diff --git a/.idea/compiler.xml b/.idea/compiler.xml
index 9631f0b16849..fa595e20de73 100644
--- a/.idea/compiler.xml
+++ b/.idea/compiler.xml
@@ -6,6 +6,7 @@
   <component name="CompilerConfiguration">
     <option name="DEFAULT_COMPILER" value="Javac" />
     <excludeFromCompile>
+      <file url="file://$PROJECT_DIR$/jps/jps-builders/src/org/jetbrains/jps/incremental/java/OptimizedFileManager.java" />
       <file url="file://$PROJECT_DIR$/jps/jps-builders/src/org/jetbrains/jps/javac/OptimizedFileManager.java" />
       <file url="file://$PROJECT_DIR$/jps/jps-builders/src/org/jetbrains/jps/javac/OptimizedFileManager17.java" />
     </excludeFromCompile>
diff --git a/images/src/org/intellij/images/editor/impl/ImageFileEditorImpl.java b/images/src/org/intellij/images/editor/impl/ImageFileEditorImpl.java
index be3c13575781..1c2b6c45ffbd 100644
--- a/images/src/org/intellij/images/editor/impl/ImageFileEditorImpl.java
+++ b/images/src/org/intellij/images/editor/impl/ImageFileEditorImpl.java
@@ -33,7 +33,6 @@ import org.jetbrains.annotations.NotNull;
 
 import javax.swing.*;
 import java.beans.PropertyChangeListener;
-import java.io.Serializable;
 
 /**
  * Image Editor.
@@ -87,9 +86,9 @@ final class ImageFileEditorImpl extends UserDataHolderBase implements ImageFileE
         if (state instanceof ImageFileEditorState) {
             ImageFileEditorState editorState = (ImageFileEditorState) state;
             ImageZoomModel zoomModel = imageEditor.getZoomModel();
-            imageEditor.setTransparencyChessboardVisible(editorState.backgroundVisible);
-            imageEditor.setGridVisible(editorState.gridVisible);
-            zoomModel.setZoomFactor(editorState.zoomFactor);
+            imageEditor.setTransparencyChessboardVisible(editorState.isBackgroundVisible());
+            imageEditor.setGridVisible(editorState.isGridVisible());
+            zoomModel.setZoomFactor(editorState.getZoomFactor());
         }
     }
 
@@ -134,22 +133,4 @@ final class ImageFileEditorImpl extends UserDataHolderBase implements ImageFileE
     public ImageEditor getImageEditor() {
         return imageEditor;
     }
-
-    private static class ImageFileEditorState implements FileEditorState, Serializable {
-        private static final long serialVersionUID = -4470317464706072486L;
-
-        private final boolean backgroundVisible;
-        private final boolean gridVisible;
-        private final double zoomFactor;
-
-        private ImageFileEditorState(boolean backgroundVisible, boolean gridVisible, double zoomFactor) {
-            this.backgroundVisible = backgroundVisible;
-            this.gridVisible = gridVisible;
-            this.zoomFactor = zoomFactor;
-        }
-
-        public boolean canBeMergedWith(FileEditorState otherState, FileEditorStateLevel level) {
-            return otherState instanceof ImageFileEditorState;
-        }
-    }
 }
diff --git a/images/src/org/intellij/images/editor/impl/ImageFileEditorState.java b/images/src/org/intellij/images/editor/impl/ImageFileEditorState.java
new file mode 100644
index 000000000000..ba2afd4d0e95
--- /dev/null
+++ b/images/src/org/intellij/images/editor/impl/ImageFileEditorState.java
@@ -0,0 +1,93 @@
+/*
+ * Copyright 2000-2012 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 org.intellij.images.editor.impl;
+
+import com.intellij.openapi.fileEditor.FileEditorState;
+import com.intellij.openapi.fileEditor.FileEditorStateLevel;
+import com.intellij.openapi.fileEditor.TransferableFileEditorState;
+
+import java.io.Serializable;
+import java.util.HashMap;
+import java.util.Map;
+
+/**
+ * @author Konstantin Bulenkov
+ */
+public class ImageFileEditorState implements TransferableFileEditorState, Serializable {
+  private static final long serialVersionUID = -4470317464706072486L;
+  public static final String IMAGE_EDITOR_ID = "ImageEditor";
+  public static final String BACKGROUND_VISIBLE_OPTION = "backgroundVisible";
+  public static final String GRID_VISIBLE_OPTION = "gridVisible";
+  public static final String ZOOM_FACTOR_OPTION = "zoomFactor";
+
+  private boolean backgroundVisible;
+  private boolean gridVisible;
+  private double zoomFactor;
+
+  ImageFileEditorState(boolean backgroundVisible, boolean gridVisible, double zoomFactor) {
+    this.backgroundVisible = backgroundVisible;
+    this.gridVisible = gridVisible;
+    this.zoomFactor = zoomFactor;
+  }
+
+  public boolean canBeMergedWith(FileEditorState otherState, FileEditorStateLevel level) {
+    return otherState instanceof ImageFileEditorState;
+  }
+
+  public boolean isBackgroundVisible() {
+    return backgroundVisible;
+  }
+
+  public boolean isGridVisible() {
+    return gridVisible;
+  }
+
+  public double getZoomFactor() {
+    return zoomFactor;
+  }
+
+  @Override
+  public String getEditorId() {
+    return IMAGE_EDITOR_ID;
+  }
+
+  @Override
+  public Map<String, String> getTransferableOptions() {
+    final HashMap<String, String> map = new HashMap<String, String>();
+    map.put(BACKGROUND_VISIBLE_OPTION, String.valueOf(backgroundVisible));
+    map.put(GRID_VISIBLE_OPTION, String.valueOf(gridVisible));
+    map.put(ZOOM_FACTOR_OPTION, String.valueOf(zoomFactor));
+    return map;
+  }
+
+  @Override
+  public void setTransferableOptions(Map<String, String> options) {
+    String o = options.get(BACKGROUND_VISIBLE_OPTION);
+    if (o != null) {
+      backgroundVisible = Boolean.valueOf(o);
+    }
+
+    o = options.get(GRID_VISIBLE_OPTION);
+    if (o != null) {
+      gridVisible = Boolean.valueOf(o);
+    }
+
+    o = options.get(ZOOM_FACTOR_OPTION);
+    if (o != null) {
+      zoomFactor = Double.valueOf(o);
+    }
+  }
+}
diff --git a/java/compiler/impl/src/com/intellij/compiler/CompileServerManager.java b/java/compiler/impl/src/com/intellij/compiler/CompileServerManager.java
index ed97f1ea86c7..8abbe757472b 100644
--- a/java/compiler/impl/src/com/intellij/compiler/CompileServerManager.java
+++ b/java/compiler/impl/src/com/intellij/compiler/CompileServerManager.java
@@ -280,7 +280,8 @@ public class CompileServerManager implements ApplicationComponent{
           continue;
         }
         final RequestFuture future = submitCompilationTask(project, false, true, Collections.<String>emptyList(), Collections.<String>emptyList(),
-                                                           Collections.<String>emptyList(), new AutoMakeResponseHandler(project));
+                                                           Collections.<String>emptyList(), Collections.<String, String>emptyMap(), new AutoMakeResponseHandler(project)
+        );
         if (future != null) {
           futures.add(future);
           synchronized (myAutomakeFutures) {
@@ -312,9 +313,10 @@ public class CompileServerManager implements ApplicationComponent{
   }
 
   @Nullable
-  public RequestFuture submitCompilationTask(final Project project, final boolean isRebuild, final boolean isMake, 
-                                             final Collection<String> modules, final Collection<String> artifacts, 
-                                             final Collection<String> paths, final JpsServerResponseHandler handler) {
+  public RequestFuture submitCompilationTask(final Project project, final boolean isRebuild, final boolean isMake,
+                                             final Collection<String> modules, final Collection<String> artifacts,
+                                             final Collection<String> paths,
+                                             final Map<String, String> userData, final JpsServerResponseHandler handler) {
     final String projectId = project.getLocation();
     final Ref<RequestFuture> futureRef = new Ref<RequestFuture>(null);
     final RunnableFuture future = myTaskExecutor.submit(new Runnable() {
@@ -324,7 +326,7 @@ public class CompileServerManager implements ApplicationComponent{
           if (client != null) {
             final RequestFuture requestFuture = isRebuild ?
               client.sendRebuildRequest(projectId, handler) :
-              client.sendCompileRequest(isMake, projectId, modules, artifacts, paths, handler);
+              client.sendCompileRequest(isMake, projectId, modules, artifacts, paths, userData, handler);
             futureRef.set(requestFuture);
           }
           else {
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 0b1bf1f4605c..8d6d0f39f63d 100644
--- a/java/compiler/impl/src/com/intellij/compiler/impl/CompileDriver.java
+++ b/java/compiler/impl/src/com/intellij/compiler/impl/CompileDriver.java
@@ -430,7 +430,24 @@ public class CompileDriver {
     final CompileServerManager csManager = CompileServerManager.getInstance();
     final MessageBus messageBus = myProject.getMessageBus();
     csManager.cancelAutoMakeTasks(myProject);
-    return csManager.submitCompilationTask(myProject, compileContext.isRebuild(), compileContext.isMake(), moduleNames, artifactNames, paths, new JpsServerResponseHandler() {
+    final CompileScope scope = compileContext.getCompileScope();
+    final Map<String, String> userData;
+    // need to pass scope's user data to server
+    if (scope instanceof UserDataHolderBase) { // hack
+      userData = new HashMap<String, String>();
+      ((UserDataHolderBase)scope).copyUserDataTo(new UserDataHolderBase() {
+        @Override
+        public <T> void putUserData(@NotNull Key<T> key, @Nullable T value) {
+          final String _key = key.toString();
+          final String _value = value != null? value.toString() : "";
+          userData.put(_key, _value);
+        }
+      });
+    }
+    else {
+      userData = Collections.emptyMap();
+    }
+    return csManager.submitCompilationTask(myProject, compileContext.isRebuild(), compileContext.isMake(), moduleNames, artifactNames, paths, userData, new JpsServerResponseHandler() {
 
       @Override
       public void handleCompileMessage(JpsRemoteProto.Message.Response.CompileMessage compilerMessage) {
diff --git a/java/compiler/impl/src/com/intellij/compiler/impl/resourceCompiler/ResourceCompiler.java b/java/compiler/impl/src/com/intellij/compiler/impl/resourceCompiler/ResourceCompiler.java
index e3729d8142c1..f6e0f4013b0a 100644
--- a/java/compiler/impl/src/com/intellij/compiler/impl/resourceCompiler/ResourceCompiler.java
+++ b/java/compiler/impl/src/com/intellij/compiler/impl/resourceCompiler/ResourceCompiler.java
@@ -50,6 +50,7 @@ public class ResourceCompiler implements TranslatingCompiler {
   private static final Logger LOG = Logger.getInstance("#com.intellij.compiler.impl.resourceCompiler.ResourceCompiler");
   private final Project myProject;
   private final CompilerConfiguration myConfiguration;
+  private final ResourceCompilerExtension[] myResourceCompilerExtensions = ResourceCompilerExtension.EP_NAME.getExtensions();
   private static final FileTypeManager FILE_TYPE_MANAGER = FileTypeManager.getInstance();
 
   public ResourceCompiler(Project project, CompilerConfiguration compilerConfiguration) {
@@ -68,6 +69,11 @@ public class ResourceCompiler implements TranslatingCompiler {
   }
 
   public boolean isCompilableFile(VirtualFile file, CompileContext context) {
+    final Module module = context.getModuleByFile(file);
+    if (module != null && skipStandardResourceCompiler(module)) {
+      return false;
+    }
+
     return !StdFileTypes.JAVA.equals(file.getFileType()) && myConfiguration.isResourceFile(file);
   }
 
@@ -81,8 +87,6 @@ public class ResourceCompiler implements TranslatingCompiler {
     ApplicationManager.getApplication().runReadAction(new Runnable() {
       public void run() {
         final ProjectFileIndex fileIndex = ProjectRootManager.getInstance(myProject).getFileIndex();
-
-        OUTER:
         for (final VirtualFile file : files) {
           if (context.getProgressIndicator().isCanceled()) {
             break;
@@ -91,13 +95,6 @@ public class ResourceCompiler implements TranslatingCompiler {
           if (module == null) {
             continue; // looks like file invalidated
           }
-
-          for (ResourceCompilerExtension extension : ResourceCompilerExtension.EP_NAME.getExtensions()) {
-            if (extension.skipStandardResourceCompiler(module)) {
-              continue OUTER;
-            }
-          }
-
           final VirtualFile fileRoot = MakeUtil.getSourceRoot(context, module, file);
           if (fileRoot == null) {
             continue;
@@ -164,6 +161,15 @@ public class ResourceCompiler implements TranslatingCompiler {
     context.getProgressIndicator().popState();
   }
 
+  private boolean skipStandardResourceCompiler(final Module module) {
+    for (ResourceCompilerExtension extension : myResourceCompilerExtensions) {
+      if (extension.skipStandardResourceCompiler(module)) {
+        return true;
+      }
+    }
+    return false;
+  }
+
   private static void addToMap(Map<String, Collection<OutputItem>> map, String outputDir, OutputItem item) {
     Collection<OutputItem> list = map.get(outputDir);
     if (list == null) {
diff --git a/java/debugger/impl/src/com/intellij/debugger/engine/DebugProcessImpl.java b/java/debugger/impl/src/com/intellij/debugger/engine/DebugProcessImpl.java
index 764aac2c251e..beb967fb699d 100644
--- a/java/debugger/impl/src/com/intellij/debugger/engine/DebugProcessImpl.java
+++ b/java/debugger/impl/src/com/intellij/debugger/engine/DebugProcessImpl.java
@@ -66,7 +66,10 @@ import com.intellij.openapi.editor.Document;
 import com.intellij.openapi.extensions.Extensions;
 import com.intellij.openapi.project.Project;
 import com.intellij.openapi.ui.Messages;
-import com.intellij.openapi.util.*;
+import com.intellij.openapi.util.Disposer;
+import com.intellij.openapi.util.Key;
+import com.intellij.openapi.util.Pair;
+import com.intellij.openapi.util.Ref;
 import com.intellij.openapi.wm.ToolWindowId;
 import com.intellij.openapi.wm.WindowManager;
 import com.intellij.psi.PsiDocumentManager;
@@ -1215,40 +1218,12 @@ public abstract class DebugProcessImpl implements DebugProcess {
   }
 
   private static boolean isVisibleFromClassLoader(final ClassLoaderReference fromLoader, final ReferenceType refType) {
-    final ClassLoaderReference typeLoader = refType.classLoader();
-    if (typeLoader == null) {
-      return true; // optimization: if class is loaded by a bootstrap loader, it is visible from every other loader
-    }
-    for (ClassLoaderReference checkLoader = fromLoader; checkLoader != null; checkLoader = getParentLoader(checkLoader)) {
-      if (Comparing.equal(typeLoader, checkLoader)) {
-        return true;
-      }
-    }
-    return fromLoader != null && fromLoader.visibleClasses().contains(refType);
-  }
-
-  @SuppressWarnings({"HardCodedStringLiteral"})
-  private static ClassLoaderReference getParentLoader(final ClassLoaderReference fromLoader) {
-    final ReferenceType refType = fromLoader.referenceType();
-    Field field = refType.fieldByName("parent");
-    if (field == null) {
-      final List<Field> allFields = refType.allFields();
-      for (Field candidateField : allFields) {
-        try {
-          final Type checkedType = candidateField.type();
-          if (checkedType instanceof ReferenceType &&
-              DebuggerUtilsEx.isAssignableFrom("java.lang.ClassLoader", (ReferenceType)checkedType)) {
-            field = candidateField;
-            break;
-          }
-        }
-        catch (ClassNotLoadedException e) {
-          // ignore this and continue,
-          // java.lang.ClassLoader must be loaded at the moment of check, so if this happens, the field's type is definitely not java.lang.ClassLoader
-        }
-      }
-    }
-    return field != null? (ClassLoaderReference)fromLoader.getValue(field) : null;
+    // IMPORTANT! Even if the refType is already loaded by some parent or bootstrap loader, it may not be visible from the given loader.
+    // For example because there were no accesses yet from this loader to this class. So the loader is not in the list of "initialing" loaders
+    // for this refType and the refType is not visible to the loader.
+    // Attempt to evaluate method with this refType will yield ClassNotLoadedException.
+    // The only way to say for sure whether the class is _visible_ to the given loader, is to use the following API call
+    return fromLoader == null || fromLoader.visibleClasses().contains(refType);
   }
 
   private static String reformatArrayName(String className) {
diff --git a/java/execution/openapi/src/com/intellij/execution/JavaExecutionUtil.java b/java/execution/openapi/src/com/intellij/execution/JavaExecutionUtil.java
index 89cc65ebeeaf..85a5b51e1337 100644
--- a/java/execution/openapi/src/com/intellij/execution/JavaExecutionUtil.java
+++ b/java/execution/openapi/src/com/intellij/execution/JavaExecutionUtil.java
@@ -162,10 +162,7 @@ public class JavaExecutionUtil {
 
   public static String getShortClassName(final String fqName) {
     if (fqName == null) return "";
-    final int dotIndex = fqName.lastIndexOf('.');
-    if (dotIndex == fqName.length() - 1) return "";
-    if (dotIndex < 0) return fqName;
-    return fqName.substring(dotIndex + 1, fqName.length());
+    return StringUtil.getShortName(fqName);
   }
 
   public static void showExecutionErrorMessage(final ExecutionException e, final String title, final Project project) {
diff --git a/java/java-impl/src/com/intellij/codeInsight/daemon/impl/quickfix/ChangeNewOperatorTypeFix.java b/java/java-impl/src/com/intellij/codeInsight/daemon/impl/quickfix/ChangeNewOperatorTypeFix.java
index f95c595b3fe2..3d75b961b500 100644
--- a/java/java-impl/src/com/intellij/codeInsight/daemon/impl/quickfix/ChangeNewOperatorTypeFix.java
+++ b/java/java-impl/src/com/intellij/codeInsight/daemon/impl/quickfix/ChangeNewOperatorTypeFix.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2000-2009 JetBrains s.r.o.
+ * Copyright 2000-2012 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.
@@ -77,15 +77,36 @@ public class ChangeNewOperatorTypeFix implements IntentionAction {
     int caretOffset;
     TextRange selection;
     if (toType instanceof PsiArrayType) {
-      caretOffset = -2;
-      @NonNls String text = "new " + toType.getDeepComponentType().getCanonicalText() + "[0]";
+      final PsiExpression[] originalExpressionArrayDimensions = originalExpression.getArrayDimensions();
+      caretOffset = 0;
+      @NonNls String text = "new " + toType.getDeepComponentType().getCanonicalText() + "[";
+      if (originalExpressionArrayDimensions.length > 0) {
+        text += originalExpressionArrayDimensions[0].getText();
+      }
+      else {
+        text += "0";
+        caretOffset = -2;
+      } 
+      text += "]";
       for (int i = 1; i < toType.getArrayDimensions(); i++) {
-        text += "[]";
-        caretOffset -= 2;
+        text += "[";
+        String arrayDimension = "";
+        if (originalExpressionArrayDimensions.length > i) {
+          arrayDimension = originalExpressionArrayDimensions[i].getText();
+          text += arrayDimension;
+        }
+        text += "]";
+        if (caretOffset < 0) {
+          caretOffset -= arrayDimension.length() + 2;
+        }
       }
 
       newExpression = (PsiNewExpression)factory.createExpressionFromText(text, originalExpression);
-      selection = new TextRange(caretOffset, caretOffset+1);
+      if (caretOffset < 0) {
+        selection = new TextRange(caretOffset, caretOffset+1);
+      } else {
+        selection = null;
+      }
     }
     else {
       final PsiAnonymousClass anonymousClass = originalExpression.getAnonymousClass();
diff --git a/java/java-impl/src/com/intellij/codeInsight/intention/impl/ImplementAbstractMethodAction.java b/java/java-impl/src/com/intellij/codeInsight/intention/impl/ImplementAbstractMethodAction.java
index cafe0f34e4bf..7e88af6c6766 100644
--- a/java/java-impl/src/com/intellij/codeInsight/intention/impl/ImplementAbstractMethodAction.java
+++ b/java/java-impl/src/com/intellij/codeInsight/intention/impl/ImplementAbstractMethodAction.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2000-2009 JetBrains s.r.o.
+ * Copyright 2000-2012 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.
@@ -79,7 +79,10 @@ public class ImplementAbstractMethodAction extends BaseIntentionAction {
   }
 
   protected String getIntentionName(final PsiMethod method) {
-    return CodeInsightBundle.message("intention.implement.abstract.method.text", method.getName());
+    return method.hasModifierProperty(PsiModifier.ABSTRACT) ?
+           CodeInsightBundle.message("intention.implement.abstract.method.text", method.getName()) :
+           CodeInsightBundle.message("intention.override.method.text", method.getName())
+      ;
   }
 
   static class MyElementProcessor implements PsiElementProcessor {
diff --git a/java/java-impl/src/com/intellij/codeInspection/deprecation/DeprecationInspection.java b/java/java-impl/src/com/intellij/codeInspection/deprecation/DeprecationInspection.java
index 6b5c2de96781..4387f86e35e0 100644
--- a/java/java-impl/src/com/intellij/codeInspection/deprecation/DeprecationInspection.java
+++ b/java/java-impl/src/com/intellij/codeInspection/deprecation/DeprecationInspection.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2000-2009 JetBrains s.r.o.
+ * Copyright 2000-2012 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.
@@ -150,6 +150,10 @@ public class DeprecationInspection extends BaseJavaLocalInspectionTool {
       assert containingClass != null;
       final PsiClass superClass = containingClass.getSuperClass();
       if (hasDefaultDeprecatedConstructor(superClass)) {
+        if (superClass instanceof PsiAnonymousClass) {
+          final PsiExpressionList argumentList = ((PsiAnonymousClass)superClass).getArgumentList();
+          if (argumentList != null && argumentList.getExpressions().length > 0) return;
+        }
         final PsiCodeBlock body = method.getBody();
         if (body != null) {
           final PsiStatement[] statements = body.getStatements();
diff --git a/java/java-impl/src/com/intellij/refactoring/extractMethod/ExtractMethodProcessor.java b/java/java-impl/src/com/intellij/refactoring/extractMethod/ExtractMethodProcessor.java
index 123463734811..41bbe91ca43d 100644
--- a/java/java-impl/src/com/intellij/refactoring/extractMethod/ExtractMethodProcessor.java
+++ b/java/java-impl/src/com/intellij/refactoring/extractMethod/ExtractMethodProcessor.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2000-2011 JetBrains s.r.o.
+ * Copyright 2000-2012 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.
@@ -762,12 +762,11 @@ public class ExtractMethodProcessor implements MatchProvider {
     }
 
     adjustFinalParameters(newMethod);
-
-    for (int i = 0, length = myVariableDatum.length; i < length; i++) {
-      ParameterTablePanel.VariableData data = myVariableDatum[i];
+    int i = 0;
+    for (ParameterTablePanel.VariableData data : myVariableDatum) {
       if (!data.passAsParameter) continue;
       final PsiVariable variable = data.variable;
-      final PsiParameter psiParameter = newMethod.getParameterList().getParameters()[i];
+      final PsiParameter psiParameter = newMethod.getParameterList().getParameters()[i++];
       if (!TypeConversionUtil.isAssignable(variable.getType(), psiParameter.getType())) {
         for (PsiReference reference : ReferencesSearch.search(psiParameter, new LocalSearchScope(body))){
           final PsiElement element = reference.getElement();
diff --git a/java/java-psi-impl/src/com/intellij/psi/impl/compiled/DefaultClsStubBuilderFactory.java b/java/java-psi-impl/src/com/intellij/psi/impl/compiled/DefaultClsStubBuilderFactory.java
index e29bb9f502f6..d7164e97d879 100644
--- a/java/java-psi-impl/src/com/intellij/psi/impl/compiled/DefaultClsStubBuilderFactory.java
+++ b/java/java-psi-impl/src/com/intellij/psi/impl/compiled/DefaultClsStubBuilderFactory.java
@@ -51,7 +51,7 @@ public class DefaultClsStubBuilderFactory extends ClsStubBuilderFactory {
       return file;
     }
     catch (Exception e) {
-      LOG.warn(vFile.getPath(), e);
+      LOG.debug(vFile.getPath(), e);
       throw new ClsFormatException();
     }
   }
diff --git a/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/changeNewOperatorType/after3.java b/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/changeNewOperatorType/after3.java
index 53df5ba02e21..b74263a1f326 100644
--- a/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/changeNewOperatorType/after3.java
+++ b/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/changeNewOperatorType/after3.java
@@ -1,9 +1,25 @@
+/*
+ * Copyright 2000-2012 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.
+ */
+
 // "Change 'new TTT[0][]' to 'new TTT[]'" "true"
 public class TTT {
     void f() {
         String s = new Object();
         int[][] i = new Object();
-        TTT[] f = new TTT[<caret><selection>0</selection>];
+        TTT[] f = new TTT[0]<caret>;
 
     }
 }
diff --git a/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/changeNewOperatorType/afterNonPrimitiveArrayDimensions.java b/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/changeNewOperatorType/afterNonPrimitiveArrayDimensions.java
new file mode 100644
index 000000000000..895a33236f5d
--- /dev/null
+++ b/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/changeNewOperatorType/afterNonPrimitiveArrayDimensions.java
@@ -0,0 +1,21 @@
+/*
+ * Copyright 2000-2012 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.
+ */
+
+// "Change 'new X[42]' to 'new long[]'" "true"
+
+ class X {
+ public long[] foo() { return new long[42]; }
+ }
diff --git a/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/changeNewOperatorType/beforeNonPrimitiveArrayDimensions.java b/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/changeNewOperatorType/beforeNonPrimitiveArrayDimensions.java
new file mode 100644
index 000000000000..d1067c2c7a2a
--- /dev/null
+++ b/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/changeNewOperatorType/beforeNonPrimitiveArrayDimensions.java
@@ -0,0 +1,21 @@
+/*
+ * Copyright 2000-2012 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.
+ */
+
+// "Change 'new X[42]' to 'new long[]'" "true"
+
+ class X {
+ public long[] foo() { return <caret>new X[42]; }
+ }
diff --git a/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/overrideMethod/afterProtectedMethod.java b/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/overrideMethod/afterProtectedMethod.java
index f8719f2651b3..c00be390d07a 100644
--- a/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/overrideMethod/afterProtectedMethod.java
+++ b/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/overrideMethod/afterProtectedMethod.java
@@ -1,4 +1,20 @@
-// "Implement method 'foo'" "true"
+/*
+ * Copyright 2000-2012 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.
+ */
+
+// "Override method 'foo'" "true"
 class Test {
   protected void foo(){}
 }
diff --git a/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/overrideMethod/beforePrivateMethod.java b/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/overrideMethod/beforePrivateMethod.java
index 18bffdf3f0cd..18629818d098 100644
--- a/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/overrideMethod/beforePrivateMethod.java
+++ b/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/overrideMethod/beforePrivateMethod.java
@@ -1,4 +1,20 @@
-// "Implement method 'foo'" "false"
+/*
+ * Copyright 2000-2012 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.
+ */
+
+// "Override method 'foo'" "false"
 class Test {
   private void f<caret>oo(){}
 }
diff --git a/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/overrideMethod/beforeProtectedMethod.java b/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/overrideMethod/beforeProtectedMethod.java
index 477c4568b02e..fa5bc2c68ff7 100644
--- a/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/overrideMethod/beforeProtectedMethod.java
+++ b/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/overrideMethod/beforeProtectedMethod.java
@@ -1,4 +1,20 @@
-// "Implement method 'foo'" "true"
+/*
+ * Copyright 2000-2012 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.
+ */
+
+// "Override method 'foo'" "true"
 class Test {
   protected void f<caret>oo(){}
 }
diff --git a/java/java-tests/testData/compileServer/incremental/classProperties/changeExtends2.log b/java/java-tests/testData/compileServer/incremental/classProperties/changeExtends2.log
new file mode 100644
index 000000000000..d0f22e46b2ae
--- /dev/null
+++ b/java/java-tests/testData/compileServer/incremental/classProperties/changeExtends2.log
@@ -0,0 +1,13 @@
+Cleaning output files:
+out/production/ChangeExtends2/Victim$SubVictim.class
+out/production/ChangeExtends2/Victim.class
+End of files
+Compiling files:
+src/Victim.java
+End of files
+Cleaning output files:
+out/production/ChangeExtends2/Main.class
+End of files
+Compiling files:
+src/Main.java
+End of files
diff --git a/java/java-tests/testData/compileServer/incremental/classProperties/changeExtends2/.idea/.name b/java/java-tests/testData/compileServer/incremental/classProperties/changeExtends2/.idea/.name
new file mode 100644
index 000000000000..ea799cad6e8b
--- /dev/null
+++ b/java/java-tests/testData/compileServer/incremental/classProperties/changeExtends2/.idea/.name
@@ -0,0 +1 @@
+changeExtends2
\ No newline at end of file
diff --git a/java/java-tests/testData/compileServer/incremental/classProperties/changeExtends2/.idea/compiler.xml b/java/java-tests/testData/compileServer/incremental/classProperties/changeExtends2/.idea/compiler.xml
new file mode 100644
index 000000000000..a1b41c52c724
--- /dev/null
+++ b/java/java-tests/testData/compileServer/incremental/classProperties/changeExtends2/.idea/compiler.xml
@@ -0,0 +1,21 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project version="4">
+  <component name="CompilerConfiguration">
+    <option name="DEFAULT_COMPILER" value="Javac" />
+    <resourceExtensions />
+    <wildcardResourcePatterns>
+      <entry name="?*.properties" />
+      <entry name="?*.xml" />
+      <entry name="?*.gif" />
+      <entry name="?*.png" />
+      <entry name="?*.jpeg" />
+      <entry name="?*.jpg" />
+      <entry name="?*.html" />
+      <entry name="?*.dtd" />
+      <entry name="?*.tld" />
+      <entry name="?*.ftl" />
+    </wildcardResourcePatterns>
+    <annotationProcessing enabled="false" useClasspath="true" />
+  </component>
+</project>
+
diff --git a/java/java-tests/testData/compileServer/incremental/classProperties/changeExtends2/.idea/copyright/profiles_settings.xml b/java/java-tests/testData/compileServer/incremental/classProperties/changeExtends2/.idea/copyright/profiles_settings.xml
new file mode 100644
index 000000000000..3572571ad83c
--- /dev/null
+++ b/java/java-tests/testData/compileServer/incremental/classProperties/changeExtends2/.idea/copyright/profiles_settings.xml
@@ -0,0 +1,5 @@
+<component name="CopyrightManager">
+  <settings default="">
+    <module2copyright />
+  </settings>
+</component>
\ No newline at end of file
diff --git a/java/java-tests/testData/compileServer/incremental/classProperties/changeExtends2/.idea/encodings.xml b/java/java-tests/testData/compileServer/incremental/classProperties/changeExtends2/.idea/encodings.xml
new file mode 100644
index 000000000000..e206d70d8595
--- /dev/null
+++ b/java/java-tests/testData/compileServer/incremental/classProperties/changeExtends2/.idea/encodings.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project version="4">
+  <component name="Encoding" useUTFGuessing="true" native2AsciiForPropertiesFiles="false" />
+</project>
+
diff --git a/java/java-tests/testData/compileServer/incremental/classProperties/changeExtends2/.idea/misc.xml b/java/java-tests/testData/compileServer/incremental/classProperties/changeExtends2/.idea/misc.xml
new file mode 100644
index 000000000000..3be55a8062da
--- /dev/null
+++ b/java/java-tests/testData/compileServer/incremental/classProperties/changeExtends2/.idea/misc.xml
@@ -0,0 +1,23 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project version="4">
+  <component name="ProjectRootManager" version="2" languageLevel="JDK_1_6" assert-keyword="true" jdk-15="true" project-jdk-name="IDEA jdk" project-jdk-type="JavaSDK">
+    <output url="file://$PROJECT_DIR$/out" />
+  </component>
+  <component name="masterDetails">
+    <states>
+      <state key="ProjectJDKs.UI">
+        <settings>
+          <last-edited>IDEA jdk</last-edited>
+          <splitter-proportions>
+            <option name="proportions">
+              <list>
+                <option value="0.20000002" />
+              </list>
+            </option>
+          </splitter-proportions>
+        </settings>
+      </state>
+    </states>
+  </component>
+</project>
+
diff --git a/java/java-tests/testData/compileServer/incremental/classProperties/changeExtends2/.idea/modules.xml b/java/java-tests/testData/compileServer/incremental/classProperties/changeExtends2/.idea/modules.xml
new file mode 100644
index 000000000000..4f270de54f78
--- /dev/null
+++ b/java/java-tests/testData/compileServer/incremental/classProperties/changeExtends2/.idea/modules.xml
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project version="4">
+  <component name="ProjectModuleManager">
+    <modules>
+      <module fileurl="file://$PROJECT_DIR$/ChangeExtends2.iml" filepath="$PROJECT_DIR$/ChangeExtends2.iml" />
+    </modules>
+  </component>
+</project>
+
diff --git a/java/java-tests/testData/compileServer/incremental/classProperties/changeExtends2/.idea/scopes/scope_settings.xml b/java/java-tests/testData/compileServer/incremental/classProperties/changeExtends2/.idea/scopes/scope_settings.xml
new file mode 100644
index 000000000000..922003b8433b
--- /dev/null
+++ b/java/java-tests/testData/compileServer/incremental/classProperties/changeExtends2/.idea/scopes/scope_settings.xml
@@ -0,0 +1,5 @@
+<component name="DependencyValidationManager">
+  <state>
+    <option name="SKIP_IMPORT_STATEMENTS" value="false" />
+  </state>
+</component>
\ No newline at end of file
diff --git a/java/java-tests/testData/compileServer/incremental/classProperties/changeExtends2/.idea/uiDesigner.xml b/java/java-tests/testData/compileServer/incremental/classProperties/changeExtends2/.idea/uiDesigner.xml
new file mode 100644
index 000000000000..3b0002030884
--- /dev/null
+++ b/java/java-tests/testData/compileServer/incremental/classProperties/changeExtends2/.idea/uiDesigner.xml
@@ -0,0 +1,125 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project version="4">
+  <component name="Palette2">
+    <group name="Swing">
+      <item class="com.intellij.uiDesigner.HSpacer" tooltip-text="Horizontal Spacer" icon="/com/intellij/uiDesigner/icons/hspacer.png" removable="false" auto-create-binding="false" can-attach-label="false">
+        <default-constraints vsize-policy="1" hsize-policy="6" anchor="0" fill="1" />
+      </item>
+      <item class="com.intellij.uiDesigner.VSpacer" tooltip-text="Vertical Spacer" icon="/com/intellij/uiDesigner/icons/vspacer.png" removable="false" auto-create-binding="false" can-attach-label="false">
+        <default-constraints vsize-policy="6" hsize-policy="1" anchor="0" fill="2" />
+      </item>
+      <item class="javax.swing.JPanel" icon="/com/intellij/uiDesigner/icons/panel.png" removable="false" auto-create-binding="false" can-attach-label="false">
+        <default-constraints vsize-policy="3" hsize-policy="3" anchor="0" fill="3" />
+      </item>
+      <item class="javax.swing.JScrollPane" icon="/com/intellij/uiDesigner/icons/scrollPane.png" removable="false" auto-create-binding="false" can-attach-label="true">
+        <default-constraints vsize-policy="7" hsize-policy="7" anchor="0" fill="3" />
+      </item>
+      <item class="javax.swing.JButton" icon="/com/intellij/uiDesigner/icons/button.png" removable="false" auto-create-binding="true" can-attach-label="false">
+        <default-constraints vsize-policy="0" hsize-policy="3" anchor="0" fill="1" />
+        <initial-values>
+          <property name="text" value="Button" />
+        </initial-values>
+      </item>
+      <item class="javax.swing.JRadioButton" icon="/com/intellij/uiDesigner/icons/radioButton.png" removable="false" auto-create-binding="true" can-attach-label="false">
+        <default-constraints vsize-policy="0" hsize-policy="3" anchor="8" fill="0" />
+        <initial-values>
+          <property name="text" value="RadioButton" />
+        </initial-values>
+      </item>
+      <item class="javax.swing.JCheckBox" icon="/com/intellij/uiDesigner/icons/checkBox.png" removable="false" auto-create-binding="true" can-attach-label="false">
+        <default-constraints vsize-policy="0" hsize-policy="3" anchor="8" fill="0" />
+        <initial-values>
+          <property name="text" value="CheckBox" />
+        </initial-values>
+      </item>
+      <item class="javax.swing.JLabel" icon="/com/intellij/uiDesigner/icons/label.png" removable="false" auto-create-binding="false" can-attach-label="false">
+        <default-constraints vsize-policy="0" hsize-policy="0" anchor="8" fill="0" />
+        <initial-values>
+          <property name="text" value="Label" />
+        </initial-values>
+      </item>
+      <item class="javax.swing.JTextField" icon="/com/intellij/uiDesigner/icons/textField.png" removable="false" auto-create-binding="true" can-attach-label="true">
+        <default-constraints vsize-policy="0" hsize-policy="6" anchor="8" fill="1">
+          <preferred-size width="150" height="-1" />
+        </default-constraints>
+      </item>
+      <item class="javax.swing.JPasswordField" icon="/com/intellij/uiDesigner/icons/passwordField.png" removable="false" auto-create-binding="true" can-attach-label="true">
+        <default-constraints vsize-policy="0" hsize-policy="6" anchor="8" fill="1">
+          <preferred-size width="150" height="-1" />
+        </default-constraints>
+      </item>
+      <item class="javax.swing.JFormattedTextField" icon="/com/intellij/uiDesigner/icons/formattedTextField.png" removable="false" auto-create-binding="true" can-attach-label="true">
+        <default-constraints vsize-policy="0" hsize-policy="6" anchor="8" fill="1">
+          <preferred-size width="150" height="-1" />
+        </default-constraints>
+      </item>
+      <item class="javax.swing.JTextArea" icon="/com/intellij/uiDesigner/icons/textArea.png" removable="false" auto-create-binding="true" can-attach-label="true">
+        <default-constraints vsize-policy="6" hsize-policy="6" anchor="0" fill="3">
+          <preferred-size width="150" height="50" />
+        </default-constraints>
+      </item>
+      <item class="javax.swing.JTextPane" icon="/com/intellij/uiDesigner/icons/textPane.png" removable="false" auto-create-binding="true" can-attach-label="true">
+        <default-constraints vsize-policy="6" hsize-policy="6" anchor="0" fill="3">
+          <preferred-size width="150" height="50" />
+        </default-constraints>
+      </item>
+      <item class="javax.swing.JEditorPane" icon="/com/intellij/uiDesigner/icons/editorPane.png" removable="false" auto-create-binding="true" can-attach-label="true">
+        <default-constraints vsize-policy="6" hsize-policy="6" anchor="0" fill="3">
+          <preferred-size width="150" height="50" />
+        </default-constraints>
+      </item>
+      <item class="javax.swing.JComboBox" icon="/com/intellij/uiDesigner/icons/comboBox.png" removable="false" auto-create-binding="true" can-attach-label="true">
+        <default-constraints vsize-policy="0" hsize-policy="2" anchor="8" fill="1" />
+      </item>
+      <item class="javax.swing.JTable" icon="/com/intellij/uiDesigner/icons/table.png" removable="false" auto-create-binding="true" can-attach-label="false">
+        <default-constraints vsize-policy="6" hsize-policy="6" anchor="0" fill="3">
+          <preferred-size width="150" height="50" />
+        </default-constraints>
+      </item>
+      <item class="javax.swing.JList" icon="/com/intellij/uiDesigner/icons/list.png" removable="false" auto-create-binding="true" can-attach-label="false">
+        <default-constraints vsize-policy="6" hsize-policy="2" anchor="0" fill="3">
+          <preferred-size width="150" height="50" />
+        </default-constraints>
+      </item>
+      <item class="javax.swing.JTree" icon="/com/intellij/uiDesigner/icons/tree.png" removable="false" auto-create-binding="true" can-attach-label="false">
+        <default-constraints vsize-policy="6" hsize-policy="6" anchor="0" fill="3">
+          <preferred-size width="150" height="50" />
+        </default-constraints>
+      </item>
+      <item class="javax.swing.JTabbedPane" icon="/com/intellij/uiDesigner/icons/tabbedPane.png" removable="false" auto-create-binding="true" can-attach-label="false">
+        <default-constraints vsize-policy="3" hsize-policy="3" anchor="0" fill="3">
+          <preferred-size width="200" height="200" />
+        </default-constraints>
+      </item>
+      <item class="javax.swing.JSplitPane" icon="/com/intellij/uiDesigner/icons/splitPane.png" removable="false" auto-create-binding="false" can-attach-label="false">
+        <default-constraints vsize-policy="3" hsize-policy="3" anchor="0" fill="3">
+          <preferred-size width="200" height="200" />
+        </default-constraints>
+      </item>
+      <item class="javax.swing.JSpinner" icon="/com/intellij/uiDesigner/icons/spinner.png" removable="false" auto-create-binding="true" can-attach-label="true">
+        <default-constraints vsize-policy="0" hsize-policy="6" anchor="8" fill="1" />
+      </item>
+      <item class="javax.swing.JSlider" icon="/com/intellij/uiDesigner/icons/slider.png" removable="false" auto-create-binding="true" can-attach-label="false">
+        <default-constraints vsize-policy="0" hsize-policy="6" anchor="8" fill="1" />
+      </item>
+      <item class="javax.swing.JSeparator" icon="/com/intellij/uiDesigner/icons/separator.png" removable="false" auto-create-binding="false" can-attach-label="false">
+        <default-constraints vsize-policy="6" hsize-policy="6" anchor="0" fill="3" />
+      </item>
+      <item class="javax.swing.JProgressBar" icon="/com/intellij/uiDesigner/icons/progressbar.png" removable="false" auto-create-binding="true" can-attach-label="false">
+        <default-constraints vsize-policy="0" hsize-policy="6" anchor="0" fill="1" />
+      </item>
+      <item class="javax.swing.JToolBar" icon="/com/intellij/uiDesigner/icons/toolbar.png" removable="false" auto-create-binding="false" can-attach-label="false">
+        <default-constraints vsize-policy="0" hsize-policy="6" anchor="0" fill="1">
+          <preferred-size width="-1" height="20" />
+        </default-constraints>
+      </item>
+      <item class="javax.swing.JToolBar$Separator" icon="/com/intellij/uiDesigner/icons/toolbarSeparator.png" removable="false" auto-create-binding="false" can-attach-label="false">
+        <default-constraints vsize-policy="0" hsize-policy="0" anchor="0" fill="1" />
+      </item>
+      <item class="javax.swing.JScrollBar" icon="/com/intellij/uiDesigner/icons/scrollbar.png" removable="false" auto-create-binding="true" can-attach-label="false">
+        <default-constraints vsize-policy="6" hsize-policy="0" anchor="0" fill="2" />
+      </item>
+    </group>
+  </component>
+</project>
+
diff --git a/java/java-tests/testData/compileServer/incremental/classProperties/changeExtends2/.idea/vcs.xml b/java/java-tests/testData/compileServer/incremental/classProperties/changeExtends2/.idea/vcs.xml
new file mode 100644
index 000000000000..def6a6a18457
--- /dev/null
+++ b/java/java-tests/testData/compileServer/incremental/classProperties/changeExtends2/.idea/vcs.xml
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project version="4">
+  <component name="VcsDirectoryMappings">
+    <mapping directory="" vcs="" />
+  </component>
+</project>
+
diff --git a/java/java-tests/testData/compileServer/incremental/classProperties/changeExtends2/.idea/workspace.xml b/java/java-tests/testData/compileServer/incremental/classProperties/changeExtends2/.idea/workspace.xml
new file mode 100644
index 000000000000..0a7790e24c1f
--- /dev/null
+++ b/java/java-tests/testData/compileServer/incremental/classProperties/changeExtends2/.idea/workspace.xml
@@ -0,0 +1,331 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project version="4">
+  <component name="ChangeListManager">
+    <list default="true" id="4439e742-b1c3-4c53-9caf-bd092b4963fd" name="Default" comment="" />
+    <ignored path="changeExtends2.iws" />
+    <ignored path=".idea/workspace.xml" />
+    <option name="TRACKING_ENABLED" value="true" />
+    <option name="SHOW_DIALOG" value="false" />
+    <option name="HIGHLIGHT_CONFLICTS" value="true" />
+    <option name="HIGHLIGHT_NON_ACTIVE_CHANGELIST" value="false" />
+    <option name="LAST_RESOLUTION" value="IGNORE" />
+  </component>
+  <component name="ChangesViewManager" flattened_view="true" show_ignored="false" />
+  <component name="CreatePatchCommitExecutor">
+    <option name="PATCH_PATH" value="" />
+  </component>
+  <component name="DaemonCodeAnalyzer">
+    <disable_hints />
+  </component>
+  <component name="DebuggerManager">
+    <breakpoint_any>
+      <breakpoint>
+        <option name="NOTIFY_CAUGHT" value="true" />
+        <option name="NOTIFY_UNCAUGHT" value="true" />
+        <option name="ENABLED" value="false" />
+        <option name="LOG_ENABLED" value="false" />
+        <option name="LOG_EXPRESSION_ENABLED" value="false" />
+        <option name="SUSPEND_POLICY" value="SuspendAll" />
+        <option name="COUNT_FILTER_ENABLED" value="false" />
+        <option name="COUNT_FILTER" value="0" />
+        <option name="CONDITION_ENABLED" value="false" />
+        <option name="CLASS_FILTERS_ENABLED" value="false" />
+        <option name="INSTANCE_FILTERS_ENABLED" value="false" />
+        <option name="CONDITION" value="" />
+        <option name="LOG_MESSAGE" value="" />
+      </breakpoint>
+      <breakpoint>
+        <option name="NOTIFY_CAUGHT" value="true" />
+        <option name="NOTIFY_UNCAUGHT" value="true" />
+        <option name="ENABLED" value="false" />
+        <option name="LOG_ENABLED" value="false" />
+        <option name="LOG_EXPRESSION_ENABLED" value="false" />
+        <option name="SUSPEND_POLICY" value="SuspendAll" />
+        <option name="COUNT_FILTER_ENABLED" value="false" />
+        <option name="COUNT_FILTER" value="0" />
+        <option name="CONDITION_ENABLED" value="false" />
+        <option name="CLASS_FILTERS_ENABLED" value="false" />
+        <option name="INSTANCE_FILTERS_ENABLED" value="false" />
+        <option name="CONDITION" value="" />
+        <option name="LOG_MESSAGE" value="" />
+      </breakpoint>
+    </breakpoint_any>
+    <breakpoint_rules />
+    <ui_properties />
+  </component>
+  <component name="FavoritesManager">
+    <favorites_list name="changeExtends2" />
+  </component>
+  <component name="ProjectFrameBounds">
+    <option name="y" value="25" />
+    <option name="width" value="1280" />
+    <option name="height" value="974" />
+  </component>
+  <component name="ProjectLevelVcsManager" settingsEditedManually="false">
+    <OptionsSetting value="true" id="Add" />
+    <OptionsSetting value="true" id="Remove" />
+    <OptionsSetting value="true" id="Checkout" />
+    <OptionsSetting value="true" id="Update" />
+    <OptionsSetting value="true" id="Status" />
+    <OptionsSetting value="true" id="Edit" />
+    <ConfirmationsSetting value="0" id="Add" />
+    <ConfirmationsSetting value="0" id="Remove" />
+  </component>
+  <component name="ProjectReloadState">
+    <option name="STATE" value="0" />
+  </component>
+  <component name="ProjectView">
+    <navigator currentView="ProjectPane" proportions="" version="1" splitterProportion="0.5">
+      <flattenPackages />
+      <showMembers />
+      <showModules />
+      <showLibraryContents />
+      <hideEmptyPackages />
+      <abbreviatePackageNames />
+      <autoscrollToSource />
+      <autoscrollFromSource />
+      <sortByType />
+    </navigator>
+    <panes>
+      <pane id="Scope">
+        <subPane subId="Project Files">
+          <PATH>
+            <PATH_ELEMENT USER_OBJECT="Root">
+              <option name="myItemId" value="" />
+              <option name="myItemType" value="" />
+            </PATH_ELEMENT>
+          </PATH>
+        </subPane>
+      </pane>
+      <pane id="PackagesPane" />
+      <pane id="ProjectPane">
+        <subPane>
+          <PATH>
+            <PATH_ELEMENT>
+              <option name="myItemId" value="changeExtends2" />
+              <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewProjectNode" />
+            </PATH_ELEMENT>
+          </PATH>
+        </subPane>
+      </pane>
+    </panes>
+  </component>
+  <component name="PropertiesComponent">
+    <property name="GoToFile.includeJavaFiles" value="false" />
+    <property name="GoToClass.toSaveIncludeLibraries" value="false" />
+    <property name="MemberChooser.sorted" value="false" />
+    <property name="MemberChooser.showClasses" value="true" />
+    <property name="GoToClass.includeLibraries" value="false" />
+    <property name="MemberChooser.copyJavadoc" value="false" />
+  </component>
+  <component name="RunManager">
+    <configuration default="true" type="#org.jetbrains.idea.devkit.run.PluginConfigurationType" factoryName="Plugin">
+      <module name="" />
+      <option name="VM_PARAMETERS" value="-Xmx512m -Xms256m -XX:MaxPermSize=250m" />
+      <option name="PROGRAM_PARAMETERS" />
+      <method>
+        <option name="AntTarget" enabled="false" />
+        <option name="BuildArtifacts" enabled="false" />
+        <option name="Make" enabled="true" />
+        <option name="Maven.BeforeRunTask" enabled="false" />
+      </method>
+    </configuration>
+    <configuration default="true" type="Remote" factoryName="Remote">
+      <option name="USE_SOCKET_TRANSPORT" value="true" />
+      <option name="SERVER_MODE" value="false" />
+      <option name="SHMEM_ADDRESS" value="javadebug" />
+      <option name="HOST" value="localhost" />
+      <option name="PORT" value="5005" />
+      <method>
+        <option name="AntTarget" enabled="false" />
+        <option name="BuildArtifacts" enabled="false" />
+        <option name="Maven.BeforeRunTask" enabled="false" />
+      </method>
+    </configuration>
+    <configuration default="true" type="TestNG" factoryName="TestNG">
+      <module name="" />
+      <option name="ALTERNATIVE_JRE_PATH_ENABLED" value="false" />
+      <option name="ALTERNATIVE_JRE_PATH" />
+      <option name="SUITE_NAME" />
+      <option name="PACKAGE_NAME" />
+      <option name="MAIN_CLASS_NAME" />
+      <option name="METHOD_NAME" />
+      <option name="GROUP_NAME" />
+      <option name="TEST_OBJECT" value="CLASS" />
+      <option name="VM_PARAMETERS" value="-ea" />
+      <option name="PARAMETERS" />
+      <option name="WORKING_DIRECTORY" value="$PROJECT_DIR$" />
+      <option name="OUTPUT_DIRECTORY" />
+      <option name="ANNOTATION_TYPE" />
+      <option name="ENV_VARIABLES" />
+      <option name="PASS_PARENT_ENVS" value="true" />
+      <option name="TEST_SEARCH_SCOPE">
+        <value defaultName="moduleWithDependencies" />
+      </option>
+      <option name="USE_DEFAULT_REPORTERS" value="false" />
+      <option name="PROPERTIES_FILE" />
+      <envs />
+      <properties />
+      <listeners />
+      <method>
+        <option name="AntTarget" enabled="false" />
+        <option name="BuildArtifacts" enabled="false" />
+        <option name="Make" enabled="true" />
+        <option name="Maven.BeforeRunTask" enabled="false" />
+      </method>
+    </configuration>
+    <configuration default="true" type="Applet" factoryName="Applet">
+      <module name="" />
+      <option name="MAIN_CLASS_NAME" />
+      <option name="HTML_FILE_NAME" />
+      <option name="HTML_USED" value="false" />
+      <option name="WIDTH" value="400" />
+      <option name="HEIGHT" value="300" />
+      <option name="POLICY_FILE" value="$APPLICATION_HOME_DIR$/bin/appletviewer.policy" />
+      <option name="VM_PARAMETERS" />
+      <option name="ALTERNATIVE_JRE_PATH_ENABLED" value="false" />
+      <option name="ALTERNATIVE_JRE_PATH" />
+      <method>
+        <option name="AntTarget" enabled="false" />
+        <option name="BuildArtifacts" enabled="false" />
+        <option name="Make" enabled="true" />
+        <option name="Maven.BeforeRunTask" enabled="false" />
+      </method>
+    </configuration>
+    <configuration default="true" type="Application" factoryName="Application">
+      <option name="MAIN_CLASS_NAME" />
+      <option name="VM_PARAMETERS" />
+      <option name="PROGRAM_PARAMETERS" />
+      <option name="WORKING_DIRECTORY" value="$PROJECT_DIR$" />
+      <option name="ALTERNATIVE_JRE_PATH_ENABLED" value="false" />
+      <option name="ALTERNATIVE_JRE_PATH" />
+      <option name="ENABLE_SWING_INSPECTOR" value="false" />
+      <option name="ENV_VARIABLES" />
+      <option name="PASS_PARENT_ENVS" value="true" />
+      <module name="" />
+      <envs />
+      <method>
+        <option name="AntTarget" enabled="false" />
+        <option name="BuildArtifacts" enabled="false" />
+        <option name="Make" enabled="true" />
+        <option name="Maven.BeforeRunTask" enabled="false" />
+      </method>
+    </configuration>
+    <configuration default="true" type="JUnit" factoryName="JUnit">
+      <module name="" />
+      <option name="ALTERNATIVE_JRE_PATH_ENABLED" value="false" />
+      <option name="ALTERNATIVE_JRE_PATH" />
+      <option name="PACKAGE_NAME" />
+      <option name="MAIN_CLASS_NAME" />
+      <option name="METHOD_NAME" />
+      <option name="TEST_OBJECT" value="class" />
+      <option name="VM_PARAMETERS" value="-ea" />
+      <option name="PARAMETERS" />
+      <option name="WORKING_DIRECTORY" value="$PROJECT_DIR$" />
+      <option name="ENV_VARIABLES" />
+      <option name="PASS_PARENT_ENVS" value="true" />
+      <option name="TEST_SEARCH_SCOPE">
+        <value defaultName="moduleWithDependencies" />
+      </option>
+      <envs />
+      <patterns />
+      <method>
+        <option name="AntTarget" enabled="false" />
+        <option name="BuildArtifacts" enabled="false" />
+        <option name="Make" enabled="true" />
+        <option name="Maven.BeforeRunTask" enabled="false" />
+      </method>
+    </configuration>
+    <list size="0" />
+    <configuration name="&lt;template&gt;" type="WebApp" default="true" selected="false">
+      <Host>localhost</Host>
+      <Port>5050</Port>
+    </configuration>
+  </component>
+  <component name="ShelveChangesManager" show_recycled="false" />
+  <component name="TaskManager">
+    <task active="true" id="Default" summary="Default task">
+      <created>1329738171438</created>
+      <updated>1329738171438</updated>
+    </task>
+    <servers />
+  </component>
+  <component name="ToolWindowManager">
+    <frame x="0" y="25" width="1280" height="974" extended-state="0" />
+    <editor active="false" />
+    <layout>
+      <window_info id="Changes" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" sideWeight="0.5" order="-1" side_tool="false" content_ui="tabs" />
+      <window_info id="Palette" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" sideWeight="0.5" order="-1" side_tool="false" content_ui="tabs" />
+      <window_info id="Ant Build" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.25" sideWeight="0.5" order="1" side_tool="false" content_ui="tabs" />
+      <window_info id="Debug" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.4" sideWeight="0.5" order="3" side_tool="false" content_ui="tabs" />
+      <window_info id="Event Log" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" sideWeight="0.5" order="-1" side_tool="true" content_ui="tabs" />
+      <window_info id="Favorites" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" sideWeight="0.5" order="-1" side_tool="true" content_ui="tabs" />
+      <window_info id="Version Control" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" sideWeight="0.5" order="-1" side_tool="false" content_ui="tabs" />
+      <window_info id="TODO" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" sideWeight="0.5" order="6" side_tool="false" content_ui="tabs" />
+      <window_info id="Gradle" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" sideWeight="0.5" order="-1" side_tool="false" content_ui="tabs" />
+      <window_info id="Structure" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.25" sideWeight="0.5" order="1" side_tool="true" content_ui="tabs" />
+      <window_info id="Maven Projects" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" sideWeight="0.5" order="-1" side_tool="false" content_ui="tabs" />
+      <window_info id="Commander" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.4" sideWeight="0.5" order="0" side_tool="false" content_ui="tabs" />
+      <window_info id="Project" active="true" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="true" weight="0.25" sideWeight="0.5" order="0" side_tool="false" content_ui="combo" />
+      <window_info id="Run" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" sideWeight="0.5" order="2" side_tool="false" content_ui="tabs" />
+      <window_info id="Cvs" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.25" sideWeight="0.5" order="4" side_tool="false" content_ui="tabs" />
+      <window_info id="Message" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" sideWeight="0.5" order="0" side_tool="false" content_ui="tabs" />
+      <window_info id="Find" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" sideWeight="0.5" order="1" side_tool="false" content_ui="tabs" />
+      <window_info id="Inspection" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.4" sideWeight="0.5" order="5" side_tool="false" content_ui="tabs" />
+      <window_info id="Hierarchy" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.25" sideWeight="0.5" order="2" side_tool="false" content_ui="combo" />
+    </layout>
+  </component>
+  <component name="VcsContentAnnotationSettings">
+    <option name="myLimit" value="2678400000" />
+  </component>
+  <component name="VcsManagerConfiguration">
+    <option name="OFFER_MOVE_TO_ANOTHER_CHANGELIST_ON_PARTIAL_COMMIT" value="true" />
+    <option name="CHECK_CODE_SMELLS_BEFORE_PROJECT_COMMIT" value="true" />
+    <option name="CHECK_NEW_TODO" value="true" />
+    <option name="myTodoPanelSettings">
+      <value>
+        <are-packages-shown value="false" />
+        <are-modules-shown value="false" />
+        <flatten-packages value="false" />
+        <is-autoscroll-to-source value="false" />
+      </value>
+    </option>
+    <option name="PERFORM_UPDATE_IN_BACKGROUND" value="true" />
+    <option name="PERFORM_COMMIT_IN_BACKGROUND" value="true" />
+    <option name="PERFORM_EDIT_IN_BACKGROUND" value="true" />
+    <option name="PERFORM_CHECKOUT_IN_BACKGROUND" value="true" />
+    <option name="PERFORM_ADD_REMOVE_IN_BACKGROUND" value="true" />
+    <option name="PERFORM_ROLLBACK_IN_BACKGROUND" value="false" />
+    <option name="CHECK_LOCALLY_CHANGED_CONFLICTS_IN_BACKGROUND" value="false" />
+    <option name="ENABLE_BACKGROUND_PROCESSES" value="false" />
+    <option name="CHANGED_ON_SERVER_INTERVAL" value="60" />
+    <option name="SHOW_ONLY_CHANGED_IN_SELECTION_DIFF" value="true" />
+    <option name="CHECK_COMMIT_MESSAGE_SPELLING" value="true" />
+    <option name="DEFAULT_PATCH_EXTENSION" value="patch" />
+    <option name="SHORT_DIFF_HORISONTALLY" value="true" />
+    <option name="SHORT_DIFF_EXTRA_LINES" value="2" />
+    <option name="SOFT_WRAPS_IN_SHORT_DIFF" value="true" />
+    <option name="INCLUDE_TEXT_INTO_PATCH" value="false" />
+    <option name="INCLUDE_TEXT_INTO_SHELF" value="false" />
+    <option name="CREATE_PATCH_EXPAND_DETAILS_DEFAULT" value="true" />
+    <option name="SHOW_FILE_HISTORY_DETAILS" value="true" />
+    <option name="FORCE_NON_EMPTY_COMMENT" value="false" />
+    <option name="LAST_COMMIT_MESSAGE" />
+    <option name="MAKE_NEW_CHANGELIST_ACTIVE" value="false" />
+    <option name="OPTIMIZE_IMPORTS_BEFORE_PROJECT_COMMIT" value="false" />
+    <option name="CHECK_FILES_UP_TO_DATE_BEFORE_COMMIT" value="false" />
+    <option name="REFORMAT_BEFORE_PROJECT_COMMIT" value="false" />
+    <option name="REFORMAT_BEFORE_FILE_COMMIT" value="false" />
+    <option name="FILE_HISTORY_DIALOG_COMMENTS_SPLITTER_PROPORTION" value="0.8" />
+    <option name="FILE_HISTORY_DIALOG_SPLITTER_PROPORTION" value="0.5" />
+    <option name="ACTIVE_VCS_NAME" />
+    <option name="UPDATE_GROUP_BY_PACKAGES" value="false" />
+    <option name="UPDATE_GROUP_BY_CHANGELIST" value="false" />
+    <option name="SHOW_FILE_HISTORY_AS_TREE" value="false" />
+    <option name="FILE_HISTORY_SPLITTER_PROPORTION" value="0.6" />
+  </component>
+  <component name="XDebuggerManager">
+    <breakpoint-manager />
+  </component>
+</project>
+
diff --git a/java/java-tests/testData/compileServer/incremental/classProperties/changeExtends2/ChangeExtends2.iml b/java/java-tests/testData/compileServer/incremental/classProperties/changeExtends2/ChangeExtends2.iml
new file mode 100644
index 000000000000..d5c074327501
--- /dev/null
+++ b/java/java-tests/testData/compileServer/incremental/classProperties/changeExtends2/ChangeExtends2.iml
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<module type="JAVA_MODULE" version="4">
+  <component name="NewModuleRootManager" inherit-compiler-output="true">
+    <exclude-output />
+    <content url="file://$MODULE_DIR$">
+      <sourceFolder url="file://$MODULE_DIR$/src" isTestSource="false" />
+    </content>
+    <orderEntry type="inheritedJdk" />
+    <orderEntry type="sourceFolder" forTests="false" />
+  </component>
+</module>
+
diff --git a/java/java-tests/testData/compileServer/incremental/classProperties/changeExtends2/Victim.java.new b/java/java-tests/testData/compileServer/incremental/classProperties/changeExtends2/Victim.java.new
new file mode 100644
index 000000000000..a7c5c2e41f6c
--- /dev/null
+++ b/java/java-tests/testData/compileServer/incremental/classProperties/changeExtends2/Victim.java.new
@@ -0,0 +1,12 @@
+/**
+ * Created with IntelliJ IDEA.
+ * User: db
+ * Date: 20.02.12
+ * Time: 13:19
+ * To change this template use File | Settings | File Templates.
+ */
+public class Victim extends Super {
+    public static class SubVictim extends Victim {
+
+    }
+}
diff --git a/java/java-tests/testData/compileServer/incremental/classProperties/changeExtends2/src/Main.java b/java/java-tests/testData/compileServer/incremental/classProperties/changeExtends2/src/Main.java
new file mode 100644
index 000000000000..9fdd7c6e7630
--- /dev/null
+++ b/java/java-tests/testData/compileServer/incremental/classProperties/changeExtends2/src/Main.java
@@ -0,0 +1,20 @@
+/**
+ * Created with IntelliJ IDEA.
+ * User: db
+ * Date: 20.02.12
+ * Time: 13:19
+ * To change this template use File | Settings | File Templates.
+ */
+public class Main {
+    static void doMe (final Puper x) {
+        System.out.println("Puper!");
+    }
+
+    static void doMe (final Super x){
+        System.out.println("Super!");
+    }
+
+    public static void main (String[] args){
+        doMe(new Victim.SubVictim());
+    }
+}
diff --git a/java/java-tests/testData/compileServer/incremental/classProperties/changeExtends2/src/Puper.java b/java/java-tests/testData/compileServer/incremental/classProperties/changeExtends2/src/Puper.java
new file mode 100644
index 000000000000..93cca12551e2
--- /dev/null
+++ b/java/java-tests/testData/compileServer/incremental/classProperties/changeExtends2/src/Puper.java
@@ -0,0 +1,9 @@
+/**
+ * Created with IntelliJ IDEA.
+ * User: db
+ * Date: 20.02.12
+ * Time: 13:19
+ * To change this template use File | Settings | File Templates.
+ */
+public class Puper {
+}
diff --git a/java/java-tests/testData/compileServer/incremental/classProperties/changeExtends2/src/Super.java b/java/java-tests/testData/compileServer/incremental/classProperties/changeExtends2/src/Super.java
new file mode 100644
index 000000000000..bd70f5810d9e
--- /dev/null
+++ b/java/java-tests/testData/compileServer/incremental/classProperties/changeExtends2/src/Super.java
@@ -0,0 +1,9 @@
+/**
+ * Created with IntelliJ IDEA.
+ * User: db
+ * Date: 20.02.12
+ * Time: 13:19
+ * To change this template use File | Settings | File Templates.
+ */
+public class Super {
+}
diff --git a/java/java-tests/testData/compileServer/incremental/classProperties/changeExtends2/src/Victim.java b/java/java-tests/testData/compileServer/incremental/classProperties/changeExtends2/src/Victim.java
new file mode 100644
index 000000000000..e871cfb68e65
--- /dev/null
+++ b/java/java-tests/testData/compileServer/incremental/classProperties/changeExtends2/src/Victim.java
@@ -0,0 +1,12 @@
+/**
+ * Created with IntelliJ IDEA.
+ * User: db
+ * Date: 20.02.12
+ * Time: 13:19
+ * To change this template use File | Settings | File Templates.
+ */
+public class Victim extends Puper {
+    public static class SubVictim extends Victim {
+
+    }
+}
diff --git a/java/java-tests/testData/compileServer/incremental/common/class2Interface1/.idea/.name b/java/java-tests/testData/compileServer/incremental/common/class2Interface1/.idea/.name
new file mode 100644
index 000000000000..d71eabd9d364
--- /dev/null
+++ b/java/java-tests/testData/compileServer/incremental/common/class2Interface1/.idea/.name
@@ -0,0 +1 @@
+class2Interface1
\ No newline at end of file
diff --git a/java/java-tests/testData/compileServer/incremental/common/class2Interface2/.idea/.name b/java/java-tests/testData/compileServer/incremental/common/class2Interface2/.idea/.name
new file mode 100644
index 000000000000..f2a34a4958c2
--- /dev/null
+++ b/java/java-tests/testData/compileServer/incremental/common/class2Interface2/.idea/.name
@@ -0,0 +1 @@
+class2Interface2
\ No newline at end of file
diff --git a/java/java-tests/testData/compileServer/incremental/common/class2Interface3/.idea/.name b/java/java-tests/testData/compileServer/incremental/common/class2Interface3/.idea/.name
new file mode 100644
index 000000000000..db229b752d4f
--- /dev/null
+++ b/java/java-tests/testData/compileServer/incremental/common/class2Interface3/.idea/.name
@@ -0,0 +1 @@
+class2Interface3
\ No newline at end of file
diff --git a/java/java-tests/testData/compileServer/incremental/common/deleteClass3.log b/java/java-tests/testData/compileServer/incremental/common/deleteClass3.log
new file mode 100644
index 000000000000..04f0cf660dcc
--- /dev/null
+++ b/java/java-tests/testData/compileServer/incremental/common/deleteClass3.log
@@ -0,0 +1,9 @@
+Cleaning output files:
+out/production/M/A.class
+End of files
+Compiling files:
+M/src/A.java
+End of files
+Cleaning output files:
+out/production/N/C.class
+End of files
diff --git a/java/java-tests/testData/compileServer/incremental/common/deleteClass3/.idea/.name b/java/java-tests/testData/compileServer/incremental/common/deleteClass3/.idea/.name
new file mode 100644
index 000000000000..bcce99bf5402
--- /dev/null
+++ b/java/java-tests/testData/compileServer/incremental/common/deleteClass3/.idea/.name
@@ -0,0 +1 @@
+deleteClass3
\ No newline at end of file
diff --git a/java/java-tests/testData/compileServer/incremental/common/deleteClass3/.idea/compiler.xml b/java/java-tests/testData/compileServer/incremental/common/deleteClass3/.idea/compiler.xml
new file mode 100644
index 000000000000..a1b41c52c724
--- /dev/null
+++ b/java/java-tests/testData/compileServer/incremental/common/deleteClass3/.idea/compiler.xml
@@ -0,0 +1,21 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project version="4">
+  <component name="CompilerConfiguration">
+    <option name="DEFAULT_COMPILER" value="Javac" />
+    <resourceExtensions />
+    <wildcardResourcePatterns>
+      <entry name="?*.properties" />
+      <entry name="?*.xml" />
+      <entry name="?*.gif" />
+      <entry name="?*.png" />
+      <entry name="?*.jpeg" />
+      <entry name="?*.jpg" />
+      <entry name="?*.html" />
+      <entry name="?*.dtd" />
+      <entry name="?*.tld" />
+      <entry name="?*.ftl" />
+    </wildcardResourcePatterns>
+    <annotationProcessing enabled="false" useClasspath="true" />
+  </component>
+</project>
+
diff --git a/java/java-tests/testData/compileServer/incremental/common/deleteClass3/.idea/copyright/profiles_settings.xml b/java/java-tests/testData/compileServer/incremental/common/deleteClass3/.idea/copyright/profiles_settings.xml
new file mode 100644
index 000000000000..3572571ad83c
--- /dev/null
+++ b/java/java-tests/testData/compileServer/incremental/common/deleteClass3/.idea/copyright/profiles_settings.xml
@@ -0,0 +1,5 @@
+<component name="CopyrightManager">
+  <settings default="">
+    <module2copyright />
+  </settings>
+</component>
\ No newline at end of file
diff --git a/java/java-tests/testData/compileServer/incremental/common/deleteClass3/.idea/encodings.xml b/java/java-tests/testData/compileServer/incremental/common/deleteClass3/.idea/encodings.xml
new file mode 100644
index 000000000000..e206d70d8595
--- /dev/null
+++ b/java/java-tests/testData/compileServer/incremental/common/deleteClass3/.idea/encodings.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project version="4">
+  <component name="Encoding" useUTFGuessing="true" native2AsciiForPropertiesFiles="false" />
+</project>
+
diff --git a/java/java-tests/testData/compileServer/incremental/common/deleteClass3/.idea/misc.xml b/java/java-tests/testData/compileServer/incremental/common/deleteClass3/.idea/misc.xml
new file mode 100644
index 000000000000..6798096f372b
--- /dev/null
+++ b/java/java-tests/testData/compileServer/incremental/common/deleteClass3/.idea/misc.xml
@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project version="4">
+  <component name="EntryPointsManager">
+    <entry_points version="2.0" />
+  </component>
+  <component name="ProjectRootManager" version="2" languageLevel="JDK_1_6" assert-keyword="true" jdk-15="true" project-jdk-name="IDEA jdk" project-jdk-type="JavaSDK">
+    <output url="file://$PROJECT_DIR$/out" />
+  </component>
+</project>
+
diff --git a/java/java-tests/testData/compileServer/incremental/common/deleteClass3/.idea/modules.xml b/java/java-tests/testData/compileServer/incremental/common/deleteClass3/.idea/modules.xml
new file mode 100644
index 000000000000..fb0361f6346b
--- /dev/null
+++ b/java/java-tests/testData/compileServer/incremental/common/deleteClass3/.idea/modules.xml
@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project version="4">
+  <component name="ProjectModuleManager">
+    <modules>
+      <module fileurl="file://$PROJECT_DIR$/M/M.iml" filepath="$PROJECT_DIR$/M/M.iml" />
+      <module fileurl="file://$PROJECT_DIR$/N/N.iml" filepath="$PROJECT_DIR$/N/N.iml" />
+    </modules>
+  </component>
+</project>
+
diff --git a/java/java-tests/testData/compileServer/incremental/common/deleteClass3/.idea/scopes/scope_settings.xml b/java/java-tests/testData/compileServer/incremental/common/deleteClass3/.idea/scopes/scope_settings.xml
new file mode 100644
index 000000000000..922003b8433b
--- /dev/null
+++ b/java/java-tests/testData/compileServer/incremental/common/deleteClass3/.idea/scopes/scope_settings.xml
@@ -0,0 +1,5 @@
+<component name="DependencyValidationManager">
+  <state>
+    <option name="SKIP_IMPORT_STATEMENTS" value="false" />
+  </state>
+</component>
\ No newline at end of file
diff --git a/java/java-tests/testData/compileServer/incremental/common/deleteClass3/.idea/uiDesigner.xml b/java/java-tests/testData/compileServer/incremental/common/deleteClass3/.idea/uiDesigner.xml
new file mode 100644
index 000000000000..3b0002030884
--- /dev/null
+++ b/java/java-tests/testData/compileServer/incremental/common/deleteClass3/.idea/uiDesigner.xml
@@ -0,0 +1,125 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project version="4">
+  <component name="Palette2">
+    <group name="Swing">
+      <item class="com.intellij.uiDesigner.HSpacer" tooltip-text="Horizontal Spacer" icon="/com/intellij/uiDesigner/icons/hspacer.png" removable="false" auto-create-binding="false" can-attach-label="false">
+        <default-constraints vsize-policy="1" hsize-policy="6" anchor="0" fill="1" />
+      </item>
+      <item class="com.intellij.uiDesigner.VSpacer" tooltip-text="Vertical Spacer" icon="/com/intellij/uiDesigner/icons/vspacer.png" removable="false" auto-create-binding="false" can-attach-label="false">
+        <default-constraints vsize-policy="6" hsize-policy="1" anchor="0" fill="2" />
+      </item>
+      <item class="javax.swing.JPanel" icon="/com/intellij/uiDesigner/icons/panel.png" removable="false" auto-create-binding="false" can-attach-label="false">
+        <default-constraints vsize-policy="3" hsize-policy="3" anchor="0" fill="3" />
+      </item>
+      <item class="javax.swing.JScrollPane" icon="/com/intellij/uiDesigner/icons/scrollPane.png" removable="false" auto-create-binding="false" can-attach-label="true">
+        <default-constraints vsize-policy="7" hsize-policy="7" anchor="0" fill="3" />
+      </item>
+      <item class="javax.swing.JButton" icon="/com/intellij/uiDesigner/icons/button.png" removable="false" auto-create-binding="true" can-attach-label="false">
+        <default-constraints vsize-policy="0" hsize-policy="3" anchor="0" fill="1" />
+        <initial-values>
+          <property name="text" value="Button" />
+        </initial-values>
+      </item>
+      <item class="javax.swing.JRadioButton" icon="/com/intellij/uiDesigner/icons/radioButton.png" removable="false" auto-create-binding="true" can-attach-label="false">
+        <default-constraints vsize-policy="0" hsize-policy="3" anchor="8" fill="0" />
+        <initial-values>
+          <property name="text" value="RadioButton" />
+        </initial-values>
+      </item>
+      <item class="javax.swing.JCheckBox" icon="/com/intellij/uiDesigner/icons/checkBox.png" removable="false" auto-create-binding="true" can-attach-label="false">
+        <default-constraints vsize-policy="0" hsize-policy="3" anchor="8" fill="0" />
+        <initial-values>
+          <property name="text" value="CheckBox" />
+        </initial-values>
+      </item>
+      <item class="javax.swing.JLabel" icon="/com/intellij/uiDesigner/icons/label.png" removable="false" auto-create-binding="false" can-attach-label="false">
+        <default-constraints vsize-policy="0" hsize-policy="0" anchor="8" fill="0" />
+        <initial-values>
+          <property name="text" value="Label" />
+        </initial-values>
+      </item>
+      <item class="javax.swing.JTextField" icon="/com/intellij/uiDesigner/icons/textField.png" removable="false" auto-create-binding="true" can-attach-label="true">
+        <default-constraints vsize-policy="0" hsize-policy="6" anchor="8" fill="1">
+          <preferred-size width="150" height="-1" />
+        </default-constraints>
+      </item>
+      <item class="javax.swing.JPasswordField" icon="/com/intellij/uiDesigner/icons/passwordField.png" removable="false" auto-create-binding="true" can-attach-label="true">
+        <default-constraints vsize-policy="0" hsize-policy="6" anchor="8" fill="1">
+          <preferred-size width="150" height="-1" />
+        </default-constraints>
+      </item>
+      <item class="javax.swing.JFormattedTextField" icon="/com/intellij/uiDesigner/icons/formattedTextField.png" removable="false" auto-create-binding="true" can-attach-label="true">
+        <default-constraints vsize-policy="0" hsize-policy="6" anchor="8" fill="1">
+          <preferred-size width="150" height="-1" />
+        </default-constraints>
+      </item>
+      <item class="javax.swing.JTextArea" icon="/com/intellij/uiDesigner/icons/textArea.png" removable="false" auto-create-binding="true" can-attach-label="true">
+        <default-constraints vsize-policy="6" hsize-policy="6" anchor="0" fill="3">
+          <preferred-size width="150" height="50" />
+        </default-constraints>
+      </item>
+      <item class="javax.swing.JTextPane" icon="/com/intellij/uiDesigner/icons/textPane.png" removable="false" auto-create-binding="true" can-attach-label="true">
+        <default-constraints vsize-policy="6" hsize-policy="6" anchor="0" fill="3">
+          <preferred-size width="150" height="50" />
+        </default-constraints>
+      </item>
+      <item class="javax.swing.JEditorPane" icon="/com/intellij/uiDesigner/icons/editorPane.png" removable="false" auto-create-binding="true" can-attach-label="true">
+        <default-constraints vsize-policy="6" hsize-policy="6" anchor="0" fill="3">
+          <preferred-size width="150" height="50" />
+        </default-constraints>
+      </item>
+      <item class="javax.swing.JComboBox" icon="/com/intellij/uiDesigner/icons/comboBox.png" removable="false" auto-create-binding="true" can-attach-label="true">
+        <default-constraints vsize-policy="0" hsize-policy="2" anchor="8" fill="1" />
+      </item>
+      <item class="javax.swing.JTable" icon="/com/intellij/uiDesigner/icons/table.png" removable="false" auto-create-binding="true" can-attach-label="false">
+        <default-constraints vsize-policy="6" hsize-policy="6" anchor="0" fill="3">
+          <preferred-size width="150" height="50" />
+        </default-constraints>
+      </item>
+      <item class="javax.swing.JList" icon="/com/intellij/uiDesigner/icons/list.png" removable="false" auto-create-binding="true" can-attach-label="false">
+        <default-constraints vsize-policy="6" hsize-policy="2" anchor="0" fill="3">
+          <preferred-size width="150" height="50" />
+        </default-constraints>
+      </item>
+      <item class="javax.swing.JTree" icon="/com/intellij/uiDesigner/icons/tree.png" removable="false" auto-create-binding="true" can-attach-label="false">
+        <default-constraints vsize-policy="6" hsize-policy="6" anchor="0" fill="3">
+          <preferred-size width="150" height="50" />
+        </default-constraints>
+      </item>
+      <item class="javax.swing.JTabbedPane" icon="/com/intellij/uiDesigner/icons/tabbedPane.png" removable="false" auto-create-binding="true" can-attach-label="false">
+        <default-constraints vsize-policy="3" hsize-policy="3" anchor="0" fill="3">
+          <preferred-size width="200" height="200" />
+        </default-constraints>
+      </item>
+      <item class="javax.swing.JSplitPane" icon="/com/intellij/uiDesigner/icons/splitPane.png" removable="false" auto-create-binding="false" can-attach-label="false">
+        <default-constraints vsize-policy="3" hsize-policy="3" anchor="0" fill="3">
+          <preferred-size width="200" height="200" />
+        </default-constraints>
+      </item>
+      <item class="javax.swing.JSpinner" icon="/com/intellij/uiDesigner/icons/spinner.png" removable="false" auto-create-binding="true" can-attach-label="true">
+        <default-constraints vsize-policy="0" hsize-policy="6" anchor="8" fill="1" />
+      </item>
+      <item class="javax.swing.JSlider" icon="/com/intellij/uiDesigner/icons/slider.png" removable="false" auto-create-binding="true" can-attach-label="false">
+        <default-constraints vsize-policy="0" hsize-policy="6" anchor="8" fill="1" />
+      </item>
+      <item class="javax.swing.JSeparator" icon="/com/intellij/uiDesigner/icons/separator.png" removable="false" auto-create-binding="false" can-attach-label="false">
+        <default-constraints vsize-policy="6" hsize-policy="6" anchor="0" fill="3" />
+      </item>
+      <item class="javax.swing.JProgressBar" icon="/com/intellij/uiDesigner/icons/progressbar.png" removable="false" auto-create-binding="true" can-attach-label="false">
+        <default-constraints vsize-policy="0" hsize-policy="6" anchor="0" fill="1" />
+      </item>
+      <item class="javax.swing.JToolBar" icon="/com/intellij/uiDesigner/icons/toolbar.png" removable="false" auto-create-binding="false" can-attach-label="false">
+        <default-constraints vsize-policy="0" hsize-policy="6" anchor="0" fill="1">
+          <preferred-size width="-1" height="20" />
+        </default-constraints>
+      </item>
+      <item class="javax.swing.JToolBar$Separator" icon="/com/intellij/uiDesigner/icons/toolbarSeparator.png" removable="false" auto-create-binding="false" can-attach-label="false">
+        <default-constraints vsize-policy="0" hsize-policy="0" anchor="0" fill="1" />
+      </item>
+      <item class="javax.swing.JScrollBar" icon="/com/intellij/uiDesigner/icons/scrollbar.png" removable="false" auto-create-binding="true" can-attach-label="false">
+        <default-constraints vsize-policy="6" hsize-policy="0" anchor="0" fill="2" />
+      </item>
+    </group>
+  </component>
+</project>
+
diff --git a/java/java-tests/testData/compileServer/incremental/common/deleteClass3/.idea/vcs.xml b/java/java-tests/testData/compileServer/incremental/common/deleteClass3/.idea/vcs.xml
new file mode 100644
index 000000000000..def6a6a18457
--- /dev/null
+++ b/java/java-tests/testData/compileServer/incremental/common/deleteClass3/.idea/vcs.xml
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project version="4">
+  <component name="VcsDirectoryMappings">
+    <mapping directory="" vcs="" />
+  </component>
+</project>
+
diff --git a/java/java-tests/testData/compileServer/incremental/common/deleteClass3/.idea/workspace.xml b/java/java-tests/testData/compileServer/incremental/common/deleteClass3/.idea/workspace.xml
new file mode 100644
index 000000000000..5463be1e1778
--- /dev/null
+++ b/java/java-tests/testData/compileServer/incremental/common/deleteClass3/.idea/workspace.xml
@@ -0,0 +1,520 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project version="4">
+  <component name="ChangeListManager">
+    <list default="true" id="dd9bc927-d58d-4323-ab6d-ddb385f956df" name="Default" comment="" />
+    <ignored path="deleteClass3.iws" />
+    <ignored path=".idea/workspace.xml" />
+    <option name="TRACKING_ENABLED" value="true" />
+    <option name="SHOW_DIALOG" value="false" />
+    <option name="HIGHLIGHT_CONFLICTS" value="true" />
+    <option name="HIGHLIGHT_NON_ACTIVE_CHANGELIST" value="false" />
+    <option name="LAST_RESOLUTION" value="IGNORE" />
+  </component>
+  <component name="ChangesViewManager" flattened_view="true" show_ignored="false" />
+  <component name="CreatePatchCommitExecutor">
+    <option name="PATCH_PATH" value="" />
+  </component>
+  <component name="DaemonCodeAnalyzer">
+    <disable_hints />
+  </component>
+  <component name="DebuggerManager">
+    <breakpoint_any>
+      <breakpoint>
+        <option name="NOTIFY_CAUGHT" value="true" />
+        <option name="NOTIFY_UNCAUGHT" value="true" />
+        <option name="ENABLED" value="false" />
+        <option name="LOG_ENABLED" value="false" />
+        <option name="LOG_EXPRESSION_ENABLED" value="false" />
+        <option name="SUSPEND_POLICY" value="SuspendAll" />
+        <option name="COUNT_FILTER_ENABLED" value="false" />
+        <option name="COUNT_FILTER" value="0" />
+        <option name="CONDITION_ENABLED" value="false" />
+        <option name="CLASS_FILTERS_ENABLED" value="false" />
+        <option name="INSTANCE_FILTERS_ENABLED" value="false" />
+        <option name="CONDITION" value="" />
+        <option name="LOG_MESSAGE" value="" />
+      </breakpoint>
+      <breakpoint>
+        <option name="NOTIFY_CAUGHT" value="true" />
+        <option name="NOTIFY_UNCAUGHT" value="true" />
+        <option name="ENABLED" value="false" />
+        <option name="LOG_ENABLED" value="false" />
+        <option name="LOG_EXPRESSION_ENABLED" value="false" />
+        <option name="SUSPEND_POLICY" value="SuspendAll" />
+        <option name="COUNT_FILTER_ENABLED" value="false" />
+        <option name="COUNT_FILTER" value="0" />
+        <option name="CONDITION_ENABLED" value="false" />
+        <option name="CLASS_FILTERS_ENABLED" value="false" />
+        <option name="INSTANCE_FILTERS_ENABLED" value="false" />
+        <option name="CONDITION" value="" />
+        <option name="LOG_MESSAGE" value="" />
+      </breakpoint>
+    </breakpoint_any>
+    <breakpoint_rules />
+    <ui_properties />
+  </component>
+  <component name="FavoritesManager">
+    <favorites_list name="deleteClass3" />
+  </component>
+  <component name="FileEditorManager">
+    <leaf>
+      <file leaf-file-name="C.java" pinned="false" current="false" current-in-tab="false">
+        <entry file="file://$PROJECT_DIR$/N/src/C.java">
+          <provider selected="true" editor-type-id="text-editor">
+            <state line="8" column="15" selection-start="181" selection-end="181" vertical-scroll-proportion="0.0">
+              <folding />
+            </state>
+          </provider>
+        </entry>
+      </file>
+      <file leaf-file-name="A.java" pinned="false" current="true" current-in-tab="true">
+        <entry file="file://$PROJECT_DIR$/M/src/A.java">
+          <provider selected="true" editor-type-id="text-editor">
+            <state line="7" column="14" selection-start="163" selection-end="163" vertical-scroll-proportion="0.12727273">
+              <folding />
+            </state>
+          </provider>
+        </entry>
+      </file>
+    </leaf>
+  </component>
+  <component name="FindManager">
+    <FindUsagesManager>
+      <setting name="OPEN_NEW_TAB" value="false" />
+    </FindUsagesManager>
+  </component>
+  <component name="IdeDocumentHistory">
+    <option name="changedFiles">
+      <list>
+        <option value="$PROJECT_DIR$/N/src/C.java" />
+      </list>
+    </option>
+  </component>
+  <component name="ProjectFrameBounds">
+    <option name="x" value="-1" />
+    <option name="y" value="25" />
+    <option name="width" value="1282" />
+    <option name="height" value="979" />
+  </component>
+  <component name="ProjectLevelVcsManager" settingsEditedManually="false">
+    <OptionsSetting value="true" id="Add" />
+    <OptionsSetting value="true" id="Remove" />
+    <OptionsSetting value="true" id="Checkout" />
+    <OptionsSetting value="true" id="Update" />
+    <OptionsSetting value="true" id="Status" />
+    <OptionsSetting value="true" id="Edit" />
+    <ConfirmationsSetting value="0" id="Add" />
+    <ConfirmationsSetting value="0" id="Remove" />
+  </component>
+  <component name="ProjectReloadState">
+    <option name="STATE" value="0" />
+  </component>
+  <component name="ProjectView">
+    <navigator currentView="ProjectPane" proportions="" version="1" splitterProportion="0.5">
+      <flattenPackages />
+      <showMembers />
+      <showModules />
+      <showLibraryContents />
+      <hideEmptyPackages />
+      <abbreviatePackageNames />
+      <autoscrollToSource />
+      <autoscrollFromSource />
+      <sortByType />
+    </navigator>
+    <panes>
+      <pane id="Scope">
+        <subPane subId="Project Files">
+          <PATH>
+            <PATH_ELEMENT USER_OBJECT="Root">
+              <option name="myItemId" value="" />
+              <option name="myItemType" value="" />
+            </PATH_ELEMENT>
+          </PATH>
+        </subPane>
+      </pane>
+      <pane id="ProjectPane">
+        <subPane>
+          <PATH>
+            <PATH_ELEMENT>
+              <option name="myItemId" value="deleteClass3" />
+              <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewProjectNode" />
+            </PATH_ELEMENT>
+          </PATH>
+          <PATH>
+            <PATH_ELEMENT>
+              <option name="myItemId" value="deleteClass3" />
+              <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewProjectNode" />
+            </PATH_ELEMENT>
+            <PATH_ELEMENT>
+              <option name="myItemId" value="N" />
+              <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
+            </PATH_ELEMENT>
+          </PATH>
+          <PATH>
+            <PATH_ELEMENT>
+              <option name="myItemId" value="deleteClass3" />
+              <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewProjectNode" />
+            </PATH_ELEMENT>
+            <PATH_ELEMENT>
+              <option name="myItemId" value="N" />
+              <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
+            </PATH_ELEMENT>
+            <PATH_ELEMENT>
+              <option name="myItemId" value="src" />
+              <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
+            </PATH_ELEMENT>
+          </PATH>
+          <PATH>
+            <PATH_ELEMENT>
+              <option name="myItemId" value="deleteClass3" />
+              <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewProjectNode" />
+            </PATH_ELEMENT>
+            <PATH_ELEMENT>
+              <option name="myItemId" value="M" />
+              <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
+            </PATH_ELEMENT>
+          </PATH>
+          <PATH>
+            <PATH_ELEMENT>
+              <option name="myItemId" value="deleteClass3" />
+              <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewProjectNode" />
+            </PATH_ELEMENT>
+            <PATH_ELEMENT>
+              <option name="myItemId" value="M" />
+              <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
+            </PATH_ELEMENT>
+            <PATH_ELEMENT>
+              <option name="myItemId" value="src" />
+              <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
+            </PATH_ELEMENT>
+          </PATH>
+        </subPane>
+      </pane>
+      <pane id="PackagesPane" />
+    </panes>
+  </component>
+  <component name="PropertiesComponent">
+    <property name="project.structure.last.edited" value="Modules" />
+    <property name="GoToFile.includeJavaFiles" value="false" />
+    <property name="project.structure.proportion" value="0.0" />
+    <property name="GoToClass.toSaveIncludeLibraries" value="false" />
+    <property name="MemberChooser.sorted" value="false" />
+    <property name="MemberChooser.showClasses" value="true" />
+    <property name="project.structure.side.proportion" value="0.0" />
+    <property name="GoToClass.includeLibraries" value="false" />
+    <property name="MemberChooser.copyJavadoc" value="false" />
+  </component>
+  <component name="RunManager">
+    <configuration default="true" type="#org.jetbrains.idea.devkit.run.PluginConfigurationType" factoryName="Plugin">
+      <module name="" />
+      <option name="VM_PARAMETERS" value="-Xmx512m -Xms256m -XX:MaxPermSize=250m" />
+      <option name="PROGRAM_PARAMETERS" />
+      <method>
+        <option name="AntTarget" enabled="false" />
+        <option name="BuildArtifacts" enabled="false" />
+        <option name="Make" enabled="true" />
+        <option name="Maven.BeforeRunTask" enabled="false" />
+      </method>
+    </configuration>
+    <configuration default="true" type="Remote" factoryName="Remote">
+      <option name="USE_SOCKET_TRANSPORT" value="true" />
+      <option name="SERVER_MODE" value="false" />
+      <option name="SHMEM_ADDRESS" value="javadebug" />
+      <option name="HOST" value="localhost" />
+      <option name="PORT" value="5005" />
+      <method>
+        <option name="AntTarget" enabled="false" />
+        <option name="BuildArtifacts" enabled="false" />
+        <option name="Maven.BeforeRunTask" enabled="false" />
+      </method>
+    </configuration>
+    <configuration default="true" type="Applet" factoryName="Applet">
+      <module name="" />
+      <option name="MAIN_CLASS_NAME" />
+      <option name="HTML_FILE_NAME" />
+      <option name="HTML_USED" value="false" />
+      <option name="WIDTH" value="400" />
+      <option name="HEIGHT" value="300" />
+      <option name="POLICY_FILE" value="$APPLICATION_HOME_DIR$/bin/appletviewer.policy" />
+      <option name="VM_PARAMETERS" />
+      <option name="ALTERNATIVE_JRE_PATH_ENABLED" value="false" />
+      <option name="ALTERNATIVE_JRE_PATH" />
+      <method>
+        <option name="AntTarget" enabled="false" />
+        <option name="BuildArtifacts" enabled="false" />
+        <option name="Make" enabled="true" />
+        <option name="Maven.BeforeRunTask" enabled="false" />
+      </method>
+    </configuration>
+    <configuration default="true" type="TestNG" factoryName="TestNG">
+      <module name="" />
+      <option name="ALTERNATIVE_JRE_PATH_ENABLED" value="false" />
+      <option name="ALTERNATIVE_JRE_PATH" />
+      <option name="SUITE_NAME" />
+      <option name="PACKAGE_NAME" />
+      <option name="MAIN_CLASS_NAME" />
+      <option name="METHOD_NAME" />
+      <option name="GROUP_NAME" />
+      <option name="TEST_OBJECT" value="CLASS" />
+      <option name="VM_PARAMETERS" value="-ea" />
+      <option name="PARAMETERS" />
+      <option name="WORKING_DIRECTORY" value="$PROJECT_DIR$" />
+      <option name="OUTPUT_DIRECTORY" />
+      <option name="ANNOTATION_TYPE" />
+      <option name="ENV_VARIABLES" />
+      <option name="PASS_PARENT_ENVS" value="true" />
+      <option name="TEST_SEARCH_SCOPE">
+        <value defaultName="moduleWithDependencies" />
+      </option>
+      <option name="USE_DEFAULT_REPORTERS" value="false" />
+      <option name="PROPERTIES_FILE" />
+      <envs />
+      <properties />
+      <listeners />
+      <method>
+        <option name="AntTarget" enabled="false" />
+        <option name="BuildArtifacts" enabled="false" />
+        <option name="Make" enabled="true" />
+        <option name="Maven.BeforeRunTask" enabled="false" />
+      </method>
+    </configuration>
+    <configuration default="true" type="Application" factoryName="Application">
+      <option name="MAIN_CLASS_NAME" />
+      <option name="VM_PARAMETERS" />
+      <option name="PROGRAM_PARAMETERS" />
+      <option name="WORKING_DIRECTORY" value="$PROJECT_DIR$" />
+      <option name="ALTERNATIVE_JRE_PATH_ENABLED" value="false" />
+      <option name="ALTERNATIVE_JRE_PATH" />
+      <option name="ENABLE_SWING_INSPECTOR" value="false" />
+      <option name="ENV_VARIABLES" />
+      <option name="PASS_PARENT_ENVS" value="true" />
+      <module name="" />
+      <envs />
+      <method>
+        <option name="AntTarget" enabled="false" />
+        <option name="BuildArtifacts" enabled="false" />
+        <option name="Make" enabled="true" />
+        <option name="Maven.BeforeRunTask" enabled="false" />
+      </method>
+    </configuration>
+    <configuration default="true" type="JUnit" factoryName="JUnit">
+      <module name="" />
+      <option name="ALTERNATIVE_JRE_PATH_ENABLED" value="false" />
+      <option name="ALTERNATIVE_JRE_PATH" />
+      <option name="PACKAGE_NAME" />
+      <option name="MAIN_CLASS_NAME" />
+      <option name="METHOD_NAME" />
+      <option name="TEST_OBJECT" value="class" />
+      <option name="VM_PARAMETERS" value="-ea" />
+      <option name="PARAMETERS" />
+      <option name="WORKING_DIRECTORY" value="$PROJECT_DIR$" />
+      <option name="ENV_VARIABLES" />
+      <option name="PASS_PARENT_ENVS" value="true" />
+      <option name="TEST_SEARCH_SCOPE">
+        <value defaultName="moduleWithDependencies" />
+      </option>
+      <envs />
+      <patterns />
+      <method>
+        <option name="AntTarget" enabled="false" />
+        <option name="BuildArtifacts" enabled="false" />
+        <option name="Make" enabled="true" />
+        <option name="Maven.BeforeRunTask" enabled="false" />
+      </method>
+    </configuration>
+    <list size="0" />
+    <configuration name="&lt;template&gt;" type="WebApp" default="true" selected="false">
+      <Host>localhost</Host>
+      <Port>5050</Port>
+    </configuration>
+  </component>
+  <component name="ShelveChangesManager" show_recycled="false" />
+  <component name="TaskManager">
+    <task active="true" id="Default" summary="Default task">
+      <created>1329731107288</created>
+      <updated>1329731107288</updated>
+    </task>
+    <servers />
+  </component>
+  <component name="ToolWindowManager">
+    <frame x="-1" y="25" width="1282" height="979" extended-state="6" />
+    <editor active="true" />
+    <layout>
+      <window_info id="Changes" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" sideWeight="0.5" order="-1" side_tool="false" content_ui="tabs" />
+      <window_info id="Palette" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" sideWeight="0.5" order="-1" side_tool="false" content_ui="tabs" />
+      <window_info id="Ant Build" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.25" sideWeight="0.5" order="1" side_tool="false" content_ui="tabs" />
+      <window_info id="Debug" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.4" sideWeight="0.5" order="3" side_tool="false" content_ui="tabs" />
+      <window_info id="Event Log" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" sideWeight="0.5" order="-1" side_tool="true" content_ui="tabs" />
+      <window_info id="Favorites" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" sideWeight="0.5" order="-1" side_tool="true" content_ui="tabs" />
+      <window_info id="Version Control" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" sideWeight="0.5" order="-1" side_tool="false" content_ui="tabs" />
+      <window_info id="TODO" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" sideWeight="0.5" order="6" side_tool="false" content_ui="tabs" />
+      <window_info id="Gradle" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" sideWeight="0.5" order="-1" side_tool="false" content_ui="tabs" />
+      <window_info id="Structure" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.25" sideWeight="0.5" order="1" side_tool="true" content_ui="tabs" />
+      <window_info id="Maven Projects" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" sideWeight="0.5" order="-1" side_tool="false" content_ui="tabs" />
+      <window_info id="Commander" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.4" sideWeight="0.5" order="0" side_tool="false" content_ui="tabs" />
+      <window_info id="Project" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="true" weight="0.4076175" sideWeight="0.5" order="0" side_tool="false" content_ui="combo" />
+      <window_info id="Run" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" sideWeight="0.5" order="2" side_tool="false" content_ui="tabs" />
+      <window_info id="Cvs" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.25" sideWeight="0.5" order="4" side_tool="false" content_ui="tabs" />
+      <window_info id="Message" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" sideWeight="0.5" order="0" side_tool="false" content_ui="tabs" />
+      <window_info id="Find" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" sideWeight="0.5" order="1" side_tool="false" content_ui="tabs" />
+      <window_info id="Inspection" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.4" sideWeight="0.5" order="5" side_tool="false" content_ui="tabs" />
+      <window_info id="Hierarchy" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.25" sideWeight="0.5" order="2" side_tool="false" content_ui="combo" />
+    </layout>
+  </component>
+  <component name="VcsContentAnnotationSettings">
+    <option name="myLimit" value="2678400000" />
+  </component>
+  <component name="VcsManagerConfiguration">
+    <option name="OFFER_MOVE_TO_ANOTHER_CHANGELIST_ON_PARTIAL_COMMIT" value="true" />
+    <option name="CHECK_CODE_SMELLS_BEFORE_PROJECT_COMMIT" value="true" />
+    <option name="CHECK_NEW_TODO" value="true" />
+    <option name="myTodoPanelSettings">
+      <value>
+        <are-packages-shown value="false" />
+        <are-modules-shown value="false" />
+        <flatten-packages value="false" />
+        <is-autoscroll-to-source value="false" />
+      </value>
+    </option>
+    <option name="PERFORM_UPDATE_IN_BACKGROUND" value="true" />
+    <option name="PERFORM_COMMIT_IN_BACKGROUND" value="true" />
+    <option name="PERFORM_EDIT_IN_BACKGROUND" value="true" />
+    <option name="PERFORM_CHECKOUT_IN_BACKGROUND" value="true" />
+    <option name="PERFORM_ADD_REMOVE_IN_BACKGROUND" value="true" />
+    <option name="PERFORM_ROLLBACK_IN_BACKGROUND" value="false" />
+    <option name="CHECK_LOCALLY_CHANGED_CONFLICTS_IN_BACKGROUND" value="false" />
+    <option name="ENABLE_BACKGROUND_PROCESSES" value="false" />
+    <option name="CHANGED_ON_SERVER_INTERVAL" value="60" />
+    <option name="SHOW_ONLY_CHANGED_IN_SELECTION_DIFF" value="true" />
+    <option name="CHECK_COMMIT_MESSAGE_SPELLING" value="true" />
+    <option name="DEFAULT_PATCH_EXTENSION" value="patch" />
+    <option name="SHORT_DIFF_HORISONTALLY" value="true" />
+    <option name="SHORT_DIFF_EXTRA_LINES" value="2" />
+    <option name="SOFT_WRAPS_IN_SHORT_DIFF" value="true" />
+    <option name="INCLUDE_TEXT_INTO_PATCH" value="false" />
+    <option name="INCLUDE_TEXT_INTO_SHELF" value="false" />
+    <option name="CREATE_PATCH_EXPAND_DETAILS_DEFAULT" value="true" />
+    <option name="SHOW_FILE_HISTORY_DETAILS" value="true" />
+    <option name="FORCE_NON_EMPTY_COMMENT" value="false" />
+    <option name="LAST_COMMIT_MESSAGE" />
+    <option name="MAKE_NEW_CHANGELIST_ACTIVE" value="false" />
+    <option name="OPTIMIZE_IMPORTS_BEFORE_PROJECT_COMMIT" value="false" />
+    <option name="CHECK_FILES_UP_TO_DATE_BEFORE_COMMIT" value="false" />
+    <option name="REFORMAT_BEFORE_PROJECT_COMMIT" value="false" />
+    <option name="REFORMAT_BEFORE_FILE_COMMIT" value="false" />
+    <option name="FILE_HISTORY_DIALOG_COMMENTS_SPLITTER_PROPORTION" value="0.8" />
+    <option name="FILE_HISTORY_DIALOG_SPLITTER_PROPORTION" value="0.5" />
+    <option name="ACTIVE_VCS_NAME" />
+    <option name="UPDATE_GROUP_BY_PACKAGES" value="false" />
+    <option name="UPDATE_GROUP_BY_CHANGELIST" value="false" />
+    <option name="SHOW_FILE_HISTORY_AS_TREE" value="false" />
+    <option name="FILE_HISTORY_SPLITTER_PROPORTION" value="0.6" />
+  </component>
+  <component name="XDebuggerManager">
+    <breakpoint-manager />
+  </component>
+  <component name="editorHistoryManager">
+    <entry file="file://$PROJECT_DIR$/N/src/C.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state line="8" column="15" selection-start="181" selection-end="181" vertical-scroll-proportion="0.0">
+          <folding />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/M/src/A.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state line="7" column="14" selection-start="163" selection-end="163" vertical-scroll-proportion="0.12727273">
+          <folding />
+        </state>
+      </provider>
+    </entry>
+  </component>
+  <component name="masterDetails">
+    <states>
+      <state key="ArtifactsStructureConfigurable.UI">
+        <settings>
+          <artifact-editor />
+          <splitter-proportions>
+            <option name="proportions">
+              <list>
+                <option value="0.2" />
+              </list>
+            </option>
+          </splitter-proportions>
+        </settings>
+      </state>
+      <state key="FacetStructureConfigurable.UI">
+        <settings>
+          <last-edited>No facets are configured</last-edited>
+          <splitter-proportions>
+            <option name="proportions">
+              <list>
+                <option value="0.2" />
+              </list>
+            </option>
+          </splitter-proportions>
+        </settings>
+      </state>
+      <state key="GlobalLibrariesConfigurable.UI">
+        <settings>
+          <last-edited>Gant</last-edited>
+          <splitter-proportions>
+            <option name="proportions">
+              <list>
+                <option value="0.2" />
+              </list>
+            </option>
+          </splitter-proportions>
+        </settings>
+      </state>
+      <state key="JdkListConfigurable.UI">
+        <settings>
+          <last-edited>IDEA jdk</last-edited>
+          <splitter-proportions>
+            <option name="proportions">
+              <list>
+                <option value="0.2" />
+              </list>
+            </option>
+          </splitter-proportions>
+        </settings>
+      </state>
+      <state key="ModuleStructureConfigurable.UI">
+        <settings>
+          <last-edited>N</last-edited>
+          <splitter-proportions>
+            <option name="proportions">
+              <list>
+                <option value="0.2" />
+              </list>
+            </option>
+          </splitter-proportions>
+        </settings>
+      </state>
+      <state key="ProjectJDKs.UI">
+        <settings>
+          <last-edited>IDEA jdk</last-edited>
+          <splitter-proportions>
+            <option name="proportions">
+              <list>
+                <option value="0.20000002" />
+              </list>
+            </option>
+          </splitter-proportions>
+        </settings>
+      </state>
+      <state key="ProjectLibrariesConfigurable.UI">
+        <settings>
+          <splitter-proportions>
+            <option name="proportions">
+              <list>
+                <option value="0.2" />
+              </list>
+            </option>
+          </splitter-proportions>
+        </settings>
+      </state>
+    </states>
+  </component>
+</project>
+
diff --git a/java/java-tests/testData/compileServer/incremental/common/deleteClass3/M-src$A.java.new b/java/java-tests/testData/compileServer/incremental/common/deleteClass3/M-src$A.java.new
new file mode 100644
index 000000000000..16be12862245
--- /dev/null
+++ b/java/java-tests/testData/compileServer/incremental/common/deleteClass3/M-src$A.java.new
@@ -0,0 +1,3 @@
+public class A {
+  public A (int x) {}
+}
\ No newline at end of file
diff --git a/java/java-tests/testData/compileServer/incremental/common/deleteClass3/M/M.iml b/java/java-tests/testData/compileServer/incremental/common/deleteClass3/M/M.iml
new file mode 100644
index 000000000000..d5c074327501
--- /dev/null
+++ b/java/java-tests/testData/compileServer/incremental/common/deleteClass3/M/M.iml
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<module type="JAVA_MODULE" version="4">
+  <component name="NewModuleRootManager" inherit-compiler-output="true">
+    <exclude-output />
+    <content url="file://$MODULE_DIR$">
+      <sourceFolder url="file://$MODULE_DIR$/src" isTestSource="false" />
+    </content>
+    <orderEntry type="inheritedJdk" />
+    <orderEntry type="sourceFolder" forTests="false" />
+  </component>
+</module>
+
diff --git a/java/java-tests/testData/compileServer/incremental/common/deleteClass3/M/src/A.java b/java/java-tests/testData/compileServer/incremental/common/deleteClass3/M/src/A.java
new file mode 100644
index 000000000000..8ee5d39e62ef
--- /dev/null
+++ b/java/java-tests/testData/compileServer/incremental/common/deleteClass3/M/src/A.java
@@ -0,0 +1,9 @@
+/**
+ * Created with IntelliJ IDEA.
+ * User: db
+ * Date: 20.02.12
+ * Time: 12:47
+ * To change this template use File | Settings | File Templates.
+ */
+public class A {
+}
diff --git a/java/java-tests/testData/compileServer/incremental/common/deleteClass3/N-src$C.java.remove b/java/java-tests/testData/compileServer/incremental/common/deleteClass3/N-src$C.java.remove
new file mode 100644
index 000000000000..2995a4d0e749
--- /dev/null
+++ b/java/java-tests/testData/compileServer/incremental/common/deleteClass3/N-src$C.java.remove
@@ -0,0 +1 @@
+dummy
\ No newline at end of file
diff --git a/java/java-tests/testData/compileServer/incremental/common/deleteClass3/N/N.iml b/java/java-tests/testData/compileServer/incremental/common/deleteClass3/N/N.iml
new file mode 100644
index 000000000000..f05dcad075be
--- /dev/null
+++ b/java/java-tests/testData/compileServer/incremental/common/deleteClass3/N/N.iml
@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<module type="JAVA_MODULE" version="4">
+  <component name="NewModuleRootManager" inherit-compiler-output="true">
+    <exclude-output />
+    <content url="file://$MODULE_DIR$">
+      <sourceFolder url="file://$MODULE_DIR$/src" isTestSource="false" />
+    </content>
+    <orderEntry type="inheritedJdk" />
+    <orderEntry type="sourceFolder" forTests="false" />
+    <orderEntry type="module" module-name="M" />
+  </component>
+</module>
+
diff --git a/java/java-tests/testData/compileServer/incremental/common/deleteClass3/N/src/C.java b/java/java-tests/testData/compileServer/incremental/common/deleteClass3/N/src/C.java
new file mode 100644
index 000000000000..4e183225cf08
--- /dev/null
+++ b/java/java-tests/testData/compileServer/incremental/common/deleteClass3/N/src/C.java
@@ -0,0 +1,10 @@
+/**
+ * Created with IntelliJ IDEA.
+ * User: db
+ * Date: 20.02.12
+ * Time: 12:46
+ * To change this template use File | Settings | File Templates.
+ */
+public class C {
+    A a = new A();
+}
diff --git a/java/java-tests/testData/compileServer/incremental/imports/classImport/.idea/.name b/java/java-tests/testData/compileServer/incremental/imports/classImport/.idea/.name
new file mode 100644
index 000000000000..7cbbb5be57eb
--- /dev/null
+++ b/java/java-tests/testData/compileServer/incremental/imports/classImport/.idea/.name
@@ -0,0 +1 @@
+classImport
\ No newline at end of file
diff --git a/java/java-tests/testData/compileServer/incremental/imports/staticImport/.idea/.name b/java/java-tests/testData/compileServer/incremental/imports/staticImport/.idea/.name
new file mode 100644
index 000000000000..847cbd82f5c2
--- /dev/null
+++ b/java/java-tests/testData/compileServer/incremental/imports/staticImport/.idea/.name
@@ -0,0 +1 @@
+staticImport
\ No newline at end of file
diff --git a/java/java-tests/testData/refactoring/extractMethod/DisabledParam.java b/java/java-tests/testData/refactoring/extractMethod/DisabledParam.java
index 64406a7febeb..a64da7565d1e 100644
--- a/java/java-tests/testData/refactoring/extractMethod/DisabledParam.java
+++ b/java/java-tests/testData/refactoring/extractMethod/DisabledParam.java
@@ -1,6 +1,22 @@
+/*
+ * Copyright 2000-2012 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.
+ */
 class Fest {
   public static void main(String[] args) {
     String f = "";
-    <selection>System.out.println(f);</selection>
+    String bar = ""
+    <selection> System.out.println(f + ";" + bar);</selection>
   }
 }
\ No newline at end of file
diff --git a/java/java-tests/testData/refactoring/extractMethod/DisabledParam_after.java b/java/java-tests/testData/refactoring/extractMethod/DisabledParam_after.java
index c25ade46e4d5..c83eb274a692 100644
--- a/java/java-tests/testData/refactoring/extractMethod/DisabledParam_after.java
+++ b/java/java-tests/testData/refactoring/extractMethod/DisabledParam_after.java
@@ -1,11 +1,27 @@
+/*
+ * Copyright 2000-2012 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.
+ */
 class Fest {
   public static void main(String[] args) {
     String f = "";
-      newMethod();
+    String bar = ""
+      newMethod(bar);
   }
 
-    private static void newMethod() {
+    private static void newMethod(String bar) {
         String f = ;
-        System.out.println(f);
+        System.out.println(f + ";" + bar);
     }
 }
\ No newline at end of file
diff --git a/java/java-tests/testSrc/com/intellij/refactoring/ExtractMethodTest.java b/java/java-tests/testSrc/com/intellij/refactoring/ExtractMethodTest.java
index dd534625c829..fba5f90a20fa 100644
--- a/java/java-tests/testSrc/com/intellij/refactoring/ExtractMethodTest.java
+++ b/java/java-tests/testSrc/com/intellij/refactoring/ExtractMethodTest.java
@@ -1,3 +1,18 @@
+/*
+ * Copyright 2000-2012 JetBrains s.r.o.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
 package com.intellij.refactoring;
 
 import com.intellij.JavaTestUtil;
@@ -503,6 +518,10 @@ public class ExtractMethodTest extends LightCodeInsightTestCase {
   }
   
   public void testDisabledParam() throws Exception {
+    doTestDisabledParam();
+  }
+
+  private void doTestDisabledParam() throws PrepareFailedException {
     final CodeStyleSettings settings = CodeStyleSettingsManager.getSettings(getProject());
     settings.ELSE_ON_NEW_LINE = true;
     settings.CATCH_ON_NEW_LINE = myCatchOnNewLine;
diff --git a/jps/jps-builders/proto/jps_remote_proto.proto b/jps/jps-builders/proto/jps_remote_proto.proto
index 03eabce9567f..730a59e33544 100644
--- a/jps/jps-builders/proto/jps_remote_proto.proto
+++ b/jps/jps-builders/proto/jps_remote_proto.proto
@@ -10,6 +10,11 @@ message Message {
     required sint64 least_sig_bits = 2;
   }
 
+  message KeyValuePair {
+    required string key = 1;
+    required string value = 2;
+  }
+
   enum Type {
     REQUEST = 1;
     RESPONSE = 2;
@@ -44,6 +49,7 @@ message Message {
       repeated string module_name = 3;
       repeated string file_path = 4;
       repeated string artifact_name = 5;
+      repeated KeyValuePair builder_parameter = 6;
     }
 
     message ShutdownCommand {
@@ -56,11 +62,6 @@ message Message {
 
     message SetupCommand {
 
-      message PathVariable {
-        required string name = 1;
-        required string value = 2;
-      }
-
       message GlobalLibrary {
         required string name = 1;
         optional string homePath = 2;
@@ -69,7 +70,7 @@ message Message {
         repeated string path = 5;
       }
 
-      repeated PathVariable path_variable = 1;
+      repeated KeyValuePair path_variable = 1;
       repeated GlobalLibrary global_library = 2;
       optional string global_encoding = 3;
     }
diff --git a/jps/jps-builders/src/org/jetbrains/jps/api/JpsRemoteProto.java b/jps/jps-builders/src/org/jetbrains/jps/api/JpsRemoteProto.java
index cf6dd424fbba..424a1ef5e08c 100644
--- a/jps/jps-builders/src/org/jetbrains/jps/api/JpsRemoteProto.java
+++ b/jps/jps-builders/src/org/jetbrains/jps/api/JpsRemoteProto.java
@@ -359,6 +359,305 @@ public final class JpsRemoteProto {
       // @@protoc_insertion_point(class_scope:org.jetbrains.jpsservice.Message.UUID)
     }
     
+    public static final class KeyValuePair extends
+        com.google.protobuf.GeneratedMessageLite {
+      // Use KeyValuePair.newBuilder() to construct.
+      private KeyValuePair() {
+        initFields();
+      }
+      private KeyValuePair(boolean noInit) {}
+      
+      private static final KeyValuePair defaultInstance;
+      public static KeyValuePair getDefaultInstance() {
+        return defaultInstance;
+      }
+      
+      public KeyValuePair getDefaultInstanceForType() {
+        return defaultInstance;
+      }
+      
+      // required string key = 1;
+      public static final int KEY_FIELD_NUMBER = 1;
+      private boolean hasKey;
+      private java.lang.String key_ = "";
+      public boolean hasKey() { return hasKey; }
+      public java.lang.String getKey() { return key_; }
+      
+      // required string value = 2;
+      public static final int VALUE_FIELD_NUMBER = 2;
+      private boolean hasValue;
+      private java.lang.String value_ = "";
+      public boolean hasValue() { return hasValue; }
+      public java.lang.String getValue() { return value_; }
+      
+      private void initFields() {
+      }
+      public final boolean isInitialized() {
+        if (!hasKey) return false;
+        if (!hasValue) return false;
+        return true;
+      }
+      
+      public void writeTo(com.google.protobuf.CodedOutputStream output)
+                          throws java.io.IOException {
+        getSerializedSize();
+        if (hasKey()) {
+          output.writeString(1, getKey());
+        }
+        if (hasValue()) {
+          output.writeString(2, getValue());
+        }
+      }
+      
+      private int memoizedSerializedSize = -1;
+      public int getSerializedSize() {
+        int size = memoizedSerializedSize;
+        if (size != -1) return size;
+      
+        size = 0;
+        if (hasKey()) {
+          size += com.google.protobuf.CodedOutputStream
+            .computeStringSize(1, getKey());
+        }
+        if (hasValue()) {
+          size += com.google.protobuf.CodedOutputStream
+            .computeStringSize(2, getValue());
+        }
+        memoizedSerializedSize = size;
+        return size;
+      }
+      
+      public static org.jetbrains.jps.api.JpsRemoteProto.Message.KeyValuePair parseFrom(
+          com.google.protobuf.ByteString data)
+          throws com.google.protobuf.InvalidProtocolBufferException {
+        return newBuilder().mergeFrom(data).buildParsed();
+      }
+      public static org.jetbrains.jps.api.JpsRemoteProto.Message.KeyValuePair parseFrom(
+          com.google.protobuf.ByteString data,
+          com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+          throws com.google.protobuf.InvalidProtocolBufferException {
+        return newBuilder().mergeFrom(data, extensionRegistry)
+                 .buildParsed();
+      }
+      public static org.jetbrains.jps.api.JpsRemoteProto.Message.KeyValuePair parseFrom(byte[] data)
+          throws com.google.protobuf.InvalidProtocolBufferException {
+        return newBuilder().mergeFrom(data).buildParsed();
+      }
+      public static org.jetbrains.jps.api.JpsRemoteProto.Message.KeyValuePair parseFrom(
+          byte[] data,
+          com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+          throws com.google.protobuf.InvalidProtocolBufferException {
+        return newBuilder().mergeFrom(data, extensionRegistry)
+                 .buildParsed();
+      }
+      public static org.jetbrains.jps.api.JpsRemoteProto.Message.KeyValuePair parseFrom(java.io.InputStream input)
+          throws java.io.IOException {
+        return newBuilder().mergeFrom(input).buildParsed();
+      }
+      public static org.jetbrains.jps.api.JpsRemoteProto.Message.KeyValuePair parseFrom(
+          java.io.InputStream input,
+          com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+          throws java.io.IOException {
+        return newBuilder().mergeFrom(input, extensionRegistry)
+                 .buildParsed();
+      }
+      public static org.jetbrains.jps.api.JpsRemoteProto.Message.KeyValuePair parseDelimitedFrom(java.io.InputStream input)
+          throws java.io.IOException {
+        Builder builder = newBuilder();
+        if (builder.mergeDelimitedFrom(input)) {
+          return builder.buildParsed();
+        } else {
+          return null;
+        }
+      }
+      public static org.jetbrains.jps.api.JpsRemoteProto.Message.KeyValuePair parseDelimitedFrom(
+          java.io.InputStream input,
+          com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+          throws java.io.IOException {
+        Builder builder = newBuilder();
+        if (builder.mergeDelimitedFrom(input, extensionRegistry)) {
+          return builder.buildParsed();
+        } else {
+          return null;
+        }
+      }
+      public static org.jetbrains.jps.api.JpsRemoteProto.Message.KeyValuePair parseFrom(
+          com.google.protobuf.CodedInputStream input)
+          throws java.io.IOException {
+        return newBuilder().mergeFrom(input).buildParsed();
+      }
+      public static org.jetbrains.jps.api.JpsRemoteProto.Message.KeyValuePair parseFrom(
+          com.google.protobuf.CodedInputStream input,
+          com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+          throws java.io.IOException {
+        return newBuilder().mergeFrom(input, extensionRegistry)
+                 .buildParsed();
+      }
+      
+      public static Builder newBuilder() { return Builder.create(); }
+      public Builder newBuilderForType() { return newBuilder(); }
+      public static Builder newBuilder(org.jetbrains.jps.api.JpsRemoteProto.Message.KeyValuePair prototype) {
+        return newBuilder().mergeFrom(prototype);
+      }
+      public Builder toBuilder() { return newBuilder(this); }
+      
+      public static final class Builder extends
+          com.google.protobuf.GeneratedMessageLite.Builder<
+            org.jetbrains.jps.api.JpsRemoteProto.Message.KeyValuePair, Builder> {
+        private org.jetbrains.jps.api.JpsRemoteProto.Message.KeyValuePair result;
+        
+        // Construct using org.jetbrains.jps.api.JpsRemoteProto.Message.KeyValuePair.newBuilder()
+        private Builder() {}
+        
+        private static Builder create() {
+          Builder builder = new Builder();
+          builder.result = new org.jetbrains.jps.api.JpsRemoteProto.Message.KeyValuePair();
+          return builder;
+        }
+        
+        protected org.jetbrains.jps.api.JpsRemoteProto.Message.KeyValuePair internalGetResult() {
+          return result;
+        }
+        
+        public Builder clear() {
+          if (result == null) {
+            throw new IllegalStateException(
+              "Cannot call clear() after build().");
+          }
+          result = new org.jetbrains.jps.api.JpsRemoteProto.Message.KeyValuePair();
+          return this;
+        }
+        
+        public Builder clone() {
+          return create().mergeFrom(result);
+        }
+        
+        public org.jetbrains.jps.api.JpsRemoteProto.Message.KeyValuePair getDefaultInstanceForType() {
+          return org.jetbrains.jps.api.JpsRemoteProto.Message.KeyValuePair.getDefaultInstance();
+        }
+        
+        public boolean isInitialized() {
+          return result.isInitialized();
+        }
+        public org.jetbrains.jps.api.JpsRemoteProto.Message.KeyValuePair build() {
+          if (result != null && !isInitialized()) {
+            throw newUninitializedMessageException(result);
+          }
+          return buildPartial();
+        }
+        
+        private org.jetbrains.jps.api.JpsRemoteProto.Message.KeyValuePair buildParsed()
+            throws com.google.protobuf.InvalidProtocolBufferException {
+          if (!isInitialized()) {
+            throw newUninitializedMessageException(
+              result).asInvalidProtocolBufferException();
+          }
+          return buildPartial();
+        }
+        
+        public org.jetbrains.jps.api.JpsRemoteProto.Message.KeyValuePair buildPartial() {
+          if (result == null) {
+            throw new IllegalStateException(
+              "build() has already been called on this Builder.");
+          }
+          org.jetbrains.jps.api.JpsRemoteProto.Message.KeyValuePair returnMe = result;
+          result = null;
+          return returnMe;
+        }
+        
+        public Builder mergeFrom(org.jetbrains.jps.api.JpsRemoteProto.Message.KeyValuePair other) {
+          if (other == org.jetbrains.jps.api.JpsRemoteProto.Message.KeyValuePair.getDefaultInstance()) return this;
+          if (other.hasKey()) {
+            setKey(other.getKey());
+          }
+          if (other.hasValue()) {
+            setValue(other.getValue());
+          }
+          return this;
+        }
+        
+        public Builder mergeFrom(
+            com.google.protobuf.CodedInputStream input,
+            com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+            throws java.io.IOException {
+          while (true) {
+            int tag = input.readTag();
+            switch (tag) {
+              case 0:
+                return this;
+              default: {
+                if (!parseUnknownField(input, extensionRegistry, tag)) {
+                  return this;
+                }
+                break;
+              }
+              case 10: {
+                setKey(input.readString());
+                break;
+              }
+              case 18: {
+                setValue(input.readString());
+                break;
+              }
+            }
+          }
+        }
+        
+        
+        // required string key = 1;
+        public boolean hasKey() {
+          return result.hasKey();
+        }
+        public java.lang.String getKey() {
+          return result.getKey();
+        }
+        public Builder setKey(java.lang.String value) {
+          if (value == null) {
+    throw new NullPointerException();
+  }
+  result.hasKey = true;
+          result.key_ = value;
+          return this;
+        }
+        public Builder clearKey() {
+          result.hasKey = false;
+          result.key_ = getDefaultInstance().getKey();
+          return this;
+        }
+        
+        // required string value = 2;
+        public boolean hasValue() {
+          return result.hasValue();
+        }
+        public java.lang.String getValue() {
+          return result.getValue();
+        }
+        public Builder setValue(java.lang.String value) {
+          if (value == null) {
+    throw new NullPointerException();
+  }
+  result.hasValue = true;
+          result.value_ = value;
+          return this;
+        }
+        public Builder clearValue() {
+          result.hasValue = false;
+          result.value_ = getDefaultInstance().getValue();
+          return this;
+        }
+        
+        // @@protoc_insertion_point(builder_scope:org.jetbrains.jpsservice.Message.KeyValuePair)
+      }
+      
+      static {
+        defaultInstance = new KeyValuePair(true);
+        org.jetbrains.jps.api.JpsRemoteProto.internalForceInit();
+        defaultInstance.initFields();
+      }
+      
+      // @@protoc_insertion_point(class_scope:org.jetbrains.jpsservice.Message.KeyValuePair)
+    }
+    
     public static final class Failure extends
         com.google.protobuf.GeneratedMessageLite {
       // Use Failure.newBuilder() to construct.
@@ -869,11 +1168,26 @@ public final class JpsRemoteProto {
           return artifactName_.get(index);
         }
         
+        // repeated .org.jetbrains.jpsservice.Message.KeyValuePair builder_parameter = 6;
+        public static final int BUILDER_PARAMETER_FIELD_NUMBER = 6;
+        private java.util.List<org.jetbrains.jps.api.JpsRemoteProto.Message.KeyValuePair> builderParameter_ =
+          java.util.Collections.emptyList();
+        public java.util.List<org.jetbrains.jps.api.JpsRemoteProto.Message.KeyValuePair> getBuilderParameterList() {
+          return builderParameter_;
+        }
+        public int getBuilderParameterCount() { return builderParameter_.size(); }
+        public org.jetbrains.jps.api.JpsRemoteProto.Message.KeyValuePair getBuilderParameter(int index) {
+          return builderParameter_.get(index);
+        }
+        
         private void initFields() {
           commandType_ = org.jetbrains.jps.api.JpsRemoteProto.Message.Request.CompilationRequest.Type.REBUILD;
         }
         public final boolean isInitialized() {
           if (!hasCommandType) return false;
+          for (org.jetbrains.jps.api.JpsRemoteProto.Message.KeyValuePair element : getBuilderParameterList()) {
+            if (!element.isInitialized()) return false;
+          }
           return true;
         }
         
@@ -895,6 +1209,9 @@ public final class JpsRemoteProto {
           for (java.lang.String element : getArtifactNameList()) {
             output.writeString(5, element);
           }
+          for (org.jetbrains.jps.api.JpsRemoteProto.Message.KeyValuePair element : getBuilderParameterList()) {
+            output.writeMessage(6, element);
+          }
         }
         
         private int memoizedSerializedSize = -1;
@@ -938,6 +1255,10 @@ public final class JpsRemoteProto {
             size += dataSize;
             size += 1 * getArtifactNameList().size();
           }
+          for (org.jetbrains.jps.api.JpsRemoteProto.Message.KeyValuePair element : getBuilderParameterList()) {
+            size += com.google.protobuf.CodedOutputStream
+              .computeMessageSize(6, element);
+          }
           memoizedSerializedSize = size;
           return size;
         }
@@ -1087,6 +1408,10 @@ public final class JpsRemoteProto {
               result.artifactName_ =
                 java.util.Collections.unmodifiableList(result.artifactName_);
             }
+            if (result.builderParameter_ != java.util.Collections.EMPTY_LIST) {
+              result.builderParameter_ =
+                java.util.Collections.unmodifiableList(result.builderParameter_);
+            }
             org.jetbrains.jps.api.JpsRemoteProto.Message.Request.CompilationRequest returnMe = result;
             result = null;
             return returnMe;
@@ -1118,6 +1443,12 @@ public final class JpsRemoteProto {
               }
               result.artifactName_.addAll(other.artifactName_);
             }
+            if (!other.builderParameter_.isEmpty()) {
+              if (result.builderParameter_.isEmpty()) {
+                result.builderParameter_ = new java.util.ArrayList<org.jetbrains.jps.api.JpsRemoteProto.Message.KeyValuePair>();
+              }
+              result.builderParameter_.addAll(other.builderParameter_);
+            }
             return this;
           }
           
@@ -1160,6 +1491,12 @@ public final class JpsRemoteProto {
                   addArtifactName(input.readString());
                   break;
                 }
+                case 50: {
+                  org.jetbrains.jps.api.JpsRemoteProto.Message.KeyValuePair.Builder subBuilder = org.jetbrains.jps.api.JpsRemoteProto.Message.KeyValuePair.newBuilder();
+                  input.readMessage(subBuilder, extensionRegistry);
+                  addBuilderParameter(subBuilder.buildPartial());
+                  break;
+                }
               }
             }
           }
@@ -1327,6 +1664,57 @@ public final class JpsRemoteProto {
             return this;
           }
           
+          // repeated .org.jetbrains.jpsservice.Message.KeyValuePair builder_parameter = 6;
+          public java.util.List<org.jetbrains.jps.api.JpsRemoteProto.Message.KeyValuePair> getBuilderParameterList() {
+            return java.util.Collections.unmodifiableList(result.builderParameter_);
+          }
+          public int getBuilderParameterCount() {
+            return result.getBuilderParameterCount();
+          }
+          public org.jetbrains.jps.api.JpsRemoteProto.Message.KeyValuePair getBuilderParameter(int index) {
+            return result.getBuilderParameter(index);
+          }
+          public Builder setBuilderParameter(int index, org.jetbrains.jps.api.JpsRemoteProto.Message.KeyValuePair value) {
+            if (value == null) {
+              throw new NullPointerException();
+            }
+            result.builderParameter_.set(index, value);
+            return this;
+          }
+          public Builder setBuilderParameter(int index, org.jetbrains.jps.api.JpsRemoteProto.Message.KeyValuePair.Builder builderForValue) {
+            result.builderParameter_.set(index, builderForValue.build());
+            return this;
+          }
+          public Builder addBuilderParameter(org.jetbrains.jps.api.JpsRemoteProto.Message.KeyValuePair value) {
+            if (value == null) {
+              throw new NullPointerException();
+            }
+            if (result.builderParameter_.isEmpty()) {
+              result.builderParameter_ = new java.util.ArrayList<org.jetbrains.jps.api.JpsRemoteProto.Message.KeyValuePair>();
+            }
+            result.builderParameter_.add(value);
+            return this;
+          }
+          public Builder addBuilderParameter(org.jetbrains.jps.api.JpsRemoteProto.Message.KeyValuePair.Builder builderForValue) {
+            if (result.builderParameter_.isEmpty()) {
+              result.builderParameter_ = new java.util.ArrayList<org.jetbrains.jps.api.JpsRemoteProto.Message.KeyValuePair>();
+            }
+            result.builderParameter_.add(builderForValue.build());
+            return this;
+          }
+          public Builder addAllBuilderParameter(
+              java.lang.Iterable<? extends org.jetbrains.jps.api.JpsRemoteProto.Message.KeyValuePair> values) {
+            if (result.builderParameter_.isEmpty()) {
+              result.builderParameter_ = new java.util.ArrayList<org.jetbrains.jps.api.JpsRemoteProto.Message.KeyValuePair>();
+            }
+            super.addAll(values, result.builderParameter_);
+            return this;
+          }
+          public Builder clearBuilderParameter() {
+            result.builderParameter_ = java.util.Collections.emptyList();
+            return this;
+          }
+          
           // @@protoc_insertion_point(builder_scope:org.jetbrains.jpsservice.Message.Request.CompilationRequest)
         }
         
@@ -1656,305 +2044,6 @@ public final class JpsRemoteProto {
           return defaultInstance;
         }
         
-        public static final class PathVariable extends
-            com.google.protobuf.GeneratedMessageLite {
-          // Use PathVariable.newBuilder() to construct.
-          private PathVariable() {
-            initFields();
-          }
-          private PathVariable(boolean noInit) {}
-          
-          private static final PathVariable defaultInstance;
-          public static PathVariable getDefaultInstance() {
-            return defaultInstance;
-          }
-          
-          public PathVariable getDefaultInstanceForType() {
-            return defaultInstance;
-          }
-          
-          // required string name = 1;
-          public static final int NAME_FIELD_NUMBER = 1;
-          private boolean hasName;
-          private java.lang.String name_ = "";
-          public boolean hasName() { return hasName; }
-          public java.lang.String getName() { return name_; }
-          
-          // required string value = 2;
-          public static final int VALUE_FIELD_NUMBER = 2;
-          private boolean hasValue;
-          private java.lang.String value_ = "";
-          public boolean hasValue() { return hasValue; }
-          public java.lang.String getValue() { return value_; }
-          
-          private void initFields() {
-          }
-          public final boolean isInitialized() {
-            if (!hasName) return false;
-            if (!hasValue) return false;
-            return true;
-          }
-          
-          public void writeTo(com.google.protobuf.CodedOutputStream output)
-                              throws java.io.IOException {
-            getSerializedSize();
-            if (hasName()) {
-              output.writeString(1, getName());
-            }
-            if (hasValue()) {
-              output.writeString(2, getValue());
-            }
-          }
-          
-          private int memoizedSerializedSize = -1;
-          public int getSerializedSize() {
-            int size = memoizedSerializedSize;
-            if (size != -1) return size;
-          
-            size = 0;
-            if (hasName()) {
-              size += com.google.protobuf.CodedOutputStream
-                .computeStringSize(1, getName());
-            }
-            if (hasValue()) {
-              size += com.google.protobuf.CodedOutputStream
-                .computeStringSize(2, getValue());
-            }
-            memoizedSerializedSize = size;
-            return size;
-          }
-          
-          public static org.jetbrains.jps.api.JpsRemoteProto.Message.Request.SetupCommand.PathVariable parseFrom(
-              com.google.protobuf.ByteString data)
-              throws com.google.protobuf.InvalidProtocolBufferException {
-            return newBuilder().mergeFrom(data).buildParsed();
-          }
-          public static org.jetbrains.jps.api.JpsRemoteProto.Message.Request.SetupCommand.PathVariable parseFrom(
-              com.google.protobuf.ByteString data,
-              com.google.protobuf.ExtensionRegistryLite extensionRegistry)
-              throws com.google.protobuf.InvalidProtocolBufferException {
-            return newBuilder().mergeFrom(data, extensionRegistry)
-                     .buildParsed();
-          }
-          public static org.jetbrains.jps.api.JpsRemoteProto.Message.Request.SetupCommand.PathVariable parseFrom(byte[] data)
-              throws com.google.protobuf.InvalidProtocolBufferException {
-            return newBuilder().mergeFrom(data).buildParsed();
-          }
-          public static org.jetbrains.jps.api.JpsRemoteProto.Message.Request.SetupCommand.PathVariable parseFrom(
-              byte[] data,
-              com.google.protobuf.ExtensionRegistryLite extensionRegistry)
-              throws com.google.protobuf.InvalidProtocolBufferException {
-            return newBuilder().mergeFrom(data, extensionRegistry)
-                     .buildParsed();
-          }
-          public static org.jetbrains.jps.api.JpsRemoteProto.Message.Request.SetupCommand.PathVariable parseFrom(java.io.InputStream input)
-              throws java.io.IOException {
-            return newBuilder().mergeFrom(input).buildParsed();
-          }
-          public static org.jetbrains.jps.api.JpsRemoteProto.Message.Request.SetupCommand.PathVariable parseFrom(
-              java.io.InputStream input,
-              com.google.protobuf.ExtensionRegistryLite extensionRegistry)
-              throws java.io.IOException {
-            return newBuilder().mergeFrom(input, extensionRegistry)
-                     .buildParsed();
-          }
-          public static org.jetbrains.jps.api.JpsRemoteProto.Message.Request.SetupCommand.PathVariable parseDelimitedFrom(java.io.InputStream input)
-              throws java.io.IOException {
-            Builder builder = newBuilder();
-            if (builder.mergeDelimitedFrom(input)) {
-              return builder.buildParsed();
-            } else {
-              return null;
-            }
-          }
-          public static org.jetbrains.jps.api.JpsRemoteProto.Message.Request.SetupCommand.PathVariable parseDelimitedFrom(
-              java.io.InputStream input,
-              com.google.protobuf.ExtensionRegistryLite extensionRegistry)
-              throws java.io.IOException {
-            Builder builder = newBuilder();
-            if (builder.mergeDelimitedFrom(input, extensionRegistry)) {
-              return builder.buildParsed();
-            } else {
-              return null;
-            }
-          }
-          public static org.jetbrains.jps.api.JpsRemoteProto.Message.Request.SetupCommand.PathVariable parseFrom(
-              com.google.protobuf.CodedInputStream input)
-              throws java.io.IOException {
-            return newBuilder().mergeFrom(input).buildParsed();
-          }
-          public static org.jetbrains.jps.api.JpsRemoteProto.Message.Request.SetupCommand.PathVariable parseFrom(
-              com.google.protobuf.CodedInputStream input,
-              com.google.protobuf.ExtensionRegistryLite extensionRegistry)
-              throws java.io.IOException {
-            return newBuilder().mergeFrom(input, extensionRegistry)
-                     .buildParsed();
-          }
-          
-          public static Builder newBuilder() { return Builder.create(); }
-          public Builder newBuilderForType() { return newBuilder(); }
-          public static Builder newBuilder(org.jetbrains.jps.api.JpsRemoteProto.Message.Request.SetupCommand.PathVariable prototype) {
-            return newBuilder().mergeFrom(prototype);
-          }
-          public Builder toBuilder() { return newBuilder(this); }
-          
-          public static final class Builder extends
-              com.google.protobuf.GeneratedMessageLite.Builder<
-                org.jetbrains.jps.api.JpsRemoteProto.Message.Request.SetupCommand.PathVariable, Builder> {
-            private org.jetbrains.jps.api.JpsRemoteProto.Message.Request.SetupCommand.PathVariable result;
-            
-            // Construct using org.jetbrains.jps.api.JpsRemoteProto.Message.Request.SetupCommand.PathVariable.newBuilder()
-            private Builder() {}
-            
-            private static Builder create() {
-              Builder builder = new Builder();
-              builder.result = new org.jetbrains.jps.api.JpsRemoteProto.Message.Request.SetupCommand.PathVariable();
-              return builder;
-            }
-            
-            protected org.jetbrains.jps.api.JpsRemoteProto.Message.Request.SetupCommand.PathVariable internalGetResult() {
-              return result;
-            }
-            
-            public Builder clear() {
-              if (result == null) {
-                throw new IllegalStateException(
-                  "Cannot call clear() after build().");
-              }
-              result = new org.jetbrains.jps.api.JpsRemoteProto.Message.Request.SetupCommand.PathVariable();
-              return this;
-            }
-            
-            public Builder clone() {
-              return create().mergeFrom(result);
-            }
-            
-            public org.jetbrains.jps.api.JpsRemoteProto.Message.Request.SetupCommand.PathVariable getDefaultInstanceForType() {
-              return org.jetbrains.jps.api.JpsRemoteProto.Message.Request.SetupCommand.PathVariable.getDefaultInstance();
-            }
-            
-            public boolean isInitialized() {
-              return result.isInitialized();
-            }
-            public org.jetbrains.jps.api.JpsRemoteProto.Message.Request.SetupCommand.PathVariable build() {
-              if (result != null && !isInitialized()) {
-                throw newUninitializedMessageException(result);
-              }
-              return buildPartial();
-            }
-            
-            private org.jetbrains.jps.api.JpsRemoteProto.Message.Request.SetupCommand.PathVariable buildParsed()
-                throws com.google.protobuf.InvalidProtocolBufferException {
-              if (!isInitialized()) {
-                throw newUninitializedMessageException(
-                  result).asInvalidProtocolBufferException();
-              }
-              return buildPartial();
-            }
-            
-            public org.jetbrains.jps.api.JpsRemoteProto.Message.Request.SetupCommand.PathVariable buildPartial() {
-              if (result == null) {
-                throw new IllegalStateException(
-                  "build() has already been called on this Builder.");
-              }
-              org.jetbrains.jps.api.JpsRemoteProto.Message.Request.SetupCommand.PathVariable returnMe = result;
-              result = null;
-              return returnMe;
-            }
-            
-            public Builder mergeFrom(org.jetbrains.jps.api.JpsRemoteProto.Message.Request.SetupCommand.PathVariable other) {
-              if (other == org.jetbrains.jps.api.JpsRemoteProto.Message.Request.SetupCommand.PathVariable.getDefaultInstance()) return this;
-              if (other.hasName()) {
-                setName(other.getName());
-              }
-              if (other.hasValue()) {
-                setValue(other.getValue());
-              }
-              return this;
-            }
-            
-            public Builder mergeFrom(
-                com.google.protobuf.CodedInputStream input,
-                com.google.protobuf.ExtensionRegistryLite extensionRegistry)
-                throws java.io.IOException {
-              while (true) {
-                int tag = input.readTag();
-                switch (tag) {
-                  case 0:
-                    return this;
-                  default: {
-                    if (!parseUnknownField(input, extensionRegistry, tag)) {
-                      return this;
-                    }
-                    break;
-                  }
-                  case 10: {
-                    setName(input.readString());
-                    break;
-                  }
-                  case 18: {
-                    setValue(input.readString());
-                    break;
-                  }
-                }
-              }
-            }
-            
-            
-            // required string name = 1;
-            public boolean hasName() {
-              return result.hasName();
-            }
-            public java.lang.String getName() {
-              return result.getName();
-            }
-            public Builder setName(java.lang.String value) {
-              if (value == null) {
-    throw new NullPointerException();
-  }
-  result.hasName = true;
-              result.name_ = value;
-              return this;
-            }
-            public Builder clearName() {
-              result.hasName = false;
-              result.name_ = getDefaultInstance().getName();
-              return this;
-            }
-            
-            // required string value = 2;
-            public boolean hasValue() {
-              return result.hasValue();
-            }
-            public java.lang.String getValue() {
-              return result.getValue();
-            }
-            public Builder setValue(java.lang.String value) {
-              if (value == null) {
-    throw new NullPointerException();
-  }
-  result.hasValue = true;
-              result.value_ = value;
-              return this;
-            }
-            public Builder clearValue() {
-              result.hasValue = false;
-              result.value_ = getDefaultInstance().getValue();
-              return this;
-            }
-            
-            // @@protoc_insertion_point(builder_scope:org.jetbrains.jpsservice.Message.Request.SetupCommand.PathVariable)
-          }
-          
-          static {
-            defaultInstance = new PathVariable(true);
-            org.jetbrains.jps.api.JpsRemoteProto.internalForceInit();
-            defaultInstance.initFields();
-          }
-          
-          // @@protoc_insertion_point(class_scope:org.jetbrains.jpsservice.Message.Request.SetupCommand.PathVariable)
-        }
-        
         public static final class GlobalLibrary extends
             com.google.protobuf.GeneratedMessageLite {
           // Use GlobalLibrary.newBuilder() to construct.
@@ -2415,15 +2504,15 @@ public final class JpsRemoteProto {
           // @@protoc_insertion_point(class_scope:org.jetbrains.jpsservice.Message.Request.SetupCommand.GlobalLibrary)
         }
         
-        // repeated .org.jetbrains.jpsservice.Message.Request.SetupCommand.PathVariable path_variable = 1;
+        // repeated .org.jetbrains.jpsservice.Message.KeyValuePair path_variable = 1;
         public static final int PATH_VARIABLE_FIELD_NUMBER = 1;
-        private java.util.List<org.jetbrains.jps.api.JpsRemoteProto.Message.Request.SetupCommand.PathVariable> pathVariable_ =
+        private java.util.List<org.jetbrains.jps.api.JpsRemoteProto.Message.KeyValuePair> pathVariable_ =
           java.util.Collections.emptyList();
-        public java.util.List<org.jetbrains.jps.api.JpsRemoteProto.Message.Request.SetupCommand.PathVariable> getPathVariableList() {
+        public java.util.List<org.jetbrains.jps.api.JpsRemoteProto.Message.KeyValuePair> getPathVariableList() {
           return pathVariable_;
         }
         public int getPathVariableCount() { return pathVariable_.size(); }
-        public org.jetbrains.jps.api.JpsRemoteProto.Message.Request.SetupCommand.PathVariable getPathVariable(int index) {
+        public org.jetbrains.jps.api.JpsRemoteProto.Message.KeyValuePair getPathVariable(int index) {
           return pathVariable_.get(index);
         }
         
@@ -2449,7 +2538,7 @@ public final class JpsRemoteProto {
         private void initFields() {
         }
         public final boolean isInitialized() {
-          for (org.jetbrains.jps.api.JpsRemoteProto.Message.Request.SetupCommand.PathVariable element : getPathVariableList()) {
+          for (org.jetbrains.jps.api.JpsRemoteProto.Message.KeyValuePair element : getPathVariableList()) {
             if (!element.isInitialized()) return false;
           }
           for (org.jetbrains.jps.api.JpsRemoteProto.Message.Request.SetupCommand.GlobalLibrary element : getGlobalLibraryList()) {
@@ -2461,7 +2550,7 @@ public final class JpsRemoteProto {
         public void writeTo(com.google.protobuf.CodedOutputStream output)
                             throws java.io.IOException {
           getSerializedSize();
-          for (org.jetbrains.jps.api.JpsRemoteProto.Message.Request.SetupCommand.PathVariable element : getPathVariableList()) {
+          for (org.jetbrains.jps.api.JpsRemoteProto.Message.KeyValuePair element : getPathVariableList()) {
             output.writeMessage(1, element);
           }
           for (org.jetbrains.jps.api.JpsRemoteProto.Message.Request.SetupCommand.GlobalLibrary element : getGlobalLibraryList()) {
@@ -2478,7 +2567,7 @@ public final class JpsRemoteProto {
           if (size != -1) return size;
         
           size = 0;
-          for (org.jetbrains.jps.api.JpsRemoteProto.Message.Request.SetupCommand.PathVariable element : getPathVariableList()) {
+          for (org.jetbrains.jps.api.JpsRemoteProto.Message.KeyValuePair element : getPathVariableList()) {
             size += com.google.protobuf.CodedOutputStream
               .computeMessageSize(1, element);
           }
@@ -2644,7 +2733,7 @@ public final class JpsRemoteProto {
             if (other == org.jetbrains.jps.api.JpsRemoteProto.Message.Request.SetupCommand.getDefaultInstance()) return this;
             if (!other.pathVariable_.isEmpty()) {
               if (result.pathVariable_.isEmpty()) {
-                result.pathVariable_ = new java.util.ArrayList<org.jetbrains.jps.api.JpsRemoteProto.Message.Request.SetupCommand.PathVariable>();
+                result.pathVariable_ = new java.util.ArrayList<org.jetbrains.jps.api.JpsRemoteProto.Message.KeyValuePair>();
               }
               result.pathVariable_.addAll(other.pathVariable_);
             }
@@ -2676,7 +2765,7 @@ public final class JpsRemoteProto {
                   break;
                 }
                 case 10: {
-                  org.jetbrains.jps.api.JpsRemoteProto.Message.Request.SetupCommand.PathVariable.Builder subBuilder = org.jetbrains.jps.api.JpsRemoteProto.Message.Request.SetupCommand.PathVariable.newBuilder();
+                  org.jetbrains.jps.api.JpsRemoteProto.Message.KeyValuePair.Builder subBuilder = org.jetbrains.jps.api.JpsRemoteProto.Message.KeyValuePair.newBuilder();
                   input.readMessage(subBuilder, extensionRegistry);
                   addPathVariable(subBuilder.buildPartial());
                   break;
@@ -2696,48 +2785,48 @@ public final class JpsRemoteProto {
           }
           
           
-          // repeated .org.jetbrains.jpsservice.Message.Request.SetupCommand.PathVariable path_variable = 1;
-          public java.util.List<org.jetbrains.jps.api.JpsRemoteProto.Message.Request.SetupCommand.PathVariable> getPathVariableList() {
+          // repeated .org.jetbrains.jpsservice.Message.KeyValuePair path_variable = 1;
+          public java.util.List<org.jetbrains.jps.api.JpsRemoteProto.Message.KeyValuePair> getPathVariableList() {
             return java.util.Collections.unmodifiableList(result.pathVariable_);
           }
           public int getPathVariableCount() {
             return result.getPathVariableCount();
           }
-          public org.jetbrains.jps.api.JpsRemoteProto.Message.Request.SetupCommand.PathVariable getPathVariable(int index) {
+          public org.jetbrains.jps.api.JpsRemoteProto.Message.KeyValuePair getPathVariable(int index) {
             return result.getPathVariable(index);
           }
-          public Builder setPathVariable(int index, org.jetbrains.jps.api.JpsRemoteProto.Message.Request.SetupCommand.PathVariable value) {
+          public Builder setPathVariable(int index, org.jetbrains.jps.api.JpsRemoteProto.Message.KeyValuePair value) {
             if (value == null) {
               throw new NullPointerException();
             }
             result.pathVariable_.set(index, value);
             return this;
           }
-          public Builder setPathVariable(int index, org.jetbrains.jps.api.JpsRemoteProto.Message.Request.SetupCommand.PathVariable.Builder builderForValue) {
+          public Builder setPathVariable(int index, org.jetbrains.jps.api.JpsRemoteProto.Message.KeyValuePair.Builder builderForValue) {
             result.pathVariable_.set(index, builderForValue.build());
             return this;
           }
-          public Builder addPathVariable(org.jetbrains.jps.api.JpsRemoteProto.Message.Request.SetupCommand.PathVariable value) {
+          public Builder addPathVariable(org.jetbrains.jps.api.JpsRemoteProto.Message.KeyValuePair value) {
             if (value == null) {
               throw new NullPointerException();
             }
             if (result.pathVariable_.isEmpty()) {
-              result.pathVariable_ = new java.util.ArrayList<org.jetbrains.jps.api.JpsRemoteProto.Message.Request.SetupCommand.PathVariable>();
+              result.pathVariable_ = new java.util.ArrayList<org.jetbrains.jps.api.JpsRemoteProto.Message.KeyValuePair>();
             }
             result.pathVariable_.add(value);
             return this;
           }
-          public Builder addPathVariable(org.jetbrains.jps.api.JpsRemoteProto.Message.Request.SetupCommand.PathVariable.Builder builderForValue) {
+          public Builder addPathVariable(org.jetbrains.jps.api.JpsRemoteProto.Message.KeyValuePair.Builder builderForValue) {
             if (result.pathVariable_.isEmpty()) {
-              result.pathVariable_ = new java.util.ArrayList<org.jetbrains.jps.api.JpsRemoteProto.Message.Request.SetupCommand.PathVariable>();
+              result.pathVariable_ = new java.util.ArrayList<org.jetbrains.jps.api.JpsRemoteProto.Message.KeyValuePair>();
             }
             result.pathVariable_.add(builderForValue.build());
             return this;
           }
           public Builder addAllPathVariable(
-              java.lang.Iterable<? extends org.jetbrains.jps.api.JpsRemoteProto.Message.Request.SetupCommand.PathVariable> values) {
+              java.lang.Iterable<? extends org.jetbrains.jps.api.JpsRemoteProto.Message.KeyValuePair> values) {
             if (result.pathVariable_.isEmpty()) {
-              result.pathVariable_ = new java.util.ArrayList<org.jetbrains.jps.api.JpsRemoteProto.Message.Request.SetupCommand.PathVariable>();
+              result.pathVariable_ = new java.util.ArrayList<org.jetbrains.jps.api.JpsRemoteProto.Message.KeyValuePair>();
             }
             super.addAll(values, result.pathVariable_);
             return this;
diff --git a/jps/jps-builders/src/org/jetbrains/jps/api/ProtoUtil.java b/jps/jps-builders/src/org/jetbrains/jps/api/ProtoUtil.java
index 5df797fd4519..b93378dddacb 100644
--- a/jps/jps-builders/src/org/jetbrains/jps/api/ProtoUtil.java
+++ b/jps/jps-builders/src/org/jetbrains/jps/api/ProtoUtil.java
@@ -28,23 +28,34 @@ public class ProtoUtil {
     return builder.build();
   }
 
-  public static JpsRemoteProto.Message.Request createMakeRequest(String project, Collection<String> modules, Collection<String> artifacts) {
-    return createCompileRequest(JpsRemoteProto.Message.Request.CompilationRequest.Type.MAKE, project, modules, artifacts, Collections.<String>emptyList());
+  public static JpsRemoteProto.Message.Request createMakeRequest(String project,
+                                                                 Collection<String> modules,
+                                                                 Collection<String> artifacts,
+                                                                 final Map<String, String> userData) {
+    return createCompileRequest(JpsRemoteProto.Message.Request.CompilationRequest.Type.MAKE, project, modules, artifacts,
+                                userData, Collections.<String>emptyList());
   }
 
   public static JpsRemoteProto.Message.Request createForceCompileRequest(String project,
                                                                          Collection<String> modules,
-                                                                         Collection<String> artifacts, Collection<String> paths) {
-    return createCompileRequest(JpsRemoteProto.Message.Request.CompilationRequest.Type.FORCED_COMPILATION, project, modules, artifacts, paths);
+                                                                         Collection<String> artifacts,
+                                                                         Collection<String> paths,
+                                                                         final Map<String, String> userData) {
+    return createCompileRequest(JpsRemoteProto.Message.Request.CompilationRequest.Type.FORCED_COMPILATION, project, modules, artifacts,
+                                userData, paths);
   }
 
-  public static JpsRemoteProto.Message.Request createRebuildRequest(String project) {
+  public static JpsRemoteProto.Message.Request createRebuildRequest(String project, final Map<String, String> userData) {
     return createCompileRequest(JpsRemoteProto.Message.Request.CompilationRequest.Type.REBUILD, project, Collections.<String>emptyList(),
-                                Collections.<String>emptyList(), Collections.<String>emptyList());
+                                Collections.<String>emptyList(), userData, Collections.<String>emptyList());
   }
 
-  public static JpsRemoteProto.Message.Request createCleanRequest(String project, Collection<String> modules, Collection<String> artifacts) {
-    return createCompileRequest(JpsRemoteProto.Message.Request.CompilationRequest.Type.CLEAN, project, modules, artifacts, Collections.<String>emptyList());
+  public static JpsRemoteProto.Message.Request createCleanRequest(String project,
+                                                                  Collection<String> modules,
+                                                                  Collection<String> artifacts,
+                                                                  final Map<String, String> userData) {
+    return createCompileRequest(JpsRemoteProto.Message.Request.CompilationRequest.Type.CLEAN, project, modules, artifacts,
+                                userData, Collections.<String>emptyList());
   }
 
   public static JpsRemoteProto.Message.Request createCancelRequest(UUID compileSessionId) {
@@ -53,22 +64,34 @@ public class ProtoUtil {
     return JpsRemoteProto.Message.Request.newBuilder().setRequestType(JpsRemoteProto.Message.Request.Type.CANCEL_BUILD_COMMAND).setCancelBuildCommand(builder.build()).build();
   }
 
-  public static JpsRemoteProto.Message.Request createCompileRequest(final JpsRemoteProto.Message.Request.CompilationRequest.Type command, String project, Collection<String> modules,
-                                                                    Collection<String> artifacts, Collection<String> paths) {
+  public static JpsRemoteProto.Message.Request createCompileRequest(
+    final JpsRemoteProto.Message.Request.CompilationRequest.Type command,
+    String project,
+    Collection<String> modules,
+    Collection<String> artifacts, Map<String, String> userData, Collection<String> paths) {
+
     final JpsRemoteProto.Message.Request.CompilationRequest.Builder builder = JpsRemoteProto.Message.Request.CompilationRequest.newBuilder().setCommandType(
       command);
     builder.setProjectId(project);
-    if (modules.size() > 0) {
+    if (!modules.isEmpty()) {
       builder.addAllModuleName(modules);
     }
-    if (artifacts.size() > 0) {
+    if (!artifacts.isEmpty()) {
       builder.addAllArtifactName(artifacts);
     }
-    if (paths.size() > 0) {
+    if (!userData.isEmpty()) {
+      for (Map.Entry<String, String> entry : userData.entrySet()) {
+        final String key = entry.getKey();
+        final String value = entry.getValue();
+        if (key != null && value != null) {
+          builder.addBuilderParameter(createPair(key, value));
+        }
+      }
+    }
+    if (!paths.isEmpty()) {
       builder.addAllFilePath(paths);
     }
-    return JpsRemoteProto.Message.Request.newBuilder().setRequestType(JpsRemoteProto.Message.Request.Type.COMPILE_REQUEST).setCompileRequest(
-      builder.build()).build();
+    return JpsRemoteProto.Message.Request.newBuilder().setRequestType(JpsRemoteProto.Message.Request.Type.COMPILE_REQUEST).setCompileRequest(builder.build()).build();
   }
 
   public static JpsRemoteProto.Message.Request createShutdownRequest(boolean cancelRunningBuilds) {
@@ -101,9 +124,7 @@ public class ProtoUtil {
         final String var = entry.getKey();
         final String value = entry.getValue();
         if (var != null && value != null) {
-          final JpsRemoteProto.Message.Request.SetupCommand.PathVariable.Builder pathVarBuilder =
-            JpsRemoteProto.Message.Request.SetupCommand.PathVariable.newBuilder();
-          cmdBuilder.addPathVariable(pathVarBuilder.setName(var).setValue(value).build());
+          cmdBuilder.addPathVariable(createPair(var, value));
         }
       }
     }
@@ -131,6 +152,10 @@ public class ProtoUtil {
     return JpsRemoteProto.Message.Request.newBuilder().setRequestType(JpsRemoteProto.Message.Request.Type.SETUP_COMMAND).setSetupCommand(cmdBuilder.build()).build();
   }
 
+  public static JpsRemoteProto.Message.KeyValuePair createPair(String key, String value) {
+    return JpsRemoteProto.Message.KeyValuePair.newBuilder().setKey(key).setValue(value).build();
+  }
+
   public static JpsRemoteProto.Message.Response createBuildStartedEvent(@Nullable String description) {
     return createBuildEvent(JpsRemoteProto.Message.Response.BuildEvent.Type.BUILD_STARTED, description, null, null);
   }
diff --git a/jps/jps-builders/src/org/jetbrains/jps/client/CompileServerClient.java b/jps/jps-builders/src/org/jetbrains/jps/client/CompileServerClient.java
index 139eaa703e74..49b2e2a9a1d3 100644
--- a/jps/jps-builders/src/org/jetbrains/jps/client/CompileServerClient.java
+++ b/jps/jps-builders/src/org/jetbrains/jps/client/CompileServerClient.java
@@ -5,10 +5,7 @@ import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;
 import org.jetbrains.jps.api.*;
 
-import java.util.Collection;
-import java.util.List;
-import java.util.Map;
-import java.util.UUID;
+import java.util.*;
 
 /**
  * @author Eugene Zhuravlev
@@ -28,18 +25,20 @@ public class CompileServerClient extends SimpleProtobufClient<JpsServerResponseH
 
   @NotNull
   public RequestFuture sendCompileRequest(boolean isMake, String projectId, Collection<String> modules, final Collection<String> artifacts,
-                                          Collection<String> paths, JpsServerResponseHandler handler) throws Exception{
+                                          Collection<String> paths,
+                                          final Map<String, String> userData,
+                                          JpsServerResponseHandler handler) throws Exception{
     checkConnected();
     final JpsRemoteProto.Message.Request request = isMake?
-      ProtoUtil.createMakeRequest(projectId, modules, artifacts) :
-      ProtoUtil.createForceCompileRequest(projectId, modules, artifacts, paths);
+      ProtoUtil.createMakeRequest(projectId, modules, artifacts, userData) :
+      ProtoUtil.createForceCompileRequest(projectId, modules, artifacts, paths, userData);
     return sendRequest(request, handler);
   }
 
   @NotNull
   public RequestFuture sendRebuildRequest(String projectId, JpsServerResponseHandler handler) throws Exception{
     checkConnected();
-    return sendRequest(ProtoUtil.createRebuildRequest(projectId), handler);
+    return sendRequest(ProtoUtil.createRebuildRequest(projectId, Collections.<String, String>emptyMap()), handler);
   }
 
   @NotNull
diff --git a/jps/jps-builders/src/org/jetbrains/jps/incremental/CompileContext.java b/jps/jps-builders/src/org/jetbrains/jps/incremental/CompileContext.java
index d500daa21dc0..95a64bbeb63b 100644
--- a/jps/jps-builders/src/org/jetbrains/jps/incremental/CompileContext.java
+++ b/jps/jps-builders/src/org/jetbrains/jps/incremental/CompileContext.java
@@ -41,6 +41,7 @@ public class CompileContext extends UserDataHolderBase implements MessageHandler
   private volatile boolean myErrorsFound = false;
   private final long myCompilationStartStamp;
   private final TimestampStorage myTsStorage;
+  private final Map<String, String> myBuilderParams;
   private final CanceledStatus myCancelStatus;
   private float myDone = -1.0f;
 
@@ -49,8 +50,15 @@ public class CompileContext extends UserDataHolderBase implements MessageHandler
                         boolean isProjectRebuild,
                         ProjectChunks productionChunks,
                         ProjectChunks testChunks,
-                        FSState fsState, final BuildDataManager dataManager, TimestampStorage tsStorage, MessageHandler delegateMessageHandler, final ModuleRootsIndex rootsIndex, CanceledStatus cancelStatus) throws ProjectBuildException {
+                        FSState fsState,
+                        final BuildDataManager dataManager,
+                        TimestampStorage tsStorage,
+                        MessageHandler delegateMessageHandler,
+                        final ModuleRootsIndex rootsIndex,
+                        Map<String, String> builderParams,
+                        CanceledStatus cancelStatus) throws ProjectBuildException {
     myTsStorage = tsStorage;
+    myBuilderParams = Collections.unmodifiableMap(builderParams);
     myCancelStatus = cancelStatus;
     myCompilationStartStamp = System.currentTimeMillis();
     myScope = scope;
@@ -82,6 +90,11 @@ public class CompileContext extends UserDataHolderBase implements MessageHandler
     return myIsProjectRebuild;
   }
 
+  @Nullable
+  public String getBuilderParameter(String paramName) {
+    return myBuilderParams.get(paramName);
+  }
+
   public void markDirty(final File file) throws IOException {
     final RootDescriptor descriptor = getModuleAndRoot(file);
     if (descriptor != null) {
diff --git a/jps/jps-builders/src/org/jetbrains/jps/incremental/IncProjectBuilder.java b/jps/jps-builders/src/org/jetbrains/jps/incremental/IncProjectBuilder.java
index 97fc6b25399f..bfc942b296ae 100644
--- a/jps/jps-builders/src/org/jetbrains/jps/incremental/IncProjectBuilder.java
+++ b/jps/jps-builders/src/org/jetbrains/jps/incremental/IncProjectBuilder.java
@@ -37,6 +37,7 @@ public class IncProjectBuilder {
 
   private final ProjectDescriptor myProjectDescriptor;
   private final BuilderRegistry myBuilderRegistry;
+  private final Map<String, String> myBuilderParams;
   private final CanceledStatus myCancelStatus;
   private ProjectChunks myProductionChunks;
   private ProjectChunks myTestChunks;
@@ -53,9 +54,10 @@ public class IncProjectBuilder {
   private final float myTotalModulesWork;
   private final int myTotalModuleLevelBuilderCount;
 
-  public IncProjectBuilder(ProjectDescriptor pd, BuilderRegistry builderRegistry, CanceledStatus cs) {
+  public IncProjectBuilder(ProjectDescriptor pd, BuilderRegistry builderRegistry, Map<String, String> builderParams, CanceledStatus cs) {
     myProjectDescriptor = pd;
     myBuilderRegistry = builderRegistry;
+    myBuilderParams = builderParams;
     myCancelStatus = cs;
     myProductionChunks = new ProjectChunks(pd.project, ClasspathKind.PRODUCTION_COMPILE);
     myTestChunks = new ProjectChunks(pd.project, ClasspathKind.TEST_COMPILE);
@@ -182,8 +184,10 @@ public class IncProjectBuilder {
     final FSState fsState = myProjectDescriptor.fsState;
     final ModuleRootsIndex rootsIndex = myProjectDescriptor.rootsIndex;
     final BuildDataManager dataManager = myProjectDescriptor.dataManager;
-    return new CompileContext(scope, isMake, isProjectRebuild, myProductionChunks, myTestChunks, fsState, dataManager, tsStorage,
-                              myMessageDispatcher, rootsIndex, myCancelStatus);
+    return new CompileContext(
+      scope, isMake, isProjectRebuild, myProductionChunks, myTestChunks, fsState, dataManager, tsStorage, myMessageDispatcher, rootsIndex,
+      myBuilderParams, myCancelStatus
+    );
   }
 
   private void cleanOutputRoots(CompileContext context) throws ProjectBuildException {
diff --git a/jps/jps-builders/src/org/jetbrains/jps/server/ServerMessageHandler.java b/jps/jps-builders/src/org/jetbrains/jps/server/ServerMessageHandler.java
index 2dc966b51c51..bc3739d5ae61 100644
--- a/jps/jps-builders/src/org/jetbrains/jps/server/ServerMessageHandler.java
+++ b/jps/jps-builders/src/org/jetbrains/jps/server/ServerMessageHandler.java
@@ -69,8 +69,8 @@ class ServerMessageHandler extends SimpleChannelHandler {
         case SETUP_COMMAND:
           final Map<String, String> pathVars = new HashMap<String, String>();
           final JpsRemoteProto.Message.Request.SetupCommand setupCommand = request.getSetupCommand();
-          for (JpsRemoteProto.Message.Request.SetupCommand.PathVariable variable : setupCommand.getPathVariableList()) {
-            pathVars.put(variable.getName(), variable.getValue());
+          for (JpsRemoteProto.Message.KeyValuePair variable : setupCommand.getPathVariableList()) {
+            pathVars.put(variable.getKey(), variable.getValue());
           }
           final List<GlobalLibrary> libs = new ArrayList<GlobalLibrary>();
           for (JpsRemoteProto.Message.Request.SetupCommand.GlobalLibrary library : setupCommand.getGlobalLibraryList()) {
@@ -187,8 +187,14 @@ class ServerMessageHandler extends SimpleChannelHandler {
       case REBUILD: {
         channelContext.setAttachment(sessionId);
         final BuildType buildType = convertCompileType(compileType);
-        final CompilationTask task = new CompilationTask(sessionId, channelContext, projectId, buildType, compileRequest.getModuleNameList(),
-                                                         compileRequest.getArtifactNameList(), compileRequest.getFilePathList());
+        final List<String> modules = compileRequest.getModuleNameList();
+        final List<String> artifacts = compileRequest.getArtifactNameList();
+        final List<String> paths = compileRequest.getFilePathList();
+        final Map<String, String> builderParams = new HashMap<String, String>();
+        for (JpsRemoteProto.Message.KeyValuePair pair : compileRequest.getBuilderParameterList()) {
+          builderParams.put(pair.getKey(), pair.getValue());
+        }
+        final CompilationTask task = new CompilationTask(sessionId, channelContext, projectId, buildType, modules, artifacts, builderParams, paths);
         final RunnableFuture future = getCompileTaskExecutor(projectId).submit(task);
         myBuildsInProgress.add(new Pair<RunnableFuture, CompilationTask>(future, task));
         return null;
@@ -230,6 +236,7 @@ class ServerMessageHandler extends SimpleChannelHandler {
     private final String myProjectPath;
     private final BuildType myBuildType;
     private final Collection<String> myArtifacts;
+    private final Map<String, String> myBuilderParams;
     private final Collection<String> myPaths;
     private final Set<String> myModules;
     private volatile boolean myCanceled = false;
@@ -240,12 +247,13 @@ class ServerMessageHandler extends SimpleChannelHandler {
                            BuildType buildType,
                            Collection<String> modules,
                            Collection<String> artifacts,
-                           Collection<String> paths) {
+                           Map<String, String> builderParams, Collection<String> paths) {
       mySessionId = sessionId;
       myChannelContext = channelContext;
       myProjectPath = projectId;
       myBuildType = buildType;
       myArtifacts = artifacts;
+      myBuilderParams = builderParams;
       myPaths = paths;
       myModules = new HashSet<String>(modules);
     }
@@ -264,7 +272,7 @@ class ServerMessageHandler extends SimpleChannelHandler {
       final Ref<Boolean> hasErrors = new Ref<Boolean>(false);
       final Ref<Boolean> markedFilesUptodate = new Ref<Boolean>(false);
       try {
-        ServerState.getInstance().startBuild(myProjectPath, myBuildType, myModules, myArtifacts, myPaths, new MessageHandler() {
+        ServerState.getInstance().startBuild(myProjectPath, myBuildType, myModules, myArtifacts, myBuilderParams, myPaths, new MessageHandler() {
           public void processMessage(BuildMessage buildMessage) {
             final JpsRemoteProto.Message.Response response;
             if (buildMessage instanceof FileGeneratedEvent) {
diff --git a/jps/jps-builders/src/org/jetbrains/jps/server/ServerState.java b/jps/jps-builders/src/org/jetbrains/jps/server/ServerState.java
index d8b201ba316c..30b878bf2e76 100644
--- a/jps/jps-builders/src/org/jetbrains/jps/server/ServerState.java
+++ b/jps/jps-builders/src/org/jetbrains/jps/server/ServerState.java
@@ -124,7 +124,7 @@ class ServerState {
   }
 
   public void startBuild(String projectPath, BuildType buildType, Set<String> modules, Collection<String> artifacts,
-                         Collection<String> paths, final MessageHandler msgHandler, CanceledStatus cs) throws Throwable{
+                         Map<String, String> builderParams, Collection<String> paths, final MessageHandler msgHandler, CanceledStatus cs) throws Throwable{
 
     final String projectName = getProjectName(projectPath);
 
@@ -167,7 +167,7 @@ class ServerState {
 
     try {
       final CompileScope compileScope = createCompilationScope(buildType, pd, modules, artifacts, paths);
-      final IncProjectBuilder builder = new IncProjectBuilder(pd, BuilderRegistry.getInstance(), cs);
+      final IncProjectBuilder builder = new IncProjectBuilder(pd, BuilderRegistry.getInstance(), builderParams, cs);
       if (msgHandler != null) {
         builder.addMessageHandler(msgHandler);
       }
diff --git a/jps/jps-builders/testSrc/org/jetbrains/ether/ClassPropertyTest.java b/jps/jps-builders/testSrc/org/jetbrains/ether/ClassPropertyTest.java
index a652b11ab437..5f12194ac03f 100644
--- a/jps/jps-builders/testSrc/org/jetbrains/ether/ClassPropertyTest.java
+++ b/jps/jps-builders/testSrc/org/jetbrains/ether/ClassPropertyTest.java
@@ -39,4 +39,8 @@ public class ClassPropertyTest extends IncrementalTestCase {
   public void testRemoveImplements3() throws Exception {
     doTest();
   }
+
+  public void testChangeExtends2() throws Exception {
+      doTest();
+  }
 }
diff --git a/jps/jps-builders/testSrc/org/jetbrains/ether/CommonTest.java b/jps/jps-builders/testSrc/org/jetbrains/ether/CommonTest.java
index 933dedb3e922..a764fbd895b4 100644
--- a/jps/jps-builders/testSrc/org/jetbrains/ether/CommonTest.java
+++ b/jps/jps-builders/testSrc/org/jetbrains/ether/CommonTest.java
@@ -71,4 +71,8 @@ public class CommonTest extends IncrementalTestCase {
   public void testClass2Interface3() throws Exception {
     doTest();
   }
+
+  public void testDeleteClass3() throws Exception {
+      doTest();
+    }
 }
diff --git a/jps/jps-builders/testSrc/org/jetbrains/ether/IncrementalTestCase.java b/jps/jps-builders/testSrc/org/jetbrains/ether/IncrementalTestCase.java
index 6160a0126ced..549f4f5772ca 100644
--- a/jps/jps-builders/testSrc/org/jetbrains/ether/IncrementalTestCase.java
+++ b/jps/jps-builders/testSrc/org/jetbrains/ether/IncrementalTestCase.java
@@ -177,7 +177,7 @@ public abstract class IncrementalTestCase extends TestCase {
     finally {
       try {
         closeAppender();
-        //delete(new File(workDir));
+        delete(new File(workDir));
       }
       finally {
         Logger.setFactory(oldFactory);
@@ -325,7 +325,7 @@ public abstract class IncrementalTestCase extends TestCase {
     try {
 
       new IncProjectBuilder(
-        projectDescriptor, BuilderRegistry.getInstance(), CanceledStatus.NULL
+        projectDescriptor, BuilderRegistry.getInstance(), Collections.<String, String>emptyMap(), CanceledStatus.NULL
       ).build(
         new AllProjectScope(project, Collections.<Artifact>emptySet(), true), false, true
       );
@@ -337,7 +337,7 @@ public abstract class IncrementalTestCase extends TestCase {
       }
 
       new IncProjectBuilder(
-        projectDescriptor, BuilderRegistry.getInstance(), CanceledStatus.NULL
+        projectDescriptor, BuilderRegistry.getInstance(), Collections.<String, String>emptyMap(), CanceledStatus.NULL
       ).build(
         new AllProjectScope(project, Collections.<Artifact>emptySet(), false), true, false
       );
diff --git a/jps/model/src/org/jetbrains/ether/dependencyView/Mappings.java b/jps/model/src/org/jetbrains/ether/dependencyView/Mappings.java
index 67a32b06bd88..9d4e522c83e4 100644
--- a/jps/model/src/org/jetbrains/ether/dependencyView/Mappings.java
+++ b/jps/model/src/org/jetbrains/ether/dependencyView/Mappings.java
@@ -613,7 +613,7 @@ public class Mappings {
         }
       }
 
-      final Collection<DependencyContext.S> depClasses = myClassToClassDependency.get(fileName);
+      final Collection<DependencyContext.S> depClasses = myClassToClassDependency.get(className);
 
       if (depClasses != null) {
         dependants.addAll(depClasses);
@@ -885,7 +885,6 @@ public class Mappings {
         debug("Changed: ", it.name);
 
         final int addedModifiers = diff.addedModifiers();
-        final int removedModifiers = diff.removedModifiers();
 
         final boolean superClassChanged = (diff.base() & Difference.SUPERCLASS) > 0;
         final boolean interfacesChanged = !diff.interfaces().unchanged();
diff --git a/platform/lang-api/src/com/intellij/codeInspection/GlobalInspectionTool.java b/platform/lang-api/src/com/intellij/codeInspection/GlobalInspectionTool.java
index 392a6402cd25..1fe06eb53b72 100644
--- a/platform/lang-api/src/com/intellij/codeInspection/GlobalInspectionTool.java
+++ b/platform/lang-api/src/com/intellij/codeInspection/GlobalInspectionTool.java
@@ -187,4 +187,9 @@ public abstract class GlobalInspectionTool extends InspectionProfileEntry {
   public JobDescriptor[] getAdditionalJobs() {
     return null;
   }
+
+  // In some cases we can do highlighting in annotator or high. visitor based on global inspection
+  public boolean worksInBatchModeOnly() {
+    return true;
+  }
 }
diff --git a/platform/lang-impl/src/com/intellij/codeInsight/editorActions/CompletionAutoPopupHandler.java b/platform/lang-impl/src/com/intellij/codeInsight/editorActions/CompletionAutoPopupHandler.java
index a87af81063b2..aa557f43fc0e 100644
--- a/platform/lang-impl/src/com/intellij/codeInsight/editorActions/CompletionAutoPopupHandler.java
+++ b/platform/lang-impl/src/com/intellij/codeInsight/editorActions/CompletionAutoPopupHandler.java
@@ -22,7 +22,6 @@ import com.intellij.codeInsight.completion.CompletionType;
 import com.intellij.codeInsight.completion.impl.CompletionServiceImpl;
 import com.intellij.codeInsight.lookup.LookupManager;
 import com.intellij.codeInsight.lookup.impl.LookupImpl;
-import com.intellij.ide.DataManager;
 import com.intellij.openapi.application.ApplicationManager;
 import com.intellij.openapi.diagnostic.Logger;
 import com.intellij.openapi.editor.Document;
@@ -50,12 +49,14 @@ public class CompletionAutoPopupHandler extends TypedHandlerDelegate {
                                 PsiFile file,
                                 FileType fileType) {
     CompletionPhase phase = CompletionServiceImpl.getCompletionPhase();
+    /*
     if (phase instanceof CompletionPhase.EmptyAutoPopup) {
       long modificationStampBeforeTyping = editor.getDocument().getModificationStamp();
       ((CompletionPhase.EmptyAutoPopup)phase).handleTyping(c);
       AutoHardWrapHandler.getInstance().wrapLineIfNecessary(editor, DataManager.getInstance().getDataContext(editor.getContentComponent()), modificationStampBeforeTyping);
       return Result.STOP;
     }
+    */
 
     return Result.CONTINUE;
   }
diff --git a/platform/lang-impl/src/com/intellij/codeInsight/folding/impl/UpdateFoldRegionsOperation.java b/platform/lang-impl/src/com/intellij/codeInsight/folding/impl/UpdateFoldRegionsOperation.java
index 73f3c89453ee..682c5b172094 100644
--- a/platform/lang-impl/src/com/intellij/codeInsight/folding/impl/UpdateFoldRegionsOperation.java
+++ b/platform/lang-impl/src/com/intellij/codeInsight/folding/impl/UpdateFoldRegionsOperation.java
@@ -177,22 +177,35 @@ class UpdateFoldRegionsOperation implements Runnable {
       }
       if (element != null && myElementsToFoldMap.containsKey(element)) {
         final Collection<FoldingDescriptor> descriptors = myElementsToFoldMap.get(element);
+        boolean matchingDescriptorFound = false;
         for (FoldingDescriptor descriptor : descriptors) {
           TextRange range = descriptor.getRange();
-          if (!region.isValid() ||
-              region.getGroup() != null ||
-              descriptor.getGroup() != null ||
-              region.getStartOffset() != range.getStartOffset() ||
-              region.getEndOffset() != range.getEndOffset() ||
-              !region.getPlaceholderText().equals(descriptor.getPlaceholderText()) ||
-              range.getLength() < 2
-            ) {
-            rangeToExpandStatusMap.put(range, region.isExpanded());
-            toRemove.add(region);
+          if (region.getStartOffset() == range.getStartOffset()
+              && region.getEndOffset() == range.getEndOffset()) {
+            matchingDescriptorFound = true;
+            if (!region.isValid() ||
+                region.getGroup() != null ||
+                descriptor.getGroup() != null ||
+                !region.getPlaceholderText().equals(descriptor.getPlaceholderText()) ||
+                range.getLength() < 2
+              ) {
+              rangeToExpandStatusMap.put(range, region.isExpanded());
+              toRemove.add(region);
+            }
+            else {
+              myElementsToFoldMap.removeValue(element, descriptor);
+            }
+            break;
           }
-          else {
-            myElementsToFoldMap.remove(element);
+        }
+        if (!matchingDescriptorFound) {
+          for (FoldingDescriptor descriptor : descriptors) {
+            rangeToExpandStatusMap.put(descriptor.getRange(), region.isExpanded());
           }
+          toRemove.add(region);
+        }
+        if (myElementsToFoldMap.get(element).isEmpty()) {
+          myElementsToFoldMap.remove(element);
         }
       }
       else if (region.isValid() && info.isLightRegion(region)) {
diff --git a/platform/lang-impl/src/com/intellij/codeInspection/ex/GlobalInspectionToolWrapper.java b/platform/lang-impl/src/com/intellij/codeInspection/ex/GlobalInspectionToolWrapper.java
index 4031249bbd1f..503d824cb97a 100644
--- a/platform/lang-impl/src/com/intellij/codeInspection/ex/GlobalInspectionToolWrapper.java
+++ b/platform/lang-impl/src/com/intellij/codeInspection/ex/GlobalInspectionToolWrapper.java
@@ -132,4 +132,8 @@ public class GlobalInspectionToolWrapper extends InspectionToolWrapper<GlobalIns
     }
     return null;
   }
+
+  public boolean worksInBatchModeOnly() {
+    return getTool().worksInBatchModeOnly();
+  }
 }
diff --git a/platform/lang-impl/src/com/intellij/execution/ui/layout/impl/GridCellImpl.java b/platform/lang-impl/src/com/intellij/execution/ui/layout/impl/GridCellImpl.java
index c85261cd83f8..fc6488f989db 100644
--- a/platform/lang-impl/src/com/intellij/execution/ui/layout/impl/GridCellImpl.java
+++ b/platform/lang-impl/src/com/intellij/execution/ui/layout/impl/GridCellImpl.java
@@ -27,8 +27,6 @@ import com.intellij.openapi.util.MutualMap;
 import com.intellij.ui.awt.RelativePoint;
 import com.intellij.ui.components.panels.NonOpaquePanel;
 import com.intellij.ui.content.Content;
-import com.intellij.ui.docking.DockContainer;
-import com.intellij.ui.docking.DockManager;
 import com.intellij.ui.switcher.SwitchTarget;
 import com.intellij.ui.tabs.JBTabs;
 import com.intellij.ui.tabs.TabInfo;
@@ -364,7 +362,7 @@ public class GridCellImpl implements GridCell {
     final Dimension size = myContext.getContentManager().getComponent().getSize();
     service.setSize(getDimensionKey(), size, myContext.getProject());
     if (myContext.getWindow() != 0) {
-      final JFrame frame = (JFrame)DockManager.getInstance(myContext.getProject()).getIdeFrame((DockContainer)myContext);
+      final Window frame = SwingUtilities.getWindowAncestor(myPlaceholder);
       service.setLocation(getDimensionKey(), frame.getLocationOnScreen());
     }
   }
diff --git a/platform/lang-impl/src/com/intellij/execution/ui/layout/impl/RunnerLayoutUiImpl.java b/platform/lang-impl/src/com/intellij/execution/ui/layout/impl/RunnerLayoutUiImpl.java
index c850e815f0e2..36e66742cf50 100644
--- a/platform/lang-impl/src/com/intellij/execution/ui/layout/impl/RunnerLayoutUiImpl.java
+++ b/platform/lang-impl/src/com/intellij/execution/ui/layout/impl/RunnerLayoutUiImpl.java
@@ -46,7 +46,7 @@ import org.jetbrains.annotations.Nullable;
 import javax.swing.*;
 import java.awt.*;
 
-public class RunnerLayoutUiImpl implements Disposable, RunnerLayoutUi, LayoutStateDefaults, LayoutViewOptions {
+public class RunnerLayoutUiImpl implements Disposable.Parent, RunnerLayoutUi, LayoutStateDefaults, LayoutViewOptions {
   private final RunnerLayout myLayout;
   private final JPanel myContentPanel;
   private final RunnerContentUi myContentUI;
@@ -155,6 +155,11 @@ public class RunnerLayoutUiImpl implements Disposable, RunnerLayoutUi, LayoutSta
     myContentUI.updateActionsImmediately();
   }
 
+  @Override
+  public void beforeTreeDispose() {
+    myContentUI.saveUiState();
+  }
+
   public void dispose() {
   }
 
diff --git a/platform/lang-impl/src/com/intellij/ide/util/FileStructurePopup.java b/platform/lang-impl/src/com/intellij/ide/util/FileStructurePopup.java
index 764d1fc588e6..439465eb09f1 100644
--- a/platform/lang-impl/src/com/intellij/ide/util/FileStructurePopup.java
+++ b/platform/lang-impl/src/com/intellij/ide/util/FileStructurePopup.java
@@ -111,6 +111,7 @@ public class FileStructurePopup implements Disposable {
   private PsiElement myInitialPsiElement;
   private Map<Class, JCheckBox> myCheckBoxes = new HashMap<Class, JCheckBox>();
   private String myTestSearchFilter;
+  private final ActionCallback myTreeHasBuilt = new ActionCallback();
 
   public FileStructurePopup(StructureViewModel structureViewModel,
                             @Nullable Editor editor,
@@ -119,6 +120,7 @@ public class FileStructurePopup implements Disposable {
                             final boolean applySortAndFilter) {
     myProject = project;
     myEditor = editor;
+    IdeFocusManager.getInstance(myProject).typeAheadUntil(myTreeHasBuilt);
     myBaseTreeModel = structureViewModel;
     Disposer.register(this, auxDisposable);
     if (applySortAndFilter) {
@@ -210,8 +212,6 @@ public class FileStructurePopup implements Disposable {
 
   public void show() {
     //final long time = System.currentTimeMillis();
-    final ActionCallback treeHasBuilt = new ActionCallback();
-    IdeFocusManager.getInstance(myProject).typeAheadUntil(treeHasBuilt);
     JComponent panel = createCenterPanel();
     new MnemonicHelper().register(panel);
     boolean shouldSetWidth = DimensionService.getInstance().getSize(getDimensionServiceKey(), myProject) == null;
@@ -250,8 +250,8 @@ public class FileStructurePopup implements Disposable {
     Disposer.register(myPopup, new Disposable() {
       @Override
       public void dispose() {
-        if (!treeHasBuilt.isDone()) {
-          treeHasBuilt.setRejected();
+        if (!myTreeHasBuilt.isDone()) {
+          myTreeHasBuilt.setRejected();
         }
       }
     });
@@ -275,7 +275,7 @@ public class FileStructurePopup implements Disposable {
           @Override
           public void run() {
             selectPsiElement(myInitialPsiElement);
-            treeHasBuilt.setDone();
+            myTreeHasBuilt.setDone();
             //long t = System.currentTimeMillis() - time;
             //System.out.println("Shown in " + t + "ms");
           }
diff --git a/platform/lang-impl/src/com/intellij/ide/util/gotoByName/GotoActionModel.java b/platform/lang-impl/src/com/intellij/ide/util/gotoByName/GotoActionModel.java
index 6b00860cd44c..12d00f611b57 100644
--- a/platform/lang-impl/src/com/intellij/ide/util/gotoByName/GotoActionModel.java
+++ b/platform/lang-impl/src/com/intellij/ide/util/gotoByName/GotoActionModel.java
@@ -178,10 +178,11 @@ public class GotoActionModel implements ChooseByNameModel, CustomMatcherModel {
   }
 
   protected static Color defaultActionForeground(boolean isSelected, Presentation presentation) {
-    return isSelected ? UIUtil.getListSelectionForeground()
-                      : presentation.isEnabled() && presentation.isVisible()
-                        ? UIUtil.getListForeground()
-                        : UIUtil.getInactiveTextColor();
+    if (!presentation.isEnabled() || !presentation.isVisible()) {
+      return UIUtil.getInactiveTextColor();
+    }
+
+    return isSelected ? UIUtil.getListSelectionForeground() : UIUtil.getListForeground();
   }
 
   public String[] getNames(boolean checkBoxState) {
diff --git a/platform/lang-impl/src/com/intellij/packageDependencies/ui/DirectoryNode.java b/platform/lang-impl/src/com/intellij/packageDependencies/ui/DirectoryNode.java
index 48c96d92884f..f44497bb3a16 100644
--- a/platform/lang-impl/src/com/intellij/packageDependencies/ui/DirectoryNode.java
+++ b/platform/lang-impl/src/com/intellij/packageDependencies/ui/DirectoryNode.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2000-2009 JetBrains s.r.o.
+ * Copyright 2000-2012 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.
@@ -237,7 +237,7 @@ public class DirectoryNode extends PackageDependenciesNode {
 
   @Override
   public String getComment() {
-    if (myVDirectory != null && myVDirectory.isValid()) {
+    if (myVDirectory != null && myVDirectory.isValid() && !myProject.isDisposed()) {
       return ProjectViewDirectoryHelper.getInstance(myProject).getLocationString(getPsiDirectory());
     }
     return super.getComment();
diff --git a/platform/lang-impl/src/com/intellij/profile/codeInspection/ui/InspectionsConfigTreeRenderer.java b/platform/lang-impl/src/com/intellij/profile/codeInspection/ui/InspectionsConfigTreeRenderer.java
index 3fa4229745f9..1fd982b5c461 100644
--- a/platform/lang-impl/src/com/intellij/profile/codeInspection/ui/InspectionsConfigTreeRenderer.java
+++ b/platform/lang-impl/src/com/intellij/profile/codeInspection/ui/InspectionsConfigTreeRenderer.java
@@ -20,8 +20,10 @@
  */
 package com.intellij.profile.codeInspection.ui;
 
+import com.intellij.codeInspection.InspectionProfileEntry;
 import com.intellij.codeInspection.InspectionsBundle;
 import com.intellij.codeInspection.ex.Descriptor;
+import com.intellij.codeInspection.ex.GlobalInspectionToolWrapper;
 import com.intellij.codeInspection.ex.LocalInspectionToolWrapper;
 import com.intellij.ide.ui.search.SearchUtil;
 import com.intellij.ui.CheckboxTree;
@@ -91,14 +93,15 @@ abstract class InspectionsConfigTreeRenderer extends CheckboxTree.CheckboxTreeCe
   }
 
   @Nullable
-private static String getHint(Descriptor descriptor) {
-  if (descriptor.getTool() == null) {
-    return InspectionsBundle.message("inspection.tool.availability.in.tree.node");
+  private static String getHint(Descriptor descriptor) {
+    final InspectionProfileEntry tool = descriptor.getTool();
+    if (tool == null) {
+      return InspectionsBundle.message("inspection.tool.availability.in.tree.node");
+    }
+    if (tool instanceof LocalInspectionToolWrapper ||
+        tool instanceof GlobalInspectionToolWrapper && !((GlobalInspectionToolWrapper)tool).worksInBatchModeOnly()) {
+      return null;
+    }
+    return InspectionsBundle.message("inspection.tool.availability.in.tree.node1");
   }
-  if (descriptor.getTool()instanceof LocalInspectionToolWrapper) {
-    return null;
-  }
-  return InspectionsBundle.message("inspection.tool.availability.in.tree.node1");
-}
-
 }
\ No newline at end of file
diff --git a/platform/lang-impl/src/com/intellij/refactoring/rename/inplace/InplaceRefactoring.java b/platform/lang-impl/src/com/intellij/refactoring/rename/inplace/InplaceRefactoring.java
index d27119aa63a6..b34ef1d6172e 100644
--- a/platform/lang-impl/src/com/intellij/refactoring/rename/inplace/InplaceRefactoring.java
+++ b/platform/lang-impl/src/com/intellij/refactoring/rename/inplace/InplaceRefactoring.java
@@ -295,6 +295,7 @@ public abstract class InplaceRefactoring {
 
     Template template = builder.buildInlineTemplate();
     template.setToShortenLongNames(false);
+    template.setToReformat(false);
     TextRange range = myScope.getTextRange();
     assert range != null;
     myHighlighters = new ArrayList<RangeHighlighter>();
diff --git a/platform/lang-impl/src/com/intellij/refactoring/rename/inplace/MemberInplaceRenamer.java b/platform/lang-impl/src/com/intellij/refactoring/rename/inplace/MemberInplaceRenamer.java
index ab7d708ca11c..b9520b91474e 100644
--- a/platform/lang-impl/src/com/intellij/refactoring/rename/inplace/MemberInplaceRenamer.java
+++ b/platform/lang-impl/src/com/intellij/refactoring/rename/inplace/MemberInplaceRenamer.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2000-2011 JetBrains s.r.o.
+ * Copyright 2000-2012 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.
@@ -159,6 +159,11 @@ public class MemberInplaceRenamer extends VariableInplaceRenamer {
     return showChooser;
   }
 
+  @Override
+  protected boolean shouldCreateSnapshot() {
+    return false;
+  }
+
   private void appendAdditionalElement(Collection<Pair<PsiElement, TextRange>> stringUsages,
                                        PsiNamedElement variable,
                                        PsiElement element) {
diff --git a/platform/lang-impl/src/com/intellij/refactoring/rename/inplace/VariableInplaceRenamer.java b/platform/lang-impl/src/com/intellij/refactoring/rename/inplace/VariableInplaceRenamer.java
index 992e079a17da..2a24a63d929b 100644
--- a/platform/lang-impl/src/com/intellij/refactoring/rename/inplace/VariableInplaceRenamer.java
+++ b/platform/lang-impl/src/com/intellij/refactoring/rename/inplace/VariableInplaceRenamer.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2000-2009 JetBrains s.r.o.
+ * Copyright 2000-2012 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.
@@ -132,12 +132,18 @@ public class VariableInplaceRenamer extends InplaceRefactoring {
     return stringUsages.isEmpty();
   }
 
+  protected boolean shouldCreateSnapshot() {
+    return true;
+  }
+
   @Override
   protected void beforeTemplateStart() {
     super.beforeTemplateStart();
     myLanguage = myScope.getLanguage();
-    final ResolveSnapshotProvider resolveSnapshotProvider = INSTANCE.forLanguage(myLanguage);
-    mySnapshot = resolveSnapshotProvider != null ? resolveSnapshotProvider.createSnapshot(myScope) : null;
+    if (shouldCreateSnapshot()) {
+      final ResolveSnapshotProvider resolveSnapshotProvider = INSTANCE.forLanguage(myLanguage);
+      mySnapshot = resolveSnapshotProvider != null ? resolveSnapshotProvider.createSnapshot(myScope) : null;
+    }
 
     final SelectionModel selectionModel = myEditor.getSelectionModel();
     mySelectedRange =
diff --git a/platform/lang-impl/src/com/intellij/util/indexing/FileBasedIndex.java b/platform/lang-impl/src/com/intellij/util/indexing/FileBasedIndex.java
index 619ac7132312..f8ce88ae536d 100644
--- a/platform/lang-impl/src/com/intellij/util/indexing/FileBasedIndex.java
+++ b/platform/lang-impl/src/com/intellij/util/indexing/FileBasedIndex.java
@@ -1933,6 +1933,9 @@ public class FileBasedIndex implements ApplicationComponent {
 
     @Override
     public boolean processFile(final VirtualFile file) {
+      if (!file.isValid()) {
+        return true;
+      }
       if (!file.isDirectory()) {
         if (file instanceof NewVirtualFile && ((NewVirtualFile)file).getFlag(ALREADY_PROCESSED)) {
           return true;
diff --git a/platform/platform-api/src/com/intellij/openapi/fileEditor/TransferableFileEditorState.java b/platform/platform-api/src/com/intellij/openapi/fileEditor/TransferableFileEditorState.java
new file mode 100644
index 000000000000..3b4322fdfb1e
--- /dev/null
+++ b/platform/platform-api/src/com/intellij/openapi/fileEditor/TransferableFileEditorState.java
@@ -0,0 +1,49 @@
+/*
+ * Copyright 2000-2012 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.fileEditor;
+
+import java.util.Map;
+
+/**
+ * This interface extends FileEditorState interface to sync some editor's options
+ * Example:
+ *   we have image editor and open image files, image by image. We'd like to set default zoom
+ *   factor to 1:1, but this is not the default value for this option. So, we can use methods in this
+ *   interface to store these options somewhere and apply them within the session (the time we need these options).
+ *
+ * @author Konstantin Bulenkov
+ */
+public interface TransferableFileEditorState extends FileEditorState {
+  /**
+   * Returns unique editor ID
+   *
+   * @return unique editor ID
+   */
+  String getEditorId();
+
+  /**
+   * Options name-value string mapping. Example: {{"zoomFactor": "1:1"}, {"transparentBackground": "false"}}
+   *
+   * @return name-value string mapping
+   */
+  Map<String, String> getTransferableOptions();
+
+  /**
+   * Applies options to the editor
+   * @param options name-value string mapping
+   */
+  void setTransferableOptions(Map<String, String> options);
+}
diff --git a/platform/platform-api/src/com/intellij/openapi/fileTypes/WildcardFileNameMatcher.java b/platform/platform-api/src/com/intellij/openapi/fileTypes/WildcardFileNameMatcher.java
index 6823c5d7c4be..8fa84a4bf55d 100644
--- a/platform/platform-api/src/com/intellij/openapi/fileTypes/WildcardFileNameMatcher.java
+++ b/platform/platform-api/src/com/intellij/openapi/fileTypes/WildcardFileNameMatcher.java
@@ -60,14 +60,47 @@ public class WildcardFileNameMatcher implements FileNameMatcher {
     }
   }
 
+  private static final class PrefixMatcher implements MaskMatcher {
+    private final String myPrefix;
+
+    private PrefixMatcher(final String prefix) {
+      myPrefix = prefix;
+    }
+
+    public boolean matches(final String filename) {
+      return filename.startsWith(myPrefix);
+    }
+  }
+
+  private static final class InfixMatcher implements MaskMatcher {
+    private final String myInfix;
+
+    private InfixMatcher(final String infix) {
+      myInfix = infix;
+    }
+
+    public boolean matches(final String filename) {
+      return filename.contains(myInfix);
+    }
+  }
+
   public WildcardFileNameMatcher(@NotNull @NonNls String pattern) {
     myPattern = pattern;
     myMatcher = createMatcher(pattern);
   }
 
   private static MaskMatcher createMatcher(final String pattern) {
-    if (pattern.length() > 1 && pattern.charAt(0) == '*' && pattern.indexOf('*', 1) < 0 && pattern.indexOf('?') < 0) {
-      return new SuffixMatcher(pattern.substring(1));
+    int len = pattern.length();
+    if (len > 1 && pattern.indexOf('?') < 0) {
+      if (pattern.charAt(0) == '*' && pattern.indexOf('*', 1) < 0) {
+        return new SuffixMatcher(pattern.substring(1));
+      }
+      if (pattern.indexOf('*') == len - 1) {
+        return new PrefixMatcher(pattern.substring(0, len - 1));
+      }
+      if (len > 2 && pattern.charAt(0) == '*' && pattern.indexOf('*', 1) == len - 1) {
+        return new InfixMatcher(pattern.substring(1, len - 1));
+      }
     }
     return new RegexpMatcher(pattern);
   }
diff --git a/platform/platform-api/src/com/intellij/ui/MouseDragHelper.java b/platform/platform-api/src/com/intellij/ui/MouseDragHelper.java
index bb0ccb0cb25a..de67b2b116b8 100644
--- a/platform/platform-api/src/com/intellij/ui/MouseDragHelper.java
+++ b/platform/platform-api/src/com/intellij/ui/MouseDragHelper.java
@@ -115,6 +115,7 @@ public abstract class MouseDragHelper implements MouseListener, MouseMotionListe
 
     myPressPointScreen = new RelativePoint(e).getScreenPoint();
     myPressPointComponent = e.getPoint();
+    processMousePressed(e);
 
     myDelta = new Dimension();
     if (myDragComponent.isShowing()) {
@@ -209,6 +210,9 @@ public abstract class MouseDragHelper implements MouseListener, MouseMotionListe
     return true;
   }
 
+  protected void processMousePressed(MouseEvent event) {
+  }
+
   protected void processDragCancel() {
   }
 
diff --git a/platform/platform-api/src/com/intellij/ui/tabs/TabInfo.java b/platform/platform-api/src/com/intellij/ui/tabs/TabInfo.java
index 56e646ab8f4d..b851d9745126 100644
--- a/platform/platform-api/src/com/intellij/ui/tabs/TabInfo.java
+++ b/platform/platform-api/src/com/intellij/ui/tabs/TabInfo.java
@@ -86,6 +86,12 @@ public final class TabInfo implements Queryable, PlaceProvider<String> {
   private Queryable myQueryable;
   private DragOutDelegate myDragOutDelegate;
 
+  /**
+   * The tab which was selected before the mouse was pressed on this tab. Focus will be transferred to that tab if this tab is dragged
+   * out of its container. (IDEA-61536)
+   */
+  private WeakReference<TabInfo> myPreviousSelection = new WeakReference<TabInfo>(null);
+
   public TabInfo(final JComponent component) {
     myComponent = component;
     myPreferredFocusableComponent = component;
@@ -371,6 +377,15 @@ public final class TabInfo implements Queryable, PlaceProvider<String> {
     return myDragOutDelegate;
   }
 
+  public void setPreviousSelection(@Nullable TabInfo previousSelection) {
+    myPreviousSelection = new WeakReference<TabInfo>(previousSelection);
+  }
+
+  @Nullable
+  public TabInfo getPreviousSelection() {
+    return myPreviousSelection.get();
+  }
+
   public interface DragOutDelegate {
 
     void dragOutStarted(MouseEvent mouseEvent, TabInfo info);
diff --git a/platform/platform-api/src/com/intellij/ui/tabs/impl/DragHelper.java b/platform/platform-api/src/com/intellij/ui/tabs/impl/DragHelper.java
index c67151d77509..979f08e2fc22 100644
--- a/platform/platform-api/src/com/intellij/ui/tabs/impl/DragHelper.java
+++ b/platform/platform-api/src/com/intellij/ui/tabs/impl/DragHelper.java
@@ -18,6 +18,7 @@ package com.intellij.ui.tabs.impl;
 import com.intellij.ui.InplaceButton;
 import com.intellij.ui.MouseDragHelper;
 import com.intellij.ui.ScreenUtil;
+import com.intellij.ui.awt.RelativePoint;
 import com.intellij.ui.tabs.TabInfo;
 import org.jetbrains.annotations.Nullable;
 
@@ -38,6 +39,7 @@ class DragHelper extends MouseDragHelper {
   Measurer myVertical = new Measurer.Height();
 
   private TabInfo myDragOutSource;
+  private TabLabel myPressedTabLabel;
 
   public DragHelper(JBTabsImpl tabs) {
     super(tabs, tabs);
@@ -81,19 +83,25 @@ class DragHelper extends MouseDragHelper {
     myDragOutSource.getDragOutDelegate().dragOutCancelled(myDragOutSource);
   }
 
+  @Override
+  protected void processMousePressed(MouseEvent event) {
+    // since selection change can cause tabs to be reordered, we need to remember the tab on which the mouse was pressed, otherwise
+    // we'll end up dragging the wrong tab (IDEA-65073)
+    myPressedTabLabel = findLabel(new RelativePoint(event).getPoint(myTabs));
+  }
+
   protected void processDrag(MouseEvent event, Point targetScreenPoint, Point startPointScreen) {
     if (!myTabs.isTabDraggingEnabled()) return;
 
     SwingUtilities.convertPointFromScreen(startPointScreen, myTabs);
 
     if (isDragJustStarted()) {
-      final TabLabel label = findLabel(startPointScreen);
-      if (label == null) return;
+      if (myPressedTabLabel == null) return;
 
-      final Rectangle labelBounds = label.getBounds();
+      final Rectangle labelBounds = myPressedTabLabel.getBounds();
 
       myHoldDelta = new Dimension(startPointScreen.x - labelBounds.x, startPointScreen.y - labelBounds.y);
-      myDragSource = label.getInfo();
+      myDragSource = myPressedTabLabel.getInfo();
       myDragRec = new Rectangle(startPointScreen, labelBounds.getSize());
       myDragOriginalRec = (Rectangle)myDragRec.clone();
 
diff --git a/platform/platform-api/src/com/intellij/ui/tabs/impl/JBTabsImpl.java b/platform/platform-api/src/com/intellij/ui/tabs/impl/JBTabsImpl.java
index 67ad7b6694ec..f651f7fabcb0 100644
--- a/platform/platform-api/src/com/intellij/ui/tabs/impl/JBTabsImpl.java
+++ b/platform/platform-api/src/com/intellij/ui/tabs/impl/JBTabsImpl.java
@@ -147,7 +147,7 @@ public class JBTabsImpl extends JComponent
 
   private TimedDeadzone.Length myTabActionsMouseDeadzone = TimedDeadzone.DEFAULT;
 
-  private long myRemoveDefferredRequest;
+  private long myRemoveDeferredRequest;
   private boolean myTestMode;
 
   private JBTabsPosition myPosition = JBTabsPosition.top;
@@ -156,8 +156,6 @@ public class JBTabsImpl extends JComponent
   private BaseNavigationAction myNextAction;
   private BaseNavigationAction myPrevAction;
 
-  private boolean myWasEverShown;
-
   private boolean myTabDraggingEnabled;
   private DragHelper myDragHelper;
   private boolean myNavigationActionsEnabled = true;
@@ -884,11 +882,11 @@ public class JBTabsImpl extends JComponent
   private ActionCallback removeDeferred() {
     final ActionCallback callback = new ActionCallback();
 
-    final long executionRequest = ++myRemoveDefferredRequest;
+    final long executionRequest = ++myRemoveDeferredRequest;
 
     final Runnable onDone = new Runnable() {
       public void run() {
-        if (myRemoveDefferredRequest == executionRequest) {
+        if (myRemoveDeferredRequest == executionRequest) {
           removeDeferredNow();
         }
 
@@ -1468,11 +1466,6 @@ public class JBTabsImpl extends JComponent
     return insets;
   }
 
-  private int fixInset(int inset, int addin) {
-    return inset + addin;
-  }
-
-
   public int getToolbarInset() {
     return getArcSize() + 1;
   }
@@ -2903,7 +2896,7 @@ public class JBTabsImpl extends JComponent
     return mySingleRowLayout;
   }
 
-  public JBTabsPresentation setUiDecorator(UiDecorator decorator) {
+  public JBTabsPresentation setUiDecorator(@Nullable UiDecorator decorator) {
     myUiDecorator = decorator == null ? ourDefaultDecorator : decorator;
     applyDecoration();
     return this;
@@ -2989,9 +2982,7 @@ public class JBTabsImpl extends JComponent
       ActionGroup group = selection.getGroup();
       if (group != null) {
         AnAction[] children = group.getChildren(null);
-        for (int i = 0; i < children.length; i++) {
-          result.add(children[i]);
-        }
+        Collections.addAll(result, children);
       }
     }
 
diff --git a/platform/platform-api/src/com/intellij/ui/tabs/impl/TabLabel.java b/platform/platform-api/src/com/intellij/ui/tabs/impl/TabLabel.java
index 63237e5e51b8..a35f05d2f2c3 100644
--- a/platform/platform-api/src/com/intellij/ui/tabs/impl/TabLabel.java
+++ b/platform/platform-api/src/com/intellij/ui/tabs/impl/TabLabel.java
@@ -34,6 +34,7 @@ import com.intellij.ui.tabs.UiDecorator;
 import com.intellij.ui.tabs.impl.table.TableLayout;
 import com.intellij.util.PairConsumer;
 import com.intellij.util.ui.Centerizer;
+import org.jetbrains.annotations.Nullable;
 
 import javax.swing.*;
 import javax.swing.border.EmptyBorder;
@@ -87,6 +88,10 @@ public class TabLabel extends JPanel {
     addMouseListener(new MouseAdapter() {
       public void mousePressed(final MouseEvent e) {
         if (myTabs.isSelectionClick(e, false) && myInfo.isEnabled()) {
+          final TabInfo selectedInfo = myTabs.getSelectedInfo();
+          if (selectedInfo != myInfo) {
+            myInfo.setPreviousSelection(selectedInfo);
+          }
           Component c = SwingUtilities.getDeepestComponentAt(e.getComponent(), e.getX(), e.getY());
           if (c instanceof InplaceButton) return;
           myTabs.select(info, true);
@@ -101,6 +106,7 @@ public class TabLabel extends JPanel {
       }
 
       public void mouseReleased(final MouseEvent e) {
+        myInfo.setPreviousSelection(null);
         handlePopup(e);
       }
     });
@@ -385,8 +391,8 @@ public class TabLabel extends JPanel {
     }
   }
 
-  private static int getValue(int curentValue, int newValue) {
-    return newValue != -1 ? newValue : curentValue;
+  private static int getValue(int currentValue, int newValue) {
+    return newValue != -1 ? newValue : currentValue;
   }
 
   public void setTabActions(ActionGroup group) {
@@ -530,6 +536,7 @@ public class TabLabel extends JPanel {
   }
 
 
+  @Nullable
   public BufferedImage getInactiveStateImage(Rectangle effectiveBounds) {
     BufferedImage img = null;
     if (myLastPaintedInactiveImageBounds != null && myLastPaintedInactiveImageBounds.getSize().equals(effectiveBounds.getSize())) {
@@ -541,7 +548,7 @@ public class TabLabel extends JPanel {
     return img;
   }
 
-  public void setInactiveStateImage(BufferedImage img) {
+  public void setInactiveStateImage(@Nullable BufferedImage img) {
     if (myInactiveStateImage != null && img != myInactiveStateImage) {
       myInactiveStateImage.flush();
     }
diff --git a/platform/platform-api/src/com/intellij/ui/treeStructure/filtered/FilteringTreeStructure.java b/platform/platform-api/src/com/intellij/ui/treeStructure/filtered/FilteringTreeStructure.java
index 7a3fce1253bc..2f9403d92d55 100644
--- a/platform/platform-api/src/com/intellij/ui/treeStructure/filtered/FilteringTreeStructure.java
+++ b/platform/platform-api/src/com/intellij/ui/treeStructure/filtered/FilteringTreeStructure.java
@@ -100,6 +100,7 @@ public class FilteringTreeStructure extends AbstractTreeStructure {
   }
 
   private void setUnknown(FilteringNode node) {
+    if (node.state == State.UNKNOWN) return;
     node.state = State.UNKNOWN;
     List<FilteringNode> nodes = myNodesCache.get(node);
     if (nodes != null) {
diff --git a/platform/platform-impl/src/com/intellij/ide/diff/VirtualFileDiffElement.java b/platform/platform-impl/src/com/intellij/ide/diff/VirtualFileDiffElement.java
index c1aeecb5e5eb..422fb29338da 100644
--- a/platform/platform-impl/src/com/intellij/ide/diff/VirtualFileDiffElement.java
+++ b/platform/platform-impl/src/com/intellij/ide/diff/VirtualFileDiffElement.java
@@ -16,6 +16,7 @@
 package com.intellij.ide.diff;
 
 import com.intellij.ide.presentation.VirtualFilePresentation;
+import com.intellij.ide.util.PropertiesComponent;
 import com.intellij.openapi.actionSystem.DataProvider;
 import com.intellij.openapi.actionSystem.PlatformDataKeys;
 import com.intellij.openapi.application.AccessToken;
@@ -26,9 +27,7 @@ import com.intellij.openapi.diff.DiffRequest;
 import com.intellij.openapi.editor.Document;
 import com.intellij.openapi.fileChooser.FileChooserDescriptor;
 import com.intellij.openapi.fileChooser.FileChooserFactory;
-import com.intellij.openapi.fileEditor.FileDocumentManager;
-import com.intellij.openapi.fileEditor.FileEditor;
-import com.intellij.openapi.fileEditor.FileEditorProvider;
+import com.intellij.openapi.fileEditor.*;
 import com.intellij.openapi.fileEditor.ex.FileEditorProviderManager;
 import com.intellij.openapi.fileTypes.FileTypeManager;
 import com.intellij.openapi.project.Project;
@@ -47,7 +46,9 @@ import javax.swing.*;
 import java.io.File;
 import java.io.IOException;
 import java.util.ArrayList;
+import java.util.HashMap;
 import java.util.List;
+import java.util.Map;
 import java.util.concurrent.Callable;
 
 /**
@@ -149,11 +150,47 @@ public class VirtualFileDiffElement extends DiffElement<VirtualFile> {
     if (providers.length > 0) {
       myFileEditor = providers[0].createEditor(project, getValue());
       myEditorProvider = providers[0];
+      setCustomState(myFileEditor);
       return myFileEditor.getComponent();
     }
     return null;
   }
 
+  private static void setCustomState(FileEditor editor) {
+    final FileEditorState state = editor.getState(FileEditorStateLevel.FULL);
+    if (state instanceof TransferableFileEditorState) {
+      final TransferableFileEditorState editorState = (TransferableFileEditorState)state;
+      final String id = editorState.getEditorId();
+      final HashMap<String, String> options = new HashMap<String, String>();
+      final PropertiesComponent properties = PropertiesComponent.getInstance();
+      for (String key : editorState.getTransferableOptions().keySet()) {
+        final String value = properties.getValue(getKey(id, key));
+        if (value != null) {
+          options.put(key, value);
+        }
+      }
+      editorState.setTransferableOptions(options);
+      editor.setState(editorState);
+    }
+  }
+
+  private static void saveCustomState(FileEditor editor) {
+    final FileEditorState state = editor.getState(FileEditorStateLevel.FULL);
+    if (state instanceof TransferableFileEditorState) {
+      final TransferableFileEditorState editorState = (TransferableFileEditorState)state;
+      final String id = editorState.getEditorId();
+      final PropertiesComponent properties = PropertiesComponent.getInstance();
+      final Map<String,String> options = editorState.getTransferableOptions();
+      for (String key : options.keySet()) {
+        properties.setValue(getKey(id, key), options.get(key));
+      }
+    }
+  }
+
+  private static String getKey(String editorId, String key) {
+    return "dir.diff.editor.options." + editorId + "." + key;
+  }
+
   @Override
   protected DiffRequest createRequestForBinaries(Project project, @NotNull VirtualFile src, @NotNull VirtualFile trg) {
     if (FileEditorProviderManager.getInstance().getProviders(project, src).length > 0
@@ -168,6 +205,7 @@ public class VirtualFileDiffElement extends DiffElement<VirtualFile> {
   public void disposeViewComponent() {
     super.disposeViewComponent();
     if (myFileEditor != null && myEditorProvider != null) {
+      saveCustomState(myFileEditor);
       myEditorProvider.disposeEditor(myFileEditor);
       myFileEditor = null;
       myEditorProvider = null;
diff --git a/platform/platform-impl/src/com/intellij/ide/dnd/aware/DnDAwareTree.java b/platform/platform-impl/src/com/intellij/ide/dnd/aware/DnDAwareTree.java
index 3957149b1967..f525f5a7cd7f 100644
--- a/platform/platform-impl/src/com/intellij/ide/dnd/aware/DnDAwareTree.java
+++ b/platform/platform-impl/src/com/intellij/ide/dnd/aware/DnDAwareTree.java
@@ -17,6 +17,7 @@ package com.intellij.ide.dnd.aware;
 
 import com.intellij.ide.dnd.DnDAware;
 import com.intellij.openapi.util.Pair;
+import com.intellij.openapi.util.SystemInfo;
 import com.intellij.ui.treeStructure.Tree;
 import com.intellij.util.ui.UIUtil;
 import com.intellij.util.ui.tree.TreeUtil;
@@ -49,6 +50,12 @@ public class DnDAwareTree extends Tree implements DnDAware {
     super.processMouseEvent(e);
   }
 
+  @Override
+  protected void processMouseMotionEvent(MouseEvent e) {
+    if (SystemInfo.isMac && SwingUtilities.isRightMouseButton(e) && e.getID() == MouseEvent.MOUSE_DRAGGED) return;
+    super.processMouseMotionEvent(e);
+  }
+
   public final boolean isOverSelection(final Point point) {
     final TreeUI ui = getUI();
     final TreePath path = ui instanceof UIUtil.MacTreeUI && ((UIUtil.MacTreeUI)ui).isWideSelection()
diff --git a/platform/platform-impl/src/com/intellij/notification/EventLog.java b/platform/platform-impl/src/com/intellij/notification/EventLog.java
index bfd2dfc15bd9..d4b39dfdff33 100644
--- a/platform/platform-impl/src/com/intellij/notification/EventLog.java
+++ b/platform/platform-impl/src/com/intellij/notification/EventLog.java
@@ -121,7 +121,7 @@ public class EventLog implements Notifications {
     return getLogModel(project).getStatusMessage();
   }
 
-  public static LogEntry formatForLog(@NotNull final Notification notification) {
+  public static LogEntry formatForLog(@NotNull final Notification notification, String indent) {
     DocumentImpl logDoc = new DocumentImpl(true);
     AtomicBoolean showMore = new AtomicBoolean(false);
     Map<RangeMarker, HyperlinkInfo> links = new LinkedHashMap<RangeMarker, HyperlinkInfo>();
@@ -141,7 +141,7 @@ public class EventLog implements Notifications {
 
     String status = getStatusText(logDoc, showMore, lineSeparators, hasHtml);
 
-    indentNewLines(logDoc, lineSeparators, afterTitle, hasHtml);
+    indentNewLines(logDoc, lineSeparators, afterTitle, hasHtml, indent);
 
     ArrayList<Pair<TextRange, HyperlinkInfo>> list = new ArrayList<Pair<TextRange, HyperlinkInfo>>();
     for (RangeMarker marker : links.keySet()) {
@@ -165,7 +165,7 @@ public class EventLog implements Notifications {
     return new LogEntry(logDoc.getText(), status, list);
   }
 
-  private static void indentNewLines(DocumentImpl logDoc, List<RangeMarker> lineSeparators, RangeMarker afterTitle, boolean hasHtml) {
+  private static void indentNewLines(DocumentImpl logDoc, List<RangeMarker> lineSeparators, RangeMarker afterTitle, boolean hasHtml, String indent) {
     if (!hasHtml) {
       int i = -1;
       while (true) {
@@ -187,8 +187,8 @@ public class EventLog implements Notifications {
           continue;
         }
 
-        logDoc.replaceString(start, separator.getEndOffset(), "\n\t");
-        nextLineStart = start + 2;
+        logDoc.replaceString(start, separator.getEndOffset(), "\n" + indent);
+        nextLineStart = start + 1 + indent.length();
         while (nextLineStart < logDoc.getTextLength() && Character.isWhitespace(logDoc.getCharsSequence().charAt(nextLineStart))) {
           logDoc.deleteString(nextLineStart, nextLineStart + 1);
         }
@@ -234,8 +234,9 @@ public class EventLog implements Notifications {
         int linkEnd = content.indexOf(A_CLOSING, tagMatcher.end());
         if (linkEnd > 0) {
           String linkText = content.substring(tagMatcher.end(), linkEnd).replaceAll(TAG_PATTERN.pattern(), "");
+          int linkStart = document.getTextLength();
           appendText(document, linkText);
-          links.put(document.createRangeMarker(new TextRange(document.getTextLength() - linkText.length(), document.getTextLength())),
+          links.put(document.createRangeMarker(new TextRange(linkStart, document.getTextLength())),
                     new NotificationHyperlinkInfo(notification, href));
           content = content.substring(linkEnd + A_CLOSING.length());
           continue;
diff --git a/platform/platform-impl/src/com/intellij/notification/EventLogConsole.java b/platform/platform-impl/src/com/intellij/notification/EventLogConsole.java
index f298cad20cdb..f4b45cd6f86c 100644
--- a/platform/platform-impl/src/com/intellij/notification/EventLogConsole.java
+++ b/platform/platform-impl/src/com/intellij/notification/EventLogConsole.java
@@ -38,6 +38,7 @@ import com.intellij.openapi.util.Disposer;
 import com.intellij.openapi.util.NotNullLazyValue;
 import com.intellij.openapi.util.Pair;
 import com.intellij.openapi.util.TextRange;
+import com.intellij.openapi.util.text.StringUtil;
 import com.intellij.ui.awt.RelativePoint;
 import com.intellij.util.EditorPopupHandler;
 import com.intellij.util.text.DateFormatUtil;
@@ -137,10 +138,11 @@ class EventLogConsole {
     if (notificationTime == null) {
       return;
     }
-    
-    append(document, DateFormatUtil.formatTimeWithSeconds(notificationTime) + " ");
 
-    EventLog.LogEntry pair = EventLog.formatForLog(notification);
+    String date = DateFormatUtil.formatTimeWithSeconds(notificationTime) + " ";
+    append(document, date);
+
+    EventLog.LogEntry pair = EventLog.formatForLog(notification, StringUtil.repeatSymbol(' ', date.length()));
 
     final NotificationType type = notification.getType();
     TextAttributesKey key = type == NotificationType.ERROR
diff --git a/platform/platform-impl/src/com/intellij/notification/impl/actions/NotificationTestAction.java b/platform/platform-impl/src/com/intellij/notification/impl/actions/NotificationTestAction.java
index 4e998c2833b0..a1e9e584c843 100644
--- a/platform/platform-impl/src/com/intellij/notification/impl/actions/NotificationTestAction.java
+++ b/platform/platform-impl/src/com/intellij/notification/impl/actions/NotificationTestAction.java
@@ -61,7 +61,7 @@ public class NotificationTestAction extends AnAction implements DumbAware {
     };
 
     final Notification notification = new Notification(TEST_GROUP_ID, "This is a test notification", //"a",
-      "You can close this very very very very long notification by clicking <a href=\"close\">this link</a>. Long long long long. It should be long. Very long. Too long. And even longer.",
+      "You can<br> close this very<p> very very very long notification by clicking <a href=\"close\">this link</a>. Long long long long. It should be long. Very long. Too long. And even longer.",
       type, listener);
 
     messageBus.syncPublisher(Notifications.TOPIC).notify(notification);
diff --git a/platform/platform-impl/src/com/intellij/openapi/application/impl/ApplicationImpl.java b/platform/platform-impl/src/com/intellij/openapi/application/impl/ApplicationImpl.java
index b88935f46efc..b3f56b46d224 100644
--- a/platform/platform-impl/src/com/intellij/openapi/application/impl/ApplicationImpl.java
+++ b/platform/platform-impl/src/com/intellij/openapi/application/impl/ApplicationImpl.java
@@ -1309,7 +1309,7 @@ public class ApplicationImpl extends ComponentManagerImpl implements Application
   }
 
   public boolean isDisposeInProgress() {
-    return myDisposeInProgress;
+    return myDisposeInProgress || ShutDownTracker.isShutdownHookRunning();
   }
 
   public boolean isRestartCapable() {
diff --git a/platform/platform-impl/src/com/intellij/openapi/editor/impl/EditorImpl.java b/platform/platform-impl/src/com/intellij/openapi/editor/impl/EditorImpl.java
index a4763ae3a7c3..2bcdcec7613c 100644
--- a/platform/platform-impl/src/com/intellij/openapi/editor/impl/EditorImpl.java
+++ b/platform/platform-impl/src/com/intellij/openapi/editor/impl/EditorImpl.java
@@ -1659,19 +1659,29 @@ public final class EditorImpl extends UserDataHolderBase implements EditorEx, Hi
   }
 
   public void stopDumb() {
-    putUserData(BUFFER, null);
+    if (ApplicationManager.getApplication().isUnitTestMode()) return;
+    final Runnable stopDumbRunnable = new Runnable() {
+      @Override
+      public void run() {
+        putUserData(BUFFER, null);
+      }
+    };
+    ApplicationManager.getApplication().invokeLater(stopDumbRunnable, ModalityState.current());
   }
 
   /**
-   * {@link #stopDumb()} must be performed in finally
+   * {@link #stopDumb} must be performed in finally
    */
   public void startDumb() {
+    if (ApplicationManager.getApplication().isUnitTestMode()) return;
     final EditorComponentImpl component = getContentComponent();
-    final Dimension dimension = component.getSize();
-    BufferedImage image = new BufferedImage(dimension.width, dimension.height, BufferedImage.TYPE_INT_RGB);
+    final Rectangle rect = component.getVisibleRect();
+    BufferedImage image = new BufferedImage(rect.width, rect.height, BufferedImage.TYPE_INT_RGB);
     final Graphics2D graphics = image.createGraphics();
-    graphics.setClip(0, 0, dimension.width, dimension.height);
+    graphics.translate(-rect.x, -rect.y);
+    graphics.setClip(rect.x, rect.y, rect.width, rect.height);
     paint(graphics);
+    graphics.translate(rect.x, rect.y);
     putUserData(BUFFER, image);
   }
   
@@ -1685,9 +1695,9 @@ public final class EditorImpl extends UserDataHolderBase implements EditorEx, Hi
     if (Registry.is("editor.dumb.mode.available")) {
       final BufferedImage buffer = getUserData(BUFFER);
       if (buffer != null) {
-        final Point point = new Point(clip.x, clip.y);
-        SwingUtilities.convertPointFromScreen(point, getContentComponent());
-        g.drawImage(buffer, null, 0, 0);
+        g.setClip(clip.x, clip.y, buffer.getWidth(), buffer.getHeight());
+        final Rectangle rect = getContentComponent().getVisibleRect();
+        g.drawImage(buffer, null, rect.x, rect.y);
         return;
       }
     }
diff --git a/platform/platform-impl/src/com/intellij/openapi/fileEditor/impl/EditorTabbedContainer.java b/platform/platform-impl/src/com/intellij/openapi/fileEditor/impl/EditorTabbedContainer.java
index 20a19762b1b8..b24815f3f014 100644
--- a/platform/platform-impl/src/com/intellij/openapi/fileEditor/impl/EditorTabbedContainer.java
+++ b/platform/platform-impl/src/com/intellij/openapi/fileEditor/impl/EditorTabbedContainer.java
@@ -212,7 +212,12 @@ final class EditorTabbedContainer implements Disposable, CloseAction.CloseTarget
 
   public ActionCallback removeTabAt(final int componentIndex, int indexToSelect, boolean transferFocus) {
     TabInfo toSelect = indexToSelect >= 0 && indexToSelect < myTabs.getTabCount() ? myTabs.getTabAt(indexToSelect) : null;
-    final ActionCallback callback = myTabs.removeTab(myTabs.getTabAt(componentIndex), toSelect, transferFocus);
+    final TabInfo info = myTabs.getTabAt(componentIndex);
+    // removing hidden tab happens on end of drag-out, we've already selected the correct tab for this case in dragOutStarted
+    if (info.isHidden()) {
+      toSelect = null;
+    }
+    final ActionCallback callback = myTabs.removeTab(info, toSelect, transferFocus);
     return myProject.isOpen() ? callback : new ActionCallback.Done();
   }
 
@@ -554,8 +559,12 @@ final class EditorTabbedContainer implements Disposable, CloseAction.CloseTarget
 
     @Override
     public void dragOutStarted(MouseEvent mouseEvent, TabInfo info) {
+      final TabInfo previousSelection = info.getPreviousSelection();
       final Image img = myTabs.getComponentImage(info);
       info.setHidden(true);
+      if (previousSelection != null) {
+        myTabs.select(previousSelection, true);
+      }
 
       myFile = (VirtualFile)info.getObject();
       Presentation presentation = new Presentation(info.getText());
diff --git a/platform/platform-impl/src/com/intellij/openapi/wm/impl/ProjectWindowAction.java b/platform/platform-impl/src/com/intellij/openapi/wm/impl/ProjectWindowAction.java
index 12744f8a6534..60ce09d2c921 100644
--- a/platform/platform-impl/src/com/intellij/openapi/wm/impl/ProjectWindowAction.java
+++ b/platform/platform-impl/src/com/intellij/openapi/wm/impl/ProjectWindowAction.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2000-2011 JetBrains s.r.o.
+ * Copyright 2000-2012 JetBrains s.r.o.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -28,6 +28,7 @@ import org.jetbrains.annotations.Nullable;
 import java.awt.*;
 
 /**
+ * @ author Bas Leijdekkers
  * This class is programmatically instantiated and registered when opening and closing projects
  * and thus not registered in plugin.xml
  */
@@ -36,9 +37,13 @@ public class ProjectWindowAction extends ToggleAction implements DumbAware {
 
   private ProjectWindowAction myPrevious;
   private ProjectWindowAction myNext;
+  @NotNull private final String myProjectName;
+  @NotNull private final String myProjectLocation;
 
-  public ProjectWindowAction(@NotNull String projectName, ProjectWindowAction previous) {
+  public ProjectWindowAction(@NotNull String projectName, @NotNull String projectLocation, ProjectWindowAction previous) {
     super(projectName);
+    myProjectName = projectName;
+    myProjectLocation = projectLocation;
     if (previous != null) {
       myPrevious = previous;
       myNext = previous.myNext;
@@ -71,11 +76,21 @@ public class ProjectWindowAction extends ToggleAction implements DumbAware {
     return myNext;
   }
 
+  @NotNull
+  public String getProjectLocation() {
+    return myProjectLocation;
+  }
+
+  @NotNull
+  public String getProjectName() {
+    return myProjectName;
+  }
+
   @Nullable
-  public static Frame findProjectFrame(@NotNull String projectName) {
+  public Frame findProjectFrame() {
     final Project[] projects = ProjectManager.getInstance().getOpenProjects();
     for (Project project : projects) {
-      if (projectName.equals(project.getName())) {
+      if (myProjectLocation.equals(project.getLocation())) {
         final WindowManager windowManager = WindowManager.getInstance();
         return windowManager.getFrame(project);
       }
@@ -89,15 +104,14 @@ public class ProjectWindowAction extends ToggleAction implements DumbAware {
     if (project == null) {
       return false;
     }
-    final String text = getTemplatePresentation().getText();
-    return text.equals(project.getName());
+    return myProjectLocation.equals(project.getLocation());
   }
 
   public void setSelected(@Nullable AnActionEvent e, boolean selected) {
     if (!selected) {
       return;
     }
-    final Frame projectFrame = findProjectFrame(getTemplatePresentation().getText());
+    final Frame projectFrame = findProjectFrame();
     if (projectFrame == null) {
       return;
     }
diff --git a/platform/platform-impl/src/com/intellij/openapi/wm/impl/ProjectWindowActionGroup.java b/platform/platform-impl/src/com/intellij/openapi/wm/impl/ProjectWindowActionGroup.java
index f68e6201a6fc..4c8bc785c276 100644
--- a/platform/platform-impl/src/com/intellij/openapi/wm/impl/ProjectWindowActionGroup.java
+++ b/platform/platform-impl/src/com/intellij/openapi/wm/impl/ProjectWindowActionGroup.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2000-2011 JetBrains s.r.o.
+ * Copyright 2000-2012 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.
@@ -20,20 +20,43 @@ import com.intellij.openapi.actionSystem.AnActionEvent;
 import com.intellij.openapi.actionSystem.DefaultActionGroup;
 import com.intellij.openapi.actionSystem.PlatformDataKeys;
 import com.intellij.openapi.project.Project;
+import com.intellij.openapi.util.io.FileUtil;
 import org.jetbrains.annotations.NotNull;
+import org.jetbrains.annotations.Nullable;
 
+import java.util.ArrayList;
+import java.util.Collections;
+import java.util.List;
+
+/**
+ * @author Bas Leijdekkers
+ */
 public class ProjectWindowActionGroup extends DefaultActionGroup {
 
   private ProjectWindowAction latest = null;
 
-  public void addProject(@NotNull String name) {
-    final ProjectWindowAction windowAction = new ProjectWindowAction(name, latest);
+  public void addProject(@NotNull Project project) {
+    final String projectLocation = project.getLocation();
+    if (projectLocation == null) {
+      return;
+    }
+    final String projectName = project.getName();
+    final ProjectWindowAction windowAction = new ProjectWindowAction(projectName, projectLocation, latest);
+    final List<ProjectWindowAction> duplicateWindowActions = findWindowActionsWithProjectName(projectName);
+    if (!duplicateWindowActions.isEmpty()) {
+      for (ProjectWindowAction action : duplicateWindowActions) {
+        action.getTemplatePresentation().setText(FileUtil.getLocationRelativeToUserHome(
+          FileUtil.toSystemDependentName(action.getProjectLocation())));
+      }
+      windowAction.getTemplatePresentation().setText(FileUtil.getLocationRelativeToUserHome(
+        FileUtil.toSystemDependentName(windowAction.getProjectLocation())));
+    }
     add(windowAction);
     latest = windowAction;
   }
 
-  public void removeProject(@NotNull String name) {
-    final ProjectWindowAction windowAction = findWindowAction(name);
+  public void removeProject(@NotNull Project project) {
+    final ProjectWindowAction windowAction = findWindowAction(project.getLocation());
     if (windowAction == null) {
       return;
     }
@@ -46,6 +69,11 @@ public class ProjectWindowActionGroup extends DefaultActionGroup {
       }
     }
     remove(windowAction);
+    final String projectName = project.getName();
+    final List<ProjectWindowAction> duplicateWindowActions = findWindowActionsWithProjectName(projectName);
+    if (duplicateWindowActions.size() == 1) {
+      duplicateWindowActions.get(0).getTemplatePresentation().setText(projectName);
+    }
     windowAction.dispose();
   }
 
@@ -63,7 +91,7 @@ public class ProjectWindowActionGroup extends DefaultActionGroup {
     if (project == null) {
       return;
     }
-    final ProjectWindowAction windowAction = findWindowAction(project.getName());
+    final ProjectWindowAction windowAction = findWindowAction(project.getLocation());
     if (windowAction == null) {
       return;
     }
@@ -78,7 +106,7 @@ public class ProjectWindowActionGroup extends DefaultActionGroup {
     if (project == null) {
       return;
     }
-    final ProjectWindowAction windowAction = findWindowAction(project.getName());
+    final ProjectWindowAction windowAction = findWindowAction(project.getLocation());
     if (windowAction == null) {
       return;
     }
@@ -88,17 +116,42 @@ public class ProjectWindowActionGroup extends DefaultActionGroup {
     }
   }
 
-  private ProjectWindowAction findWindowAction(String name) {
+  @Nullable
+  private ProjectWindowAction findWindowAction(String projectLocation) {
+    if (projectLocation == null) {
+      return null;
+    }
     final AnAction[] children = getChildren(null);
     for (AnAction child : children) {
       if (!(child instanceof ProjectWindowAction)) {
         continue;
       }
       final ProjectWindowAction windowAction = (ProjectWindowAction) child;
-      if (name.equals(windowAction.getTemplatePresentation().getText())) {
+      if (projectLocation.equals(windowAction.getProjectLocation())) {
         return windowAction;
       }
     }
     return null;
   }
+
+  private List<ProjectWindowAction> findWindowActionsWithProjectName(String projectName) {
+    List<ProjectWindowAction> result = null;
+    final AnAction[] children = getChildren(null);
+    for (AnAction child : children) {
+      if (!(child instanceof ProjectWindowAction)) {
+        continue;
+      }
+      final ProjectWindowAction windowAction = (ProjectWindowAction) child;
+      if (projectName.equals(windowAction.getProjectName())) {
+        if (result == null) {
+          result = new ArrayList();
+        }
+        result.add(windowAction);
+      }
+    }
+    if (result == null) {
+      return Collections.emptyList();
+    }
+    return result;
+  }
 }
\ No newline at end of file
diff --git a/platform/platform-impl/src/com/intellij/openapi/wm/impl/WindowDressing.java b/platform/platform-impl/src/com/intellij/openapi/wm/impl/WindowDressing.java
index 977a447ea85e..e4da89a869d0 100644
--- a/platform/platform-impl/src/com/intellij/openapi/wm/impl/WindowDressing.java
+++ b/platform/platform-impl/src/com/intellij/openapi/wm/impl/WindowDressing.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2000-2011 JetBrains s.r.o.
+ * Copyright 2000-2012 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.
@@ -20,6 +20,9 @@ import com.intellij.openapi.components.AbstractProjectComponent;
 import com.intellij.openapi.project.Project;
 import org.jetbrains.annotations.NotNull;
 
+/**
+ * @author Bas Leijdekkers
+ */
 public class WindowDressing extends AbstractProjectComponent {
 
   public WindowDressing(@NotNull Project project) {
@@ -27,11 +30,11 @@ public class WindowDressing extends AbstractProjectComponent {
   }
 
   public void projectOpened() {
-    getWindowActionGroup().addProject(myProject.getName());
+    getWindowActionGroup().addProject(myProject);
   }
 
   public void projectClosed() {
-    getWindowActionGroup().removeProject(myProject.getName());
+    getWindowActionGroup().removeProject(myProject);
   }
 
   public static ProjectWindowActionGroup getWindowActionGroup() {
diff --git a/platform/platform-impl/src/com/intellij/openapi/wm/impl/status/StatusPanel.java b/platform/platform-impl/src/com/intellij/openapi/wm/impl/status/StatusPanel.java
index 3f90f74fd95d..53f1f9e0ff04 100644
--- a/platform/platform-impl/src/com/intellij/openapi/wm/impl/status/StatusPanel.java
+++ b/platform/platform-impl/src/com/intellij/openapi/wm/impl/status/StatusPanel.java
@@ -161,7 +161,7 @@ class StatusPanel extends JPanel {
         @Override
         public void run() {
           assert statusMessage != null;
-          String text = EventLog.formatForLog(statusMessage.first).status;
+          String text = EventLog.formatForLog(statusMessage.first, "").status;
           if (myDirty || System.currentTimeMillis() - statusMessage.second >= DateFormatUtil.MINUTE) {
             myTimeStart = text.length() + 1;
             text += " (" + StringUtil.decapitalize(DateFormatUtil.formatPrettyDateTime(statusMessage.second)) + ")";
diff --git a/platform/platform-impl/src/com/intellij/ui/SpeedSearchBase.java b/platform/platform-impl/src/com/intellij/ui/SpeedSearchBase.java
index 7f29f725af9f..797edb0b4f98 100644
--- a/platform/platform-impl/src/com/intellij/ui/SpeedSearchBase.java
+++ b/platform/platform-impl/src/com/intellij/ui/SpeedSearchBase.java
@@ -17,16 +17,21 @@ package com.intellij.ui;
 
 import com.intellij.featureStatistics.FeatureUsageTracker;
 import com.intellij.ide.DataManager;
+import com.intellij.openapi.actionSystem.AnAction;
+import com.intellij.openapi.actionSystem.AnActionEvent;
+import com.intellij.openapi.actionSystem.CustomShortcutSet;
 import com.intellij.openapi.actionSystem.PlatformDataKeys;
 import com.intellij.openapi.application.ApplicationManager;
 import com.intellij.openapi.diagnostic.Logger;
 import com.intellij.openapi.project.Project;
+import com.intellij.openapi.util.SystemInfo;
 import com.intellij.openapi.util.TextRange;
 import com.intellij.openapi.util.text.StringUtil;
 import com.intellij.openapi.wm.ToolWindowManager;
 import com.intellij.openapi.wm.ex.ToolWindowManagerAdapter;
 import com.intellij.openapi.wm.ex.ToolWindowManagerEx;
 import com.intellij.openapi.wm.ex.ToolWindowManagerListener;
+import com.intellij.psi.codeStyle.NameUtil;
 import com.intellij.ui.speedSearch.SpeedSearchSupply;
 import com.intellij.util.ui.UIUtil;
 import org.jetbrains.annotations.NonNls;
@@ -78,6 +83,23 @@ public abstract class SpeedSearchBase<Comp extends JComponent> extends SpeedSear
       }
     });
 
+    new AnAction() {
+      @Override
+      public void actionPerformed(AnActionEvent e) {
+        final String prefix = getEnteredPrefix();
+        assert prefix != null;
+        final String[] strings = NameUtil.splitNameIntoWords(prefix);
+        final String last = strings[strings.length - 1];
+        final int i = prefix.lastIndexOf(last);
+        mySearchPopup.mySearchField.setText(prefix.substring(0, i).trim());
+      }
+
+      @Override
+      public void update(AnActionEvent e) {
+        e.getPresentation().setEnabled(isPopupActive() && !StringUtil.isEmpty(getEnteredPrefix()));
+      }
+    }.registerCustomShortcutSet(CustomShortcutSet.fromString(SystemInfo.isMac ? "meta BACK_SPACE" : "control BACK_SPACE"), myComponent);
+
     installSupplyTo(component);
   }
 
diff --git a/platform/platform-resources-en/src/messages/CodeInsightBundle.properties b/platform/platform-resources-en/src/messages/CodeInsightBundle.properties
index 9f45496bbc7f..96996b50611e 100644
--- a/platform/platform-resources-en/src/messages/CodeInsightBundle.properties
+++ b/platform/platform-resources-en/src/messages/CodeInsightBundle.properties
@@ -160,6 +160,7 @@ intention.split.if.family=Split If
 intention.split.if.text=Split into 2 if's
 intention.implement.abstract.method.family=Implement Abstract Method
 intention.implement.abstract.method.text=Implement method ''{0}''
+intention.override.method.text=Override method ''{0}''
 intention.add.annotation.family=Add Annotation
 intention.add.on.demand.static.import.family=Add On Demand Static Import
 intention.add.on.demand.static.import.text=Add on demand static import for ''{0}''
@@ -269,7 +270,7 @@ templates.surround.no.defined=No surround templates defined in this context
 templates.no.defined.with.prefix=No templates starting with ''{0}'' defined in this context
 templates.settings.page.title=Live Templates
 templates.select.template.chooser.title=Select Template
-templates.export.display.name=Code templates
+templates.export.display.name=Live templates
 templates.dialog.edit.variables.title=Edit Template Variables
 templates.dialog.edit.variables.border.title=Variables
 templates.dialog.edit.variables.action.move.up=Move &Up
diff --git a/platform/platform-resources-en/src/misc/registry.properties b/platform/platform-resources-en/src/misc/registry.properties
index 20657e9847e7..25819ceda9e5 100644
--- a/platform/platform-resources-en/src/misc/registry.properties
+++ b/platform/platform-resources-en/src/misc/registry.properties
@@ -116,7 +116,7 @@ debugger.valueTooltipAutoShow=true
 debugger.valueTooltipAutoShow.description=Auto show tooltip on mouse over
 debugger.mayBringFrameToFrontOnBreakpoint=true
 debugger.breakpoint.message.full.trace=false
-debugger.breakpoint.message.full.trace.description='Log message to console' breakpoint action will out full stacktrace for the trhread that hit the breakpoint
+debugger.breakpoint.message.full.trace.description='Log message to console' breakpoint action will out full stacktrace for the thread that hit the breakpoint
 
 filesystem.useNative=true
 
diff --git a/platform/platform-resources/src/idea/PlatformActions.xml b/platform/platform-resources/src/idea/PlatformActions.xml
index 7e170bca3e77..d0f904632b35 100644
--- a/platform/platform-resources/src/idea/PlatformActions.xml
+++ b/platform/platform-resources/src/idea/PlatformActions.xml
@@ -346,6 +346,7 @@
         <group id="OpenProjectWindows" class="com.intellij.openapi.wm.impl.ProjectWindowActionGroup">
           <action id="NextProjectWindow" class="com.intellij.openapi.wm.impl.NextProjectWindow"/>
           <action id="PreviousProjectWindow" class="com.intellij.openapi.wm.impl.PreviousProjectWindow"/>
+          <separator/>
         </group>
       </group>
 
diff --git a/platform/platform-tests/testSrc/com/intellij/notification/EventLogTest.groovy b/platform/platform-tests/testSrc/com/intellij/notification/EventLogTest.groovy
index a974d308537b..ffd1207a39cb 100644
--- a/platform/platform-tests/testSrc/com/intellij/notification/EventLogTest.groovy
+++ b/platform/platform-tests/testSrc/com/intellij/notification/EventLogTest.groovy
@@ -30,17 +30,17 @@ class EventLogTest extends LightPlatformTestCase {
   }
 
   public void testHtmlEntities() {
-    def entry = EventLog.formatForLog(new Notification("xxx", "Title", "Hello&nbsp;world&laquo;&raquo;", NotificationType.ERROR))
+    def entry = format("Title", "Hello&nbsp;world&laquo;&raquo;")
     assert entry.message == 'Title: Hello world<<>>'
   }
 
   public void testParseMultilineText() {
-    def entry = EventLog.formatForLog(new Notification("xxx", "Title", "<html><body> " +
+    def entry = format("Title", "<html><body> " +
                                                                        "<font size=\"3\">first line<br>" +
                                                                        "second line<br>" +
                                                                        "third<br>" +
                                                                        "<a href=\"create\">Action</a><br>" +
-                                                                       "</body></html>", NotificationType.ERROR))
+                                                                       "</body></html>")
     assert entry.status == 'Title:  first line second line third // Action'
     assert entry.message == '''Title
 \tfirst line
@@ -52,13 +52,13 @@ class EventLogTest extends LightPlatformTestCase {
   }
 
   public void testInParagraph() {
-    def entry = EventLog.formatForLog(new Notification("xxx", "Title", "<p>message</p>", NotificationType.ERROR))
+    def entry = format("Title", "<p>message</p>")
     assert entry.message == 'Title: message'
     assert entry.status == 'Title: message'
   }
 
   public void testJavaSeparators() {
-    def entry = EventLog.formatForLog(new Notification("xxx", "Title", "fst\nsnd", NotificationType.ERROR))
+    def entry = format("Title", "fst\nsnd")
     assert entry.message == '''Title
 \tfst
 \tsnd'''
@@ -71,7 +71,7 @@ class EventLogTest extends LightPlatformTestCase {
   }
 
   public void testMalformedLink() throws Exception {
-    def entry = EventLog.formatForLog(new Notification("xxx", '<a href="a">link<a/>', "content", NotificationType.ERROR))
+    def entry = format('<a href="a">link<a/>', "content")
     assert entry.message ==  'link: content (show balloon)'
   }
 
@@ -96,7 +96,7 @@ class EventLogTest extends LightPlatformTestCase {
   }
 
   EventLog.LogEntry format(String title, String content) {
-    EventLog.formatForLog(new Notification("xxx", title, content, NotificationType.ERROR))
+    EventLog.formatForLog(new Notification("xxx", title, content, NotificationType.ERROR), '\t')
   }
 
   public void testManyNewlines() throws Exception {
@@ -107,4 +107,14 @@ class EventLogTest extends LightPlatformTestCase {
 \tbar'''
   }
 
+  public void testTeamCityLink() {
+    def entry = format('title', '''<p>You are assigned for investigation of a test failure<br/>FtlFixesTest.testToplevelVariableLocal (IDEA Trunk), assigned by Roman Shevchenko<br/></p>
+<p><a href='#'>Details &raquo;</a></p>''')
+    assert entry.message == '''title
+\tYou are assigned for investigation of a test failure
+\tFtlFixesTest.testToplevelVariableLocal (IDEA Trunk), assigned by Roman Shevchenko
+\tDetails >>'''
+    assert entry.links.collect { it.first } == [new TextRange(144, 154)]
+  }
+
 }
diff --git a/platform/testFramework/src/com/intellij/testFramework/PlatformTestCase.java b/platform/testFramework/src/com/intellij/testFramework/PlatformTestCase.java
index 7c92f6ebc3b8..4e4a6bb5553d 100644
--- a/platform/testFramework/src/com/intellij/testFramework/PlatformTestCase.java
+++ b/platform/testFramework/src/com/intellij/testFramework/PlatformTestCase.java
@@ -110,7 +110,7 @@ public abstract class PlatformTestCase extends UsefulTestCase implements DataPro
   private ThreadTracker myThreadTracker;
 
   protected static boolean ourPlatformPrefixInitialized;
-  private static Set<VirtualFile> ourEternallyLivingFiles;
+  private static Set<VirtualFile> ourEternallyLivingFilesCache;
 
   static {
     Logger.setFactory(TestLoggerFactory.getInstance());
@@ -343,20 +343,9 @@ public abstract class PlatformTestCase extends UsefulTestCase implements DataPro
     PatchedWeakReference.clearAll();
   }
 
-  private static void addSubTree(VirtualFile root, Set<VirtualFile> to) {
-    if (root instanceof VirtualDirectoryImpl) {
-      for (VirtualFile child : ((VirtualDirectoryImpl)root).getCachedChildren()) {
-        if (child instanceof VirtualDirectoryImpl) {
-          to.add(child);
-          addSubTree(child, to);
-        }
-      }
-    }
-  }
-
-  public static Set<VirtualFile> eternallyLivingFiles() {
-    if (ourEternallyLivingFiles != null) {
-      return ourEternallyLivingFiles;
+  private static Set<VirtualFile> eternallyLivingFiles() {
+    if (ourEternallyLivingFilesCache != null) {
+      return ourEternallyLivingFilesCache;
     }
 
     Set<VirtualFile> survivors = new HashSet<VirtualFile>();
@@ -367,17 +356,34 @@ public abstract class PlatformTestCase extends UsefulTestCase implements DataPro
       }
     }
 
-    ourEternallyLivingFiles = survivors;
+    ourEternallyLivingFilesCache = survivors;
     return survivors;
   }
 
-  public static void registerSurvivor(Set<VirtualFile> survivors, VirtualFile file) {
+  public static void addSurvivingFiles(@NotNull Collection<VirtualFile> files) {
+    for (VirtualFile each : files) {
+      registerSurvivor(eternallyLivingFiles(), each);
+    }
+  }
+
+  private static void registerSurvivor(Set<VirtualFile> survivors, VirtualFile file) {
     addSubTree(file, survivors);
     while (file != null && survivors.add(file)) {
       file = file.getParent();
     }
   }
 
+  private static void addSubTree(VirtualFile root, Set<VirtualFile> to) {
+    if (root instanceof VirtualDirectoryImpl) {
+      for (VirtualFile child : ((VirtualDirectoryImpl)root).getCachedChildren()) {
+        if (child instanceof VirtualDirectoryImpl) {
+          to.add(child);
+          addSubTree(child, to);
+        }
+      }
+    }
+  }
+
   @Override
   protected void tearDown() throws Exception {
     CompositeException result = new CompositeException();
diff --git a/platform/vcs-api/src/com/intellij/openapi/vcs/checkin/BeforeCheckinDialogHandler.java b/platform/vcs-api/src/com/intellij/openapi/vcs/checkin/BeforeCheckinDialogHandler.java
index cbb51c59b205..1c9ec8dcd07e 100644
--- a/platform/vcs-api/src/com/intellij/openapi/vcs/checkin/BeforeCheckinDialogHandler.java
+++ b/platform/vcs-api/src/com/intellij/openapi/vcs/checkin/BeforeCheckinDialogHandler.java
@@ -1,13 +1,17 @@
 package com.intellij.openapi.vcs.checkin;
 
+import com.intellij.openapi.vcs.changes.CommitExecutor;
+
 /**
  * @author irengrig
  *         Date: 5/24/11
  *         Time: 7:23 PM
  */
-public interface BeforeCheckinDialogHandler {
+public abstract class BeforeCheckinDialogHandler {
   /**
    * @return false to cancel commit
+   * @param executors
+   * @param showVcsCommit
    */
-  boolean beforeCommitDialogShownCallback();
+  public abstract boolean beforeCommitDialogShownCallback(Iterable<CommitExecutor> executors, boolean showVcsCommit);
 }
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 c46617082086..67923aa96abb 100644
--- 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
@@ -143,8 +143,8 @@ public class CommitChangeListDialog extends DialogWrapper implements CheckinProj
       CheckinHandlersManager.getInstance().getMatchingVcsFactories(Arrays.<AbstractVcs>asList(allActiveVcss));
     for (BaseCheckinHandlerFactory factory : factoryList) {
       final BeforeCheckinDialogHandler handler = factory.createSystemReadyHandler(project);
-      if (handler != null) {
-        if (! handler.beforeCommitDialogShownCallback()) return false;
+      if (handler != null && !handler.beforeCommitDialogShownCallback(Collections.unmodifiableList(executors), showVcsCommit)) {
+        return false;
       }
     }
 
diff --git a/plugins/InspectionGadgets/src/com/siyeh/ig/threading/PublicFieldAccessedInSynchronizedContextInspection.java b/plugins/InspectionGadgets/src/com/siyeh/ig/threading/PublicFieldAccessedInSynchronizedContextInspection.java
index d2a6455a7f38..653c0986c627 100644
--- a/plugins/InspectionGadgets/src/com/siyeh/ig/threading/PublicFieldAccessedInSynchronizedContextInspection.java
+++ b/plugins/InspectionGadgets/src/com/siyeh/ig/threading/PublicFieldAccessedInSynchronizedContextInspection.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2003-2007 Dave Griffith, Bas Leijdekkers
+ * Copyright 2003-2012 Dave Griffith, Bas Leijdekkers
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -22,13 +22,11 @@ import com.siyeh.ig.BaseInspectionVisitor;
 import com.siyeh.ig.psiutils.SynchronizationUtil;
 import org.jetbrains.annotations.NotNull;
 
-public class PublicFieldAccessedInSynchronizedContextInspection
-  extends BaseInspection {
+public class PublicFieldAccessedInSynchronizedContextInspection extends BaseInspection {
 
   @NotNull
   public String getDisplayName() {
-    return InspectionGadgetsBundle.message(
-      "public.field.accessed.in.synchronized.context.display.name");
+    return InspectionGadgetsBundle.message("public.field.accessed.in.synchronized.context.display.name");
   }
 
   @NotNull
@@ -38,34 +36,34 @@ public class PublicFieldAccessedInSynchronizedContextInspection
 
   @NotNull
   protected String buildErrorString(Object... infos) {
-    return InspectionGadgetsBundle.message(
-      "public.field.accessed.in.synchronized.context.problem.descriptor");
+    return InspectionGadgetsBundle.message("public.field.accessed.in.synchronized.context.problem.descriptor");
   }
 
   public BaseInspectionVisitor buildVisitor() {
     return new PublicFieldAccessedInSynchronizedContextVisitor();
   }
 
-  private static class PublicFieldAccessedInSynchronizedContextVisitor
-    extends BaseInspectionVisitor {
+  private static class PublicFieldAccessedInSynchronizedContextVisitor extends BaseInspectionVisitor {
 
     @Override
-    public void visitReferenceExpression(
-      @NotNull PsiReferenceExpression expression) {
+    public void visitReferenceExpression(@NotNull PsiReferenceExpression expression) {
+      final PsiExpression qualifier = expression.getQualifierExpression();
+      if (qualifier != null && !(qualifier instanceof PsiThisExpression) && !(qualifier instanceof PsiSuperExpression)) {
+        return;
+      }
       final PsiElement element = expression.resolve();
       if (!(element instanceof PsiField)) {
         return;
       }
       final PsiField field = (PsiField)element;
-      if (field.hasModifierProperty(PsiModifier.PRIVATE) ||
-          field.hasModifierProperty(PsiModifier.FINAL)) {
+      if (field.hasModifierProperty(PsiModifier.PRIVATE) || field.hasModifierProperty(PsiModifier.FINAL)) {
         return;
       }
       if (!SynchronizationUtil.isInSynchronizedContext(expression)) {
         return;
       }
       final PsiClass containingClass = field.getContainingClass();
-      if (containingClass.hasModifierProperty(PsiModifier.PRIVATE)) {
+      if (containingClass == null || containingClass.hasModifierProperty(PsiModifier.PRIVATE)) {
         return;
       }
       registerError(expression);
diff --git a/plugins/InspectionGadgets/test/com/siyeh/igtest/threading/public_field_accessed_in_synchronized_context/Foo.java b/plugins/InspectionGadgets/test/com/siyeh/igtest/threading/public_field_accessed_in_synchronized_context/Foo.java
new file mode 100644
index 000000000000..8aeff1248395
--- /dev/null
+++ b/plugins/InspectionGadgets/test/com/siyeh/igtest/threading/public_field_accessed_in_synchronized_context/Foo.java
@@ -0,0 +1,26 @@
+package com.siyeh.igtest.threading.public_field_accessed_in_synchronized_context;
+
+import java.util.List;
+
+class Bar2 {
+  public String field1;
+  private String field2;
+
+  public void setField2(String s) {
+    field2 = s;
+  }
+}
+public class Foo {
+  public Bar2 myBar;
+  private List<Bar2> myBars;
+
+  synchronized public void setSingle() {
+    myBar.field1 = "bar";
+    myBar.setField2("bar");
+  }
+
+  synchronized public void setViaList() {
+    myBars.iterator().next().field1 = "bar";
+    myBars.iterator().next().setField2("bar");
+  }
+}
diff --git a/plugins/InspectionGadgets/test/com/siyeh/igtest/threading/public_field_accessed_in_synchronized_context/expected.xml b/plugins/InspectionGadgets/test/com/siyeh/igtest/threading/public_field_accessed_in_synchronized_context/expected.xml
new file mode 100644
index 000000000000..180519b7f224
--- /dev/null
+++ b/plugins/InspectionGadgets/test/com/siyeh/igtest/threading/public_field_accessed_in_synchronized_context/expected.xml
@@ -0,0 +1,16 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<problems>
+  <problem>
+    <file>Foo.java</file>
+    <line>18</line>
+    <problem_class severity="WARNING" attribute_key="WARNING_ATTRIBUTES">Non-private field accessed in synchronized context</problem_class>
+    <description>Non-private field &lt;code&gt;myBar&lt;/code&gt; accessed in synchronized context #loc</description>
+  </problem>
+
+  <problem>
+    <file>Foo.java</file>
+    <line>19</line>
+    <problem_class severity="WARNING" attribute_key="WARNING_ATTRIBUTES">Non-private field accessed in synchronized context</problem_class>
+    <description>Non-private field &lt;code&gt;myBar&lt;/code&gt; accessed in synchronized context #loc</description>
+  </problem>
+</problems>
\ No newline at end of file
diff --git a/plugins/InspectionGadgets/testsrc/com/siyeh/ig/threading/PublicFieldAccessedInSynchronizedContextInspectionTest.java b/plugins/InspectionGadgets/testsrc/com/siyeh/ig/threading/PublicFieldAccessedInSynchronizedContextInspectionTest.java
new file mode 100644
index 000000000000..3f766a4631b0
--- /dev/null
+++ b/plugins/InspectionGadgets/testsrc/com/siyeh/ig/threading/PublicFieldAccessedInSynchronizedContextInspectionTest.java
@@ -0,0 +1,12 @@
+package com.siyeh.ig.threading;
+
+import com.siyeh.ig.IGInspectionTestCase;
+
+public class PublicFieldAccessedInSynchronizedContextInspectionTest
+  extends IGInspectionTestCase {
+
+  public void test() throws Exception {
+    doTest("com/siyeh/igtest/threading/public_field_accessed_in_synchronized_context",
+           new PublicFieldAccessedInSynchronizedContextInspection());
+  }
+}
\ No newline at end of file
diff --git a/plugins/android-designer/src/com/intellij/android/designer/designSurface/TreeOperation.java b/plugins/android-designer/src/com/intellij/android/designer/designSurface/TreeOperation.java
new file mode 100644
index 000000000000..ee6ae2a370bb
--- /dev/null
+++ b/plugins/android-designer/src/com/intellij/android/designer/designSurface/TreeOperation.java
@@ -0,0 +1,40 @@
+/*
+ * Copyright 2000-2012 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.android.designer.designSurface;
+
+import com.intellij.android.designer.model.RadViewComponent;
+import com.intellij.designer.componentTree.TreeEditOperation;
+import com.intellij.designer.designSurface.OperationContext;
+import com.intellij.designer.model.RadComponent;
+
+/**
+ * @author Alexander Lobas
+ */
+public class TreeOperation extends TreeEditOperation {
+  public TreeOperation(RadComponent host, OperationContext context) {
+    super(host, context);
+  }
+
+  @Override
+  protected boolean canExecute(RadComponent insertBefore) {
+    return !"TableRow".equals(((RadViewComponent)myHost).getTitle());
+  }
+
+  @Override
+  protected void execute(RadComponent insertBefore) throws Exception {
+    System.out.println("Execute(" + myHost + ") insert " + myComponents + " before " + insertBefore);
+  }
+}
\ No newline at end of file
diff --git a/plugins/android-designer/src/com/intellij/android/designer/model/RadViewComponent.java b/plugins/android-designer/src/com/intellij/android/designer/model/RadViewComponent.java
index 17efca5c09ca..39b3694da575 100644
--- a/plugins/android-designer/src/com/intellij/android/designer/model/RadViewComponent.java
+++ b/plugins/android-designer/src/com/intellij/android/designer/model/RadViewComponent.java
@@ -51,6 +51,11 @@ public class RadViewComponent extends RadComponent {
     return myTitle;
   }
 
+  @Override
+  public String toString() {
+    return super.toString() + " - " + myTitle;
+  }
+
   @Override
   public Rectangle getBounds() {
     return myBounds;
diff --git a/plugins/android-designer/src/com/intellij/android/designer/model/RadViewLayout.java b/plugins/android-designer/src/com/intellij/android/designer/model/RadViewLayout.java
index b827f8eaa590..fb3f861a6807 100644
--- a/plugins/android-designer/src/com/intellij/android/designer/model/RadViewLayout.java
+++ b/plugins/android-designer/src/com/intellij/android/designer/model/RadViewLayout.java
@@ -17,6 +17,8 @@ package com.intellij.android.designer.model;
 
 import com.intellij.android.designer.designSurface.CreateOperation;
 import com.intellij.android.designer.designSurface.MoveOperation;
+import com.intellij.android.designer.designSurface.TreeOperation;
+import com.intellij.designer.componentTree.TreeEditOperation;
 import com.intellij.designer.designSurface.ComponentDecorator;
 import com.intellij.designer.designSurface.EditOperation;
 import com.intellij.designer.designSurface.OperationContext;
@@ -43,6 +45,15 @@ public class RadViewLayout extends RadLayout {
 
   @Override
   public EditOperation processChildOperation(OperationContext context) {
+    if (context.getArea().isTree()) {
+      if (!myContainer.getChildren().isEmpty() && TreeEditOperation.isTarget(myContainer, context)) {
+        /*if ("TableRow".equals(myContainer.getTitle())) {
+          return null;
+        }*/
+        return new TreeOperation(myContainer, context);
+      }
+      return null;
+    }
     if (context.isMove()) {
       return new MoveOperation(context);
     }
diff --git a/plugins/android/src/org/jetbrains/android/inspections/lint/AndroidLintInspectionBase.java b/plugins/android/src/org/jetbrains/android/inspections/lint/AndroidLintInspectionBase.java
index 5b7994193bbc..9e9e7c2944e1 100644
--- a/plugins/android/src/org/jetbrains/android/inspections/lint/AndroidLintInspectionBase.java
+++ b/plugins/android/src/org/jetbrains/android/inspections/lint/AndroidLintInspectionBase.java
@@ -2,6 +2,7 @@ package org.jetbrains.android.inspections.lint;
 
 import com.android.tools.lint.detector.api.Category;
 import com.android.tools.lint.detector.api.Issue;
+import com.android.tools.lint.detector.api.Scope;
 import com.android.tools.lint.detector.api.Severity;
 import com.intellij.analysis.AnalysisScope;
 import com.intellij.codeHighlighting.HighlightDisplayLevel;
@@ -31,6 +32,7 @@ import org.jetbrains.annotations.Nullable;
 
 import java.io.File;
 import java.util.ArrayList;
+import java.util.EnumSet;
 import java.util.List;
 import java.util.Map;
 
@@ -282,7 +284,19 @@ public abstract class AndroidLintInspectionBase extends GlobalInspectionTool {
         return null;
     }
   }
-  
+
+  public boolean worksInBatchModeOnly() {
+    final EnumSet<Scope> scopeSet = myIssue.getScope();
+    if (scopeSet.size() != 1) {
+      return true;
+    }
+    final Scope scope = scopeSet.iterator().next();
+    return scope != Scope.JAVA_FILE &&
+           scope != Scope.MANIFEST &&
+           scope != Scope.RESOURCE_FILE &&
+           scope != Scope.PROGUARD;
+  }
+
   static class MyLocalQuickFix implements LocalQuickFix {
     private final AndroidLintQuickFix myLintQuickFix;
 
diff --git a/plugins/android/src/org/jetbrains/android/resourceManagers/ResourceManager.java b/plugins/android/src/org/jetbrains/android/resourceManagers/ResourceManager.java
index aea85df5e3f6..db301858d4f8 100644
--- a/plugins/android/src/org/jetbrains/android/resourceManagers/ResourceManager.java
+++ b/plugins/android/src/org/jetbrains/android/resourceManagers/ResourceManager.java
@@ -222,7 +222,6 @@ public abstract class ResourceManager {
     final ResourceType type = ResourceType.getEnum(resourceType);
 
     if (type == null) {
-      LOG.error("Unknown resource type " + resourceType);
       return Collections.emptyList();
     }
 
@@ -354,7 +353,6 @@ public abstract class ResourceManager {
                                                   boolean distinguishDelimetersInName) {
     final ResourceType type = ResourceType.getEnum(resourceType);
     if (type == null) {
-      LOG.error("Unknown resource type " + resourceType);
       return Collections.emptyList();
     }
 
diff --git a/plugins/android/src/org/jetbrains/android/uipreview/IncompatibleClassFileFormatException.java b/plugins/android/src/org/jetbrains/android/uipreview/IncompatibleClassFileFormatException.java
new file mode 100644
index 000000000000..da67bb23c6b4
--- /dev/null
+++ b/plugins/android/src/org/jetbrains/android/uipreview/IncompatibleClassFileFormatException.java
@@ -0,0 +1,7 @@
+package org.jetbrains.android.uipreview;
+
+/**
+ * @author Eugene.Kudelevsky
+ */
+public class IncompatibleClassFileFormatException extends Exception {
+}
diff --git a/plugins/android/src/org/jetbrains/android/uipreview/ProjectCallback.java b/plugins/android/src/org/jetbrains/android/uipreview/ProjectCallback.java
index 8f5c2a3d3521..6d7fed659850 100644
--- a/plugins/android/src/org/jetbrains/android/uipreview/ProjectCallback.java
+++ b/plugins/android/src/org/jetbrains/android/uipreview/ProjectCallback.java
@@ -181,6 +181,11 @@ class ProjectCallback extends LegacyCallback implements IProjectCallback {
       }
       return null;
     }
+    catch (UnsupportedClassVersionError e) {
+      LOG.info(e);
+      myBrokenClasses.put(className, e);
+      return null;
+    }
   }
 
   private Object createMockView(String className, Class[] constructorSignature, Object[] constructorArgs)
@@ -331,7 +336,7 @@ class ProjectCallback extends LegacyCallback implements IProjectCallback {
     return myBrokenClasses;
   }
 
-  public void loadAndParseRClass() throws ClassNotFoundException {
+  public void loadAndParseRClass() throws ClassNotFoundException, IncompatibleClassFileFormatException {
     final String className = ApplicationManager.getApplication().runReadAction(new Computable<String>() {
       @Nullable
       @Override
@@ -347,7 +352,12 @@ class ProjectCallback extends LegacyCallback implements IProjectCallback {
     Class<?> aClass = myLoadedClasses.get(className);
     if (aClass == null) {
       ProjectClassLoader loader = new ProjectClassLoader(null, myModule);
-      aClass = loader.loadClass(className);
+      try {
+        aClass = loader.loadClass(className);
+      }
+      catch (UnsupportedClassVersionError e) {
+        throw new IncompatibleClassFileFormatException();
+      }
       if (aClass != null) {
         myLoadedClasses.put(className, aClass);
       }
diff --git a/plugins/android/src/org/jetbrains/android/uipreview/RenderUtil.java b/plugins/android/src/org/jetbrains/android/uipreview/RenderUtil.java
index 65f8c9200670..5d7d57eab54e 100644
--- a/plugins/android/src/org/jetbrains/android/uipreview/RenderUtil.java
+++ b/plugins/android/src/org/jetbrains/android/uipreview/RenderUtil.java
@@ -93,6 +93,9 @@ public class RenderUtil {
     catch (ClassNotFoundException e) {
       LOG.debug(e);
     }
+    catch (IncompatibleClassFileFormatException e) {
+      LOG.debug(e);
+    }
 
     final RenderResources resolver =
       factory.createResourceResolver(facet, config, projectResources, theme.getName(), theme.isProjectTheme());
@@ -159,6 +162,11 @@ public class RenderUtil {
       missingRClassMessage = e.getMessage();
       missingRClass = true;
     }
+    catch (IncompatibleClassFileFormatException e) {
+      LOG.debug(e);
+      missingRClassMessage = "Incompatible R.class file format";
+      missingRClass = true;
+    }
 
     final RenderResources resolver =
       factory.createResourceResolver(facet, config, projectResources, theme.getName(), theme.isProjectTheme());
diff --git a/plugins/cvs/cvs-plugin/src/com/intellij/cvsSupport2/annotate/CvsAnnotationProvider.java b/plugins/cvs/cvs-plugin/src/com/intellij/cvsSupport2/annotate/CvsAnnotationProvider.java
index ea66ed16116a..9a57ee13d916 100644
--- a/plugins/cvs/cvs-plugin/src/com/intellij/cvsSupport2/annotate/CvsAnnotationProvider.java
+++ b/plugins/cvs/cvs-plugin/src/com/intellij/cvsSupport2/annotate/CvsAnnotationProvider.java
@@ -37,6 +37,7 @@ import com.intellij.openapi.vcs.annotate.FileAnnotation;
 import com.intellij.openapi.vcs.history.VcsFileRevision;
 import com.intellij.openapi.vcs.history.VcsRevisionNumber;
 import com.intellij.openapi.vfs.VirtualFile;
+import com.intellij.util.ArrayUtil;
 import org.jetbrains.annotations.NonNls;
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;
@@ -48,7 +49,7 @@ import java.util.*;
 public class CvsAnnotationProvider implements AnnotationProvider{
 
   @NonNls private static final String INVALID_OPTION_F = "invalid option -- F";
-  @NonNls private static final String USAGE_CVSNTSRV_SERVER = "Usage: cvsntsrv server";
+  @NonNls private static final String USAGE_CVSNTSRV_SERVER = "Usage: cvs";
 
   private final Project myProject;
   private final CvsHistoryProvider myCvsHistoryProvider;
@@ -194,7 +195,7 @@ public class CvsAnnotationProvider implements AnnotationProvider{
     }
 
     public byte[] getContent() throws IOException, VcsException {
-      return new byte[0];
+      return ArrayUtil.EMPTY_BYTE_ARRAY;
     }
   }
 
diff --git a/plugins/cvs/cvs-plugin/src/com/intellij/cvsSupport2/javacvsImpl/io/LineReader.java b/plugins/cvs/cvs-plugin/src/com/intellij/cvsSupport2/javacvsImpl/io/LineReader.java
index d26b67082ed8..0f671a3a8a2d 100644
--- a/plugins/cvs/cvs-plugin/src/com/intellij/cvsSupport2/javacvsImpl/io/LineReader.java
+++ b/plugins/cvs/cvs-plugin/src/com/intellij/cvsSupport2/javacvsImpl/io/LineReader.java
@@ -16,6 +16,7 @@
 
 package com.intellij.cvsSupport2.javacvsImpl.io;
 
+import com.intellij.util.ArrayUtil;
 import org.jetbrains.annotations.Nullable;
 
 import java.io.ByteArrayOutputStream;
@@ -28,7 +29,6 @@ import java.io.InputStream;
 public class LineReader {
 
   private static final int DEFAULT_BUFFER_SIZE = 10 * 1024;
-  private static final byte[] EMPTY_BYTE_ARRAY = new byte[0];
 
   private final byte[] myBuffer;
   private final InputStream myInputStream;
@@ -66,7 +66,7 @@ public class LineReader {
   private byte[] getLineArray() {
     myPosition++;
     if (myOutputStream.size() == 0) {
-      return EMPTY_BYTE_ARRAY;
+      return ArrayUtil.EMPTY_BYTE_ARRAY;
     }
     final byte[] bytes = myOutputStream.toByteArray();
     myOutputStream.reset();
diff --git a/plugins/gradle/resources/i18n/GradleBundle.properties b/plugins/gradle/resources/i18n/GradleBundle.properties
index e85e37d53385..2f5a36196e9f 100644
--- a/plugins/gradle/resources/i18n/GradleBundle.properties
+++ b/plugins/gradle/resources/i18n/GradleBundle.properties
@@ -55,6 +55,7 @@ gradle.sync.change.type.conflict=Settings conflict
 gradle.sync.change.type.unchanged=Unchanged setting
 gradle.sync.change.type.confirmed=Confirmed settings diff
 gradle.sync.change.entity.type.module=module
+gradle.sync.change.entity.type.module.dependency=module dependency
 gradle.sync.change.entity.type.library.dependency=library dependency
 gradle.sync.change.library.path=library ''{0}'' binary path
 gradle.sync.change.project.name.text=project name
diff --git a/plugins/gradle/src/META-INF/plugin.xml b/plugins/gradle/src/META-INF/plugin.xml
index 71c23dd96f02..50b6a4bbf64c 100644
--- a/plugins/gradle/src/META-INF/plugin.xml
+++ b/plugins/gradle/src/META-INF/plugin.xml
@@ -38,6 +38,7 @@
     <applicationService serviceInterface="org.jetbrains.plugins.gradle.diff.GradleStructureChangesCalculator"
                         serviceImplementation="org.jetbrains.plugins.gradle.diff.GradleProjectStructureChangesCalculator"/>
     <applicationService serviceImplementation="org.jetbrains.plugins.gradle.diff.GradleModuleStructureChangesCalculator"/>
+    <applicationService serviceImplementation="org.jetbrains.plugins.gradle.diff.GradleModuleDependencyStructureChangesCalculator"/>
     <applicationService serviceImplementation="org.jetbrains.plugins.gradle.diff.GradleLibraryStructureChangesCalculator"/>
     <applicationService serviceImplementation="org.jetbrains.plugins.gradle.diff.GradleLibraryDependencyStructureChangesCalculator"/>
     
diff --git a/plugins/gradle/src/org/jetbrains/plugins/gradle/diff/GradleAbstractDependencyStructureChangesCalculator.java b/plugins/gradle/src/org/jetbrains/plugins/gradle/diff/GradleAbstractDependencyStructureChangesCalculator.java
new file mode 100644
index 000000000000..e982b0022e79
--- /dev/null
+++ b/plugins/gradle/src/org/jetbrains/plugins/gradle/diff/GradleAbstractDependencyStructureChangesCalculator.java
@@ -0,0 +1,24 @@
+package org.jetbrains.plugins.gradle.diff;
+
+import org.jetbrains.annotations.NotNull;
+import org.jetbrains.plugins.gradle.model.gradle.GradleEntity;
+
+/**
+ * Manages common dependency properties like 'scope', 'exported'.
+ * <p/>
+ * Thread-safe.
+ * 
+ * @author Denis Zhdanov
+ * @since 2/20/12 11:17 AM
+ */
+public abstract class GradleAbstractDependencyStructureChangesCalculator<G extends GradleEntity, I>
+  implements GradleStructureChangesCalculator<G, I>
+{
+  @Override
+  public void calculate(@NotNull G gradleEntity, @NotNull I intellijEntity, @NotNull GradleChangesCalculationContext context) {
+    // TODO den process common dependency properties here.
+    doCalculate(gradleEntity, intellijEntity, context);
+  }
+  
+  protected abstract void doCalculate(@NotNull G gradleEntity, @NotNull I intellijEntity, @NotNull GradleChangesCalculationContext context);
+}
diff --git a/plugins/gradle/src/org/jetbrains/plugins/gradle/diff/GradleChangesCalculationContext.java b/plugins/gradle/src/org/jetbrains/plugins/gradle/diff/GradleChangesCalculationContext.java
new file mode 100644
index 000000000000..7511561cb088
--- /dev/null
+++ b/plugins/gradle/src/org/jetbrains/plugins/gradle/diff/GradleChangesCalculationContext.java
@@ -0,0 +1,53 @@
+package org.jetbrains.plugins.gradle.diff;
+
+import org.jetbrains.annotations.NotNull;
+
+import java.util.HashSet;
+import java.util.Set;
+
+/**
+ * <code>'Parameter object'</code> to use during project structure changes calculations.
+ * <p/>
+ * Thread-safe.
+ */
+public class GradleChangesCalculationContext {
+
+  @NotNull private final Set<GradleProjectStructureChange> myKnownChanges   = new HashSet<GradleProjectStructureChange>();
+  @NotNull private final Set<GradleProjectStructureChange> myCurrentChanges = new HashSet<GradleProjectStructureChange>();
+
+  @NotNull private final PlatformFacade myPlatformFacade;
+
+  /**
+   * @param knownChanges    changes between the gradle and intellij project structure that has been known up until now
+   * @param platformFacade  platform facade to use during the calculations
+   */
+  public GradleChangesCalculationContext(@NotNull Set<GradleProjectStructureChange> knownChanges,
+                                         @NotNull PlatformFacade platformFacade)
+  {
+    myKnownChanges.addAll(knownChanges);
+    myPlatformFacade = platformFacade;
+  }
+  
+  @NotNull
+  public Set<GradleProjectStructureChange> getKnownChanges() {
+    return myKnownChanges;
+  }
+
+  @NotNull
+  public Set<GradleProjectStructureChange> getCurrentChanges() {
+    return myCurrentChanges;
+  }
+  
+  public void register(@NotNull GradleProjectStructureChange change) {
+    myCurrentChanges.add(change);
+  }
+
+  public boolean hasNewChanges() {
+    return !myKnownChanges.equals(myCurrentChanges);
+  }
+  
+  @NotNull
+  public PlatformFacade getPlatformFacade() {
+    return myPlatformFacade;
+  }
+}
diff --git a/plugins/gradle/src/org/jetbrains/plugins/gradle/diff/GradleDiffUtil.java b/plugins/gradle/src/org/jetbrains/plugins/gradle/diff/GradleDiffUtil.java
index 243003b92ff7..16ee64b7690f 100644
--- a/plugins/gradle/src/org/jetbrains/plugins/gradle/diff/GradleDiffUtil.java
+++ b/plugins/gradle/src/org/jetbrains/plugins/gradle/diff/GradleDiffUtil.java
@@ -1,11 +1,17 @@
 package org.jetbrains.plugins.gradle.diff;
 
 import com.intellij.openapi.module.Module;
+import com.intellij.openapi.project.Project;
 import com.intellij.openapi.roots.LibraryOrderEntry;
+import com.intellij.openapi.roots.ModuleOrderEntry;
+import com.intellij.openapi.roots.OrderEntry;
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.plugins.gradle.model.gradle.*;
+import org.jetbrains.plugins.gradle.model.intellij.IntellijEntityVisitor;
+import org.jetbrains.plugins.gradle.util.GradleUtil;
 
-import java.util.*;
+import java.util.HashMap;
+import java.util.Map;
 
 /**
  * Contains various utility methods for building changes between the gradle and intellij project structures.
@@ -25,10 +31,10 @@ public class GradleDiffUtil {
    * Example: particular module has been added at the gradle side. We want to mark that module, its content root(s), dependencies etc
    * as gradle-local changes.
    * 
-   * @param entity          target gradle-local entity
-   * @param currentChanges  holder for the changes built during the current call
+   * @param entity   target gradle-local entity
+   * @param context  changes calculation context to use
    */
-  public static void buildLocalChanges(@NotNull GradleEntity entity, @NotNull final Set<GradleProjectStructureChange> currentChanges) {
+  public static void buildLocalChanges(@NotNull GradleEntity entity, @NotNull final GradleChangesCalculationContext context) {
     entity.invite(new GradleEntityVisitor() {
       @Override
       public void visit(@NotNull GradleProject project) {
@@ -37,7 +43,7 @@ public class GradleDiffUtil {
 
       @Override
       public void visit(@NotNull GradleModule module) {
-        currentChanges.add(new GradleModulePresenceChange(module, null));
+        context.register(new GradleModulePresenceChange(module, null));
         for (GradleDependency dependency : module.getDependencies()) {
           dependency.invite(this);
         }
@@ -55,59 +61,56 @@ public class GradleDiffUtil {
 
       @Override
       public void visit(@NotNull GradleModuleDependency dependency) {
-        // TODO den implement 
+        context.register(new GradleModuleDependencyPresenceChange(dependency, null));
       }
 
       @Override
       public void visit(@NotNull GradleLibraryDependency dependency) {
-        currentChanges.add(new GradleLibraryDependencyPresenceChange(dependency, null));
+        context.register(new GradleLibraryDependencyPresenceChange(dependency, null));
       }
     });
   }
 
-  /**
-   * Analogues to {@link #buildLocalChanges} but targets intellij entity.
-   *
-   * @param module          target intellij-local module that doesn't present at the gradle side
-   * @param currentChanges  holder for the changes built during the current call
-   */
-  public static void buildLocalChanges(@NotNull Module module,
-                                       @NotNull Set<GradleProjectStructureChange> currentChanges)
-  {
-    currentChanges.add(new GradleModulePresenceChange(null, module));
-    // TODO den process module sub-entities here (content roots and dependencies).
-  }
-
-  /**
-   * Analogues to {@link #buildLocalChanges} but targets intellij entity.
-   * 
-   * @param libraryDependency  target intellij-local library dependency that doesn't present at the gradle side
-   * @param currentChanges     holder for the changes built during the current call
-   */
-  public static void buildLocalChanges(@NotNull LibraryOrderEntry libraryDependency,
-                                       @NotNull Set<GradleProjectStructureChange> currentChanges)
-  {
-    final String libraryName = libraryDependency.getLibraryName();
-    if (libraryName != null) {
-      currentChanges.add(new GradleLibraryDependencyPresenceChange(null, libraryDependency));
-    }
-  }
-
   /**
    * Performs argument type-based dispatch and delegates to one of strongly typed <code>'buildLocalChanges()'</code> methods.
    *
-   * @param entity          target intellij-local entity that doesn't present at the gradle side
-   * @param currentChanges  holder for the changes built during the current call
+   * @param entity   target intellij-local entity that doesn't present at the gradle side
+   * @param context  changes calculation context to use
    */
-  public static void buildLocalChanges(@NotNull Object entity, @NotNull Set<GradleProjectStructureChange> currentChanges) {
+  public static void buildLocalChanges(@NotNull Object entity, @NotNull final GradleChangesCalculationContext context) {
     if (entity instanceof GradleEntity) {
-      buildLocalChanges((GradleEntity)entity, currentChanges);
+      buildLocalChanges((GradleEntity)entity, context);
     }
-    else if (entity instanceof Module) {
-      buildLocalChanges((Module)entity, currentChanges);
-    }
-    else if (entity instanceof LibraryOrderEntry) {
-      buildLocalChanges((LibraryOrderEntry)entity, currentChanges);
+    else {
+      GradleUtil.dispatch(entity, new IntellijEntityVisitor() {
+        @Override
+        public void visit(@NotNull Project project) {
+        }
+
+        @Override
+        public void visit(@NotNull Module module) {
+          context.register(new GradleModulePresenceChange(null, module));
+          for (OrderEntry entry : context.getPlatformFacade().getOrderEntries(module)) {
+            GradleUtil.dispatch(entry, this);
+          }
+        }
+
+        @Override
+        public void visit(@NotNull LibraryOrderEntry libraryDependency) {
+          final String libraryName = libraryDependency.getLibraryName();
+          if (libraryName != null) {
+            context.register(new GradleLibraryDependencyPresenceChange(null, libraryDependency));
+          }
+        }
+
+        @Override
+        public void visit(@NotNull ModuleOrderEntry moduleDependency) {
+          final Module module = moduleDependency.getModule();
+          if (module != null) {
+            context.register(new GradleModuleDependencyPresenceChange(null, moduleDependency));
+          }
+        }
+      });
     }
   }
 
@@ -120,8 +123,7 @@ public class GradleDiffUtil {
    * @param calculator        comparison strategy that works with the single entities (not collection of entities)
    * @param gradleEntities    entities available at the gradle side
    * @param intellijEntities  entities available at the intellij side
-   * @param knownChanges      collection that contains known changes about the entities
-   * @param currentChanges    holder for the changes discovered during the current call
+   * @param context           changes calculation context
    * @param <I>               target intellij entity type
    * @param <G>               target gradle entity type
    */
@@ -129,8 +131,7 @@ public class GradleDiffUtil {
     @NotNull GradleStructureChangesCalculator<G, I> calculator,
     @NotNull Iterable<? extends G> gradleEntities,
     @NotNull Iterable<? extends I> intellijEntities,
-    @NotNull Set<GradleProjectStructureChange> knownChanges,
-    @NotNull Set<GradleProjectStructureChange> currentChanges)
+    @NotNull GradleChangesCalculationContext context)
   {
     Map<Object, I> intellijEntitiesByKeys = new HashMap<Object, I>();
     for (I entity : intellijEntities) {
@@ -138,17 +139,17 @@ public class GradleDiffUtil {
       assert previous == null;
     }
     for (G gradleEntity: gradleEntities) {
-      I intellijEntity = intellijEntitiesByKeys.remove(calculator.getGradleKey(gradleEntity, knownChanges));
+      I intellijEntity = intellijEntitiesByKeys.remove(calculator.getGradleKey(gradleEntity, context));
       if (intellijEntity == null) {
-        buildLocalChanges(gradleEntity, currentChanges);
+        buildLocalChanges(gradleEntity, context);
       }
       else {
-        calculator.calculate(gradleEntity, intellijEntity, knownChanges, currentChanges);
+        calculator.calculate(gradleEntity, intellijEntity, context);
       }
     }
 
     for (I entity : intellijEntitiesByKeys.values()) {
-      buildLocalChanges(entity, currentChanges);
+      buildLocalChanges(entity, context);
     }
   }
 }
diff --git a/plugins/gradle/src/org/jetbrains/plugins/gradle/diff/GradleLibraryDependencyStructureChangesCalculator.java b/plugins/gradle/src/org/jetbrains/plugins/gradle/diff/GradleLibraryDependencyStructureChangesCalculator.java
index 68d2fe30c243..68e360327790 100644
--- a/plugins/gradle/src/org/jetbrains/plugins/gradle/diff/GradleLibraryDependencyStructureChangesCalculator.java
+++ b/plugins/gradle/src/org/jetbrains/plugins/gradle/diff/GradleLibraryDependencyStructureChangesCalculator.java
@@ -5,14 +5,12 @@ import com.intellij.openapi.roots.libraries.Library;
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.plugins.gradle.model.gradle.GradleLibraryDependency;
 
-import java.util.Set;
-
 /**
  * @author Denis Zhdanov
  * @since 1/24/12 1:37 PM
  */
 public class GradleLibraryDependencyStructureChangesCalculator
-  implements GradleStructureChangesCalculator<GradleLibraryDependency, LibraryOrderEntry>
+  extends GradleAbstractDependencyStructureChangesCalculator<GradleLibraryDependency, LibraryOrderEntry>
 {
   
   private final GradleLibraryStructureChangesCalculator myLibraryCalculator;
@@ -22,28 +20,30 @@ public class GradleLibraryDependencyStructureChangesCalculator
   }
 
   @Override
-  public void calculate(@NotNull GradleLibraryDependency gradleEntity,
-                        @NotNull LibraryOrderEntry intellijEntity,
-                        @NotNull Set<GradleProjectStructureChange> knownChanges,
-                        @NotNull Set<GradleProjectStructureChange> currentChanges)
+  public void doCalculate(@NotNull GradleLibraryDependency gradleEntity,
+                          @NotNull LibraryOrderEntry intellijEntity,
+                          @NotNull GradleChangesCalculationContext context)
   {
     final Library library = intellijEntity.getLibrary();
     if (library == null) {
       return;
     }
-    myLibraryCalculator.calculate(gradleEntity.getTarget(), library, knownChanges, currentChanges);
+    myLibraryCalculator.calculate(gradleEntity.getTarget(), library, context);
   }
 
   @NotNull
   @Override
   public Object getIntellijKey(@NotNull LibraryOrderEntry entity) {
-    final String result = entity.getLibraryName();
-    return result == null ? "" : result;
+    final Library library = entity.getLibrary();
+    if (library == null) {
+      return "";
+    }
+    return myLibraryCalculator.getIntellijKey(library);
   }
 
   @NotNull
   @Override
-  public Object getGradleKey(@NotNull GradleLibraryDependency entity, @NotNull Set<GradleProjectStructureChange> knownChanges) {
-    return myLibraryCalculator.getGradleKey(entity.getTarget(), knownChanges);
+  public Object getGradleKey(@NotNull GradleLibraryDependency entity, @NotNull GradleChangesCalculationContext context) {
+    return myLibraryCalculator.getGradleKey(entity.getTarget(), context);
   }
 }
diff --git a/plugins/gradle/src/org/jetbrains/plugins/gradle/diff/GradleLibraryStructureChangesCalculator.java b/plugins/gradle/src/org/jetbrains/plugins/gradle/diff/GradleLibraryStructureChangesCalculator.java
index f746329331bb..b1cf497ff872 100644
--- a/plugins/gradle/src/org/jetbrains/plugins/gradle/diff/GradleLibraryStructureChangesCalculator.java
+++ b/plugins/gradle/src/org/jetbrains/plugins/gradle/diff/GradleLibraryStructureChangesCalculator.java
@@ -25,20 +25,20 @@ public class GradleLibraryStructureChangesCalculator implements GradleStructureC
   @Override
   public void calculate(@NotNull GradleLibrary gradleEntity,
                         @NotNull Library intellijEntity,
-                        @NotNull Set<GradleProjectStructureChange> knownChanges,
-                        @NotNull Set<GradleProjectStructureChange> currentChanges)
+                        @NotNull GradleChangesCalculationContext context)
   {
     final Set<String> gradleBinaryPaths = new HashSet<String>(gradleEntity.getPaths(LibraryPathType.BINARY));
+    final Set<String> intellijBinaryPaths = new HashSet<String>();
     for (VirtualFile file : intellijEntity.getFiles(OrderRootType.CLASSES)) {
       final String path = myPlatformFacade.getLocalFileSystemPath(file);
       if (!gradleBinaryPaths.remove(path)) {
-        currentChanges.add(new GradleMismatchedLibraryPathChange(intellijEntity, null, path));
+        intellijBinaryPaths.add(path);
       }
     }
 
-    for (String binaryPath : gradleBinaryPaths) {
-      currentChanges.add(new GradleMismatchedLibraryPathChange(intellijEntity, binaryPath, null));
-    } 
+    if (!gradleBinaryPaths.equals(intellijBinaryPaths)) {
+      context.register(new GradleMismatchedLibraryPathChange(intellijEntity, gradleBinaryPaths, intellijBinaryPaths));
+    }
   }
 
   @NotNull
@@ -49,7 +49,7 @@ public class GradleLibraryStructureChangesCalculator implements GradleStructureC
 
   @NotNull
   @Override
-  public Object getGradleKey(@NotNull GradleLibrary entity, @NotNull Set<GradleProjectStructureChange> knownChanges) {
+  public Object getGradleKey(@NotNull GradleLibrary entity, @NotNull GradleChangesCalculationContext context) {
     // TODO den consider the known changes 
     return entity.getName();
   }
diff --git a/plugins/gradle/src/org/jetbrains/plugins/gradle/diff/GradleMismatchedLibraryPathChange.java b/plugins/gradle/src/org/jetbrains/plugins/gradle/diff/GradleMismatchedLibraryPathChange.java
index c6dbdbcf2d9b..9853e006c3a6 100644
--- a/plugins/gradle/src/org/jetbrains/plugins/gradle/diff/GradleMismatchedLibraryPathChange.java
+++ b/plugins/gradle/src/org/jetbrains/plugins/gradle/diff/GradleMismatchedLibraryPathChange.java
@@ -5,17 +5,19 @@ import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;
 import org.jetbrains.plugins.gradle.util.GradleBundle;
 
+import java.util.Set;
+
 /**
  * @author Denis Zhdanov
  * @since 2/2/12 1:32 PM
  */
-public class GradleMismatchedLibraryPathChange extends GradleAbstractConflictingPropertyChange<String> {
+public class GradleMismatchedLibraryPathChange extends GradleAbstractConflictingPropertyChange<Set<String>> {
   
   private final String myLibraryName;
 
   public GradleMismatchedLibraryPathChange(@NotNull Library entity,
-                                           @Nullable String gradleValue,
-                                           @Nullable String intellijValue)
+                                           @Nullable Set<String> gradleValue,
+                                           @Nullable Set<String> intellijValue)
     throws IllegalArgumentException
   {
     super(GradleBundle.message("gradle.sync.change.library.path", entity.getName()), gradleValue, intellijValue);
diff --git a/plugins/gradle/src/org/jetbrains/plugins/gradle/diff/GradleModuleDependencyPresenceChange.java b/plugins/gradle/src/org/jetbrains/plugins/gradle/diff/GradleModuleDependencyPresenceChange.java
new file mode 100644
index 000000000000..54a352245e51
--- /dev/null
+++ b/plugins/gradle/src/org/jetbrains/plugins/gradle/diff/GradleModuleDependencyPresenceChange.java
@@ -0,0 +1,43 @@
+package org.jetbrains.plugins.gradle.diff;
+
+import com.intellij.openapi.roots.ModuleOrderEntry;
+import org.jetbrains.annotations.NotNull;
+import org.jetbrains.annotations.Nullable;
+import org.jetbrains.plugins.gradle.model.gradle.GradleModuleDependency;
+import org.jetbrains.plugins.gradle.model.id.GradleEntityIdMapper;
+import org.jetbrains.plugins.gradle.model.id.GradleModuleDependencyId;
+import org.jetbrains.plugins.gradle.util.GradleBundle;
+
+/**
+ * @author Denis Zhdanov
+ * @since 2/17/12 3:14 PM
+ */
+public class GradleModuleDependencyPresenceChange extends GradleEntityPresenceChange<GradleModuleDependencyId> {
+
+  public GradleModuleDependencyPresenceChange(@Nullable GradleModuleDependency gradle,
+                                              @Nullable ModuleOrderEntry intellij)
+  {
+    super(GradleBundle.message("gradle.sync.change.entity.type.module.dependency"), of(gradle), of(intellij));
+  }
+
+  @Override
+  public void invite(@NotNull GradleProjectStructureChangeVisitor visitor) {
+    visitor.visit(this);
+  }
+
+  @Nullable
+  private static GradleModuleDependencyId of(@Nullable GradleModuleDependency dependency) {
+    if (dependency == null) {
+      return null;
+    }
+    return GradleEntityIdMapper.mapEntityToId(dependency);
+  }
+
+  @Nullable
+  private static GradleModuleDependencyId of(@Nullable ModuleOrderEntry dependency) {
+    if (dependency == null) {
+      return null;
+    }
+    return GradleEntityIdMapper.mapEntityToId(dependency);
+  }
+}
diff --git a/plugins/gradle/src/org/jetbrains/plugins/gradle/diff/GradleModuleDependencyStructureChangesCalculator.java b/plugins/gradle/src/org/jetbrains/plugins/gradle/diff/GradleModuleDependencyStructureChangesCalculator.java
new file mode 100644
index 000000000000..9374b83dab87
--- /dev/null
+++ b/plugins/gradle/src/org/jetbrains/plugins/gradle/diff/GradleModuleDependencyStructureChangesCalculator.java
@@ -0,0 +1,39 @@
+package org.jetbrains.plugins.gradle.diff;
+
+import com.intellij.openapi.roots.ModuleOrderEntry;
+import org.jetbrains.annotations.NotNull;
+import org.jetbrains.plugins.gradle.model.gradle.GradleModuleDependency;
+
+/**
+ * @author Denis Zhdanov
+ * @since 2/20/12 11:10 AM
+ */
+public class GradleModuleDependencyStructureChangesCalculator
+  extends GradleAbstractDependencyStructureChangesCalculator<GradleModuleDependency, ModuleOrderEntry>
+{
+  
+  @Override
+  public void doCalculate(@NotNull GradleModuleDependency gradleEntity,
+                          @NotNull ModuleOrderEntry intellijEntity,
+                          @NotNull GradleChangesCalculationContext context)
+  {
+    // Assuming that the modules referenced by the given dependencies are compared independently.
+  }
+
+  @NotNull
+  @Override
+  public Object getIntellijKey(@NotNull ModuleOrderEntry entity) {
+    final String intellijModuleName = entity.getModuleName();
+    if (intellijModuleName == null) {
+      return "";
+    }
+    return intellijModuleName;
+  }
+
+  @NotNull
+  @Override
+  public Object getGradleKey(@NotNull GradleModuleDependency entity, @NotNull GradleChangesCalculationContext context) {
+    // TODO den consider known changes here.
+    return entity.getTarget().getName();
+  }
+}
diff --git a/plugins/gradle/src/org/jetbrains/plugins/gradle/diff/GradleModuleStructureChangesCalculator.java b/plugins/gradle/src/org/jetbrains/plugins/gradle/diff/GradleModuleStructureChangesCalculator.java
index 5638b9df1541..1fe1c70a5f79 100644
--- a/plugins/gradle/src/org/jetbrains/plugins/gradle/diff/GradleModuleStructureChangesCalculator.java
+++ b/plugins/gradle/src/org/jetbrains/plugins/gradle/diff/GradleModuleStructureChangesCalculator.java
@@ -16,13 +16,15 @@
 package org.jetbrains.plugins.gradle.diff;
 
 import com.intellij.openapi.module.Module;
-import com.intellij.openapi.roots.*;
+import com.intellij.openapi.roots.LibraryOrderEntry;
+import com.intellij.openapi.roots.ModuleOrderEntry;
+import com.intellij.openapi.roots.OrderEntry;
+import com.intellij.openapi.roots.RootPolicy;
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.plugins.gradle.model.gradle.*;
 
 import java.util.ArrayList;
 import java.util.List;
-import java.util.Set;
 
 /**
  * Encapsulates functionality of calculating changes between Gradle and IntelliJ IDEA module hierarchies.
@@ -34,25 +36,24 @@ import java.util.Set;
  */
 public class GradleModuleStructureChangesCalculator implements GradleStructureChangesCalculator<GradleModule, Module> {
   
-  private final GradleLibraryDependencyStructureChangesCalculator myLibraryDependencyCalculator;
-  private final PlatformFacade myStructureHelper;
+  @NotNull private final GradleLibraryDependencyStructureChangesCalculator myLibraryDependencyCalculator;
+  @NotNull private final GradleModuleDependencyStructureChangesCalculator myModuleDependencyCalculator;
 
   public GradleModuleStructureChangesCalculator(@NotNull GradleLibraryDependencyStructureChangesCalculator libraryDependencyCalculator,
-                                                @NotNull PlatformFacade structureHelper)
+                                                @NotNull GradleModuleDependencyStructureChangesCalculator moduleDependencyCalculator)
   {
     myLibraryDependencyCalculator = libraryDependencyCalculator;
-    myStructureHelper = structureHelper;
+    myModuleDependencyCalculator = moduleDependencyCalculator;
   }
 
   @Override
   public void calculate(@NotNull GradleModule gradleEntity,
                         @NotNull Module intellijEntity,
-                        @NotNull Set<GradleProjectStructureChange> knownChanges,
-                        @NotNull Set<GradleProjectStructureChange> currentChanges)
+                        @NotNull GradleChangesCalculationContext context)
   {
     //TODO den process module-local settings
     //TODO den process content roots
-    checkDependencies(gradleEntity, intellijEntity, knownChanges, currentChanges); 
+    checkDependencies(gradleEntity, intellijEntity, context); 
   }
 
   @NotNull
@@ -63,15 +64,14 @@ public class GradleModuleStructureChangesCalculator implements GradleStructureCh
 
   @NotNull
   @Override
-  public Object getGradleKey(@NotNull GradleModule entity, @NotNull Set<GradleProjectStructureChange> knownChanges) {
+  public Object getGradleKey(@NotNull GradleModule entity, @NotNull GradleChangesCalculationContext context) {
     // TODO den consider the known changes
     return entity.getName();
   }
 
   private void checkDependencies(@NotNull GradleModule gradleModule,
                                  @NotNull Module intellijModule,
-                                 @NotNull Set<GradleProjectStructureChange> knownChanges,
-                                 @NotNull Set<GradleProjectStructureChange> currentChanges)
+                                 @NotNull GradleChangesCalculationContext context)
   {
     // Prepare intellij part.
     final List<ModuleOrderEntry> intellijModuleDependencies = new ArrayList<ModuleOrderEntry>();
@@ -89,7 +89,7 @@ public class GradleModuleStructureChangesCalculator implements GradleStructureCh
         return libraryOrderEntry;
       }
     };
-    for (OrderEntry orderEntry : myStructureHelper.getOrderEntries(intellijModule)) {
+    for (OrderEntry orderEntry : context.getPlatformFacade().getOrderEntries(intellijModule)) {
       orderEntry.accept(policy, null);
     }
 
@@ -112,8 +112,7 @@ public class GradleModuleStructureChangesCalculator implements GradleStructureCh
     }
 
     // Calculate changes.
-    // TODO den process module dependencies here as well.
-    GradleDiffUtil.calculate(myLibraryDependencyCalculator, gradleLibraryDependencies, intellijLibraryDependencies,
-                             knownChanges, currentChanges);
+    GradleDiffUtil.calculate(myLibraryDependencyCalculator, gradleLibraryDependencies, intellijLibraryDependencies, context);
+    GradleDiffUtil.calculate(myModuleDependencyCalculator, gradleModuleDependencies, intellijModuleDependencies, context);
   }
 }
diff --git a/plugins/gradle/src/org/jetbrains/plugins/gradle/diff/GradleProjectStructureChangeVisitor.java b/plugins/gradle/src/org/jetbrains/plugins/gradle/diff/GradleProjectStructureChangeVisitor.java
index 0a41c198a88b..5b8fc2e6f680 100644
--- a/plugins/gradle/src/org/jetbrains/plugins/gradle/diff/GradleProjectStructureChangeVisitor.java
+++ b/plugins/gradle/src/org/jetbrains/plugins/gradle/diff/GradleProjectStructureChangeVisitor.java
@@ -28,5 +28,6 @@ public interface GradleProjectStructureChangeVisitor {
   void visit(@NotNull GradleLanguageLevelChange change);
   void visit(@NotNull GradleModulePresenceChange change);
   void visit(@NotNull GradleLibraryDependencyPresenceChange change);
+  void visit(@NotNull GradleModuleDependencyPresenceChange change);
   void visit(@NotNull GradleMismatchedLibraryPathChange change);
 }
diff --git a/plugins/gradle/src/org/jetbrains/plugins/gradle/diff/GradleProjectStructureChangeVisitorAdapter.java b/plugins/gradle/src/org/jetbrains/plugins/gradle/diff/GradleProjectStructureChangeVisitorAdapter.java
deleted file mode 100644
index 6e963b8ea895..000000000000
--- a/plugins/gradle/src/org/jetbrains/plugins/gradle/diff/GradleProjectStructureChangeVisitorAdapter.java
+++ /dev/null
@@ -1,45 +0,0 @@
-/*
- * Copyright 2000-2011 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 org.jetbrains.plugins.gradle.diff;
-
-import org.jetbrains.annotations.NotNull;
-
-/**
- * @author Denis Zhdanov
- * @since 11/16/11 8:49 PM
- */
-public class GradleProjectStructureChangeVisitorAdapter implements GradleProjectStructureChangeVisitor {
-
-  @Override
-  public void visit(@NotNull GradleProjectRenameChange change) {
-  }
-
-  @Override
-  public void visit(@NotNull GradleLanguageLevelChange change) {
-  }
-
-  @Override
-  public void visit(@NotNull GradleModulePresenceChange change) {
-  }
-
-  @Override
-  public void visit(@NotNull GradleLibraryDependencyPresenceChange change) {
-  }
-
-  @Override
-  public void visit(@NotNull GradleMismatchedLibraryPathChange change) {
-  }
-}
diff --git a/plugins/gradle/src/org/jetbrains/plugins/gradle/diff/GradleProjectStructureChangesCalculator.java b/plugins/gradle/src/org/jetbrains/plugins/gradle/diff/GradleProjectStructureChangesCalculator.java
index 7b64e2613f13..1c512480105e 100644
--- a/plugins/gradle/src/org/jetbrains/plugins/gradle/diff/GradleProjectStructureChangesCalculator.java
+++ b/plugins/gradle/src/org/jetbrains/plugins/gradle/diff/GradleProjectStructureChangesCalculator.java
@@ -21,25 +21,24 @@ import java.util.Set;
 public class GradleProjectStructureChangesCalculator implements GradleStructureChangesCalculator<GradleProject, Project> {
 
   private final GradleModuleStructureChangesCalculator myModuleChangesCalculator;
-  private final PlatformFacade myStructureHelper;
+  private final PlatformFacade myPlatformFacade;
 
   public GradleProjectStructureChangesCalculator(@NotNull GradleModuleStructureChangesCalculator moduleCalculator,
-                                                 @NotNull PlatformFacade structureHelper) {
+                                                 @NotNull PlatformFacade platformFacade) {
     myModuleChangesCalculator = moduleCalculator;
-    myStructureHelper = structureHelper;
+    myPlatformFacade = platformFacade;
   }
 
   @Override
   public void calculate(@NotNull GradleProject gradleEntity,
                         @NotNull Project intellijEntity,
-                        @NotNull Set<GradleProjectStructureChange> knownChanges,
-                        @NotNull Set<GradleProjectStructureChange> currentChanges)
+                        @NotNull GradleChangesCalculationContext context)
   {
-    calculateProjectChanges(gradleEntity, intellijEntity, currentChanges);
+    calculateProjectChanges(gradleEntity, intellijEntity, context.getCurrentChanges());
 
     final Set<? extends GradleModule> gradleSubEntities = gradleEntity.getModules();
-    final Collection<Module> intellijSubEntities = myStructureHelper.getModules(intellijEntity);
-    GradleDiffUtil.calculate(myModuleChangesCalculator, gradleSubEntities, intellijSubEntities, knownChanges, currentChanges);
+    final Collection<Module> intellijSubEntities = myPlatformFacade.getModules(intellijEntity);
+    GradleDiffUtil.calculate(myModuleChangesCalculator, gradleSubEntities, intellijSubEntities, context);
   }
 
   @NotNull
@@ -50,7 +49,7 @@ public class GradleProjectStructureChangesCalculator implements GradleStructureC
 
   @NotNull
   @Override
-  public Object getGradleKey(@NotNull GradleProject entity, @NotNull Set<GradleProjectStructureChange> knownChanges) {
+  public Object getGradleKey(@NotNull GradleProject entity, @NotNull GradleChangesCalculationContext context) {
     // TODO den consider the known changes
     return entity.getName();
   }
@@ -79,7 +78,7 @@ public class GradleProjectStructureChangesCalculator implements GradleStructureC
                                   @NotNull Set<GradleProjectStructureChange> currentChanges)
   {
     LanguageLevel gradleLevel = gradleProject.getLanguageLevel();
-    LanguageLevel intellijLevel = myStructureHelper.getLanguageLevel(intellijProject);
+    LanguageLevel intellijLevel = myPlatformFacade.getLanguageLevel(intellijProject);
     if (gradleLevel != intellijLevel) {
       currentChanges.add(new GradleLanguageLevelChange(gradleLevel, intellijLevel));
     }
diff --git a/plugins/gradle/src/org/jetbrains/plugins/gradle/diff/GradleStructureChangesCalculator.java b/plugins/gradle/src/org/jetbrains/plugins/gradle/diff/GradleStructureChangesCalculator.java
index 53db9679b2ae..04feeaa63b4d 100644
--- a/plugins/gradle/src/org/jetbrains/plugins/gradle/diff/GradleStructureChangesCalculator.java
+++ b/plugins/gradle/src/org/jetbrains/plugins/gradle/diff/GradleStructureChangesCalculator.java
@@ -3,8 +3,6 @@ package org.jetbrains.plugins.gradle.diff;
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.plugins.gradle.model.gradle.GradleEntity;
 
-import java.util.Set;
-
 /**
  * Defines common interface to the strategy that calculates difference between the corresponding gradle and intellij entities
  * (e.g. between the gradle and intellij module).
@@ -20,18 +18,12 @@ public interface GradleStructureChangesCalculator<G extends GradleEntity, I> {
 
   /**
    * Calculates changes between the given entities.
-   * 
+   *
    * @param gradleEntity    target gradle entity
    * @param intellijEntity  target intellij entity
-   * @param knownChanges    changes between the gradle and intellij project structure that has been known up until now
-   * @param currentChanges  holder for the changes between the given entities discovered by the current call. Note that
-   *                        it must contain the change objects that have been known (contained at the <code>'knownChanges'</code>)
-   *                        but are still in place
+   * @param context         target diff calculation context
    */
-  void calculate(@NotNull G gradleEntity,
-                 @NotNull I intellijEntity,
-                 @NotNull Set<GradleProjectStructureChange> knownChanges,
-                 @NotNull Set<GradleProjectStructureChange> currentChanges);
+  void calculate(@NotNull G gradleEntity, @NotNull I intellijEntity, @NotNull GradleChangesCalculationContext context);
 
   /**
    * There are three possible situations when we compare a set of gradle entities with a set of intellij entities:
@@ -43,16 +35,16 @@ public interface GradleStructureChangesCalculator<G extends GradleEntity, I> {
    * </ul>
    * </pre>
    * <p/>
-   * The general idea is to map evey item at the given sets of gradle and intellij entities to particular key (both gradle and
+   * The general idea is to map every item at the given sets of gradle and intellij entities to particular key (both gradle and
    * intellij keys are expected to belong to the same class) and then compare them. Matched keys shows that corresponding
-   * entities should be {@link #calculate(GradleEntity, Object, Set, Set)}  compared to each other}; non-matched indicate that corresponding
-   * entities are gradle- or intellij-local.
+   * entities should be {@link #calculate(GradleEntity, Object, GradleChangesCalculationContext) compared to each other};
+   * non-matched indicate that corresponding entities are gradle- or intellij-local.
    * <p/>
    * This method allows to match intellij entity to the target key.
    * 
    * @param entity  intellij entity to match
    * @return        key for the given entity
-   * @see #getGradleKey(GradleEntity, Set)
+   * @see #getGradleKey(GradleEntity, GradleChangesCalculationContext) 
    */
   @NotNull
   Object getIntellijKey(@NotNull I entity);
@@ -68,10 +60,10 @@ public interface GradleStructureChangesCalculator<G extends GradleEntity, I> {
    * So, we take into consideration the known changes only during {@code gradle-entity -> key} processing.
    * 
    * @param entity        target gradle entity that should be mapped to a key
-   * @param knownChanges  known changes between the gradle and intellij structures
+   * @param context       changes calculation context
    * @return              key for the given entity
    * @see #getIntellijKey(Object)
    */
   @NotNull
-  Object getGradleKey(@NotNull G entity, @NotNull Set<GradleProjectStructureChange> knownChanges);
+  Object getGradleKey(@NotNull G entity, @NotNull GradleChangesCalculationContext context);
 }
diff --git a/plugins/gradle/src/org/jetbrains/plugins/gradle/model/GradleEntityType.java b/plugins/gradle/src/org/jetbrains/plugins/gradle/model/GradleEntityType.java
index 4f43cc086056..59550283de6e 100644
--- a/plugins/gradle/src/org/jetbrains/plugins/gradle/model/GradleEntityType.java
+++ b/plugins/gradle/src/org/jetbrains/plugins/gradle/model/GradleEntityType.java
@@ -11,7 +11,7 @@ import javax.swing.*;
  */
 public enum GradleEntityType {
   PROJECT(GradleIcons.PROJECT_ICON), MODULE(GradleIcons.MODULE_ICON), MODULE_DEPENDENCY(GradleIcons.MODULE_ICON),
-  LIBRARY_DEPENDENCY(GradleIcons.LIB_ICON), CONTENT_ROOT(GradleIcons.CONTENT_ROOT_ICON), SYNTHETIC(null);
+  LIBRARY(GradleIcons.LIB_ICON), LIBRARY_DEPENDENCY(GradleIcons.LIB_ICON), CONTENT_ROOT(GradleIcons.CONTENT_ROOT_ICON), SYNTHETIC(null);
 
   @Nullable private final Icon myIcon;
 
diff --git a/plugins/gradle/src/org/jetbrains/plugins/gradle/model/gradle/GradleModule.java b/plugins/gradle/src/org/jetbrains/plugins/gradle/model/gradle/GradleModule.java
index dcfeff87a3af..9a0622dd7083 100644
--- a/plugins/gradle/src/org/jetbrains/plugins/gradle/model/gradle/GradleModule.java
+++ b/plugins/gradle/src/org/jetbrains/plugins/gradle/model/gradle/GradleModule.java
@@ -89,6 +89,10 @@ public class GradleModule extends AbstractNamedGradleEntity implements Named {
     myDependencies.add(dependency);
   }
 
+  public void clearDependencies() {
+    myDependencies.clear();
+  }
+  
   @Override
   public void invite(@NotNull GradleEntityVisitor visitor) {
     visitor.visit(this);
diff --git a/plugins/gradle/src/org/jetbrains/plugins/gradle/model/id/GradleAbstractDependencyId.java b/plugins/gradle/src/org/jetbrains/plugins/gradle/model/id/GradleAbstractDependencyId.java
new file mode 100644
index 000000000000..413b9017e6d5
--- /dev/null
+++ b/plugins/gradle/src/org/jetbrains/plugins/gradle/model/id/GradleAbstractDependencyId.java
@@ -0,0 +1,55 @@
+package org.jetbrains.plugins.gradle.model.id;
+
+import org.jetbrains.annotations.NotNull;
+import org.jetbrains.plugins.gradle.model.GradleEntityOwner;
+import org.jetbrains.plugins.gradle.model.GradleEntityType;
+
+/**
+ * @author Denis Zhdanov
+ * @since 2/20/12 12:01 PM
+ */
+public abstract  class GradleAbstractDependencyId extends GradleAbstractEntityId {
+
+  @NotNull private final String myOwnerModuleName;
+  @NotNull private final String myDependencyName;
+  
+  public GradleAbstractDependencyId(@NotNull GradleEntityType type,
+                                    @NotNull GradleEntityOwner owner,
+                                    @NotNull String ownerModuleName,
+                                    @NotNull String dependencyName)
+  {
+    super(type, owner);
+    myOwnerModuleName = ownerModuleName;
+    myDependencyName = dependencyName;
+  }
+
+  @NotNull
+  public String getOwnerModuleName() {
+    return myOwnerModuleName;
+  }
+
+  @NotNull
+  public String getDependencyName() {
+    return myDependencyName;
+  }
+
+  @NotNull
+  public GradleModuleId getOwnerModuleId() {
+    return new GradleModuleId(getOwner(), myOwnerModuleName);
+  }
+  
+  @Override
+  public int hashCode() {
+    int result = 31 * super.hashCode() + myOwnerModuleName.hashCode();
+    return 31 * result + myDependencyName.hashCode();
+  }
+
+  @Override
+  public boolean equals(Object o) {
+    if (!super.equals(o)) {
+      return false;
+    }
+    GradleAbstractDependencyId that = (GradleAbstractDependencyId)o;
+    return myOwnerModuleName.equals(that.myOwnerModuleName) && myDependencyName.equals(that.myDependencyName);
+  }
+}
diff --git a/plugins/gradle/src/org/jetbrains/plugins/gradle/model/id/GradleEntityIdMapper.java b/plugins/gradle/src/org/jetbrains/plugins/gradle/model/id/GradleEntityIdMapper.java
index 4d5f08219d8f..7e5c93141ff4 100644
--- a/plugins/gradle/src/org/jetbrains/plugins/gradle/model/id/GradleEntityIdMapper.java
+++ b/plugins/gradle/src/org/jetbrains/plugins/gradle/model/id/GradleEntityIdMapper.java
@@ -59,7 +59,7 @@ public class GradleEntityIdMapper {
 
         @Override
         public void visit(@NotNull GradleModuleDependency dependency) {
-          result.set(new GradleLibraryDependencyId(GradleEntityOwner.GRADLE, dependency.getOwnerModule().getName(), dependency.getName()));
+          result.set(new GradleModuleDependencyId(GradleEntityOwner.GRADLE, dependency.getOwnerModule().getName(), dependency.getName()));
         }
 
         @Override
@@ -74,7 +74,7 @@ public class GradleEntityIdMapper {
 
         @Override
         public void visit(@NotNull GradleLibrary library) {
-          // TODO den implement 
+          result.set(new GradleLibraryId(GradleEntityOwner.GRADLE, library.getName())); 
         }
       });
     }
diff --git a/plugins/gradle/src/org/jetbrains/plugins/gradle/model/id/GradleLibraryDependencyId.java b/plugins/gradle/src/org/jetbrains/plugins/gradle/model/id/GradleLibraryDependencyId.java
index b0584a9dc072..6ad1b6187bdc 100644
--- a/plugins/gradle/src/org/jetbrains/plugins/gradle/model/id/GradleLibraryDependencyId.java
+++ b/plugins/gradle/src/org/jetbrains/plugins/gradle/model/id/GradleLibraryDependencyId.java
@@ -8,60 +8,26 @@ import org.jetbrains.plugins.gradle.model.GradleEntityType;
  * @author Denis Zhdanov
  * @since 2/14/12 1:59 PM
  */
-public class GradleLibraryDependencyId extends GradleAbstractEntityId {
+public class GradleLibraryDependencyId extends GradleAbstractDependencyId {
 
-  @NotNull private final String myModuleName;
-  @NotNull private final String myLibraryName;
-  
   public GradleLibraryDependencyId(@NotNull GradleEntityOwner owner, @NotNull String moduleName, @NotNull String libraryName) {
-    super(GradleEntityType.LIBRARY_DEPENDENCY, owner);
-    myModuleName = moduleName;
-    myLibraryName = libraryName;
+    super(GradleEntityType.LIBRARY_DEPENDENCY, owner, moduleName, libraryName);
   }
 
-  @NotNull
-  public String getModuleName() {
-    return myModuleName;
-  }
-
-  @NotNull
-  public String getLibraryName() {
-    return myLibraryName;
-  }
-
-  @NotNull
-  public GradleModuleId getModuleId() {
-    return new GradleModuleId(getOwner(), myModuleName);
-  }
-  
   @Override
   public Object mapToEntity(@NotNull GradleEntityMappingContext context) {
     switch (getOwner()) {
-      case GRADLE: return context.getProjectStructureHelper().findGradleLibraryDependency(myModuleName, myLibraryName);
-      case INTELLIJ: return context.getProjectStructureHelper().findIntellijLibraryDependency(myModuleName, myLibraryName);
+      case GRADLE: return context.getProjectStructureHelper().findGradleLibraryDependency(getOwnerModuleName(), getDependencyName());
+      case INTELLIJ: return context.getProjectStructureHelper().findIntellijLibraryDependency(getOwnerModuleName(), getDependencyName());
     }
     throw new IllegalStateException(String.format(
-      "Can't map id to the target library dependency. Owner: %s, module: '%s', library: '%s'", getOwner(), myModuleName, myLibraryName
+      "Can't map id to the target library dependency. Owner: %s, module: '%s', library: '%s'",
+      getOwner(), getOwnerModuleName(), getDependencyName()
     ));
   }
 
-  @Override
-  public int hashCode() {
-    int result = 31 * super.hashCode() + myModuleName.hashCode();
-    return 31 * result + myLibraryName.hashCode();
-  }
-
-  @Override
-  public boolean equals(Object o) {
-    if (!super.equals(o)) {
-      return false;
-    }
-    GradleLibraryDependencyId that = (GradleLibraryDependencyId)o;
-    return myModuleName.equals(that.myModuleName) && myLibraryName.equals(that.myLibraryName);
-  }
-
   @Override
   public String toString() {
-    return String.format("library dependency:owner module='%s'|library='%s'", myModuleName, myLibraryName);
+    return String.format("library dependency:owner module='%s'|library='%s'", getOwnerModuleName(), getDependencyName());
   }
 }
diff --git a/plugins/gradle/src/org/jetbrains/plugins/gradle/model/id/GradleLibraryId.java b/plugins/gradle/src/org/jetbrains/plugins/gradle/model/id/GradleLibraryId.java
new file mode 100644
index 000000000000..803262104548
--- /dev/null
+++ b/plugins/gradle/src/org/jetbrains/plugins/gradle/model/id/GradleLibraryId.java
@@ -0,0 +1,49 @@
+package org.jetbrains.plugins.gradle.model.id;
+
+import org.jetbrains.annotations.NotNull;
+import org.jetbrains.plugins.gradle.model.GradleEntityOwner;
+import org.jetbrains.plugins.gradle.model.GradleEntityType;
+
+/**
+ * @author Denis Zhdanov
+ * @since 2/20/12 7:12 PM
+ */
+public class GradleLibraryId extends GradleAbstractEntityId {
+
+  @NotNull private final String myLibraryName;
+  
+  public GradleLibraryId(@NotNull GradleEntityOwner owner, @NotNull String libraryName) {
+    super(GradleEntityType.LIBRARY, owner);
+    myLibraryName = libraryName;
+  }
+  
+  @Override
+  public Object mapToEntity(@NotNull GradleEntityMappingContext context) {
+    switch (getOwner()) {
+      case GRADLE: return context.getProjectStructureHelper().findGradleLibrary(myLibraryName);
+      case INTELLIJ: return context.getProjectStructureHelper().findIntellijLibrary(myLibraryName);
+    }
+    throw new IllegalStateException(String.format(
+      "Can't map library id to the target library. Id owner: %s, name: '%s'", getOwner(), myLibraryName
+    ));
+  }
+
+  @Override
+  public int hashCode() {
+    return 31 * super.hashCode() + myLibraryName.hashCode();
+  }
+
+  @Override
+  public boolean equals(Object o) {
+    if (!super.equals(o)) {
+      return false;
+    }
+    GradleLibraryId that = (GradleLibraryId)o;
+    return myLibraryName.equals(that.myLibraryName);
+  }
+
+  @Override
+  public String toString() {
+    return "library '" + myLibraryName + "'";
+  }
+}
diff --git a/plugins/gradle/src/org/jetbrains/plugins/gradle/model/id/GradleModuleDependencyId.java b/plugins/gradle/src/org/jetbrains/plugins/gradle/model/id/GradleModuleDependencyId.java
index 285626fdb950..342962b324a5 100644
--- a/plugins/gradle/src/org/jetbrains/plugins/gradle/model/id/GradleModuleDependencyId.java
+++ b/plugins/gradle/src/org/jetbrains/plugins/gradle/model/id/GradleModuleDependencyId.java
@@ -8,46 +8,26 @@ import org.jetbrains.plugins.gradle.model.GradleEntityType;
  * @author Denis Zhdanov
  * @since 2/14/12 2:06 PM
  */
-public class GradleModuleDependencyId extends GradleAbstractEntityId {
+public class GradleModuleDependencyId extends GradleAbstractDependencyId {
 
-  @NotNull private final String myOwnerModuleName;
-  @NotNull private final String myDependencyModuleName;
-  
   public GradleModuleDependencyId(@NotNull GradleEntityOwner owner, @NotNull String ownerModuleName, @NotNull String dependencyModuleName) {
-    super(GradleEntityType.MODULE, owner);
-    myOwnerModuleName = ownerModuleName;
-    myDependencyModuleName = dependencyModuleName;
+    super(GradleEntityType.MODULE_DEPENDENCY, owner, ownerModuleName, dependencyModuleName);
   }
 
   @Override
   public Object mapToEntity(@NotNull GradleEntityMappingContext context) {
     switch (getOwner()) {
-      case GRADLE: return context.getProjectStructureHelper().findGradleModuleDependency(myOwnerModuleName, myDependencyModuleName);
-      case INTELLIJ: return context.getProjectStructureHelper().findIntellijModuleDependency(myOwnerModuleName, myDependencyModuleName);
+      case GRADLE: return context.getProjectStructureHelper().findGradleModuleDependency(getOwnerModuleName(), getDependencyName());
+      case INTELLIJ: return context.getProjectStructureHelper().findIntellijModuleDependency(getOwnerModuleName(), getDependencyName());
     }
     throw new IllegalStateException(String.format(
       "Can't map id to the target module dependency. Owner: %s, owner module: '%s', dependency module: '%s'",
-      getOwner(), myOwnerModuleName, myDependencyModuleName
+      getOwner(), getOwnerModuleName(), getDependencyName()
     ));
   }
 
-  @Override
-  public int hashCode() {
-    int result = 31 * super.hashCode() + myOwnerModuleName.hashCode();
-    return 31 * result + myDependencyModuleName.hashCode();
-  }
-
-  @Override
-  public boolean equals(Object o) {
-    if (!super.equals(o)) {
-      return false;
-    }
-    GradleModuleDependencyId that = (GradleModuleDependencyId)o;
-    return myOwnerModuleName.equals(that.myOwnerModuleName) && myDependencyModuleName.equals(that.myDependencyModuleName);
-  }
-
   @Override
   public String toString() {
-    return String.format("module dependency:owner module='%s'|dependency module='%s'", myOwnerModuleName, myDependencyModuleName);
+    return String.format("module dependency:owner module='%s'|dependency module='%s'", getOwnerModuleName(), getDependencyName());
   }
 }
diff --git a/plugins/gradle/src/org/jetbrains/plugins/gradle/model/id/GradleModuleId.java b/plugins/gradle/src/org/jetbrains/plugins/gradle/model/id/GradleModuleId.java
index e447f2189540..275887045ed8 100644
--- a/plugins/gradle/src/org/jetbrains/plugins/gradle/model/id/GradleModuleId.java
+++ b/plugins/gradle/src/org/jetbrains/plugins/gradle/model/id/GradleModuleId.java
@@ -46,4 +46,9 @@ public class GradleModuleId extends GradleAbstractEntityId {
     GradleModuleId that = (GradleModuleId)o;
     return myModuleName.equals(that.myModuleName);
   }
+
+  @Override
+  public String toString() {
+    return "module '" + myModuleName + "'";
+  }
 }
diff --git a/plugins/gradle/src/org/jetbrains/plugins/gradle/sync/GradleProjectStructureChangesDetector.java b/plugins/gradle/src/org/jetbrains/plugins/gradle/sync/GradleProjectStructureChangesDetector.java
index e46258ad1597..11baf98bbe71 100644
--- a/plugins/gradle/src/org/jetbrains/plugins/gradle/sync/GradleProjectStructureChangesDetector.java
+++ b/plugins/gradle/src/org/jetbrains/plugins/gradle/sync/GradleProjectStructureChangesDetector.java
@@ -1,11 +1,13 @@
 package org.jetbrains.plugins.gradle.sync;
 
 import com.intellij.ProjectTopics;
+import com.intellij.openapi.application.ModalityState;
 import com.intellij.openapi.components.AbstractProjectComponent;
 import com.intellij.openapi.project.Project;
 import com.intellij.openapi.roots.ModuleRootEvent;
 import com.intellij.openapi.roots.ModuleRootListener;
 import com.intellij.util.Alarm;
+import com.intellij.util.ui.UIUtil;
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.plugins.gradle.util.GradleUtil;
 
@@ -59,10 +61,25 @@ public class GradleProjectStructureChangesDetector extends AbstractProjectCompon
       myAlarm.cancelAllRequests();
       final long diff = System.currentTimeMillis() - myStartRefreshTime.get();
       if (diff < 0) {
+        myAlarm.cancelAllRequests();
         myAlarm.addRequest(this, (int)-diff);
         return;
       }
-      GradleUtil.refreshProject(myProject);
+
+      UIUtil.invokeAndWaitIfNeeded(new Runnable() {
+        @Override
+        public void run() {
+          if (ModalityState.current() != ModalityState.NON_MODAL) {
+            // There is a possible case that user performs intellij project structure modification and 'project settings' dialog
+            // is open. We want to perform the refresh when the editing is completely finished then.
+            myAlarm.cancelAllRequests();
+            myAlarm.addRequest(RefreshRequest.this, REFRESH_DELAY_MILLIS);
+            return;
+          }
+
+          GradleUtil.refreshProject(myProject); 
+        }
+      });
     }
   }
 }
diff --git a/plugins/gradle/src/org/jetbrains/plugins/gradle/sync/GradleProjectStructureChangesModel.java b/plugins/gradle/src/org/jetbrains/plugins/gradle/sync/GradleProjectStructureChangesModel.java
index f91b30f579dd..a05831228288 100644
--- a/plugins/gradle/src/org/jetbrains/plugins/gradle/sync/GradleProjectStructureChangesModel.java
+++ b/plugins/gradle/src/org/jetbrains/plugins/gradle/sync/GradleProjectStructureChangesModel.java
@@ -4,8 +4,10 @@ import com.intellij.openapi.components.AbstractProjectComponent;
 import com.intellij.openapi.project.Project;
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;
+import org.jetbrains.plugins.gradle.diff.GradleChangesCalculationContext;
 import org.jetbrains.plugins.gradle.diff.GradleProjectStructureChange;
 import org.jetbrains.plugins.gradle.diff.GradleStructureChangesCalculator;
+import org.jetbrains.plugins.gradle.diff.PlatformFacade;
 import org.jetbrains.plugins.gradle.model.gradle.GradleProject;
 
 import java.util.HashSet;
@@ -28,14 +30,17 @@ public class GradleProjectStructureChangesModel extends AbstractProjectComponent
     = new AtomicReference<Set<GradleProjectStructureChange>>(new HashSet<GradleProjectStructureChange>());
   
   private final AtomicReference<GradleProject> myGradleProject = new AtomicReference<GradleProject>();
-  
-  private final GradleStructureChangesCalculator<GradleProject, Project> myChangesCalculator;
+
+  @NotNull private final GradleStructureChangesCalculator<GradleProject, Project> myChangesCalculator;
+  @NotNull private final PlatformFacade myPlatformFacade;
 
   public GradleProjectStructureChangesModel(@NotNull Project project,
-                                            @NotNull GradleStructureChangesCalculator<GradleProject, Project> changesCalculator)
+                                            @NotNull GradleStructureChangesCalculator<GradleProject, Project> changesCalculator,
+                                            @NotNull PlatformFacade platformFacade)
   {
     super(project);
     myChangesCalculator = changesCalculator;
+    myPlatformFacade = platformFacade;
   }
 
   /**
@@ -58,15 +63,14 @@ public class GradleProjectStructureChangesModel extends AbstractProjectComponent
    */
   public void update(@NotNull GradleProject gradleProject) {
     myGradleProject.set(gradleProject);
-    Set<GradleProjectStructureChange> knownChanges = new HashSet<GradleProjectStructureChange>(myChanges.get());
-    Set<GradleProjectStructureChange> currentChanges = new HashSet<GradleProjectStructureChange>();
-    myChangesCalculator.calculate(gradleProject, myProject, knownChanges, currentChanges);
-    if (currentChanges.equals(knownChanges)) {
+    GradleChangesCalculationContext context = new GradleChangesCalculationContext(myChanges.get(), myPlatformFacade);
+    myChangesCalculator.calculate(gradleProject, myProject, context);
+    if (!context.hasNewChanges()) {
       return;
     }
-    myChanges.set(currentChanges);
+    myChanges.set(context.getCurrentChanges());
     for (GradleProjectStructureChangeListener listener : myListeners) {
-      listener.onChanges(knownChanges, currentChanges);
+      listener.onChanges(context.getKnownChanges(), context.getCurrentChanges());
     }
   }
 
diff --git a/plugins/gradle/src/org/jetbrains/plugins/gradle/sync/GradleProjectStructureChangesPanel.java b/plugins/gradle/src/org/jetbrains/plugins/gradle/sync/GradleProjectStructureChangesPanel.java
index 75a9e5c25a06..b21feae7cbcf 100644
--- a/plugins/gradle/src/org/jetbrains/plugins/gradle/sync/GradleProjectStructureChangesPanel.java
+++ b/plugins/gradle/src/org/jetbrains/plugins/gradle/sync/GradleProjectStructureChangesPanel.java
@@ -49,8 +49,8 @@ public class GradleProjectStructureChangesPanel extends GradleToolWindowPanel {
         UIUtil.invokeLaterIfNeeded(new Runnable() {
           @Override
           public void run() {
-            myTreeModel.update(currentChanges);
             myTreeModel.processObsoleteChanges(ContainerUtil.subtract(oldChanges, currentChanges));
+            myTreeModel.processCurrentChanges(currentChanges);
           }
         });
       }
diff --git a/plugins/gradle/src/org/jetbrains/plugins/gradle/sync/GradleProjectStructureHelper.java b/plugins/gradle/src/org/jetbrains/plugins/gradle/sync/GradleProjectStructureHelper.java
index 268fe0d2d1be..63f41e11b0b2 100644
--- a/plugins/gradle/src/org/jetbrains/plugins/gradle/sync/GradleProjectStructureHelper.java
+++ b/plugins/gradle/src/org/jetbrains/plugins/gradle/sync/GradleProjectStructureHelper.java
@@ -15,6 +15,7 @@ import org.jetbrains.annotations.Nullable;
 import org.jetbrains.plugins.gradle.diff.PlatformFacade;
 import org.jetbrains.plugins.gradle.model.gradle.*;
 import org.jetbrains.plugins.gradle.model.id.GradleLibraryDependencyId;
+import org.jetbrains.plugins.gradle.model.id.GradleModuleDependencyId;
 
 /**
  * Thread-safe.
@@ -49,23 +50,7 @@ public class GradleProjectStructureHelper extends AbstractProjectComponent {
    *                 <code>false</code> otherwise
    */
   public boolean isIntellijLibraryDependencyExist(@NotNull final GradleLibraryDependencyId id) {
-    final Module module = findIntellijModule(id.getModuleName());
-    if (module == null) {
-      return false;
-    }
-    
-    RootPolicy<Boolean> visitor = new RootPolicy<Boolean>() {
-      @Override
-      public Boolean visitLibraryOrderEntry(LibraryOrderEntry libraryOrderEntry, Boolean value) {
-        return id.getLibraryName().equals(libraryOrderEntry.getLibraryName());
-      }
-    };
-    for (OrderEntry entry : myFacade.getOrderEntries(module)) {
-      if (entry.accept(visitor, false)) {
-        return true;
-      }
-    }
-    return false;
+    return findIntellijLibraryDependency(id.getOwnerModuleName(), id.getDependencyName()) != null;
   }
 
   /**
@@ -76,7 +61,15 @@ public class GradleProjectStructureHelper extends AbstractProjectComponent {
    *                 <code>false</code> otherwise
    */
   public boolean isGradleLibraryDependencyExist(@NotNull final GradleLibraryDependencyId id) {
-    return findGradleLibraryDependency(id.getModuleName(), id.getLibraryName()) != null;
+    return findGradleLibraryDependency(id.getOwnerModuleName(), id.getDependencyName()) != null;
+  }
+
+  public boolean isIntellijModuleDependencyExist(@NotNull final GradleModuleDependencyId id) {
+    return findIntellijModuleDependency(id.getOwnerModuleName(), id.getDependencyName()) != null;
+  }
+  
+  public boolean isGradleModuleDependencyExist(@NotNull final GradleModuleDependencyId id) {
+    return findIntellijModuleDependency(id.getOwnerModuleName(), id.getDependencyName()) != null;
   }
   
   @Nullable
@@ -111,10 +104,15 @@ public class GradleProjectStructureHelper extends AbstractProjectComponent {
 
   @Nullable
   public Library findIntellijLibrary(@NotNull final GradleLibrary library) {
+    return findIntellijLibrary(library.getName());
+  }
+  
+  @Nullable
+  public Library findIntellijLibrary(@NotNull String libraryName) {
     final LibraryTable libraryTable = myFacade.getProjectLibraryTable(myProject);
     for (Library intellijLibrary : libraryTable.getLibraries()) {
       // TODO den consider 'merged libraries' at the registered project structure changes here.
-      if (library.getName().equals(intellijLibrary.getName())) {
+      if (libraryName.equals(intellijLibrary.getName())) {
         return intellijLibrary;
       }
     }
@@ -145,6 +143,20 @@ public class GradleProjectStructureHelper extends AbstractProjectComponent {
     }
     return null;
   }
+
+  @Nullable
+  public GradleLibrary findGradleLibrary(@NotNull final String libraryName) {
+    final GradleProject project = myModel.getGradleProject();
+    if (project == null) {
+      return null;
+    }
+    for (GradleLibrary library : project.getLibraries()) {
+      if (libraryName.equals(library.getName())) {
+        return library;
+      }
+    }
+    return null;
+  }
   
   @Nullable
   public GradleLibraryDependency findGradleLibraryDependency(@NotNull final String moduleName, @NotNull final String libraryName) {
diff --git a/plugins/gradle/src/org/jetbrains/plugins/gradle/sync/GradleProjectStructureTreeModel.java b/plugins/gradle/src/org/jetbrains/plugins/gradle/sync/GradleProjectStructureTreeModel.java
index f0dc67d9692d..7deb8d5e3f8f 100644
--- a/plugins/gradle/src/org/jetbrains/plugins/gradle/sync/GradleProjectStructureTreeModel.java
+++ b/plugins/gradle/src/org/jetbrains/plugins/gradle/sync/GradleProjectStructureTreeModel.java
@@ -92,7 +92,7 @@ public class GradleProjectStructureTreeModel extends DefaultTreeModel {
           return value;
         }
         GradleLibraryDependencyId id = GradleEntityIdMapper.mapEntityToId(libraryOrderEntry);
-        dependencies.add(buildNode(id, id.getLibraryName()));
+        dependencies.add(buildNode(id, id.getDependencyName()));
         return value;
       }
     };
@@ -137,6 +137,7 @@ public class GradleProjectStructureTreeModel extends DefaultTreeModel {
     GradleProjectStructureNode<GradleModuleId> moduleNode = getModuleNode(id);
     GradleProjectStructureNode<GradleSyntheticId> result
       = new GradleProjectStructureNode<GradleSyntheticId>(GradleConstants.DEPENDENCIES_NODE_DESCRIPTOR);
+    result.addListener(myNodeListener);
     moduleNode.add(result);
     myModuleDependencies.put(id.getModuleName(), result);
     
@@ -159,7 +160,7 @@ public class GradleProjectStructureTreeModel extends DefaultTreeModel {
    * 
    * @param changes  collections that contains all changes between the current gradle and intellij project structures
    */
-  public void update(@NotNull Collection<GradleProjectStructureChange> changes) {
+  public void processCurrentChanges(@NotNull Collection<GradleProjectStructureChange> changes) {
     for (GradleProjectStructureChange change : changes) {
       change.invite(myNewChangesDispatcher);
     }
@@ -196,7 +197,7 @@ public class GradleProjectStructureTreeModel extends DefaultTreeModel {
     for (GradleProjectStructureNode<GradleSyntheticId> holder : myModuleDependencies.values()) {
       for (GradleProjectStructureNode<GradleLibraryDependencyId> dependencyNode : holder.getChildren(GradleLibraryDependencyId.class)) {
         final GradleLibraryDependencyId id = dependencyNode.getDescriptor().getElement();
-        if (change.getLibraryName().equals(id.getLibraryName())) {
+        if (change.getLibraryName().equals(id.getDependencyName())) {
           dependencyNode.addConflictChange(change);
           break;
         }
@@ -205,26 +206,31 @@ public class GradleProjectStructureTreeModel extends DefaultTreeModel {
   }
 
   private void processNewLibraryDependencyPresenceChange(@NotNull GradleLibraryDependencyPresenceChange change) {
-    GradleLibraryDependencyId id = change.getGradleEntity();
+    processNewDependencyPresenceChange(change);
+  }
+
+  private void processNewModuleDependencyPresenceChange(@NotNull GradleModuleDependencyPresenceChange change) {
+    processNewDependencyPresenceChange(change);
+  }
+  
+  private <I extends GradleAbstractDependencyId> void processNewDependencyPresenceChange(@NotNull GradleEntityPresenceChange<I> change) {
+    I id = change.getGradleEntity();
     TextAttributesKey attributes = GradleTextAttributes.GRADLE_LOCAL_CHANGE;
     if (id == null) {
       id = change.getIntellijEntity();
       attributes = GradleTextAttributes.INTELLIJ_LOCAL_CHANGE;
     }
     assert id != null;
-    final GradleProjectStructureNode<GradleSyntheticId> dependenciesNode = getDependenciesNode(id.getModuleId());
-    for (GradleProjectStructureNode<GradleLibraryDependencyId> node : dependenciesNode.getChildren(GradleLibraryDependencyId.class)) {
-      GradleProjectStructureNodeDescriptor<GradleLibraryDependencyId> d = node.getDescriptor();
-      if (id.equals(d.getElement())) {
-        d.setAttributes(attributes);
-        nodeStructureChanged(node);
+    final GradleProjectStructureNode<GradleSyntheticId> dependenciesNode = getDependenciesNode(id.getOwnerModuleId());
+    for (GradleProjectStructureNode<? extends GradleAbstractDependencyId> node : dependenciesNode.getChildren(id.getClass())) {
+      if (id.equals(node.getDescriptor().getElement())) {
+        node.setAttributes(attributes);
         return;
       }
     }
-    GradleProjectStructureNode<GradleLibraryDependencyId> newNode = buildNode(id, id.getLibraryName());
-    newNode.getDescriptor().setAttributes(attributes);
+    GradleProjectStructureNode<I> newNode = buildNode(id, id.getDependencyName());
     dependenciesNode.add(newNode);
-    nodeStructureChanged(dependenciesNode);
+    newNode.setAttributes(attributes);
   }
 
   private void processNewModulePresenceChange(@NotNull GradleModulePresenceChange change) {
@@ -255,7 +261,7 @@ public class GradleProjectStructureTreeModel extends DefaultTreeModel {
     for (GradleProjectStructureNode<GradleSyntheticId> holder : myModuleDependencies.values()) {
       for (GradleProjectStructureNode<GradleLibraryDependencyId> node : holder.getChildren(GradleLibraryDependencyId.class)) {
         final GradleLibraryDependencyId id = node.getDescriptor().getElement();
-        if (id.getLibraryName().equals(change.getLibraryName())) {
+        if (id.getDependencyName().equals(change.getLibraryName())) {
           node.removeConflictChange(change);
           break;
         }
@@ -275,7 +281,25 @@ public class GradleProjectStructureTreeModel extends DefaultTreeModel {
     else {
       removeNode = !myProjectStructureHelper.isGradleLibraryDependencyExist(id);
     }
-    final GradleProjectStructureNode<GradleSyntheticId> holder = myModuleDependencies.get(id.getModuleName());
+    processObsoleteDependencyPresenceChange(id, removeNode);
+  }
+
+  private void processObsoleteModuleDependencyPresenceChange(@NotNull GradleModuleDependencyPresenceChange change) {
+    GradleModuleDependencyId id = change.getGradleEntity();
+    boolean removeNode;
+    if (id == null) {
+      id = change.getIntellijEntity();
+      assert id != null;
+      removeNode = !myProjectStructureHelper.isIntellijModuleDependencyExist(id);
+    }
+    else {
+      removeNode = !myProjectStructureHelper.isGradleModuleDependencyExist(id);
+    }
+    processObsoleteDependencyPresenceChange(id, removeNode);
+  }
+
+  private void processObsoleteDependencyPresenceChange(@NotNull GradleAbstractDependencyId id, boolean removeNode) {
+    final GradleProjectStructureNode<GradleSyntheticId> holder = myModuleDependencies.get(id.getOwnerModuleName());
     if (holder == null) {
       return;
     }
@@ -286,8 +310,8 @@ public class GradleProjectStructureTreeModel extends DefaultTreeModel {
     // We should distinguish between those situations because we need to mark the node as 'synced' at one case and
     // completely removed at another one.
 
-    for (GradleProjectStructureNode<GradleLibraryDependencyId> node : holder.getChildren(GradleLibraryDependencyId.class)) {
-      GradleProjectStructureNodeDescriptor<GradleLibraryDependencyId> descriptor = node.getDescriptor();
+    for (GradleProjectStructureNode<? extends GradleAbstractDependencyId> node : holder.getChildren(id.getClass())) {
+      GradleProjectStructureNodeDescriptor<? extends GradleAbstractDependencyId> descriptor = node.getDescriptor();
       if (!id.equals(descriptor.getElement())) {
         continue;
       }
@@ -304,13 +328,32 @@ public class GradleProjectStructureTreeModel extends DefaultTreeModel {
 
   private void processObsoleteModulePresenceChange(@NotNull GradleModulePresenceChange change) {
     GradleModuleId id = change.getGradleEntity();
+    boolean removeNode;
     if (id == null) {
       id = change.getIntellijEntity();
+      assert id != null;
+      removeNode = myProjectStructureHelper.findIntellijModule(id.getModuleName()) == null;
     }
-    assert id != null;
+    else {
+      removeNode = myProjectStructureHelper.findGradleModule(id.getModuleName()) == null;
+    }
+    
+
+    // There are two possible cases why 'module presence' change is obsolete:
+    //   1. Corresponding module has been added at the counterparty;
+    //   2. The 'local module' has been removed;
+    // We should distinguish between those situations because we need to mark the node as 'synced' at one case and
+    // completely removed at another one.
+    
     final GradleProjectStructureNode<GradleModuleId> moduleNode = myModules.get(id.getModuleName());
-    if (moduleNode != null) {
-      moduleNode.getDescriptor().setAttributes(GradleTextAttributes.GRADLE_NO_CHANGE);
+    if (moduleNode == null) {
+      return;
+    }
+    if (removeNode) {
+      moduleNode.removeFromParent();
+    }
+    else {
+      moduleNode.setAttributes(GradleTextAttributes.GRADLE_NO_CHANGE);
     }
   }
   
@@ -323,10 +366,13 @@ public class GradleProjectStructureTreeModel extends DefaultTreeModel {
     }
 
     @Override
-    public void onNodeRemoved(@NotNull GradleProjectStructureNode<?> node, int index) {
-      myIndexHolder[0] = index;
-      myNodeHolder[0] = node;
-      nodesWereRemoved(node.getParent(), myIndexHolder, myNodeHolder); 
+    public void onNodeRemoved(@NotNull GradleProjectStructureNode<?> parent,
+                              @NotNull GradleProjectStructureNode<?> removedChild,
+                              int removedChildIndex)
+    {
+      myIndexHolder[0] = removedChildIndex;
+      myNodeHolder[0] = removedChild;
+      nodesWereRemoved(parent, myIndexHolder, myNodeHolder); 
     }
 
     @Override
@@ -340,6 +386,7 @@ public class GradleProjectStructureTreeModel extends DefaultTreeModel {
     @Override public void visit(@NotNull GradleLanguageLevelChange change) { processNewLanguageLevelChange(change); }
     @Override public void visit(@NotNull GradleModulePresenceChange change) { processNewModulePresenceChange(change); }
     @Override public void visit(@NotNull GradleLibraryDependencyPresenceChange change) { processNewLibraryDependencyPresenceChange(change); }
+    @Override public void visit(@NotNull GradleModuleDependencyPresenceChange change) { processNewModuleDependencyPresenceChange(change); }
     @Override public void visit(@NotNull GradleMismatchedLibraryPathChange change) { processNewMismatchedLibraryPathChange(change); }
   }
   
@@ -350,6 +397,9 @@ public class GradleProjectStructureTreeModel extends DefaultTreeModel {
     @Override public void visit(@NotNull GradleLibraryDependencyPresenceChange change) {
       processObsoleteLibraryDependencyPresenceChange(change); 
     }
+    @Override public void visit(@NotNull GradleModuleDependencyPresenceChange change) {
+      processObsoleteModuleDependencyPresenceChange(change); 
+    }
     @Override public void visit(@NotNull GradleMismatchedLibraryPathChange change) { processObsoleteMismatchedLibraryPathChange(change); }
   }
 }
diff --git a/plugins/gradle/src/org/jetbrains/plugins/gradle/task/GradleResolveProjectTask.java b/plugins/gradle/src/org/jetbrains/plugins/gradle/task/GradleResolveProjectTask.java
index 2fbce6411fea..0ad2b87a27a6 100644
--- a/plugins/gradle/src/org/jetbrains/plugins/gradle/task/GradleResolveProjectTask.java
+++ b/plugins/gradle/src/org/jetbrains/plugins/gradle/task/GradleResolveProjectTask.java
@@ -39,7 +39,7 @@ public class GradleResolveProjectTask extends AbstractGradleTask {
     final GradleProject project = resolver.resolveProjectInfo(getId(), myProjectPath, myResolveLibraries);
     myGradleProject.set(project);
     setState(GradleTaskState.FINISHED);
-    if (myIntellijProject == null) {
+    if (myIntellijProject == null || myIntellijProject.isDisposed()) {
       return;
     }
     final GradleProjectStructureChangesModel model = myIntellijProject.getComponent(GradleProjectStructureChangesModel.class);
diff --git a/plugins/gradle/src/org/jetbrains/plugins/gradle/ui/GradleProjectStructureNode.java b/plugins/gradle/src/org/jetbrains/plugins/gradle/ui/GradleProjectStructureNode.java
index 37dcd05b960c..c1068610d2b4 100644
--- a/plugins/gradle/src/org/jetbrains/plugins/gradle/ui/GradleProjectStructureNode.java
+++ b/plugins/gradle/src/org/jetbrains/plugins/gradle/ui/GradleProjectStructureNode.java
@@ -70,13 +70,11 @@ public class GradleProjectStructureNode<T extends GradleEntityId> extends Defaul
     for (int i = 0; i < getChildCount(); i++) {
       GradleProjectStructureNode<?> node = getChildAt(i);
       if (NODE_COMPARATOR.compare((GradleProjectStructureNode<?>)newChild, node) <= 0) {
-        insert(newChild, i);
-        onNodeAdded((GradleProjectStructureNode<?>)newChild, i);
+        insert(newChild, i); // Assuming that the node listeners are notified during the nested call.
         return;
       }
     }
-    super.add(newChild);
-    onNodeAdded((GradleProjectStructureNode<?>)newChild, getChildCount() - 1);
+    super.add(newChild); // Assuming that the node listeners are notified during the nested call to 'insert()'.
   }
 
   @Override
@@ -105,26 +103,40 @@ public class GradleProjectStructureNode<T extends GradleEntityId> extends Defaul
    * Does nothing if given node is not a child of the current node.
    * 
    * @param child  target child node
+   * @return       <code>true</code> if child position was changed; <code>false</code> otherwise
    */
-  public void correctChildPositionIfNecessary(@NotNull GradleProjectStructureNode<?> child) {
+  public boolean correctChildPositionIfNecessary(@NotNull GradleProjectStructureNode<?> child) {
     int currentPosition = -1;
-    int desiredPosition = getChildCount() - 1;
+    int desiredPosition = -1;
     for (int i = 0; i < getChildCount(); i++) {
       GradleProjectStructureNode<?> node = getChildAt(i);
       if (node == child) {
         currentPosition = i;
         continue;
       }
-      if (NODE_COMPARATOR.compare(child, node) <= 0) {
+      if (desiredPosition < 0 && NODE_COMPARATOR.compare(child, node) <= 0) {
         desiredPosition = i;
+        if (currentPosition >= 0) {
+          break;
+        }
       }
     }
     if (currentPosition < 0) {
       // Given node is not a child of the current node.
-      return;
+      return false;
+    }
+    if (desiredPosition < 0) {
+      desiredPosition = getChildCount();
+    }
+    if (currentPosition < desiredPosition) {
+      desiredPosition--;
+    }
+    if (currentPosition == desiredPosition) {
+      return false;
     }
     remove(currentPosition);
     insert(child, desiredPosition);
+    return true;
   }
 
   /**
@@ -145,7 +157,12 @@ public class GradleProjectStructureNode<T extends GradleEntityId> extends Defaul
    */
   public void addConflictChange(@NotNull GradleProjectStructureChange change) {
     myConflictChanges.add(change);
-    if (myConflictChanges.size() == 1) {
+    if (myConflictChanges.size() != 1) {
+      return;
+    }
+    final TextAttributesKey key = myDescriptor.getAttributes();
+    boolean localNode = key == GradleTextAttributes.GRADLE_LOCAL_CHANGE || key == GradleTextAttributes.INTELLIJ_LOCAL_CHANGE;
+    if (!localNode) {
       myDescriptor.setAttributes(GradleTextAttributes.GRADLE_CHANGE_CONFLICT);
       onNodeChanged(this);
     }
@@ -219,7 +236,15 @@ public class GradleProjectStructureNode<T extends GradleEntityId> extends Defaul
 
   public void setAttributes(@NotNull TextAttributesKey key) {
     myDescriptor.setAttributes(key);
-    onNodeChanged(this);
+    final GradleProjectStructureNode<?> parent = getParent();
+    if (parent == null) {
+      onNodeChanged(this);
+      return;
+    }
+    boolean positionChanged = parent.correctChildPositionIfNecessary(this);
+    if (!positionChanged) {
+      onNodeChanged(this);
+    }
   }
   
   public void addListener(@NotNull Listener listener) {
@@ -232,9 +257,9 @@ public class GradleProjectStructureNode<T extends GradleEntityId> extends Defaul
     }
   }
 
-  private void onNodeRemoved(@NotNull GradleProjectStructureNode<?> node, int index) {
+  private void onNodeRemoved(@NotNull GradleProjectStructureNode<?> node, int removedChildIndex) {
     for (Listener listener : myListeners) {
-      listener.onNodeRemoved(node, index);
+      listener.onNodeRemoved(this, node, removedChildIndex);
     }
   }
 
@@ -246,7 +271,9 @@ public class GradleProjectStructureNode<T extends GradleEntityId> extends Defaul
   
   public interface Listener {
     void onNodeAdded(@NotNull GradleProjectStructureNode<?> node, int index);
-    void onNodeRemoved(@NotNull GradleProjectStructureNode<?> node, int index);
+    void onNodeRemoved(@NotNull GradleProjectStructureNode<?> parent,
+                       @NotNull GradleProjectStructureNode<?> removedChild,
+                       int removedChildIndex);
     void onNodeChanged(@NotNull GradleProjectStructureNode<?> node);
   }
 }
diff --git a/plugins/gradle/src/org/jetbrains/plugins/gradle/util/GradleUtil.java b/plugins/gradle/src/org/jetbrains/plugins/gradle/util/GradleUtil.java
index b2327cf987f0..3977afeb7df3 100644
--- a/plugins/gradle/src/org/jetbrains/plugins/gradle/util/GradleUtil.java
+++ b/plugins/gradle/src/org/jetbrains/plugins/gradle/util/GradleUtil.java
@@ -157,10 +157,10 @@ public class GradleUtil {
    */
   @Nullable
   public static GradleProject refreshProject(@NotNull final Project project,
-                                    @NotNull final String gradleProjectPath,
-                                    @NotNull final Ref<String> errorHolder,
-                                    final boolean resolveLibraries,
-                                    final boolean modal)
+                                             @NotNull final String gradleProjectPath,
+                                             @NotNull final Ref<String> errorHolder,
+                                             final boolean resolveLibraries,
+                                             final boolean modal)
   {
     final Ref<GradleProject> gradleProject = new Ref<GradleProject>();
     final TaskUnderProgress task = new TaskUnderProgress() {
@@ -196,7 +196,7 @@ public class GradleUtil {
               task.execute(indicator);
             }
           });
-        } 
+        }
       }
     });
     return gradleProject.get();
diff --git a/plugins/gradle/testSources/org/jetbrains/plugins/gradle/sync/GradleProjectStructureChangesModelTest.groovy b/plugins/gradle/testSources/org/jetbrains/plugins/gradle/sync/GradleProjectStructureChangesModelTest.groovy
index 897969814943..4f94296362ef 100644
--- a/plugins/gradle/testSources/org/jetbrains/plugins/gradle/sync/GradleProjectStructureChangesModelTest.groovy
+++ b/plugins/gradle/testSources/org/jetbrains/plugins/gradle/sync/GradleProjectStructureChangesModelTest.groovy
@@ -6,6 +6,8 @@ import org.jetbrains.plugins.gradle.testutil.AbstractGradleTest
 import org.junit.Test
 
 import static org.junit.Assert.assertEquals
+import org.jetbrains.plugins.gradle.diff.GradleMismatchedLibraryPathChange
+import org.jetbrains.plugins.gradle.diff.GradleLibraryDependencyPresenceChange
 
 /**
  * @author Denis Zhdanov
@@ -15,7 +17,7 @@ import static org.junit.Assert.assertEquals
 public class GradleProjectStructureChangesModelTest extends AbstractGradleTest {
 
   @Test
-  public void processObsoleteGradleLocalChange() {
+  public void "obsolete gradle-local modules"() {
     // Configure initial projects state.
     init(
       gradle: {
@@ -32,14 +34,17 @@ public class GradleProjectStructureChangesModelTest extends AbstractGradleTest {
           module {
             dependencies {
               library("lib1")
-        } } } }
+        } } } },
+      changesSorter: { a, b ->
+        b.gradleEntity.dependencyName.compareTo(a.gradleEntity.dependencyName)
+      }
     )
     
     // Check that the initial projects state is correctly parsed.
     checkChanges {
       presence {
-        library(gradle: gradle.modules.dependencies.flatten().findAll { it.name == "lib2" })
-        library(gradle: gradle.modules.dependencies.flatten().findAll { it.name == "lib3" })
+        library(gradle: gradle.libraryDependencies.values().flatten().findAll { it.name == "lib2" })
+        library(gradle: gradle.libraryDependencies.values().flatten().findAll { it.name == "lib3" })
     } }
     checkTree {
       project {
@@ -61,7 +66,7 @@ public class GradleProjectStructureChangesModelTest extends AbstractGradleTest {
     
     checkChanges {
       presence {
-        library(gradle: gradle.modules.dependencies.flatten().findAll { it.name == "lib3" })
+        library(gradle: gradle.libraryDependencies.values().flatten().findAll { it.name == "lib3" })
     } }
     checkTree {
       project {
@@ -93,7 +98,7 @@ public class GradleProjectStructureChangesModelTest extends AbstractGradleTest {
   }
   
   @Test
-  public void libraryDependenciesWithDifferentPaths() {
+  public void "library dependencies on binary paths"() {
     // Let the model has two differences in a library setup initially.
     init(
       gradle: {
@@ -114,8 +119,7 @@ public class GradleProjectStructureChangesModelTest extends AbstractGradleTest {
 
     checkChanges {
       libraryConflict(entity: intellij.libraries['lib2']) {
-        binaryPath(gradle: '1', intellij: null)
-        binaryPath(gradle: null, intellij: '3')
+        binaryPath(gradle: '1', intellij: ['3'])
     } }
     checkTree {
       project {
@@ -143,7 +147,7 @@ public class GradleProjectStructureChangesModelTest extends AbstractGradleTest {
       } } } }
     )
     checkChanges {
-      libraryConflict(entity: intellij.dependencies.values().flatten().find {it.library.name == 'lib2' }.library) {
+      libraryConflict(entity: intellij.libraryDependencies.values().flatten().find {it.library.name == 'lib2' }.library) {
         binaryPath(gradle: null, intellij: '3')
     } }
     checkTree {
@@ -182,7 +186,7 @@ public class GradleProjectStructureChangesModelTest extends AbstractGradleTest {
   }
   
   @Test
-  public void intellijModuleRemoval() {
+  public void "intellij module removal"() {
     Closure initialClosure = {
       project {
         module('module1')
@@ -208,21 +212,22 @@ public class GradleProjectStructureChangesModelTest extends AbstractGradleTest {
     } } )
     checkChanges {
       presence {
-        module(gradle: gradle.modules.find { it.name == 'module2'})
-        libraryDependency(gradle: gradle.modules.dependencies.flatten())
+        module(gradle: gradle.modules['module2'])
+        libraryDependency(gradle: gradle.modules['module2'].dependencies)
     } }
     checkTree {
       project {
-        module1()
         module2('gradle') {
           dependencies {
             lib1('gradle')
             lib2('gradle')
-    } } } }
+        } }
+        module1()
+    } }
   }
   
   @Test
-  public void gradleModuleIsImported() {
+  public void "gradle-local module is not treated as 'local' after import"() {
     init(
       gradle: {
         project {
@@ -236,12 +241,12 @@ public class GradleProjectStructureChangesModelTest extends AbstractGradleTest {
     )
     checkChanges {
       presence {
-        module(gradle: gradle.modules.find { it.name == 'module2' })
+        module(gradle: gradle.modules['module2'])
     } }
     checkTree {
       project {
-        module1()
         module2('gradle')
+        module1()
     } }
     
     // Emulate import gradle module to intellij.
@@ -257,4 +262,293 @@ public class GradleProjectStructureChangesModelTest extends AbstractGradleTest {
         module2() // Imported module node is not highlighted anymore.
     } }
   }
+  
+  @Test
+  public void "gradle local library dependency outweighs library path conflict"() {
+    init(
+      gradle: {
+        project {
+          module('module1') {
+            dependencies {
+              library('lib1', bin: ['1'])
+          } }
+          module('module2') {
+            dependencies {
+              library('lib1')
+      } } } },
+      intellij: {
+        project {
+          module('module1') {
+            dependencies {
+              library('lib1', bin: ['2'])
+      } } } },
+      changesSorter: changeByClassSorter([
+        (GradleMismatchedLibraryPathChange)     : 2,
+        (GradleLibraryDependencyPresenceChange) : 1
+      ])
+    )
+
+    checkChanges {
+      presence {
+        module(gradle: gradle.modules['module2'])
+        libraryDependency(gradle: gradle.libraryDependencies[gradle.modules['module2']].first())
+      }
+      libraryConflict(entity: intellij.libraries['lib1']) {
+        binaryPath(gradle: ['1'], intellij: ['2'])
+    } }
+    checkTree {
+      project {
+        module2('gradle') {
+          dependencies {
+            lib1('gradle') // This is the point of the test. We don't expect to see 'conflict' here.
+        } }
+        module1() {
+          dependencies {
+            lib1('conflict')
+    } } } }
+  }
+  
+  @Test
+  public void "mismatched module dependency import"() {
+    init(
+      gradle: {
+        project {
+          module('module1')
+          module('module2')
+          module('module3') {
+            dependencies {
+              module('module1')
+              module('module2')
+      } } } },
+      intellij: {
+        project {
+          module('module2')
+          module('module4')
+          module('module3') {
+            dependencies {
+              module('module2')
+              module('module4')
+      } } } }
+    )
+    checkChanges {
+      presence {
+        module(gradle: gradle.modules['module1'])
+        module(intellij: intellij.modules['module4'])
+        moduleDependency(gradle: gradle.moduleDependencies[gradle.modules['module3']].find { it.target == gradle.modules['module1']})
+        moduleDependency(intellij: intellij.moduleDependencies[intellij.modules['module3']].find { it.moduleName == 'module4'})
+    } }
+    checkTree {
+      project {
+        module1('gradle')
+        module2()
+        module3() {
+          dependencies {
+            module1('gradle')
+            module2()
+            module4('intellij')
+        } }
+        module4('intellij')
+    } }
+    
+    Closure newProjectState = {
+      project {
+        module('module1')
+        module('module2')
+        module('module4')
+        module('module3') {
+          dependencies {
+            module('module1')
+            module('module2')
+            module('module4')
+    } } } }
+    setState(gradle: newProjectState, intellij: newProjectState)
+    checkChanges { } // No changes
+    checkTree {
+      project {
+        module1()
+        module2()
+        module3 {
+          dependencies {
+            module1()
+            module2()
+            module4()
+         } }
+        module4()
+    } }
+  }
+  
+  @Test
+  public void "mismatched module dependency removal"() {
+    init(
+      gradle: {
+        project {
+          module('module1')
+          module('module2')
+          module('module3') {
+            dependencies {
+              module('module1')
+              module('module2')
+      } } } },
+      intellij: {
+        project {
+          module('module2')
+          module('module4')
+          module('module3') {
+            dependencies {
+              module('module2')
+              module('module4')
+      } } } }
+    )
+    checkChanges {
+      presence {
+        module(gradle: gradle.modules['module1'])
+        module(intellij: intellij.modules['module4'])
+        moduleDependency(gradle: gradle.moduleDependencies[gradle.modules['module3']].find { it.target == gradle.modules['module1']})
+        moduleDependency(intellij: intellij.moduleDependencies[intellij.modules['module3']].find { it.moduleName == 'module4'})
+    } }
+    checkTree {
+      project {
+        module1('gradle')
+        module2()
+        module3() {
+          dependencies {
+            module1('gradle')
+            module2()
+            module4('intellij')
+        } }
+        module4('intellij')
+    } }
+
+    Closure newProjectState = {
+      project {
+        module('module2')
+        module('module3') {
+          dependencies {
+            module('module2')
+    } } } }
+    setState(gradle: newProjectState, intellij: newProjectState)
+    checkChanges { } // No changes
+    checkTree {
+      project {
+        module2()
+        module3 {
+          dependencies {
+            module2()
+    } } } }
+  }
+  
+  @Test
+  public void "cycled module dependencies"() {
+    init(
+      gradle: {
+        project {
+          module('module1') {
+            dependencies {
+              module('module2')
+          } }
+          module('module2') {
+            dependencies {
+              module('module1')
+      } } } },
+      intellij: {
+        project {
+          module('module2') {
+            dependencies {
+              module('module3')
+          } }
+          module('module3') {
+            dependencies {
+              module('module2')
+      } } } } 
+    )
+    checkChanges {
+      presence {
+        module(gradle: gradle.modules['module1'])
+        module(intellij: intellij.modules['module3'])
+        moduleDependency(gradle: gradle.moduleDependencies.values().flatten())
+        moduleDependency(intellij: intellij.moduleDependencies.values().flatten())
+    } }
+    checkTree {
+      project {
+        module1('gradle') {
+          dependencies {
+            module2('gradle')
+        } }
+        module2() {
+          dependencies {
+            module1('gradle')
+            module3('intellij')
+        } }
+        module3('intellij') {
+          dependencies {
+            module2('intellij')
+    } } } }
+  }
+  
+  @Test
+  public void "mismatched library path is highlighted after importing local library dependency"() {
+    init(
+      gradle: {
+        project {
+          module('module1') {
+            dependencies {
+              library('lib1', bin: ['1'])
+          } }
+          module('module2') {
+            dependencies {
+              library('lib1')
+      } } } },
+      intellij: {
+        project {
+          module('module1') {
+            dependencies {
+              library('lib1', bin: ['2'])
+      } } } }
+    )
+    checkChanges {
+      presence {
+        module(gradle: gradle.modules['module2'])
+        libraryDependency(gradle: gradle.libraryDependencies[gradle.modules['module2']])
+      }
+      libraryConflict(entity: intellij.libraries['lib1']) {
+        binaryPath(gradle: '1', intellij: ['2'])
+    } }
+    checkTree {
+      project {
+        module2('gradle') {
+          dependencies {
+            lib1('gradle')
+        } }
+        module1 {
+          dependencies {
+            lib1('conflict')
+    } } } }
+    
+    // Emulate importing missing module and library dependencies. Expecting to see the newly imported library dependency node
+    // highlighted as 'conflict' now.
+    setState(intellij: {
+      project {
+        module('module1') {
+          dependencies {
+            library('lib1', bin: ['2'])
+        } }
+        module('module2') {
+          dependencies {
+            library('lib1')
+    } } } })
+    checkChanges {
+      libraryConflict(entity: intellij.libraries['lib1']) {
+        binaryPath(gradle: '1', intellij: ['2'])
+    } }
+    checkTree {
+      project {
+        module1 {
+          dependencies {
+            lib1('conflict')
+        } }
+        module2() {
+          dependencies {
+            lib1('conflict')
+    } } } }
+  }
 }
diff --git a/plugins/gradle/testSources/org/jetbrains/plugins/gradle/testutil/AbstractGradleTest.groovy b/plugins/gradle/testSources/org/jetbrains/plugins/gradle/testutil/AbstractGradleTest.groovy
index 99f9fc4f7076..d97f7288a24e 100644
--- a/plugins/gradle/testSources/org/jetbrains/plugins/gradle/testutil/AbstractGradleTest.groovy
+++ b/plugins/gradle/testSources/org/jetbrains/plugins/gradle/testutil/AbstractGradleTest.groovy
@@ -1,23 +1,18 @@
 package org.jetbrains.plugins.gradle.testutil
 
+import com.intellij.openapi.project.Project
+import com.intellij.util.containers.ContainerUtil
+import org.jetbrains.plugins.gradle.model.id.GradleEntityIdMapper
+import org.jetbrains.plugins.gradle.sync.GradleProjectStructureChangeListener
 import org.jetbrains.plugins.gradle.sync.GradleProjectStructureChangesModel
+import org.jetbrains.plugins.gradle.sync.GradleProjectStructureHelper
 import org.jetbrains.plugins.gradle.sync.GradleProjectStructureTreeModel
 import org.junit.Before
-import org.picocontainer.defaults.DefaultPicoContainer
-import com.intellij.openapi.project.Project
-import org.jetbrains.plugins.gradle.diff.PlatformFacade
-import org.jetbrains.plugins.gradle.diff.GradleStructureChangesCalculator
-import org.jetbrains.plugins.gradle.diff.GradleProjectStructureChangesCalculator
-import org.jetbrains.plugins.gradle.diff.GradleModuleStructureChangesCalculator
-import org.jetbrains.plugins.gradle.diff.GradleLibraryDependencyStructureChangesCalculator
-import org.jetbrains.plugins.gradle.diff.GradleLibraryStructureChangesCalculator
-import org.jetbrains.plugins.gradle.sync.GradleProjectStructureHelper
-import com.intellij.util.containers.ContainerUtil
-import org.jetbrains.plugins.gradle.sync.GradleProjectStructureChangeListener
-
-import static org.junit.Assert.assertEquals
 import org.picocontainer.MutablePicoContainer
-import org.jetbrains.plugins.gradle.model.id.GradleEntityIdMapper;
+import org.picocontainer.defaults.DefaultPicoContainer
+import org.jetbrains.plugins.gradle.diff.*
+
+import static org.junit.Assert.fail
 
 /**
  * @author Denis Zhdanov
@@ -29,15 +24,16 @@ public abstract class AbstractGradleTest {
   GradleProjectStructureTreeModel treeModel
   def gradle
   def intellij
-  def changes
+  def changesBuilder
   def treeChecker
   def container
+  private Closure changesComparator
 
   @Before
   public void setUp() {
     gradle = new GradleProjectBuilder()
     intellij = new IntellijProjectBuilder()
-    changes = new ChangeBuilder()
+    changesBuilder = new ChangeBuilder()
     treeChecker = new ProjectStructureChecker()
     container = new DefaultPicoContainer()
     container.registerComponentInstance(Project, intellij.project)
@@ -47,6 +43,7 @@ public abstract class AbstractGradleTest {
     container.registerComponentImplementation(GradleProjectStructureHelper)
     container.registerComponentImplementation(GradleStructureChangesCalculator, GradleProjectStructureChangesCalculator)
     container.registerComponentImplementation(GradleModuleStructureChangesCalculator)
+    container.registerComponentImplementation(GradleModuleDependencyStructureChangesCalculator)
     container.registerComponentImplementation(GradleLibraryDependencyStructureChangesCalculator)
     container.registerComponentImplementation(GradleLibraryStructureChangesCalculator)
     container.registerComponentImplementation(GradleEntityIdMapper)
@@ -62,31 +59,55 @@ public abstract class AbstractGradleTest {
   protected def init(map = [:]) {
     treeModel = container.getComponentInstance(GradleProjectStructureTreeModel) as GradleProjectStructureTreeModel
     changesModel.addListener({ old, current ->
-                               treeModel.update(current)
-                               treeModel.processObsoleteChanges(ContainerUtil.subtract(old, current));
+                               treeModel.processObsoleteChanges(sortChanges(ContainerUtil.subtract(old, current)));
+                               treeModel.processCurrentChanges(sortChanges(current))
     } as GradleProjectStructureChangeListener)
     setState(map, false)
     treeModel.rebuild()
     changesModel.update(gradle.project)
   }
 
+  def sortChanges(changes) {
+    if (changesComparator) {
+      return changes.toList().sort(changesComparator)
+    }
+    return changes
+  }
+  
   protected def setState(map, update = true) {
     map.intellij?.delegate = intellij
     map.intellij?.call()
     map.gradle?.delegate = gradle
     map.gradle?.call()
+    changesComparator = map.changesSorter
     if (update) {
       changesModel.update(gradle.project)
     }
   }
   
   protected def checkChanges(Closure c) {
-    c.delegate = changes
+    changesBuilder.changes.clear()
+    c.delegate = changesBuilder
     def expected = c()
     if (!expected) {
       expected = [].toSet()
     }
-    assertEquals(expected, changesModel.changes)
+    def actual = new HashSet(changesModel.changes)
+    if (expected == actual) {
+      return
+    }
+    actual.removeAll(expected)
+    expected.removeAll(changesModel.changes)
+    def message = "Project structure changes are mismatched."
+    if (expected) {
+      message += "\n  Expected but not matched:"
+      expected.each { message += "\n    * $it"}
+    }
+    if (actual) {
+      message += "\n  Unexpected:"
+      actual.each { message += "\n    * $it"}
+    }
+    fail(message)
   }
 
   protected def checkTree(c) {
@@ -95,4 +116,17 @@ public abstract class AbstractGradleTest {
     def expected = c()
     treeChecker.check(expected, treeModel.root)
   }
+
+  protected Closure changeByClassSorter(Map<Class<?>, Integer> rules) {
+    { a, b ->
+      def weightA = rules[a.class] ?: Integer.MAX_VALUE
+      def weightB = rules[b.class] ?: Integer.MAX_VALUE
+      if (weightA == weightB) {
+        return  a.hashCode() - b.hashCode()
+      }
+      else {
+        return weightA - weightB
+      }
+    }
+  }
 }
diff --git a/plugins/gradle/testSources/org/jetbrains/plugins/gradle/testutil/AbstractProjectBuilder.groovy b/plugins/gradle/testSources/org/jetbrains/plugins/gradle/testutil/AbstractProjectBuilder.groovy
index 4b031f380a76..4b6ad6712fb7 100644
--- a/plugins/gradle/testSources/org/jetbrains/plugins/gradle/testutil/AbstractProjectBuilder.groovy
+++ b/plugins/gradle/testSources/org/jetbrains/plugins/gradle/testutil/AbstractProjectBuilder.groovy
@@ -1,6 +1,7 @@
 package org.jetbrains.plugins.gradle.testutil
 
 import com.intellij.pom.java.LanguageLevel
+import com.intellij.openapi.util.text.StringUtil
 
 /**
  * @author Denis Zhdanov
@@ -12,16 +13,28 @@ public abstract class AbstractProjectBuilder extends BuilderSupport {
   private static int COUNTER
   
   def project
-  def modules = []
+  
+  /** [module name; module] */
+  def modules = [:]
+  
   /** Holds (library name; library) pairs for the active configuration. */
   def libraries = [:]
+
+  /** [module; dependency list] */
+  def libraryDependencies = [:].withDefault {[]}
+
+  /** [module; dependency list] */
+  def moduleDependencies = [:].withDefault {[]}
+  
   /**
    * Holds (library name; library) pairs for the whole test. I.e. there is a possible case that we define particular configuration
    * initially and the adjust it. We need to use the same library instance then in order to pass hashCode()/equals() checks then.
    * This map works as a test-wide storage.
    */
   def librariesCache = [:]
-  def dependencies = [:].withDefault {[]}
+  
+  /** [module name; module] */
+  def modulesCache = [:]
 
   @Override
   protected void setParent(Object parent, Object child) {
@@ -43,37 +56,54 @@ public abstract class AbstractProjectBuilder extends BuilderSupport {
   }
   
   @Override
-  protected Object createNode(Object name, Map attributes) {
+  protected Object createNode(name, Map attributes) {
     switch (name) {
       case "dependencies": return current // Assuming that 'current' is a module object
       case "project":
-        reset()
+        clear()
         return project = createProject(attributes.name?: same, attributes.langLevel?: LanguageLevel.JDK_1_6)
-      case "module": def module = createModule(attributes.name?: same); modules << module; return module
+      case "module":
       case "library":
+        def n = StringUtil.capitalize(name)
         if (current == project) {
-          // Library.
-          return getLibrary(attributes)
-        }
-        else {
-          // Library dependency.
-          def module = current
-          def dep = createLibraryDependency(module, getLibrary(attributes))
-          dependencies[module] << dep
-          return dep
+          // Not a dependency.
+          return "get$n"(attributes)
         }
+        def ownerModule = current
+        def dep = "create${n}Dependency"(ownerModule, "get$n"(attributes))
+        "get${n}Dependencies"()[ownerModule] << dep
+        return dep
     }
   }
 
   protected abstract def createProject(String name, LanguageLevel languageLevel)
   protected abstract def createModule(String name)
+  protected abstract def registerModule(module)
   protected abstract def createLibrary(String name, Map paths)
   protected abstract def applyLibraryPaths(library, Map paths)
   protected abstract def createLibraryDependency(module, library)
+  protected abstract def createModuleDependency(ownerModule, targetModule)
+  protected abstract def reset();
 
   protected String getUnique() { "./${COUNTER++}" }
   protected String getSame() { SAME_TOKEN }
 
+  private def getModule(Map attributes) {
+    def name = attributes.name?: same
+    def result = modules[name]
+    if (result) return result
+    result = modulesCache[name]
+    if (result) {
+      registerModule(result)
+    }
+    else {
+      result = createModule(name)
+      modulesCache[name] = result
+    }
+    modules[name] = result
+    result
+  }
+  
   private def getLibrary(Map attributes) {
     def name = attributes.name?: same
     def result = libraries[name]
@@ -89,8 +119,9 @@ public abstract class AbstractProjectBuilder extends BuilderSupport {
     libraries[name] = result
     result
   }
-  
-  private def reset() {
-    [modules, dependencies, libraries]*.clear()
+
+  private def clear() {
+    reset()
+    [modules, libraryDependencies, libraries, moduleDependencies]*.clear()
   }
 }
diff --git a/plugins/gradle/testSources/org/jetbrains/plugins/gradle/testutil/ChangeBuilder.groovy b/plugins/gradle/testSources/org/jetbrains/plugins/gradle/testutil/ChangeBuilder.groovy
index 0a840bdb4674..07a7219421ae 100644
--- a/plugins/gradle/testSources/org/jetbrains/plugins/gradle/testutil/ChangeBuilder.groovy
+++ b/plugins/gradle/testSources/org/jetbrains/plugins/gradle/testutil/ChangeBuilder.groovy
@@ -6,6 +6,7 @@ import org.jetbrains.plugins.gradle.diff.GradleMismatchedLibraryPathChange
 import com.intellij.openapi.roots.libraries.Library
 import org.jetbrains.plugins.gradle.util.GradleUtil
 import org.jetbrains.plugins.gradle.diff.GradleModulePresenceChange
+import org.jetbrains.plugins.gradle.diff.GradleModuleDependencyPresenceChange
 
 /**
  * @author Denis Zhdanov
@@ -29,14 +30,15 @@ public class ChangeBuilder extends BuilderSupport {
 
   @Override
   protected Object createNode(Object name, Map attributes) {
-    if (current == null) {
-      changes = []
-    }
     switch (name) {
       case "module":
         changes.addAll attributes.gradle.collect { new GradleModulePresenceChange(it, null)}
         changes.addAll attributes.intellij.collect { new GradleModulePresenceChange(null, it)}
         return changes
+      case "moduleDependency":
+        changes.addAll attributes.gradle.collect { new GradleModuleDependencyPresenceChange(it, null) }
+        changes.addAll attributes.intellij.collect { new GradleModuleDependencyPresenceChange(null, it) }
+        return changes
       case "library":
         changes.addAll attributes.gradle.collect { new GradleLibraryDependencyPresenceChange(it, null)}
         changes.addAll attributes.intellij.collect { new GradleLibraryDependencyPresenceChange(null, it)}
@@ -50,15 +52,12 @@ public class ChangeBuilder extends BuilderSupport {
         if (!library) {
           throw new IllegalArgumentException("No entity is defined for the library conflict change. Known attributes: $attributes")
         }
-        if (attributes.gradle) {
-          return register(new GradleMismatchedLibraryPathChange(library, attributes.gradle, attributes.intellij))
-        }
         return library
       case "binaryPath":
         // Assuming that we're processing library binary path conflict here
         register(new GradleMismatchedLibraryPathChange(
-          current as Library, toCanonicalPath(attributes.gradle), toCanonicalPath(attributes.intellij)
-        ))  
+          current as Library, collectPaths(attributes.gradle), collectPaths(attributes.intellij)
+        ))
     }
     changes
   }
@@ -73,9 +72,16 @@ public class ChangeBuilder extends BuilderSupport {
 
   protected def register(change) {
     changes << change
-    change
+    changes
   }
 
+  private def collectPaths(paths) {
+    if (!paths) {
+      return [].toSet()
+    }
+    paths.collect { toCanonicalPath(it) }.toSet()
+  }
+  
   private def toCanonicalPath(String path) {
     path ? GradleUtil.toCanonicalPath(path) : path
   }
diff --git a/plugins/gradle/testSources/org/jetbrains/plugins/gradle/testutil/GradleProjectBuilder.groovy b/plugins/gradle/testSources/org/jetbrains/plugins/gradle/testutil/GradleProjectBuilder.groovy
index 9926a3f7f3b8..be6902acd9dc 100644
--- a/plugins/gradle/testSources/org/jetbrains/plugins/gradle/testutil/GradleProjectBuilder.groovy
+++ b/plugins/gradle/testSources/org/jetbrains/plugins/gradle/testutil/GradleProjectBuilder.groovy
@@ -6,6 +6,7 @@ import org.jetbrains.plugins.gradle.model.gradle.GradleLibraryDependency
 import org.jetbrains.plugins.gradle.model.gradle.GradleLibrary
 import org.jetbrains.plugins.gradle.model.gradle.LibraryPathType
 import com.intellij.pom.java.LanguageLevel
+import org.jetbrains.plugins.gradle.model.gradle.GradleModuleDependency
 
 /** 
  * @author Denis Zhdanov
@@ -23,8 +24,19 @@ class GradleProjectBuilder extends AbstractProjectBuilder {
 
   @Override
   protected createModule(String name) {
-    def result = new GradleModule(name, unique)
-    project.addModule(result)
+    registerModule(new GradleModule(name, unique))
+  }
+
+  @Override
+  protected registerModule(module) {
+    project.addModule(module)
+    module
+  }
+
+  @Override
+  protected createModuleDependency(ownerModule, targetModule) {
+    def result = new GradleModuleDependency(ownerModule, targetModule)
+    ownerModule.addDependency(result)
     result
   }
 
@@ -49,4 +61,9 @@ class GradleProjectBuilder extends AbstractProjectBuilder {
       key, type -> paths[key]?.each { library.addPath(type, it) }
     }
   }
+
+  @Override
+  protected reset() {
+    modulesCache.values().each { it.clearDependencies() }
+  }
 }
diff --git a/plugins/gradle/testSources/org/jetbrains/plugins/gradle/testutil/IntellijProjectBuilder.groovy b/plugins/gradle/testSources/org/jetbrains/plugins/gradle/testutil/IntellijProjectBuilder.groovy
index c2530ad59f2e..9a694bef6d3e 100644
--- a/plugins/gradle/testSources/org/jetbrains/plugins/gradle/testutil/IntellijProjectBuilder.groovy
+++ b/plugins/gradle/testSources/org/jetbrains/plugins/gradle/testutil/IntellijProjectBuilder.groovy
@@ -13,6 +13,7 @@ import com.intellij.openapi.vfs.VirtualFile
 import com.intellij.openapi.roots.OrderRootType
 import org.jetbrains.plugins.gradle.util.GradleUtil
 import com.intellij.openapi.roots.libraries.LibraryTable
+import com.intellij.openapi.roots.ModuleOrderEntry
 
 /** 
  * @author Denis Zhdanov
@@ -30,8 +31,8 @@ class IntellijProjectBuilder extends AbstractProjectBuilder {
   def projectLibraryTable = projectLibraryTableStub as LibraryTable
   
   def platformFacade = [
-    getModules: { modules },
-    getOrderEntries: { dependencies[it] },
+    getModules: { modules.values() },
+    getOrderEntries: { libraryDependencies[it] + moduleDependencies[it] },
     getProjectIcon: { IconLoader.getIcon("/nodes/ideaProject.png") },
     getLocalFileSystemPath: { it.path },
     getProjectLibraryTable: { projectLibraryTable }
@@ -42,7 +43,7 @@ class IntellijProjectBuilder extends AbstractProjectBuilder {
   @Override
   protected createProject(String name, LanguageLevel languageLevel) {
     projectStub.getName = { name }
-    platformFacade.getLanguageLevel = { languageLevel }
+    platformFacade.getLanguageLevel = { languageLevel } as Closure
     project
   }
 
@@ -51,6 +52,20 @@ class IntellijProjectBuilder extends AbstractProjectBuilder {
     [ getName: { name } ] as Module
   }
 
+  @Override
+  protected registerModule(Object module) { }
+
+  @Override
+  protected createModuleDependency(ownerModule, targetModule) {
+    def stub = [:]
+    def result = stub as ModuleOrderEntry
+    stub.accept = { policy, defaultValue -> policy.visitModuleOrderEntry(result, defaultValue) }
+    stub.getModule = { targetModule }
+    stub.getOwnerModule = { ownerModule }
+    stub.getModuleName = { targetModule.name }
+    result
+  }
+
   @Override
   protected createLibrary(String name, Map paths) {
     libraryPaths[name] = paths
@@ -81,4 +96,7 @@ class IntellijProjectBuilder extends AbstractProjectBuilder {
   protected applyLibraryPaths(library, Map paths) {
     libraryPaths[library.name] = paths
   }
+
+  @Override
+  protected reset() { }
 }
diff --git a/plugins/groovy/src/org/jetbrains/plugins/groovy/annotator/GroovyAnnotator.java b/plugins/groovy/src/org/jetbrains/plugins/groovy/annotator/GroovyAnnotator.java
index 61dd5bd5504a..214564712db7 100644
--- a/plugins/groovy/src/org/jetbrains/plugins/groovy/annotator/GroovyAnnotator.java
+++ b/plugins/groovy/src/org/jetbrains/plugins/groovy/annotator/GroovyAnnotator.java
@@ -57,6 +57,7 @@ import org.jetbrains.plugins.groovy.annotator.intentions.*;
 import org.jetbrains.plugins.groovy.annotator.intentions.dynamic.DynamicMethodFix;
 import org.jetbrains.plugins.groovy.annotator.intentions.dynamic.DynamicPropertyFix;
 import org.jetbrains.plugins.groovy.config.GroovyConfigUtils;
+import org.jetbrains.plugins.groovy.debugger.fragments.GroovyCodeFragment;
 import org.jetbrains.plugins.groovy.extensions.GroovyUnresolvedHighlightFilter;
 import org.jetbrains.plugins.groovy.highlighter.DefaultHighlighter;
 import org.jetbrains.plugins.groovy.lang.documentation.GroovyPresentationUtil;
@@ -861,6 +862,7 @@ public class GroovyAnnotator extends GroovyElementVisitor implements Annotator {
   }
 
   private static boolean isClosureAmbiguous(GrClosableBlock closure) {
+    if (closure.getContainingFile() instanceof GroovyCodeFragment) return false; //for code fragments
     PsiElement place = closure;
     while (true) {
       if (place instanceof GrUnAmbiguousClosureContainer) return false;
diff --git a/plugins/groovy/src/org/jetbrains/plugins/groovy/codeInspection/assignment/GrCastFix.java b/plugins/groovy/src/org/jetbrains/plugins/groovy/codeInspection/assignment/GrCastFix.java
index 8760f5d7239f..2f7240528272 100644
--- a/plugins/groovy/src/org/jetbrains/plugins/groovy/codeInspection/assignment/GrCastFix.java
+++ b/plugins/groovy/src/org/jetbrains/plugins/groovy/codeInspection/assignment/GrCastFix.java
@@ -42,6 +42,8 @@ public class GrCastFix extends GroovyFix implements LocalQuickFix {
 
   @Override
   protected void doFix(Project project, ProblemDescriptor descriptor) throws IncorrectOperationException {
+    if (!myExpression.isValid() || !myExpectedType.isValid()) return;
+
     final GroovyPsiElementFactory factory = GroovyPsiElementFactory.getInstance(project);
     final GrSafeCastExpression cast = (GrSafeCastExpression)factory.createExpressionFromText("foo as String");
     final GrTypeElement typeElement = factory.createTypeElement(myExpectedType);
diff --git a/plugins/groovy/src/org/jetbrains/plugins/groovy/highlighter/GroovySlashyStringLexer.java b/plugins/groovy/src/org/jetbrains/plugins/groovy/highlighter/GroovySlashyStringLexer.java
index 3718f1219882..5b8d006184ef 100644
--- a/plugins/groovy/src/org/jetbrains/plugins/groovy/highlighter/GroovySlashyStringLexer.java
+++ b/plugins/groovy/src/org/jetbrains/plugins/groovy/highlighter/GroovySlashyStringLexer.java
@@ -38,6 +38,8 @@ public class GroovySlashyStringLexer extends LexerBase {
 
   @Override
   public void start(CharSequence buffer, int startOffset, int endOffset, int initialState) {
+    assert buffer.length() >= endOffset : "buffer Length: " + buffer.length() + ", endOffset: " + endOffset;
+
     myBuffer = buffer;
     myEnd = startOffset;
     myBufferEnd = endOffset;
diff --git a/plugins/groovy/src/org/jetbrains/plugins/groovy/lang/completion/GroovyCompletionData.java b/plugins/groovy/src/org/jetbrains/plugins/groovy/lang/completion/GroovyCompletionData.java
index 67504d48865e..4b68369710cb 100644
--- a/plugins/groovy/src/org/jetbrains/plugins/groovy/lang/completion/GroovyCompletionData.java
+++ b/plugins/groovy/src/org/jetbrains/plugins/groovy/lang/completion/GroovyCompletionData.java
@@ -75,7 +75,7 @@ public class GroovyCompletionData {
       return;
     }
     
-    if (!PlatformPatterns.psiElement().afterLeaf(".", ".&").accepts(position)) {
+    if (!PlatformPatterns.psiElement().afterLeaf(".", ".&", "@", "*.", "?.").accepts(position)) {
       if (suggestPackage(position)) {
         result.addElement(keyword(PsiKeyword.PACKAGE, TailType.INSERT_SPACE));
       }
diff --git a/plugins/groovy/src/org/jetbrains/plugins/groovy/lang/completion/GroovySmartCompletionContributor.java b/plugins/groovy/src/org/jetbrains/plugins/groovy/lang/completion/GroovySmartCompletionContributor.java
index 9162c169fc43..4b217ac7d149 100644
--- a/plugins/groovy/src/org/jetbrains/plugins/groovy/lang/completion/GroovySmartCompletionContributor.java
+++ b/plugins/groovy/src/org/jetbrains/plugins/groovy/lang/completion/GroovySmartCompletionContributor.java
@@ -25,7 +25,6 @@ import com.intellij.openapi.editor.Document;
 import com.intellij.openapi.editor.Editor;
 import com.intellij.openapi.editor.ScrollType;
 import com.intellij.patterns.ElementPattern;
-import com.intellij.patterns.PlatformPatterns;
 import com.intellij.psi.*;
 import com.intellij.psi.codeStyle.CodeStyleSettings;
 import com.intellij.psi.codeStyle.CodeStyleSettingsManager;
@@ -63,14 +62,11 @@ import static com.intellij.patterns.StandardPatterns.or;
  */
 public class GroovySmartCompletionContributor extends CompletionContributor {
   private static final ElementPattern<PsiElement> INSIDE_EXPRESSION = psiElement().withParent(GrExpression.class);
-  private static final ElementPattern<PsiElement> IN_CAST_PARENTHESES = psiElement().withSuperParent(3,
-                                                                                                     psiElement(GrTypeCastExpression.class)
-                                                                                                       .withParent(or(psiElement(
-                                                                                                         GrAssignmentExpression.class),
-                                                                                                                      psiElement(
-                                                                                                                        GrVariable.class))));
-  static final ElementPattern<PsiElement> AFTER_NEW =
-    psiElement().afterLeaf(psiElement().withText(PsiKeyword.NEW).andNot(psiElement().afterLeaf(psiElement().withText(PsiKeyword.THROW))));
+  private static final ElementPattern<PsiElement> IN_CAST_PARENTHESES =
+    psiElement().withSuperParent(3, psiElement(GrTypeCastExpression.class).withParent(
+      or(psiElement(GrAssignmentExpression.class), psiElement(GrVariable.class))));
+
+  static final ElementPattern<PsiElement> AFTER_NEW = psiElement().afterLeaf(psiElement().withText(PsiKeyword.NEW));
   private static final TObjectHashingStrategy<TypeConstraint> EXPECTED_TYPE_INFO_STRATEGY =
     new TObjectHashingStrategy<TypeConstraint>() {
       public int computeHashCode(final TypeConstraint object) {
@@ -153,8 +149,8 @@ public class GroovySmartCompletionContributor extends CompletionContributor {
           return;
         }
 
-        final boolean overwrite = PlatformPatterns.psiElement()
-          .afterLeaf(PlatformPatterns.psiElement().withText("(").withParent(GrTypeCastExpression.class))
+        final boolean overwrite = psiElement()
+          .afterLeaf(psiElement().withText("(").withParent(GrTypeCastExpression.class))
           .accepts(parameters.getOriginalPosition());
         final Set<TypeConstraint> typeConstraints = getExpectedTypeInfos(parameters);
         for (TypeConstraint typeConstraint : typeConstraints) {
diff --git a/plugins/groovy/src/org/jetbrains/plugins/groovy/lang/editor/actions/GroovyTypedHandler.java b/plugins/groovy/src/org/jetbrains/plugins/groovy/lang/editor/actions/GroovyTypedHandler.java
index 03a2536216e1..e5351d1c6dc2 100644
--- a/plugins/groovy/src/org/jetbrains/plugins/groovy/lang/editor/actions/GroovyTypedHandler.java
+++ b/plugins/groovy/src/org/jetbrains/plugins/groovy/lang/editor/actions/GroovyTypedHandler.java
@@ -15,6 +15,7 @@
  */
 package org.jetbrains.plugins.groovy.lang.editor.actions;
 
+import com.intellij.codeInsight.AutoPopupController;
 import com.intellij.codeInsight.CodeInsightSettings;
 import com.intellij.codeInsight.editorActions.JavaTypedHandler;
 import com.intellij.codeInsight.editorActions.TypedHandlerDelegate;
@@ -23,8 +24,12 @@ import com.intellij.openapi.editor.ex.EditorEx;
 import com.intellij.openapi.editor.highlighter.HighlighterIterator;
 import com.intellij.openapi.fileTypes.FileType;
 import com.intellij.openapi.project.Project;
-import com.intellij.psi.*;
+import com.intellij.openapi.util.Condition;
+import com.intellij.psi.PsiElement;
+import com.intellij.psi.PsiFile;
 import com.intellij.psi.tree.TokenSet;
+import com.intellij.psi.util.PsiTreeUtil;
+import org.jetbrains.annotations.NotNull;
 import org.jetbrains.plugins.groovy.lang.lexer.GroovyTokenTypes;
 import org.jetbrains.plugins.groovy.lang.psi.GroovyFile;
 
@@ -50,10 +55,41 @@ public class GroovyTypedHandler extends TypedHandlerDelegate {
       }
     }
 
+    if (c == '@' && file instanceof GroovyFile) {
+      autoPopupMemberLookup(project, editor, new Condition<PsiFile>() {
+        public boolean value(final PsiFile file) {
+          int offset = editor.getCaretModel().getOffset();
+
+          PsiElement lastElement = file.findElementAt(offset - 1);
+          if (lastElement == null) return false;
+
+          final PsiElement prevSibling = PsiTreeUtil.prevVisibleLeaf(lastElement);
+          return prevSibling != null && ".".equals(prevSibling.getText());
+        }
+      });
+    }
+
+    if (c == '&' && file instanceof GroovyFile) {
+      autoPopupMemberLookup(project, editor, new Condition<PsiFile>() {
+        public boolean value(final PsiFile file) {
+          int offset = editor.getCaretModel().getOffset();
+
+          PsiElement lastElement = file.findElementAt(offset - 1);
+          return lastElement != null && ".&".equals(lastElement.getText());
+        }
+      });
+    }
+
+
     return Result.CONTINUE;
   }
 
-  public Result charTyped(final char c, final Project project, final Editor editor, final PsiFile file) {
+  private static void autoPopupMemberLookup(Project project, final Editor editor, Condition<PsiFile> condition) {
+    AutoPopupController.getInstance(project).autoPopupMemberLookup(editor, condition);
+  }
+
+
+  public Result charTyped(final char c, final Project project, final Editor editor, @NotNull final PsiFile file) {
     if (myJavaLTTyped) {
       myJavaLTTyped = false;
       JavaTypedHandler.handleAfterJavaLT(editor, GroovyTokenTypes.mLT, GroovyTokenTypes.mGT, INVALID_INSIDE_REFERENCE);
diff --git a/plugins/groovy/src/org/jetbrains/plugins/groovy/lang/psi/impl/GrClassReferenceType.java b/plugins/groovy/src/org/jetbrains/plugins/groovy/lang/psi/impl/GrClassReferenceType.java
index bbe1bdbe55cb..a77ed5300cb8 100644
--- a/plugins/groovy/src/org/jetbrains/plugins/groovy/lang/psi/impl/GrClassReferenceType.java
+++ b/plugins/groovy/src/org/jetbrains/plugins/groovy/lang/psi/impl/GrClassReferenceType.java
@@ -58,6 +58,8 @@ public class GrClassReferenceType extends PsiClassType {
 
   @Nullable
   public String getClassName() {
+    final PsiClass resolved = resolve();
+    if (resolved != null) return resolved.getName();
     return myReferenceElement.getReferenceName();
   }
 
diff --git a/plugins/groovy/src/org/jetbrains/plugins/groovy/lang/psi/impl/statements/expressions/CompleteReferenceExpression.java b/plugins/groovy/src/org/jetbrains/plugins/groovy/lang/psi/impl/statements/expressions/CompleteReferenceExpression.java
index 2c4a6af49cfb..cba92f066030 100644
--- a/plugins/groovy/src/org/jetbrains/plugins/groovy/lang/psi/impl/statements/expressions/CompleteReferenceExpression.java
+++ b/plugins/groovy/src/org/jetbrains/plugins/groovy/lang/psi/impl/statements/expressions/CompleteReferenceExpression.java
@@ -342,6 +342,8 @@ public class CompleteReferenceExpression {
     private final Set<String> myPropertyNames = new HashSet<String>();
     private final Set<String> myLocalVars = new HashSet<String>();
     private final Set<GrMethod> myProcessedMethodWithOptionalParams = new HashSet<GrMethod>();
+    private final boolean myFieldPointerOperator;
+    private final boolean myMethodPointerOperator;
 
     protected CompleteReferenceProcessor(GrReferenceExpression place, Consumer<Object> consumer, @NotNull PrefixMatcher matcher, CompletionParameters parameters) {
       super(null, EnumSet.allOf(ResolveKind.class), place, PsiType.EMPTY_ARRAY);
@@ -352,6 +354,9 @@ public class CompleteReferenceExpression {
       mySkipPackages = PsiImplUtil.getRuntimeQualifier(place) == null;
       myEventListener = JavaPsiFacade.getInstance(place.getProject()).findClass("java.util.EventListener", place.getResolveScope());
       myPropertyNames.addAll(addAllRestrictedProperties(place));
+
+      myFieldPointerOperator = place.hasAt();
+      myMethodPointerOperator = place.getDotTokenType() == GroovyTokenTypes.mMEMBER_POINTER;
     }
 
     @Override
@@ -396,17 +401,25 @@ public class CompleteReferenceExpression {
                                              result.isInvokedOnProperty());
       }
 
+      if (myFieldPointerOperator && !(element instanceof PsiVariable)) {
+        return;
+      }
+      if (myMethodPointerOperator && !(element instanceof PsiMethod)) {
+        return;
+      }
       addCandidate(result);
 
-      if (element instanceof PsiMethod) {
-        processProperty((PsiMethod)element, result);
-      }
-      else if (element instanceof GrField) {
-        if (((GrField)element).isProperty()) {
-          processPropertyFromField((GrField)element, result);
+      if (!myFieldPointerOperator && !myMethodPointerOperator) {
+        if (element instanceof PsiMethod) {
+          processProperty((PsiMethod)element, result);
+        }
+        else if (element instanceof GrField) {
+          if (((GrField)element).isProperty()) {
+            processPropertyFromField((GrField)element, result);
+          }
         }
       }
-      else if (element instanceof GrVariable) {
+      if (element instanceof GrVariable && !(element instanceof GrField)) {
         myLocalVars.add(((GrVariable)element).getName());
       }
     }
diff --git a/plugins/groovy/src/org/jetbrains/plugins/groovy/lang/resolve/MixinMemberContributor.java b/plugins/groovy/src/org/jetbrains/plugins/groovy/lang/resolve/MixinMemberContributor.java
index 2e1d8fd17c47..45c436b49308 100644
--- a/plugins/groovy/src/org/jetbrains/plugins/groovy/lang/resolve/MixinMemberContributor.java
+++ b/plugins/groovy/src/org/jetbrains/plugins/groovy/lang/resolve/MixinMemberContributor.java
@@ -50,20 +50,19 @@ public class MixinMemberContributor extends NonCodeMembersContributor {
     final PsiModifierList modifierList = aClass.getModifierList();
     if (modifierList == null) return;
 
-    final PsiAnnotation annotation = modifierList.findAnnotation(GroovyCommonClassNames.GROOVY_LANG_MIXIN);
-    if (annotation == null) return;
-
-    final PsiAnnotationMemberValue value = annotation.findAttributeValue("value");
-
     List<PsiClass> mixins = new ArrayList<PsiClass>();
-    if (value instanceof GrAnnotationArrayInitializer) {
-      final GrAnnotationMemberValue[] initializers = ((GrAnnotationArrayInitializer)value).getInitializers();
-      for (GrAnnotationMemberValue initializer : initializers) {
-        addMixin(initializer, mixins);
+    for (PsiAnnotation annotation : getAllMixins(modifierList)) {
+      final PsiAnnotationMemberValue value = annotation.findAttributeValue("value");
+
+      if (value instanceof GrAnnotationArrayInitializer) {
+        final GrAnnotationMemberValue[] initializers = ((GrAnnotationArrayInitializer)value).getInitializers();
+        for (GrAnnotationMemberValue initializer : initializers) {
+          addMixin(initializer, mixins);
+        }
+      }
+      else if (value instanceof GrExpression) {
+        addMixin((GrExpression)value, mixins);
       }
-    }
-    else if (value instanceof GrExpression) {
-      addMixin((GrExpression)value, mixins);
     }
 
     for (PsiClass mixin : mixins) {
@@ -83,6 +82,16 @@ public class MixinMemberContributor extends NonCodeMembersContributor {
     }
   }
 
+  private static List<PsiAnnotation> getAllMixins(PsiModifierList modifierList) {
+    final ArrayList<PsiAnnotation> result = new ArrayList<PsiAnnotation>();
+    for (PsiAnnotation annotation : modifierList.getApplicableAnnotations()) {
+      if (GroovyCommonClassNames.GROOVY_LANG_MIXIN.equals(annotation.getQualifiedName())) {
+        result.add(annotation);
+      }
+    }
+    return result;
+  }
+
   private static boolean isCategoryMethod(PsiElement element, PsiType qualifierType) {
     if (!(element instanceof PsiMethod)) return false;
     if (!((PsiMethod)element).hasModifierProperty(PsiModifier.STATIC)) return false;
diff --git a/plugins/groovy/src/org/jetbrains/plugins/groovy/runner/GroovyScriptRunConfigurationProducer.java b/plugins/groovy/src/org/jetbrains/plugins/groovy/runner/GroovyScriptRunConfigurationProducer.java
index 133d687a7e1d..67c81ff24225 100644
--- a/plugins/groovy/src/org/jetbrains/plugins/groovy/runner/GroovyScriptRunConfigurationProducer.java
+++ b/plugins/groovy/src/org/jetbrains/plugins/groovy/runner/GroovyScriptRunConfigurationProducer.java
@@ -56,7 +56,7 @@ public class GroovyScriptRunConfigurationProducer extends RuntimeConfigurationPr
 
     GroovyFile groovyFile = (GroovyFile)file;
     final PsiClass aClass = GroovyRunnerUtil.getRunningClass(location.getPsiElement());
-    if (aClass != null) {
+    if (aClass != null && GroovyRunnerUtil.canBeRunByGroovy(aClass)) {
       final RunnerAndConfigurationSettings settings = createConfiguration(aClass);
       if (settings != null) {
         mySourceElement = element;
diff --git a/plugins/groovy/test/org/jetbrains/plugins/groovy/completion/GroovyCompletionTest.groovy b/plugins/groovy/test/org/jetbrains/plugins/groovy/completion/GroovyCompletionTest.groovy
index fe133175c2fb..fb4b05585d9d 100644
--- a/plugins/groovy/test/org/jetbrains/plugins/groovy/completion/GroovyCompletionTest.groovy
+++ b/plugins/groovy/test/org/jetbrains/plugins/groovy/completion/GroovyCompletionTest.groovy
@@ -18,13 +18,13 @@ package org.jetbrains.plugins.groovy.completion;
 
 
 import com.intellij.codeInsight.CodeInsightSettings
+import com.intellij.codeInsight.completion.CompletionType
 import com.intellij.codeInsight.lookup.LookupElement
 import com.intellij.codeInsight.lookup.LookupElementPresentation
-import org.jetbrains.plugins.groovy.GroovyFileType
-import org.jetbrains.plugins.groovy.util.TestUtils
 import com.intellij.psi.codeStyle.CodeStyleSettingsManager
+import org.jetbrains.plugins.groovy.GroovyFileType
 import org.jetbrains.plugins.groovy.formatter.GroovyCodeStyleSettings
-import com.intellij.codeInsight.completion.CompletionType
+import org.jetbrains.plugins.groovy.util.TestUtils
 
 /**
  * @author Maxim.Medvedev
@@ -1133,4 +1133,43 @@ Util.foo()<caret>'''
   }
 
   public void testPropertyChain() { doBasicTest() }
+
+  public void testMethodPointer() {
+    myFixture.configureByText('_a.groovy', '''\
+class Base {
+  def prefixMethod(){}
+  def prefixField
+}
+
+new Base().&prefix<caret>''')
+    myFixture.completeBasic()
+    assertNull(myFixture.lookupElements)
+    myFixture.checkResult('''\
+class Base {
+  def prefixMethod(){}
+  def prefixField
+}
+
+new Base().&prefixMethod<caret>''')
+  }
+
+  public void testFieldPointer() {
+    myFixture.configureByText('_a.groovy', '''\
+class Base {
+  def prefixMethod(){}
+  def prefixField
+}
+
+new Base().@prefix<caret>''')
+    myFixture.completeBasic()
+    assertNull(myFixture.lookupElements)
+    myFixture.checkResult('''\
+class Base {
+  def prefixMethod(){}
+  def prefixField
+}
+
+new Base().@prefixField<caret>''')
+  }
+
 }
\ No newline at end of file
diff --git a/plugins/groovy/test/org/jetbrains/plugins/groovy/completion/GroovyCompletionTestBase.java b/plugins/groovy/test/org/jetbrains/plugins/groovy/completion/GroovyCompletionTestBase.groovy
similarity index 86%
rename from plugins/groovy/test/org/jetbrains/plugins/groovy/completion/GroovyCompletionTestBase.java
rename to plugins/groovy/test/org/jetbrains/plugins/groovy/completion/GroovyCompletionTestBase.groovy
index 9c3a3bda4644..a8c0e23cb23d 100644
--- a/plugins/groovy/test/org/jetbrains/plugins/groovy/completion/GroovyCompletionTestBase.java
+++ b/plugins/groovy/test/org/jetbrains/plugins/groovy/completion/GroovyCompletionTestBase.groovy
@@ -15,11 +15,9 @@
  */
 package org.jetbrains.plugins.groovy.completion;
 
-import com.intellij.codeInsight.completion.CompletionType;
-import com.intellij.testFramework.UsefulTestCase;
-import com.intellij.testFramework.fixtures.LightCodeInsightFixtureTestCase;
 
-import java.util.List;
+import com.intellij.codeInsight.completion.CompletionType
+import com.intellij.testFramework.fixtures.LightCodeInsightFixtureTestCase
 
 /**
  * @author Maxim.Medvedev
@@ -42,15 +40,15 @@ abstract public class GroovyCompletionTestBase extends LightCodeInsightFixtureTe
   public void doVariantableTest(String... variants) throws Throwable {
     myFixture.configureByFile(getTestName(false) + ".groovy");
     myFixture.complete(CompletionType.BASIC);
-    assertOrderedEquals(myFixture.getLookupElementStrings(), variants);
+    assertOrderedEquals(myFixture.lookupElementStrings, variants);
   }
 
   public void doSmartCompletion(String... variants) throws Exception {
     myFixture.configureByFile(getTestName(false) + ".groovy");
     myFixture.complete(CompletionType.SMART);
-    final List<String> list = myFixture.getLookupElementStrings();
+    final List<String> list = myFixture.lookupElementStrings;
     assertNotNull(list);
-    UsefulTestCase.assertOrderedEquals(list, variants);
+    assertOrderedEquals(list, variants);
   }
 
   public void checkCompletion(String before, String type, String after) {
diff --git a/plugins/groovy/test/org/jetbrains/plugins/groovy/completion/GroovySmartCompletionTest.groovy b/plugins/groovy/test/org/jetbrains/plugins/groovy/completion/GroovySmartCompletionTest.groovy
index 236f70474fe1..34b0e7071039 100644
--- a/plugins/groovy/test/org/jetbrains/plugins/groovy/completion/GroovySmartCompletionTest.groovy
+++ b/plugins/groovy/test/org/jetbrains/plugins/groovy/completion/GroovySmartCompletionTest.groovy
@@ -19,8 +19,6 @@ package org.jetbrains.plugins.groovy.completion;
 
 import com.intellij.codeInsight.completion.CompletionType
 import com.intellij.codeInsight.completion.StaticallyImportable
-import com.intellij.psi.PsiDocumentManager
-import com.intellij.psi.PsiFile
 import org.jetbrains.plugins.groovy.util.TestUtils
 
 /**
@@ -29,13 +27,13 @@ import org.jetbrains.plugins.groovy.util.TestUtils
 public class GroovySmartCompletionTest extends GroovyCompletionTestBase {
   @Override
   protected String getBasePath() {
-    return TestUtils.getTestDataPath() + "groovy/completion/smart";
+    return "${TestUtils.testDataPath}groovy/completion/smart";
   }
 
   public void testSmartCompletionAfterNewInDeclaration() throws Throwable {
     myFixture.configureByFile(getTestName(false) + ".groovy");
     myFixture.complete(CompletionType.SMART);
-    assertOrderedEquals(myFixture.getLookupElementStrings(), "Bar", "Foo");
+    assertOrderedEquals(myFixture.lookupElementStrings, "Bar", "Foo");
   }
 
   public void testSmartCompletionAfterNewInDeclarationWithInterface() throws Throwable { doSmartTest(); }
@@ -116,12 +114,18 @@ class Expected {
 
 Expected exp = fooField'''
   }
+
+  public void testThrow() {
+    myFixture.configureByText('_a.groovy', '''\
+throw new RunEx<caret>
+''')
+    myFixture.complete(CompletionType.SMART)
+    myFixture.checkResult('''\
+throw new RuntimeException()
+''')
+  }
   
   void testInnerClassReferenceWithoutQualifier() {
     doSmartTest()
   }
-
-  def getFileText(PsiFile file) {
-    return PsiDocumentManager.getInstance(project).getDocument(file).text
-  }
 }
diff --git a/plugins/groovy/test/org/jetbrains/plugins/groovy/lang/GroovyHighlightingTest.groovy b/plugins/groovy/test/org/jetbrains/plugins/groovy/lang/GroovyHighlightingTest.groovy
index 6ba4d83375de..d21f6e8bb545 100644
--- a/plugins/groovy/test/org/jetbrains/plugins/groovy/lang/GroovyHighlightingTest.groovy
+++ b/plugins/groovy/test/org/jetbrains/plugins/groovy/lang/GroovyHighlightingTest.groovy
@@ -673,4 +673,22 @@ List<?> list2
   public void testGloballyUnusedSymbols() {
     doTest(new GroovyUnusedDeclarationInspection(), new UnusedDeclarationInspection())
   }
+
+  public void testAliasInParameterType() {
+    myFixture.configureByText('a_.groovy', '''\
+import java.awt.event.ActionListener
+import java.awt.event.ActionEvent as AE
+
+public class CorrectImplementor implements ActionListener {
+  public void actionPerformed (AE e) { //AE is alias to ActionEvent
+  }
+}
+
+<error descr="Method 'actionPerformed' is not implemented">public class IncorrectImplementor implements ActionListener</error> {
+  public void actionPerformed (Object e) {
+  }
+}
+''')
+    myFixture.testHighlighting(true, false, false)
+  }
 }
\ No newline at end of file
diff --git a/plugins/groovy/test/org/jetbrains/plugins/groovy/lang/resolve/ResolveMethodTest.groovy b/plugins/groovy/test/org/jetbrains/plugins/groovy/lang/resolve/ResolveMethodTest.groovy
index 69b237df29b9..1d4650e9c13a 100644
--- a/plugins/groovy/test/org/jetbrains/plugins/groovy/lang/resolve/ResolveMethodTest.groovy
+++ b/plugins/groovy/test/org/jetbrains/plugins/groovy/lang/resolve/ResolveMethodTest.groovy
@@ -789,9 +789,39 @@ print new B().f<caret>oo()
 
     def resolved = ref.resolve()
     assertInstanceOf(resolved, GrMethod)
-    assertTrue(resolved.isPhysical())
+    assertTrue(resolved.physical)
   }
 
+  void testTwoMixinsInModifierList() {
+    def ref = configureByText("""
+class PersonHelper {
+  def useThePerson() {
+    Person person = new Person()
+
+    person.getUsername()
+    person.get<caret>Name()
+  }
+}
+
+@Mixin(PersonMixin)
+@Mixin(OtherPersonMixin)
+class Person { }
+
+class PersonMixin {
+  String getUsername() { }
+}
+
+class OtherPersonMixin {
+  String getName() { }
+}
+""")
+
+    def resolved = ref.resolve()
+    assertInstanceOf(resolved, GrMethod)
+    assertTrue(resolved.physical)
+  }
+
+
   void testDisjunctionType() {
     def ref = configureByText ("""
 import java.sql.SQLException
diff --git a/plugins/maven/src/main/java/org/jetbrains/idea/maven/dom/MavenDomProjectProcessorUtils.java b/plugins/maven/src/main/java/org/jetbrains/idea/maven/dom/MavenDomProjectProcessorUtils.java
index c462fb40ced8..95b50f81e0f0 100644
--- a/plugins/maven/src/main/java/org/jetbrains/idea/maven/dom/MavenDomProjectProcessorUtils.java
+++ b/plugins/maven/src/main/java/org/jetbrains/idea/maven/dom/MavenDomProjectProcessorUtils.java
@@ -152,7 +152,6 @@ public class MavenDomProjectProcessorUtils {
     return property[0];
   }
 
-  @Nullable
   public static Set<XmlTag> collectProperties(@NotNull MavenDomProjectModel projectDom, @NotNull final Project project) {
     final Set<XmlTag> properties = new HashSet<XmlTag>();
 
diff --git a/plugins/maven/src/main/java/org/jetbrains/idea/maven/dom/references/MavenFilteredPropertyPsiReference.java b/plugins/maven/src/main/java/org/jetbrains/idea/maven/dom/references/MavenFilteredPropertyPsiReference.java
index 4638e44917d3..26dafe7f8319 100644
--- a/plugins/maven/src/main/java/org/jetbrains/idea/maven/dom/references/MavenFilteredPropertyPsiReference.java
+++ b/plugins/maven/src/main/java/org/jetbrains/idea/maven/dom/references/MavenFilteredPropertyPsiReference.java
@@ -55,7 +55,7 @@ public class MavenFilteredPropertyPsiReference extends MavenPropertyPsiReference
     for (String each : myMavenProject.getFilters()) {
       VirtualFile file = LocalFileSystem.getInstance().findFileByPath(each);
       if (file == null) continue;
-      collectPropertiesFileVariants(MavenDomUtil.getPropertiesFile(myProject, file), "", result);
+      collectPropertiesFileVariants(MavenDomUtil.getPropertiesFile(myProject, file), null, result);
     }
   }
 
diff --git a/plugins/maven/src/main/java/org/jetbrains/idea/maven/dom/references/MavenModelClassesProperties.java b/plugins/maven/src/main/java/org/jetbrains/idea/maven/dom/references/MavenModelClassesProperties.java
new file mode 100644
index 000000000000..08ab28d58a63
--- /dev/null
+++ b/plugins/maven/src/main/java/org/jetbrains/idea/maven/dom/references/MavenModelClassesProperties.java
@@ -0,0 +1,233 @@
+/*
+ * Copyright 2000-2012 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 org.jetbrains.idea.maven.dom.references;
+
+import com.google.common.collect.ImmutableMap;
+import com.intellij.psi.CommonClassNames;
+import org.jetbrains.annotations.NotNull;
+import org.jetbrains.annotations.Nullable;
+
+import java.util.Collections;
+import java.util.HashMap;
+import java.util.Map;
+
+/**
+ * @author Sergey Evdokimov
+ */
+public class MavenModelClassesProperties {
+
+  private static final Map<String, Map<String, String>> PROPERTIES_MAP;
+
+  public static final String MAVEN_PROJECT_CLASS = "org.apache.maven.project.MavenProject";
+  public static final String MAVEN_MODEL_CLASS = "org.apache.maven.model.Model";
+
+  static {
+    Map<String, Map<String, String>> res = new HashMap<String, Map<String, String>>();
+
+    res.put(MAVEN_PROJECT_CLASS, ImmutableMap.<String, String>builder()
+      .put("parentFile", "java.io.File")
+      .put("artifact", "org.apache.maven.artifact.Artifact")
+      .put("model", MAVEN_MODEL_CLASS)
+      .put("parent", MAVEN_PROJECT_CLASS)
+      .put("file", "java.io.File")
+      .put("dependencies", CommonClassNames.JAVA_UTIL_LIST)
+      .put("compileSourceRoots", CommonClassNames.JAVA_UTIL_LIST)
+      .put("scriptSourceRoots", CommonClassNames.JAVA_UTIL_LIST)
+      .put("testCompileSourceRoots", CommonClassNames.JAVA_UTIL_LIST)
+      .put("compileClasspathElements", CommonClassNames.JAVA_UTIL_LIST)
+      .put("compileArtifacts", CommonClassNames.JAVA_UTIL_LIST)
+      .put("compileDependencies", CommonClassNames.JAVA_UTIL_LIST)
+      .put("testClasspathElements", CommonClassNames.JAVA_UTIL_LIST)
+      .put("testArtifacts", CommonClassNames.JAVA_UTIL_LIST)
+      .put("testDependencies", CommonClassNames.JAVA_UTIL_LIST)
+      .put("runtimeClasspathElements", CommonClassNames.JAVA_UTIL_LIST)
+      .put("runtimeArtifacts", CommonClassNames.JAVA_UTIL_LIST)
+      .put("runtimeDependencies", CommonClassNames.JAVA_UTIL_LIST)
+      .put("systemClasspathElements", CommonClassNames.JAVA_UTIL_LIST)
+      .put("systemArtifacts", CommonClassNames.JAVA_UTIL_LIST)
+      .put("systemDependencies", CommonClassNames.JAVA_UTIL_LIST)
+      .put("modelVersion", CommonClassNames.JAVA_LANG_STRING)
+      .put("id", CommonClassNames.JAVA_LANG_STRING)
+      .put("groupId", CommonClassNames.JAVA_LANG_STRING)
+      .put("artifactId", CommonClassNames.JAVA_LANG_STRING)
+      .put("version", CommonClassNames.JAVA_LANG_STRING)
+      .put("packaging", CommonClassNames.JAVA_LANG_STRING)
+      .put("name", CommonClassNames.JAVA_LANG_STRING)
+      .put("inceptionYear", CommonClassNames.JAVA_LANG_STRING)
+      .put("url", CommonClassNames.JAVA_LANG_STRING)
+      .put("prerequisites", "org.apache.maven.model.Prerequisites")
+      .put("issueManagement", "org.apache.maven.model.IssueManagement")
+      .put("ciManagement", "org.apache.maven.model.CiManagement")
+      .put("description", CommonClassNames.JAVA_LANG_STRING)
+      .put("organization", "org.apache.maven.model.Organization")
+      .put("scm", "org.apache.maven.model.Scm")
+      .put("mailingLists", CommonClassNames.JAVA_UTIL_LIST)
+      .put("developers", CommonClassNames.JAVA_UTIL_LIST)
+      .put("contributors", CommonClassNames.JAVA_UTIL_LIST)
+      .put("build", "org.apache.maven.model.Build")
+
+      .put("resources", CommonClassNames.JAVA_UTIL_LIST)
+      .put("testResources", CommonClassNames.JAVA_UTIL_LIST)
+      .put("reporting", "org.apache.maven.model.Reporting")
+      .put("licenses", CommonClassNames.JAVA_UTIL_LIST)
+      .put("artifacts", CommonClassNames.JAVA_UTIL_LIST)
+      .put("artifactMap", CommonClassNames.JAVA_UTIL_LIST)
+      .put("pluginArtifacts", CommonClassNames.JAVA_UTIL_LIST)
+      .put("pluginArtifactMap", CommonClassNames.JAVA_UTIL_LIST)
+      .put("reportArtifacts", CommonClassNames.JAVA_UTIL_LIST)
+      .put("reportArtifactMap", CommonClassNames.JAVA_UTIL_LIST)
+      .put("extensionArtifacts", CommonClassNames.JAVA_UTIL_LIST)
+      .put("extensionArtifactMap", CommonClassNames.JAVA_UTIL_LIST)
+      .put("parentArtifact", CommonClassNames.JAVA_UTIL_LIST)
+      .put("repositories", CommonClassNames.JAVA_UTIL_LIST)
+      .put("reportPlugins", CommonClassNames.JAVA_UTIL_LIST)
+      .put("buildPlugins", CommonClassNames.JAVA_UTIL_LIST)
+      .put("modules", CommonClassNames.JAVA_UTIL_LIST)
+      .put("modelBuild", "org.apache.maven.model.Build")
+      .put("remoteArtifactRepositories", CommonClassNames.JAVA_UTIL_LIST)
+      .put("pluginArtifactRepositories", CommonClassNames.JAVA_UTIL_LIST)
+      .put("distributionManagementArtifactRepository", "org.apache.maven.artifact.repository.ArtifactRepository")
+      .put("pluginRepositories", CommonClassNames.JAVA_UTIL_LIST)
+      .put("remoteProjectRepositories", CommonClassNames.JAVA_UTIL_LIST)
+      .put("remotePluginRepositories", CommonClassNames.JAVA_UTIL_LIST)
+      .put("activeProfiles", CommonClassNames.JAVA_UTIL_LIST)
+      .put("injectedProfileIds", CommonClassNames.JAVA_UTIL_LIST)
+      .put("attachedArtifacts", CommonClassNames.JAVA_UTIL_LIST)
+      .put("executionProject", MAVEN_PROJECT_CLASS)
+      .put("collectedProjects", CommonClassNames.JAVA_UTIL_LIST)
+      .put("dependencyArtifacts", CommonClassNames.JAVA_UTIL_LIST)
+      .put("managedVersionMap", CommonClassNames.JAVA_UTIL_LIST)
+      .put("buildExtensions", CommonClassNames.JAVA_UTIL_LIST)
+      .put("properties", CommonClassNames.JAVA_UTIL_LIST)
+      .put("filters", CommonClassNames.JAVA_UTIL_LIST)
+      .put("projectReferences", CommonClassNames.JAVA_UTIL_LIST)
+      .put("executionRoot", "boolean")
+      .put("defaultGoal", CommonClassNames.JAVA_UTIL_LIST)
+      .put("releaseArtifactRepository", "org.apache.maven.artifact.repository.ArtifactRepository")
+      .put("snapshotArtifactRepository", "org.apache.maven.artifact.repository.ArtifactRepository")
+      .put("classRealm", "org.codehaus.plexus.classworlds.realm.ClassRealm")
+      .put("extensionDependencyFilter", "org.sonatype.aether.graph.DependencyFilter")
+      .put("projectBuildingRequest", "org.apache.maven.project.ProjectBuildingRequest")
+
+      .build()
+    );
+
+    res.put(MAVEN_MODEL_CLASS, ImmutableMap.<String, String>builder()
+      .put("modelVersion", CommonClassNames.JAVA_LANG_STRING)
+      .put("parent", MAVEN_PROJECT_CLASS)
+      .put("groupId", CommonClassNames.JAVA_LANG_STRING)
+      .put("artifactId", CommonClassNames.JAVA_LANG_STRING)
+      .put("version", CommonClassNames.JAVA_LANG_STRING)
+      .put("packaging", CommonClassNames.JAVA_LANG_STRING)
+      .put("name", CommonClassNames.JAVA_LANG_STRING)
+      .put("description", CommonClassNames.JAVA_LANG_STRING)
+      .put("url", CommonClassNames.JAVA_LANG_STRING)
+      .put("inceptionYear", CommonClassNames.JAVA_LANG_STRING)
+      .put("organization", "org.apache.maven.model.Organization")
+      .put("licenses", CommonClassNames.JAVA_UTIL_LIST)
+      .put("developers", CommonClassNames.JAVA_UTIL_LIST)
+      .put("contributors", CommonClassNames.JAVA_UTIL_LIST)
+      .put("mailingLists", CommonClassNames.JAVA_UTIL_LIST)
+      .put("prerequisites", "org.apache.maven.model.Prerequisites")
+      .put("scm", "org.apache.maven.model.Scm")
+      .put("issueManagement", "org.apache.maven.model.IssueManagement")
+      .put("ciManagement", "org.apache.maven.model.CiManagement")
+      .put("build", "org.apache.maven.model.Build")
+      .put("profiles", CommonClassNames.JAVA_UTIL_LIST)
+      .put("modelEncoding", CommonClassNames.JAVA_LANG_STRING)
+      .put("pomFile", "java.io.File")
+      .put("projectDirectory", "java.io.File")
+      .put("id", CommonClassNames.JAVA_LANG_STRING)
+
+      .put("repositories", CommonClassNames.JAVA_UTIL_LIST)
+      .put("dependencies", CommonClassNames.JAVA_UTIL_LIST)
+      .put("modules", CommonClassNames.JAVA_UTIL_LIST)
+      .put("pluginRepositories", CommonClassNames.JAVA_UTIL_LIST)
+      .put("properties", CommonClassNames.JAVA_UTIL_LIST)
+      .put("reports", CommonClassNames.JAVA_LANG_OBJECT)
+      .put("reporting", "org.apache.maven.model.Reporting")
+      .build()
+    );
+
+    res.put(CommonClassNames.JAVA_UTIL_LIST, ImmutableMap.<String, String>of("empty", "boolean"));
+
+    res.put("org.apache.maven.model.Build", ImmutableMap.<String, String>builder()
+      .put("extensions", CommonClassNames.JAVA_UTIL_LIST)
+      .put("filters", CommonClassNames.JAVA_UTIL_LIST)
+      .put("resources", CommonClassNames.JAVA_UTIL_LIST)
+      .put("testResources", CommonClassNames.JAVA_UTIL_LIST)
+      .build());
+
+    res.put("java.io.File", ImmutableMap.<String, String>builder()
+      .put("prefixLength", "long")
+      .put("name", CommonClassNames.JAVA_LANG_STRING)
+      .put("parent", CommonClassNames.JAVA_LANG_STRING)
+      .put("parentFile", "java.io.File")
+      .put("path", CommonClassNames.JAVA_LANG_STRING)
+      .put("absolute", "boolean")
+      .put("absolutePath", CommonClassNames.JAVA_LANG_STRING)
+      .put("absoluteFile", "java.io.File")
+      .put("canonicalPath", CommonClassNames.JAVA_LANG_STRING)
+      .put("canonicalFile", "java.io.File")
+      .put("directory", "boolean")
+      .put("file", "boolean")
+      .put("hidden", "boolean")
+      .put("totalSpace", "long")
+      .put("freeSpace", "long")
+      .put("usableSpace", "long")
+      .build());
+
+    PROPERTIES_MAP = res;
+  }
+
+  public static boolean isPathValid(@NotNull String className, @NotNull String path) {
+    Map<String,String> cMap = PROPERTIES_MAP.get(className);
+    if (cMap == null) return false;
+
+    int idx = 0;
+
+    do {
+      int i = path.indexOf('.', idx);
+      if (i == -1) {
+        return cMap.containsKey(path.substring(idx));
+      }
+
+      cMap = PROPERTIES_MAP.get(cMap.get(path.substring(idx, i)));
+      if (cMap == null) return false;
+
+      idx = i + 1;
+    } while (true);
+  }
+
+  public static Map<String, String> getCompletionVariants(@NotNull String className, @NotNull String path) {
+    Map<String,String> cMap = PROPERTIES_MAP.get(className);
+    if (cMap == null) return Collections.emptyMap();
+
+    int idx = 0;
+
+    do {
+      int i = path.indexOf('.', idx);
+      if (i == -1) {
+        return cMap;
+      }
+
+      cMap = PROPERTIES_MAP.get(cMap.get(path.substring(idx, i)));
+      if (cMap == null) return Collections.emptyMap();
+
+      idx = i + 1;
+    } while (true);
+  }
+}
diff --git a/plugins/maven/src/main/java/org/jetbrains/idea/maven/dom/references/MavenPropertyPsiReference.java b/plugins/maven/src/main/java/org/jetbrains/idea/maven/dom/references/MavenPropertyPsiReference.java
index 1dbbd29ab12b..613f3313731d 100644
--- a/plugins/maven/src/main/java/org/jetbrains/idea/maven/dom/references/MavenPropertyPsiReference.java
+++ b/plugins/maven/src/main/java/org/jetbrains/idea/maven/dom/references/MavenPropertyPsiReference.java
@@ -28,11 +28,8 @@ import com.intellij.psi.xml.XmlFile;
 import com.intellij.psi.xml.XmlTag;
 import com.intellij.psi.xml.XmlTagChild;
 import com.intellij.util.ArrayUtil;
-import com.intellij.util.Function;
 import com.intellij.util.IncorrectOperationException;
 import com.intellij.util.PlatformIcons;
-import com.intellij.util.containers.CollectionFactory;
-import com.intellij.util.containers.ContainerUtil;
 import com.intellij.util.xml.DomElement;
 import com.intellij.util.xml.DomUtil;
 import com.intellij.xml.XmlElementDescriptor;
@@ -46,19 +43,21 @@ import org.jetbrains.idea.maven.dom.MavenSchemaProvider;
 import org.jetbrains.idea.maven.dom.model.MavenDomProfile;
 import org.jetbrains.idea.maven.dom.model.MavenDomProjectModel;
 import org.jetbrains.idea.maven.dom.model.MavenDomSettingsModel;
+import org.jetbrains.idea.maven.execution.MavenRunner;
+import org.jetbrains.idea.maven.execution.MavenRunnerSettings;
+import org.jetbrains.idea.maven.model.MavenId;
 import org.jetbrains.idea.maven.project.MavenProject;
 import org.jetbrains.idea.maven.utils.MavenIcons;
+import org.jetbrains.idea.maven.utils.MavenUtil;
 import org.jetbrains.idea.maven.vfs.MavenPropertiesVirtualFileSystem;
 
 import javax.swing.*;
 import java.util.ArrayList;
+import java.util.HashSet;
 import java.util.List;
 import java.util.Set;
 
 public class MavenPropertyPsiReference extends MavenPsiReference {
-  private static final Set<String> BASEDIR_PROPS =
-    CollectionFactory.newTroveSet("basedir", "project.basedir", "pom.basedir", "baseUri", "project.baseUri", "pom.baseUri");
-
   private static final String TIMESTAMP_PROP = "maven.build.timestamp";
 
   protected final MavenDomProjectModel myProjectDom;
@@ -86,79 +85,110 @@ public class MavenPropertyPsiReference extends MavenPsiReference {
     return result;
   }
 
-  // precedence
-  // 1. user/system
-  // 2. settings.xml
-  // 3. current profile (if property is used inside one)
-  // 4. profiles.xml
-  // 5. profiles in pom.xml
-  // 6. pom.xml
-  // 7. parent profiles.xml
-  // 8. profiles in parent pom.xml
-  // 9. parent pom.xml
-  // 10. model
+  // See org.apache.maven.project.interpolation.AbstractStringBasedModelInterpolator.createValueSources()
   @Nullable
   protected PsiElement doResolve() {
-    if (myText.startsWith("env.")) {
-      return resolveEnvPropety();
+    boolean hasPrefix = false;
+    String unprefixed = myText;
+
+    if (myText.startsWith("pom.")) {
+      unprefixed = myText.substring("pom.".length());
+      hasPrefix = true;
+    }
+    else if (myText.startsWith("project.")) {
+      unprefixed = myText.substring("project.".length());
+      hasPrefix = true;
     }
 
-    if (BASEDIR_PROPS.contains(myText)) {
-      return resolveBasedir();
+    MavenProject mavenProject = myMavenProject;
+
+    while (unprefixed.startsWith("parent.")) {
+      if (unprefixed.equals("parent.groupId") || unprefixed.equals("parent.artifactId") || unprefixed.equals("parent.version")
+          || unprefixed.equals("parent.relativePath")) {
+        break;
+      }
+
+      MavenId parentId = mavenProject.getParentId();
+      if (parentId == null) return null;
+
+      mavenProject = myProjectsManager.findProject(parentId);
+      if (mavenProject == null) return null;
+
+      unprefixed = unprefixed.substring("parent.".length());
+    }
+
+    if (unprefixed.equals("basedir") || (hasPrefix && mavenProject == myMavenProject && unprefixed.equals("baseUri"))) {
+      return getBaseDir(mavenProject);
     }
 
     if (myText.equals(TIMESTAMP_PROP)) {
       return myElement;
     }
 
-    PsiElement result = resolveSystemPropety();
-    if (result != null) return result;
+    if (hasPrefix) {
+      MavenDomProjectModel domProjectModel = MavenDomUtil.getMavenDomProjectModel(myProject, mavenProject.getFile());
+      if (domProjectModel != null) {
+        PsiElement res = resolveModelProperty(domProjectModel, unprefixed, new HashSet<DomElement>());
+        if (res != null) {
+          return res;
+        }
+      }
+    }
+
+    // todo resolve properties from config.
+    MavenRunnerSettings runnerSettings = MavenRunner.getInstance(myProject).getSettings();
+    if (runnerSettings.getMavenProperties().containsKey(myText) || runnerSettings.getVmOptions().contains("-D" + myText + '=')) {
+      return myElement;
+    }
+    if (MavenUtil.getPropertiesFromMavenOpts().containsKey(myText)) {
+      return myElement;
+    }
 
     MavenDomProfile profile = DomUtil.findDomElement(myElement, MavenDomProfile.class);
     if (profile != null) {
-      result = MavenDomProjectProcessorUtils.searchPropertyInProfile(myText, profile);
+      PsiElement result = MavenDomProjectProcessorUtils.searchPropertyInProfile(myText, profile);
       if (result != null) return result;
     }
 
-    result = MavenDomProjectProcessorUtils.searchProperty(myText, myProjectDom, myProject);
+    PsiElement result = MavenDomProjectProcessorUtils.searchProperty(myText, myProjectDom, myProject);
     if (result != null) return result;
 
+    IProperty property = MavenDomUtil.findProperty(myProject, MavenPropertiesVirtualFileSystem.SYSTEM_PROPERTIES_FILE, myText);
+    if (property != null) return property.getPsiElement();
+
+    if (myText.startsWith("env.")) {
+      property = MavenDomUtil.findProperty(myProject, MavenPropertiesVirtualFileSystem.ENV_PROPERTIES_FILE,
+                                           myText.substring("env.".length()));
+      if (property != null) return property.getPsiElement();
+    }
+
+    String textWithEnv = "env." + myText;
+
+    property = MavenDomUtil.findProperty(myProject, MavenPropertiesVirtualFileSystem.SYSTEM_PROPERTIES_FILE, textWithEnv);
+    if (property != null) return property.getPsiElement();
+
+    property = MavenDomUtil.findProperty(myProject, MavenPropertiesVirtualFileSystem.ENV_PROPERTIES_FILE, textWithEnv);
+    if (property != null) return property.getPsiElement();
+
+    if (!hasPrefix) {
+      MavenDomProjectModel domProjectModel = MavenDomUtil.getMavenDomProjectModel(myProject, mavenProject.getFile());
+      if (domProjectModel != null) {
+        PsiElement res = resolveModelProperty(domProjectModel, unprefixed, new HashSet<DomElement>());
+        if (res != null) {
+          return res;
+        }
+      }
+    }
+
     if (myText.startsWith("settings.")) {
       return resolveSettingsModelProperty();
     }
 
-    String modelProperty = myText;
-    if (!modelProperty.startsWith("project.")) {
-      modelProperty = modelProperty.startsWith("pom.")
-                      ? "project." + modelProperty.substring("pom.".length())
-                      : "project." + modelProperty;
-    }
-    return resolveModelProperty(myProjectDom, modelProperty, new THashSet<DomElement>());
+    return null;
   }
 
-  @Nullable
-  private PsiElement resolveSystemPropety() {
-    IProperty property = MavenDomUtil.findProperty(myProject,
-                                                   MavenPropertiesVirtualFileSystem.SYSTEM_PROPERTIES_FILE,
-                                                   myText);
-    return property == null ? null : property.getPsiElement();
-  }
-
-  @Nullable
-  private PsiElement resolveEnvPropety() {
-    IProperty property = MavenDomUtil.findProperty(myProject,
-                                                   MavenPropertiesVirtualFileSystem.ENV_PROPERTIES_FILE,
-                                                   myText.substring("env.".length()));
-    return property == null ? null : property.getPsiElement();
-  }
-
-  @Nullable
-  private PsiElement resolveBasedir() {
-    return getBaseDir();
-  }
-
-  private PsiDirectory getBaseDir() {
-    return PsiManager.getInstance(myProject).findDirectory(myMavenProject.getDirectoryFile());
+  private PsiDirectory getBaseDir(@NotNull MavenProject mavenProject) {
+    return PsiManager.getInstance(myProject).findDirectory(mavenProject.getDirectoryFile());
   }
 
   @Nullable
@@ -178,16 +208,20 @@ public class MavenPropertyPsiReference extends MavenPsiReference {
   private PsiElement resolveModelProperty(@NotNull MavenDomProjectModel projectDom,
                                           @NotNull final String path,
                                           @NotNull final Set<DomElement> recursionGuard) {
-    if (recursionGuard.contains(projectDom)) return null;
-    recursionGuard.add(projectDom);
+    if (!recursionGuard.add(projectDom)) return null;
 
-    if (!schemaHasProperty(MavenSchemaProvider.MAVEN_PROJECT_SCHEMA_URL, path)) return null;
+    String pathWithProjectPrefix = "project." + path;
 
-    PsiElement result = MavenDomUtil.findTag(projectDom, path);
+    if (!MavenModelClassesProperties.isPathValid(MavenModelClassesProperties.MAVEN_PROJECT_CLASS, path)
+      && !MavenModelClassesProperties.isPathValid(MavenModelClassesProperties.MAVEN_MODEL_CLASS, path)) {
+      if (!schemaHasProperty(MavenSchemaProvider.MAVEN_PROJECT_SCHEMA_URL, pathWithProjectPrefix)) return null;
+    }
+
+    PsiElement result = MavenDomUtil.findTag(projectDom, pathWithProjectPrefix);
     if (result != null) return result;
 
-    if (path.equals("project.groupId") || path.equals("project.version")) {
-      return MavenDomUtil.findTag(projectDom, path.replace("project.", "project.parent."));
+    if (pathWithProjectPrefix.equals("project.groupId") || pathWithProjectPrefix.equals("project.version")) {
+      return MavenDomUtil.findTag(projectDom, "project.parent." + path);
     }
 
     result = new MavenDomProjectProcessorUtils.DomParentProjectFileProcessor<PsiElement>(myProjectsManager) {
@@ -224,72 +258,121 @@ public class MavenPropertyPsiReference extends MavenPsiReference {
     return ArrayUtil.toObjectArray(result);
   }
 
-  protected void collectVariants(List<Object> result) {
-    collectStandardVariants(result);
-    collectProjectSchemaVariants(result);
-    collectSettingsXmlSchemaVariants(result);
-    collectPropertiesVariants(result);
-    collectSystemEnvProperties(MavenPropertiesVirtualFileSystem.SYSTEM_PROPERTIES_FILE, null, result);
-    collectSystemEnvProperties(MavenPropertiesVirtualFileSystem.ENV_PROPERTIES_FILE, "env.", result);
-  }
-
-  private void collectStandardVariants(List<Object> result) {
-    PsiDirectory basedir = getBaseDir();
-    for (String each : BASEDIR_PROPS) {
-      result.add(createLookupElement(basedir, each, MavenIcons.MAVEN_ICON));
+  protected void collectVariants(final List<Object> result) {
+    int prefixLength = 0;
+    if (myText.startsWith("pom.")) {
+      prefixLength = "pom.".length();
+    }
+    else if (myText.startsWith("project.")) {
+      prefixLength = "project.".length();
     }
-    result.add(createLookupElement(myElement, TIMESTAMP_PROP, MavenIcons.MAVEN_ICON));
-  }
 
-  private void collectProjectSchemaVariants(final List<Object> result) {
-    processSchema(MavenSchemaProvider.MAVEN_PROJECT_SCHEMA_URL, new CollectingSchemaProcessor(result) {
+    MavenProject mavenProject = myMavenProject;
+    while (myText.startsWith("parent.", prefixLength)) {
+      MavenId parentId = mavenProject.getParentId();
+      if (parentId == null) return;
+
+      mavenProject = myProjectsManager.findProject(parentId);
+      if (mavenProject == null) return;
+
+      prefixLength += "parent.".length();
+    }
+
+    final String prefix = prefixLength == 0 ? null : myText.substring(0, prefixLength);
+
+    PsiDirectory baseDir = getBaseDir(mavenProject);
+    addVariant(result, "basedir", baseDir, prefix, MavenIcons.MAVEN_ICON);
+    if (prefix == null) {
+      result.add(createLookupElement(baseDir, "project.baseUri", MavenIcons.MAVEN_ICON));
+      result.add(createLookupElement(baseDir, "pom.baseUri", MavenIcons.MAVEN_ICON));
+      result.add(LookupElementBuilder.create(TIMESTAMP_PROP).setIcon(MavenIcons.MAVEN_ICON));
+    }
+
+    processSchema(MavenSchemaProvider.MAVEN_PROJECT_SCHEMA_URL, new SchemaProcessor<Object>() {
       @Override
       public Object process(@NotNull String property, XmlElementDescriptor descriptor) {
-        super.process(property, descriptor);
-        String prefix = "project.";
-        if (property.length() > prefix.length()) {
-          String unqualified = property.substring(prefix.length());
-          super.process("pom." + unqualified, descriptor);
-          super.process(unqualified, descriptor);
+        if (property.startsWith("project.")) {
+          addVariant(result, property.substring("project.".length()), descriptor, prefix, MavenIcons.MAVEN_ICON);
         }
         return null;
       }
     });
+
+    processSchema(MavenSchemaProvider.MAVEN_SETTINGS_SCHEMA_URL, new SchemaProcessor<Object>(){
+      @Override
+      public Object process(@NotNull String property, XmlElementDescriptor descriptor) {
+        result.add(createLookupElement(descriptor, property, MavenIcons.MAVEN_ICON));
+        return null;
+      }
+    });
+
+    collectPropertiesVariants(result);
+    collectSystemEnvProperties(MavenPropertiesVirtualFileSystem.SYSTEM_PROPERTIES_FILE, null, result);
+    collectSystemEnvProperties(MavenPropertiesVirtualFileSystem.ENV_PROPERTIES_FILE, "env.", result);
+
+    MavenRunnerSettings runnerSettings = MavenRunner.getInstance(myProject).getSettings();
+    for (String prop : runnerSettings.getMavenProperties().keySet()) {
+      if (!isResultAlreadyContains(result, prop)) {
+        result.add(LookupElementBuilder.create(prop).setIcon(PlatformIcons.PROPERTY_ICON));
+      }
+    }
+    for (String prop : MavenUtil.getPropertiesFromMavenOpts().keySet()) {
+      if (!isResultAlreadyContains(result, prop)) {
+        result.add(LookupElementBuilder.create(prop).setIcon(PlatformIcons.PROPERTY_ICON));
+      }
+    }
   }
 
-  private void collectSettingsXmlSchemaVariants(final List<Object> result) {
-    processSchema(MavenSchemaProvider.MAVEN_SETTINGS_SCHEMA_URL, new CollectingSchemaProcessor(result));
+  private static boolean isResultAlreadyContains(List<Object> results, String propertyName) {
+    for (Object result : results) {
+      if (result instanceof LookupElement) {
+        if (((LookupElement)result).getLookupString().equals(propertyName)) {
+          return true;
+        }
+      }
+    }
+
+    return false;
+  }
+
+  private static void addVariant(List<Object> result, String name, @NotNull Object element, @Nullable String prefix, @NotNull Icon icon) {
+    String nameWithPrefix;
+    if (prefix == null) {
+      nameWithPrefix = name;
+      result.add(createLookupElement(element, "pom." + name, icon));
+      result.add(createLookupElement(element, "project." + name, icon));
+    }
+    else {
+      nameWithPrefix = prefix + name;
+    }
+
+    result.add(createLookupElement(element, nameWithPrefix, icon));
   }
 
   private void collectPropertiesVariants(final List<Object> result) {
-    Set<XmlTag> properties = MavenDomProjectProcessorUtils.collectProperties(myProjectDom, myProject);
-    result.addAll(ContainerUtil.map(properties, new Function<XmlTag, LookupElement>() {
-      public LookupElement fun(XmlTag xmlTag) {
-        return createLookupElement(xmlTag, xmlTag.getName());
-      }
-    }));
+    for (XmlTag xmlTag : MavenDomProjectProcessorUtils.collectProperties(myProjectDom, myProject)) {
+      result.add(createLookupElement(xmlTag, xmlTag.getName(), PlatformIcons.PROPERTY_ICON));
+    }
   }
 
-  private void collectSystemEnvProperties(String propertiesFileName, String prefix, List<Object> result) {
+  private void collectSystemEnvProperties(String propertiesFileName, @Nullable String prefix, List<Object> result) {
     PropertiesFile file = MavenDomUtil.getPropertiesFile(myProject, propertiesFileName);
     collectPropertiesFileVariants(file, prefix, result);
   }
 
-  protected void collectPropertiesFileVariants(@Nullable PropertiesFile file, String prefix, List<Object> result) {
+  protected static void collectPropertiesFileVariants(@Nullable PropertiesFile file, @Nullable String prefix, List<Object> result) {
     if (file == null) return;
 
     for (IProperty each : file.getProperties()) {
       String name = each.getKey();
-      if (prefix != null) name = prefix + name;
-      result.add(createLookupElement(each, name));
+      if (name != null) {
+        if (prefix != null) name = prefix + name;
+        result.add(createLookupElement(each, name, PlatformIcons.PROPERTY_ICON));
+      }
     }
   }
 
-  private static LookupElement createLookupElement(Object element, String name) {
-    return createLookupElement(element, name, PlatformIcons.PROPERTY_ICON);
-  }
-
-  private static LookupElement createLookupElement(Object element, String name, Icon icon) {
+  private static LookupElement createLookupElement(@NotNull Object element, @NotNull String name, @Nullable Icon icon) {
     return LookupElementBuilder.create(element, name)
       .setIcon(icon)
       .setPresentableText(name);
@@ -314,9 +397,8 @@ public class MavenPropertyPsiReference extends MavenPsiReference {
                                        Set<XmlElementDescriptor> recursionGuard) {
     for (XmlElementDescriptor each : descriptors) {
       if (isCollection(each)) continue;
+      if (!recursionGuard.add(each)) continue;
 
-      if (recursionGuard.contains(each)) continue;
-      recursionGuard.add(each);
       try {
         String name = each.getName();
         if (prefix != null) name = prefix + "." + name;
@@ -335,7 +417,7 @@ public class MavenPropertyPsiReference extends MavenPsiReference {
     return null;
   }
 
-  private static <T> boolean isCollection(XmlElementDescriptor each) {
+  private static boolean isCollection(XmlElementDescriptor each) {
     XmlTag declaration = (XmlTag)each.getDeclaration();
     if (declaration != null) {
       XmlTag complexType = declaration.findFirstSubTag("xs:complexType");
@@ -356,17 +438,4 @@ public class MavenPropertyPsiReference extends MavenPsiReference {
     T process(@NotNull String property, XmlElementDescriptor descriptor);
   }
 
-  private static class CollectingSchemaProcessor implements SchemaProcessor {
-    private final List<Object> myResult;
-
-    public CollectingSchemaProcessor(List<Object> result) {
-      myResult = result;
-    }
-
-    @Nullable
-    public Object process(@NotNull String property, XmlElementDescriptor descriptor) {
-      myResult.add(createLookupElement(descriptor, property, MavenIcons.MAVEN_ICON));
-      return null;
-    }
-  }
 }
diff --git a/plugins/maven/src/main/java/org/jetbrains/idea/maven/execution/EditMavenPropertyDialog.java b/plugins/maven/src/main/java/org/jetbrains/idea/maven/execution/EditMavenPropertyDialog.java
index 9ef8c87e6679..54e62788f208 100644
--- a/plugins/maven/src/main/java/org/jetbrains/idea/maven/execution/EditMavenPropertyDialog.java
+++ b/plugins/maven/src/main/java/org/jetbrains/idea/maven/execution/EditMavenPropertyDialog.java
@@ -15,7 +15,6 @@
  */
 package org.jetbrains.idea.maven.execution;
 
-import com.intellij.openapi.project.Project;
 import com.intellij.openapi.ui.DialogWrapper;
 import com.intellij.openapi.util.Pair;
 import com.intellij.util.ArrayUtil;
@@ -34,8 +33,8 @@ public class EditMavenPropertyDialog extends DialogWrapper {
   private JTextField myValueField;
   private final Map<String, String> myAvailableProperties;
 
-  public EditMavenPropertyDialog(Project p, Pair<String, String> value, Map<String, String> availableProperties) {
-    super(p, false);
+  public EditMavenPropertyDialog(Pair<String, String> value, Map<String, String> availableProperties) {
+    super(false);
     setTitle("Edit Maven Property");
 
     myAvailableProperties = availableProperties;
diff --git a/plugins/maven/src/main/java/org/jetbrains/idea/maven/execution/MavenPropertiesPanel.java b/plugins/maven/src/main/java/org/jetbrains/idea/maven/execution/MavenPropertiesPanel.java
new file mode 100644
index 000000000000..f5cf8e20184c
--- /dev/null
+++ b/plugins/maven/src/main/java/org/jetbrains/idea/maven/execution/MavenPropertiesPanel.java
@@ -0,0 +1,86 @@
+/*
+ * Copyright 2000-2012 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 org.jetbrains.idea.maven.execution;
+
+import com.intellij.openapi.util.Pair;
+import com.intellij.ui.AddEditRemovePanel;
+
+import java.awt.*;
+import java.util.*;
+import java.util.List;
+
+/**
+* @author Sergey Evdokimov
+*/
+public class MavenPropertiesPanel extends AddEditRemovePanel<Pair<String, String>> {
+  private Map<String, String> myAvailableProperties;
+
+  public MavenPropertiesPanel(Map<String, String> availableProperties) {
+    super(new MyPropertiesTableModel(), new ArrayList<Pair<String, String>>(), null);
+    setPreferredSize(new Dimension(100, 100));
+    myAvailableProperties = availableProperties;
+  }
+
+  protected Pair<String, String> addItem() {
+    return doAddOrEdit(new Pair<String, String>("", ""));
+  }
+
+  protected boolean removeItem(Pair<String, String> o) {
+    return true;
+  }
+
+  protected Pair<String, String> editItem(Pair<String, String> o) {
+    return doAddOrEdit(o);
+  }
+
+  private Pair<String, String> doAddOrEdit(Pair<String, String> o) {
+    EditMavenPropertyDialog d = new EditMavenPropertyDialog(o, myAvailableProperties);
+    d.show();
+    if (!d.isOK()) return null;
+    return d.getValue();
+  }
+
+  public Map<String, String> getDataAsMap() {
+    Map<String, String> result = new LinkedHashMap<String, String>();
+    for (Pair<String, String> p : getData()) {
+      result.put(p.getFirst(), p.getSecond());
+    }
+    return result;
+  }
+
+  public void setDataFromMap(Map<String, String> map) {
+    List<Pair<String, String>> result = new ArrayList<Pair<String, String>>();
+    for (Map.Entry<String, String> e : map.entrySet()) {
+      result.add(new Pair<String, String>(e.getKey(), e.getValue()));
+    }
+    setData(result);
+  }
+
+  private static class MyPropertiesTableModel extends AddEditRemovePanel.TableModel<Pair<String, String>> {
+    public int getColumnCount() {
+      return 2;
+    }
+
+    public String getColumnName(int c) {
+      return c == 0 ? "Name" : "Value";
+    }
+
+    public Object getField(Pair<String, String> o, int c) {
+      return c == 0 ? o.getFirst() : o.getSecond();
+    }
+  }
+
+}
diff --git a/plugins/maven/src/main/java/org/jetbrains/idea/maven/execution/MavenRunnerConfigurable.java b/plugins/maven/src/main/java/org/jetbrains/idea/maven/execution/MavenRunnerConfigurable.java
index 085fc93e248c..9179c008b610 100644
--- a/plugins/maven/src/main/java/org/jetbrains/idea/maven/execution/MavenRunnerConfigurable.java
+++ b/plugins/maven/src/main/java/org/jetbrains/idea/maven/execution/MavenRunnerConfigurable.java
@@ -21,8 +21,6 @@ import com.intellij.openapi.options.Configurable;
 import com.intellij.openapi.options.ConfigurationException;
 import com.intellij.openapi.options.SearchableConfigurable;
 import com.intellij.openapi.project.Project;
-import com.intellij.openapi.util.Pair;
-import com.intellij.ui.AddEditRemovePanel;
 import com.intellij.ui.IdeBorderFactory;
 import com.intellij.ui.RawCommandLineEditor;
 import org.jetbrains.annotations.Nls;
@@ -35,8 +33,9 @@ import org.jetbrains.idea.maven.utils.ComboBoxUtil;
 
 import javax.swing.*;
 import java.awt.*;
-import java.util.*;
-import java.util.List;
+import java.util.LinkedHashMap;
+import java.util.Map;
+import java.util.Properties;
 
 public abstract class MavenRunnerConfigurable implements SearchableConfigurable, Configurable.NoScroll {
   private final Project myProject;
@@ -47,7 +46,7 @@ public abstract class MavenRunnerConfigurable implements SearchableConfigurable,
   private JComboBox myJdkCombo;
   private final DefaultComboBoxModel myJdkComboModel = new DefaultComboBoxModel();
   private JCheckBox mySkipTestsCheckBox;
-  private MyPropertiesPanel myPropertiesPanel;
+  private MavenPropertiesPanel myPropertiesPanel;
 
   private Map<String, String> myProperties;
 
@@ -114,7 +113,9 @@ public abstract class MavenRunnerConfigurable implements SearchableConfigurable,
 
     propertiesPanel.add(mySkipTestsCheckBox = new JCheckBox("Skip tests"), BorderLayout.NORTH);
     mySkipTestsCheckBox.setMnemonic('t');
-    propertiesPanel.add(myPropertiesPanel = new MyPropertiesPanel(), BorderLayout.CENTER);
+
+    collectProperties();
+    propertiesPanel.add(myPropertiesPanel = new MavenPropertiesPanel(myProperties), BorderLayout.CENTER);
     myPropertiesPanel.getEmptyText().setText("No properties defined");
 
     c.gridx = 0;
@@ -124,8 +125,6 @@ public abstract class MavenRunnerConfigurable implements SearchableConfigurable,
     c.fill = GridBagConstraints.BOTH;
     panel.add(propertiesPanel, c);
 
-    collectProperties();
-
     return panel;
   }
 
@@ -135,9 +134,7 @@ public abstract class MavenRunnerConfigurable implements SearchableConfigurable,
 
     for (MavenProject each : s.getProjects()) {
       Properties properties = each.getProperties();
-      for (Map.Entry p : properties.entrySet()) {
-        result.put((String)p.getKey(), (String)p.getValue());
-      }
+      result.putAll((Map)properties);
     }
 
     myProperties = result;
@@ -215,60 +212,4 @@ public abstract class MavenRunnerConfigurable implements SearchableConfigurable,
 
     data.setMavenProperties(myPropertiesPanel.getDataAsMap());
   }
-
-  private class MyPropertiesPanel extends AddEditRemovePanel<Pair<String, String>> {
-    public MyPropertiesPanel() {
-      super(new MyPropertiesTableModel(), new ArrayList<Pair<String, String>>(), null);
-      setPreferredSize(new Dimension(100, 100));
-    }
-
-    protected Pair<String, String> addItem() {
-      return doAddOrEdit(new Pair<String, String>("", ""));
-    }
-
-    protected boolean removeItem(Pair<String, String> o) {
-      return true;
-    }
-
-    protected Pair<String, String> editItem(Pair<String, String> o) {
-      return doAddOrEdit(o);
-    }
-
-    private Pair<String, String> doAddOrEdit(Pair<String, String> o) {
-      EditMavenPropertyDialog d = new EditMavenPropertyDialog(myProject, o, myProperties);
-      d.show();
-      if (!d.isOK()) return null;
-      return d.getValue();
-    }
-
-    public Map<String, String> getDataAsMap() {
-      Map<String, String> result = new LinkedHashMap<String, String>();
-      for (Pair<String, String> p : getData()) {
-        result.put(p.getFirst(), p.getSecond());
-      }
-      return result;
-    }
-
-    public void setDataFromMap(Map<String, String> map) {
-      List<Pair<String, String>> result = new ArrayList<Pair<String, String>>();
-      for (Map.Entry<String, String> e : map.entrySet()) {
-        result.add(new Pair<String, String>(e.getKey(), e.getValue()));
-      }
-      setData(result);
-    }
-  }
-
-  private static class MyPropertiesTableModel extends AddEditRemovePanel.TableModel<Pair<String, String>> {
-    public int getColumnCount() {
-      return 2;
-    }
-
-    public String getColumnName(int c) {
-      return c == 0 ? "Name" : "Value";
-    }
-
-    public Object getField(Pair<String, String> o, int c) {
-      return c == 0 ? o.getFirst() : o.getSecond();
-    }
-  }
 }
diff --git a/plugins/maven/src/main/java/org/jetbrains/idea/maven/project/MavenProjectReader.java b/plugins/maven/src/main/java/org/jetbrains/idea/maven/project/MavenProjectReader.java
index ce1cb6907529..870155863984 100644
--- a/plugins/maven/src/main/java/org/jetbrains/idea/maven/project/MavenProjectReader.java
+++ b/plugins/maven/src/main/java/org/jetbrains/idea/maven/project/MavenProjectReader.java
@@ -64,7 +64,7 @@ public class MavenProjectReader {
                                         new THashSet<MavenId>());
   }
 
-  private File getBaseDir(VirtualFile file) {
+  private static File getBaseDir(VirtualFile file) {
     return new File(file.getParent().getPath());
   }
 
@@ -109,7 +109,7 @@ public class MavenProjectReader {
       return new RawModelReadResult(result, problems, alwaysOnProfiles);
     }
 
-    MavenParent parent = new MavenParent(new MavenId(UNKNOWN, UNKNOWN, UNKNOWN), "../pom.xml");
+    MavenParent parent;
     if (MavenJDOMUtil.hasChildByPath(xmlProject, "parent")) {
       parent = new MavenParent(new MavenId(MavenJDOMUtil.findChildValueByPath(xmlProject, "parent.groupId", UNKNOWN),
                                            MavenJDOMUtil.findChildValueByPath(xmlProject, "parent.artifactId", UNKNOWN),
@@ -117,6 +117,9 @@ public class MavenProjectReader {
                                MavenJDOMUtil.findChildValueByPath(xmlProject, "parent.relativePath", "../pom.xml"));
       result.setParent(parent);
     }
+    else {
+      parent = new MavenParent(new MavenId(UNKNOWN, UNKNOWN, UNKNOWN), "../pom.xml");
+    }
 
     result.setMavenId(new MavenId(MavenJDOMUtil.findChildValueByPath(xmlProject, "groupId", parent.getMavenId().getGroupId()),
                                   MavenJDOMUtil.findChildValueByPath(xmlProject, "artifactId", UNKNOWN),
@@ -336,7 +339,7 @@ public class MavenProjectReader {
     return true;
   }
 
-  private void collectProperties(Element xmlProperties, MavenModelBase mavenModelBase) {
+  private static void collectProperties(Element xmlProperties, MavenModelBase mavenModelBase) {
     if (xmlProperties == null) return;
 
     Properties props = mavenModelBase.getProperties();
@@ -422,7 +425,14 @@ public class MavenProjectReader {
                                                        MavenProjectProblem.ProblemType.PARENT));
       }
 
-      return MavenServerManager.getInstance().assembleInheritance(model, parentModel);
+      model = MavenServerManager.getInstance().assembleInheritance(model, parentModel);
+
+      // todo: it is a quick-hack here - we add inherited dummy profiles to correctly collect activated profiles in 'applyProfiles'.
+      List<MavenProfile> profiles = model.getProfiles();
+      for (MavenProfile each : parentModel.getProfiles()) {
+        addProfileIfDoesNotExist(new MavenProfile(each.getId(), each.getSource()), profiles);
+      }
+      return model;
     }
     finally {
       recursionGuard.remove(file);
@@ -469,13 +479,14 @@ public class MavenProjectReader {
     }
   }
 
-  public MavenProjectReaderResult generateSources(MavenEmbedderWrapper embedder,
-                                                  MavenImportingSettings importingSettings,
-                                                  VirtualFile file,
-                                                  Collection<String> profiles,
-                                                  MavenConsole console) throws MavenProcessCanceledException {
+  @Nullable
+  public static MavenProjectReaderResult generateSources(MavenEmbedderWrapper embedder,
+                                                         MavenImportingSettings importingSettings,
+                                                         VirtualFile file,
+                                                         Collection<String> profiles,
+                                                         MavenConsole console) throws MavenProcessCanceledException {
     try {
-      List<String> goals = Arrays.asList(importingSettings.getUpdateFoldersOnImportPhase());
+      List<String> goals = Collections.singletonList(importingSettings.getUpdateFoldersOnImportPhase());
       MavenServerExecutionResult result = embedder.execute(file, profiles, goals);
       if (result.projectData == null) return null;
 
diff --git a/plugins/maven/src/main/java/org/jetbrains/idea/maven/server/MavenServerManager.java b/plugins/maven/src/main/java/org/jetbrains/idea/maven/server/MavenServerManager.java
index cd96e0e3f10a..c8d10de2385e 100644
--- a/plugins/maven/src/main/java/org/jetbrains/idea/maven/server/MavenServerManager.java
+++ b/plugins/maven/src/main/java/org/jetbrains/idea/maven/server/MavenServerManager.java
@@ -19,7 +19,10 @@ import com.intellij.execution.DefaultExecutionResult;
 import com.intellij.execution.ExecutionException;
 import com.intellij.execution.ExecutionResult;
 import com.intellij.execution.Executor;
-import com.intellij.execution.configurations.*;
+import com.intellij.execution.configurations.CommandLineState;
+import com.intellij.execution.configurations.GeneralCommandLine;
+import com.intellij.execution.configurations.RunProfileState;
+import com.intellij.execution.configurations.SimpleJavaParameters;
 import com.intellij.execution.process.OSProcessHandler;
 import com.intellij.execution.process.ProcessHandler;
 import com.intellij.execution.rmi.RemoteProcessSupport;
@@ -54,6 +57,7 @@ import org.jetbrains.idea.maven.project.MavenGeneralSettings;
 import org.jetbrains.idea.maven.project.MavenProjectsManager;
 import org.jetbrains.idea.maven.utils.MavenLog;
 import org.jetbrains.idea.maven.utils.MavenProgressIndicator;
+import org.jetbrains.idea.maven.utils.MavenUtil;
 
 import java.io.File;
 import java.nio.charset.Charset;
@@ -178,13 +182,7 @@ public class MavenServerManager extends RemoteObjectWrapper<MavenServer> {
         params.setMainClass(MAIN_CLASS);
 
         Map<String, String> defs = new THashMap<String, String>();
-        
-        String mavenOpts = System.getenv("MAVEN_OPTS");
-        if (mavenOpts != null) {
-          ParametersList mavenOptsList = new ParametersList();
-          mavenOptsList.addParametersString(mavenOpts);
-          defs.putAll(mavenOptsList.getProperties());
-        }
+        defs.putAll(MavenUtil.getPropertiesFromMavenOpts());
 
         // pass ssl-related options
         for (Map.Entry<Object, Object> each : System.getProperties().entrySet()) {
diff --git a/plugins/maven/src/main/java/org/jetbrains/idea/maven/utils/MavenUtil.java b/plugins/maven/src/main/java/org/jetbrains/idea/maven/utils/MavenUtil.java
index ddcff2edc120..9f6faff1080e 100644
--- a/plugins/maven/src/main/java/org/jetbrains/idea/maven/utils/MavenUtil.java
+++ b/plugins/maven/src/main/java/org/jetbrains/idea/maven/utils/MavenUtil.java
@@ -17,6 +17,7 @@ package org.jetbrains.idea.maven.utils;
 
 import com.intellij.codeInsight.template.TemplateManager;
 import com.intellij.codeInsight.template.impl.TemplateImpl;
+import com.intellij.execution.configurations.ParametersList;
 import com.intellij.ide.fileTemplates.FileTemplate;
 import com.intellij.ide.fileTemplates.FileTemplateManager;
 import com.intellij.notification.Notification;
@@ -80,6 +81,28 @@ public class MavenUtil {
   public static final String LIB_DIR = "lib";
   public static final String SUPER_POM_PATH = "org/apache/maven/project/" + MavenConstants.SUPER_POM_XML;
 
+  private static volatile Map<String, String> ourPropertiesFromMvnOpts;
+
+  public static Map<String, String> getPropertiesFromMavenOpts() {
+    Map<String, String> res = ourPropertiesFromMvnOpts;
+    if (res == null) {
+      String mavenOpts = System.getenv("MAVEN_OPTS");
+      if (mavenOpts != null) {
+        ParametersList mavenOptsList = new ParametersList();
+        mavenOptsList.addParametersString(mavenOpts);
+        res = mavenOptsList.getProperties();
+      }
+      else {
+        res = Collections.emptyMap();
+      }
+
+      ourPropertiesFromMvnOpts = res;
+    }
+
+    return res;
+  }
+
+
   public static void invokeLater(Project p, Runnable r) {
     invokeLater(p, ModalityState.defaultModalityState(), r);
   }
diff --git a/plugins/maven/src/main/java/org/jetbrains/idea/maven/wizards/MavenFrameworkSupportProvider.java b/plugins/maven/src/main/java/org/jetbrains/idea/maven/wizards/MavenFrameworkSupportProvider.java
index 78c3533f2dff..3b7d2b570a40 100644
--- a/plugins/maven/src/main/java/org/jetbrains/idea/maven/wizards/MavenFrameworkSupportProvider.java
+++ b/plugins/maven/src/main/java/org/jetbrains/idea/maven/wizards/MavenFrameworkSupportProvider.java
@@ -67,7 +67,7 @@ public class MavenFrameworkSupportProvider extends FrameworkSupportProvider {
         }
         else {
           new MavenModuleBuilderHelper(new MavenId("groupId", module.getName(), "1.0-SNAPSHOT"), null, null, false, false, null,
-                                       "Add Maven Support").configure(model.getProject(), root, true);
+                                       null, "Add Maven Support").configure(model.getProject(), root, true);
         }
       }
     };
diff --git a/plugins/maven/src/main/java/org/jetbrains/idea/maven/wizards/MavenModuleBuilder.java b/plugins/maven/src/main/java/org/jetbrains/idea/maven/wizards/MavenModuleBuilder.java
index 0d7273eac2ae..1fcd564002be 100644
--- a/plugins/maven/src/main/java/org/jetbrains/idea/maven/wizards/MavenModuleBuilder.java
+++ b/plugins/maven/src/main/java/org/jetbrains/idea/maven/wizards/MavenModuleBuilder.java
@@ -33,6 +33,7 @@ import com.intellij.openapi.vfs.LocalFileSystem;
 import com.intellij.openapi.vfs.VirtualFile;
 import org.jetbrains.idea.maven.model.MavenArchetype;
 import org.jetbrains.idea.maven.model.MavenId;
+import org.jetbrains.idea.maven.project.MavenEnvironmentForm;
 import org.jetbrains.idea.maven.project.MavenProject;
 import org.jetbrains.idea.maven.project.MavenProjectsManager;
 import org.jetbrains.idea.maven.utils.MavenUtil;
@@ -41,6 +42,7 @@ import javax.swing.*;
 import java.io.File;
 import java.util.Collections;
 import java.util.List;
+import java.util.Map;
 
 public class MavenModuleBuilder extends ModuleBuilder implements SourcePathsBuilder {
   private static final Icon BIG_ICON = IconLoader.getIcon("/modules/javaModule.png");
@@ -54,6 +56,10 @@ public class MavenModuleBuilder extends ModuleBuilder implements SourcePathsBuil
   private MavenId myProjectId;
   private MavenArchetype myArchetype;
 
+  private MavenEnvironmentForm myEnvironmentForm;
+
+  private Map<String, String> myPropertiesToCreateByArtifact;
+
   public void setupRootModel(ModifiableRootModel rootModel) throws ConfigurationException {
     final Project project = rootModel.getProject();
 
@@ -64,8 +70,12 @@ public class MavenModuleBuilder extends ModuleBuilder implements SourcePathsBuil
 
     MavenUtil.runWhenInitialized(project, new DumbAwareRunnable() {
       public void run() {
+        if (myEnvironmentForm != null) {
+          myEnvironmentForm.setData(MavenProjectsManager.getInstance(project).getGeneralSettings());
+        }
+
         new MavenModuleBuilderHelper(myProjectId, myAggregatorProject, myParentProject, myInheritGroupId,
-                                     myInheritVersion, myArchetype, "Create new Maven module").configure(project, root, false);
+                                     myInheritVersion, myArchetype, myPropertiesToCreateByArtifact, "Create new Maven module").configure(project, root, false);
       }
     });
   }
@@ -96,7 +106,8 @@ public class MavenModuleBuilder extends ModuleBuilder implements SourcePathsBuil
 
   @Override
   public ModuleWizardStep[] createWizardSteps(WizardContext wizardContext, ModulesProvider modulesProvider) {
-    return new ModuleWizardStep[]{new MavenModuleWizardStep(wizardContext.getProject(), this)};
+    return new ModuleWizardStep[]{new MavenModuleWizardStep(wizardContext.getProject(), this),
+      new SelectPropertiesStep(wizardContext.getProject(), this)};
   }
 
   public MavenProject findPotentialParentProject(Project project) {
@@ -170,4 +181,20 @@ public class MavenModuleBuilder extends ModuleBuilder implements SourcePathsBuil
   public MavenArchetype getArchetype() {
     return myArchetype;
   }
+
+  public MavenEnvironmentForm getEnvironmentForm() {
+    return myEnvironmentForm;
+  }
+
+  public void setEnvironmentForm(MavenEnvironmentForm environmentForm) {
+    myEnvironmentForm = environmentForm;
+  }
+
+  public Map<String, String> getPropertiesToCreateByArtifact() {
+    return myPropertiesToCreateByArtifact;
+  }
+
+  public void setPropertiesToCreateByArtifact(Map<String, String> propertiesToCreateByArtifact) {
+    myPropertiesToCreateByArtifact = propertiesToCreateByArtifact;
+  }
 }
diff --git a/plugins/maven/src/main/java/org/jetbrains/idea/maven/wizards/MavenModuleBuilderHelper.java b/plugins/maven/src/main/java/org/jetbrains/idea/maven/wizards/MavenModuleBuilderHelper.java
index 7480bccbd758..c194329c73ac 100644
--- a/plugins/maven/src/main/java/org/jetbrains/idea/maven/wizards/MavenModuleBuilderHelper.java
+++ b/plugins/maven/src/main/java/org/jetbrains/idea/maven/wizards/MavenModuleBuilderHelper.java
@@ -61,6 +61,7 @@ public class MavenModuleBuilderHelper {
   private final boolean myInheritVersion;
 
   private final MavenArchetype myArchetype;
+  private final Map<String, String> myPropertiesToCreateByArtifact;
 
   private final String myCommandName;
 
@@ -70,6 +71,7 @@ public class MavenModuleBuilderHelper {
                                   boolean inheritGroupId,
                                   boolean inheritVersion,
                                   MavenArchetype archetype,
+                                  Map<String, String> propertiesToCreateByArtifact,
                                   String commaneName) {
     myProjectId = projectId;
     myAggregatorProject = aggregatorProject;
@@ -77,6 +79,8 @@ public class MavenModuleBuilderHelper {
     myInheritGroupId = inheritGroupId;
     myInheritVersion = inheritVersion;
     myArchetype = archetype;
+    myPropertiesToCreateByArtifact = propertiesToCreateByArtifact;
+    assert (archetype == null) == (propertiesToCreateByArtifact == null);
     myCommandName = commaneName;
   }
 
@@ -194,14 +198,16 @@ public class MavenModuleBuilderHelper {
     Map<String, String> props = settings.getMavenProperties();
 
     props.put("interactiveMode", "false");
-    props.put("archetypeGroupId", myArchetype.groupId);
-    props.put("archetypeArtifactId", myArchetype.artifactId);
-    props.put("archetypeVersion", myArchetype.version);
-    if (myArchetype.repository != null) props.put("archetypeRepository", myArchetype.repository);
+    //props.put("archetypeGroupId", myArchetype.groupId);
+    //props.put("archetypeArtifactId", myArchetype.artifactId);
+    //props.put("archetypeVersion", myArchetype.version);
+    //if (myArchetype.repository != null) props.put("archetypeRepository", myArchetype.repository);
 
-    props.put("groupId", myProjectId.getGroupId());
-    props.put("artifactId", myProjectId.getArtifactId());
-    props.put("version", myProjectId.getVersion());
+    //props.put("groupId", myProjectId.getGroupId());
+    //props.put("artifactId", myProjectId.getArtifactId());
+    //props.put("version", myProjectId.getVersion());
+
+    props.putAll(myPropertiesToCreateByArtifact);
 
     runner.run(params, settings, new Runnable() {
       public void run() {
diff --git a/plugins/maven/src/main/java/org/jetbrains/idea/maven/wizards/MavenModuleWizardStep.java b/plugins/maven/src/main/java/org/jetbrains/idea/maven/wizards/MavenModuleWizardStep.java
index e78e2d495aee..c52e04c20cac 100644
--- a/plugins/maven/src/main/java/org/jetbrains/idea/maven/wizards/MavenModuleWizardStep.java
+++ b/plugins/maven/src/main/java/org/jetbrains/idea/maven/wizards/MavenModuleWizardStep.java
@@ -24,7 +24,6 @@ import com.intellij.openapi.util.text.StringUtil;
 import com.intellij.ui.*;
 import com.intellij.ui.treeStructure.Tree;
 import com.intellij.util.containers.Convertor;
-import com.intellij.util.ui.AbstractLayoutManager;
 import com.intellij.util.ui.AsyncProcessIcon;
 import com.intellij.util.ui.UIUtil;
 import com.intellij.util.ui.tree.TreeUtil;
@@ -45,7 +44,6 @@ import java.awt.event.ActionEvent;
 import java.awt.event.ActionListener;
 import java.util.*;
 import java.util.List;
-import java.util.concurrent.atomic.AtomicBoolean;
 
 public class MavenModuleWizardStep extends ModuleWizardStep {
   private static final Icon WIZARD_ICON = IconLoader.getIcon("/addmodulewizard.png");
@@ -91,6 +89,8 @@ public class MavenModuleWizardStep extends ModuleWizardStep {
   private Object myCurrentUpdaterMarker;
   private final AsyncProcessIcon myLoadingIcon = new AsyncProcessIcon.Big(getClass() + ".loading");
 
+  private boolean skipUpdateUI;
+
   public MavenModuleWizardStep(@Nullable Project project, MavenModuleBuilder builder) {
     myProjectOrNull = project;
     myBuilder = builder;
@@ -140,6 +140,12 @@ public class MavenModuleWizardStep extends ModuleWizardStep {
     myInheritVersionCheckBox.addActionListener(updatingListener);
 
     myUseArchetypeCheckBox.addActionListener(updatingListener);
+    myUseArchetypeCheckBox.addActionListener(new ActionListener() {
+      @Override
+      public void actionPerformed(ActionEvent e) {
+        archetypeMayBeChanged();
+      }
+    });
 
     myAddArchetypeButton.addActionListener(new ActionListener() {
       public void actionPerformed(ActionEvent e) {
@@ -155,6 +161,7 @@ public class MavenModuleWizardStep extends ModuleWizardStep {
     myArchetypesTree.getSelectionModel().addTreeSelectionListener(new TreeSelectionListener() {
       public void valueChanged(TreeSelectionEvent e) {
         updateArchetypeDescription();
+        archetypeMayBeChanged();
       }
     });
 
@@ -169,6 +176,20 @@ public class MavenModuleWizardStep extends ModuleWizardStep {
     myArchetypeDescriptionField.setBackground(UIUtil.getPanelBackground());
   }
 
+  private void archetypeMayBeChanged() {
+    MavenArchetype selectedArchetype = getSelectedArchetype();
+    if (((myBuilder.getArchetype() == null) != (selectedArchetype == null))) {
+      myBuilder.setArchetype(selectedArchetype);
+      skipUpdateUI = true;
+      try {
+        fireStateChanged();
+      }
+      finally {
+        skipUpdateUI = false;
+      }
+    }
+  }
+
   @Override
   public JComponent getPreferredFocusedComponent() {
     return myGroupIdField;
@@ -253,6 +274,8 @@ public class MavenModuleWizardStep extends ModuleWizardStep {
 
   @Override
   public void updateStep() {
+    if (skipUpdateUI) return;
+
     if (isMavenizedProject()) {
       MavenProject parent = myBuilder.findPotentialParentProject(myProjectOrNull);
       myAggregator = parent;
@@ -429,7 +452,7 @@ public class MavenModuleWizardStep extends ModuleWizardStep {
     myArchetypesTree.setBackground(archetypesEnabled ? UIUtil.getListBackground() : UIUtil.getPanelBackground());
   }
 
-  private String formatProjectString(MavenProject project) {
+  private static String formatProjectString(MavenProject project) {
     if (project == null) return "<none>";
     return project.getMavenId().getDisplayString();
   }
@@ -448,12 +471,13 @@ public class MavenModuleWizardStep extends ModuleWizardStep {
     myBuilder.setArchetype(getSelectedArchetype());
   }
 
+  @Nullable
   private MavenArchetype getSelectedArchetype() {
     if (!myUseArchetypeCheckBox.isSelected() || myArchetypesTree.isSelectionEmpty()) return null;
     return getArchetypeInfoFromPathComponent(myArchetypesTree.getLastSelectedPathComponent());
   }
 
-  private MavenArchetype getArchetypeInfoFromPathComponent(Object sel) {
+  private static MavenArchetype getArchetypeInfoFromPathComponent(Object sel) {
     return (MavenArchetype)((DefaultMutableTreeNode)sel).getUserObject();
   }
 
diff --git a/plugins/maven/src/main/java/org/jetbrains/idea/maven/wizards/SelectPropertiesStep.form b/plugins/maven/src/main/java/org/jetbrains/idea/maven/wizards/SelectPropertiesStep.form
new file mode 100644
index 000000000000..fc42a0ccb4b5
--- /dev/null
+++ b/plugins/maven/src/main/java/org/jetbrains/idea/maven/wizards/SelectPropertiesStep.form
@@ -0,0 +1,36 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<form xmlns="http://www.intellij.com/uidesigner/form/" version="1" bind-to-class="org.jetbrains.idea.maven.wizards.SelectPropertiesStep">
+  <grid id="27dc6" binding="myMainPanel" layout-manager="GridLayoutManager" row-count="3" column-count="1" same-size-horizontally="false" same-size-vertically="false" hgap="-1" vgap="-1">
+    <margin top="0" left="0" bottom="0" right="0"/>
+    <constraints>
+      <xy x="20" y="20" width="500" height="400"/>
+    </constraints>
+    <properties/>
+    <border type="none"/>
+    <children>
+      <grid id="bbb30" binding="myEnvironmentPanel" layout-manager="BorderLayout" hgap="0" vgap="0">
+        <constraints>
+          <grid row="0" column="0" row-span="1" col-span="1" vsize-policy="3" hsize-policy="3" anchor="0" fill="3" indent="0" use-parent-layout="false"/>
+        </constraints>
+        <properties/>
+        <border type="none"/>
+        <children/>
+      </grid>
+      <grid id="41b57" binding="myPropertiesPanel" layout-manager="BorderLayout" hgap="0" vgap="0">
+        <constraints>
+          <grid row="1" column="0" row-span="1" col-span="1" vsize-policy="3" hsize-policy="3" anchor="0" fill="3" indent="0" use-parent-layout="false">
+            <preferred-size width="-1" height="300"/>
+          </grid>
+        </constraints>
+        <properties/>
+        <border type="etched" title="Properties"/>
+        <children/>
+      </grid>
+      <vspacer id="c877e">
+        <constraints>
+          <grid row="2" column="0" row-span="1" col-span="1" vsize-policy="6" hsize-policy="1" anchor="0" fill="2" indent="0" use-parent-layout="false"/>
+        </constraints>
+      </vspacer>
+    </children>
+  </grid>
+</form>
diff --git a/plugins/maven/src/main/java/org/jetbrains/idea/maven/wizards/SelectPropertiesStep.java b/plugins/maven/src/main/java/org/jetbrains/idea/maven/wizards/SelectPropertiesStep.java
new file mode 100644
index 000000000000..7f18f9426189
--- /dev/null
+++ b/plugins/maven/src/main/java/org/jetbrains/idea/maven/wizards/SelectPropertiesStep.java
@@ -0,0 +1,108 @@
+/*
+ * Copyright 2000-2012 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 org.jetbrains.idea.maven.wizards;
+
+import com.intellij.ide.util.projectWizard.ModuleWizardStep;
+import com.intellij.openapi.project.Project;
+import com.intellij.openapi.project.ProjectManager;
+import com.intellij.util.containers.hash.HashMap;
+import org.jetbrains.annotations.Nullable;
+import org.jetbrains.idea.maven.execution.MavenPropertiesPanel;
+import org.jetbrains.idea.maven.indices.MavenIndex;
+import org.jetbrains.idea.maven.model.MavenArchetype;
+import org.jetbrains.idea.maven.model.MavenId;
+import org.jetbrains.idea.maven.project.MavenEnvironmentForm;
+import org.jetbrains.idea.maven.project.MavenGeneralSettings;
+import org.jetbrains.idea.maven.project.MavenProjectsManager;
+
+import javax.swing.*;
+import java.awt.*;
+import java.util.Collections;
+import java.util.LinkedHashMap;
+import java.util.Map;
+
+/**
+ * @author Sergey Evdokimov
+ */
+public class SelectPropertiesStep extends ModuleWizardStep {
+
+  private final Project myProjectOrNull;
+  private final MavenModuleBuilder myBuilder;
+
+  private JPanel myMainPanel;
+  private JPanel myEnvironmentPanel;
+  private JPanel myPropertiesPanel;
+
+  private MavenEnvironmentForm myEnvironmentForm;
+  private MavenPropertiesPanel myMavenPropertiesPanel;
+
+  private Map<String, String> myAvailableProperties = new HashMap<String, String>();
+
+  public SelectPropertiesStep(@Nullable Project project, MavenModuleBuilder builder) {
+    myProjectOrNull = project;
+    myBuilder = builder;
+
+    initComponents();
+  }
+
+  private void initComponents() {
+    myEnvironmentForm = new MavenEnvironmentForm();
+
+    Project project = myProjectOrNull == null ? ProjectManager.getInstance().getDefaultProject() : myProjectOrNull;
+    myEnvironmentForm.getData(MavenProjectsManager.getInstance(project).getGeneralSettings().clone());
+
+    myEnvironmentPanel.add(myEnvironmentForm.createComponent(), BorderLayout.CENTER);
+
+    myMavenPropertiesPanel = new MavenPropertiesPanel(myAvailableProperties);
+    myPropertiesPanel.add(myMavenPropertiesPanel);
+  }
+
+  @Override
+  public void updateStep() {
+    MavenArchetype archetype = myBuilder.getArchetype();
+
+    Map<String, String> props = new LinkedHashMap<String, String>();
+
+    MavenId projectId = myBuilder.getProjectId();
+
+    props.put("groupId", projectId.getGroupId());
+    props.put("artifactId", projectId.getArtifactId());
+    props.put("version", projectId.getVersion());
+
+    props.put("archetypeGroupId", archetype.groupId);
+    props.put("archetypeArtifactId", archetype.artifactId);
+    props.put("archetypeVersion", archetype.version);
+    if (archetype.repository != null) props.put("archetypeRepository", archetype.repository);
+
+    myMavenPropertiesPanel.setDataFromMap(props);
+  }
+
+  @Override
+  public JComponent getComponent() {
+    return myMainPanel;
+  }
+
+  @Override
+  public boolean isStepVisible() {
+    return myBuilder.getArchetype() != null;
+  }
+
+  @Override
+  public void updateDataModel() {
+    myBuilder.setEnvironmentForm(myEnvironmentForm);
+    myBuilder.setPropertiesToCreateByArtifact(myMavenPropertiesPanel.getDataAsMap());
+  }
+}
diff --git a/plugins/maven/src/test/java/org/jetbrains/idea/maven/dom/MavenFilteredPropertiesCompletionAndResolutionTest.java b/plugins/maven/src/test/java/org/jetbrains/idea/maven/dom/MavenFilteredPropertiesCompletionAndResolutionTest.java
index 8abc1192fb12..f3a1c49b1b41 100644
--- a/plugins/maven/src/test/java/org/jetbrains/idea/maven/dom/MavenFilteredPropertiesCompletionAndResolutionTest.java
+++ b/plugins/maven/src/test/java/org/jetbrains/idea/maven/dom/MavenFilteredPropertiesCompletionAndResolutionTest.java
@@ -488,11 +488,11 @@ public class MavenFilteredPropertiesCompletionAndResolutionTest extends MavenDom
 
     VirtualFile f = createProjectSubFile("res/foo1.properties",
                                          "foo1=${basedir}\n" +
-                                         "foo2=|baseUri|\n" +
+                                         "foo2=|pom.baseUri|\n" +
                                          "foo3=a(ve|rsion]");
 
     assertNotNull(resolveReference(f, "basedir"));
-    assertNotNull(resolveReference(f, "baseUri"));
+    assertNotNull(resolveReference(f, "pom.baseUri"));
     assertNotNull(getReference(f, "ve|rsion"));
   }
 
@@ -526,10 +526,10 @@ public class MavenFilteredPropertiesCompletionAndResolutionTest extends MavenDom
 
     VirtualFile f = createProjectSubFile("res/foo1.properties",
                                          "foo1=${basedir}\n" +
-                                         "foo2=|baseUri|");
+                                         "foo2=|pom.baseUri|");
 
     assert !(getReference(f, "basedir") instanceof MavenPropertyPsiReference);
-    assertNotNull(resolveReference(f, "baseUri"));
+    assertNotNull(resolveReference(f, "pom.baseUri"));
   }
 
 }
diff --git a/plugins/maven/src/test/java/org/jetbrains/idea/maven/dom/MavenPropertyCompletionAndResolutionTest.java b/plugins/maven/src/test/java/org/jetbrains/idea/maven/dom/MavenPropertyCompletionAndResolutionTest.java
index 1049aca502e2..c04b7c4379c4 100644
--- a/plugins/maven/src/test/java/org/jetbrains/idea/maven/dom/MavenPropertyCompletionAndResolutionTest.java
+++ b/plugins/maven/src/test/java/org/jetbrains/idea/maven/dom/MavenPropertyCompletionAndResolutionTest.java
@@ -36,16 +36,6 @@ public class MavenPropertyCompletionAndResolutionTest extends MavenDomTestCase {
                   "<version>1</version>");
   }
 
-  public void testBasicResolution() throws Exception {
-    createProjectPom("<groupId>test</groupId>" +
-                     "<artifactId>project</artifactId>" +
-                     "<version>1</version>" +
-
-                     "<name>${<caret>foo}</name>");
-
-    assertUnresolved(myProjectPom);
-  }
-
   public void testResolutionToProject() throws Exception {
     createProjectPom("<groupId>test</groupId>" +
                      "<artifactId>project</artifactId>" +
@@ -101,24 +91,6 @@ public class MavenPropertyCompletionAndResolutionTest extends MavenDomTestCase {
                      "<name>${<caret>pom.basedir}</name>");
 
     assertResolved(myProjectPom, baseDir);
-
-    createProjectPom("<groupId>test</groupId" +
-                     "<artifactId>project</artifactId>" +
-                     "<version>1</version>" +
-
-                     "<name>${<caret>baseUri}</name>");
-
-    assertResolved(myProjectPom, baseDir);
-  }
-
-  public void testBuiltInTimestampProperty() throws Exception {
-    createProjectPom("<groupId>test</groupId" +
-                     "<artifactId>project</artifactId>" +
-                     "<version>1</version>" +
-
-                     "<name>${<caret>maven.build.timestamp}</name>");
-
-    assertResolved(myProjectPom, findTag("project.name"));
   }
 
   public void testResolutionWithSeveralProperties() throws Exception {
@@ -186,16 +158,6 @@ public class MavenPropertyCompletionAndResolutionTest extends MavenDomTestCase {
     assertUnresolved(myProjectPom);
   }
 
-  public void testResolutionToUnknownExtraProjectProperty() throws Exception {
-    createProjectPom("<groupId>test</groupId>" +
-                     "<artifactId>project</artifactId>" +
-                     "<version>1</version>" +
-
-                     "<name>${<caret>project.version.bar}</name>");
-
-    assertUnresolved(myProjectPom);
-  }
-
   public void testResolutionToAbsentProjectProperty() throws Exception {
     createProjectPom("<groupId>test</groupId>" +
                      "<artifactId>project</artifactId>" +
@@ -745,14 +707,30 @@ public class MavenPropertyCompletionAndResolutionTest extends MavenDomTestCase {
   }
 
   public void testHighlightUnresolvedProperties() throws Exception {
-    createProjectPom("<groupId>test</groupId>" +
-                     "<artifactId>project</artifactId>" +
-                     "<version>1</version>" +
-                     "<name>${<error>xxx</error>}</name>" +
+    createProjectPom("<groupId>test</groupId>\n" +
+                     "<artifactId>child</artifactId>\n" +
+                     "<version>1</version>\n" +
+                     "<name>${<error>xxx</error>}</name>\n" +
 
-                     "<properties>" +
-                     "  <foo>${<error>zzz</error>}</foo>" +
-                     "</properties>");
+                     "<properties>\n" +
+                     "  <foo>\n" +
+                     "${<error>zzz</error>}\n" +
+                     "${<error>pom.maven.build.timestamp</error>}\n" +
+                     "${<error>project.maven.build.timestamp</error>}\n" +
+                     "${<error>parent.maven.build.timestamp</error>}\n" +
+                     "${<error>baseUri</error>}\n" +
+                     "${<error>unknownProperty</error>}\n" +
+                     "${<error>project.version.bar</error>}\n" +
+
+                     "${maven.build.timestamp}\n" +
+                     "${project.parentFile.name}\n" +
+                     "${<error>project.parentFile.nameXxx</error>}\n" +
+                     "${pom.compileArtifacts.empty}\n" +
+                     "${modules.empty}\n" +
+                     "${projectDirectory}\n" +
+                     "</foo>\n" +
+                     "</properties>"
+    );
 
     checkHighlighting();
   }
@@ -841,8 +819,10 @@ public class MavenPropertyCompletionAndResolutionTest extends MavenDomTestCase {
                   "parentPomProfilesProp",
                   "parentProfilesXmlProp");
     assertContain(variants, "artifactId", "project.artifactId", "pom.artifactId");
-    assertContain(variants, "basedir", "project.basedir", "pom.basedir", "baseUri", "project.baseUri", "pom.basedir");
+    assertContain(variants, "basedir", "project.basedir", "pom.basedir", "project.baseUri", "pom.basedir");
+    assert !variants.contains("baseUri");
     assertContain(variants, "maven.build.timestamp");
+    assert !variants.contains("project.maven.build.timestamp");
     assertContain(variants, "settingsXmlProp");
     assertContain(variants, "settings.localRepository");
     assertContain(variants, "user.home", "env." + getEnvVar());
diff --git a/plugins/maven/src/test/java/org/jetbrains/idea/maven/importing/StructureImportingTest.java b/plugins/maven/src/test/java/org/jetbrains/idea/maven/importing/StructureImportingTest.java
index fb31c457f070..16f6fc4e89d6 100644
--- a/plugins/maven/src/test/java/org/jetbrains/idea/maven/importing/StructureImportingTest.java
+++ b/plugins/maven/src/test/java/org/jetbrains/idea/maven/importing/StructureImportingTest.java
@@ -24,7 +24,6 @@ import com.intellij.openapi.roots.ModuleRootManager;
 import com.intellij.openapi.vfs.VirtualFile;
 import com.intellij.pom.java.LanguageLevel;
 import org.jetbrains.idea.maven.MavenImportingTestCase;
-import org.jetbrains.idea.maven.model.MavenId;
 import org.jetbrains.idea.maven.project.MavenProject;
 
 import java.io.File;
@@ -108,36 +107,6 @@ public class StructureImportingTest extends MavenImportingTestCase {
     assertModules("project", "m1", "m2");
   }
 
-  public void testModulesAreNotInheritedFromParentsProfiles() throws Exception {
-    createProjectPom("<groupId>test</groupId>" +
-                     "<artifactId>project</artifactId>" +
-                     "<version>1</version>" +
-                     "<packaging>pom</packaging>" +
-
-                     "<profiles>\n" +
-                     " <profile>\n" +
-                     "  <id>one</id>\n" +
-                     "   <modules>" +
-                     "    <module>m</module>" +
-                     "   </modules>" +
-                     " </profile>" +
-                     "</profiles>");
-
-    createModulePom("m", "<groupId>test</groupId>" +
-                         "<artifactId>m</artifactId>" +
-                         "<version>1</version>" +
-                         "<parent>" +
-                         " <groupId>test</groupId>" +
-                         " <artifactId>project</artifactId>" +
-                         " <version>1</version>" +
-                         "</parent>");
-
-    importProjectWithProfiles("one");
-
-    assertSize(1, myProjectsManager.findProject(new MavenId("test", "project", "1")).getModulePaths());
-    assertSize(0, myProjectsManager.findProject(new MavenId("test", "m", "1")).getModulePaths());
-  }
-
   public void testModulesWithSlashesAtTheEnds() throws Exception {
     createProjectPom("<groupId>test</groupId>" +
                      "<artifactId>project</artifactId>" +
@@ -375,18 +344,18 @@ public class StructureImportingTest extends MavenImportingTestCase {
     if (!hasMavenInstallation()) return;
 
     final VirtualFile parent = createModulePom("parent",
-                                               "<groupId>test</groupId>" +
-                                               "<artifactId>parent</artifactId>" +
-                                               "<version>1</version>" +
-                                               "<packaging>pom</packaging>" +
+                                         "<groupId>test</groupId>" +
+                                         "<artifactId>parent</artifactId>" +
+                                         "<version>1</version>" +
+                                         "<packaging>pom</packaging>" +
 
-                                               "<dependencies>" +
-                                               "  <dependency>" +
-                                               "    <groupId>junit</groupId>" +
-                                               "    <artifactId>junit</artifactId>" +
-                                               "    <version>4.0</version>" +
-                                               "  </dependency>" +
-                                               "</dependencies>");
+                                         "<dependencies>" +
+                                         "  <dependency>" +
+                                         "    <groupId>junit</groupId>" +
+                                         "    <artifactId>junit</artifactId>" +
+                                         "    <version>4.0</version>" +
+                                         "  </dependency>" +
+                                         "</dependencies>");
     executeGoal("parent", "install");
 
     new WriteAction() {
diff --git a/plugins/maven/src/test/java/org/jetbrains/idea/maven/project/MavenProjectReaderTest.java b/plugins/maven/src/test/java/org/jetbrains/idea/maven/project/MavenProjectReaderTest.java
index 912f8b9d1f5a..5f0b3ec4b79d 100644
--- a/plugins/maven/src/test/java/org/jetbrains/idea/maven/project/MavenProjectReaderTest.java
+++ b/plugins/maven/src/test/java/org/jetbrains/idea/maven/project/MavenProjectReaderTest.java
@@ -23,11 +23,10 @@ import com.intellij.openapi.util.io.FileUtil;
 import com.intellij.openapi.vfs.VfsUtil;
 import com.intellij.openapi.vfs.VirtualFile;
 import com.intellij.util.ArrayUtil;
+import com.intellij.util.Function;
+import com.intellij.util.containers.ContainerUtil;
 import org.jetbrains.idea.maven.MavenTestCase;
-import org.jetbrains.idea.maven.model.MavenId;
-import org.jetbrains.idea.maven.model.MavenModel;
-import org.jetbrains.idea.maven.model.MavenProjectProblem;
-import org.jetbrains.idea.maven.model.MavenResource;
+import org.jetbrains.idea.maven.model.*;
 import org.jetbrains.idea.maven.utils.MavenUtil;
 
 import java.io.File;
@@ -494,7 +493,7 @@ public class MavenProjectReaderTest extends MavenTestCase {
     assertEquals("${prop2}", p.getPackaging());
   }
 
-  public void testHandlingRecursionProperlyAndDoNotForgetCoClearRecursionGuard() throws Exception {
+  public void testHandlingRecursionProprielyAndDoNotForgetCoClearRecursionGuard() throws Exception {
     File repositoryPath = new File(myDir, "repository");
     setRepositoryPath(repositoryPath.getPath());
 
@@ -1000,6 +999,44 @@ public class MavenProjectReaderTest extends MavenTestCase {
     assertEquals("xxx", p.getBuild().getFinalName());
   }
 
+
+  public void testInheritingParentProfiles() throws Exception {
+    createProjectPom("<groupId>test</groupId>" +
+                     "<artifactId>parent</artifactId>" +
+                     "<version>1</version>" +
+
+                     "<profiles>" +
+                     "  <profile>" +
+                     "    <id>profileFromParent</id>" +
+                     "  </profile>" +
+                     "</profiles>");
+
+    VirtualFile module = createModulePom("module",
+                                         "<groupId>test</groupId>" +
+                                         "<artifactId>module</artifactId>" +
+                                         "<version>1</version>" +
+
+                                         "<parent>" +
+                                         "  <groupId>test</groupId>" +
+                                         "  <artifactId>parent</artifactId>" +
+                                         "  <version>1</version>" +
+                                         "</parent>" +
+
+                                         "<profiles>" +
+                                         "  <profile>" +
+                                         "    <id>profileFromChild</id>" +
+                                         "  </profile>" +
+                                         "</profiles>");
+
+    MavenModel p = readProject(module);
+    assertOrderedElementsAreEqual(ContainerUtil.map(p.getProfiles(), new Function<MavenProfile, Object>() {
+      @Override
+      public Object fun(MavenProfile profile) {
+        return profile.getId();
+      }
+    }), "profileFromChild", "profileFromParent");
+  }
+
   public void testCorrectlyCollectProfilesFromDifferentSources() throws Exception {
     createProjectPom("<groupId>test</groupId>" +
                      "<artifactId>parent</artifactId>" +
@@ -1013,9 +1050,9 @@ public class MavenProjectReaderTest extends MavenTestCase {
                      "</profiles>");
 
     final VirtualFile parentProfiles = createProfilesXml("<profile>" +
-                                                   "  <id>profile</id>" +
-                                                   "  <modules><module>parentProfiles</module></modules>" +
-                                                   "</profile>");
+                                                         "  <id>profile</id>" +
+                                                         "  <modules><module>parentProfiles</module></modules>" +
+                                                         "</profile>");
 
     VirtualFile module = createModulePom("module",
                                          "<groupId>test</groupId>" +
@@ -1043,10 +1080,10 @@ public class MavenProjectReaderTest extends MavenTestCase {
                       "</profiles>");
 
     final VirtualFile profiles = createProfilesXml("module",
-                                             "<profile>" +
-                                             "  <id>profile</id>" +
-                                             "  <modules><module>profiles</module></modules>" +
-                                             "</profile>");
+                                                   "<profile>" +
+                                                   "  <id>profile</id>" +
+                                                   "  <modules><module>profiles</module></modules>" +
+                                                   "</profile>");
 
     MavenModel p = readProject(module);
     assertEquals(1, p.getProfiles().size());
@@ -1079,8 +1116,8 @@ public class MavenProjectReaderTest extends MavenTestCase {
 
     p = readProject(module);
     assertEquals(1, p.getProfiles().size());
-    assertEquals("settings", p.getProfiles().get(0).getModules().get(0));
-    assertEquals("settings.xml", p.getProfiles().get(0).getSource());
+    assertEmpty("parent", p.getProfiles().get(0).getModules());
+    assertEquals("pom", p.getProfiles().get(0).getSource());
 
     createProjectPom("<groupId>test</groupId>" +
                      "<artifactId>parent</artifactId>" +
@@ -1088,8 +1125,8 @@ public class MavenProjectReaderTest extends MavenTestCase {
 
     p = readProject(module);
     assertEquals(1, p.getProfiles().size());
-    assertEquals("settings", p.getProfiles().get(0).getModules().get(0));
-    assertEquals("settings.xml", p.getProfiles().get(0).getSource());
+    assertEmpty("parentProfiles", p.getProfiles().get(0).getModules());
+    assertEquals("profiles.xml", p.getProfiles().get(0).getSource());
 
     new WriteCommandAction.Simple(myProject) {
       @Override
@@ -1101,7 +1138,7 @@ public class MavenProjectReaderTest extends MavenTestCase {
 
     p = readProject(module);
     assertEquals(1, p.getProfiles().size());
-    assertEquals("settings", p.getProfiles().get(0).getModules().get(0));
+    assertEmpty("settings", p.getProfiles().get(0).getModules());
     assertEquals("settings.xml", p.getProfiles().get(0).getSource());
   }
 
diff --git a/plugins/svn4idea/lib/svnkit-javahl.jar b/plugins/svn4idea/lib/svnkit-javahl.jar
index f5615cf20595..00f40fa3353f 100644
Binary files a/plugins/svn4idea/lib/svnkit-javahl.jar and b/plugins/svn4idea/lib/svnkit-javahl.jar differ
diff --git a/plugins/svn4idea/lib/svnkit-javahl16.zip b/plugins/svn4idea/lib/svnkit-javahl16.zip
index 9104eeabdd42..d8cff562d17b 100644
Binary files a/plugins/svn4idea/lib/svnkit-javahl16.zip and b/plugins/svn4idea/lib/svnkit-javahl16.zip differ
diff --git a/plugins/svn4idea/lib/svnkit.jar b/plugins/svn4idea/lib/svnkit.jar
index e7f60fae5f49..6863da269bc1 100644
Binary files a/plugins/svn4idea/lib/svnkit.jar and b/plugins/svn4idea/lib/svnkit.jar differ
diff --git a/plugins/svn4idea/lib/svnkitsrc.zip b/plugins/svn4idea/lib/svnkitsrc.zip
index 49b3ac842c71..d2b77aa393c8 100644
Binary files a/plugins/svn4idea/lib/svnkitsrc.zip and b/plugins/svn4idea/lib/svnkitsrc.zip differ
diff --git a/plugins/svn4idea/src/org/jetbrains/idea/svn17/SvnChangeProviderContext.java b/plugins/svn4idea/src/org/jetbrains/idea/svn17/SvnChangeProviderContext.java
index 1b41336aff40..aad0f0d5d762 100644
--- a/plugins/svn4idea/src/org/jetbrains/idea/svn17/SvnChangeProviderContext.java
+++ b/plugins/svn4idea/src/org/jetbrains/idea/svn17/SvnChangeProviderContext.java
@@ -30,6 +30,7 @@ import org.tmatesoft.svn.core.SVNErrorCode;
 import org.tmatesoft.svn.core.SVNException;
 import org.tmatesoft.svn.core.SVNLock;
 import org.tmatesoft.svn.core.SVNNodeKind;
+import org.tmatesoft.svn.core.internal.wc17.db.ISVNWCDb;
 import org.tmatesoft.svn.core.wc.*;
 
 import java.io.File;
@@ -191,7 +192,8 @@ class SvnChangeProviderContext implements StatusReceiver {
   }
 
   void processStatus(final FilePath filePath, final SVNStatus status) throws SVNException {
-    if (WorkingCopyFormat.ONE_DOT_SEVEN.getFormat() != status.getWorkingCopyFormat()) {
+    final int wcFormat = status.getWorkingCopyFormat();
+    if (WorkingCopyFormat.ONE_DOT_SEVEN.getFormat() != wcFormat && ISVNWCDb.WC_FORMAT_17 != wcFormat) {
       loadEntriesFile(filePath);
     }
     if (status != null) {
diff --git a/plugins/svn4idea/src/org/jetbrains/idea/svn17/SvnRecursiveStatusWalker.java b/plugins/svn4idea/src/org/jetbrains/idea/svn17/SvnRecursiveStatusWalker.java
index 7719c32a6129..8e1b13e2103f 100644
--- a/plugins/svn4idea/src/org/jetbrains/idea/svn17/SvnRecursiveStatusWalker.java
+++ b/plugins/svn4idea/src/org/jetbrains/idea/svn17/SvnRecursiveStatusWalker.java
@@ -17,6 +17,7 @@ package org.jetbrains.idea.svn17;
 
 import com.intellij.openapi.project.Project;
 import com.intellij.openapi.vcs.FilePath;
+import com.intellij.openapi.vfs.LocalFileSystem;
 import com.intellij.openapi.vfs.VirtualFile;
 import com.intellij.vcsUtil.VcsUtil;
 import org.jetbrains.idea.svn17.commandLine.SvnCommandLineStatusClient;
@@ -174,9 +175,12 @@ public class SvnRecursiveStatusWalker {
 
     public void handleStatus(final SVNStatus status) throws SVNException {
       myPartner.checkCanceled();
-      final FilePath path = VcsUtil.getFilePath(status.getFile(), status.getKind().equals(SVNNodeKind.DIR));
-      final VirtualFile vFile = path.getVirtualFile();
-
+      final File ioFile = status.getFile();
+      final LocalFileSystem lfs = LocalFileSystem.getInstance();
+      VirtualFile vFile = lfs.findFileByIoFile(ioFile);
+      if (vFile == null) {
+        vFile = lfs.refreshAndFindFileByIoFile(ioFile);
+      }
       if ((vFile != null) && myPartner.isExcluded(vFile)) return;
 
       if ((vFile != null) && (SvnVcs17.svnStatusIsUnversioned(status))) {
@@ -185,6 +189,7 @@ public class SvnRecursiveStatusWalker {
           processRecursively(vFile, myCurrentItem.getDepth());
         }
       } else {
+        final FilePath path = VcsUtil.getFilePath(ioFile, status.getKind().equals(SVNNodeKind.DIR));
         myReceiver.process(path, status, myCurrentItem.isIsInnerCopyRoot());
       }
     }
diff --git a/plugins/svn4idea/src/org/jetbrains/idea/svn17/commandLine/SVNLockWrapper.java b/plugins/svn4idea/src/org/jetbrains/idea/svn17/commandLine/SVNLockWrapper.java
new file mode 100644
index 000000000000..ab83dc2d2933
--- /dev/null
+++ b/plugins/svn4idea/src/org/jetbrains/idea/svn17/commandLine/SVNLockWrapper.java
@@ -0,0 +1,99 @@
+/*
+ * Copyright 2000-2012 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 org.jetbrains.idea.svn17.commandLine;
+
+import org.tmatesoft.svn.core.SVNLock;
+
+import java.util.Date;
+
+/**
+ * Created with IntelliJ IDEA.
+ * User: Irina.Chernushina
+ * Date: 2/21/12
+ * Time: 2:33 PM
+ */
+public class SVNLockWrapper {
+  private String myPath;
+  private String myID;
+  private String myOwner;
+  private String myComment;
+  private Date myCreationDate;
+  private Date myExpirationDate;
+
+  public SVNLockWrapper(String path, String ID, String owner, String comment, Date creationDate, Date expirationDate) {
+    myPath = path;
+    myID = ID;
+    myOwner = owner;
+    myComment = comment;
+    myCreationDate = creationDate;
+    myExpirationDate = expirationDate;
+  }
+
+  public SVNLockWrapper() {
+  }
+
+  public SVNLock create() {
+    return new SVNLock(myPath, myID, myOwner, myComment, myCreationDate, myExpirationDate);
+  }
+
+  public String getPath() {
+    return myPath;
+  }
+
+  public void setPath(String path) {
+    myPath = path;
+  }
+
+  public String getID() {
+    return myID;
+  }
+
+  public void setID(String ID) {
+    myID = ID;
+  }
+
+  public String getOwner() {
+    return myOwner;
+  }
+
+  public void setOwner(String owner) {
+    myOwner = owner;
+  }
+
+  public String getComment() {
+    return myComment;
+  }
+
+  public void setComment(String comment) {
+    myComment = comment;
+  }
+
+  public Date getCreationDate() {
+    return myCreationDate;
+  }
+
+  public void setCreationDate(Date creationDate) {
+    myCreationDate = creationDate;
+  }
+
+  public Date getExpirationDate() {
+    return myExpirationDate;
+  }
+
+  public void setExpirationDate(Date expirationDate) {
+    myExpirationDate = expirationDate;
+  }
+}
diff --git a/plugins/svn4idea/src/org/jetbrains/idea/svn17/commandLine/SvnCommandLineInfoClient.java b/plugins/svn4idea/src/org/jetbrains/idea/svn17/commandLine/SvnCommandLineInfoClient.java
index 48ab7367713c..b2e4f91725bf 100644
--- a/plugins/svn4idea/src/org/jetbrains/idea/svn17/commandLine/SvnCommandLineInfoClient.java
+++ b/plugins/svn4idea/src/org/jetbrains/idea/svn17/commandLine/SvnCommandLineInfoClient.java
@@ -16,6 +16,7 @@
 package org.jetbrains.idea.svn17.commandLine;
 
 import com.intellij.openapi.project.Project;
+import com.intellij.openapi.util.io.FileUtil;
 import com.intellij.openapi.util.text.StringUtil;
 import com.intellij.openapi.vcs.VcsException;
 import com.intellij.util.Consumer;
@@ -70,7 +71,12 @@ public class SvnCommandLineInfoClient extends SvnkitSvnWcClient {
                      SVNDepth depth,
                      Collection changeLists,
                      final ISVNInfoHandler handler) throws SVNException {
-    final File base = path.isDirectory() ? path : path.getParentFile();
+    File base = path.isDirectory() ? path : path.getParentFile();
+    base = correctUpToExistingParent(base);
+    if (base == null) {
+      // very unrealistic
+      throw new SVNException(SVNErrorMessage.create(SVNErrorCode.IO_ERROR), new RuntimeException("Can not find existing parent file"));
+    }
     final SvnSimpleCommand command = new SvnSimpleCommand(myProject, base, SvnCommandName.info);
 
     if (depth != null) {
@@ -128,6 +134,14 @@ public class SvnCommandLineInfoClient extends SvnkitSvnWcClient {
     }
   }
 
+  private File correctUpToExistingParent(File base) {
+    while (base != null) {
+      if (base.exists()) return base;
+      base = base.getParentFile();
+    }
+    return null;
+  }
+
   @Override
   public void doInfo(SVNURL url, SVNRevision pegRevision, SVNRevision revision, boolean recursive, ISVNInfoHandler handler)
     throws SVNException {
diff --git a/plugins/svn4idea/src/org/jetbrains/idea/svn17/commandLine/SvnCommandLineStatusClient.java b/plugins/svn4idea/src/org/jetbrains/idea/svn17/commandLine/SvnCommandLineStatusClient.java
index c99cc95fa0bc..bd2aec69a803 100644
--- a/plugins/svn4idea/src/org/jetbrains/idea/svn17/commandLine/SvnCommandLineStatusClient.java
+++ b/plugins/svn4idea/src/org/jetbrains/idea/svn17/commandLine/SvnCommandLineStatusClient.java
@@ -123,7 +123,7 @@ public class SvnCommandLineStatusClient implements SvnStatusClientI {
 
     final String[] changelistName = new String[1];
     final SvnStatusHandler[] svnHandl = new SvnStatusHandler[1];
-    svnHandl[0] = new SvnStatusHandler(new SvnStatusHandler.DataCallback() {
+    svnHandl[0] = new SvnStatusHandler(new SvnStatusHandler.ExternalDataCallback() {
       @Override
       public void switchPath() {
         final PortableStatus pending = svnHandl[0].getPending();
@@ -161,7 +161,9 @@ public class SvnCommandLineStatusClient implements SvnStatusClientI {
       // todo not synchronized wrapper stream!
       SAXParser parser = SAXParserFactory.newInstance().newSAXParser();
       parser.parse(new StringBufferInputStream(result), svnHandl[0]);
-
+      if (! svnHandl[0].isAnythingReported()) {
+        throw new SVNException(SVNErrorMessage.create(SVNErrorCode.WC_NOT_DIRECTORY));
+      }
     }
     catch (SvnExceptionWrapper e) {
       throw (SVNException) e.getCause();
diff --git a/plugins/svn4idea/src/org/jetbrains/idea/svn17/commandLine/SvnStatusHandler.java b/plugins/svn4idea/src/org/jetbrains/idea/svn17/commandLine/SvnStatusHandler.java
index 65fe6819bae3..7188681c8472 100644
--- a/plugins/svn4idea/src/org/jetbrains/idea/svn17/commandLine/SvnStatusHandler.java
+++ b/plugins/svn4idea/src/org/jetbrains/idea/svn17/commandLine/SvnStatusHandler.java
@@ -44,14 +44,17 @@ public class SvnStatusHandler extends DefaultHandler {
   private List<PortableStatus> myDefaultListStatuses;
   private MultiMap<String, PortableStatus> myCurrentListChanges;
   private PortableStatus myPending;
+  private boolean myInRemoteStatus;
+  private SVNLockWrapper myLockWrapper;
 
   private final List<ElementHandlerBase> myParseStack;
   private final Map<String, Getter<ElementHandlerBase>> myElementsMap;
   private final DataCallback myDataCallback;
   private final File myBase;
   private final StringBuilder mySb;
+  private boolean myAnythingReported;
 
-  public SvnStatusHandler(final DataCallback dataCallback, File base, final Convertor<File, SVNInfo> infoGetter) {
+  public SvnStatusHandler(final ExternalDataCallback dataCallback, File base, final Convertor<File, SVNInfo> infoGetter) {
     myBase = base;
     myParseStack = new ArrayList<ElementHandlerBase>();
     myParseStack.add(new Fake());
@@ -61,8 +64,34 @@ public class SvnStatusHandler extends DefaultHandler {
 
     if (dataCallback != null) {
       myDataCallback = new DataCallback() {
+        @Override
+        public void startLock() {
+          myLockWrapper = new SVNLockWrapper();
+        }
+
+        @Override
+        public void endLock() {
+          if (myInRemoteStatus) {
+            myPending.setRemoteLock(myLockWrapper.create());
+          } else {
+            myPending.setLocalLock(myLockWrapper.create());
+          }
+          myLockWrapper = null;
+        }
+
+        @Override
+        public void startRemoteStatus() {
+          myInRemoteStatus = true;
+        }
+
+        @Override
+        public void endRemoteStatus() {
+          myInRemoteStatus = false;
+        }
+
         @Override
         public void switchPath() {
+          myAnythingReported = true;
           dataCallback.switchPath();
           newPending(infoGetter);
         }
@@ -74,8 +103,34 @@ public class SvnStatusHandler extends DefaultHandler {
       };
     } else {
       myDataCallback = new DataCallback() {
+        @Override
+        public void startLock() {
+          myLockWrapper = new SVNLockWrapper();
+        }
+
+        @Override
+        public void endLock() {
+          if (myInRemoteStatus) {
+            myPending.setRemoteLock(myLockWrapper.create());
+          } else {
+            myPending.setLocalLock(myLockWrapper.create());
+          }
+          myLockWrapper = null;
+        }
+
+        @Override
+        public void startRemoteStatus() {
+          myInRemoteStatus = true;
+        }
+
+        @Override
+        public void endRemoteStatus() {
+          myInRemoteStatus = false;
+        }
+
         @Override
         public void switchPath() {
+          myAnythingReported = true;
           if (myChangelistName == null) {
             myDefaultListStatuses.add(myPending);
           } else {
@@ -94,6 +149,10 @@ public class SvnStatusHandler extends DefaultHandler {
     mySb = new StringBuilder();
   }
 
+  public boolean isAnythingReported() {
+    return myAnythingReported;
+  }
+
   private void newPending(final Convertor<File, SVNInfo> infoGetter) {
     final PortableStatus status = new PortableStatus();
     myPending = status;
@@ -118,6 +177,44 @@ public class SvnStatusHandler extends DefaultHandler {
   }
 
   private void fillElements() {
+    myElementsMap.put("repos-status", new Getter<ElementHandlerBase>() {
+      @Override
+      public ElementHandlerBase get() {
+        return new ReposStatus();
+      }
+    });
+    myElementsMap.put("lock", new Getter<ElementHandlerBase>() {
+      @Override
+      public ElementHandlerBase get() {
+        return new Lock();
+      }
+    });
+
+    myElementsMap.put("token", new Getter<ElementHandlerBase>() {
+      @Override
+      public ElementHandlerBase get() {
+        return new LockToken();
+      }
+    });
+    myElementsMap.put("owner", new Getter<ElementHandlerBase>() {
+      @Override
+      public ElementHandlerBase get() {
+        return new LockOwner();
+      }
+    });
+    myElementsMap.put("comment", new Getter<ElementHandlerBase>() {
+      @Override
+      public ElementHandlerBase get() {
+        return new LockComment();
+      }
+    });
+    myElementsMap.put("created", new Getter<ElementHandlerBase>() {
+      @Override
+      public ElementHandlerBase get() {
+        return new LockCreatedDate();
+      }
+    });
+// --
     myElementsMap.put("status", new Getter<ElementHandlerBase>() {
       @Override
       public ElementHandlerBase get() {
@@ -178,7 +275,7 @@ public class SvnStatusHandler extends DefaultHandler {
     assertSAX(! myParseStack.isEmpty());
     ElementHandlerBase current = myParseStack.get(myParseStack.size() - 1);
     if (mySb.length() > 0) {
-      current.characters(mySb.toString().trim(), myPending);
+      current.characters(mySb.toString().trim(), myPending, myLockWrapper);
       mySb.setLength(0);
     }
 
@@ -187,7 +284,8 @@ public class SvnStatusHandler extends DefaultHandler {
       if (createNewChild) {
         assertSAX(myElementsMap.containsKey(qName));
         final ElementHandlerBase newChild = myElementsMap.get(qName).get();
-        newChild.updateStatus(attributes, myPending);
+        newChild.preEffect(myDataCallback);
+        newChild.updateStatus(attributes, myPending, myLockWrapper);
         myParseStack.add(newChild);
         return;
       } else {
@@ -228,7 +326,7 @@ public class SvnStatusHandler extends DefaultHandler {
     }
 
     @Override
-    protected void updateStatus(Attributes attributes, PortableStatus status) throws SAXException {
+    protected void updateStatus(Attributes attributes, PortableStatus status, SVNLockWrapper lock) throws SAXException {
     }
 
     @Override
@@ -240,7 +338,7 @@ public class SvnStatusHandler extends DefaultHandler {
     }
 
     @Override
-    public void characters(String s, PortableStatus pending) {
+    public void characters(String s, PortableStatus pending, SVNLockWrapper lock) {
     }
   }
 
@@ -250,7 +348,7 @@ public class SvnStatusHandler extends DefaultHandler {
     }
 
     @Override
-    protected void updateStatus(Attributes attributes, PortableStatus status) throws SAXException {
+    protected void updateStatus(Attributes attributes, PortableStatus status, SVNLockWrapper lock) throws SAXException {
     }
 
     @Override
@@ -262,7 +360,7 @@ public class SvnStatusHandler extends DefaultHandler {
     }
 
     @Override
-    public void characters(String s, PortableStatus pending) {
+    public void characters(String s, PortableStatus pending, SVNLockWrapper lock) {
       final SVNDate date = SVNDate.parseDate(s);
       //if (SVNDate.NULL.equals(date)) return;
       pending.setRemoteDate(date);
@@ -275,7 +373,7 @@ public class SvnStatusHandler extends DefaultHandler {
     }
 
     @Override
-    protected void updateStatus(Attributes attributes, PortableStatus status) throws SAXException {
+    protected void updateStatus(Attributes attributes, PortableStatus status, SVNLockWrapper lock) throws SAXException {
     }
 
     @Override
@@ -287,7 +385,7 @@ public class SvnStatusHandler extends DefaultHandler {
     }
 
     @Override
-    public void characters(String s, PortableStatus pending) {
+    public void characters(String s, PortableStatus pending, SVNLockWrapper lock) {
       pending.setRemoteAuthor(s);
     }
   }
@@ -303,7 +401,7 @@ public class SvnStatusHandler extends DefaultHandler {
     }
 
     @Override
-    protected void updateStatus(Attributes attributes, PortableStatus status) throws SAXException {
+    protected void updateStatus(Attributes attributes, PortableStatus status, SVNLockWrapper lock) throws SAXException {
       final String revision = attributes.getValue("revision");
       if (! StringUtil.isEmptyOrSpaces(revision)) {
         try {
@@ -324,7 +422,177 @@ public class SvnStatusHandler extends DefaultHandler {
     }
 
     @Override
-    public void characters(String s, PortableStatus pending) {
+    public void characters(String s, PortableStatus pending, SVNLockWrapper lock) {
+    }
+  }
+
+  /*<lock>
+  <token>opaquelocktoken:27ee743a-5376-fc4a-a209-b7834e1a3f39</token>
+  <owner>admin</owner>
+  <comment>LLL</comment>
+  <created>2012-02-21T09:59:39.771077Z</created>
+  </lock>*/
+
+  /*<lock>
+  <token>opaquelocktoken:e21e93d2-0623-b347-bb39-900b01387555</token>
+  <owner>admin</owner>
+  <comment>787878</comment>
+  <created>2012-02-21T10:17:29.160005Z</created>
+  </lock>
+  </wc-status>
+  <repos-status
+     props="none"
+     item="none">
+  <lock>
+  <token>opaquelocktoken:e21e93d2-0623-b347-bb39-900b01387555</token>
+  <owner>admin</owner>
+  <comment>787878</comment>
+  <created>2012-02-21T10:17:29.160005Z</created>
+  </lock>
+  </repos-status>
+  </entry>*/
+
+  private static class LockCreatedDate extends ElementHandlerBase {
+    private LockCreatedDate() {
+      super(new String[]{}, new String[]{});
+    }
+
+    @Override
+    protected void updateStatus(Attributes attributes, PortableStatus status, SVNLockWrapper lock) throws SAXException {
+    }
+
+    @Override
+    public void postEffect(DataCallback callback) {
+    }
+
+    @Override
+    public void preEffect(DataCallback callback) {
+    }
+
+    @Override
+    public void characters(String s, PortableStatus pending, SVNLockWrapper lock) {
+      final SVNDate date = SVNDate.parseDate(s);
+      lock.setCreationDate(date);
+    }
+  }
+
+  private static class LockComment extends ElementHandlerBase {
+    private LockComment() {
+      super(new String[]{}, new String[]{});
+    }
+
+    @Override
+    protected void updateStatus(Attributes attributes, PortableStatus status, SVNLockWrapper lock) throws SAXException {
+    }
+
+    @Override
+    public void postEffect(DataCallback callback) {
+    }
+
+    @Override
+    public void preEffect(DataCallback callback) {
+    }
+
+    @Override
+    public void characters(String s, PortableStatus pending, SVNLockWrapper lock) {
+      lock.setComment(s);
+    }
+  }
+
+  private static class LockOwner extends ElementHandlerBase {
+    private LockOwner() {
+      super(new String[]{}, new String[]{});
+    }
+
+    @Override
+    protected void updateStatus(Attributes attributes, PortableStatus status, SVNLockWrapper lock) throws SAXException {
+    }
+
+    @Override
+    public void postEffect(DataCallback callback) {
+    }
+
+    @Override
+    public void preEffect(DataCallback callback) {
+    }
+
+    @Override
+    public void characters(String s, PortableStatus pending, SVNLockWrapper lock) {
+      lock.setOwner(s);
+    }
+  }
+
+  private static class LockToken extends ElementHandlerBase {
+    private LockToken() {
+      super(new String[]{}, new String[]{});
+    }
+
+    @Override
+    protected void updateStatus(Attributes attributes, PortableStatus status, SVNLockWrapper lock) throws SAXException {
+    }
+
+    @Override
+    public void postEffect(DataCallback callback) {
+    }
+
+    @Override
+    public void preEffect(DataCallback callback) {
+    }
+
+    @Override
+    public void characters(String s, PortableStatus pending, SVNLockWrapper lock) {
+      lock.setID(s);
+    }
+  }
+
+  private static class Lock extends ElementHandlerBase {
+    private Lock() {
+      super(new String[]{"token","owner","comment","created"}, new String[]{});
+    }
+
+    @Override
+    protected void updateStatus(Attributes attributes, PortableStatus status, SVNLockWrapper lock) throws SAXException {
+      // todo check inside-repository path
+      lock.setPath(status.getPath());
+    }
+
+    @Override
+    public void postEffect(DataCallback callback) {
+      callback.endLock();
+    }
+
+    @Override
+    public void preEffect(DataCallback callback) {
+      callback.startLock();
+    }
+
+    @Override
+    public void characters(String s, PortableStatus pending, SVNLockWrapper lock) {
+    }
+  }
+
+  private static class ReposStatus extends ElementHandlerBase {
+    private ReposStatus() {
+      super(new String[]{"lock"}, new String[]{});
+    }
+
+    @Override
+    protected void updateStatus(Attributes attributes, PortableStatus status, SVNLockWrapper lock) throws SAXException {
+      //not used now
+    }
+
+    @Override
+    public void postEffect(DataCallback callback) {
+      callback.endRemoteStatus();
+    }
+
+    @Override
+    public void preEffect(DataCallback callback) {
+      callback.startRemoteStatus();
+    }
+
+    @Override
+    public void characters(String s, PortableStatus pending, SVNLockWrapper lock) {
     }
   }
 
@@ -336,7 +604,7 @@ public class SvnStatusHandler extends DefaultHandler {
   */
   private static class WcStatus extends ElementHandlerBase {
     private WcStatus() {
-      super(new String[]{"commit"}, new String[]{});
+      super(new String[]{"commit", "lock"}, new String[]{});
     }
 
     /*<wc-status
@@ -346,7 +614,7 @@ public class SvnStatusHandler extends DefaultHandler {
        revision="120">*/
 
     @Override
-    protected void updateStatus(Attributes attributes, PortableStatus status) throws SAXException {
+    protected void updateStatus(Attributes attributes, PortableStatus status, SVNLockWrapper lock) throws SAXException {
       final String props = attributes.getValue("props");
       assertSAX(props != null);
       final SVNStatusType propertiesStatus = StatusCallbackConvertor.convert(org.apache.subversion.javahl.types.Status.Kind.valueOf(props));
@@ -394,7 +662,7 @@ public class SvnStatusHandler extends DefaultHandler {
     }
 
     @Override
-    public void characters(String s, PortableStatus pending) {
+    public void characters(String s, PortableStatus pending, SVNLockWrapper lock) {
     }
   }
 
@@ -407,12 +675,17 @@ public class SvnStatusHandler extends DefaultHandler {
     }
 
     @Override
-    protected void updateStatus(Attributes attributes, PortableStatus status) throws SAXException {
+    protected void updateStatus(Attributes attributes, PortableStatus status, SVNLockWrapper lock) throws SAXException {
       final String path = attributes.getValue("path");
       assertSAX(path != null);
       final File file = new File(myBase, path);
       status.setFile(file);
-      status.setKind(file.isDirectory() ? SVNNodeKind.DIR : SVNNodeKind.FILE);
+      final boolean exists = file.exists();
+      if (exists) {
+        status.setKind(exists, file.isDirectory() ? SVNNodeKind.DIR : SVNNodeKind.FILE);
+      } else {
+        status.setKind(exists, SVNNodeKind.UNKNOWN);
+      }
       status.setPath(path);
     }
 
@@ -426,7 +699,7 @@ public class SvnStatusHandler extends DefaultHandler {
     }
 
     @Override
-    public void characters(String s, PortableStatus pending) {
+    public void characters(String s, PortableStatus pending, SVNLockWrapper lock) {
     }
   }
 
@@ -438,7 +711,7 @@ public class SvnStatusHandler extends DefaultHandler {
     }
 
     @Override
-    protected void updateStatus(Attributes attributes, PortableStatus status) throws SAXException {
+    protected void updateStatus(Attributes attributes, PortableStatus status, SVNLockWrapper lock) throws SAXException {
       final String name = attributes.getValue("name");
       assertSAX(! StringUtil.isEmptyOrSpaces(name));
       myName = name;
@@ -454,7 +727,7 @@ public class SvnStatusHandler extends DefaultHandler {
     }
 
     @Override
-    public void characters(String s, PortableStatus pending) {
+    public void characters(String s, PortableStatus pending, SVNLockWrapper lock) {
     }
   }
 
@@ -464,7 +737,7 @@ public class SvnStatusHandler extends DefaultHandler {
     }
 
     @Override
-    protected void updateStatus(Attributes attributes, PortableStatus status) {
+    protected void updateStatus(Attributes attributes, PortableStatus status, SVNLockWrapper lock) {
     }
 
     @Override
@@ -476,7 +749,7 @@ public class SvnStatusHandler extends DefaultHandler {
     }
 
     @Override
-    public void characters(String s, PortableStatus pending) {
+    public void characters(String s, PortableStatus pending, SVNLockWrapper lock) {
     }
   }
 
@@ -486,7 +759,7 @@ public class SvnStatusHandler extends DefaultHandler {
     }
 
     @Override
-    protected void updateStatus(Attributes attributes, PortableStatus status) {
+    protected void updateStatus(Attributes attributes, PortableStatus status, SVNLockWrapper lock) {
     }
 
     @Override
@@ -498,7 +771,7 @@ public class SvnStatusHandler extends DefaultHandler {
     }
 
     @Override
-    public void characters(String s, PortableStatus pending) {
+    public void characters(String s, PortableStatus pending, SVNLockWrapper lock) {
     }
   }
 
@@ -511,7 +784,7 @@ public class SvnStatusHandler extends DefaultHandler {
       myAwaitedChildrenMultiple = new HashSet<String>(Arrays.asList(awaitedChildrenMultiple));
     }
 
-    protected abstract void updateStatus(Attributes attributes, PortableStatus status) throws SAXException;
+    protected abstract void updateStatus(Attributes attributes, PortableStatus status, SVNLockWrapper lock) throws SAXException;
     public abstract void postEffect(final DataCallback callback);
     public abstract void preEffect(final DataCallback callback);
 
@@ -522,10 +795,19 @@ public class SvnStatusHandler extends DefaultHandler {
       return myAwaitedChildren.remove(qName);
     }
 
-    public abstract void characters(String s, PortableStatus pending);
+    public abstract void characters(String s, PortableStatus pending, SVNLockWrapper lock);
   }
 
-  public interface DataCallback {
+  public interface ExternalDataCallback {
+    void switchPath();
+    void switchChangeList(final String newList);
+  }
+
+  private interface DataCallback extends ExternalDataCallback {
+    void startRemoteStatus();
+    void endRemoteStatus();
+    void startLock();
+    void endLock();
     void switchPath();
     void switchChangeList(final String newList);
   }
diff --git a/plugins/svn4idea/src/org/jetbrains/idea/svn17/history/SvnChangeList.java b/plugins/svn4idea/src/org/jetbrains/idea/svn17/history/SvnChangeList.java
index 3a12a1efa815..eba00c54ea7a 100644
--- a/plugins/svn4idea/src/org/jetbrains/idea/svn17/history/SvnChangeList.java
+++ b/plugins/svn4idea/src/org/jetbrains/idea/svn17/history/SvnChangeList.java
@@ -25,6 +25,7 @@ package org.jetbrains.idea.svn17.history;
 import com.intellij.openapi.diagnostic.Logger;
 import com.intellij.openapi.util.Comparing;
 import com.intellij.openapi.util.Pair;
+import com.intellij.openapi.util.text.StringUtil;
 import com.intellij.openapi.vcs.AbstractVcs;
 import com.intellij.openapi.vcs.FilePath;
 import com.intellij.openapi.vcs.FilePathImpl;
@@ -477,7 +478,7 @@ public class SvnChangeList implements CommittedChangeList {
     final SimpleContentRevision after = createRevisionForProperty(becameUrl, change.getAfterRevision(), filePath);
     final String beforeText = before == null ? null : before.getContent();
     final String afterText = after == null ? null : after.getContent();
-    if (Comparing.equal(beforeText, afterText)) return;
+    if (Comparing.equal(beforeText, afterText) || StringUtil.isEmptyOrSpaces(beforeText) && StringUtil.isEmptyOrSpaces(afterText)) return;
     final Change additional = new Change(before, after);
     change.addAdditionalLayerElement(SvnChangeProvider.PROPERTY_LAYER, additional);
   }
diff --git a/plugins/svn4idea/src/org/jetbrains/idea/svn17/portable/PortableStatus.java b/plugins/svn4idea/src/org/jetbrains/idea/svn17/portable/PortableStatus.java
index 59d0db10fd25..7d3a50b512e6 100644
--- a/plugins/svn4idea/src/org/jetbrains/idea/svn17/portable/PortableStatus.java
+++ b/plugins/svn4idea/src/org/jetbrains/idea/svn17/portable/PortableStatus.java
@@ -37,6 +37,7 @@ public class PortableStatus extends SVNStatus {
   private Getter<SVNInfo> myInfoGetter;
   private SVNInfo myInfo;
   private String myPath;
+  private boolean myFileExists;
 
   /**
    * Constructs an <b>SVNStatus</b> object filling it with status information
@@ -149,6 +150,16 @@ public class PortableStatus extends SVNStatus {
     return myInfo;
   }
 
+  @Override
+  public SVNNodeKind getKind() {
+    if (myFileExists) return super.getKind();
+    final SVNInfo info = initInfo();
+    if (info != null) {
+      return info.getKind();
+    }
+    return super.getKind();
+  }
+
   /**
    * Gets the temporary file that contains all latest changes from the
    * repository which led to a conflict with local changes. This file is at
@@ -260,4 +271,9 @@ public class PortableStatus extends SVNStatus {
   public String getPath() {
     return myPath;
   }
+
+  public void setKind(boolean exists, SVNNodeKind kind) {
+    myFileExists = exists;
+    setKind(kind);
+  }
 }
diff --git a/plugins/svn4idea/src/org/jetbrains/idea/svn17/update/UpdateEventHandler.java b/plugins/svn4idea/src/org/jetbrains/idea/svn17/update/UpdateEventHandler.java
index 52639ff773bb..44e71a60f19e 100644
--- a/plugins/svn4idea/src/org/jetbrains/idea/svn17/update/UpdateEventHandler.java
+++ b/plugins/svn4idea/src/org/jetbrains/idea/svn17/update/UpdateEventHandler.java
@@ -129,6 +129,9 @@ public class UpdateEventHandler implements ISVNEventHandler {
       else if (event.getContentsStatus() == SVNStatusType.UNCHANGED &&
                (event.getPropertiesStatus() == SVNStatusType.UNCHANGED || event.getPropertiesStatus() == SVNStatusType.UNKNOWN)) {
         myText2 = SvnBundle.message("progres.text2.updated", displayPath);
+      } else if (SVNStatusType.INAPPLICABLE.equals(event.getContentsStatus()) &&
+                 (event.getPropertiesStatus() == SVNStatusType.UNCHANGED || event.getPropertiesStatus() == SVNStatusType.UNKNOWN)) {
+        myText2 = SvnBundle.message("progres.text2.updated", displayPath);
       }
       else {
         myText2 = "";
diff --git a/plugins/tasks/tasks-core/src/com/intellij/tasks/actions/ActivateTaskDialog.java b/plugins/tasks/tasks-core/src/com/intellij/tasks/actions/ActivateTaskDialog.java
index d0582be7ae43..066628101f1f 100644
--- a/plugins/tasks/tasks-core/src/com/intellij/tasks/actions/ActivateTaskDialog.java
+++ b/plugins/tasks/tasks-core/src/com/intellij/tasks/actions/ActivateTaskDialog.java
@@ -320,7 +320,7 @@ public class ActivateTaskDialog extends DialogWrapper {
 
     @Override
     protected String getQuickDocHotKeyAdvertisementTail(@NotNull String shortcut) {
-      return " would show task description and comments";
+      return " task description and comments";
     }
 
     @NotNull
diff --git a/plugins/ui-designer/ui-designer-new/src/com/intellij/designer/componentTree/ComponentTree.java b/plugins/ui-designer/ui-designer-new/src/com/intellij/designer/componentTree/ComponentTree.java
index 742dc769f312..00d88adf08fa 100644
--- a/plugins/ui-designer/ui-designer-new/src/com/intellij/designer/componentTree/ComponentTree.java
+++ b/plugins/ui-designer/ui-designer-new/src/com/intellij/designer/componentTree/ComponentTree.java
@@ -15,27 +15,35 @@
  */
 package com.intellij.designer.componentTree;
 
-import com.intellij.designer.designSurface.DesignerEditorPanel;
+import com.intellij.designer.designSurface.FeedbackTreeLayer;
 import com.intellij.designer.model.RadComponent;
 import com.intellij.openapi.actionSystem.DataProvider;
 import com.intellij.ui.ColoredTreeCellRenderer;
+import com.intellij.ui.IdeBorderFactory;
+import com.intellij.ui.SideBorder;
 import com.intellij.ui.treeStructure.Tree;
 import com.intellij.util.ui.tree.TreeUtil;
 import org.jetbrains.annotations.NonNls;
+import org.jetbrains.annotations.Nullable;
 
 import javax.swing.*;
+import javax.swing.border.LineBorder;
 import javax.swing.tree.DefaultMutableTreeNode;
 import javax.swing.tree.DefaultTreeModel;
+import java.awt.*;
 
 /**
  * @author Alexander Lobas
  */
 public final class ComponentTree extends Tree implements DataProvider {
   private TreeComponentDecorator myDecorator;
+  private RadComponent myMarkComponent;
+  private int myMarkFeedback;
 
   public ComponentTree() {
     newModel();
 
+    setScrollsOnExpand(true);
     installCellRenderer();
 
     setRootVisible(false);
@@ -50,8 +58,6 @@ public final class ComponentTree extends Tree implements DataProvider {
     // TODO: Popup menu
 
     // TODO: F2 should start inplace editing
-
-    // TODO: DND
   }
 
   public void newModel() {
@@ -60,6 +66,13 @@ public final class ComponentTree extends Tree implements DataProvider {
 
   public void setDecorator(TreeComponentDecorator decorator) {
     myDecorator = decorator;
+    myMarkComponent = null;
+  }
+
+  public void mark(RadComponent component, int feedback) {
+    myMarkComponent = component;
+    myMarkFeedback = feedback;
+    repaint();
   }
 
   @Override
@@ -67,6 +80,26 @@ public final class ComponentTree extends Tree implements DataProvider {
     return null;  //TODO
   }
 
+  @Nullable
+  public RadComponent extractComponent(Object value) {
+    DefaultMutableTreeNode node = (DefaultMutableTreeNode)value;
+    Object userObject = node.getUserObject();
+
+    if (myDecorator != null && userObject instanceof TreeNodeDescriptor) {
+      TreeNodeDescriptor descriptor = (TreeNodeDescriptor)userObject;
+      Object element = descriptor.getElement();
+
+      if (element instanceof RadComponent) {
+        return (RadComponent)element;
+      }
+    }
+    return null;
+  }
+
+  public int getEdgeSize() {
+    return Math.max(5, ((JComponent)getCellRenderer()).getPreferredSize().height / 2 - 3);
+  }
+
   private void installCellRenderer() {
     setCellRenderer(new ColoredTreeCellRenderer() {
       @Override
@@ -77,16 +110,64 @@ public final class ComponentTree extends Tree implements DataProvider {
                                         boolean leaf,
                                         int row,
                                         boolean hasFocus) {
-        DefaultMutableTreeNode node = (DefaultMutableTreeNode)value;
-        if (myDecorator != null && node.getUserObject() instanceof TreeNodeDescriptor) {
-          TreeNodeDescriptor descriptor = (TreeNodeDescriptor)node.getUserObject();
-          if (descriptor.getElement() instanceof RadComponent) {
-            RadComponent component = (RadComponent)descriptor.getElement();
-            // TODO: support more parameters and attributes
-            myDecorator.decorate(component, this);
+        RadComponent component = extractComponent(value);
+        if (component != null) {
+          // TODO: support more parameters and attributes
+          myDecorator.decorate(component, this);
+
+          if (myMarkComponent == component) {
+            if (myMarkFeedback == FeedbackTreeLayer.INSERT_SELECTION) {
+              setBorder(BorderFactory.createLineBorder(Color.RED, 1));
+            }
+            else {
+              setBorder(new InsertBorder(myMarkFeedback));
+            }
+          }
+          else {
+            setBorder(BorderFactory.createEmptyBorder(1, 1, 1, 1));
           }
         }
       }
     });
   }
+
+  private static class InsertBorder extends LineBorder {
+    private final int myMode;
+
+    public InsertBorder(int mode) {
+      super(Color.BLACK, 2);
+      myMode = mode;
+    }
+
+    @Override
+    public Insets getBorderInsets(Component component) {
+      return getBorderInsets(component, new Insets(0, 0, 0, 0));
+    }
+
+    @Override
+    public Insets getBorderInsets(Component component, Insets insets) {
+      insets.top = myMode == FeedbackTreeLayer.INSERT_BEFORE ? thickness : 0;
+      insets.left = insets.right = thickness;
+      insets.bottom = myMode == FeedbackTreeLayer.INSERT_AFTER ? thickness : 0;
+      return insets;
+    }
+
+    @Override
+    public void paintBorder(Component c, Graphics g, int x, int y, int width, int height) {
+      Color oldColor = g.getColor();
+
+      g.setColor(getLineColor());
+      if (myMode == FeedbackTreeLayer.INSERT_BEFORE) {
+        g.fillRect(x, y, width, thickness);
+        g.fillRect(x, y, thickness, 2 * thickness);
+        g.fillRect(x + width - thickness, y, thickness, 2 * thickness);
+      }
+      else {
+        g.fillRect(x, y + height - thickness, width, thickness);
+        g.fillRect(x, y + height - 2 * thickness, thickness, 2 * thickness);
+        g.fillRect(x + width - thickness, y + height - 2 * thickness, thickness, 2 * thickness);
+      }
+      g.setColor(oldColor);
+    }
+  }
 }
\ No newline at end of file
diff --git a/plugins/ui-designer/ui-designer-new/src/com/intellij/designer/componentTree/ComponentTreeBuilder.java b/plugins/ui-designer/ui-designer-new/src/com/intellij/designer/componentTree/ComponentTreeBuilder.java
index c2f2c0b0bea2..16d05a471e27 100644
--- a/plugins/ui-designer/ui-designer-new/src/com/intellij/designer/componentTree/ComponentTreeBuilder.java
+++ b/plugins/ui-designer/ui-designer-new/src/com/intellij/designer/componentTree/ComponentTreeBuilder.java
@@ -18,7 +18,6 @@ package com.intellij.designer.componentTree;
 import com.intellij.designer.designSurface.ComponentSelectionListener;
 import com.intellij.designer.designSurface.DesignerEditorPanel;
 import com.intellij.designer.designSurface.EditableArea;
-import com.intellij.designer.model.RadComponent;
 import com.intellij.ide.util.treeView.AbstractTreeBuilder;
 
 import javax.swing.event.TreeSelectionEvent;
@@ -30,22 +29,31 @@ import javax.swing.tree.TreeSelectionModel;
  * @author Alexander Lobas
  */
 public final class ComponentTreeBuilder extends AbstractTreeBuilder implements ComponentSelectionListener, TreeSelectionListener {
-  private final EditableArea mySurfaceArea;
   private final TreeSelectionModel myTreeSelectionModel;
+  private final EditableArea mySurfaceArea;
+  private final TreeEditableArea myTreeArea;
+  private final TreeGlassLayer myGlassLayer;
 
   public ComponentTreeBuilder(ComponentTree tree, DesignerEditorPanel designer) {
-    super(tree, (DefaultTreeModel)tree.getModel(), new TreeContentProvider(designer), null); // TODO: comparator?
+    super(tree, (DefaultTreeModel)tree.getModel(), new TreeContentProvider(designer), null);
+
     initRootNode();
-    mySurfaceArea = designer.getSurfaceArea();
+
     myTreeSelectionModel = getTree().getSelectionModel();
+    mySurfaceArea = designer.getSurfaceArea();
+    myTreeArea = new TreeEditableArea(tree, this);
+    myGlassLayer = new TreeGlassLayer(tree, designer.getToolProvider(), myTreeArea);
+
     // TODO: restore expanded state
-    setTreeSelection();
+    select(mySurfaceArea.getSelection().toArray(), null);
+
     addListeners();
   }
 
   @Override
   public void dispose() {
     removeListeners();
+    myGlassLayer.dispose();
     super.dispose();
   }
 
@@ -74,22 +82,17 @@ public final class ComponentTreeBuilder extends AbstractTreeBuilder implements C
     handleSelection(new Runnable() {
       @Override
       public void run() {
-        queueUpdate();
-        setTreeSelection();
+        myTreeArea.setSelection(mySurfaceArea.getSelection());
       }
     });
   }
 
-  private void setTreeSelection() {
-    select(mySurfaceArea.getSelection().toArray(), null);
-  }
-
   @Override
   public void valueChanged(TreeSelectionEvent e) {
     handleSelection(new Runnable() {
       @Override
       public void run() {
-        mySurfaceArea.setSelection(getSelectedElements(RadComponent.class));
+        mySurfaceArea.setSelection(myTreeArea.getSelection());
       }
     });
   }
diff --git a/plugins/ui-designer/ui-designer-new/src/com/intellij/designer/componentTree/TreeEditOperation.java b/plugins/ui-designer/ui-designer-new/src/com/intellij/designer/componentTree/TreeEditOperation.java
new file mode 100644
index 000000000000..ecda60e3cbf6
--- /dev/null
+++ b/plugins/ui-designer/ui-designer-new/src/com/intellij/designer/componentTree/TreeEditOperation.java
@@ -0,0 +1,146 @@
+/*
+ * Copyright 2000-2012 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.designer.componentTree;
+
+import com.intellij.designer.designSurface.EditOperation;
+import com.intellij.designer.designSurface.FeedbackTreeLayer;
+import com.intellij.designer.designSurface.OperationContext;
+import com.intellij.designer.model.RadComponent;
+import org.jetbrains.annotations.Nullable;
+
+import java.awt.*;
+import java.util.Collections;
+import java.util.List;
+
+/**
+ * @author Alexander Lobas
+ */
+public abstract class TreeEditOperation implements EditOperation {
+  protected final RadComponent myHost;
+  protected final OperationContext myContext;
+  protected List<RadComponent> myComponents;
+
+  public static boolean isTarget(RadComponent host, OperationContext context) {
+    Point location = context.getLocation();
+    RadComponent target = context.getArea().findTarget(location.x, location.y, null);
+    if (target == host) {
+      FeedbackTreeLayer layer = context.getArea().getFeedbackTreeLayer();
+      return !layer.isBeforeLocation(target, location.x, location.y) &&
+             !layer.isAfterLocation(target, location.x, location.y);
+    }
+    return true;
+  }
+
+  public TreeEditOperation(RadComponent host, OperationContext context) {
+    myHost = host;
+    myContext = context;
+  }
+
+  @Override
+  public void setComponent(RadComponent component) {
+    myComponents = Collections.singletonList(component);
+  }
+
+  @Override
+  public void setComponents(List<RadComponent> components) {
+    myComponents = components;
+  }
+
+  @Override
+  public void showFeedback() {
+    Point location = myContext.getLocation();
+    RadComponent target = myContext.getArea().findTarget(location.x, location.y, null);
+    FeedbackTreeLayer layer = myContext.getArea().getFeedbackTreeLayer();
+
+    if (myHost == target) {
+      layer.mark(target, FeedbackTreeLayer.INSERT_SELECTION);
+    }
+    else if (target != null && isChildren(target)) {
+      layer.mark(target,
+                 layer.isBeforeLocation(target, location.x, location.y) ?
+                 FeedbackTreeLayer.INSERT_BEFORE : FeedbackTreeLayer.INSERT_AFTER);
+    } else {
+      eraseFeedback();
+    }
+  }
+
+  private boolean isChildren(RadComponent component) {
+    for (Object child : myHost.getTreeChildren()) {
+      if (child == component) {
+        return true;
+      }
+    }
+    return false;
+  }
+
+  @Override
+  public void eraseFeedback() {
+    myContext.getArea().getFeedbackTreeLayer().mark(null, FeedbackTreeLayer.INSERT_AFTER);
+  }
+
+  @Override
+  public boolean canExecute() {
+    RadComponent reference = getReference();
+    if (reference == null) {
+      return false;
+    }
+    return canExecute(myHost == reference ? null : reference);
+  }
+
+  protected boolean canExecute(RadComponent insertBefore) {
+    return true;
+  }
+
+  @Override
+  public void execute() throws Exception {
+    RadComponent reference = getReference();
+    execute(myHost == reference ? null : reference);
+  }
+
+  protected abstract void execute(RadComponent insertBefore) throws Exception;
+
+  @Nullable
+  private RadComponent getReference() {
+    Point location = myContext.getLocation();
+    RadComponent target = myContext.getArea().findTarget(location.x, location.y, null);
+
+    if (myHost == target) {
+      return myHost;
+    }
+    if (target != null) {
+      Object[] children = myHost.getTreeChildren();
+      int index = -1;
+
+      for (int i = 0; i < children.length; i++) {
+        if (children[i] == target) {
+          index = i + 1;
+          break;
+        }
+      }
+      if (index == -1) {
+        return null;
+      }
+      if (myContext.getArea().getFeedbackTreeLayer().isBeforeLocation(target, location.x, location.y)) {
+        return target;
+      }
+      if (index < children.length) {
+        return (RadComponent)children[index];
+      }
+      return myHost;
+    }
+    return null;
+  }
+}
\ No newline at end of file
diff --git a/plugins/ui-designer/ui-designer-new/src/com/intellij/designer/componentTree/TreeEditableArea.java b/plugins/ui-designer/ui-designer-new/src/com/intellij/designer/componentTree/TreeEditableArea.java
new file mode 100644
index 000000000000..81667c8f44b1
--- /dev/null
+++ b/plugins/ui-designer/ui-designer-new/src/com/intellij/designer/componentTree/TreeEditableArea.java
@@ -0,0 +1,213 @@
+/*
+ * Copyright 2000-2012 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.designer.componentTree;
+
+import com.intellij.designer.designSurface.*;
+import com.intellij.designer.designSurface.tools.InputTool;
+import com.intellij.designer.model.RadComponent;
+import com.intellij.ide.util.treeView.AbstractTreeBuilder;
+import org.jetbrains.annotations.NotNull;
+import org.jetbrains.annotations.Nullable;
+
+import javax.swing.*;
+import javax.swing.tree.DefaultMutableTreeNode;
+import javax.swing.tree.TreePath;
+import java.awt.*;
+import java.util.ArrayList;
+import java.util.Collection;
+import java.util.List;
+
+/**
+ * @author Alexander Lobas
+ */
+public final class TreeEditableArea implements EditableArea, FeedbackTreeLayer {
+  private final ComponentTree myTree;
+  private final AbstractTreeBuilder myTreeBuilder;
+
+  public TreeEditableArea(ComponentTree tree, AbstractTreeBuilder treeBuilder) {
+    myTree = tree;
+    myTreeBuilder = treeBuilder;
+  }
+
+  //////////////////////////////////////////////////////////////////////////////////////////
+  //
+  // Selection
+  //
+  //////////////////////////////////////////////////////////////////////////////////////////
+
+  @Override
+  public void addSelectionListener(ComponentSelectionListener listener) {
+  }
+
+  @Override
+  public void removeSelectionListener(ComponentSelectionListener listener) {
+  }
+
+  @NotNull
+  @Override
+  public List<RadComponent> getSelection() {
+    return new ArrayList<RadComponent>(getRawSelection());
+  }
+
+  @Override
+  public boolean isSelected(@NotNull RadComponent component) {
+    return getRawSelection().contains(component);
+  }
+
+  @Override
+  public void select(@NotNull RadComponent component) {
+    myTreeBuilder.queueUpdate();
+    myTreeBuilder.select(component);
+  }
+
+  @Override
+  public void deselect(@NotNull RadComponent component) {
+    Collection<RadComponent> selection = getRawSelection();
+    selection.remove(component);
+    setRawSelection(selection);
+  }
+
+  @Override
+  public void appendSelection(@NotNull RadComponent component) {
+    Collection<RadComponent> selection = getRawSelection();
+    selection.add(component);
+    setRawSelection(selection);
+  }
+
+  @Override
+  public void setSelection(@NotNull List<RadComponent> components) {
+    setRawSelection(components);
+  }
+
+  private void setRawSelection(Collection<RadComponent> components) {
+    myTreeBuilder.queueUpdate();
+    myTreeBuilder.select(components.toArray(), null);
+  }
+
+  private Collection<RadComponent> getRawSelection() {
+    return myTreeBuilder.getSelectedElements(RadComponent.class);
+  }
+
+  //////////////////////////////////////////////////////////////////////////////////////////
+  //
+  // Visual
+  //
+  //////////////////////////////////////////////////////////////////////////////////////////
+
+  @Override
+  public void setCursor(@Nullable Cursor cursor) {
+    myTree.setCursor(cursor);
+  }
+
+  @NotNull
+  @Override
+  public JComponent getNativeComponent() {
+    return myTree;
+  }
+
+  @Override
+  public RadComponent findTarget(int x, int y, @Nullable ComponentTargetFilter filter) {
+    TreePath path = myTree.getPathForLocation(x, y);
+    if (path != null) {
+      RadComponent component = myTree.extractComponent(path.getLastPathComponent());
+      if (filter != null) {
+        while (component != null) {
+          if (filter.preFilter(component) && filter.resultFilter(component)) {
+            break;
+          }
+          component = component.getParent();
+        }
+      }
+      return component;
+    }
+    return null;
+  }
+
+  @Override
+  public InputTool findTargetTool(int x, int y) {
+    return null;
+  }
+
+  @Override
+  public ComponentDecorator getRootSelectionDecorator() {
+    return null;
+  }
+
+  @Override
+  public EditOperation processRootOperation(OperationContext context) {
+    return null;
+  }
+
+  @Override
+  public FeedbackLayer getFeedbackLayer() {
+    return null;
+  }
+
+  @Override
+  public RadComponent getRootComponent() {
+    return null;
+  }
+
+  @Override
+  public boolean isTree() {
+    return true;
+  }
+
+  @Override
+  public FeedbackTreeLayer getFeedbackTreeLayer() {
+    return this;
+  }
+
+  //////////////////////////////////////////////////////////////////////////////////////////
+  //
+  // FeedbackTreeLayer
+  //
+  //////////////////////////////////////////////////////////////////////////////////////////
+
+  private TreePath getPath(RadComponent component) {
+    // TODO: I don't know better way gets tree path for element
+    return new TreePath(myTreeBuilder.getNodeForElement(component).getPath());
+  }
+
+  @Override
+  public void mark(RadComponent component, int feedback) {
+    if (component != null) {
+      TreePath path = getPath(component);
+      if (feedback == INSERT_SELECTION) {
+        myTree.scrollPathToVisible(path);
+        if (!myTree.isExpanded(path)) {
+          myTreeBuilder.expand(component, null);
+        }
+      }
+      else {
+        myTree.scrollRowToVisible(myTree.getRowForPath(path) + (feedback == INSERT_BEFORE ? -1 : 1));
+      }
+    }
+    myTree.mark(component, feedback);
+  }
+
+  @Override
+  public boolean isBeforeLocation(RadComponent component, int x, int y) {
+    Rectangle bounds = myTree.getPathBounds(getPath(component));
+    return bounds != null && y - bounds.y < myTree.getEdgeSize();
+  }
+
+  @Override
+  public boolean isAfterLocation(RadComponent component, int x, int y) {
+    Rectangle bounds = myTree.getPathBounds(getPath(component));
+    return bounds != null && bounds.getMaxY() - y < myTree.getEdgeSize();
+  }
+}
\ No newline at end of file
diff --git a/plugins/ui-designer/ui-designer-new/src/com/intellij/designer/componentTree/TreeGlassLayer.java b/plugins/ui-designer/ui-designer-new/src/com/intellij/designer/componentTree/TreeGlassLayer.java
new file mode 100644
index 000000000000..9051d05e3fa6
--- /dev/null
+++ b/plugins/ui-designer/ui-designer-new/src/com/intellij/designer/componentTree/TreeGlassLayer.java
@@ -0,0 +1,108 @@
+/*
+ * Copyright 2000-2012 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.designer.componentTree;
+
+import com.intellij.designer.designSurface.EditableArea;
+import com.intellij.designer.designSurface.tools.ToolProvider;
+
+import java.awt.event.*;
+
+/**
+ * @author Alexander Lobas
+ */
+public final class TreeGlassLayer implements KeyListener, MouseListener, MouseMotionListener {
+  private final ComponentTree myTree;
+  private final ToolProvider myToolProvider;
+  private final EditableArea myArea;
+
+  public TreeGlassLayer(ComponentTree tree, ToolProvider provider, EditableArea area) {
+    myTree = tree;
+    myToolProvider = provider;
+    myArea = area;
+
+    myTree.addKeyListener(this);
+    myTree.addMouseListener(this);
+    myTree.addMouseMotionListener(this);
+  }
+
+  public void dispose() {
+    myTree.removeKeyListener(this);
+    myTree.removeMouseListener(this);
+    myTree.removeMouseMotionListener(this);
+  }
+
+  //////////////////////////////////////////////////////////////////////////////////////////
+  //
+  // Keyboard
+  //
+  //////////////////////////////////////////////////////////////////////////////////////////
+
+  @Override
+  public void keyTyped(KeyEvent event) {
+    myToolProvider.processKeyEvent(event, myArea);
+  }
+
+  @Override
+  public void keyPressed(KeyEvent event) {
+    myToolProvider.processKeyEvent(event, myArea);
+  }
+
+  @Override
+  public void keyReleased(KeyEvent event) {
+    myToolProvider.processKeyEvent(event, myArea);
+  }
+
+  //////////////////////////////////////////////////////////////////////////////////////////
+  //
+  // Mouse
+  //
+  //////////////////////////////////////////////////////////////////////////////////////////
+
+  @Override
+  public void mouseClicked(MouseEvent event) {
+    myToolProvider.processMouseEvent(event, myArea);
+  }
+
+  @Override
+  public void mousePressed(MouseEvent event) {
+    myToolProvider.processMouseEvent(event, myArea);
+  }
+
+  @Override
+  public void mouseReleased(MouseEvent event) {
+    myToolProvider.processMouseEvent(event, myArea);
+  }
+
+  @Override
+  public void mouseEntered(MouseEvent event) {
+    myToolProvider.processMouseEvent(event, myArea);
+  }
+
+  @Override
+  public void mouseExited(MouseEvent event) {
+    myToolProvider.processMouseEvent(event, myArea);
+  }
+
+  @Override
+  public void mouseDragged(MouseEvent event) {
+    myToolProvider.processMouseEvent(event, myArea);
+  }
+
+  @Override
+  public void mouseMoved(MouseEvent event) {
+    myToolProvider.processMouseEvent(event, myArea);
+  }
+}
\ No newline at end of file
diff --git a/plugins/ui-designer/ui-designer-new/src/com/intellij/designer/designSurface/ComponentDecorator.java b/plugins/ui-designer/ui-designer-new/src/com/intellij/designer/designSurface/ComponentDecorator.java
index 82202b6b3fb9..1ac34f7f0643 100644
--- a/plugins/ui-designer/ui-designer-new/src/com/intellij/designer/designSurface/ComponentDecorator.java
+++ b/plugins/ui-designer/ui-designer-new/src/com/intellij/designer/designSurface/ComponentDecorator.java
@@ -24,9 +24,19 @@ import java.awt.*;
 /**
  * @author Alexander Lobas
  */
-public interface ComponentDecorator {
+public abstract class ComponentDecorator {
   @Nullable
-  InputTool findTargetTool(DecorationLayer layer, RadComponent component, int x, int y);
+  public abstract InputTool findTargetTool(DecorationLayer layer, RadComponent component, int x, int y);
 
-  void decorate(DecorationLayer layer, Graphics2D g, RadComponent component);
+  public void decorate(DecorationLayer layer, Graphics2D host, RadComponent component) {
+    Graphics2D child = (Graphics2D)host.create();
+    try {
+      paint(layer, child, component);
+    }
+    finally {
+      child.dispose();
+    }
+  }
+
+  protected abstract void paint(DecorationLayer layer, Graphics2D g, RadComponent component);
 }
\ No newline at end of file
diff --git a/plugins/ui-designer/ui-designer-new/src/com/intellij/designer/designSurface/ComponentEditableArea.java b/plugins/ui-designer/ui-designer-new/src/com/intellij/designer/designSurface/ComponentEditableArea.java
new file mode 100644
index 000000000000..b8a119174608
--- /dev/null
+++ b/plugins/ui-designer/ui-designer-new/src/com/intellij/designer/designSurface/ComponentEditableArea.java
@@ -0,0 +1,122 @@
+/*
+ * Copyright 2000-2012 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.designer.designSurface;
+
+import com.intellij.designer.model.RadComponent;
+import org.jetbrains.annotations.NotNull;
+import org.jetbrains.annotations.Nullable;
+
+import javax.swing.*;
+import javax.swing.event.EventListenerList;
+import java.awt.*;
+import java.util.ArrayList;
+import java.util.List;
+
+/**
+ * @author Alexander Lobas
+ */
+public abstract class ComponentEditableArea implements EditableArea {
+  private final JComponent myComponent;
+  private final EventListenerList myListenerList = new EventListenerList();
+  private List<RadComponent> mySelection = new ArrayList<RadComponent>();
+
+  public ComponentEditableArea(JComponent component) {
+    myComponent = component;
+  }
+
+  //////////////////////////////////////////////////////////////////////////////////////////
+  //
+  // Selection
+  //
+  //////////////////////////////////////////////////////////////////////////////////////////
+
+  @Override
+  public void addSelectionListener(ComponentSelectionListener listener) {
+    myListenerList.add(ComponentSelectionListener.class, listener);
+  }
+
+  @Override
+  public void removeSelectionListener(ComponentSelectionListener listener) {
+    myListenerList.remove(ComponentSelectionListener.class, listener);
+  }
+
+  protected void fireSelectionChanged() {
+    for (ComponentSelectionListener listener : myListenerList.getListeners(ComponentSelectionListener.class)) {
+      listener.selectionChanged(this);
+    }
+  }
+
+  @Override
+  @NotNull
+  public List<RadComponent> getSelection() {
+    return mySelection;
+  }
+
+  @Override
+  public boolean isSelected(@NotNull RadComponent component) {
+    return mySelection.contains(component);
+  }
+
+  @Override
+  public void select(@NotNull RadComponent component) {
+    mySelection = new ArrayList<RadComponent>();
+    mySelection.add(component);
+    fireSelectionChanged();
+  }
+
+  @Override
+  public void deselect(@NotNull RadComponent component) {
+    mySelection.remove(component);
+    fireSelectionChanged();
+  }
+
+  @Override
+  public void appendSelection(@NotNull RadComponent component) {
+    mySelection.remove(component);
+    mySelection.add(component);
+    fireSelectionChanged();
+  }
+
+  @Override
+  public void setSelection(@NotNull List<RadComponent> components) {
+    mySelection = new ArrayList<RadComponent>(components);
+    fireSelectionChanged();
+  }
+
+  //////////////////////////////////////////////////////////////////////////////////////////
+  //
+  // Visual
+  //
+  //////////////////////////////////////////////////////////////////////////////////////////
+
+  public void setCursor(@Nullable Cursor cursor) {
+    myComponent.setCursor(cursor);
+  }
+
+  @NotNull
+  public JComponent getNativeComponent() {
+    return myComponent;
+  }
+
+  public boolean isTree() {
+    return false;
+  }
+
+  @Nullable
+  public FeedbackTreeLayer getFeedbackTreeLayer() {
+    return null;
+  }
+}
diff --git a/plugins/ui-designer/ui-designer-new/src/com/intellij/designer/designSurface/DecorationLayer.java b/plugins/ui-designer/ui-designer-new/src/com/intellij/designer/designSurface/DecorationLayer.java
index db8e76a60681..3c23fa4cd134 100644
--- a/plugins/ui-designer/ui-designer-new/src/com/intellij/designer/designSurface/DecorationLayer.java
+++ b/plugins/ui-designer/ui-designer-new/src/com/intellij/designer/designSurface/DecorationLayer.java
@@ -32,11 +32,6 @@ public class DecorationLayer extends JComponent {
     myArea = area;
   }
 
-  @Override
-  public void paint(Graphics g) {
-    painSelection((Graphics2D)g);
-  }
-
   @Nullable
   public InputTool findTargetTool(int x, int y) {
     for (RadComponent component : myArea.getSelection()) {
@@ -49,12 +44,15 @@ public class DecorationLayer extends JComponent {
     return null;
   }
 
+  @Override
+  public void paint(Graphics g) {
+    painSelection((Graphics2D)g);
+  }
+
   private void painSelection(Graphics2D g) {
     for (RadComponent component : myArea.getSelection()) {
       ComponentDecorator decorator = getDecorator(component);
-      // TODO: set component clipping
       decorator.decorate(this, g, component);
-      // TODO: restore Graphics state: color, font, stroke etc.
     }
   }
 
diff --git a/plugins/ui-designer/ui-designer-new/src/com/intellij/designer/designSurface/DesignerEditorPanel.java b/plugins/ui-designer/ui-designer-new/src/com/intellij/designer/designSurface/DesignerEditorPanel.java
index de715ad37985..8c9957c9fe1f 100644
--- a/plugins/ui-designer/ui-designer-new/src/com/intellij/designer/designSurface/DesignerEditorPanel.java
+++ b/plugins/ui-designer/ui-designer-new/src/com/intellij/designer/designSurface/DesignerEditorPanel.java
@@ -93,17 +93,7 @@ public abstract class DesignerEditorPanel extends JPanel implements DataProvider
 
     myLayeredPane = new MyLayeredPane();
 
-    mySurfaceArea = new EditableArea() {
-      @Override
-      public void setCursor(Cursor cursor) {
-        myLayeredPane.setCursor(cursor);
-      }
-
-      @Override
-      public JComponent getNativeComponent() {
-        return myLayeredPane;
-      }
-
+    mySurfaceArea = new ComponentEditableArea(myLayeredPane) {
       @Override
       protected void fireSelectionChanged() {
         super.fireSelectionChanged();
@@ -191,6 +181,10 @@ public abstract class DesignerEditorPanel extends JPanel implements DataProvider
     return mySurfaceArea;
   }
 
+  public ToolProvider getToolProvider() {
+    return myToolProvider;
+  }
+
   protected abstract ComponentDecorator getRootSelectionDecorator();
 
   @Nullable
diff --git a/plugins/ui-designer/ui-designer-new/src/com/intellij/designer/designSurface/EditableArea.java b/plugins/ui-designer/ui-designer-new/src/com/intellij/designer/designSurface/EditableArea.java
index 9515b07f82c6..3028c4761867 100644
--- a/plugins/ui-designer/ui-designer-new/src/com/intellij/designer/designSurface/EditableArea.java
+++ b/plugins/ui-designer/ui-designer-new/src/com/intellij/designer/designSurface/EditableArea.java
@@ -21,104 +21,64 @@ import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;
 
 import javax.swing.*;
-import javax.swing.event.EventListenerList;
 import java.awt.*;
-import java.util.ArrayList;
-import java.util.Collection;
 import java.util.List;
 
 /**
  * @author Alexander Lobas
  */
-public abstract class EditableArea {
+public interface EditableArea {
   //////////////////////////////////////////////////////////////////////////////////////////
   //
   // Selection
   //
   //////////////////////////////////////////////////////////////////////////////////////////
 
-  private final EventListenerList myListenerList = new EventListenerList();
-  private List<RadComponent> mySelection = new ArrayList<RadComponent>();
+  void addSelectionListener(ComponentSelectionListener listener);
 
-  public void addSelectionListener(ComponentSelectionListener listener) {
-    myListenerList.add(ComponentSelectionListener.class, listener);
-  }
-
-  public void removeSelectionListener(ComponentSelectionListener listener) {
-    myListenerList.remove(ComponentSelectionListener.class, listener);
-  }
-
-  protected void fireSelectionChanged() {
-    for (ComponentSelectionListener listener : myListenerList.getListeners(ComponentSelectionListener.class)) {
-      listener.selectionChanged(this);
-    }
-  }
+  void removeSelectionListener(ComponentSelectionListener listener);
 
   @NotNull
-  public List<RadComponent> getSelection() {
-    return mySelection;
-  }
+  List<RadComponent> getSelection();
 
-  public boolean isSelected(@NotNull RadComponent component) {
-    return mySelection.contains(component);
-  }
+  boolean isSelected(@NotNull RadComponent component);
 
-  public void select(@NotNull RadComponent component) {
-    mySelection = new ArrayList<RadComponent>();
-    mySelection.add(component);
-    fireSelectionChanged();
-  }
+  void select(@NotNull RadComponent component);
 
-  public void deselect(@NotNull RadComponent component) {
-    mySelection.remove(component);
-    fireSelectionChanged();
-  }
+  void deselect(@NotNull RadComponent component);
 
-  public void appendSelection(@NotNull RadComponent component) {
-    mySelection.remove(component);
-    mySelection.add(component);
-    fireSelectionChanged();
-  }
+  void appendSelection(@NotNull RadComponent component);
 
-  public void setSelection(@NotNull Collection<RadComponent> components) {
-    mySelection = new ArrayList<RadComponent>(components);
-    fireSelectionChanged();
-  }
+  void setSelection(@NotNull List<RadComponent> components);
 
   //////////////////////////////////////////////////////////////////////////////////////////
   //
-  //
+  // Visual
   //
   //////////////////////////////////////////////////////////////////////////////////////////
 
-  public abstract void setCursor(@Nullable Cursor cursor);
+  void setCursor(@Nullable Cursor cursor);
 
   @NotNull
-  public abstract JComponent getNativeComponent();
+  JComponent getNativeComponent();
 
   @Nullable
-  public abstract RadComponent findTarget(int x, int y, @Nullable ComponentTargetFilter filter);
+  RadComponent findTarget(int x, int y, @Nullable ComponentTargetFilter filter);
 
   @Nullable
-  public abstract InputTool findTargetTool(int x, int y);
+  InputTool findTargetTool(int x, int y);
 
-  public abstract ComponentDecorator getRootSelectionDecorator();
+  ComponentDecorator getRootSelectionDecorator();
 
   @Nullable
-  public EditOperation processRootOperation(OperationContext context) {
-    return null;
-  }
+  EditOperation processRootOperation(OperationContext context);
 
-  public abstract FeedbackLayer getFeedbackLayer();
+  FeedbackLayer getFeedbackLayer();
 
-  public abstract RadComponent getRootComponent();
+  RadComponent getRootComponent();
 
-  public boolean isTree() {
-    return false;
-  }
+  boolean isTree();
 
   @Nullable
-  public FeedbackTreeLayer getFeedbackTreeLayer() {
-    return null;
-  }
+  FeedbackTreeLayer getFeedbackTreeLayer();
 }
\ No newline at end of file
diff --git a/plugins/ui-designer/ui-designer-new/src/com/intellij/designer/designSurface/FeedbackTreeLayer.java b/plugins/ui-designer/ui-designer-new/src/com/intellij/designer/designSurface/FeedbackTreeLayer.java
index 2c3bf8b39dd3..14e63a55d890 100644
--- a/plugins/ui-designer/ui-designer-new/src/com/intellij/designer/designSurface/FeedbackTreeLayer.java
+++ b/plugins/ui-designer/ui-designer-new/src/com/intellij/designer/designSurface/FeedbackTreeLayer.java
@@ -15,8 +15,20 @@
  */
 package com.intellij.designer.designSurface;
 
+import com.intellij.designer.model.RadComponent;
+import org.jetbrains.annotations.Nullable;
+
 /**
  * @author Alexander Lobas
  */
 public interface FeedbackTreeLayer {
+  int INSERT_BEFORE = 0;
+  int INSERT_AFTER = 1;
+  int INSERT_SELECTION = 2;
+
+  void mark(RadComponent component, int feedback);
+
+  boolean isBeforeLocation(RadComponent component, int x, int y);
+
+  boolean isAfterLocation(RadComponent component, int x, int y);
 }
\ No newline at end of file
diff --git a/plugins/ui-designer/ui-designer-new/src/com/intellij/designer/designSurface/GlassLayer.java b/plugins/ui-designer/ui-designer-new/src/com/intellij/designer/designSurface/GlassLayer.java
index 7ecae96e4059..e2263af6d68e 100644
--- a/plugins/ui-designer/ui-designer-new/src/com/intellij/designer/designSurface/GlassLayer.java
+++ b/plugins/ui-designer/ui-designer-new/src/com/intellij/designer/designSurface/GlassLayer.java
@@ -15,7 +15,6 @@
  */
 package com.intellij.designer.designSurface;
 
-import com.intellij.designer.designSurface.tools.InputTool;
 import com.intellij.designer.designSurface.tools.ToolProvider;
 import com.intellij.openapi.actionSystem.DataProvider;
 import com.intellij.ui.popup.PopupOwner;
@@ -37,31 +36,12 @@ public final class GlassLayer extends JComponent implements PopupOwner, DataProv
     myToolProvider = provider;
     myArea = area;
     enableEvents(AWTEvent.KEY_EVENT_MASK | AWTEvent.MOUSE_EVENT_MASK | AWTEvent.MOUSE_MOTION_EVENT_MASK);
-    // TODO: DND
   }
 
   @Override
   protected void processKeyEvent(KeyEvent event) {
-    try {
-      InputTool tool = myToolProvider.getActiveTool();
+    myToolProvider.processKeyEvent(event, myArea);
 
-      if (tool != null) {
-        switch (event.getID()) {
-          case KeyEvent.KEY_PRESSED:
-            tool.keyPressed(event, myArea);
-            break;
-          case KeyEvent.KEY_TYPED:
-            tool.keyTyped(event, myArea);
-            break;
-          case KeyEvent.KEY_RELEASED:
-            tool.keyReleased(event, myArea);
-            break;
-        }
-      }
-    }
-    catch (Throwable e) {
-      handleException(e);
-    }
     if (!event.isConsumed()) {
       super.processKeyEvent(event);
     }
@@ -72,59 +52,13 @@ public final class GlassLayer extends JComponent implements PopupOwner, DataProv
     if (event.getID() == MouseEvent.MOUSE_PRESSED) {
       requestFocusInWindow();
     }
-    try {
-      InputTool tool = myToolProvider.getActiveTool();
 
-      if (tool != null) {
-        switch (event.getID()) {
-          case MouseEvent.MOUSE_PRESSED:
-            tool.mouseDown(event, myArea);
-            break;
-          case MouseEvent.MOUSE_RELEASED:
-            tool.mouseUp(event, myArea);
-            break;
-          case MouseEvent.MOUSE_ENTERED:
-            tool.mouseEntered(event, myArea);
-            break;
-          case MouseEvent.MOUSE_EXITED:
-            tool.mouseExited(event, myArea);
-            break;
-          case MouseEvent.MOUSE_CLICKED:
-            if (event.getClickCount() == 2) {
-              tool.mouseDoubleClick(event, myArea);
-            }
-            break;
-        }
-      }
-    }
-    catch (Throwable e) {
-      handleException(e);
-    }
+    myToolProvider.processMouseEvent(event, myArea);
   }
 
   @Override
   protected void processMouseMotionEvent(MouseEvent event) {
-    try {
-      InputTool tool = myToolProvider.getActiveTool();
-
-      if (tool != null) {
-        switch (event.getID()) {
-          case MouseEvent.MOUSE_MOVED:
-            tool.mouseMove(event, myArea);
-            break;
-          case MouseEvent.MOUSE_DRAGGED:
-            tool.mouseDrag(event, myArea);
-            break;
-        }
-      }
-    }
-    catch (Throwable e) {
-      handleException(e);
-    }
-  }
-
-  private void handleException(Throwable e) {
-    myToolProvider.showError("Edit error: ", e);
+    myToolProvider.processMouseEvent(event, myArea);
   }
 
   @Override
diff --git a/plugins/ui-designer/ui-designer-new/src/com/intellij/designer/designSurface/selection/NonResizeSelectionDecorator.java b/plugins/ui-designer/ui-designer-new/src/com/intellij/designer/designSurface/selection/NonResizeSelectionDecorator.java
index 73cb484afab0..caa46f272517 100644
--- a/plugins/ui-designer/ui-designer-new/src/com/intellij/designer/designSurface/selection/NonResizeSelectionDecorator.java
+++ b/plugins/ui-designer/ui-designer-new/src/com/intellij/designer/designSurface/selection/NonResizeSelectionDecorator.java
@@ -26,7 +26,7 @@ import java.awt.*;
 /**
  * @author Alexander Lobas
  */
-public class NonResizeSelectionDecorator implements ComponentDecorator {
+public class NonResizeSelectionDecorator extends ComponentDecorator {
   private final Color myColor;
   private final int myLineWidth;
 
@@ -53,7 +53,7 @@ public class NonResizeSelectionDecorator implements ComponentDecorator {
   }
 
   @Override
-  public void decorate(DecorationLayer layer, Graphics2D g, RadComponent component) {
+  protected void paint(DecorationLayer layer, Graphics2D g, RadComponent component) {
     g.setColor(myColor);
     if (myLineWidth > 1) {
       g.setStroke(new BasicStroke(myLineWidth));
diff --git a/plugins/ui-designer/ui-designer-new/src/com/intellij/designer/designSurface/selection/ResizePoint.java b/plugins/ui-designer/ui-designer-new/src/com/intellij/designer/designSurface/selection/ResizePoint.java
index e71cb1b1d334..9bc50ad7a3cd 100644
--- a/plugins/ui-designer/ui-designer-new/src/com/intellij/designer/designSurface/selection/ResizePoint.java
+++ b/plugins/ui-designer/ui-designer-new/src/com/intellij/designer/designSurface/selection/ResizePoint.java
@@ -25,7 +25,7 @@ import java.awt.*;
 /**
  * @author Alexander Lobas
  */
-public abstract class ResizePoint implements ComponentDecorator {
+public abstract class ResizePoint extends ComponentDecorator {
   private static final int DEFAULT_SIZE = 5;
   private final Color myColor;
   private final Color myBorder;
@@ -52,7 +52,7 @@ public abstract class ResizePoint implements ComponentDecorator {
   }
 
   @Override
-  public void decorate(DecorationLayer layer, Graphics2D g, RadComponent component) {
+  protected void paint(DecorationLayer layer, Graphics2D g, RadComponent component) {
     Point location = getLocation(layer, component);
 
     g.setColor(myColor);
diff --git a/plugins/ui-designer/ui-designer-new/src/com/intellij/designer/designSurface/selection/ResizeSelectionDecorator.java b/plugins/ui-designer/ui-designer-new/src/com/intellij/designer/designSurface/selection/ResizeSelectionDecorator.java
index 941e10279109..8de6308c973f 100644
--- a/plugins/ui-designer/ui-designer-new/src/com/intellij/designer/designSurface/selection/ResizeSelectionDecorator.java
+++ b/plugins/ui-designer/ui-designer-new/src/com/intellij/designer/designSurface/selection/ResizeSelectionDecorator.java
@@ -15,6 +15,7 @@
  */
 package com.intellij.designer.designSurface.selection;
 
+import com.intellij.designer.designSurface.ComponentDecorator;
 import com.intellij.designer.designSurface.DecorationLayer;
 import com.intellij.designer.designSurface.tools.InputTool;
 import com.intellij.designer.model.RadComponent;
diff --git a/plugins/ui-designer/ui-designer-new/src/com/intellij/designer/designSurface/tools/SelectionTracker.java b/plugins/ui-designer/ui-designer-new/src/com/intellij/designer/designSurface/tools/SelectionTracker.java
index ba1d92b4b3fc..66583f680e88 100644
--- a/plugins/ui-designer/ui-designer-new/src/com/intellij/designer/designSurface/tools/SelectionTracker.java
+++ b/plugins/ui-designer/ui-designer-new/src/com/intellij/designer/designSurface/tools/SelectionTracker.java
@@ -75,7 +75,7 @@ public class SelectionTracker extends TargetingTool {
   }
 
   private void performSelection() {
-    if (mySelected) {
+    if (mySelected || myArea.isTree()) {
       return;
     }
     mySelected = true;
diff --git a/plugins/ui-designer/ui-designer-new/src/com/intellij/designer/designSurface/tools/ToolProvider.java b/plugins/ui-designer/ui-designer-new/src/com/intellij/designer/designSurface/tools/ToolProvider.java
index cb2c190224a6..d8a5012ae174 100644
--- a/plugins/ui-designer/ui-designer-new/src/com/intellij/designer/designSurface/tools/ToolProvider.java
+++ b/plugins/ui-designer/ui-designer-new/src/com/intellij/designer/designSurface/tools/ToolProvider.java
@@ -19,6 +19,7 @@ import com.intellij.designer.designSurface.EditableArea;
 import org.jetbrains.annotations.NonNls;
 import org.jetbrains.annotations.Nullable;
 
+import java.awt.event.KeyEvent;
 import java.awt.event.MouseEvent;
 
 /**
@@ -29,6 +30,72 @@ public abstract class ToolProvider {
   private EditableArea myArea;
   private MouseEvent myEvent;
 
+  public void processKeyEvent(KeyEvent event, EditableArea area) {
+    if (myTool != null) {
+      try {
+        switch (event.getID()) {
+          case KeyEvent.KEY_PRESSED:
+            myTool.keyPressed(event, area);
+            break;
+          case KeyEvent.KEY_TYPED:
+            myTool.keyTyped(event, area);
+            break;
+          case KeyEvent.KEY_RELEASED:
+            myTool.keyReleased(event, area);
+            break;
+        }
+      }
+      catch (Throwable e) {
+        showError("Edit error: ", e);
+      }
+    }
+  }
+
+  public void processMouseEvent(MouseEvent event, EditableArea area) {
+    if (myTool != null) {
+      try {
+        switch (event.getID()) {
+          case MouseEvent.MOUSE_PRESSED:
+            myTool.mouseDown(event, area);
+            break;
+          case MouseEvent.MOUSE_RELEASED:
+            myTool.mouseUp(event, area);
+            break;
+          case MouseEvent.MOUSE_ENTERED:
+            myTool.mouseEntered(event, area);
+            break;
+          case MouseEvent.MOUSE_EXITED:
+            myTool.mouseExited(event, area);
+            break;
+          case MouseEvent.MOUSE_CLICKED:
+            if (event.getClickCount() == 2) {
+              myTool.mouseDoubleClick(event, area);
+            }
+            break;
+          case MouseEvent.MOUSE_MOVED:
+            myTool.mouseMove(event, area);
+            break;
+          case MouseEvent.MOUSE_DRAGGED:
+            myTool.mouseDrag(event, area);
+            break;
+        }
+      }
+      catch (Throwable e) {
+        showError("Edit error: ", e);
+      }
+    }
+  }
+
+  public void setEvent(MouseEvent event) {
+    myEvent = event;
+  }
+
+  public void setArea(@Nullable EditableArea area) {
+    myArea = area;
+  }
+
+  public abstract void showError(@NonNls String message, Throwable e);
+
   public InputTool getActiveTool() {
     return myTool;
   }
@@ -59,14 +126,4 @@ public abstract class ToolProvider {
   }
 
   public abstract void loadDefaultTool();
-
-  public void setArea(@Nullable EditableArea area) {
-    myArea = area;
-  }
-
-  public void setEvent(MouseEvent event) {
-    myEvent = event;
-  }
-
-  public abstract void showError(@NonNls String message, Throwable e);
 }
\ No newline at end of file