diff --git a/.idea/inspectionProfiles/idea_default.xml b/.idea/inspectionProfiles/idea_default.xml
index 89047b57a1b8..601c646f88da 100644
--- a/.idea/inspectionProfiles/idea_default.xml
+++ b/.idea/inspectionProfiles/idea_default.xml
@@ -565,6 +565,7 @@
     </inspection_tool>
     <inspection_tool class="UnnecessaryBoxing" enabled="false" level="WARNING" enabled_by_default="false" />
     <inspection_tool class="UnnecessaryContinueJS" enabled="false" level="WARNING" enabled_by_default="false" />
+    <inspection_tool class="UnnecessaryEnumModifier" enabled="true" level="WARNING" enabled_by_default="true" />
     <inspection_tool class="UnnecessaryFullyQualifiedName" enabled="true" level="WARNING" enabled_by_default="true">
       <scope name="IDEA Test Sources" level="WARNING" enabled="false">
         <option name="m_ignoreJavadoc" value="false" />
diff --git a/.idea/inspectionProfiles/idea_default_no_spellchecker.xml b/.idea/inspectionProfiles/idea_default_no_spellchecker.xml
index b86ca5504888..56f031f9b6e3 100644
--- a/.idea/inspectionProfiles/idea_default_no_spellchecker.xml
+++ b/.idea/inspectionProfiles/idea_default_no_spellchecker.xml
@@ -767,6 +767,7 @@
     </inspection_tool>
     <inspection_tool class="UnnecessaryBoxing" enabled="false" level="WARNING" enabled_by_default="false" />
     <inspection_tool class="UnnecessaryContinueJS" enabled="false" level="WARNING" enabled_by_default="false" />
+    <inspection_tool class="UnnecessaryEnumModifier" enabled="true" level="WARNING" enabled_by_default="true" />
     <inspection_tool class="UnnecessaryFullyQualifiedName" enabled="true" level="WARNING" enabled_by_default="true">
       <scope name="IDEA Test Sources" level="WARNING" enabled="false">
         <option name="m_ignoreJavadoc" value="false" />
diff --git a/java/debugger/impl/src/com/intellij/debugger/ui/breakpoints/BreakpointChooser.java b/java/debugger/impl/src/com/intellij/debugger/ui/breakpoints/BreakpointChooser.java
new file mode 100644
index 000000000000..3eaf0476498e
--- /dev/null
+++ b/java/debugger/impl/src/com/intellij/debugger/ui/breakpoints/BreakpointChooser.java
@@ -0,0 +1,223 @@
+/*
+ * 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.debugger.ui.breakpoints;
+
+import com.intellij.debugger.DebuggerBundle;
+import com.intellij.openapi.actionSystem.*;
+import com.intellij.openapi.actionSystem.ex.ComboBoxAction;
+import com.intellij.openapi.editor.Editor;
+import com.intellij.openapi.project.Project;
+import com.intellij.openapi.ui.popup.JBPopup;
+import com.intellij.openapi.ui.popup.JBPopupListener;
+import com.intellij.openapi.ui.popup.LightweightWindowEvent;
+import com.intellij.openapi.util.Key;
+import com.intellij.ui.popup.util.DetailView;
+import com.intellij.xdebugger.breakpoints.ui.BreakpointItem;
+import com.intellij.xdebugger.impl.breakpoints.ui.tree.BreakpointMasterDetailPopupBuilder;
+import org.jetbrains.annotations.NotNull;
+import org.jetbrains.annotations.Nullable;
+
+import javax.swing.*;
+import java.util.Collection;
+
+public class BreakpointChooser {
+  private Project myProject;
+
+  private DetailView myDetailView;
+
+  private ActionToolbar myActionToolbar;
+  private BreakpointItem myBreakpointItem;
+
+  private Delegate myDelegate;
+  private final ComboBoxAction myComboBoxAction;
+  private BreakpointMasterDetailPopupBuilder myPopupBuilder;
+
+  private Object mySelectedBreakpoint;
+
+  public void setDetailView(DetailView detailView) {
+    myDetailView = detailView;
+  }
+
+  public Object getSelectedBreakpoint() {
+    return mySelectedBreakpoint;
+  }
+
+  public BreakpointItem getBreakpointItem() {
+    return myBreakpointItem;
+  }
+
+  public void setSelectedBreakpoint(Object selectedBreakpoint) {
+    mySelectedBreakpoint = selectedBreakpoint;
+    myBreakpointItem = selectedBreakpoint != null ? new JavaBreakpointItem(null, (Breakpoint)selectedBreakpoint) : null;
+  updatePresentation(myComboBoxAction.getTemplatePresentation(), myBreakpointItem);
+    myActionToolbar.getComponent().repaint();
+  }
+
+  private void pop(DetailView.PreviewEditorState pushed) {
+    if (pushed.getFile() != null) {
+      myDetailView
+        .navigateInPreviewEditor(
+          new DetailView.PreviewEditorState(pushed.getFile(), pushed.getNavigate(), pushed.getAttributes()));
+    }
+    else {
+      myDetailView.clearEditor();
+    }
+  }
+  public interface Delegate {
+    void breakpointChosen(Project project, BreakpointItem breakpointItem, JBPopup popup);
+  }
+
+  public BreakpointChooser(Project project, Delegate delegate) {
+    myProject = project;
+    myDelegate = delegate;
+
+    myPopupBuilder = new BreakpointMasterDetailPopupBuilder(myProject);
+    myPopupBuilder.setPlainView(true);
+
+    myComboBoxAction = new ComboBoxAction() {
+
+      @Override
+      public void update(AnActionEvent e) {
+        final Presentation presentation = e.getPresentation();
+        updatePresentation(presentation, BreakpointChooser.this.myBreakpointItem);
+      }
+
+      @Override
+      protected ComboBoxButton createComboBoxButton(final Presentation presentation) {
+        return new ComboBoxButton(presentation) {
+          @Override
+          protected JBPopup createPopup(final Runnable onDispose) {
+            final DetailView.PreviewEditorState pushed = myDetailView.getEditorState();
+            myPopupBuilder.setIsViewer(true);
+            myPopupBuilder.setAddDetailViewToEast(false);
+            myPopupBuilder.setDetailView(new MyDetailView(pushed));
+            myPopupBuilder.setCallback(new BreakpointMasterDetailPopupBuilder.BreakpointChosenCallback() {
+              @Override
+              public void breakpointChosen(Project project, BreakpointItem breakpointItem, JBPopup popup) {
+                popup.cancel();
+                myBreakpointItem = breakpointItem;
+                mySelectedBreakpoint = breakpointItem.getBreakpoint();
+                updatePresentation(myComboBoxAction.getTemplatePresentation(), myBreakpointItem);
+                updatePresentation(presentation, myBreakpointItem);
+
+                if (myDelegate != null) {
+                  myDelegate.breakpointChosen(project, breakpointItem, popup);
+                }
+              }
+            });
+            myPopupBuilder.setIsViewer(true);
+            JBPopup popup = myPopupBuilder.createPopup();
+            popup.addListener(new JBPopupListener() {
+              @Override
+              public void beforeShown(LightweightWindowEvent event) {
+                //To change body of implemented methods use File | Settings | File Templates.
+              }
+
+              @Override
+              public void onClosed(LightweightWindowEvent event) {
+                onDispose.run();
+                pop(pushed);
+              }
+            });
+            return popup;
+          }
+
+
+        };
+      }
+
+      @NotNull
+      @Override
+      protected DefaultActionGroup createPopupActionGroup(JComponent button) {
+        assert false : "should not be here";
+        return null;
+      }
+    };
+
+    myActionToolbar = ActionManager.getInstance().createActionToolbar("asdad", new DefaultActionGroup(myComboBoxAction), true);
+
+  }
+
+  public void setBreakpointItems(Collection<BreakpointItem> items) {
+    myPopupBuilder.setBreakpointItems(items);
+  }
+
+  private void updatePresentation(Presentation presentation, BreakpointItem breakpointItem) {
+    if (breakpointItem != null) {
+      presentation.setIcon(breakpointItem.getIcon());
+      presentation.setText(breakpointItem.getDisplayText());
+    }
+    else {
+      presentation.setText(DebuggerBundle.message("value.none"));
+    }
+
+  }
+
+  public JComponent getComponent() {
+    return myActionToolbar.getComponent();
+  }
+
+  private class MyDetailView implements DetailView {
+
+    private final PreviewEditorState myPushed;
+
+    public MyDetailView(PreviewEditorState pushed) {
+      myPushed = pushed;
+    }
+
+    @Override
+    public Editor getEditor() {
+      return myDetailView.getEditor();
+    }
+
+    @Override
+    public void navigateInPreviewEditor(PreviewEditorState editorState) {
+      if (myDetailView != null) {
+        myDetailView.navigateInPreviewEditor(editorState);
+      }
+    }
+
+    @Override
+    public JPanel getDetailPanel() {
+      return null;  //To change body of implemented methods use File | Settings | File Templates.
+    }
+
+    @Override
+    public void setDetailPanel(@Nullable JPanel panel) {
+      //To change body of implemented methods use File | Settings | File Templates.
+    }
+
+    @Override
+    public void clearEditor() {
+      pop(myPushed);
+    }
+
+    @Override
+    public PreviewEditorState getEditorState() {
+      return myDetailView.getEditorState();
+    }
+
+    @Override
+    public <T> T getUserData(@NotNull Key<T> key) {
+      return myDetailView.getUserData(key);
+    }
+
+    @Override
+    public <T> void putUserData(@NotNull Key<T> key, @Nullable T value) {
+      myDetailView.putUserData(key, value);
+    }
+  }
+}
diff --git a/java/debugger/impl/src/com/intellij/debugger/ui/breakpoints/BreakpointPropertiesPanel.java b/java/debugger/impl/src/com/intellij/debugger/ui/breakpoints/BreakpointPropertiesPanel.java
index 9dea6960a3ac..ce2bc0a5a938 100644
--- a/java/debugger/impl/src/com/intellij/debugger/ui/breakpoints/BreakpointPropertiesPanel.java
+++ b/java/debugger/impl/src/com/intellij/debugger/ui/breakpoints/BreakpointPropertiesPanel.java
@@ -20,7 +20,6 @@
  */
 package com.intellij.debugger.ui.breakpoints;
 
-import com.intellij.debugger.DebuggerBundle;
 import com.intellij.debugger.DebuggerManagerEx;
 import com.intellij.debugger.InstanceFilter;
 import com.intellij.debugger.engine.evaluation.CodeFragmentKind;
@@ -30,12 +29,12 @@ import com.intellij.debugger.settings.DebuggerSettings;
 import com.intellij.debugger.ui.CompletionEditor;
 import com.intellij.debugger.ui.DebuggerExpressionComboBox;
 import com.intellij.debugger.ui.DebuggerStatementEditor;
-import com.intellij.ui.ListCellRendererWrapper;
+import com.intellij.debugger.ui.JavaDebuggerSupport;
 import com.intellij.ide.util.ClassFilter;
 import com.intellij.openapi.project.Project;
-import com.intellij.openapi.ui.ComboBox;
 import com.intellij.openapi.ui.DialogWrapper;
 import com.intellij.openapi.ui.FixedSizeButton;
+import com.intellij.openapi.ui.popup.JBPopup;
 import com.intellij.openapi.util.Key;
 import com.intellij.openapi.util.text.StringUtil;
 import com.intellij.openapi.wm.IdeFocusManager;
@@ -44,7 +43,10 @@ import com.intellij.psi.PsiElement;
 import com.intellij.ui.FieldPanel;
 import com.intellij.ui.MultiLineTooltipUI;
 import com.intellij.ui.components.JBCheckBox;
+import com.intellij.ui.popup.util.DetailView;
 import com.intellij.util.IJSwingUtilities;
+import com.intellij.xdebugger.breakpoints.ui.BreakpointItem;
+import com.intellij.xdebugger.impl.DebuggerSupport;
 import com.intellij.xdebugger.impl.ui.DebuggerUIUtil;
 import org.jetbrains.annotations.NonNls;
 import org.jetbrains.annotations.NotNull;
@@ -58,6 +60,16 @@ import java.util.Iterator;
 import java.util.List;
 
 public abstract class BreakpointPropertiesPanel {
+
+  private final BreakpointChooser myMasterBreakpointChooser;
+
+  public void setDetailView(DetailView detailView) {
+    myDetailView = detailView;
+    myMasterBreakpointChooser.setDetailView(detailView);
+  }
+
+  private DetailView myDetailView;
+
   protected final Project myProject;
   private final Key<? extends Breakpoint> myBreakpointCategory;
   private boolean myCompact;
@@ -104,7 +116,6 @@ public abstract class BreakpointPropertiesPanel {
 
   ButtonGroup mySuspendPolicyGroup;
   @NonNls public static final String CONTROL_LOG_MESSAGE = "logMessage";
-  private BreakpointComboboxHandler myBreakpointComboboxHandler;
   private static final int MAX_COMBO_WIDTH = 300;
   private final FixedSizeButton myConditionMagnifierButton;
   private boolean myMoreOptionsVisible = true;
@@ -139,6 +150,10 @@ public abstract class BreakpointPropertiesPanel {
     };
   }
 
+  public DetailView getDetailView() {
+    return myDetailView;
+  }
+
   public interface Delegate {
 
     void showActionsPanel();
@@ -153,10 +168,6 @@ public abstract class BreakpointPropertiesPanel {
   }
 
   public void dispose() {
-    if (myBreakpointComboboxHandler != null) {
-      myBreakpointComboboxHandler.dispose();
-      myBreakpointComboboxHandler = null;
-    }
     if (myConditionCombo != null) {
       myConditionCombo.dispose();
     }
@@ -212,7 +223,7 @@ public abstract class BreakpointPropertiesPanel {
     panel.add(component, BorderLayout.CENTER);
   }
 
-  public BreakpointPropertiesPanel(Project project, final Key<? extends Breakpoint> breakpointCategory, boolean compact) {
+  public BreakpointPropertiesPanel(final Project project, final Key<? extends Breakpoint> breakpointCategory, boolean compact) {
     myProject = project;
     myBreakpointCategory = breakpointCategory;
     myCompact = compact;
@@ -226,7 +237,7 @@ public abstract class BreakpointPropertiesPanel {
       public void itemStateChanged(final ItemEvent e) {
         if (e.getStateChange() == ItemEvent.SELECTED) {
           final String defaultPolicy =
-              DebuggerManagerEx.getInstanceEx(myProject).getBreakpointManager().getDefaultSuspendPolicy(breakpointCategory);
+              getBreakpointManager(myProject).getDefaultSuspendPolicy(breakpointCategory);
           myMakeDefaultButton.setEnabled(!defaultPolicy.equals(getSelectedSuspendPolicy()));                 
         }
       }
@@ -247,7 +258,7 @@ public abstract class BreakpointPropertiesPanel {
 
     myMakeDefaultButton.addActionListener(new ActionListener() {
       public void actionPerformed(final ActionEvent e) {
-        final BreakpointManager breakpointManager = DebuggerManagerEx.getInstanceEx(myProject).getBreakpointManager();
+        final BreakpointManager breakpointManager = getBreakpointManager(myProject);
         final String suspendPolicy = getSelectedSuspendPolicy();
         breakpointManager.setDefaultSuspendPolicy(breakpointCategory, suspendPolicy);
         updateSuspendPolicyRbFont();
@@ -272,20 +283,25 @@ public abstract class BreakpointPropertiesPanel {
     }
 
     myLogExpressionCombo = new DebuggerExpressionComboBox(project, "LineBreakpoint logMessage");
-    
-    final ComboBox baseBreakpointCombo = new ComboBox(100);
 
-    myBreakpointComboboxHandler = new BreakpointComboboxHandler(myProject, baseBreakpointCombo);
-    baseBreakpointCombo.setRenderer(new BreakpointComboRenderer(baseBreakpointCombo.getRenderer()));
-    baseBreakpointCombo.addItemListener(new ItemListener() {
-      public void itemStateChanged(final ItemEvent e) {
-        ComboboxItem item = (ComboboxItem)baseBreakpointCombo.getSelectedItem();
+    myMasterBreakpointChooser = new BreakpointChooser(project, new BreakpointChooser.Delegate() {
+      @Override
+      public void breakpointChosen(Project project, BreakpointItem item, JBPopup popup) {
         final boolean enabled = item != null && item.getBreakpoint() != null;
         myLeaveEnabledRadioButton.setEnabled(enabled);
         myDisableAgainRadio.setEnabled(enabled);
         myEnableOrDisableLabel.setEnabled(enabled);
+
+        if (item != null) {
+
+          saveMasterBreakpoint();
+        }
+
+        updateMasterBreakpointPanel(findMasterBreakpointRule());
+
       }
     });
+
     myInstanceFiltersField = new FieldPanel(new MyTextField(), "", null,
      new ActionListener() {
       public void actionPerformed(ActionEvent e) {
@@ -341,7 +357,8 @@ public abstract class BreakpointPropertiesPanel {
 
     insert(myConditionComboPanel, conditionPanel);
     insert(myLogExpressionComboPanel, myLogExpressionCombo);
-    insert(myDependentBreakpointComboPanel, baseBreakpointCombo);
+    //insert(myDependentBreakpointComboPanel, baseBreakpointCombo);
+    insert(myDependentBreakpointComboPanel, myMasterBreakpointChooser.getComponent());
     insert(myInstanceFiltersFieldPanel, myInstanceFiltersField);
     insert(myClassFiltersFieldPanel, myClassFiltersField);
 
@@ -364,6 +381,51 @@ public abstract class BreakpointPropertiesPanel {
     IJSwingUtilities.adjustComponentsOnMac(myLogMessageCheckBox);
   }
 
+  private List<BreakpointItem> getBreakpointItemsExceptMy() {
+    List<BreakpointItem> items = new ArrayList<BreakpointItem>();
+    findJavaDebuggerSupport().getBreakpointPanelProvider().provideBreakpointItems(myProject, items);
+    for (BreakpointItem item : items) {
+      if (item.getBreakpoint() == myBreakpoint) {
+        items.remove(item);
+        break;
+      }
+    }
+    return items;
+  }
+
+  private DebuggerSupport findJavaDebuggerSupport() {
+    DebuggerSupport[] supports = DebuggerSupport.getDebuggerSupports();
+    DebuggerSupport support = null;
+    for (DebuggerSupport s : supports) {
+      if (s instanceof JavaDebuggerSupport) {
+        support = s;
+      }
+    }
+    return support;
+  }
+
+  private void saveMasterBreakpoint() {
+
+
+    Breakpoint masterBreakpoint = (Breakpoint)myMasterBreakpointChooser.getSelectedBreakpoint();
+    if (masterBreakpoint == null) {
+      getBreakpointManager(myProject).removeBreakpointRule(myBreakpoint);
+    }
+    else {
+      EnableBreakpointRule rule = findMasterBreakpointRule();
+      boolean selected = myLeaveEnabledRadioButton.isSelected();
+      if (rule != null && (rule.getMasterBreakpoint() != masterBreakpoint || rule.isLeaveEnabled() != selected ) ) {
+        getBreakpointManager(myProject).removeBreakpointRule(rule);
+
+      }
+      getBreakpointManager(myProject).addBreakpointRule(new EnableBreakpointRule(getBreakpointManager(myProject),
+                                                                                 masterBreakpoint,
+                                                                                 myBreakpoint,
+                                                                                 selected));
+    }
+
+  }
+
   private String getSelectedSuspendPolicy() {
     if (!mySuspendJBCheckBox.isSelected()) {
       return DebuggerSettings.SUSPEND_NONE;
@@ -375,7 +437,7 @@ public abstract class BreakpointPropertiesPanel {
   }
 
   private void updateSuspendPolicyRbFont() {
-    final String defPolicy = DebuggerManagerEx.getInstanceEx(myProject).getBreakpointManager().getDefaultSuspendPolicy(myBreakpointCategory);
+    final String defPolicy = getBreakpointManager(myProject).getDefaultSuspendPolicy(myBreakpointCategory);
     
     final Font font = mySuspendAllRadio.getFont().deriveFont(Font.PLAIN);
     final Font boldFont = font.deriveFont(Font.BOLD);
@@ -410,7 +472,9 @@ public abstract class BreakpointPropertiesPanel {
     myBreakpoint = breakpoint;
     boolean moreOptionsVisible = moreOptionsVisible1;
     boolean actionsPanelVisible = moreOptionsVisible1;
-    myBreakpointComboboxHandler.initFrom(breakpoint);
+
+    initMasterBreakpointPanel();
+
     if (breakpoint.COUNT_FILTER > 0) {
       myPassCountField.setText(Integer.toString(breakpoint.COUNT_FILTER));
       moreOptionsVisible = true;
@@ -504,6 +568,31 @@ public abstract class BreakpointPropertiesPanel {
     setMoreOptionsVisible(moreOptionsVisible);
   }
 
+  private void initMasterBreakpointPanel() {
+    myMasterBreakpointChooser.setBreakpointItems(getBreakpointItemsExceptMy());
+
+    final EnableBreakpointRule rule = findMasterBreakpointRule();
+
+    final Breakpoint baseBreakpoint = rule != null ? rule.getMasterBreakpoint() : null;
+    updateMasterBreakpointPanel(rule);
+
+    myMasterBreakpointChooser.setSelectedBreakpoint(baseBreakpoint);
+  }
+
+  private @Nullable EnableBreakpointRule findMasterBreakpointRule() {
+    return myBreakpoint != null? getBreakpointManager(myProject).findBreakpointRule(myBreakpoint) : null;
+  }
+
+  private void updateMasterBreakpointPanel(@Nullable EnableBreakpointRule rule) {
+    final boolean leaveEnabled = rule != null && rule.isLeaveEnabled();
+    if (leaveEnabled) {
+      myLeaveEnabledRadioButton.setSelected(true);
+    }
+    else {
+      myDisableAgainRadio.setSelected(true);
+    }
+  }
+
   private TextWithImportsImpl emptyText() {
     return new TextWithImportsImpl(CodeFragmentKind.EXPRESSION, "");
   }
@@ -512,7 +601,8 @@ public abstract class BreakpointPropertiesPanel {
    * Save values in the UI components to the breakpoint object
    */
   public void saveTo(Breakpoint breakpoint, @NotNull Runnable afterUpdate) {
-    myBreakpointComboboxHandler.saveTo(breakpoint, myLeaveEnabledRadioButton.isSelected());
+
+    saveMasterBreakpoint();
     try {
       String text = myPassCountField.getText().trim();
       int count = !"".equals(text)? Integer.parseInt(text) : 0;
@@ -702,37 +792,6 @@ public abstract class BreakpointPropertiesPanel {
   public JPanel getPanel() {
     return myPanel;
   }
-  
-  private static class BreakpointComboboxModel extends DefaultComboBoxModel {
-    private final ComboboxItem[] myItems;
-
-    public BreakpointComboboxModel(Breakpoint[] breakpoints) {
-      myItems = new ComboboxItem[breakpoints.length + 1];
-      myItems[0] = new ComboboxItem();
-      for (int idx = 0; idx < breakpoints.length; idx++) {
-        myItems[idx + 1] = new ComboboxItem(breakpoints[idx]);
-      }
-    }
-
-    public int getSize() {
-      return myItems.length;
-    }
-
-    public ComboboxItem getElementAt(int index) {
-      return myItems[index];
-    }
-
-    public void selectBreakpoint(Breakpoint breakpoint) {
-      for (final ComboboxItem item : myItems) {
-        if (breakpoint == null ? item.getBreakpoint() == null : breakpoint.equals(item.getBreakpoint())) {
-          if (!item.equals(getSelectedItem())) {
-            setSelectedItem(item);
-          }
-          break;
-        }
-      }
-    }
-  }
 
   private static class ComboboxItem {
     private final Breakpoint breakpoint;
@@ -764,83 +823,9 @@ public abstract class BreakpointPropertiesPanel {
       return breakpoint != null ? breakpoint.hashCode() : 0;
     }
   }
-  
-  private class BreakpointComboboxHandler implements BreakpointManagerListener{
-    private final JComboBox myCombo;
-    private final BreakpointManager myBreakpointManager;
-    private Breakpoint myCurrentBreakpoint = null;
 
-    public BreakpointComboboxHandler(final Project project, final JComboBox breakpointCombo) {
-      myCombo = breakpointCombo;
-      myBreakpointManager = DebuggerManagerEx.getInstanceEx(project).getBreakpointManager();
-      myBreakpointManager.addBreakpointManagerListener(this);
-    }
-
-    public void initFrom(Breakpoint breakpoint) {
-      myCurrentBreakpoint = breakpoint;
-      fillCombobox();
-    }
-    
-    public void saveTo(Breakpoint slaveBreakpoint, final boolean leaveEnabled) {
-      myBreakpointManager.removeBreakpointRule(slaveBreakpoint);
-      final Breakpoint masterBreakpoint = ((ComboboxItem)myCombo.getSelectedItem()).getBreakpoint();
-      if (masterBreakpoint != null) {
-        myBreakpointManager.addBreakpointRule(new EnableBreakpointRule(myBreakpointManager, masterBreakpoint, slaveBreakpoint, leaveEnabled));
-      }
-    }
-    
-    public void breakpointsChanged() {
-      fillCombobox();
-    }
-    
-    public void dispose() {
-      myBreakpointManager.removeBreakpointManagerListener(this);
-    }
-    
-    private void fillCombobox() {
-      final List<Breakpoint> breakpoints = new ArrayList<Breakpoint>(myBreakpointManager.getBreakpoints());
-      if (myCurrentBreakpoint != null) {
-        // avoid depending on itself
-        breakpoints.remove(myCurrentBreakpoint);
-      }
-      myCombo.setModel(new BreakpointComboboxModel(breakpoints.toArray(new Breakpoint[breakpoints.size()])));
-      final EnableBreakpointRule rule = myCurrentBreakpoint != null? myBreakpointManager.findBreakpointRule(myCurrentBreakpoint) : null;
-      final Breakpoint baseBreakpoint = rule != null? rule.getMasterBreakpoint() : null;
-      final boolean leaveEnabled = rule != null && rule.isLeaveEnabled();
-      if (leaveEnabled) {
-        myLeaveEnabledRadioButton.setSelected(true);
-      }
-      else {
-        myDisableAgainRadio.setSelected(true);
-      }
-      ((BreakpointComboboxModel)myCombo.getModel()).selectBreakpoint(baseBreakpoint);
-    }
-  }
-
-  private static class BreakpointComboRenderer extends ListCellRendererWrapper {
-    public BreakpointComboRenderer(final ListCellRenderer listCellRenderer) {
-      super(listCellRenderer);
-    }
-
-    @Override
-    public void customize(JList list, Object value, int index, boolean selected, boolean hasFocus) {
-      Breakpoint breakpoint = ((ComboboxItem)value).getBreakpoint();
-      final String text = breakpoint != null ? index == -1 ? breakpoint.getShortName() : breakpoint.getDisplayName() : DebuggerBundle.message("value.none");
-      setText(text);
-
-      final Icon icon;
-      if (breakpoint != null) {
-        icon = breakpoint instanceof BreakpointWithHighlighter
-               ? breakpoint.ENABLED
-                 ? ((BreakpointWithHighlighter)breakpoint).getSetIcon(false)
-                 : ((BreakpointWithHighlighter)breakpoint).getDisabledIcon(false)
-               : breakpoint.getIcon();
-      }
-      else {
-        icon = null;
-      }
-      setIcon(icon);
-    }
+  private BreakpointManager getBreakpointManager(Project project) {
+    return DebuggerManagerEx.getInstanceEx(project).getBreakpointManager();
   }
 
   private static class MagnifierButtonAction implements ActionListener {
diff --git a/java/debugger/impl/src/com/intellij/debugger/ui/breakpoints/JavaBreakpointItem.java b/java/debugger/impl/src/com/intellij/debugger/ui/breakpoints/JavaBreakpointItem.java
index a186926b531b..170eec164c2f 100644
--- a/java/debugger/impl/src/com/intellij/debugger/ui/breakpoints/JavaBreakpointItem.java
+++ b/java/debugger/impl/src/com/intellij/debugger/ui/breakpoints/JavaBreakpointItem.java
@@ -23,6 +23,7 @@ import com.intellij.ui.SimpleColoredComponent;
 import com.intellij.ui.SimpleTextAttributes;
 import com.intellij.ui.popup.util.DetailView;
 import com.intellij.xdebugger.breakpoints.ui.BreakpointItem;
+import org.jetbrains.annotations.Nullable;
 
 import javax.swing.*;
 
@@ -37,17 +38,29 @@ class JavaBreakpointItem extends BreakpointItem {
   private final Breakpoint myBreakpoint;
   private BreakpointFactory myBreakpointFactory;
 
-  public JavaBreakpointItem(BreakpointFactory breakpointFactory, Breakpoint breakpoint) {
+  public JavaBreakpointItem(@Nullable BreakpointFactory breakpointFactory, Breakpoint breakpoint) {
     myBreakpointFactory = breakpointFactory;
     myBreakpoint = breakpoint;
   }
 
   @Override
-  protected void setupGenericRenderer(SimpleColoredComponent renderer) {
-    //renderer.setIcon(myBreakpoint.getIcon());
+  protected void setupGenericRenderer(SimpleColoredComponent renderer, boolean plainView) {
+    if (plainView) {
+      renderer.setIcon(myBreakpoint.getIcon());
+    }
     renderer.append(myBreakpoint.getShortName(), isEnabled() ? SimpleTextAttributes.REGULAR_ATTRIBUTES : SimpleTextAttributes.GRAY_ATTRIBUTES);
   }
 
+  @Override
+  public Icon getIcon() {
+    return myBreakpoint.getIcon();
+  }
+
+  @Override
+  public String getDisplayText() {
+    return myBreakpoint.getDisplayName();
+  }
+
   @Override
   public String speedSearchText() {
     return myBreakpoint.getDisplayName();
@@ -59,11 +72,12 @@ class JavaBreakpointItem extends BreakpointItem {
   }
 
   @Override
-  public void updateDetailView(DetailView panel) {
-    BreakpointPropertiesPanel breakpointPropertiesPanel = myBreakpointFactory
-      .createBreakpointPropertiesPanel(myBreakpoint.getProject(), false);
+  protected void doUpdateDetailView(DetailView panel) {
+    BreakpointPropertiesPanel breakpointPropertiesPanel = myBreakpointFactory != null ? myBreakpointFactory
+      .createBreakpointPropertiesPanel(myBreakpoint.getProject(), false) : null;
     if (breakpointPropertiesPanel != null) {
       breakpointPropertiesPanel.setSaveOnRemove(true);
+      breakpointPropertiesPanel.setDetailView(panel);
     }
 
     if (breakpointPropertiesPanel != null) {
@@ -86,7 +100,7 @@ class JavaBreakpointItem extends BreakpointItem {
 
   @Override
   public boolean allowedToRemove() {
-    return myBreakpointFactory.breakpointCanBeRemoved(myBreakpoint);
+    return myBreakpointFactory != null && myBreakpointFactory.breakpointCanBeRemoved(myBreakpoint);
   }
 
   @Override
diff --git a/java/idea-ui/src/com/intellij/openapi/roots/ui/configuration/AnnotationsEditor.java b/java/idea-ui/src/com/intellij/openapi/roots/ui/configuration/AnnotationsEditor.java
index 604c703d930f..e6dffa28d0fe 100644
--- a/java/idea-ui/src/com/intellij/openapi/roots/ui/configuration/AnnotationsEditor.java
+++ b/java/idea-ui/src/com/intellij/openapi/roots/ui/configuration/AnnotationsEditor.java
@@ -15,7 +15,6 @@
  */
 package com.intellij.openapi.roots.ui.configuration;
 
-import com.intellij.icons.AllIcons;
 import com.intellij.openapi.fileChooser.FileChooser;
 import com.intellij.openapi.fileChooser.FileChooserDescriptor;
 import com.intellij.openapi.fileChooser.FileChooserDescriptorFactory;
@@ -44,7 +43,6 @@ public class AnnotationsEditor extends ModuleElementsEditor {
   private JTable myTable;
 
   public static final String NAME = ProjectBundle.message("project.roots.external.annotations.tab.title");
-  public static final Icon ICON = AllIcons.Modules.Annotation;
 
   public AnnotationsEditor(final ModuleConfigurationState state) {
     super(state);
diff --git a/java/idea-ui/src/com/intellij/openapi/roots/ui/configuration/ClasspathEditor.java b/java/idea-ui/src/com/intellij/openapi/roots/ui/configuration/ClasspathEditor.java
index 0c85f1056a9c..fdac928793ca 100644
--- a/java/idea-ui/src/com/intellij/openapi/roots/ui/configuration/ClasspathEditor.java
+++ b/java/idea-ui/src/com/intellij/openapi/roots/ui/configuration/ClasspathEditor.java
@@ -16,7 +16,6 @@
 package com.intellij.openapi.roots.ui.configuration;
 
 import com.intellij.ProjectTopics;
-import com.intellij.icons.AllIcons;
 import com.intellij.openapi.Disposable;
 import com.intellij.openapi.options.ConfigurationException;
 import com.intellij.openapi.project.ProjectBundle;
@@ -45,7 +44,6 @@ import java.util.Map;
  */
 public class ClasspathEditor extends ModuleElementsEditor implements ModuleRootListener {
   public static final String NAME = ProjectBundle.message("modules.classpath.title");
-  public static final Icon ICON = AllIcons.Modules.Classpath;
 
   private ClasspathPanelImpl myPanel;
 
diff --git a/java/idea-ui/src/com/intellij/openapi/roots/ui/configuration/JavadocEditor.java b/java/idea-ui/src/com/intellij/openapi/roots/ui/configuration/JavadocEditor.java
index 480851327017..211a71c90aa2 100644
--- a/java/idea-ui/src/com/intellij/openapi/roots/ui/configuration/JavadocEditor.java
+++ b/java/idea-ui/src/com/intellij/openapi/roots/ui/configuration/JavadocEditor.java
@@ -15,7 +15,6 @@
  */
 package com.intellij.openapi.roots.ui.configuration;
 
-import com.intellij.icons.AllIcons;
 import com.intellij.openapi.actionSystem.AnActionEvent;
 import com.intellij.openapi.fileChooser.FileChooser;
 import com.intellij.openapi.fileChooser.FileChooserDescriptor;
@@ -46,8 +45,7 @@ import java.util.List;
 public class JavadocEditor extends ModuleElementsEditor {
   private JTable myTable;
 
-  public static final String NAME = ProjectBundle.message("module.javadoc.title");
-  public static final Icon ICON = AllIcons.Modules.Javadoc;
+  private static final String NAME = ProjectBundle.message("module.javadoc.title");
 
   public JavadocEditor(ModuleConfigurationState state) {
     super(state);
diff --git a/java/java-impl/src/com/intellij/codeInsight/ExpectedTypeInfoImpl.java b/java/java-impl/src/com/intellij/codeInsight/ExpectedTypeInfoImpl.java
index 4120b8e131a7..8e662da3538e 100644
--- a/java/java-impl/src/com/intellij/codeInsight/ExpectedTypeInfoImpl.java
+++ b/java/java-impl/src/com/intellij/codeInsight/ExpectedTypeInfoImpl.java
@@ -17,6 +17,7 @@
 package com.intellij.codeInsight;
 
 import com.intellij.openapi.diagnostic.Logger;
+import com.intellij.openapi.util.NullableComputable;
 import com.intellij.psi.*;
 import org.jetbrains.annotations.NotNull;
 
@@ -46,7 +47,12 @@ public class ExpectedTypeInfoImpl implements ExpectedTypeInfo {
 
   public TailType myTailType;
 
-  public String expectedName;
+  @NotNull public NullableComputable<String> expectedName = new NullableComputable<String>() {
+    @Override
+    public String compute() {
+      return null;
+    }
+  };
   private PsiMethod myCalledMethod;
 
 
diff --git a/java/java-impl/src/com/intellij/codeInsight/ExpectedTypesProvider.java b/java/java-impl/src/com/intellij/codeInsight/ExpectedTypesProvider.java
index 319cfb506269..a4718817a404 100644
--- a/java/java-impl/src/com/intellij/codeInsight/ExpectedTypesProvider.java
+++ b/java/java-impl/src/com/intellij/codeInsight/ExpectedTypesProvider.java
@@ -18,6 +18,7 @@ package com.intellij.codeInsight;
 import com.intellij.openapi.components.ServiceManager;
 import com.intellij.openapi.diagnostic.Logger;
 import com.intellij.openapi.project.Project;
+import com.intellij.openapi.util.NullableComputable;
 import com.intellij.psi.*;
 import com.intellij.psi.codeStyle.JavaCodeStyleManager;
 import com.intellij.psi.codeStyle.VariableKind;
@@ -330,14 +331,19 @@ public class ExpectedTypesProvider {
     }
 
     @Override public void visitReturnStatement(PsiReturnStatement statement) {
-      PsiMethod scopeMethod = PsiTreeUtil.getParentOfType(statement, PsiMethod.class);
+      final PsiMethod scopeMethod = PsiTreeUtil.getParentOfType(statement, PsiMethod.class);
       if (scopeMethod != null) {
         PsiType type = scopeMethod.getReturnType();
         if (type != null) {
           ExpectedTypeInfoImpl info = createInfoImpl(type, ExpectedTypeInfo.TYPE_OR_SUBTYPE, type,
                                                      TailType.SEMICOLON);
           if (PropertyUtil.isSimplePropertyAccessor(scopeMethod)) {
-            info.expectedName = PropertyUtil.getPropertyName(scopeMethod);
+            info.expectedName = new NullableComputable<String>() {
+              @Override
+              public String compute() {
+                return PropertyUtil.getPropertyName(scopeMethod);
+              }
+            };
           }
 
           myResult = new ExpectedTypeInfo[]{info};
@@ -1017,8 +1023,8 @@ public class ExpectedTypesProvider {
       ExpectedTypeInfoImpl info = createInfoImpl(parameterType, ExpectedTypeInfo.TYPE_OR_SUBTYPE, defaultType, tailType);
       info.setInsertExplicitTypeParams(true);
       info.setCalledMethod(method);
-      String propertyName = getPropertyName(parameter);
-      if (propertyName != null) info.expectedName = propertyName;
+      NullableComputable<String> propertyName = getPropertyName(parameter);
+      info.expectedName = propertyName;
       array.add(info);
 
       if (index == parameters.length - 1 && parameter.isVarArgs()) {
@@ -1158,12 +1164,17 @@ public class ExpectedTypesProvider {
     }
 
     @Nullable
-    private static String getPropertyName(@NotNull PsiVariable variable) {
-      final String name = variable.getName();
-      if (name == null) return null;
-      JavaCodeStyleManager codeStyleManager = JavaCodeStyleManager.getInstance(variable.getProject());
-      VariableKind variableKind = codeStyleManager.getVariableKind(variable);
-      return codeStyleManager.variableNameToPropertyName(name, variableKind);
+    private static NullableComputable<String> getPropertyName(@NotNull final PsiVariable variable) {
+      return new NullableComputable<String>() {
+        @Override
+        public String compute() {
+          final String name = variable.getName();
+          if (name == null) return null;
+          JavaCodeStyleManager codeStyleManager = JavaCodeStyleManager.getInstance(variable.getProject());
+          VariableKind variableKind = codeStyleManager.getVariableKind(variable);
+          return codeStyleManager.variableNameToPropertyName(name, variableKind);
+        }
+      };
     }
 
     @NotNull
diff --git a/java/java-impl/src/com/intellij/codeInsight/completion/JavaCompletionSorting.java b/java/java-impl/src/com/intellij/codeInsight/completion/JavaCompletionSorting.java
index 7ab43ceb5fc0..50b06728eaa6 100644
--- a/java/java-impl/src/com/intellij/codeInsight/completion/JavaCompletionSorting.java
+++ b/java/java-impl/src/com/intellij/codeInsight/completion/JavaCompletionSorting.java
@@ -247,7 +247,7 @@ public class JavaCompletionSorting {
 
   private static int calcMatch(final List<String> words, int max, ExpectedTypeInfo[] myExpectedInfos) {
     for (ExpectedTypeInfo myExpectedInfo : myExpectedInfos) {
-      String expectedName = ((ExpectedTypeInfoImpl)myExpectedInfo).expectedName;
+      String expectedName = ((ExpectedTypeInfoImpl)myExpectedInfo).expectedName.compute();
       if (expectedName == null) continue;
       max = calcMatch(expectedName, words, max);
       max = calcMatch(truncDigits(expectedName), words, max);
@@ -506,7 +506,7 @@ public class JavaCompletionSorting {
         int max = 0;
         final List<String> wordsNoDigits = NameUtil.nameToWordsLowerCase(truncDigits(name));
         for (ExpectedTypeInfo myExpectedInfo : myExpectedTypes) {
-          String expectedName = ((ExpectedTypeInfoImpl)myExpectedInfo).expectedName;
+          String expectedName = ((ExpectedTypeInfoImpl)myExpectedInfo).expectedName.compute();
           if (expectedName != null) {
             final THashSet<String> set = new THashSet<String>(NameUtil.nameToWordsLowerCase(truncDigits(expectedName)));
             set.retainAll(wordsNoDigits);
diff --git a/java/java-impl/src/com/intellij/codeInsight/daemon/impl/quickfix/PullAsAbstractUpFix.java b/java/java-impl/src/com/intellij/codeInsight/daemon/impl/quickfix/PullAsAbstractUpFix.java
index 883c17f21592..399b5d624ef0 100644
--- a/java/java-impl/src/com/intellij/codeInsight/daemon/impl/quickfix/PullAsAbstractUpFix.java
+++ b/java/java-impl/src/com/intellij/codeInsight/daemon/impl/quickfix/PullAsAbstractUpFix.java
@@ -17,6 +17,7 @@ package com.intellij.codeInsight.daemon.impl.quickfix;
 
 import com.intellij.codeInsight.CodeInsightUtilBase;
 import com.intellij.codeInsight.daemon.impl.HighlightInfo;
+import com.intellij.codeInsight.intention.impl.RunRefactoringAction;
 import com.intellij.codeInsight.navigation.NavigationUtil;
 import com.intellij.codeInspection.LocalQuickFixAndIntentionActionOnPsiElement;
 import com.intellij.ide.util.PsiClassListCellRenderer;
@@ -163,13 +164,13 @@ public class PullAsAbstractUpFix extends LocalQuickFixAndIntentionActionOnPsiEle
            name+= " and make it abstract";
         }
       }
-      QuickFixAction.registerQuickFixAction(highlightInfo, new RunRefactoringIntention(new ExtractInterfaceHandler(), "Extract interface"));
-      QuickFixAction.registerQuickFixAction(highlightInfo, new RunRefactoringIntention(new ExtractSuperclassHandler(), "Extract superclass"));
+      QuickFixAction.registerQuickFixAction(highlightInfo, new RunRefactoringAction(new ExtractInterfaceHandler(), "Extract interface"));
+      QuickFixAction.registerQuickFixAction(highlightInfo, new RunRefactoringAction(new ExtractSuperclassHandler(), "Extract superclass"));
     }
 
 
     if (canBePulledUp) {
-      QuickFixAction.registerQuickFixAction(highlightInfo, new RunRefactoringIntention(new JavaPullUpHandler(), "Pull members up"));
+      QuickFixAction.registerQuickFixAction(highlightInfo, new RunRefactoringAction(new JavaPullUpHandler(), "Pull members up"));
     }
     QuickFixAction.registerQuickFixAction(highlightInfo, new PullAsAbstractUpFix(methodWithOverrides, name));
   }
diff --git a/java/java-impl/src/com/intellij/codeInsight/generation/GenerateConstructorHandler.java b/java/java-impl/src/com/intellij/codeInsight/generation/GenerateConstructorHandler.java
index 46f7dd9da417..52adb3b8c657 100644
--- a/java/java-impl/src/com/intellij/codeInsight/generation/GenerateConstructorHandler.java
+++ b/java/java-impl/src/com/intellij/codeInsight/generation/GenerateConstructorHandler.java
@@ -248,7 +248,7 @@ public class GenerateConstructorHandler extends GenerateMembersHandlerBase {
         PsiParameter[] parms = baseConstructor.getParameterList().getParameters();
         for (PsiParameter parm : parms) {
           PsiParameter newParam = factory.createParameter(parm.getName(), parm.getType());
-          copyModifierList(parm, newParam);
+          replaceModifierList(parm, newParam);
           constructor.getParameterList().add(newParam);
         }
       }
@@ -291,11 +291,24 @@ public class GenerateConstructorHandler extends GenerateMembersHandlerBase {
     return constructor;
   }
 
-  static void copyModifierList(PsiParameter parm, PsiParameter newParam) {
+  static void copyModifierList(JVMElementFactory factory, PsiParameter parm, PsiParameter newParam) {
     PsiModifierList modifierList = parm.getModifierList();
     PsiModifierList newMList = newParam.getModifierList();
     if (modifierList != null && newMList != null) {
-      newMList.replace(modifierList);
+      for (PsiAnnotation annotation : modifierList.getAnnotations()) {
+        newMList.add(factory.createAnnotationFromText(annotation.getText(), newParam));
+      }
+      for (@PsiModifier.ModifierConstant String m : PsiModifier.MODIFIERS) {
+        newMList.setModifierProperty(m, parm.hasModifierProperty(m));
+      }
+    }
+  }
+
+  static void replaceModifierList(PsiParameter sourceParam, PsiParameter targetParam) {
+    PsiModifierList sourceModifierList = sourceParam.getModifierList();
+    PsiModifierList targetModifierList = targetParam.getModifierList();
+    if (sourceModifierList != null && targetModifierList != null) {
+      targetModifierList.replace(sourceModifierList);
     }
   }
 
diff --git a/java/java-impl/src/com/intellij/codeInsight/generation/GenerateMembersUtil.java b/java/java-impl/src/com/intellij/codeInsight/generation/GenerateMembersUtil.java
index 2bd69a3ac2f7..4a9c4df3fb1d 100644
--- a/java/java-impl/src/com/intellij/codeInsight/generation/GenerateMembersUtil.java
+++ b/java/java-impl/src/com/intellij/codeInsight/generation/GenerateMembersUtil.java
@@ -303,7 +303,7 @@ public class GenerateMembersUtil {
           }
         }
         else {
-          GenerateConstructorHandler.copyModifierList(parameter, newParameter);
+          GenerateConstructorHandler.copyModifierList(factory,parameter, newParameter);
         }
         newMethod.getParameterList().add(newParameter);
       }
diff --git a/java/java-impl/src/com/intellij/codeInsight/intention/impl/BaseRunRefactoringAction.java b/java/java-impl/src/com/intellij/codeInsight/intention/impl/BaseRunRefactoringAction.java
new file mode 100644
index 000000000000..b9fbab23fa76
--- /dev/null
+++ b/java/java-impl/src/com/intellij/codeInsight/intention/impl/BaseRunRefactoringAction.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.codeInsight.intention.impl;
+
+import com.intellij.codeInsight.CodeInsightBundle;
+import com.intellij.codeInsight.intention.IntentionAction;
+import com.intellij.codeInsight.intention.LowPriorityAction;
+import com.intellij.icons.AllIcons;
+import com.intellij.openapi.util.Iconable;
+import com.intellij.refactoring.RefactoringActionHandler;
+import org.jetbrains.annotations.NotNull;
+
+import javax.swing.*;
+
+/**
+ * @author Danila Ponomarenko
+ */
+public abstract class BaseRunRefactoringAction<T extends RefactoringActionHandler> implements IntentionAction, Iconable, LowPriorityAction {
+  public static final Icon REFACTORING_BULB = AllIcons.Actions.RefactoringBulb;
+
+  @NotNull
+  @Override
+  public final String getFamilyName() {
+    return CodeInsightBundle.message("intention.refactoring.family");
+  }
+
+  @Override
+  public final boolean startInWriteAction() {
+    return false;
+  }
+
+  @Override
+  public final Icon getIcon(int flags) {
+    return REFACTORING_BULB;
+  }
+}
\ No newline at end of file
diff --git a/java/java-impl/src/com/intellij/codeInsight/intention/impl/EncapsulateFieldAction.java b/java/java-impl/src/com/intellij/codeInsight/intention/impl/EncapsulateFieldAction.java
new file mode 100644
index 000000000000..685f37b375b0
--- /dev/null
+++ b/java/java-impl/src/com/intellij/codeInsight/intention/impl/EncapsulateFieldAction.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 com.intellij.codeInsight.intention.impl;
+
+import com.intellij.codeInsight.CodeInsightBundle;
+import com.intellij.openapi.editor.CaretModel;
+import com.intellij.openapi.editor.Editor;
+import com.intellij.openapi.project.Project;
+import com.intellij.psi.*;
+import com.intellij.refactoring.encapsulateFields.EncapsulateFieldsHandler;
+import com.intellij.util.IncorrectOperationException;
+import org.jetbrains.annotations.NotNull;
+import org.jetbrains.annotations.Nullable;
+
+/**
+ * @author Danila Ponomarenko
+ */
+public class EncapsulateFieldAction extends BaseRunRefactoringAction<EncapsulateFieldsHandler> {
+
+  @NotNull
+  @Override
+  public String getText() {
+    return CodeInsightBundle.message("intention.encapsulate.field.text");
+  }
+
+  @Override
+  public boolean isAvailable(@NotNull Project project, Editor editor, PsiFile file) {
+    final PsiField field = getField(getElement(editor, file));
+    return field != null && !field.hasModifierProperty(PsiModifier.FINAL) && !field.hasModifierProperty(PsiModifier.PRIVATE);
+  }
+
+
+  @Override
+  public void invoke(@NotNull Project project, Editor editor, PsiFile file) throws IncorrectOperationException {
+    final PsiField field = getField(getElement(editor, file));
+    if (field == null) {
+      return;
+    }
+
+    new EncapsulateFieldsHandler().invoke(project, new PsiElement[]{field}, null);
+  }
+
+  @Nullable
+  protected static PsiField getField(@Nullable PsiElement element) {
+    if (element == null || !(element instanceof PsiIdentifier)) {
+      return null;
+    }
+
+    final PsiElement parent = element.getParent();
+    if (parent == null || !(parent instanceof PsiReferenceExpression)) {
+      return null;
+    }
+    final PsiReferenceExpression ref = (PsiReferenceExpression)parent;
+    final PsiExpression qualifier = ref.getQualifierExpression();
+    if (qualifier == null || qualifier instanceof PsiThisExpression) {
+      return null;
+    }
+
+    final PsiElement resolved = ref.resolve();
+    if (resolved == null || !(resolved instanceof PsiField)) {
+      return null;
+    }
+    return (PsiField)resolved;
+  }
+
+  @Nullable
+  protected static PsiElement getElement(Editor editor, @NotNull PsiFile file) {
+    if (!file.getManager().isInProject(file)) return null;
+    final CaretModel caretModel = editor.getCaretModel();
+    final int position = caretModel.getOffset();
+    return file.findElementAt(position);
+  }
+}
\ No newline at end of file
diff --git a/java/java-impl/src/com/intellij/codeInsight/intention/impl/IntroduceVariableAction.java b/java/java-impl/src/com/intellij/codeInsight/intention/impl/IntroduceVariableAction.java
index c3244099a525..4ac04eaed610 100644
--- a/java/java-impl/src/com/intellij/codeInsight/intention/impl/IntroduceVariableAction.java
+++ b/java/java-impl/src/com/intellij/codeInsight/intention/impl/IntroduceVariableAction.java
@@ -16,14 +16,12 @@
 package com.intellij.codeInsight.intention.impl;
 
 import com.intellij.codeInsight.CodeInsightBundle;
-import com.intellij.codeInsight.intention.IntentionAction;
 import com.intellij.openapi.editor.CaretModel;
 import com.intellij.openapi.editor.Editor;
 import com.intellij.openapi.project.Project;
 import com.intellij.psi.*;
 import com.intellij.psi.util.PsiTreeUtil;
-import com.intellij.refactoring.JavaRefactoringActionHandlerFactory;
-import com.intellij.refactoring.RefactoringActionHandler;
+import com.intellij.refactoring.introduceVariable.IntroduceVariableHandler;
 import com.intellij.util.IncorrectOperationException;
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;
@@ -31,7 +29,7 @@ import org.jetbrains.annotations.Nullable;
 /**
  * @author Danila Ponomarenko
  */
-public class IntroduceVariableAction implements IntentionAction {
+public class IntroduceVariableAction extends BaseRunRefactoringAction<IntroduceVariableHandler> {
 
   @NotNull
   @Override
@@ -39,12 +37,6 @@ public class IntroduceVariableAction implements IntentionAction {
     return CodeInsightBundle.message("intention.introduce.variable.text");
   }
 
-  @NotNull
-  @Override
-  public String getFamilyName() {
-    return getText();
-  }
-
   @Override
   public boolean isAvailable(@NotNull Project project, Editor editor, PsiFile file) {
     final PsiElement element = getElement(editor, file);
@@ -73,12 +65,6 @@ public class IntroduceVariableAction implements IntentionAction {
 
   @Override
   public void invoke(@NotNull Project project, Editor editor, PsiFile file) throws IncorrectOperationException {
-    final RefactoringActionHandler refactoringActionHandler = JavaRefactoringActionHandlerFactory.getInstance().createIntroduceVariableHandler();
-    refactoringActionHandler.invoke(project, editor, file, null);
-  }
-
-  @Override
-  public boolean startInWriteAction() {
-    return true;
+    new IntroduceVariableHandler().invoke(project, editor, file, null);
   }
 }
diff --git a/java/java-impl/src/com/intellij/codeInsight/daemon/impl/quickfix/RunRefactoringIntention.java b/java/java-impl/src/com/intellij/codeInsight/intention/impl/RunRefactoringAction.java
similarity index 59%
rename from java/java-impl/src/com/intellij/codeInsight/daemon/impl/quickfix/RunRefactoringIntention.java
rename to java/java-impl/src/com/intellij/codeInsight/intention/impl/RunRefactoringAction.java
index f053a18527b7..6462dbe404b9 100644
--- a/java/java-impl/src/com/intellij/codeInsight/daemon/impl/quickfix/RunRefactoringIntention.java
+++ b/java/java-impl/src/com/intellij/codeInsight/intention/impl/RunRefactoringAction.java
@@ -13,31 +13,24 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.intellij.codeInsight.daemon.impl.quickfix;
+package com.intellij.codeInsight.intention.impl;
 
-import com.intellij.codeInsight.intention.IntentionAction;
-import com.intellij.codeInsight.intention.LowPriorityAction;
-import com.intellij.icons.AllIcons;
 import com.intellij.openapi.editor.Editor;
 import com.intellij.openapi.project.Project;
-import com.intellij.openapi.util.Iconable;
 import com.intellij.psi.PsiFile;
 import com.intellij.refactoring.RefactoringActionHandler;
 import com.intellij.util.IncorrectOperationException;
 import org.jetbrains.annotations.NotNull;
 
-import javax.swing.*;
-
 /**
  * User: anna
  * Date: 9/5/11
  */
-public class RunRefactoringIntention implements IntentionAction, Iconable, LowPriorityAction {
-  public static final Icon REFACTORING_BULB = AllIcons.Actions.RefactoringBulb;
+public class RunRefactoringAction extends BaseRunRefactoringAction<RefactoringActionHandler> {
   private final RefactoringActionHandler myHandler;
   private final String myCommandName;
 
-  public RunRefactoringIntention(RefactoringActionHandler handler, String commandName) {
+  public RunRefactoringAction(RefactoringActionHandler handler, String commandName) {
     myHandler = handler;
     myCommandName = commandName;
   }
@@ -48,29 +41,13 @@ public class RunRefactoringIntention implements IntentionAction, Iconable, LowPr
     return myCommandName;
   }
 
-  @NotNull
-  @Override
-  public String getFamilyName() {
-    return "Refactorings";
-  }
-
   @Override
   public boolean isAvailable(@NotNull Project project, Editor editor, PsiFile file) {
     return true;
   }
 
   @Override
-  public void invoke(@NotNull Project project, Editor editor, PsiFile file) throws IncorrectOperationException {
+  public final void invoke(@NotNull Project project, Editor editor, PsiFile file) throws IncorrectOperationException {
     myHandler.invoke(project, editor, file, null);
   }
-
-  @Override
-  public boolean startInWriteAction() {
-    return false;
-  }
-
-  @Override
-  public Icon getIcon(int flags) {
-    return REFACTORING_BULB;
-  }
 }
diff --git a/java/java-impl/src/com/intellij/codeInspection/dataFlow/DataFlowRunner.java b/java/java-impl/src/com/intellij/codeInspection/dataFlow/DataFlowRunner.java
index 5fff63255ab1..98e424724623 100644
--- a/java/java-impl/src/com/intellij/codeInspection/dataFlow/DataFlowRunner.java
+++ b/java/java-impl/src/com/intellij/codeInspection/dataFlow/DataFlowRunner.java
@@ -39,12 +39,14 @@ import gnu.trove.THashSet;
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;
 
+import java.lang.management.ManagementFactory;
+import java.lang.management.ThreadMXBean;
 import java.util.*;
 
 public class DataFlowRunner {
   private static final Logger LOG = Logger.getInstance("#com.intellij.codeInspection.dataFlow.DataFlowRunner");
   private static final Key<Integer> TOO_EXPENSIVE_SIZE = Key.create("TOO_EXPENSIVE_SIZE");
-  private static final long ourTimeLimit = 1000;
+  public static final long ourTimeLimit = 1000 * 1000 * 1000; //1 sec in nanoseconds
 
   private Instruction[] myInstructions;
   private DfaVariableValue[] myFields;
@@ -121,10 +123,11 @@ public class DataFlowRunner {
 
       long timeLimit = ourTimeLimit;
       final boolean unitTestMode = ApplicationManager.getApplication().isUnitTestMode();
-      final long before = System.currentTimeMillis();
+      ThreadMXBean tm = ManagementFactory.getThreadMXBean();
+      final long before = tm.getCurrentThreadUserTime();
       int count = 0;
       while (!queue.isEmpty()) {
-        if (count % 50 == 0 && !unitTestMode && System.currentTimeMillis() - before > timeLimit) {
+        if (count % 50 == 0 && !unitTestMode && tm.getCurrentThreadUserTime() - before > timeLimit) {
           psiBlock.putUserData(TOO_EXPENSIVE_SIZE, psiBlock.getText().hashCode());
           return RunnerResult.TOO_COMPLEX;
         }
diff --git a/java/java-impl/src/com/intellij/openapi/module/JavaModuleType.java b/java/java-impl/src/com/intellij/openapi/module/JavaModuleType.java
index e2a0a92fc422..051743e72187 100644
--- a/java/java-impl/src/com/intellij/openapi/module/JavaModuleType.java
+++ b/java/java-impl/src/com/intellij/openapi/module/JavaModuleType.java
@@ -92,7 +92,7 @@ public class JavaModuleType extends ModuleType<JavaModuleBuilder> {
   }
 
   private static class IconHolder {
-    private static final Icon JAVA_MODULE_ICON = AllIcons.Modules.JavaModule;
+    private static final Icon JAVA_MODULE_ICON = AllIcons.Modules.Types.JavaModule;
   }
 
   private static Icon getJavaModuleIcon() {
diff --git a/java/java-impl/src/com/intellij/psi/impl/PsiDiamondTypeUtil.java b/java/java-impl/src/com/intellij/psi/impl/PsiDiamondTypeUtil.java
index 502055854d22..c5037ac91c3f 100644
--- a/java/java-impl/src/com/intellij/psi/impl/PsiDiamondTypeUtil.java
+++ b/java/java-impl/src/com/intellij/psi/impl/PsiDiamondTypeUtil.java
@@ -40,6 +40,18 @@ public class PsiDiamondTypeUtil {
   public static boolean canCollapseToDiamond(final PsiNewExpression expression,
                                              final PsiNewExpression context,
                                              final @Nullable PsiType expectedType) {
+    return canCollapseToDiamond(expression, context, expectedType, false);
+  }
+
+  public static boolean canChangeContextForDiamond(final PsiNewExpression expression, final PsiType expectedType) {
+    final PsiNewExpression copy = (PsiNewExpression)expression.copy();
+    return canCollapseToDiamond(copy, copy, expectedType, true);
+  }
+
+  private static boolean canCollapseToDiamond(final PsiNewExpression expression,
+                                             final PsiNewExpression context,
+                                             final @Nullable PsiType expectedType,
+                                             boolean skipDiamonds) {
     if (PsiUtil.getLanguageLevel(context).isAtLeast(LanguageLevel.JDK_1_7)) {
       final PsiJavaCodeReferenceElement classReference = expression.getClassOrAnonymousClassReference();
       if (classReference != null) {
@@ -47,7 +59,7 @@ public class PsiDiamondTypeUtil {
         if (parameterList != null) {
           final PsiTypeElement[] typeElements = parameterList.getTypeParameterElements();
           if (typeElements.length > 0) {
-            if (typeElements.length == 1 && typeElements[0].getType() instanceof PsiDiamondType) return false;
+            if (!skipDiamonds && typeElements.length == 1 && typeElements[0].getType() instanceof PsiDiamondType) return false;
             final PsiDiamondTypeImpl.DiamondInferenceResult inferenceResult = PsiDiamondTypeImpl.resolveInferredTypes(expression, context);
             if (inferenceResult.getErrorMessage() == null) {
               final List<PsiType> types = inferenceResult.getInferredTypes();
diff --git a/java/java-impl/src/com/intellij/refactoring/copy/CopyClassesHandler.java b/java/java-impl/src/com/intellij/refactoring/copy/CopyClassesHandler.java
index aae30f20540f..ff4bc6f5b392 100644
--- a/java/java-impl/src/com/intellij/refactoring/copy/CopyClassesHandler.java
+++ b/java/java-impl/src/com/intellij/refactoring/copy/CopyClassesHandler.java
@@ -138,10 +138,14 @@ public class CopyClassesHandler extends CopyHandlerDelegateBase {
 
   private static void fillResultsMap(Map<PsiFile, PsiClass[]> result, PsiFile containingFile, PsiClass[] topLevelClasses) {
     PsiClass[] classes = result.get(containingFile);
-    if (classes != null) {
-      topLevelClasses = ArrayUtil.mergeArrays(classes, topLevelClasses, PsiClass.ARRAY_FACTORY);
+    if (topLevelClasses != null) {
+      if (classes != null) {
+        topLevelClasses = ArrayUtil.mergeArrays(classes, topLevelClasses, PsiClass.ARRAY_FACTORY);
+      }
+      result.put(containingFile, topLevelClasses);
+    } else {
+      result.put(containingFile, classes);
     }
-    result.put(containingFile, topLevelClasses);
   }
 
   public void doCopy(PsiElement[] elements, PsiDirectory defaultTargetDirectory) {
diff --git a/java/java-impl/src/com/intellij/refactoring/introduceParameter/JavaIntroduceParameterMethodUsagesProcessor.java b/java/java-impl/src/com/intellij/refactoring/introduceParameter/JavaIntroduceParameterMethodUsagesProcessor.java
index 827540c785a4..3f16cfb1e0eb 100644
--- a/java/java-impl/src/com/intellij/refactoring/introduceParameter/JavaIntroduceParameterMethodUsagesProcessor.java
+++ b/java/java-impl/src/com/intellij/refactoring/introduceParameter/JavaIntroduceParameterMethodUsagesProcessor.java
@@ -94,7 +94,9 @@ public class JavaIntroduceParameterMethodUsagesProcessor implements IntroducePar
         ExpressionConverter.getExpression(data.getParameterInitializer().getExpression(), StdLanguages.JAVA, data.getProject());
       assert initializer instanceof PsiExpression;
       if (initializer instanceof PsiNewExpression) {
-        initializer = PsiDiamondTypeUtil.expandTopLevelDiamondsInside((PsiNewExpression)initializer);
+        if (!PsiDiamondTypeUtil.canChangeContextForDiamond((PsiNewExpression)initializer, ((PsiNewExpression)initializer).getType())) {
+          initializer = PsiDiamondTypeUtil.expandTopLevelDiamondsInside((PsiNewExpression)initializer);
+        }
       }
       substituteTypeParametersInInitializer(initializer, callExpression, argList, methodToSearchFor);
       ChangeContextUtil.encodeContextInfo(initializer, true);
diff --git a/java/java-impl/src/com/intellij/refactoring/util/RefactoringUtil.java b/java/java-impl/src/com/intellij/refactoring/util/RefactoringUtil.java
index 2eda3ad6425f..4d725b7759b6 100644
--- a/java/java-impl/src/com/intellij/refactoring/util/RefactoringUtil.java
+++ b/java/java-impl/src/com/intellij/refactoring/util/RefactoringUtil.java
@@ -175,7 +175,11 @@ public class RefactoringUtil {
       public int compare(final UsageInfo usage1, final UsageInfo usage2) {
         final PsiElement element1 = usage1.getElement();
         final PsiElement element2 = usage2.getElement();
-        if (element1 == null || element2 == null) return 0;
+        if (element1 == null) {
+          if (element2 == null) return 0;
+          return 1;
+        }
+        if (element2 == null) return -1;
         return element2.getTextRange().getStartOffset() - element1.getTextRange().getStartOffset();
       }
     });
diff --git a/java/java-psi-api/src/com/intellij/psi/PsiLambdaExpression.java b/java/java-psi-api/src/com/intellij/psi/PsiLambdaExpression.java
index a0e7c5371313..43633328c66d 100644
--- a/java/java-psi-api/src/com/intellij/psi/PsiLambdaExpression.java
+++ b/java/java-psi-api/src/com/intellij/psi/PsiLambdaExpression.java
@@ -22,6 +22,14 @@ import org.jetbrains.annotations.Nullable;
  * Represents a Java lambda expression.
  */
 public interface PsiLambdaExpression extends PsiExpression {
+  /**
+   * Returns this lambda expression's type parameter list (if any).
+   *
+   * @return type parameter list or null.
+   */
+  @Nullable
+  PsiTypeParameterList getTypeParameterList();
+
   /**
    * Returns this lambda expression's parameter list.
    *
@@ -31,7 +39,8 @@ public interface PsiLambdaExpression extends PsiExpression {
   PsiParameterList getParameterList();
 
   /**
-   * Returns PSI element representing lambda expression body: {@link PsiCodeBlock}, {@link PsiExpression}, or null if none.
+   * Returns PSI element representing lambda expression body: {@link PsiCodeBlock}, {@link PsiExpression},
+   * or null if the expression is incomplete.
    *
    * @return lambda expression body.
    */
diff --git a/java/java-psi-impl/src/com/intellij/lang/java/parser/ExpressionParser.java b/java/java-psi-impl/src/com/intellij/lang/java/parser/ExpressionParser.java
index f13f09658fcc..a0cc7a36a34c 100644
--- a/java/java-psi-impl/src/com/intellij/lang/java/parser/ExpressionParser.java
+++ b/java/java-psi-impl/src/com/intellij/lang/java/parser/ExpressionParser.java
@@ -163,7 +163,7 @@ public class ExpressionParser {
         return parseBinary(builder, ExprType.UNARY, MULTIPLICATIVE_OPS);
 
       case UNARY:
-        return parseUnary(builder);
+        return parseUnary(builder, false);
 
       case TYPE:
         return myParser.getReferenceParser().parseType(builder, ReferenceParser.EAT_LAST_DOT | ReferenceParser.WILDCARD);
@@ -246,14 +246,14 @@ public class ExpressionParser {
   }
 
   @Nullable
-  private PsiBuilder.Marker parseUnary(final PsiBuilder builder) {
+  private PsiBuilder.Marker parseUnary(final PsiBuilder builder, final boolean afterCast) {
     final IElementType tokenType = builder.getTokenType();
 
     if (PREFIX_OPS.contains(tokenType)) {
       final PsiBuilder.Marker unary = builder.mark();
       builder.advanceLexer();
 
-      final PsiBuilder.Marker operand = parseUnary(builder);
+      final PsiBuilder.Marker operand = parseUnary(builder, false);
       if (operand == null) {
         error(builder, JavaErrorMessages.message("expected.expression"));
       }
@@ -269,19 +269,19 @@ public class ExpressionParser {
         myParser.getReferenceParser().parseTypeInfo(builder, ReferenceParser.EAT_LAST_DOT | ReferenceParser.WILDCARD);
       if (typeInfo == null || !expect(builder, JavaTokenType.RPARENTH)) {
         typeCast.rollbackTo();
-        return parsePostfix(builder);
+        return parsePostfix(builder, false);
       }
 
       if (PREF_ARITHMETIC_OPS.contains(builder.getTokenType()) && !typeInfo.isPrimitive) {
         typeCast.rollbackTo();
-        return parsePostfix(builder);
+        return parsePostfix(builder, false);
       }
 
-      final PsiBuilder.Marker expr = parseUnary(builder);
+      final PsiBuilder.Marker expr = parseUnary(builder, true);
       if (expr == null) {
         if (!typeInfo.isParameterized) {  // cannot parse correct parenthesized expression after correct parameterized type
           typeCast.rollbackTo();
-          return parsePostfix(builder);
+          return parsePostfix(builder, false);
         }
         else {
           error(builder, JavaErrorMessages.message("expected.expression"));
@@ -292,13 +292,13 @@ public class ExpressionParser {
       return typeCast;
     }
     else {
-      return parsePostfix(builder);
+      return parsePostfix(builder, afterCast);
     }
   }
 
   @Nullable
-  private PsiBuilder.Marker parsePostfix(final PsiBuilder builder) {
-    PsiBuilder.Marker operand = parsePrimary(builder, null, -1);
+  private PsiBuilder.Marker parsePostfix(final PsiBuilder builder, final boolean afterCast) {
+    PsiBuilder.Marker operand = parsePrimary(builder, null, -1, afterCast);
     if (operand == null) return null;
 
     while (POSTFIX_OPS.contains(builder.getTokenType())) {
@@ -315,10 +315,13 @@ public class ExpressionParser {
 
   // todo[r.sh] make 'this', 'super' and 'class' reference expressions
   @Nullable
-  private PsiBuilder.Marker parsePrimary(final PsiBuilder builder, @Nullable final BreakPoint breakPoint, final int breakOffset) {
+  private PsiBuilder.Marker parsePrimary(final PsiBuilder builder,
+                                         @Nullable final BreakPoint breakPoint,
+                                         final int breakOffset,
+                                         final boolean afterCast) {
     PsiBuilder.Marker startMarker = builder.mark();
 
-    PsiBuilder.Marker expr = parsePrimaryExpressionStart(builder);
+    PsiBuilder.Marker expr = parsePrimaryExpressionStart(builder, afterCast);
     if (expr == null) {
       startMarker.drop();
       return null;
@@ -346,7 +349,7 @@ public class ExpressionParser {
           final PsiBuilder.Marker classObjAccess = parseClassAccessOrMethodReference(builder);
           if (classObjAccess == null || builder.getCurrentOffset() < offset) {
             copy.rollbackTo();
-            return parsePrimary(builder, BreakPoint.P1, offset);
+            return parsePrimary(builder, BreakPoint.P1, offset, false);
           }
 
           startMarker = copy;
@@ -370,13 +373,13 @@ public class ExpressionParser {
           final PsiBuilder.Marker ref = myParser.getReferenceParser().parseJavaCodeReference(builder, false, true, false, false, false);
           if (ref == null || builder.getTokenType() != JavaTokenType.DOT || builder.getCurrentOffset() != dotOffset) {
             copy.rollbackTo();
-            return parsePrimary(builder, BreakPoint.P2, offset);
+            return parsePrimary(builder, BreakPoint.P2, offset, false);
           }
           builder.advanceLexer();
 
           if (builder.getTokenType() != dotTokenType) {
             copy.rollbackTo();
-            return parsePrimary(builder, BreakPoint.P2, offset);
+            return parsePrimary(builder, BreakPoint.P2, offset, false);
           }
           builder.advanceLexer();
 
@@ -417,7 +420,7 @@ public class ExpressionParser {
             final PsiBuilder.Marker copy = startMarker.precede();
             startMarker.rollbackTo();
 
-            final PsiBuilder.Marker qualifier = parsePrimaryExpressionStart(builder);
+            final PsiBuilder.Marker qualifier = parsePrimaryExpressionStart(builder, false);
             if (qualifier != null) {
               final PsiBuilder.Marker refExpr = qualifier.precede();
               if (builder.getTokenType() == JavaTokenType.DOT) {
@@ -433,7 +436,7 @@ public class ExpressionParser {
             }
 
             copy.rollbackTo();
-            return parsePrimary(builder, BreakPoint.P3, -1);
+            return parsePrimary(builder, BreakPoint.P3, -1, false);
           }
           else {
             startMarker.drop();
@@ -462,7 +465,7 @@ public class ExpressionParser {
           final PsiBuilder.Marker classObjAccess = parseClassAccessOrMethodReference(builder);
           if (classObjAccess == null || builder.getCurrentOffset() <= pos) {
             copy.rollbackTo();
-            return parsePrimary(builder, BreakPoint.P4, -1);
+            return parsePrimary(builder, BreakPoint.P4, -1, false);
           }
 
           startMarker = copy;
@@ -502,7 +505,7 @@ public class ExpressionParser {
   }
 
   @Nullable
-  private PsiBuilder.Marker parsePrimaryExpressionStart(final PsiBuilder builder) {
+  private PsiBuilder.Marker parsePrimaryExpressionStart(final PsiBuilder builder, final boolean afterCast) {
     IElementType tokenType = builder.getTokenType();
 
     if (LITERALS.contains(tokenType)) {
@@ -512,21 +515,21 @@ public class ExpressionParser {
       return literal;
     }
 
+    if (tokenType == JavaTokenType.LBRACE) {
+      return parseArrayInitializer(builder);
+    }
+
+    if (tokenType == JavaTokenType.NEW_KEYWORD) {
+      return parseNew(builder, null);
+    }
+
     if (tokenType == JavaTokenType.LPARENTH) {
+      final PsiBuilder.Marker lambda = parseLambdaAfterParenth(builder, null);
+      if (lambda != null) {
+        return lambda;
+      }
+
       final PsiBuilder.Marker parenth = builder.mark();
-
-      final IElementType nextToken1 = builder.lookAhead(1);
-      final IElementType nextToken2 = builder.lookAhead(2);
-      if (nextToken1 == JavaTokenType.IDENTIFIER) {
-        if (nextToken2 == JavaTokenType.COMMA ||
-            nextToken2 == JavaTokenType.RPARENTH && builder.lookAhead(3) == JavaTokenType.ARROW) {
-          return parseLambdaExpression(builder, parenth, false);
-        }
-      }
-      else if (nextToken1 == JavaTokenType.RPARENTH && nextToken2 == JavaTokenType.ARROW) {
-        return parseLambdaExpression(builder, parenth, false);
-      }
-
       builder.advanceLexer();
 
       final PsiBuilder.Marker inner = parse(builder);
@@ -544,17 +547,15 @@ public class ExpressionParser {
       return parenth;
     }
 
-    if (tokenType == JavaTokenType.LBRACE) {
-      return parseArrayInitializer(builder);
-    }
-
     if (TYPE_START.contains(tokenType)) {
       final PsiBuilder.Marker mark = builder.mark();
 
       final ReferenceParser.TypeInfo typeInfo = myParser.getReferenceParser().parseTypeInfo(builder, 0);
       if (typeInfo != null && (typeInfo.isPrimitive || !typeInfo.hasErrors && typeInfo.isParameterized)) {
         final PsiBuilder.Marker result = continueClassAccessOrMethodReference(builder, mark, typeInfo.isPrimitive);
-        if (result != null) return result;
+        if (result != null) {
+          return result;
+        }
       }
 
       mark.rollbackTo();
@@ -568,7 +569,7 @@ public class ExpressionParser {
 
     if (tokenType == JavaTokenType.IDENTIFIER) {
       if (builder.lookAhead(1) == JavaTokenType.ARROW) {
-        return parseLambdaExpression(builder, builder.mark(), false);
+        return parseLambdaExpression(builder, false, null);
       }
 
       final PsiBuilder.Marker refExpr;
@@ -596,6 +597,29 @@ public class ExpressionParser {
     if (tokenType == JavaTokenType.LT) {
       expr = builder.mark();
 
+      if (!afterCast) {
+        final PsiBuilder.Marker typeParams = myParser.getReferenceParser().parseTypeParameters(builder, true);
+
+        if (typeParams != null) {
+          tokenType = builder.getTokenType();
+
+          PsiBuilder.Marker lambda = null;
+          if (tokenType == JavaTokenType.LPARENTH) {
+            lambda = parseLambdaAfterParenth(builder, typeParams);
+          }
+          else if (tokenType == JavaTokenType.IDENTIFIER && builder.lookAhead(1) == JavaTokenType.ARROW) {
+            lambda = parseLambdaExpression(builder, false, typeParams);
+          }
+          if (lambda != null) {
+            expr.drop();
+            return lambda;
+          }
+
+          expr.rollbackTo();
+          expr = builder.mark();
+        }
+      }
+
       if (!myParser.getReferenceParser().parseReferenceParameterList(builder, false, false)) {
         expr.rollbackTo();
         return null;
@@ -622,10 +646,6 @@ public class ExpressionParser {
       return expr;
     }
 
-    if (tokenType == JavaTokenType.NEW_KEYWORD) {
-      return parseNew(builder, null);
-    }
-
     return null;
   }
 
@@ -827,15 +847,75 @@ public class ExpressionParser {
     return start;
   }
 
-  @NotNull
-  private PsiBuilder.Marker parseLambdaExpression(final PsiBuilder builder, final PsiBuilder.Marker start, final boolean typed) {
-    myParser.getDeclarationParser().parseLambdaParameterList(builder, typed);
-    return parseLambdaExpressionFromArrow(builder, start);
+  @Nullable
+  private PsiBuilder.Marker parseLambdaAfterParenth(final PsiBuilder builder, @Nullable final PsiBuilder.Marker typeList) {
+    final boolean isLambda;
+    final boolean isTyped;
+
+    final IElementType nextToken1 = builder.lookAhead(1);
+    final IElementType nextToken2 = builder.lookAhead(2);
+    if (nextToken1 == JavaTokenType.RPARENTH && nextToken2 == JavaTokenType.ARROW) {
+      isLambda = true;
+      isTyped = false;
+    }
+    else if (nextToken1 == JavaTokenType.AT ||
+             ElementType.MODIFIER_BIT_SET.contains(nextToken1) || ElementType.PRIMITIVE_TYPE_BIT_SET.contains(nextToken1)) {
+      isLambda = true;
+      isTyped = true;
+    }
+    else if (nextToken1 == JavaTokenType.IDENTIFIER) {
+      if (nextToken2 == JavaTokenType.COMMA || nextToken2 == JavaTokenType.RPARENTH && builder.lookAhead(3) == JavaTokenType.ARROW) {
+        isLambda = true;
+        isTyped = false;
+      }
+      else if (nextToken2 == JavaTokenType.ARROW) {
+        isLambda = false;
+        isTyped = false;
+      }
+      else {
+        boolean arrow = false;
+
+        final PsiBuilder.Marker marker = builder.mark();
+        while (!builder.eof()) {
+          builder.advanceLexer();
+          final IElementType tokenType = builder.getTokenType();
+          if (tokenType == JavaTokenType.ARROW) {
+            arrow = true;
+            break;
+          }
+          if (tokenType == JavaTokenType.RPARENTH) {
+            arrow = builder.lookAhead(1) == JavaTokenType.ARROW;
+            break;
+          }
+          else if (tokenType == JavaTokenType.LPARENTH || tokenType == JavaTokenType.SEMICOLON ||
+                   tokenType == JavaTokenType.LBRACE || tokenType == JavaTokenType.RBRACE) {
+            break;
+          }
+        }
+        marker.rollbackTo();
+
+        isLambda = arrow;
+        isTyped = true;
+      }
+    }
+    else {
+      isLambda = false;
+      isTyped = false;
+    }
+
+    return isLambda ? parseLambdaExpression(builder, isTyped, typeList) : null;
   }
 
-  @NotNull
-  private PsiBuilder.Marker parseLambdaExpressionFromArrow(final PsiBuilder builder, final PsiBuilder.Marker start) {
-    builder.advanceLexer();
+  @Nullable
+  private PsiBuilder.Marker parseLambdaExpression(final PsiBuilder builder, final boolean typed, @Nullable final PsiBuilder.Marker typeList) {
+    final PsiBuilder.Marker start = typeList != null ? typeList.precede() : builder.mark();
+
+    myParser.getDeclarationParser().parseLambdaParameterList(builder, typed);
+
+    if (!expect(builder, JavaTokenType.ARROW)) {
+      start.rollbackTo();
+      return null;
+    }
 
     final PsiBuilder.Marker body;
     if (builder.getTokenType() == JavaTokenType.LBRACE) {
diff --git a/java/java-psi-impl/src/com/intellij/lang/java/parser/ReferenceParser.java b/java/java-psi-impl/src/com/intellij/lang/java/parser/ReferenceParser.java
index 0555b567fcaa..1eca52592faa 100644
--- a/java/java-psi-impl/src/com/intellij/lang/java/parser/ReferenceParser.java
+++ b/java/java-psi-impl/src/com/intellij/lang/java/parser/ReferenceParser.java
@@ -297,6 +297,13 @@ public class ReferenceParser {
 
   @NotNull
   public PsiBuilder.Marker parseTypeParameters(final PsiBuilder builder) {
+    final PsiBuilder.Marker marker = parseTypeParameters(builder, false);
+    assert marker != null;
+    return marker;
+  }
+
+  @Nullable
+  public PsiBuilder.Marker parseTypeParameters(final PsiBuilder builder, final boolean stopOnErrors) {
     final PsiBuilder.Marker list = builder.mark();
     if (!expect(builder, JavaTokenType.LT)) {
       list.done(JavaElementType.TYPE_PARAMETER_LIST);
@@ -306,6 +313,10 @@ public class ReferenceParser {
     while (true) {
       final PsiBuilder.Marker param = parseTypeParameter(builder);
       if (param == null) {
+        if (stopOnErrors) {
+          list.rollbackTo();
+          return null;
+        }
         error(builder, JavaErrorMessages.message("expected.type.parameter"));
       }
       if (!expect(builder, JavaTokenType.COMMA)) {
@@ -314,6 +325,11 @@ public class ReferenceParser {
     }
 
     if (!expect(builder, JavaTokenType.GT)) {
+      if (stopOnErrors) {
+        list.rollbackTo();
+        return null;
+      }
+
       // hack for completion
       if (builder.getTokenType() == JavaTokenType.IDENTIFIER) {
         if (builder.lookAhead(1) == JavaTokenType.GT) {
diff --git a/java/java-psi-impl/src/com/intellij/psi/impl/PsiImplUtil.java b/java/java-psi-impl/src/com/intellij/psi/impl/PsiImplUtil.java
index 221db4d7c18b..102087ed75c0 100644
--- a/java/java-psi-impl/src/com/intellij/psi/impl/PsiImplUtil.java
+++ b/java/java-psi-impl/src/com/intellij/psi/impl/PsiImplUtil.java
@@ -184,14 +184,39 @@ public class PsiImplUtil {
                                                     @NotNull final ResolveState state,
                                                     final PsiElement lastParent,
                                                     @NotNull final PsiElement place) {
+    final boolean fromBody = lastParent instanceof PsiCodeBlock;
+    final PsiTypeParameterList typeParameterList = method.getTypeParameterList();
+    final PsiParameterList parameterList = method.getParameterList();
+    return processDeclarationsInMethodLike(method, processor, state, fromBody, place, typeParameterList, parameterList);
+  }
+
+  public static boolean processDeclarationsInLambda(@NotNull final PsiLambdaExpression lambda,
+                                                    @NotNull final PsiScopeProcessor processor,
+                                                    @NotNull final ResolveState state,
+                                                    final PsiElement lastParent,
+                                                    @NotNull final PsiElement place) {
+    final boolean fromBody = lastParent != null && lastParent == lambda.getBody();
+    final PsiTypeParameterList typeParameterList = lambda.getTypeParameterList();
+    final PsiParameterList parameterList = lambda.getParameterList();
+    return processDeclarationsInMethodLike(lambda, processor, state, fromBody, place, typeParameterList, parameterList);
+  }
+
+  private static boolean processDeclarationsInMethodLike(@NotNull final PsiElement element,
+                                                         @NotNull final PsiScopeProcessor processor,
+                                                         @NotNull final ResolveState state,
+                                                         final boolean fromBody,
+                                                         @NotNull final PsiElement place,
+                                                         @Nullable final PsiTypeParameterList typeParameterList,
+                                                         @NotNull final PsiParameterList parameterList) {
+    processor.handleEvent(PsiScopeProcessor.Event.SET_DECLARATION_HOLDER, element);
+
     final ElementClassHint hint = processor.getHint(ElementClassHint.KEY);
-    processor.handleEvent(PsiScopeProcessor.Event.SET_DECLARATION_HOLDER, method);
     if (hint == null || hint.shouldProcess(ElementClassHint.DeclarationKind.CLASS)) {
-      final PsiTypeParameterList list = method.getTypeParameterList();
-      if (list != null && !list.processDeclarations(processor, state, null, place)) return false;
+      if (typeParameterList != null && !typeParameterList.processDeclarations(processor, state, null, place)) return false;
     }
-    if (lastParent instanceof PsiCodeBlock) {
-      final PsiParameter[] parameters = method.getParameterList().getParameters();
+
+    if (fromBody) {
+      final PsiParameter[] parameters = parameterList.getParameters();
       for (PsiParameter parameter : parameters) {
         if (!processor.execute(parameter, state)) return false;
       }
diff --git a/java/java-psi-impl/src/com/intellij/psi/impl/source/JavaLightStubBuilder.java b/java/java-psi-impl/src/com/intellij/psi/impl/source/JavaLightStubBuilder.java
index 5081295bc720..51170ed698c1 100644
--- a/java/java-psi-impl/src/com/intellij/psi/impl/source/JavaLightStubBuilder.java
+++ b/java/java-psi-impl/src/com/intellij/psi/impl/source/JavaLightStubBuilder.java
@@ -63,22 +63,24 @@ public class JavaLightStubBuilder extends LightStubBuilder {
       if (child instanceof ASTNodeBuilder.ASTUnparsedNodeMarker) {
         ASTNodeBuilder.ASTUnparsedNodeMarker nodeMarker = (ASTNodeBuilder.ASTUnparsedNodeMarker)child;
         final ASTNodeBuilder nodeBuilder = nodeMarker.getBuilder();
-        final int endLexemIndex = nodeMarker.getEndLexemIndex();
+        final int endLexemeIndex = nodeMarker.getEndLexemeIndex();
         boolean seenNew = false;
 
-        for(int i = nodeMarker.getStartLexemIndex(); i < endLexemIndex; ++i) {
+        for (int i = nodeMarker.getStartLexemeIndex(); i < endLexemeIndex; ++i) {
           final IElementType type = nodeBuilder.getElementType(i);
           if (type == JavaTokenType.NEW_KEYWORD) {
             seenNew = true;
-          } else if (seenNew && type == JavaTokenType.LBRACE) {
+          }
+          else if (seenNew && type == JavaTokenType.LBRACE) {
             return false;
-          } else if (seenNew && type == JavaTokenType.SEMICOLON) {
+          }
+          else if (seenNew && type == JavaTokenType.SEMICOLON) {
             seenNew = false;
-          } else if (type == JavaTokenType.AT || // local vars can be annotated and we have them in stubs!
-                     type == JavaTokenType.CLASS_KEYWORD || // local classes
-                     type == JavaTokenType.INTERFACE_KEYWORD ||
-                     type == JavaTokenType.ENUM_KEYWORD
-                    ) {
+          }
+          else if (type == JavaTokenType.AT || // local vars can be annotated and we have them in stubs!
+                   type == JavaTokenType.CLASS_KEYWORD || // local classes
+                   type == JavaTokenType.INTERFACE_KEYWORD ||
+                   type == JavaTokenType.ENUM_KEYWORD) {
             return false;
           }
         }
diff --git a/java/java-psi-impl/src/com/intellij/psi/impl/source/tree/java/PsiLambdaExpressionImpl.java b/java/java-psi-impl/src/com/intellij/psi/impl/source/tree/java/PsiLambdaExpressionImpl.java
index 7301d74c6ce7..3d80882b8d53 100644
--- a/java/java-psi-impl/src/com/intellij/psi/impl/source/tree/java/PsiLambdaExpressionImpl.java
+++ b/java/java-psi-impl/src/com/intellij/psi/impl/source/tree/java/PsiLambdaExpressionImpl.java
@@ -16,7 +16,9 @@
 package com.intellij.psi.impl.source.tree.java;
 
 import com.intellij.psi.*;
+import com.intellij.psi.impl.PsiImplUtil;
 import com.intellij.psi.impl.source.tree.JavaElementType;
+import com.intellij.psi.scope.PsiScopeProcessor;
 import com.intellij.psi.util.PsiTreeUtil;
 import org.jetbrains.annotations.NotNull;
 
@@ -25,16 +27,22 @@ public class PsiLambdaExpressionImpl extends ExpressionPsiElement implements Psi
     super(JavaElementType.LAMBDA_EXPRESSION);
   }
 
+  @Override
+  public PsiTypeParameterList getTypeParameterList() {
+    final PsiElement element = getFirstChild();
+    return element instanceof PsiTypeParameterList ? (PsiTypeParameterList)element : null;
+  }
+
   @NotNull
   @Override
   public PsiParameterList getParameterList() {
     return PsiTreeUtil.getRequiredChildOfType(this, PsiParameterList.class);
   }
 
-  @SuppressWarnings("unchecked")
   @Override
   public PsiElement getBody() {
-    return PsiTreeUtil.getChildOfAnyType(this, PsiExpression.class, PsiCodeBlock.class);
+    final PsiElement element = getLastChild();
+    return element instanceof PsiExpression || element instanceof PsiCodeBlock ? element : null;
   }
 
   @Override
@@ -52,6 +60,14 @@ public class PsiLambdaExpressionImpl extends ExpressionPsiElement implements Psi
     }
   }
 
+  @Override
+  public boolean processDeclarations(@NotNull final PsiScopeProcessor processor,
+                                     @NotNull final ResolveState state,
+                                     final PsiElement lastParent,
+                                     @NotNull final PsiElement place) {
+    return PsiImplUtil.processDeclarationsInLambda(this, processor, state, lastParent, place);
+  }
+
   @Override
   public String toString() {
     return "PsiLambdaExpression:" + getText();
diff --git a/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/advHighlighting7/LambdaExpressions.java b/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/advHighlighting7/LambdaExpressions.java
index 6522ea1376c1..14ce1ba5cffd 100644
--- a/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/advHighlighting7/LambdaExpressions.java
+++ b/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/advHighlighting7/LambdaExpressions.java
@@ -14,15 +14,27 @@
  * limitations under the License.
  */
 
+import java.util.*;
+
 class C {
   interface Simplest {
     void m();
   }
-  void simplest() { }
   void use(Simplest s) { }
 
+  interface IntParser {
+    int parse(String s);
+  }
+
+  interface ListProducer<T> {
+    List<T> produce();
+  }
+
   void test() {
     Simplest simplest = <weak_warning descr="Lambda expressions type check is not yet implemented">() -> { }</weak_warning>;
     use(<weak_warning descr="Lambda expressions type check is not yet implemented">() -> { }</weak_warning>);
+
+    IntParser intParser = <weak_warning descr="Lambda expressions type check is not yet implemented">(String s) -> Integer.parseInt(s)</weak_warning>;
+    ListProducer<String> listProducer = <weak_warning descr="Lambda expressions type check is not yet implemented"><T>() -> new ArrayList<T>()</weak_warning>;
   }
 }
\ No newline at end of file
diff --git a/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/encapsulateField/beforeFinal.java b/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/encapsulateField/beforeFinal.java
new file mode 100644
index 000000000000..e082b01cf8fb
--- /dev/null
+++ b/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/encapsulateField/beforeFinal.java
@@ -0,0 +1,13 @@
+// "Encapsulate field" "false"
+
+class A {
+  public final boolean m_bool;
+}
+
+public class B {
+  void method() {
+    A a = new A();
+
+    a.m_bo<caret>ol = true;
+  }
+}
diff --git a/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/encapsulateField/beforePrivate.java b/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/encapsulateField/beforePrivate.java
new file mode 100644
index 000000000000..061d152e95e6
--- /dev/null
+++ b/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/encapsulateField/beforePrivate.java
@@ -0,0 +1,13 @@
+// "Encapsulate field" "false"
+
+class A {
+  private boolean m_bool;
+}
+
+public class B {
+  void method() {
+    A a = new A();
+
+    a.m_bo<caret>ol = true;
+  }
+}
diff --git a/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/encapsulateField/beforeThisClass.java b/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/encapsulateField/beforeThisClass.java
new file mode 100644
index 000000000000..4721b752ed5e
--- /dev/null
+++ b/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/encapsulateField/beforeThisClass.java
@@ -0,0 +1,9 @@
+// "Encapsulate field" "false"
+
+class A {
+  public final boolean m_bool;
+
+  void method() {
+    m_bo<caret>ol = true;
+  }
+}
diff --git a/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/encapsulateField/beforeThisClassQualified.java b/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/encapsulateField/beforeThisClassQualified.java
new file mode 100644
index 000000000000..a4aa102c4a85
--- /dev/null
+++ b/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/encapsulateField/beforeThisClassQualified.java
@@ -0,0 +1,9 @@
+// "Encapsulate field" "false"
+
+class A {
+  public final boolean m_bool;
+
+  void method() {
+    this.m_bo<caret>ol = true;
+  }
+}
diff --git a/java/java-tests/testData/psi/parser-partial/expressions/AmbiguousLambdaExpression.txt b/java/java-tests/testData/psi/parser-partial/expressions/AmbiguousLambdaExpression.txt
new file mode 100644
index 000000000000..ed9dec7e3d72
--- /dev/null
+++ b/java/java-tests/testData/psi/parser-partial/expressions/AmbiguousLambdaExpression.txt
@@ -0,0 +1,52 @@
+PsiJavaFile:AmbiguousLambdaExpression.java
+  PsiMethodCallExpression:f( (x) < y , z > (w) -> v )
+    PsiReferenceExpression:f
+      PsiReferenceParameterList
+        <empty list>
+      PsiIdentifier:f('f')
+    PsiExpressionList
+      PsiJavaToken:LPARENTH('(')
+      PsiWhiteSpace(' ')
+      PsiBinaryExpression:(x) < y
+        PsiParenthesizedExpression:(x)
+          PsiJavaToken:LPARENTH('(')
+          PsiReferenceExpression:x
+            PsiReferenceParameterList
+              <empty list>
+            PsiIdentifier:x('x')
+          PsiJavaToken:RPARENTH(')')
+        PsiWhiteSpace(' ')
+        PsiJavaToken:LT('<')
+        PsiWhiteSpace(' ')
+        PsiReferenceExpression:y
+          PsiReferenceParameterList
+            <empty list>
+          PsiIdentifier:y('y')
+      PsiWhiteSpace(' ')
+      PsiJavaToken:COMMA(',')
+      PsiWhiteSpace(' ')
+      PsiBinaryExpression:z > (w) -> v
+        PsiReferenceExpression:z
+          PsiReferenceParameterList
+            <empty list>
+          PsiIdentifier:z('z')
+        PsiWhiteSpace(' ')
+        PsiJavaToken:GT('>')
+        PsiWhiteSpace(' ')
+        PsiLambdaExpression:(w) -> v
+          PsiParameterList:(w)
+            PsiJavaToken:LPARENTH('(')
+            PsiParameter:w
+              PsiModifierList:
+                <empty list>
+              PsiIdentifier:w('w')
+            PsiJavaToken:RPARENTH(')')
+          PsiWhiteSpace(' ')
+          PsiJavaToken:ARROW('->')
+          PsiWhiteSpace(' ')
+          PsiReferenceExpression:v
+            PsiReferenceParameterList
+              <empty list>
+            PsiIdentifier:v('v')
+      PsiWhiteSpace(' ')
+      PsiJavaToken:RPARENTH(')')
\ No newline at end of file
diff --git a/java/java-tests/testData/psi/parser-partial/expressions/LambdaExpression12.txt b/java/java-tests/testData/psi/parser-partial/expressions/LambdaExpression12.txt
new file mode 100644
index 000000000000..ca651c993104
--- /dev/null
+++ b/java/java-tests/testData/psi/parser-partial/expressions/LambdaExpression12.txt
@@ -0,0 +1,33 @@
+PsiJavaFile:LambdaExpression12.java
+  PsiLambdaExpression:<T>() -> new C<T>()
+    PsiTypeParameterList
+      PsiJavaToken:LT('<')
+      PsiTypeParameter:T
+        PsiIdentifier:T('T')
+        PsiElement(EXTENDS_BOUND_LIST)
+          <empty list>
+      PsiJavaToken:GT('>')
+    PsiParameterList:()
+      PsiJavaToken:LPARENTH('(')
+      PsiJavaToken:RPARENTH(')')
+    PsiWhiteSpace(' ')
+    PsiJavaToken:ARROW('->')
+    PsiWhiteSpace(' ')
+    PsiNewExpression:new C<T>()
+      PsiKeyword:new('new')
+      PsiReferenceParameterList
+        <empty list>
+      PsiWhiteSpace(' ')
+      PsiJavaCodeReferenceElement:C<T>
+        PsiIdentifier:C('C')
+        PsiReferenceParameterList
+          PsiJavaToken:LT('<')
+          PsiTypeElement:T
+            PsiJavaCodeReferenceElement:T
+              PsiIdentifier:T('T')
+              PsiReferenceParameterList
+                <empty list>
+          PsiJavaToken:GT('>')
+      PsiExpressionList
+        PsiJavaToken:LPARENTH('(')
+        PsiJavaToken:RPARENTH(')')
\ No newline at end of file
diff --git a/java/java-tests/testData/psi/parser-partial/expressions/LambdaExpression13.txt b/java/java-tests/testData/psi/parser-partial/expressions/LambdaExpression13.txt
new file mode 100644
index 000000000000..2d0cfcd4ed32
--- /dev/null
+++ b/java/java-tests/testData/psi/parser-partial/expressions/LambdaExpression13.txt
@@ -0,0 +1,21 @@
+PsiJavaFile:LambdaExpression13.java
+  PsiLambdaExpression:<T>t -> t
+    PsiTypeParameterList
+      PsiJavaToken:LT('<')
+      PsiTypeParameter:T
+        PsiIdentifier:T('T')
+        PsiElement(EXTENDS_BOUND_LIST)
+          <empty list>
+      PsiJavaToken:GT('>')
+    PsiParameterList:t
+      PsiParameter:t
+        PsiModifierList:
+          <empty list>
+        PsiIdentifier:t('t')
+    PsiWhiteSpace(' ')
+    PsiJavaToken:ARROW('->')
+    PsiWhiteSpace(' ')
+    PsiReferenceExpression:t
+      PsiReferenceParameterList
+        <empty list>
+      PsiIdentifier:t('t')
\ No newline at end of file
diff --git a/java/java-tests/testData/psi/parser-partial/expressions/LambdaExpression14.txt b/java/java-tests/testData/psi/parser-partial/expressions/LambdaExpression14.txt
new file mode 100644
index 000000000000..f93a01e3fdd4
--- /dev/null
+++ b/java/java-tests/testData/psi/parser-partial/expressions/LambdaExpression14.txt
@@ -0,0 +1,22 @@
+PsiJavaFile:LambdaExpression14.java
+  PsiLambdaExpression:(String t) -> t
+    PsiParameterList:(String t)
+      PsiJavaToken:LPARENTH('(')
+      PsiParameter:t
+        PsiModifierList:
+          <empty list>
+        PsiTypeElement:String
+          PsiJavaCodeReferenceElement:String
+            PsiIdentifier:String('String')
+            PsiReferenceParameterList
+              <empty list>
+        PsiWhiteSpace(' ')
+        PsiIdentifier:t('t')
+      PsiJavaToken:RPARENTH(')')
+    PsiWhiteSpace(' ')
+    PsiJavaToken:ARROW('->')
+    PsiWhiteSpace(' ')
+    PsiReferenceExpression:t
+      PsiReferenceParameterList
+        <empty list>
+      PsiIdentifier:t('t')
\ No newline at end of file
diff --git a/java/java-tests/testData/psi/parser-partial/expressions/LambdaExpression15.txt b/java/java-tests/testData/psi/parser-partial/expressions/LambdaExpression15.txt
new file mode 100644
index 000000000000..282306692c5c
--- /dev/null
+++ b/java/java-tests/testData/psi/parser-partial/expressions/LambdaExpression15.txt
@@ -0,0 +1,36 @@
+PsiJavaFile:LambdaExpression15.java
+  PsiLambdaExpression:(int a, int b) -> a + b
+    PsiParameterList:(int a, int b)
+      PsiJavaToken:LPARENTH('(')
+      PsiParameter:a
+        PsiModifierList:
+          <empty list>
+        PsiTypeElement:int
+          PsiKeyword:int('int')
+        PsiWhiteSpace(' ')
+        PsiIdentifier:a('a')
+      PsiJavaToken:COMMA(',')
+      PsiWhiteSpace(' ')
+      PsiParameter:b
+        PsiModifierList:
+          <empty list>
+        PsiTypeElement:int
+          PsiKeyword:int('int')
+        PsiWhiteSpace(' ')
+        PsiIdentifier:b('b')
+      PsiJavaToken:RPARENTH(')')
+    PsiWhiteSpace(' ')
+    PsiJavaToken:ARROW('->')
+    PsiWhiteSpace(' ')
+    PsiBinaryExpression:a + b
+      PsiReferenceExpression:a
+        PsiReferenceParameterList
+          <empty list>
+        PsiIdentifier:a('a')
+      PsiWhiteSpace(' ')
+      PsiJavaToken:PLUS('+')
+      PsiWhiteSpace(' ')
+      PsiReferenceExpression:b
+        PsiReferenceParameterList
+          <empty list>
+        PsiIdentifier:b('b')
\ No newline at end of file
diff --git a/java/java-tests/testData/psi/parser-partial/expressions/LambdaExpression16.txt b/java/java-tests/testData/psi/parser-partial/expressions/LambdaExpression16.txt
new file mode 100644
index 000000000000..e9b74618084e
--- /dev/null
+++ b/java/java-tests/testData/psi/parser-partial/expressions/LambdaExpression16.txt
@@ -0,0 +1,20 @@
+PsiJavaFile:LambdaExpression16.java
+  PsiLambdaExpression:(final int x) -> x
+    PsiParameterList:(final int x)
+      PsiJavaToken:LPARENTH('(')
+      PsiParameter:x
+        PsiModifierList:final
+          PsiKeyword:final('final')
+        PsiWhiteSpace(' ')
+        PsiTypeElement:int
+          PsiKeyword:int('int')
+        PsiWhiteSpace(' ')
+        PsiIdentifier:x('x')
+      PsiJavaToken:RPARENTH(')')
+    PsiWhiteSpace(' ')
+    PsiJavaToken:ARROW('->')
+    PsiWhiteSpace(' ')
+    PsiReferenceExpression:x
+      PsiReferenceParameterList
+        <empty list>
+      PsiIdentifier:x('x')
\ No newline at end of file
diff --git a/java/java-tests/testData/psi/parser-partial/expressions/LambdaExpression17.txt b/java/java-tests/testData/psi/parser-partial/expressions/LambdaExpression17.txt
new file mode 100644
index 000000000000..60be51f0ae08
--- /dev/null
+++ b/java/java-tests/testData/psi/parser-partial/expressions/LambdaExpression17.txt
@@ -0,0 +1,23 @@
+PsiJavaFile:LambdaExpression17.java
+  PsiLambdaExpression:(String s -> s
+    PsiParameterList:(String s
+      PsiJavaToken:LPARENTH('(')
+      PsiParameter:s
+        PsiModifierList:
+          <empty list>
+        PsiTypeElement:String
+          PsiJavaCodeReferenceElement:String
+            PsiIdentifier:String('String')
+            PsiReferenceParameterList
+              <empty list>
+        PsiWhiteSpace(' ')
+        PsiIdentifier:s('s')
+      PsiErrorElement:')' expected
+        <empty list>
+    PsiWhiteSpace(' ')
+    PsiJavaToken:ARROW('->')
+    PsiWhiteSpace(' ')
+    PsiReferenceExpression:s
+      PsiReferenceParameterList
+        <empty list>
+      PsiIdentifier:s('s')
\ No newline at end of file
diff --git a/java/java-tests/testData/psi/parser-partial/expressions/LambdaExpression18.txt b/java/java-tests/testData/psi/parser-partial/expressions/LambdaExpression18.txt
new file mode 100644
index 000000000000..596bf1b4b59a
--- /dev/null
+++ b/java/java-tests/testData/psi/parser-partial/expressions/LambdaExpression18.txt
@@ -0,0 +1,34 @@
+PsiJavaFile:LambdaExpression18.java
+  PsiLambdaExpression:(java.lang.String s, -> s
+    PsiParameterList:(java.lang.String s,
+      PsiJavaToken:LPARENTH('(')
+      PsiParameter:s
+        PsiModifierList:
+          <empty list>
+        PsiTypeElement:java.lang.String
+          PsiJavaCodeReferenceElement:java.lang.String
+            PsiJavaCodeReferenceElement:java.lang
+              PsiJavaCodeReferenceElement:java
+                PsiIdentifier:java('java')
+                PsiReferenceParameterList
+                  <empty list>
+              PsiJavaToken:DOT('.')
+              PsiIdentifier:lang('lang')
+              PsiReferenceParameterList
+                <empty list>
+            PsiJavaToken:DOT('.')
+            PsiIdentifier:String('String')
+            PsiReferenceParameterList
+              <empty list>
+        PsiWhiteSpace(' ')
+        PsiIdentifier:s('s')
+      PsiJavaToken:COMMA(',')
+      PsiErrorElement:Parameter expected
+        <empty list>
+    PsiWhiteSpace(' ')
+    PsiJavaToken:ARROW('->')
+    PsiWhiteSpace(' ')
+    PsiReferenceExpression:s
+      PsiReferenceParameterList
+        <empty list>
+      PsiIdentifier:s('s')
\ No newline at end of file
diff --git a/java/java-tests/testData/psi/parser-partial/expressions/LambdaExpression19.txt b/java/java-tests/testData/psi/parser-partial/expressions/LambdaExpression19.txt
new file mode 100644
index 000000000000..d76c39bdd08a
--- /dev/null
+++ b/java/java-tests/testData/psi/parser-partial/expressions/LambdaExpression19.txt
@@ -0,0 +1,31 @@
+PsiJavaFile:LambdaExpression19.java
+  PsiLambdaExpression:(@A T t) -> (null)
+    PsiParameterList:(@A T t)
+      PsiJavaToken:LPARENTH('(')
+      PsiParameter:t
+        PsiModifierList:@A
+          PsiAnnotation
+            PsiJavaToken:AT('@')
+            PsiJavaCodeReferenceElement:A
+              PsiIdentifier:A('A')
+              PsiReferenceParameterList
+                <empty list>
+            PsiAnnotationParameterList
+              <empty list>
+        PsiWhiteSpace(' ')
+        PsiTypeElement:T
+          PsiJavaCodeReferenceElement:T
+            PsiIdentifier:T('T')
+            PsiReferenceParameterList
+              <empty list>
+        PsiWhiteSpace(' ')
+        PsiIdentifier:t('t')
+      PsiJavaToken:RPARENTH(')')
+    PsiWhiteSpace(' ')
+    PsiJavaToken:ARROW('->')
+    PsiWhiteSpace(' ')
+    PsiParenthesizedExpression:(null)
+      PsiJavaToken:LPARENTH('(')
+      PsiLiteralExpression:null
+        PsiJavaToken:NULL_KEYWORD('null')
+      PsiJavaToken:RPARENTH(')')
\ No newline at end of file
diff --git a/java/java-tests/testData/refactoring/introduceParameter/afterPreserveDiamondOccurrences.java b/java/java-tests/testData/refactoring/introduceParameter/afterPreserveDiamondOccurrences.java
new file mode 100644
index 000000000000..4f62137d7950
--- /dev/null
+++ b/java/java-tests/testData/refactoring/introduceParameter/afterPreserveDiamondOccurrences.java
@@ -0,0 +1,22 @@
+
+public class TestCompletion {
+
+    public static <T, V> ParallelPipeline<T, V> test(T base, V newStage, T upstream, final ParallelPipeline<T, V> anObject) {
+        if (base != null){
+            return anObject;
+        }
+        else {
+            return new ParallelPipeline<>(upstream, newStage);
+        }
+
+    }
+
+
+    void f() {
+        test(null, null, null, new ParallelPipeline<>(null, null));
+    }
+    private static class ParallelPipeline<T, V> {
+        public ParallelPipeline(T p0, V p1) {
+        }
+    }
+}
diff --git a/java/java-tests/testData/refactoring/introduceParameter/beforePreserveDiamondOccurrences.java b/java/java-tests/testData/refactoring/introduceParameter/beforePreserveDiamondOccurrences.java
new file mode 100644
index 000000000000..2bf9a854544d
--- /dev/null
+++ b/java/java-tests/testData/refactoring/introduceParameter/beforePreserveDiamondOccurrences.java
@@ -0,0 +1,22 @@
+
+public class TestCompletion {
+
+    public static <T, V> ParallelPipeline<T, V> test(T base, V newStage, T upstream) {
+        if (base != null){
+            return <selection>new ParallelPipeline<>(base, newStage)</selection>;
+        }
+        else {
+            return new ParallelPipeline<>(upstream, newStage);
+        }
+
+    }
+
+
+    void f() {
+        test(null, null, null);
+    }
+    private static class ParallelPipeline<T, V> {
+        public ParallelPipeline(T p0, V p1) {
+        }
+    }
+}
diff --git a/java/java-tests/testSrc/com/intellij/codeInsight/intention/EncapsulateFieldTest.java b/java/java-tests/testSrc/com/intellij/codeInsight/intention/EncapsulateFieldTest.java
new file mode 100644
index 000000000000..165073beedbd
--- /dev/null
+++ b/java/java-tests/testSrc/com/intellij/codeInsight/intention/EncapsulateFieldTest.java
@@ -0,0 +1,31 @@
+/*
+ * 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.codeInsight.intention;
+
+import com.intellij.codeInsight.daemon.LightIntentionActionTestCase;
+
+/**
+ * @author Danila Ponomarenko
+ */
+public class EncapsulateFieldTest extends LightIntentionActionTestCase {
+
+  public void test() throws Exception { doAllTests(); }
+
+  @Override
+  protected String getBasePath() {
+    return "/codeInsight/daemonCodeAnalyzer/quickFix/encapsulateField";
+  }
+}
diff --git a/java/java-tests/testSrc/com/intellij/lang/java/parser/partial/ExpressionParserTest.java b/java/java-tests/testSrc/com/intellij/lang/java/parser/partial/ExpressionParserTest.java
index 87f78668a16d..f54cc3443386 100644
--- a/java/java-tests/testSrc/com/intellij/lang/java/parser/partial/ExpressionParserTest.java
+++ b/java/java-tests/testSrc/com/intellij/lang/java/parser/partial/ExpressionParserTest.java
@@ -134,6 +134,16 @@ public class ExpressionParserTest extends JavaParsingTestCase {
   public void testLambdaExpression9() { doParserTest("(I)p -> null"); }
   public void testLambdaExpression10() { doParserTest("(I)(p -> null)"); }
   public void testLambdaExpression11() { doParserTest("() -> { }"); }
+  public void testLambdaExpression12() { doParserTest("<T>() -> new C<T>()"); }
+  public void testLambdaExpression13() { doParserTest("<T>t -> t"); }
+  public void testLambdaExpression14() { doParserTest("(String t) -> t"); }
+  public void testLambdaExpression15() { doParserTest("(int a, int b) -> a + b"); }
+  public void testLambdaExpression16() { doParserTest("(final int x) -> x"); }
+  public void testLambdaExpression17() { doParserTest("(String s -> s"); }
+  public void testLambdaExpression18() { doParserTest("(java.lang.String s, -> s"); }
+  public void testLambdaExpression19() { doParserTest("(@A T t) -> (null)"); }
+
+  public void testAmbiguousLambdaExpression() { doParserTest("f( (x) < y , z > (w) -> v )"); }
 
   private void doParserTest(@NonNls final String text) {
     doParserTest(text, new MyTestParser());
diff --git a/java/java-tests/testSrc/com/intellij/refactoring/IntroduceParameterTest.java b/java/java-tests/testSrc/com/intellij/refactoring/IntroduceParameterTest.java
index 4893ce72e001..0cad5462136e 100644
--- a/java/java-tests/testSrc/com/intellij/refactoring/IntroduceParameterTest.java
+++ b/java/java-tests/testSrc/com/intellij/refactoring/IntroduceParameterTest.java
@@ -275,6 +275,10 @@ public class IntroduceParameterTest extends LightRefactoringTestCase  {
     doTest(IntroduceParameterRefactoring.REPLACE_FIELDS_WITH_GETTERS_ALL, true, false, true, false);
   }
 
+  public void testPreserveDiamondOccurrences() throws Exception {
+    doTest(IntroduceParameterRefactoring.REPLACE_FIELDS_WITH_GETTERS_ALL, true, false, true, false);
+  }
+
   public void testSubstituteTypeParams() throws Exception {
     doTest(IntroduceParameterRefactoring.REPLACE_FIELDS_WITH_GETTERS_ALL, true, false, true, false);
   }
diff --git a/jps/model-api/src/org/jetbrains/jps/model/JpsElement.java b/jps/model-api/src/org/jetbrains/jps/model/JpsElement.java
index 071ea73b35e9..2b3487eb71be 100644
--- a/jps/model-api/src/org/jetbrains/jps/model/JpsElement.java
+++ b/jps/model-api/src/org/jetbrains/jps/model/JpsElement.java
@@ -11,7 +11,7 @@ public interface JpsElement {
 
   interface BulkModificationSupport<E extends JpsElement> extends JpsElement {
     @NotNull
-    E createCopy(@NotNull JpsModel model, @NotNull JpsEventDispatcher eventDispatcher, JpsParentElement parent);
+    E createCopy();
 
     void applyChanges(@NotNull E modified);
   }
diff --git a/jps/model-api/src/org/jetbrains/jps/model/JpsElementCollection.java b/jps/model-api/src/org/jetbrains/jps/model/JpsElementCollection.java
index a95042929058..4da1ab422c3b 100644
--- a/jps/model-api/src/org/jetbrains/jps/model/JpsElementCollection.java
+++ b/jps/model-api/src/org/jetbrains/jps/model/JpsElementCollection.java
@@ -11,10 +11,10 @@ public interface JpsElementCollection<E extends JpsElement> extends JpsParentEle
   List<E> getElements();
 
   @NotNull
-  <P> E addChild(@NotNull JpsElementFactoryWithParameter<E,P> factory, @NotNull P param);
+  <P> E addChild(@NotNull JpsElementParameterizedCreator<E,P> factory, @NotNull P param);
 
   @NotNull
-  E addChild(@NotNull JpsElementFactory<E> factory);
+  E addChild(@NotNull JpsElementCreator<E> creator);
 
   E addChild(E element);
 
diff --git a/jps/model-api/src/org/jetbrains/jps/model/JpsElementContainer.java b/jps/model-api/src/org/jetbrains/jps/model/JpsElementContainer.java
index 969b3534fc53..225599f32b0e 100644
--- a/jps/model-api/src/org/jetbrains/jps/model/JpsElementContainer.java
+++ b/jps/model-api/src/org/jetbrains/jps/model/JpsElementContainer.java
@@ -10,11 +10,11 @@ public interface JpsElementContainer {
   T getChild(@NotNull JpsElementKind<T> kind);
 
   @NotNull
-  <T extends JpsElement, K extends JpsElementKind<T>&JpsElementFactory<T>>
+  <T extends JpsElement, K extends JpsElementKind<T>&JpsElementCreator<T>>
   T setChild(@NotNull K kind);
 
   @NotNull
-  <T extends JpsElement, P, K extends JpsElementKind<T>&JpsElementFactoryWithParameter<T, P>>
+  <T extends JpsElement, P, K extends JpsElementKind<T>&JpsElementParameterizedCreator<T, P>>
   T setChild(@NotNull K kind, @NotNull P param);
 
   <T extends JpsElement>
diff --git a/jps/model-api/src/org/jetbrains/jps/model/JpsElementCreator.java b/jps/model-api/src/org/jetbrains/jps/model/JpsElementCreator.java
new file mode 100644
index 000000000000..614d6ea8c3c5
--- /dev/null
+++ b/jps/model-api/src/org/jetbrains/jps/model/JpsElementCreator.java
@@ -0,0 +1,11 @@
+package org.jetbrains.jps.model;
+
+import org.jetbrains.annotations.NotNull;
+
+/**
+ * @author nik
+ */
+public interface JpsElementCreator<E extends JpsElement> {
+  @NotNull
+  E create();
+}
diff --git a/jps/model-api/src/org/jetbrains/jps/model/JpsElementFactory.java b/jps/model-api/src/org/jetbrains/jps/model/JpsElementFactory.java
index b06da51b9455..1e25c2197573 100644
--- a/jps/model-api/src/org/jetbrains/jps/model/JpsElementFactory.java
+++ b/jps/model-api/src/org/jetbrains/jps/model/JpsElementFactory.java
@@ -1,12 +1,23 @@
 package org.jetbrains.jps.model;
 
 import org.jetbrains.annotations.NotNull;
+import org.jetbrains.jps.model.library.JpsLibraryReference;
+import org.jetbrains.jps.model.module.JpsModuleReference;
+import org.jetbrains.jps.service.JpsServiceManager;
 
 /**
  * @author nik
  */
-public interface JpsElementFactory<E extends JpsElement> {
+public abstract class JpsElementFactory {
+  public static JpsElementFactory getInstance() {
+    return JpsServiceManager.getInstance().getService(JpsElementFactory.class);
+  }
 
   @NotNull
-  E create(@NotNull JpsModel model, @NotNull JpsEventDispatcher eventDispatcher, JpsParentElement parent);
+  public abstract JpsModuleReference createModuleReference(@NotNull String moduleName);
+
+  @NotNull
+  public abstract JpsLibraryReference createLibraryReference(@NotNull String libraryName,
+                                                             @NotNull JpsElementReference<? extends JpsCompositeElement> parentReference);
+
 }
diff --git a/jps/model-api/src/org/jetbrains/jps/model/JpsElementFactoryWithParameter.java b/jps/model-api/src/org/jetbrains/jps/model/JpsElementFactoryWithParameter.java
deleted file mode 100644
index 13e9103789f6..000000000000
--- a/jps/model-api/src/org/jetbrains/jps/model/JpsElementFactoryWithParameter.java
+++ /dev/null
@@ -1,11 +0,0 @@
-package org.jetbrains.jps.model;
-
-import org.jetbrains.annotations.NotNull;
-
-/**
- * @author nik
- */
-public interface JpsElementFactoryWithParameter<E extends JpsElement, P> {
-  @NotNull
-  E create(@NotNull JpsModel model, @NotNull JpsEventDispatcher eventDispatcher, JpsParentElement parent, @NotNull P param);
-}
diff --git a/jps/model-api/src/org/jetbrains/jps/model/JpsElementKind.java b/jps/model-api/src/org/jetbrains/jps/model/JpsElementKind.java
index 4e47a07bfc5a..dc3076e0c37d 100644
--- a/jps/model-api/src/org/jetbrains/jps/model/JpsElementKind.java
+++ b/jps/model-api/src/org/jetbrains/jps/model/JpsElementKind.java
@@ -6,7 +6,6 @@ import org.jetbrains.annotations.NotNull;
  * @author nik
  */
 public class JpsElementKind<E extends JpsElement> {
-
   public void fireElementAdded(@NotNull JpsEventDispatcher dispatcher, @NotNull E element) {
   }
 
diff --git a/jps/model-api/src/org/jetbrains/jps/model/JpsElementParameterizedCreator.java b/jps/model-api/src/org/jetbrains/jps/model/JpsElementParameterizedCreator.java
new file mode 100644
index 000000000000..df601c703c4c
--- /dev/null
+++ b/jps/model-api/src/org/jetbrains/jps/model/JpsElementParameterizedCreator.java
@@ -0,0 +1,11 @@
+package org.jetbrains.jps.model;
+
+import org.jetbrains.annotations.NotNull;
+
+/**
+ * @author nik
+ */
+public interface JpsElementParameterizedCreator<E extends JpsElement, P> {
+  @NotNull
+  E create(@NotNull P param);
+}
diff --git a/jps/model-api/src/org/jetbrains/jps/model/JpsElementReference.java b/jps/model-api/src/org/jetbrains/jps/model/JpsElementReference.java
index f09bbc71ace3..ff28b4a7e29c 100644
--- a/jps/model-api/src/org/jetbrains/jps/model/JpsElementReference.java
+++ b/jps/model-api/src/org/jetbrains/jps/model/JpsElementReference.java
@@ -1,5 +1,6 @@
 package org.jetbrains.jps.model;
 
+import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;
 
 /**
@@ -8,4 +9,6 @@ import org.jetbrains.annotations.Nullable;
 public interface JpsElementReference<T extends JpsElement> extends JpsElement {
   @Nullable
   T resolve();
+
+  JpsElementReference<T> asExternal(@NotNull JpsModel model);
 }
diff --git a/jps/model-api/src/org/jetbrains/jps/model/JpsModel.java b/jps/model-api/src/org/jetbrains/jps/model/JpsModel.java
index 09780fa1861f..8387e7614f9c 100644
--- a/jps/model-api/src/org/jetbrains/jps/model/JpsModel.java
+++ b/jps/model-api/src/org/jetbrains/jps/model/JpsModel.java
@@ -15,5 +15,7 @@ public interface JpsModel {
   @NotNull
   JpsModel createModifiableModel(@NotNull JpsEventDispatcher eventDispatcher);
 
+  void registerExternalReference(@NotNull JpsElementReference<?> reference);
+
   void commit();
 }
diff --git a/jps/model-api/src/org/jetbrains/jps/model/JpsReferenceableElement.java b/jps/model-api/src/org/jetbrains/jps/model/JpsReferenceableElement.java
index 4df008cce68c..765ae7c194d1 100644
--- a/jps/model-api/src/org/jetbrains/jps/model/JpsReferenceableElement.java
+++ b/jps/model-api/src/org/jetbrains/jps/model/JpsReferenceableElement.java
@@ -7,5 +7,5 @@ import org.jetbrains.annotations.NotNull;
  */
 public interface JpsReferenceableElement<E extends JpsElement> {
   @NotNull
-  JpsElementReference<E> createReference(JpsParentElement parent);
+  JpsElementReference<E> createReference();
 }
diff --git a/jps/model-api/src/org/jetbrains/jps/model/library/JpsLibrary.java b/jps/model-api/src/org/jetbrains/jps/model/library/JpsLibrary.java
index 45293113ecfe..1d79c0bcc107 100644
--- a/jps/model-api/src/org/jetbrains/jps/model/library/JpsLibrary.java
+++ b/jps/model-api/src/org/jetbrains/jps/model/library/JpsLibrary.java
@@ -2,7 +2,6 @@ package org.jetbrains.jps.model.library;
 
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.jps.model.JpsNamedElement;
-import org.jetbrains.jps.model.JpsParentElement;
 import org.jetbrains.jps.model.JpsReferenceableElement;
 
 import java.util.List;
@@ -22,5 +21,5 @@ public interface JpsLibrary extends JpsNamedElement, JpsReferenceableElement<Jps
   void delete();
 
   @NotNull
-  JpsLibraryReference createReference(JpsParentElement parent);
+  JpsLibraryReference createReference();
 }
diff --git a/jps/model-api/src/org/jetbrains/jps/model/library/JpsLibraryReference.java b/jps/model-api/src/org/jetbrains/jps/model/library/JpsLibraryReference.java
index c752520a13fd..fb6b173279e7 100644
--- a/jps/model-api/src/org/jetbrains/jps/model/library/JpsLibraryReference.java
+++ b/jps/model-api/src/org/jetbrains/jps/model/library/JpsLibraryReference.java
@@ -2,6 +2,7 @@ package org.jetbrains.jps.model.library;
 
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.jps.model.JpsElementReference;
+import org.jetbrains.jps.model.JpsModel;
 
 /**
  * @author nik
@@ -9,4 +10,7 @@ import org.jetbrains.jps.model.JpsElementReference;
 public interface JpsLibraryReference extends JpsElementReference<JpsLibrary> {
   @NotNull
   String getLibraryName();
+
+  @Override
+  JpsLibraryReference asExternal(@NotNull JpsModel model);
 }
diff --git a/jps/model-api/src/org/jetbrains/jps/model/module/JpsDependenciesList.java b/jps/model-api/src/org/jetbrains/jps/model/module/JpsDependenciesList.java
index 4954e81f6e5b..b4e08a983b28 100644
--- a/jps/model-api/src/org/jetbrains/jps/model/module/JpsDependenciesList.java
+++ b/jps/model-api/src/org/jetbrains/jps/model/module/JpsDependenciesList.java
@@ -3,6 +3,7 @@ package org.jetbrains.jps.model.module;
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.jps.model.JpsElement;
 import org.jetbrains.jps.model.library.JpsLibrary;
+import org.jetbrains.jps.model.library.JpsLibraryReference;
 import org.jetbrains.jps.model.library.JpsSdkType;
 
 import java.util.List;
@@ -14,9 +15,15 @@ public interface JpsDependenciesList extends JpsElement {
   @NotNull
   JpsModuleDependency addModuleDependency(@NotNull JpsModule module);
 
+  @NotNull
+  JpsModuleDependency addModuleDependency(@NotNull JpsModuleReference moduleReference);
+
   @NotNull
   JpsLibraryDependency addLibraryDependency(@NotNull JpsLibrary libraryElement);
 
+  @NotNull
+  JpsLibraryDependency addLibraryDependency(@NotNull JpsLibraryReference libraryReference);
+
   void addModuleSourceDependency();
 
   void addSdkDependency(@NotNull JpsSdkType<?> sdkType);
diff --git a/jps/model-api/src/org/jetbrains/jps/model/module/JpsModule.java b/jps/model-api/src/org/jetbrains/jps/model/module/JpsModule.java
index 4226ad8f7850..fdc54705c502 100644
--- a/jps/model-api/src/org/jetbrains/jps/model/module/JpsModule.java
+++ b/jps/model-api/src/org/jetbrains/jps/model/module/JpsModule.java
@@ -2,6 +2,8 @@ package org.jetbrains.jps.model.module;
 
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.jps.model.*;
+import org.jetbrains.jps.model.library.JpsLibrary;
+import org.jetbrains.jps.model.library.JpsLibraryType;
 
 import java.util.List;
 
@@ -35,7 +37,10 @@ public interface JpsModule extends JpsNamedElement, JpsReferenceableElement<JpsM
   JpsElementContainer getContainer();
 
   @NotNull
-  JpsModuleReference createReference(JpsParentElement parent);
+  JpsModuleReference createReference();
+
+  @NotNull
+  JpsLibrary addModuleLibrary(@NotNull JpsLibraryType<?> type, @NotNull String name);
 
   void delete();
 
diff --git a/jps/model-api/src/org/jetbrains/jps/model/module/JpsModuleReference.java b/jps/model-api/src/org/jetbrains/jps/model/module/JpsModuleReference.java
index 90a35bf07ec3..0449ef46868d 100644
--- a/jps/model-api/src/org/jetbrains/jps/model/module/JpsModuleReference.java
+++ b/jps/model-api/src/org/jetbrains/jps/model/module/JpsModuleReference.java
@@ -2,6 +2,7 @@ package org.jetbrains.jps.model.module;
 
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.jps.model.JpsElementReference;
+import org.jetbrains.jps.model.JpsModel;
 
 /**
  * @author nik
@@ -9,4 +10,7 @@ import org.jetbrains.jps.model.JpsElementReference;
 public interface JpsModuleReference extends JpsElementReference<JpsModule> {
   @NotNull
   String getModuleName();
+
+  @Override
+  JpsModuleReference asExternal(@NotNull JpsModel model);
 }
diff --git a/jps/model-api/src/org/jetbrains/jps/model/module/JpsSdkReferencesTable.java b/jps/model-api/src/org/jetbrains/jps/model/module/JpsSdkReferencesTable.java
index cf0a081869a9..d4ebfda7a167 100644
--- a/jps/model-api/src/org/jetbrains/jps/model/module/JpsSdkReferencesTable.java
+++ b/jps/model-api/src/org/jetbrains/jps/model/module/JpsSdkReferencesTable.java
@@ -3,7 +3,6 @@ package org.jetbrains.jps.model.module;
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;
 import org.jetbrains.jps.model.JpsCompositeElement;
-import org.jetbrains.jps.model.library.JpsLibrary;
 import org.jetbrains.jps.model.library.JpsLibraryReference;
 import org.jetbrains.jps.model.library.JpsSdkType;
 
@@ -14,5 +13,5 @@ public interface JpsSdkReferencesTable extends JpsCompositeElement {
   @Nullable
   JpsLibraryReference getSdkReference(@NotNull JpsSdkType<?> type);
 
-  void setSdkReference(@NotNull JpsSdkType<?> type, @NotNull JpsLibrary sdk);
+  void setSdkReference(@NotNull JpsSdkType<?> type, @NotNull JpsLibraryReference sdkReference);
 }
diff --git a/jps/model-api/src/org/jetbrains/jps/service/JpsServiceManager.java b/jps/model-api/src/org/jetbrains/jps/service/JpsServiceManager.java
new file mode 100644
index 000000000000..d24524ca3664
--- /dev/null
+++ b/jps/model-api/src/org/jetbrains/jps/service/JpsServiceManager.java
@@ -0,0 +1,21 @@
+package org.jetbrains.jps.service;
+
+import java.util.ServiceLoader;
+
+/**
+ * @author nik
+ */
+public abstract class JpsServiceManager {
+  public static JpsServiceManager getInstance() {
+    return InstanceHolder.INSTANCE;
+  }
+
+  public abstract <T> T getService(Class<T> serviceClass);
+
+  private static class InstanceHolder {
+    private static final JpsServiceManager INSTANCE;
+    static {
+      INSTANCE = ServiceLoader.load(JpsServiceManager.class).iterator().next();
+    }
+  }
+}
diff --git a/jps/model-impl/src/META-INF/services/org.jetbrains.jps.model.JpsElementFactory b/jps/model-impl/src/META-INF/services/org.jetbrains.jps.model.JpsElementFactory
new file mode 100644
index 000000000000..2053df115032
--- /dev/null
+++ b/jps/model-impl/src/META-INF/services/org.jetbrains.jps.model.JpsElementFactory
@@ -0,0 +1 @@
+org.jetbrains.jps.model.impl.JpsElementFactoryImpl
\ No newline at end of file
diff --git a/jps/model-impl/src/META-INF/services/org.jetbrains.jps.service.JpsServiceManager b/jps/model-impl/src/META-INF/services/org.jetbrains.jps.service.JpsServiceManager
new file mode 100644
index 000000000000..6e703605a384
--- /dev/null
+++ b/jps/model-impl/src/META-INF/services/org.jetbrains.jps.service.JpsServiceManager
@@ -0,0 +1 @@
+org.jetbrains.jps.service.impl.JpsServiceManagerImpl
\ No newline at end of file
diff --git a/jps/model-impl/src/org/jetbrains/jps/model/impl/JpsCompositeElementBase.java b/jps/model-impl/src/org/jetbrains/jps/model/impl/JpsCompositeElementBase.java
index c1b38364d791..70c6558560ad 100644
--- a/jps/model-impl/src/org/jetbrains/jps/model/impl/JpsCompositeElementBase.java
+++ b/jps/model-impl/src/org/jetbrains/jps/model/impl/JpsCompositeElementBase.java
@@ -8,19 +8,13 @@ import org.jetbrains.jps.model.*;
  */
 public abstract class JpsCompositeElementBase<Self extends JpsCompositeElementBase<Self>> extends JpsElementBase<Self> implements JpsCompositeElement {
   protected final JpsElementContainerImpl myContainer;
-  protected final JpsModel myModel;
 
-  protected JpsCompositeElementBase(JpsModel model, JpsEventDispatcher eventDispatcher, JpsParentElement parent) {
-    super(eventDispatcher, parent);
-    myModel = model;
-    myContainer = new JpsElementContainerImpl(model, eventDispatcher, this);
+  protected JpsCompositeElementBase() {
+    myContainer = new JpsElementContainerImpl(this);
   }
 
-  protected JpsCompositeElementBase(JpsCompositeElementBase<Self> original, JpsModel model, JpsEventDispatcher dispatcher,
-                                    JpsParentElement parent) {
-    super(original, dispatcher, parent);
-    myModel = model;
-    myContainer = new JpsElementContainerImpl(original.myContainer, model, dispatcher, this);
+  protected JpsCompositeElementBase(JpsCompositeElementBase<Self> original) {
+    myContainer = new JpsElementContainerImpl(original.myContainer, this);
   }
 
   public void applyChanges(@NotNull Self element) {
diff --git a/jps/model-impl/src/org/jetbrains/jps/model/impl/JpsElementBase.java b/jps/model-impl/src/org/jetbrains/jps/model/impl/JpsElementBase.java
index 12c982d8f708..dd53713729d0 100644
--- a/jps/model-impl/src/org/jetbrains/jps/model/impl/JpsElementBase.java
+++ b/jps/model-impl/src/org/jetbrains/jps/model/impl/JpsElementBase.java
@@ -1,27 +1,52 @@
 package org.jetbrains.jps.model.impl;
 
+import com.intellij.openapi.diagnostic.Logger;
 import org.jetbrains.annotations.NotNull;
+import org.jetbrains.annotations.Nullable;
 import org.jetbrains.jps.model.*;
 
 /**
  * @author nik
  */
 public abstract class JpsElementBase<Self extends JpsElementBase<Self>> implements JpsElement, JpsElement.BulkModificationSupport<Self> {
-  private JpsEventDispatcher myEventDispatcher;
-  protected JpsParentElement myParent;
+  private static final Logger LOG = Logger.getInstance("#org.jetbrains.jps.model.impl.JpsElementBase");
+  protected JpsElementBase myParent;
 
-  protected JpsElementBase(JpsEventDispatcher eventDispatcher, JpsParentElement parent) {
-    myEventDispatcher = eventDispatcher;
+  protected JpsElementBase() {
+  }
+
+  public void setParent(@Nullable JpsElementBase<?> parent) {
+    if (myParent != null && parent != null) {
+      LOG.error("Parent for " + this + " is already set");
+    }
     myParent = parent;
   }
 
-  public JpsElementBase(JpsElementBase original, JpsEventDispatcher eventDispatcher, JpsParentElement parent) {
-    myEventDispatcher = eventDispatcher;
-    myParent = parent;
+  protected void fireElementChanged() {
+    final JpsEventDispatcher eventDispatcher = getEventDispatcher();
+    if (eventDispatcher != null) {
+      eventDispatcher.fireElementChanged(this);
+    }
   }
 
+  protected static void setParent(@NotNull JpsElement element, @Nullable JpsElementBase<?> parent) {
+    ((JpsElementBase<?>)element).setParent(parent);
+  }
+
+  @Nullable
   protected JpsEventDispatcher getEventDispatcher() {
-    return myEventDispatcher;
+    if (myParent != null) {
+      return myParent.getEventDispatcher();
+    }
+    return null;
+  }
+
+  @Nullable
+  protected JpsModel getModel() {
+    if (myParent != null) {
+      return myParent.getModel();
+    }
+    return null;
   }
 
   @NotNull
@@ -31,11 +56,11 @@ public abstract class JpsElementBase<Self extends JpsElementBase<Self>> implemen
   }
 
   @NotNull
-  public abstract Self createCopy(@NotNull JpsModel model, @NotNull JpsEventDispatcher eventDispatcher, JpsParentElement parent);
+  public abstract Self createCopy();
 
   public abstract void applyChanges(@NotNull Self modified);
 
-  public JpsParentElement getParent() {
+  public JpsElementBase getParent() {
     return myParent;
   }
 }
diff --git a/jps/model-impl/src/org/jetbrains/jps/model/impl/JpsElementCollectionImpl.java b/jps/model-impl/src/org/jetbrains/jps/model/impl/JpsElementCollectionImpl.java
index 3afa780758c9..bd950d6ea6af 100644
--- a/jps/model-impl/src/org/jetbrains/jps/model/impl/JpsElementCollectionImpl.java
+++ b/jps/model-impl/src/org/jetbrains/jps/model/impl/JpsElementCollectionImpl.java
@@ -11,30 +11,23 @@ import java.util.*;
  */
 public class JpsElementCollectionImpl<E extends JpsElement> extends JpsElementBase<JpsElementCollectionImpl<E>> implements JpsElementCollection<E> {
   private final List<E> myElements;
-  private final JpsModel myModel;
   private final Map<E, E> myCopyToOriginal;
   private final JpsElementKind<E> myKind;
 
-  public JpsElementCollectionImpl(JpsElementKind<E> kind, JpsModel model, JpsEventDispatcher eventDispatcher, JpsParentElement parent) {
-    super(eventDispatcher, parent);
+  public JpsElementCollectionImpl(JpsElementKind<E> kind) {
     myKind = kind;
-    myModel = model;
     myElements = new SmartList<E>();
     myCopyToOriginal = null;
   }
 
-  public JpsElementCollectionImpl(JpsElementCollectionImpl<E> original,
-                                  JpsModel model,
-                                  JpsEventDispatcher eventDispatcher,
-                                  JpsParentElement parent) {
-    super(original, eventDispatcher, parent);
+  public JpsElementCollectionImpl(JpsElementCollectionImpl<E> original) {
     myKind = original.myKind;
-    myModel = model;
     myElements = new SmartList<E>();
     myCopyToOriginal = new HashMap<E, E>();
     for (E e : original.myElements) {
       //noinspection unchecked
-      final E copy = (E)e.getBulkModificationSupport().createCopy(model, eventDispatcher, parent);
+      final E copy = (E)e.getBulkModificationSupport().createCopy();
+      setParent(copy, this);
       myElements.add(copy);
       myCopyToOriginal.put(copy, e);
     }
@@ -47,20 +40,24 @@ public class JpsElementCollectionImpl<E extends JpsElement> extends JpsElementBa
 
   @NotNull
   @Override
-  public <P> E addChild(@NotNull JpsElementFactoryWithParameter<E, P> factory, @NotNull P param) {
-    return addChild(factory.create(myModel, getEventDispatcher(), myParent, param));
+  public <P> E addChild(@NotNull JpsElementParameterizedCreator<E, P> factory, @NotNull P param) {
+    return addChild(factory.create(param));
   }
 
   @NotNull
   @Override
-  public E addChild(@NotNull JpsElementFactory<E> factory) {
-    return addChild(factory.create(myModel, getEventDispatcher(), myParent));
+  public E addChild(@NotNull JpsElementCreator<E> creator) {
+    return addChild(creator.create());
   }
 
   @Override
   public E addChild(E element) {
     myElements.add(element);
-    getEventDispatcher().fireElementAdded(element, myKind);
+    setParent(element, this);
+    final JpsEventDispatcher eventDispatcher = getEventDispatcher();
+    if (eventDispatcher != null) {
+      eventDispatcher.fireElementAdded(element, myKind);
+    }
     return element;
   }
 
@@ -68,16 +65,18 @@ public class JpsElementCollectionImpl<E extends JpsElement> extends JpsElementBa
   public void removeChild(@NotNull E element) {
     final boolean removed = myElements.remove(element);
     if (removed) {
-      getEventDispatcher().fireElementRemoved(element, myKind);
+      final JpsEventDispatcher eventDispatcher = getEventDispatcher();
+      if (eventDispatcher != null) {
+        eventDispatcher.fireElementRemoved(element, myKind);
+      }
+      setParent(element, null);
     }
   }
 
   @NotNull
   @Override
-  public JpsElementCollectionImpl<E> createCopy(@NotNull JpsModel model,
-                                                @NotNull JpsEventDispatcher eventDispatcher,
-                                                JpsParentElement parent) {
-    return new JpsElementCollectionImpl<E>(this, model, eventDispatcher, parent);
+  public JpsElementCollectionImpl<E> createCopy() {
+    return new JpsElementCollectionImpl<E>(this);
   }
 
   public void applyChanges(@NotNull JpsElementCollectionImpl<E> modified) {
@@ -93,7 +92,7 @@ public class JpsElementCollectionImpl<E extends JpsElement> extends JpsElementBa
       }
       else {
         //noinspection unchecked
-        final E copy = (E)element.getBulkModificationSupport().createCopy(myModel, getEventDispatcher(), myParent);
+        final E copy = (E)element.getBulkModificationSupport().createCopy();
         toAdd.add(copy);
       }
     }
diff --git a/jps/model-impl/src/org/jetbrains/jps/model/impl/JpsElementCollectionKind.java b/jps/model-impl/src/org/jetbrains/jps/model/impl/JpsElementCollectionKind.java
index 89ec021e072c..aae141b3b861 100644
--- a/jps/model-impl/src/org/jetbrains/jps/model/impl/JpsElementCollectionKind.java
+++ b/jps/model-impl/src/org/jetbrains/jps/model/impl/JpsElementCollectionKind.java
@@ -7,7 +7,7 @@ import org.jetbrains.jps.model.*;
  * @author nik
  */
 public class JpsElementCollectionKind<E extends JpsElement> extends JpsElementKind<JpsElementCollectionImpl<E>>
-  implements JpsElementFactory<JpsElementCollectionImpl<E>> {
+                                                            implements JpsElementCreator<JpsElementCollectionImpl<E>> {
   private final JpsElementKind<E> myElementKind;
 
   public JpsElementCollectionKind(JpsElementKind<E> elementKind) {
@@ -16,9 +16,7 @@ public class JpsElementCollectionKind<E extends JpsElement> extends JpsElementKi
 
   @NotNull
   @Override
-  public JpsElementCollectionImpl<E> create(@NotNull JpsModel model,
-                                            @NotNull JpsEventDispatcher eventDispatcher,
-                                            JpsParentElement parent) {
-    return new JpsElementCollectionImpl<E>(myElementKind, model, eventDispatcher, parent);
+  public JpsElementCollectionImpl<E> create() {
+    return new JpsElementCollectionImpl<E>(myElementKind);
   }
 }
diff --git a/jps/model-impl/src/org/jetbrains/jps/model/impl/JpsElementContainerImpl.java b/jps/model-impl/src/org/jetbrains/jps/model/impl/JpsElementContainerImpl.java
index a231add0dd96..2a77a6896844 100644
--- a/jps/model-impl/src/org/jetbrains/jps/model/impl/JpsElementContainerImpl.java
+++ b/jps/model-impl/src/org/jetbrains/jps/model/impl/JpsElementContainerImpl.java
@@ -1,6 +1,7 @@
 package org.jetbrains.jps.model.impl;
 
 import org.jetbrains.annotations.NotNull;
+import org.jetbrains.annotations.Nullable;
 import org.jetbrains.jps.model.*;
 
 import java.util.HashMap;
@@ -11,25 +12,19 @@ import java.util.Map;
  */
 public class JpsElementContainerImpl implements JpsElementContainer {
   private final Map<JpsElementKind<?>, JpsElement> myElements = new HashMap<JpsElementKind<?>, JpsElement>();
-  private final @NotNull JpsModel myModel;
-  private final @NotNull JpsEventDispatcher myEventDispatcher;
-  private final @NotNull JpsParentElement myParent;
+  private final @NotNull JpsCompositeElementBase<?> myParent;
 
-  public JpsElementContainerImpl(@NotNull JpsModel model,
-                                 @NotNull JpsEventDispatcher eventDispatcher, JpsParentElement parent) {
-    myModel = model;
-    myEventDispatcher = eventDispatcher;
+  public JpsElementContainerImpl(@NotNull JpsCompositeElementBase<?> parent) {
     myParent = parent;
   }
 
-  public JpsElementContainerImpl(@NotNull JpsElementContainerImpl original, @NotNull JpsModel model,
-                                 @NotNull JpsEventDispatcher eventDispatcher, JpsParentElement parent) {
-    myModel = model;
-    myEventDispatcher = eventDispatcher;
+  public JpsElementContainerImpl(@NotNull JpsElementContainerImpl original, @NotNull JpsCompositeElementBase<?> parent) {
     myParent = parent;
     for (Map.Entry<JpsElementKind<?>, JpsElement> entry : original.myElements.entrySet()) {
       final JpsElementKind kind = entry.getKey();
-      myElements.put(kind, entry.getValue().getBulkModificationSupport().createCopy(myModel, myEventDispatcher, myParent));
+      final JpsElement copy = entry.getValue().getBulkModificationSupport().createCopy();
+      JpsElementBase.setParent(copy, myParent);
+      myElements.put(kind, copy);
     }
   }
 
@@ -41,23 +36,27 @@ public class JpsElementContainerImpl implements JpsElementContainer {
 
   @NotNull
   @Override
-  public <T extends JpsElement, P, K extends JpsElementKind<T> & JpsElementFactoryWithParameter<T, P>> T setChild(@NotNull K kind,
+  public <T extends JpsElement, P, K extends JpsElementKind<T> & JpsElementParameterizedCreator<T, P>> T setChild(@NotNull K kind,
                                                                                                                   @NotNull P param) {
-    final T child = kind.create(myModel, myEventDispatcher, myParent, param);
+    final T child = kind.create(param);
     return setChild(kind, child);
   }
 
   @NotNull
   @Override
-  public <T extends JpsElement, K extends JpsElementKind<T> & JpsElementFactory<T>> T setChild(@NotNull K kind) {
-    final T child = kind.create(myModel, myEventDispatcher, myParent);
+  public <T extends JpsElement, K extends JpsElementKind<T> & JpsElementCreator<T>> T setChild(@NotNull K kind) {
+    final T child = kind.create();
     return setChild(kind, child);
   }
 
   @Override
   public <T extends JpsElement> T setChild(JpsElementKind<T> kind, T child) {
     myElements.put(kind, child);
-    myEventDispatcher.fireElementAdded(child, kind);
+    JpsElementBase.setParent(child, myParent);
+    final JpsEventDispatcher eventDispatcher = getEventDispatcher();
+    if (eventDispatcher != null) {
+      eventDispatcher.fireElementAdded(child, kind);
+    }
     return child;
   }
 
@@ -65,7 +64,11 @@ public class JpsElementContainerImpl implements JpsElementContainer {
   public <T extends JpsElement> void removeChild(@NotNull JpsElementKind<T> kind) {
     //noinspection unchecked
     final T removed = (T)myElements.remove(kind);
-    myEventDispatcher.fireElementRemoved(removed, kind);
+    final JpsEventDispatcher eventDispatcher = getEventDispatcher();
+    if (eventDispatcher != null) {
+      eventDispatcher.fireElementRemoved(removed, kind);
+    }
+    JpsElementBase.setParent(removed, null);
   }
 
   public void applyChanges(@NotNull JpsElementContainerImpl modified) {
@@ -92,7 +95,12 @@ public class JpsElementContainerImpl implements JpsElementContainer {
     }
     else {
       //noinspection unchecked
-      setChild(kind, (T)modifiedChild.getBulkModificationSupport().createCopy(myModel, myEventDispatcher, myParent));
+      setChild(kind, (T)modifiedChild.getBulkModificationSupport().createCopy());
     }
   }
+
+  @Nullable
+  private JpsEventDispatcher getEventDispatcher() {
+    return myParent.getEventDispatcher();
+  }
 }
diff --git a/jps/model-impl/src/org/jetbrains/jps/model/impl/JpsElementFactoryImpl.java b/jps/model-impl/src/org/jetbrains/jps/model/impl/JpsElementFactoryImpl.java
new file mode 100644
index 000000000000..70492b460fe7
--- /dev/null
+++ b/jps/model-impl/src/org/jetbrains/jps/model/impl/JpsElementFactoryImpl.java
@@ -0,0 +1,26 @@
+package org.jetbrains.jps.model.impl;
+
+import org.jetbrains.annotations.NotNull;
+import org.jetbrains.jps.model.*;
+import org.jetbrains.jps.model.library.JpsLibraryReference;
+import org.jetbrains.jps.model.library.impl.JpsLibraryReferenceImpl;
+import org.jetbrains.jps.model.module.JpsModuleReference;
+import org.jetbrains.jps.model.module.impl.JpsModuleReferenceImpl;
+
+/**
+ * @author nik
+ */
+public class JpsElementFactoryImpl extends JpsElementFactory {
+  @NotNull
+  @Override
+  public JpsModuleReference createModuleReference(@NotNull String moduleName) {
+    return new JpsModuleReferenceImpl(moduleName);
+  }
+
+  @NotNull
+  @Override
+  public JpsLibraryReference createLibraryReference(@NotNull String libraryName,
+                                                    @NotNull JpsElementReference<? extends JpsCompositeElement> parentReference) {
+    return new JpsLibraryReferenceImpl(libraryName, parentReference);
+  }
+}
diff --git a/jps/model-impl/src/org/jetbrains/jps/model/impl/JpsElementReferenceBase.java b/jps/model-impl/src/org/jetbrains/jps/model/impl/JpsElementReferenceBase.java
new file mode 100644
index 000000000000..3b6a86b9ade1
--- /dev/null
+++ b/jps/model-impl/src/org/jetbrains/jps/model/impl/JpsElementReferenceBase.java
@@ -0,0 +1,17 @@
+package org.jetbrains.jps.model.impl;
+
+import org.jetbrains.annotations.NotNull;
+import org.jetbrains.jps.model.JpsElement;
+import org.jetbrains.jps.model.JpsElementReference;
+import org.jetbrains.jps.model.JpsModel;
+
+/**
+ * @author nik
+ */
+public abstract class JpsElementReferenceBase<E extends JpsElementReferenceBase<E, T>, T extends JpsElement> extends JpsElementBase<E> implements JpsElementReference<T> {
+  @Override
+  public JpsElementReference<T> asExternal(@NotNull JpsModel model) {
+    model.registerExternalReference(this);
+    return this;
+  }
+}
diff --git a/jps/model-impl/src/org/jetbrains/jps/model/impl/JpsGlobalElementReference.java b/jps/model-impl/src/org/jetbrains/jps/model/impl/JpsGlobalElementReference.java
index 4e245d5dcf98..17f61a22047e 100644
--- a/jps/model-impl/src/org/jetbrains/jps/model/impl/JpsGlobalElementReference.java
+++ b/jps/model-impl/src/org/jetbrains/jps/model/impl/JpsGlobalElementReference.java
@@ -6,25 +6,17 @@ import org.jetbrains.jps.model.*;
 /**
  * @author nik
  */
-public class JpsGlobalElementReference extends JpsElementBase<JpsGlobalElementReference> implements JpsElementReference<JpsGlobal> {
-  private final JpsModel myModel;
-
-  public JpsGlobalElementReference(JpsModel model, JpsEventDispatcher eventDispatcher, JpsParentElement parent) {
-    super(eventDispatcher, parent);
-    myModel = model;
-  }
-
+public class JpsGlobalElementReference extends JpsElementReferenceBase<JpsGlobalElementReference, JpsGlobal> {
   @Override
   public JpsGlobal resolve() {
-    return myModel.getGlobal();
+    final JpsModel model = getModel();
+    return model != null ? model.getGlobal() : null;
   }
 
   @NotNull
   @Override
-  public JpsGlobalElementReference createCopy(@NotNull JpsModel model,
-                                              @NotNull JpsEventDispatcher eventDispatcher,
-                                              JpsParentElement parent) {
-    return new JpsGlobalElementReference(model, eventDispatcher, parent);
+  public JpsGlobalElementReference createCopy() {
+    return new JpsGlobalElementReference();
   }
 
   @Override
diff --git a/jps/model-impl/src/org/jetbrains/jps/model/impl/JpsGlobalImpl.java b/jps/model-impl/src/org/jetbrains/jps/model/impl/JpsGlobalImpl.java
index b6cbe9e08d04..c5bb2c500b64 100644
--- a/jps/model-impl/src/org/jetbrains/jps/model/impl/JpsGlobalImpl.java
+++ b/jps/model-impl/src/org/jetbrains/jps/model/impl/JpsGlobalImpl.java
@@ -10,32 +10,26 @@ import org.jetbrains.jps.model.library.impl.JpsLibraryKind;
 /**
  * @author nik
  */
-public class JpsGlobalImpl extends JpsCompositeElementBase<JpsGlobalImpl> implements JpsGlobal {
+public class JpsGlobalImpl extends JpsRootElementBase<JpsGlobalImpl> implements JpsGlobal {
   public JpsGlobalImpl(JpsModel model, JpsEventDispatcher eventDispatcher) {
-    super(model, eventDispatcher, null);
+    super(model, eventDispatcher);
     myContainer.setChild(JpsLibraryKind.LIBRARIES_COLLECTION_KIND);
   }
 
   public JpsGlobalImpl(JpsGlobalImpl original, JpsModel model, JpsEventDispatcher eventDispatcher) {
-    super(original, model, eventDispatcher, null);
-  }
-
-  @NotNull
-  @Override
-  public JpsGlobalImpl createCopy(@NotNull JpsModel model, @NotNull JpsEventDispatcher eventDispatcher, JpsParentElement parent) {
-    return new JpsGlobalImpl(this, model, eventDispatcher);
+    super(original, model, eventDispatcher);
   }
 
   @NotNull
   @Override
   public JpsLibrary addLibrary(@NotNull JpsLibraryType libraryType, @NotNull final String name) {
     final JpsElementCollectionImpl<JpsLibraryImpl> collection = myContainer.getChild(JpsLibraryKind.LIBRARIES_COLLECTION_KIND);
-    return collection.addChild(new JpsLibraryImpl(name, libraryType, myModel, getEventDispatcher(), collection));
+    return collection.addChild(new JpsLibraryImpl(name, libraryType));
   }
 
   @NotNull
   @Override
-  public JpsElementReference<JpsGlobal> createReference(JpsParentElement parent) {
-    return new JpsGlobalElementReference(myModel, getEventDispatcher(), parent);
+  public JpsElementReference<JpsGlobal> createReference() {
+    return new JpsGlobalElementReference();
   }
 }
diff --git a/jps/model-impl/src/org/jetbrains/jps/model/impl/JpsModelImpl.java b/jps/model-impl/src/org/jetbrains/jps/model/impl/JpsModelImpl.java
index ae6b7f4d1f8c..60e55362a367 100644
--- a/jps/model-impl/src/org/jetbrains/jps/model/impl/JpsModelImpl.java
+++ b/jps/model-impl/src/org/jetbrains/jps/model/impl/JpsModelImpl.java
@@ -1,6 +1,7 @@
 package org.jetbrains.jps.model.impl;
 
 import org.jetbrains.annotations.NotNull;
+import org.jetbrains.jps.model.JpsElementReference;
 import org.jetbrains.jps.model.JpsEventDispatcher;
 import org.jetbrains.jps.model.JpsModel;
 
@@ -11,14 +12,17 @@ public class JpsModelImpl implements JpsModel {
   private JpsProjectImpl myProject;
   private JpsGlobalImpl myGlobal;
   private JpsModelImpl myOriginalModel;
+  private final JpsEventDispatcher myEventDispatcher;
 
   public JpsModelImpl(JpsEventDispatcher eventDispatcher) {
+    myEventDispatcher = eventDispatcher;
     myProject = new JpsProjectImpl(this, eventDispatcher);
     myGlobal = new JpsGlobalImpl(this, eventDispatcher);
   }
 
   private JpsModelImpl(JpsModelImpl original, JpsEventDispatcher eventDispatcher) {
     myOriginalModel = original;
+    myEventDispatcher = eventDispatcher;
     myProject = new JpsProjectImpl(original.myProject, this, eventDispatcher);
     myGlobal = new JpsGlobalImpl(original.myGlobal, this, eventDispatcher);
   }
@@ -39,6 +43,11 @@ public class JpsModelImpl implements JpsModel {
     return new JpsModelImpl(this, eventDispatcher);
   }
 
+  @Override
+  public void registerExternalReference(@NotNull JpsElementReference<?> reference) {
+    myProject.addExternalReference(reference);
+  }
+
   @Override
   public void commit() {
     myOriginalModel.applyChanges(this);
diff --git a/jps/model-impl/src/org/jetbrains/jps/model/impl/JpsNamedCompositeElementBase.java b/jps/model-impl/src/org/jetbrains/jps/model/impl/JpsNamedCompositeElementBase.java
index e05473c5fab1..b5a163ad2fa0 100644
--- a/jps/model-impl/src/org/jetbrains/jps/model/impl/JpsNamedCompositeElementBase.java
+++ b/jps/model-impl/src/org/jetbrains/jps/model/impl/JpsNamedCompositeElementBase.java
@@ -11,17 +11,13 @@ public abstract class JpsNamedCompositeElementBase<Self extends JpsNamedComposit
   implements JpsNamedElement {
   private String myName;
 
-  protected JpsNamedCompositeElementBase(JpsModel model,
-                                         JpsEventDispatcher eventDispatcher,
-                                         @NotNull String name, JpsParentElement parent) {
-    super(model, eventDispatcher, parent);
+  protected JpsNamedCompositeElementBase(@NotNull String name) {
+    super();
     myName = name;
   }
 
-  protected JpsNamedCompositeElementBase(JpsNamedCompositeElementBase<Self, Parent> original,
-                                         JpsModel model,
-                                         JpsEventDispatcher eventDispatcher, JpsParentElement parent) {
-    super(original, model, eventDispatcher, parent);
+  protected JpsNamedCompositeElementBase(JpsNamedCompositeElementBase<Self, Parent> original) {
+    super(original);
     myName = original.myName;
   }
 
@@ -41,7 +37,10 @@ public abstract class JpsNamedCompositeElementBase<Self extends JpsNamedComposit
     if (!myName.equals(name)) {
       String oldName = myName;
       myName = name;
-      getEventDispatcher().fireElementRenamed(this, oldName, name);
+      final JpsEventDispatcher eventDispatcher = getEventDispatcher();
+      if (eventDispatcher != null) {
+        eventDispatcher.fireElementRenamed(this, oldName, name);
+      }
     }
   }
 }
diff --git a/jps/model-impl/src/org/jetbrains/jps/model/impl/JpsNamedElementReferenceBase.java b/jps/model-impl/src/org/jetbrains/jps/model/impl/JpsNamedElementReferenceBase.java
index 9e083cf5a66b..3e00ac907e7e 100644
--- a/jps/model-impl/src/org/jetbrains/jps/model/impl/JpsNamedElementReferenceBase.java
+++ b/jps/model-impl/src/org/jetbrains/jps/model/impl/JpsNamedElementReferenceBase.java
@@ -13,18 +13,17 @@ public abstract class JpsNamedElementReferenceBase<T extends JpsNamedElement, Se
   private final JpsElementCollectionKind<? extends T> myCollectionKind;
   protected final String myElementName;
 
-  protected JpsNamedElementReferenceBase(@NotNull JpsModel model, @NotNull JpsEventDispatcher eventDispatcher, @NotNull JpsElementCollectionKind<? extends T> kind, @NotNull String elementName,
-                                         @NotNull JpsElementReference<? extends JpsCompositeElement> parentReference, JpsParentElement parent) {
-    super(model, eventDispatcher, parent);
+  protected JpsNamedElementReferenceBase(@NotNull JpsElementCollectionKind<? extends T> kind,
+                                         @NotNull String elementName,
+                                         @NotNull JpsElementReference<? extends JpsCompositeElement> parentReference) {
+    super();
     myCollectionKind = kind;
     myElementName = elementName;
     myContainer.setChild(PARENT_REFERENCE_KIND, parentReference);
   }
 
-  protected JpsNamedElementReferenceBase(JpsNamedElementReferenceBase<T, Self> original,
-                                         JpsModel model, JpsEventDispatcher eventDispatcher,
-                                         JpsParentElement parent) {
-    super(original, model, eventDispatcher, parent);
+  protected JpsNamedElementReferenceBase(JpsNamedElementReferenceBase<T, Self> original) {
+    super(original);
     myCollectionKind = original.myCollectionKind;
     myElementName = original.myElementName;
   }
diff --git a/jps/model-impl/src/org/jetbrains/jps/model/impl/JpsProjectElementReference.java b/jps/model-impl/src/org/jetbrains/jps/model/impl/JpsProjectElementReference.java
index 1206aca4f6f7..814aeb446fa0 100644
--- a/jps/model-impl/src/org/jetbrains/jps/model/impl/JpsProjectElementReference.java
+++ b/jps/model-impl/src/org/jetbrains/jps/model/impl/JpsProjectElementReference.java
@@ -6,25 +6,17 @@ import org.jetbrains.jps.model.*;
 /**
  * @author nik
  */
-public class JpsProjectElementReference extends JpsElementBase<JpsProjectElementReference> implements JpsElementReference<JpsProject> {
-  private final JpsModel myModel;
-
-  public JpsProjectElementReference(JpsModel model, JpsEventDispatcher eventDispatcher, JpsParentElement parent) {
-    super(eventDispatcher, parent);
-    myModel = model;
-  }
-
+public class JpsProjectElementReference extends JpsElementReferenceBase<JpsProjectElementReference, JpsProject> {
   @Override
   public JpsProject resolve() {
-    return myModel.getProject();
+    final JpsModel model = getModel();
+    return model != null ? model.getProject() : null;
   }
 
   @NotNull
   @Override
-  public JpsProjectElementReference createCopy(@NotNull JpsModel model,
-                                               @NotNull JpsEventDispatcher eventDispatcher,
-                                               JpsParentElement parent) {
-    return new JpsProjectElementReference(model, eventDispatcher, parent);
+  public JpsProjectElementReference createCopy() {
+    return new JpsProjectElementReference();
   }
 
   @Override
diff --git a/jps/model-impl/src/org/jetbrains/jps/model/impl/JpsProjectImpl.java b/jps/model-impl/src/org/jetbrains/jps/model/impl/JpsProjectImpl.java
index 006be0cfa53e..3720c0ba1190 100644
--- a/jps/model-impl/src/org/jetbrains/jps/model/impl/JpsProjectImpl.java
+++ b/jps/model-impl/src/org/jetbrains/jps/model/impl/JpsProjectImpl.java
@@ -16,29 +16,36 @@ import java.util.List;
 /**
  * @author nik
  */
-public class JpsProjectImpl extends JpsCompositeElementBase<JpsProjectImpl> implements JpsProject {
+public class JpsProjectImpl extends JpsRootElementBase<JpsProjectImpl> implements JpsProject {
+  private static final JpsElementCollectionKind<JpsElementReference<?>> EXTERNAL_REFERENCES_COLLECTION_KIND = new JpsElementCollectionKind<JpsElementReference<?>>(new JpsElementKind<JpsElementReference<?>>());
+
   public JpsProjectImpl(JpsModel model, JpsEventDispatcher eventDispatcher) {
-    super(model, eventDispatcher, null);
+    super(model, eventDispatcher);
     myContainer.setChild(JpsModuleKind.MODULE_COLLECTION_KIND);
     myContainer.setChild(JpsLibraryKind.LIBRARIES_COLLECTION_KIND);
+    myContainer.setChild(EXTERNAL_REFERENCES_COLLECTION_KIND);
   }
 
   public JpsProjectImpl(JpsProjectImpl original, JpsModel model, JpsEventDispatcher eventDispatcher) {
-    super(original, model, eventDispatcher, null);
+    super(original, model, eventDispatcher);
+  }
+
+  public void addExternalReference(@NotNull JpsElementReference<?> reference) {
+    myContainer.getChild(EXTERNAL_REFERENCES_COLLECTION_KIND).addChild(reference);
   }
 
   @NotNull
   @Override
   public JpsModule addModule(@NotNull JpsModuleType<?> moduleType, @NotNull final String name) {
     final JpsElementCollectionImpl<JpsModuleImpl> collection = myContainer.getChild(JpsModuleKind.MODULE_COLLECTION_KIND);
-    return collection.addChild(new JpsModuleImpl(myModel, getEventDispatcher(), moduleType, name, collection));
+    return collection.addChild(new JpsModuleImpl(moduleType, name));
   }
 
   @NotNull
   @Override
   public JpsLibrary addLibrary(@NotNull JpsLibraryType<?> libraryType, @NotNull final String name) {
     final JpsElementCollectionImpl<JpsLibraryImpl> collection = myContainer.getChild(JpsLibraryKind.LIBRARIES_COLLECTION_KIND);
-    return collection.addChild(new JpsLibraryImpl(name, libraryType, myModel, getEventDispatcher(), collection));
+    return collection.addChild(new JpsLibraryImpl(name, libraryType));
   }
 
   @NotNull
@@ -55,13 +62,7 @@ public class JpsProjectImpl extends JpsCompositeElementBase<JpsProjectImpl> impl
 
   @NotNull
   @Override
-  public JpsElementReference<JpsProject> createReference(JpsParentElement parent) {
-    return new JpsProjectElementReference(myModel, getEventDispatcher(), parent);
-  }
-
-  @NotNull
-  @Override
-  public JpsProjectImpl createCopy(@NotNull JpsModel model, @NotNull JpsEventDispatcher eventDispatcher, JpsParentElement parent) {
-    return new JpsProjectImpl(this, model, eventDispatcher);
+  public JpsElementReference<JpsProject> createReference() {
+    return new JpsProjectElementReference();
   }
 }
diff --git a/jps/model-impl/src/org/jetbrains/jps/model/impl/JpsRootElementBase.java b/jps/model-impl/src/org/jetbrains/jps/model/impl/JpsRootElementBase.java
new file mode 100644
index 000000000000..884e2b3dd569
--- /dev/null
+++ b/jps/model-impl/src/org/jetbrains/jps/model/impl/JpsRootElementBase.java
@@ -0,0 +1,41 @@
+package org.jetbrains.jps.model.impl;
+
+import org.jetbrains.annotations.NotNull;
+import org.jetbrains.jps.model.JpsEventDispatcher;
+import org.jetbrains.jps.model.JpsModel;
+
+/**
+ * @author nik
+ */
+public abstract class JpsRootElementBase<E extends JpsRootElementBase<E>> extends JpsCompositeElementBase<E> {
+  private final JpsModel myModel;
+  private final JpsEventDispatcher myEventDispatcher;
+
+  protected JpsRootElementBase(JpsModel model, JpsEventDispatcher eventDispatcher) {
+    super();
+    myModel = model;
+    myEventDispatcher = eventDispatcher;
+  }
+
+  protected JpsRootElementBase(JpsCompositeElementBase<E> original, JpsModel model, JpsEventDispatcher dispatcher) {
+    super(original);
+    myModel = model;
+    myEventDispatcher = dispatcher;
+  }
+
+  @Override
+  protected JpsEventDispatcher getEventDispatcher() {
+    return myEventDispatcher;
+  }
+
+  @Override
+  protected JpsModel getModel() {
+    return myModel;
+  }
+
+  @NotNull
+  @Override
+  public E createCopy() {
+    throw new UnsupportedOperationException("'createCopy' not implemented in " + getClass().getName());
+  }
+}
diff --git a/jps/model-impl/src/org/jetbrains/jps/model/impl/JpsTypedDataImpl.java b/jps/model-impl/src/org/jetbrains/jps/model/impl/JpsTypedDataImpl.java
index d09808d00015..7e6c1e6fcdc3 100644
--- a/jps/model-impl/src/org/jetbrains/jps/model/impl/JpsTypedDataImpl.java
+++ b/jps/model-impl/src/org/jetbrains/jps/model/impl/JpsTypedDataImpl.java
@@ -11,15 +11,12 @@ public class JpsTypedDataImpl<T extends JpsElementType<?>> extends JpsElementBas
   private final T myType;
   private JpsElementProperties myProperties;
 
-  public JpsTypedDataImpl(T type, JpsEventDispatcher eventDispatcher, JpsParentElement parent) {
-    super(eventDispatcher, parent);
+  public JpsTypedDataImpl(T type) {
     myType = type;
     myProperties = type.createDefaultProperties();
   }
 
-  public JpsTypedDataImpl(JpsTypedDataImpl<T> original,
-                          JpsEventDispatcher eventDispatcher, JpsParentElement parent) {
-    super(original, eventDispatcher, parent);
+  public JpsTypedDataImpl(JpsTypedDataImpl<T> original) {
     myType = original.getType();
     final JpsElementType<?> type = original.getType();
     myProperties = createCopy(type, original.myProperties);
@@ -44,8 +41,8 @@ public class JpsTypedDataImpl<T extends JpsElementType<?>> extends JpsElementBas
 
   @NotNull
   @Override
-  public JpsTypedDataImpl<T> createCopy(@NotNull JpsModel model, @NotNull JpsEventDispatcher eventDispatcher, JpsParentElement parent) {
-    return new JpsTypedDataImpl<T>(this, eventDispatcher, parent);
+  public JpsTypedDataImpl<T> createCopy() {
+    return new JpsTypedDataImpl<T>(this);
   }
 
   @NotNull
@@ -56,7 +53,7 @@ public class JpsTypedDataImpl<T extends JpsElementType<?>> extends JpsElementBas
   public void setProperties(@NotNull JpsElementProperties properties) {
     if (!myProperties.equals(properties)) {
       myProperties = properties;
-      getEventDispatcher().fireElementChanged(this);
+      fireElementChanged();
     }
   }
 
diff --git a/jps/model-impl/src/org/jetbrains/jps/model/impl/JpsUrlListImpl.java b/jps/model-impl/src/org/jetbrains/jps/model/impl/JpsUrlListImpl.java
index 5d1ac3ac2ee4..de73d69659f0 100644
--- a/jps/model-impl/src/org/jetbrains/jps/model/impl/JpsUrlListImpl.java
+++ b/jps/model-impl/src/org/jetbrains/jps/model/impl/JpsUrlListImpl.java
@@ -12,19 +12,17 @@ import java.util.List;
 public class JpsUrlListImpl extends JpsElementBase<JpsUrlListImpl> implements JpsUrlList {
   private List<String> myUrls = new ArrayList<String>();
 
-  public JpsUrlListImpl(JpsEventDispatcher eventDispatcher, JpsParentElement parent) {
-    super(eventDispatcher, parent);
+  public JpsUrlListImpl() {
   }
 
-  public JpsUrlListImpl(JpsUrlListImpl list, JpsEventDispatcher dispatcher, JpsParentElement parent) {
-    super(list, dispatcher, parent);
+  public JpsUrlListImpl(JpsUrlListImpl list) {
     myUrls.addAll(list.myUrls);
   }
 
   @NotNull
   @Override
-  public JpsUrlListImpl createCopy(@NotNull JpsModel model, @NotNull JpsEventDispatcher eventDispatcher, JpsParentElement parent) {
-    return new JpsUrlListImpl(this, eventDispatcher, parent);
+  public JpsUrlListImpl createCopy() {
+    return new JpsUrlListImpl(this);
   }
 
   @NotNull
@@ -36,20 +34,20 @@ public class JpsUrlListImpl extends JpsElementBase<JpsUrlListImpl> implements Jp
   @Override
   public void addUrl(@NotNull String url) {
     myUrls.add(url);
-    getEventDispatcher().fireElementChanged(this);
+    fireElementChanged();
   }
 
   @Override
   public void removeUrl(@NotNull String url) {
     myUrls.remove(url);
-    getEventDispatcher().fireElementChanged(this);
+    fireElementChanged();
   }
 
   public void applyChanges(@NotNull JpsUrlListImpl modified) {
     if (!myUrls.equals(modified.myUrls)) {
       myUrls.clear();
       myUrls.addAll(modified.myUrls);
-      getEventDispatcher().fireElementChanged(this);
+      fireElementChanged();
     }
   }
 }
diff --git a/jps/model-impl/src/org/jetbrains/jps/model/impl/SimpleJpsElementImpl.java b/jps/model-impl/src/org/jetbrains/jps/model/impl/SimpleJpsElementImpl.java
index d60dd07afb8c..db16f0c05b5d 100644
--- a/jps/model-impl/src/org/jetbrains/jps/model/impl/SimpleJpsElementImpl.java
+++ b/jps/model-impl/src/org/jetbrains/jps/model/impl/SimpleJpsElementImpl.java
@@ -9,13 +9,12 @@ import org.jetbrains.jps.model.*;
 public class SimpleJpsElementImpl<P extends JpsElementProperties> extends JpsElementBase<SimpleJpsElementImpl<P>> implements SimpleJpsElement<P> {
   private P myProperties;
 
-  public SimpleJpsElementImpl(JpsEventDispatcher eventDispatcher, P properties, JpsParentElement parent) {
-    super(eventDispatcher, parent);
+  public SimpleJpsElementImpl(P properties) {
     myProperties = properties;
   }
 
-  public SimpleJpsElementImpl(SimpleJpsElementImpl<P> original, JpsEventDispatcher dispatcher, JpsParentElement parent) {
-    super(original, dispatcher, parent);
+  public SimpleJpsElementImpl(SimpleJpsElementImpl<P> original) {
+    myProperties = original.myProperties;
   }
 
   @NotNull
@@ -28,14 +27,14 @@ public class SimpleJpsElementImpl<P extends JpsElementProperties> extends JpsEle
   public void setProperties(@NotNull P properties) {
     if (!myProperties.equals(properties)) {
       myProperties = properties;
-      getEventDispatcher().fireElementChanged(this);
+      fireElementChanged();
     }
   }
 
   @NotNull
   @Override
-  public SimpleJpsElementImpl<P> createCopy(@NotNull JpsModel model, @NotNull JpsEventDispatcher eventDispatcher, JpsParentElement parent) {
-    return new SimpleJpsElementImpl<P>(this, eventDispatcher, parent);
+  public SimpleJpsElementImpl<P> createCopy() {
+    return new SimpleJpsElementImpl<P>(this);
   }
 
   @Override
diff --git a/jps/model-impl/src/org/jetbrains/jps/model/java/impl/JavaModuleExtensionImpl.java b/jps/model-impl/src/org/jetbrains/jps/model/java/impl/JavaModuleExtensionImpl.java
index ff5dce87d4e1..4bf2a2b70bc5 100644
--- a/jps/model-impl/src/org/jetbrains/jps/model/java/impl/JavaModuleExtensionImpl.java
+++ b/jps/model-impl/src/org/jetbrains/jps/model/java/impl/JavaModuleExtensionImpl.java
@@ -2,9 +2,6 @@ package org.jetbrains.jps.model.java.impl;
 
 import com.intellij.openapi.util.Comparing;
 import org.jetbrains.annotations.NotNull;
-import org.jetbrains.jps.model.JpsEventDispatcher;
-import org.jetbrains.jps.model.JpsModel;
-import org.jetbrains.jps.model.JpsParentElement;
 import org.jetbrains.jps.model.impl.JpsElementBase;
 import org.jetbrains.jps.model.java.JavaModuleExtension;
 import org.jetbrains.jps.model.java.LanguageLevel;
@@ -17,12 +14,10 @@ public class JavaModuleExtensionImpl extends JpsElementBase<JavaModuleExtensionI
   private String myTestOutputUrl;
   private LanguageLevel myLanguageLevel;
 
-  public JavaModuleExtensionImpl(JpsEventDispatcher eventDispatcher, JpsParentElement parent) {
-    super(eventDispatcher, parent);
+  public JavaModuleExtensionImpl() {
   }
 
-  public JavaModuleExtensionImpl(JavaModuleExtensionImpl original, JpsEventDispatcher dispatcher, JpsParentElement parent) {
-    super(original, dispatcher, parent);
+  public JavaModuleExtensionImpl(JavaModuleExtensionImpl original) {
     myOutputUrl = original.myOutputUrl;
     myTestOutputUrl = original.myTestOutputUrl;
     myLanguageLevel = original.myLanguageLevel;
@@ -30,8 +25,8 @@ public class JavaModuleExtensionImpl extends JpsElementBase<JavaModuleExtensionI
 
   @NotNull
   @Override
-  public JavaModuleExtensionImpl createCopy(@NotNull JpsModel model, @NotNull JpsEventDispatcher eventDispatcher, JpsParentElement parent) {
-    return new JavaModuleExtensionImpl(this, eventDispatcher, parent);
+  public JavaModuleExtensionImpl createCopy() {
+    return new JavaModuleExtensionImpl(this);
   }
 
   @Override
@@ -43,7 +38,7 @@ public class JavaModuleExtensionImpl extends JpsElementBase<JavaModuleExtensionI
   public void setOutputUrl(String outputUrl) {
     if (!Comparing.equal(myOutputUrl, outputUrl)) {
       myOutputUrl = outputUrl;
-      getEventDispatcher().fireElementChanged(this);
+      fireElementChanged();
     }
   }
 
@@ -56,7 +51,7 @@ public class JavaModuleExtensionImpl extends JpsElementBase<JavaModuleExtensionI
   public void setTestOutputUrl(String testOutputUrl) {
     if (!Comparing.equal(myTestOutputUrl, testOutputUrl)) {
       myTestOutputUrl = testOutputUrl;
-      getEventDispatcher().fireElementChanged(this);
+      fireElementChanged();
     }
   }
 
@@ -69,7 +64,7 @@ public class JavaModuleExtensionImpl extends JpsElementBase<JavaModuleExtensionI
   public void setLanguageLevel(LanguageLevel languageLevel) {
     if (!Comparing.equal(myLanguageLevel, languageLevel)) {
       myLanguageLevel = languageLevel;
-      getEventDispatcher().fireElementChanged(this);
+      fireElementChanged();
     }
   }
 
diff --git a/jps/model-impl/src/org/jetbrains/jps/model/java/impl/JavaModuleExtensionKind.java b/jps/model-impl/src/org/jetbrains/jps/model/java/impl/JavaModuleExtensionKind.java
index f0c3c7c24777..2bf771e90fc1 100644
--- a/jps/model-impl/src/org/jetbrains/jps/model/java/impl/JavaModuleExtensionKind.java
+++ b/jps/model-impl/src/org/jetbrains/jps/model/java/impl/JavaModuleExtensionKind.java
@@ -8,13 +8,13 @@ import org.jetbrains.jps.model.module.JpsModule;
 /**
  * @author nik
  */
-public class JavaModuleExtensionKind extends JpsElementKind<JavaModuleExtensionImpl> implements JpsElementFactory<JavaModuleExtensionImpl> {
+public class JavaModuleExtensionKind extends JpsElementKind<JavaModuleExtensionImpl> implements JpsElementCreator<JavaModuleExtensionImpl> {
   private static final JavaModuleExtensionKind INSTANCE = new JavaModuleExtensionKind();
 
   @NotNull
   @Override
-  public JavaModuleExtensionImpl create(@NotNull JpsModel model, @NotNull JpsEventDispatcher eventDispatcher, JpsParentElement parent) {
-    return new JavaModuleExtensionImpl(eventDispatcher, parent);
+  public JavaModuleExtensionImpl create() {
+    return new JavaModuleExtensionImpl();
   }
 
   @NotNull
diff --git a/jps/model-impl/src/org/jetbrains/jps/model/java/impl/JpsJavaDependencyExtensionImpl.java b/jps/model-impl/src/org/jetbrains/jps/model/java/impl/JpsJavaDependencyExtensionImpl.java
index 1a241a7cb87d..3faa9324a231 100644
--- a/jps/model-impl/src/org/jetbrains/jps/model/java/impl/JpsJavaDependencyExtensionImpl.java
+++ b/jps/model-impl/src/org/jetbrains/jps/model/java/impl/JpsJavaDependencyExtensionImpl.java
@@ -1,9 +1,6 @@
 package org.jetbrains.jps.model.java.impl;
 
 import org.jetbrains.annotations.NotNull;
-import org.jetbrains.jps.model.JpsEventDispatcher;
-import org.jetbrains.jps.model.JpsModel;
-import org.jetbrains.jps.model.JpsParentElement;
 import org.jetbrains.jps.model.impl.JpsElementBase;
 import org.jetbrains.jps.model.java.JpsJavaDependencyExtension;
 import org.jetbrains.jps.model.java.JpsJavaDependencyScope;
@@ -15,14 +12,13 @@ public class JpsJavaDependencyExtensionImpl extends JpsElementBase<JpsJavaDepend
   private boolean myExported;
   private JpsJavaDependencyScope myScope;
 
-  public JpsJavaDependencyExtensionImpl(JpsEventDispatcher eventDispatcher, JpsParentElement parent, boolean exported, JpsJavaDependencyScope scope) {
-    super(eventDispatcher, parent);
+  public JpsJavaDependencyExtensionImpl(boolean exported,
+                                        JpsJavaDependencyScope scope) {
     myExported = exported;
     myScope = scope;
   }
 
-  public JpsJavaDependencyExtensionImpl(JpsJavaDependencyExtensionImpl original, JpsEventDispatcher eventDispatcher, JpsParentElement parent) {
-    super(original, eventDispatcher, parent);
+  public JpsJavaDependencyExtensionImpl(JpsJavaDependencyExtensionImpl original) {
     myExported = original.myExported;
     myScope = original.myScope;
   }
@@ -36,7 +32,7 @@ public class JpsJavaDependencyExtensionImpl extends JpsElementBase<JpsJavaDepend
   public void setExported(boolean exported) {
     if (myExported != exported) {
       myExported = exported;
-      getEventDispatcher().fireElementChanged(this);
+      fireElementChanged();
     }
   }
 
@@ -50,16 +46,14 @@ public class JpsJavaDependencyExtensionImpl extends JpsElementBase<JpsJavaDepend
   public void setScope(@NotNull JpsJavaDependencyScope scope) {
     if (!scope.equals(myScope)) {
       myScope = scope;
-      getEventDispatcher().fireElementChanged(this);
+      fireElementChanged();
     }
   }
 
   @NotNull
   @Override
-  public JpsJavaDependencyExtensionImpl createCopy(@NotNull JpsModel model,
-                                                   @NotNull JpsEventDispatcher eventDispatcher,
-                                                   JpsParentElement parent) {
-    return new JpsJavaDependencyExtensionImpl(this, eventDispatcher, parent);
+  public JpsJavaDependencyExtensionImpl createCopy() {
+    return new JpsJavaDependencyExtensionImpl(this);
   }
 
   @Override
diff --git a/jps/model-impl/src/org/jetbrains/jps/model/java/impl/JpsJavaDependencyExtensionKind.java b/jps/model-impl/src/org/jetbrains/jps/model/java/impl/JpsJavaDependencyExtensionKind.java
index bd6e6bdcb81c..c15df483d74e 100644
--- a/jps/model-impl/src/org/jetbrains/jps/model/java/impl/JpsJavaDependencyExtensionKind.java
+++ b/jps/model-impl/src/org/jetbrains/jps/model/java/impl/JpsJavaDependencyExtensionKind.java
@@ -9,16 +9,13 @@ import org.jetbrains.jps.model.module.JpsDependencyElement;
 /**
  * @author nik
  */
-public class JpsJavaDependencyExtensionKind extends JpsElementKind<JpsJavaDependencyExtensionImpl>
-                                            implements JpsElementFactory<JpsJavaDependencyExtensionImpl> {
+public class JpsJavaDependencyExtensionKind extends JpsElementKind<JpsJavaDependencyExtensionImpl> implements JpsElementCreator<JpsJavaDependencyExtensionImpl> {
   public static final JpsJavaDependencyExtensionKind INSTANCE = new JpsJavaDependencyExtensionKind();
 
   @NotNull
   @Override
-  public JpsJavaDependencyExtensionImpl create(@NotNull JpsModel model,
-                                               @NotNull JpsEventDispatcher eventDispatcher,
-                                               JpsParentElement parent) {
-    return new JpsJavaDependencyExtensionImpl(eventDispatcher, parent, false, JpsJavaDependencyScope.COMPILE);
+  public JpsJavaDependencyExtensionImpl create() {
+    return new JpsJavaDependencyExtensionImpl(false, JpsJavaDependencyScope.COMPILE);
   }
 
   public static JpsJavaDependencyExtension getExtension(@NotNull JpsDependencyElement element) {
diff --git a/jps/model-impl/src/org/jetbrains/jps/model/library/impl/JpsLibraryImpl.java b/jps/model-impl/src/org/jetbrains/jps/model/library/impl/JpsLibraryImpl.java
index 541d81b64667..45728e409a93 100644
--- a/jps/model-impl/src/org/jetbrains/jps/model/library/impl/JpsLibraryImpl.java
+++ b/jps/model-impl/src/org/jetbrains/jps/model/library/impl/JpsLibraryImpl.java
@@ -18,15 +18,14 @@ public class JpsLibraryImpl extends JpsNamedCompositeElementBase<JpsLibraryImpl,
   private static final JpsElementCollectionKind<JpsLibraryRootImpl> LIBRARY_ROOTS_COLLECTION = new JpsElementCollectionKind<JpsLibraryRootImpl>(JpsLibraryRootKind.INSTANCE);
   private static final JpsTypedDataKind<JpsLibraryType<?>> TYPED_DATA_KIND = new JpsTypedDataKind<JpsLibraryType<?>>();
 
-  public JpsLibraryImpl(@NotNull String name, @NotNull JpsLibraryType<?> type, @NotNull JpsModel model,
-                        @NotNull JpsEventDispatcher eventDispatcher, JpsElementCollection<JpsLibraryImpl> parent) {
-    super(model, eventDispatcher, name, parent);
-    myContainer.setChild(TYPED_DATA_KIND, new JpsTypedDataImpl<JpsLibraryType<?>>(type, eventDispatcher, this));
+  public JpsLibraryImpl(@NotNull String name, @NotNull JpsLibraryType<?> type) {
+    super(name);
+    myContainer.setChild(TYPED_DATA_KIND, new JpsTypedDataImpl<JpsLibraryType<?>>(type));
     myContainer.setChild(LIBRARY_ROOTS_COLLECTION);
   }
 
-  public JpsLibraryImpl(@NotNull JpsLibraryImpl original, JpsModel model, JpsEventDispatcher eventDispatcher, JpsParentElement parent) {
-    super(original, model, eventDispatcher, parent);
+  private JpsLibraryImpl(@NotNull JpsLibraryImpl original) {
+    super(original);
   }
 
   @NotNull
@@ -43,7 +42,7 @@ public class JpsLibraryImpl extends JpsNamedCompositeElementBase<JpsLibraryImpl,
 
   @Override
   public void addUrl(@NotNull final String url, @NotNull final JpsLibraryRootType rootType) {
-    getRootsCollection().addChild(new JpsLibraryRootImpl(getEventDispatcher(), url, rootType, this));
+    getRootsCollection().addChild(new JpsLibraryRootImpl(url, rootType));
   }
 
   private JpsElementCollectionImpl<JpsLibraryRootImpl> getRootsCollection() {
@@ -73,15 +72,15 @@ public class JpsLibraryImpl extends JpsNamedCompositeElementBase<JpsLibraryImpl,
 
   @NotNull
   @Override
-  public JpsLibraryImpl createCopy(@NotNull JpsModel model, @NotNull JpsEventDispatcher eventDispatcher, JpsParentElement parent) {
-    return new JpsLibraryImpl(this, model, eventDispatcher, parent);
+  public JpsLibraryImpl createCopy() {
+    return new JpsLibraryImpl(this);
   }
 
   @NotNull
   @Override
-  public JpsLibraryReference createReference(JpsParentElement parent) {
+  public JpsLibraryReference createReference() {
     //noinspection unchecked
-    final JpsElementReference<JpsCompositeElement> parentReference = ((JpsReferenceableElement<JpsCompositeElement>)getParent().getParent()).createReference(parent);
-    return new JpsLibraryReferenceImpl(myModel, getEventDispatcher(), getName(), parentReference, parent);
+    final JpsElementReference<JpsCompositeElement> parentReference = ((JpsReferenceableElement<JpsCompositeElement>)getParent().getParent()).createReference();
+    return new JpsLibraryReferenceImpl(getName(), parentReference);
   }
 }
diff --git a/jps/model-impl/src/org/jetbrains/jps/model/library/impl/JpsLibraryReferenceImpl.java b/jps/model-impl/src/org/jetbrains/jps/model/library/impl/JpsLibraryReferenceImpl.java
index c78e4bdd8c0c..44ab7d92bec3 100644
--- a/jps/model-impl/src/org/jetbrains/jps/model/library/impl/JpsLibraryReferenceImpl.java
+++ b/jps/model-impl/src/org/jetbrains/jps/model/library/impl/JpsLibraryReferenceImpl.java
@@ -10,13 +10,12 @@ import org.jetbrains.jps.model.library.JpsLibraryReference;
  * @author nik
  */
 public class JpsLibraryReferenceImpl extends JpsNamedElementReferenceBase<JpsLibrary, JpsLibraryReferenceImpl> implements JpsLibraryReference {
-  public JpsLibraryReferenceImpl(JpsModel model, JpsEventDispatcher eventDispatcher, String elementName, JpsElementReference<? extends JpsCompositeElement> parentReference,
-                                 JpsParentElement parent) {
-    super(model, eventDispatcher, JpsLibraryKind.LIBRARIES_COLLECTION_KIND, elementName, parentReference, parent);
+  public JpsLibraryReferenceImpl(String elementName, JpsElementReference<? extends JpsCompositeElement> parentReference) {
+    super(JpsLibraryKind.LIBRARIES_COLLECTION_KIND, elementName, parentReference);
   }
 
-  public JpsLibraryReferenceImpl(JpsLibraryReferenceImpl original, JpsModel model, JpsEventDispatcher eventDispatcher, JpsParentElement parent) {
-    super(original, model, eventDispatcher, parent);
+  private JpsLibraryReferenceImpl(JpsLibraryReferenceImpl original) {
+    super(original);
   }
 
   @NotNull
@@ -27,9 +26,13 @@ public class JpsLibraryReferenceImpl extends JpsNamedElementReferenceBase<JpsLib
 
   @NotNull
   @Override
-  public JpsLibraryReferenceImpl createCopy(@NotNull JpsModel model,
-                                            @NotNull JpsEventDispatcher eventDispatcher,
-                                            JpsParentElement parent) {
-    return new JpsLibraryReferenceImpl(this, model, eventDispatcher, parent);
+  public JpsLibraryReferenceImpl createCopy() {
+    return new JpsLibraryReferenceImpl(this);
+  }
+
+  @Override
+  public JpsLibraryReference asExternal(@NotNull JpsModel model) {
+    model.registerExternalReference(this);
+    return this;
   }
 }
diff --git a/jps/model-impl/src/org/jetbrains/jps/model/library/impl/JpsLibraryRootImpl.java b/jps/model-impl/src/org/jetbrains/jps/model/library/impl/JpsLibraryRootImpl.java
index 6279e3adfa72..33dc41361b98 100644
--- a/jps/model-impl/src/org/jetbrains/jps/model/library/impl/JpsLibraryRootImpl.java
+++ b/jps/model-impl/src/org/jetbrains/jps/model/library/impl/JpsLibraryRootImpl.java
@@ -1,9 +1,6 @@
 package org.jetbrains.jps.model.library.impl;
 
 import org.jetbrains.annotations.NotNull;
-import org.jetbrains.jps.model.JpsEventDispatcher;
-import org.jetbrains.jps.model.JpsModel;
-import org.jetbrains.jps.model.JpsParentElement;
 import org.jetbrains.jps.model.impl.JpsElementBase;
 import org.jetbrains.jps.model.library.JpsLibrary;
 import org.jetbrains.jps.model.library.JpsLibraryRoot;
@@ -16,14 +13,13 @@ public class JpsLibraryRootImpl extends JpsElementBase<JpsLibraryRootImpl> imple
   private final String myUrl;
   private final JpsLibraryRootType myRootType;
 
-  public JpsLibraryRootImpl(JpsEventDispatcher eventDispatcher, @NotNull String url, @NotNull JpsLibraryRootType rootType, @NotNull JpsParentElement parent) {
-    super(eventDispatcher, parent);
+  public JpsLibraryRootImpl(@NotNull String url,
+                            @NotNull JpsLibraryRootType rootType) {
     myUrl = url;
     myRootType = rootType;
   }
 
-  public JpsLibraryRootImpl(JpsLibraryRootImpl original, JpsEventDispatcher dispatcher, JpsParentElement parent) {
-    super(original, dispatcher, parent);
+  public JpsLibraryRootImpl(JpsLibraryRootImpl original) {
     myUrl = original.myUrl;
     myRootType = original.myRootType;
   }
@@ -41,8 +37,8 @@ public class JpsLibraryRootImpl extends JpsElementBase<JpsLibraryRootImpl> imple
 
   @NotNull
   @Override
-  public JpsLibraryRootImpl createCopy(@NotNull JpsModel model, @NotNull JpsEventDispatcher eventDispatcher, JpsParentElement parent) {
-    return new JpsLibraryRootImpl(this, eventDispatcher, parent);
+  public JpsLibraryRootImpl createCopy() {
+    return new JpsLibraryRootImpl(this);
   }
 
   public void applyChanges(@NotNull JpsLibraryRootImpl modified) {
@@ -51,6 +47,6 @@ public class JpsLibraryRootImpl extends JpsElementBase<JpsLibraryRootImpl> imple
   @Override
   @NotNull
   public JpsLibrary getLibrary() {
-    return (JpsLibrary)myParent;
+    return (JpsLibrary)myParent.getParent();
   }
 }
diff --git a/jps/model-impl/src/org/jetbrains/jps/model/module/impl/JpsDependenciesListImpl.java b/jps/model-impl/src/org/jetbrains/jps/model/module/impl/JpsDependenciesListImpl.java
index 09a6ec9fe5f1..e5c04b68cacb 100644
--- a/jps/model-impl/src/org/jetbrains/jps/model/module/impl/JpsDependenciesListImpl.java
+++ b/jps/model-impl/src/org/jetbrains/jps/model/module/impl/JpsDependenciesListImpl.java
@@ -2,12 +2,10 @@ package org.jetbrains.jps.model.module.impl;
 
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.jps.model.JpsElementKind;
-import org.jetbrains.jps.model.JpsEventDispatcher;
-import org.jetbrains.jps.model.JpsModel;
-import org.jetbrains.jps.model.JpsParentElement;
 import org.jetbrains.jps.model.impl.JpsCompositeElementBase;
 import org.jetbrains.jps.model.impl.JpsElementCollectionKind;
 import org.jetbrains.jps.model.library.JpsLibrary;
+import org.jetbrains.jps.model.library.JpsLibraryReference;
 import org.jetbrains.jps.model.library.JpsSdkType;
 import org.jetbrains.jps.model.module.*;
 
@@ -20,13 +18,13 @@ public class JpsDependenciesListImpl extends JpsCompositeElementBase<JpsDependen
   public static final JpsElementKind<JpsDependencyElementBase<?>> DEPENDENCY_ELEMENT_KIND = new JpsElementKind<JpsDependencyElementBase<?>>();
   public static final JpsElementCollectionKind<JpsDependencyElementBase<?>> DEPENDENCY_COLLECTION_KIND = new JpsElementCollectionKind<JpsDependencyElementBase<?>>(DEPENDENCY_ELEMENT_KIND);
 
-  public JpsDependenciesListImpl(JpsModel model, JpsEventDispatcher eventDispatcher, JpsModuleImpl parent) {
-    super(model, eventDispatcher, parent);
+  public JpsDependenciesListImpl() {
+    super();
     myContainer.setChild(DEPENDENCY_COLLECTION_KIND);
   }
 
-  public JpsDependenciesListImpl(JpsDependenciesListImpl original, JpsModel model, JpsEventDispatcher dispatcher, JpsParentElement parent) {
-    super(original, model, dispatcher, parent);
+  private JpsDependenciesListImpl(JpsDependenciesListImpl original) {
+    super(original);
   }
 
   @Override
@@ -38,7 +36,13 @@ public class JpsDependenciesListImpl extends JpsCompositeElementBase<JpsDependen
   @Override
   @NotNull
   public JpsModuleDependency addModuleDependency(@NotNull JpsModule module) {
-    final JpsModuleDependencyImpl dependency = new JpsModuleDependencyImpl(myModel, getEventDispatcher(), module, this);
+    return addModuleDependency(module.createReference());
+  }
+
+  @NotNull
+  @Override
+  public JpsModuleDependency addModuleDependency(@NotNull JpsModuleReference moduleReference) {
+    final JpsModuleDependencyImpl dependency = new JpsModuleDependencyImpl(moduleReference);
     myContainer.getChild(DEPENDENCY_COLLECTION_KIND).addChild(dependency);
     return dependency;
   }
@@ -46,25 +50,31 @@ public class JpsDependenciesListImpl extends JpsCompositeElementBase<JpsDependen
   @Override
   @NotNull
   public JpsLibraryDependency addLibraryDependency(@NotNull JpsLibrary libraryElement) {
-    JpsLibraryDependencyImpl dependency = new JpsLibraryDependencyImpl(myModel, getEventDispatcher(), libraryElement, this);
+    return addLibraryDependency(libraryElement.createReference());
+  }
+
+  @NotNull
+  @Override
+  public JpsLibraryDependency addLibraryDependency(@NotNull JpsLibraryReference libraryReference) {
+    final JpsLibraryDependencyImpl dependency = new JpsLibraryDependencyImpl(libraryReference);
     myContainer.getChild(DEPENDENCY_COLLECTION_KIND).addChild(dependency);
     return dependency;
   }
 
   @Override
   public void addModuleSourceDependency() {
-    myContainer.getChild(DEPENDENCY_COLLECTION_KIND).addChild(new JpsModuleSourceDependency(myModel, getEventDispatcher(), this));
+    myContainer.getChild(DEPENDENCY_COLLECTION_KIND).addChild(new JpsModuleSourceDependency());
   }
 
   @Override
   public void addSdkDependency(@NotNull JpsSdkType<?> sdkType) {
-    myContainer.getChild(DEPENDENCY_COLLECTION_KIND).addChild(new JpsSdkDependencyImpl(sdkType, myModel, getEventDispatcher(), this));
+    myContainer.getChild(DEPENDENCY_COLLECTION_KIND).addChild(new JpsSdkDependencyImpl(sdkType));
   }
 
   @NotNull
   @Override
-  public JpsDependenciesListImpl createCopy(@NotNull JpsModel model, @NotNull JpsEventDispatcher eventDispatcher, JpsParentElement parent) {
-    return new JpsDependenciesListImpl(this, model, eventDispatcher, parent);
+  public JpsDependenciesListImpl createCopy() {
+    return new JpsDependenciesListImpl(this);
   }
 
   @Override
diff --git a/jps/model-impl/src/org/jetbrains/jps/model/module/impl/JpsDependencyElementBase.java b/jps/model-impl/src/org/jetbrains/jps/model/module/impl/JpsDependencyElementBase.java
index 4be465b91799..9d8d6c758cd9 100644
--- a/jps/model-impl/src/org/jetbrains/jps/model/module/impl/JpsDependencyElementBase.java
+++ b/jps/model-impl/src/org/jetbrains/jps/model/module/impl/JpsDependencyElementBase.java
@@ -1,8 +1,5 @@
 package org.jetbrains.jps.model.module.impl;
 
-import org.jetbrains.jps.model.JpsEventDispatcher;
-import org.jetbrains.jps.model.JpsModel;
-import org.jetbrains.jps.model.JpsParentElement;
 import org.jetbrains.jps.model.impl.JpsCompositeElementBase;
 import org.jetbrains.jps.model.module.JpsDependencyElement;
 
@@ -10,16 +7,16 @@ import org.jetbrains.jps.model.module.JpsDependencyElement;
  * @author nik
  */
 public abstract class JpsDependencyElementBase<Self extends JpsDependencyElementBase<Self>> extends JpsCompositeElementBase<Self> implements JpsDependencyElement {
-  protected JpsDependencyElementBase(JpsModel model, JpsEventDispatcher eventDispatcher, JpsDependenciesListImpl parent) {
-    super(model, eventDispatcher, parent);
+  protected JpsDependencyElementBase() {
+    super();
   }
 
-  protected JpsDependencyElementBase(JpsDependencyElementBase<Self> original, JpsModel model, JpsEventDispatcher dispatcher, JpsParentElement parent) {
-    super(original, model, dispatcher, parent);
+  protected JpsDependencyElementBase(JpsDependencyElementBase<Self> original) {
+    super(original);
   }
 
   @Override
   public void remove() {
-    ((JpsDependenciesListImpl)myParent).getContainer().getChild(JpsDependenciesListImpl.DEPENDENCY_COLLECTION_KIND).removeChild(this);
+    ((JpsDependenciesListImpl)myParent.getParent()).getContainer().getChild(JpsDependenciesListImpl.DEPENDENCY_COLLECTION_KIND).removeChild(this);
   }
 }
diff --git a/jps/model-impl/src/org/jetbrains/jps/model/module/impl/JpsLibraryDependencyImpl.java b/jps/model-impl/src/org/jetbrains/jps/model/module/impl/JpsLibraryDependencyImpl.java
index 6470a87414b5..7e2eba50a317 100644
--- a/jps/model-impl/src/org/jetbrains/jps/model/module/impl/JpsLibraryDependencyImpl.java
+++ b/jps/model-impl/src/org/jetbrains/jps/model/module/impl/JpsLibraryDependencyImpl.java
@@ -2,7 +2,6 @@ package org.jetbrains.jps.model.module.impl;
 
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.jps.model.*;
-import org.jetbrains.jps.model.library.JpsLibrary;
 import org.jetbrains.jps.model.library.JpsLibraryReference;
 import org.jetbrains.jps.model.module.JpsLibraryDependency;
 
@@ -12,13 +11,13 @@ import org.jetbrains.jps.model.module.JpsLibraryDependency;
 public class JpsLibraryDependencyImpl extends JpsDependencyElementBase<JpsLibraryDependencyImpl> implements JpsLibraryDependency {
   public static final JpsElementKind<JpsLibraryReference> LIBRARY_REFERENCE_KIND = new JpsElementKind<JpsLibraryReference>();
 
-  public JpsLibraryDependencyImpl(JpsModel model, JpsEventDispatcher eventDispatcher, JpsLibrary library, JpsDependenciesListImpl parent) {
-    super(model, eventDispatcher, parent);
-    myContainer.setChild(LIBRARY_REFERENCE_KIND, library.createReference(parent));
+  public JpsLibraryDependencyImpl(final JpsLibraryReference reference) {
+    super();
+    myContainer.setChild(LIBRARY_REFERENCE_KIND, reference);
   }
 
-  public JpsLibraryDependencyImpl(JpsLibraryDependencyImpl original, @NotNull JpsModel model, JpsEventDispatcher dispatcher, JpsParentElement parent) {
-    super(original, model, dispatcher, parent);
+  public JpsLibraryDependencyImpl(JpsLibraryDependencyImpl original) {
+    super(original);
   }
 
   @NotNull
@@ -29,9 +28,7 @@ public class JpsLibraryDependencyImpl extends JpsDependencyElementBase<JpsLibrar
 
   @NotNull
   @Override
-  public JpsLibraryDependencyImpl createCopy(@NotNull JpsModel model,
-                                             @NotNull JpsEventDispatcher eventDispatcher,
-                                             JpsParentElement parent) {
-    return new JpsLibraryDependencyImpl(this, model, eventDispatcher, parent);
+  public JpsLibraryDependencyImpl createCopy() {
+    return new JpsLibraryDependencyImpl(this);
   }
 }
diff --git a/jps/model-impl/src/org/jetbrains/jps/model/module/impl/JpsModuleDependencyImpl.java b/jps/model-impl/src/org/jetbrains/jps/model/module/impl/JpsModuleDependencyImpl.java
index 0931c60e1415..6fe796883168 100644
--- a/jps/model-impl/src/org/jetbrains/jps/model/module/impl/JpsModuleDependencyImpl.java
+++ b/jps/model-impl/src/org/jetbrains/jps/model/module/impl/JpsModuleDependencyImpl.java
@@ -2,7 +2,6 @@ package org.jetbrains.jps.model.module.impl;
 
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.jps.model.*;
-import org.jetbrains.jps.model.module.JpsModule;
 import org.jetbrains.jps.model.module.JpsModuleDependency;
 import org.jetbrains.jps.model.module.JpsModuleReference;
 
@@ -12,13 +11,13 @@ import org.jetbrains.jps.model.module.JpsModuleReference;
 public class JpsModuleDependencyImpl extends JpsDependencyElementBase<JpsModuleDependencyImpl> implements JpsModuleDependency {
   private static final JpsElementKind<JpsModuleReference> MODULE_REFERENCE_KIND = new JpsElementKind<JpsModuleReference>();
 
-  public JpsModuleDependencyImpl(JpsModel model, JpsEventDispatcher eventDispatcher, JpsModule module, JpsDependenciesListImpl parent) {
-    super(model, eventDispatcher, parent);
-    myContainer.setChild(MODULE_REFERENCE_KIND, module.createReference(this));
+  public JpsModuleDependencyImpl(final JpsModuleReference moduleReference) {
+    super();
+    myContainer.setChild(MODULE_REFERENCE_KIND, moduleReference);
   }
 
-  public JpsModuleDependencyImpl(JpsModuleDependencyImpl original, JpsModel model, JpsEventDispatcher dispatcher, JpsParentElement parent) {
-    super(original, model, dispatcher, parent);
+  public JpsModuleDependencyImpl(JpsModuleDependencyImpl original) {
+    super(original);
   }
 
   @NotNull
@@ -29,9 +28,7 @@ public class JpsModuleDependencyImpl extends JpsDependencyElementBase<JpsModuleD
 
   @NotNull
   @Override
-  public JpsModuleDependencyImpl createCopy(@NotNull JpsModel model,
-                                            @NotNull JpsEventDispatcher eventDispatcher,
-                                            JpsParentElement parent) {
-    return new JpsModuleDependencyImpl(this, model, eventDispatcher, parent);
+  public JpsModuleDependencyImpl createCopy() {
+    return new JpsModuleDependencyImpl(this);
   }
 }
diff --git a/jps/model-impl/src/org/jetbrains/jps/model/module/impl/JpsModuleImpl.java b/jps/model-impl/src/org/jetbrains/jps/model/module/impl/JpsModuleImpl.java
index 98c53860f232..7aabc147cae2 100644
--- a/jps/model-impl/src/org/jetbrains/jps/model/module/impl/JpsModuleImpl.java
+++ b/jps/model-impl/src/org/jetbrains/jps/model/module/impl/JpsModuleImpl.java
@@ -3,6 +3,10 @@ package org.jetbrains.jps.model.module.impl;
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.jps.model.*;
 import org.jetbrains.jps.model.impl.*;
+import org.jetbrains.jps.model.library.JpsLibrary;
+import org.jetbrains.jps.model.library.JpsLibraryType;
+import org.jetbrains.jps.model.library.impl.JpsLibraryImpl;
+import org.jetbrains.jps.model.library.impl.JpsLibraryKind;
 import org.jetbrains.jps.model.module.*;
 
 import java.util.List;
@@ -16,24 +20,26 @@ public class JpsModuleImpl extends JpsNamedCompositeElementBase<JpsModuleImpl, J
   private static final JpsElementKind<JpsUrlListImpl> EXCLUDED_ROOTS_KIND = new JpsElementKind<JpsUrlListImpl>();
   public static final JpsElementKind<JpsDependenciesListImpl> DEPENDENCIES_LIST_KIND = new JpsElementKind<JpsDependenciesListImpl>();
 
-  public JpsModuleImpl(JpsModel model, JpsEventDispatcher eventDispatcher, JpsModuleType type, @NotNull String name, JpsElementCollectionImpl<JpsModuleImpl> parent) {
-    super(model, eventDispatcher, name, parent);
-    myContainer.setChild(TYPED_DATA_KIND, new JpsTypedDataImpl<JpsModuleType<?>>(type, eventDispatcher, this));
-    myContainer.setChild(CONTENT_ROOTS_KIND, new JpsUrlListImpl(eventDispatcher, this));
-    myContainer.setChild(EXCLUDED_ROOTS_KIND, new JpsUrlListImpl(eventDispatcher, this));
-    myContainer.setChild(DEPENDENCIES_LIST_KIND, new JpsDependenciesListImpl(model, eventDispatcher, this));
+  public JpsModuleImpl(JpsModuleType type,
+                       @NotNull String name) {
+    super(name);
+    myContainer.setChild(TYPED_DATA_KIND, new JpsTypedDataImpl<JpsModuleType<?>>(type));
+    myContainer.setChild(CONTENT_ROOTS_KIND, new JpsUrlListImpl());
+    myContainer.setChild(EXCLUDED_ROOTS_KIND, new JpsUrlListImpl());
+    myContainer.setChild(DEPENDENCIES_LIST_KIND, new JpsDependenciesListImpl());
+    myContainer.setChild(JpsLibraryKind.LIBRARIES_COLLECTION_KIND);
     myContainer.setChild(JpsModuleSourceRootKind.ROOT_COLLECTION_KIND);
-    myContainer.setChild(JpsSdkReferencesTableImpl.KIND, new JpsSdkReferencesTableImpl(model, eventDispatcher, this));
+    myContainer.setChild(JpsSdkReferencesTableImpl.KIND, new JpsSdkReferencesTableImpl());
   }
 
-  public JpsModuleImpl(JpsModuleImpl original, JpsEventDispatcher eventDispatcher, JpsModel model, JpsParentElement parent) {
-    super(original, model, eventDispatcher, parent);
+  private JpsModuleImpl(JpsModuleImpl original) {
+    super(original);
   }
 
   @NotNull
   @Override
-  public JpsModuleImpl createCopy(@NotNull JpsModel model, @NotNull JpsEventDispatcher eventDispatcher, JpsParentElement parent) {
-    return new JpsModuleImpl(this, eventDispatcher, model, parent);
+  public JpsModuleImpl createCopy() {
+    return new JpsModuleImpl(this);
   }
 
   @NotNull
@@ -65,7 +71,7 @@ public class JpsModuleImpl extends JpsNamedCompositeElementBase<JpsModuleImpl, J
   public <P extends JpsElementProperties> JpsModuleSourceRoot addSourceRoot(@NotNull JpsModuleSourceRootType<P> rootType,
                                                                             @NotNull String url,
                                                                             @NotNull P properties) {
-    final JpsModuleSourceRootImpl root = new JpsModuleSourceRootImpl(myModel, getEventDispatcher(), url, rootType, this);
+    final JpsModuleSourceRootImpl root = new JpsModuleSourceRootImpl(url, rootType);
     myContainer.getChild(JpsModuleSourceRootKind.ROOT_COLLECTION_KIND).addChild(root);
     root.setProperties(rootType, properties);
     return root;
@@ -102,7 +108,14 @@ public class JpsModuleImpl extends JpsNamedCompositeElementBase<JpsModuleImpl, J
 
   @NotNull
   @Override
-  public JpsModuleReference createReference(JpsParentElement parent) {
-    return new JpsModuleReferenceImpl(myModel, getName(), getEventDispatcher(), parent);
+  public JpsModuleReference createReference() {
+    return new JpsModuleReferenceImpl(getName());
+  }
+
+  @NotNull
+  @Override
+  public JpsLibrary addModuleLibrary(@NotNull JpsLibraryType<?> type, @NotNull String name) {
+    final JpsElementCollectionImpl<JpsLibraryImpl> collection = myContainer.getChild(JpsLibraryKind.LIBRARIES_COLLECTION_KIND);
+    return collection.addChild(new JpsLibraryImpl(name, type));
   }
 }
diff --git a/jps/model-impl/src/org/jetbrains/jps/model/module/impl/JpsModuleReferenceImpl.java b/jps/model-impl/src/org/jetbrains/jps/model/module/impl/JpsModuleReferenceImpl.java
index 0d9d6a3607fa..f64a397ec1c3 100644
--- a/jps/model-impl/src/org/jetbrains/jps/model/module/impl/JpsModuleReferenceImpl.java
+++ b/jps/model-impl/src/org/jetbrains/jps/model/module/impl/JpsModuleReferenceImpl.java
@@ -1,10 +1,7 @@
 package org.jetbrains.jps.model.module.impl;
 
 import org.jetbrains.annotations.NotNull;
-import org.jetbrains.jps.model.JpsCompositeElement;
-import org.jetbrains.jps.model.JpsEventDispatcher;
 import org.jetbrains.jps.model.JpsModel;
-import org.jetbrains.jps.model.JpsParentElement;
 import org.jetbrains.jps.model.impl.JpsNamedElementReferenceBase;
 import org.jetbrains.jps.model.impl.JpsProjectElementReference;
 import org.jetbrains.jps.model.module.JpsModule;
@@ -14,16 +11,14 @@ import org.jetbrains.jps.model.module.JpsModuleReference;
  * @author nik
  */
 public class JpsModuleReferenceImpl extends JpsNamedElementReferenceBase<JpsModule, JpsModuleReferenceImpl> implements JpsModuleReference {
-  public JpsModuleReferenceImpl(JpsModel model, String elementName, JpsEventDispatcher eventDispatcher, JpsParentElement parent) {
-    super(model, eventDispatcher, JpsModuleKind.MODULE_COLLECTION_KIND, elementName, new JpsProjectElementReference(model, eventDispatcher, parent), parent);
+  public JpsModuleReferenceImpl(String elementName) {
+    super(JpsModuleKind.MODULE_COLLECTION_KIND, elementName, new JpsProjectElementReference());
   }
 
   @NotNull
   @Override
-  public JpsModuleReferenceImpl createCopy(@NotNull JpsModel model,
-                                           @NotNull JpsEventDispatcher eventDispatcher,
-                                           JpsParentElement parent) {
-    return new JpsModuleReferenceImpl(model, myElementName, eventDispatcher, parent);
+  public JpsModuleReferenceImpl createCopy() {
+    return new JpsModuleReferenceImpl(myElementName);
   }
 
   @NotNull
@@ -31,4 +26,10 @@ public class JpsModuleReferenceImpl extends JpsNamedElementReferenceBase<JpsModu
   public String getModuleName() {
     return myElementName;
   }
+
+  @Override
+  public JpsModuleReference asExternal(@NotNull JpsModel model) {
+    model.registerExternalReference(this);
+    return this;
+  }
 }
diff --git a/jps/model-impl/src/org/jetbrains/jps/model/module/impl/JpsModuleSourceDependency.java b/jps/model-impl/src/org/jetbrains/jps/model/module/impl/JpsModuleSourceDependency.java
index 8d2520fccc15..b56b8bee5dba 100644
--- a/jps/model-impl/src/org/jetbrains/jps/model/module/impl/JpsModuleSourceDependency.java
+++ b/jps/model-impl/src/org/jetbrains/jps/model/module/impl/JpsModuleSourceDependency.java
@@ -9,19 +9,17 @@ import org.jetbrains.jps.model.JpsParentElement;
  * @author nik
  */
 public class JpsModuleSourceDependency extends JpsDependencyElementBase<JpsModuleSourceDependency> {
-  public JpsModuleSourceDependency(JpsModel model, JpsEventDispatcher eventDispatcher, JpsDependenciesListImpl parent) {
-    super(model, eventDispatcher, parent);
+  public JpsModuleSourceDependency() {
+    super();
   }
 
-  public JpsModuleSourceDependency(JpsModuleSourceDependency original, JpsModel model, JpsEventDispatcher dispatcher, JpsParentElement parent) {
-    super(original, model, dispatcher, parent);
+  public JpsModuleSourceDependency(JpsModuleSourceDependency original) {
+    super(original);
   }
 
   @NotNull
   @Override
-  public JpsModuleSourceDependency createCopy(@NotNull JpsModel model,
-                                              @NotNull JpsEventDispatcher eventDispatcher,
-                                              JpsParentElement parent) {
-    return new JpsModuleSourceDependency(this, model, eventDispatcher, parent);
+  public JpsModuleSourceDependency createCopy() {
+    return new JpsModuleSourceDependency(this);
   }
 }
diff --git a/jps/model-impl/src/org/jetbrains/jps/model/module/impl/JpsModuleSourceRootImpl.java b/jps/model-impl/src/org/jetbrains/jps/model/module/impl/JpsModuleSourceRootImpl.java
index 61fe889ae060..e23f0f56b4f2 100644
--- a/jps/model-impl/src/org/jetbrains/jps/model/module/impl/JpsModuleSourceRootImpl.java
+++ b/jps/model-impl/src/org/jetbrains/jps/model/module/impl/JpsModuleSourceRootImpl.java
@@ -15,16 +15,15 @@ public class JpsModuleSourceRootImpl extends JpsCompositeElementBase<JpsModuleSo
   private static final JpsTypedDataKind<JpsModuleSourceRootType<?>> TYPED_DATA_KIND = new JpsTypedDataKind<JpsModuleSourceRootType<?>>();
   private String myUrl;
 
-  public JpsModuleSourceRootImpl(JpsModel model, JpsEventDispatcher eventDispatcher,
-                                 String url,
-                                 JpsModuleSourceRootType type, JpsParentElement parent) {
-    super(model, eventDispatcher, parent);
-    myContainer.setChild(TYPED_DATA_KIND, new JpsTypedDataImpl<JpsModuleSourceRootType<?>>(type, eventDispatcher, this));
+  public JpsModuleSourceRootImpl(String url,
+                                 JpsModuleSourceRootType type) {
+    super();
+    myContainer.setChild(TYPED_DATA_KIND, new JpsTypedDataImpl<JpsModuleSourceRootType<?>>(type));
     myUrl = url;
   }
 
-  public JpsModuleSourceRootImpl(JpsModuleSourceRootImpl original, JpsModel model, JpsEventDispatcher dispatcher, JpsParentElement parent) {
-    super(original, model, dispatcher, parent);
+  private JpsModuleSourceRootImpl(JpsModuleSourceRootImpl original) {
+    super(original);
     myUrl = original.myUrl;
   }
 
@@ -51,7 +50,7 @@ public class JpsModuleSourceRootImpl extends JpsCompositeElementBase<JpsModuleSo
 
   @NotNull
   @Override
-  public JpsModuleSourceRootImpl createCopy(@NotNull JpsModel model, @NotNull JpsEventDispatcher eventDispatcher, JpsParentElement parent) {
-    return new JpsModuleSourceRootImpl(this, model, eventDispatcher, parent);
+  public JpsModuleSourceRootImpl createCopy() {
+    return new JpsModuleSourceRootImpl(this);
   }
 }
diff --git a/jps/model-impl/src/org/jetbrains/jps/model/module/impl/JpsSdkDependencyImpl.java b/jps/model-impl/src/org/jetbrains/jps/model/module/impl/JpsSdkDependencyImpl.java
index c59548818eaf..ebf38444d4c7 100644
--- a/jps/model-impl/src/org/jetbrains/jps/model/module/impl/JpsSdkDependencyImpl.java
+++ b/jps/model-impl/src/org/jetbrains/jps/model/module/impl/JpsSdkDependencyImpl.java
@@ -1,9 +1,6 @@
 package org.jetbrains.jps.model.module.impl;
 
 import org.jetbrains.annotations.NotNull;
-import org.jetbrains.jps.model.JpsEventDispatcher;
-import org.jetbrains.jps.model.JpsModel;
-import org.jetbrains.jps.model.JpsParentElement;
 import org.jetbrains.jps.model.library.JpsLibrary;
 import org.jetbrains.jps.model.library.JpsLibraryReference;
 import org.jetbrains.jps.model.library.JpsSdkType;
@@ -15,20 +12,20 @@ import org.jetbrains.jps.model.module.JpsSdkDependency;
 public class JpsSdkDependencyImpl extends JpsDependencyElementBase<JpsSdkDependencyImpl> implements JpsSdkDependency {
   private final JpsSdkType<?> mySdkType;
   
-  public JpsSdkDependencyImpl(@NotNull JpsSdkType<?> sdkType, JpsModel model, JpsEventDispatcher eventDispatcher, JpsDependenciesListImpl parent) {
-    super(model, eventDispatcher, parent);
+  public JpsSdkDependencyImpl(@NotNull JpsSdkType<?> sdkType) {
+    super();
     mySdkType = sdkType;
   }
 
-  public JpsSdkDependencyImpl(JpsSdkDependencyImpl original, JpsModel model, JpsEventDispatcher dispatcher, JpsParentElement parent) {
-    super(original, model, dispatcher, parent);
+  public JpsSdkDependencyImpl(JpsSdkDependencyImpl original) {
+    super(original);
     mySdkType = original.mySdkType;
   }
 
   @NotNull
   @Override
-  public JpsSdkDependencyImpl createCopy(@NotNull JpsModel model, @NotNull JpsEventDispatcher eventDispatcher, JpsParentElement parent) {
-    return new JpsSdkDependencyImpl(this, model, eventDispatcher, parent);
+  public JpsSdkDependencyImpl createCopy() {
+    return new JpsSdkDependencyImpl(this);
   }
 
   @Override
@@ -39,12 +36,11 @@ public class JpsSdkDependencyImpl extends JpsDependencyElementBase<JpsSdkDepende
 
   @Override
   public JpsLibrary resolveSdk() {
-    final JpsLibraryReference reference = getParent().getParent().getSdkReferencesTable().getSdkReference(mySdkType);
+    final JpsLibraryReference reference = getDependenciesList().getParent().getSdkReferencesTable().getSdkReference(mySdkType);
     return reference != null ? reference.resolve() : null;
   }
 
-  @Override
-  public JpsDependenciesListImpl getParent() {
-    return (JpsDependenciesListImpl)super.getParent();
+  public JpsDependenciesListImpl getDependenciesList() {
+    return (JpsDependenciesListImpl)myParent.getParent();
   }
 }
diff --git a/jps/model-impl/src/org/jetbrains/jps/model/module/impl/JpsSdkReferencesTableImpl.java b/jps/model-impl/src/org/jetbrains/jps/model/module/impl/JpsSdkReferencesTableImpl.java
index 79fe355b9e25..4b7c81cbecd6 100644
--- a/jps/model-impl/src/org/jetbrains/jps/model/module/impl/JpsSdkReferencesTableImpl.java
+++ b/jps/model-impl/src/org/jetbrains/jps/model/module/impl/JpsSdkReferencesTableImpl.java
@@ -2,11 +2,7 @@ package org.jetbrains.jps.model.module.impl;
 
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.jps.model.JpsElementKind;
-import org.jetbrains.jps.model.JpsEventDispatcher;
-import org.jetbrains.jps.model.JpsModel;
-import org.jetbrains.jps.model.JpsParentElement;
 import org.jetbrains.jps.model.impl.JpsCompositeElementBase;
-import org.jetbrains.jps.model.library.JpsLibrary;
 import org.jetbrains.jps.model.library.JpsLibraryReference;
 import org.jetbrains.jps.model.library.JpsSdkType;
 import org.jetbrains.jps.model.module.JpsSdkReferencesTable;
@@ -17,25 +13,23 @@ import org.jetbrains.jps.model.module.JpsSdkReferencesTable;
 public class JpsSdkReferencesTableImpl extends JpsCompositeElementBase<JpsSdkReferencesTableImpl> implements JpsSdkReferencesTable {
   public static final JpsElementKind<JpsSdkReferencesTableImpl> KIND = new JpsElementKind<JpsSdkReferencesTableImpl>();
 
-  public JpsSdkReferencesTableImpl(JpsModel model, JpsEventDispatcher eventDispatcher, JpsParentElement parent) {
-    super(model, eventDispatcher, parent);
+  public JpsSdkReferencesTableImpl() {
+    super();
   }
 
-  public JpsSdkReferencesTableImpl(JpsSdkReferencesTableImpl original, JpsModel model, JpsEventDispatcher dispatcher, JpsParentElement parent) {
-    super(original, model, dispatcher, parent);
+  private JpsSdkReferencesTableImpl(JpsSdkReferencesTableImpl original) {
+    super(original);
   }
 
   @NotNull
   @Override
-  public JpsSdkReferencesTableImpl createCopy(@NotNull JpsModel model,
-                                              @NotNull JpsEventDispatcher eventDispatcher,
-                                              JpsParentElement parent) {
-    return new JpsSdkReferencesTableImpl(this, model, eventDispatcher, parent);
+  public JpsSdkReferencesTableImpl createCopy() {
+    return new JpsSdkReferencesTableImpl(this);
   }
 
   @Override
-  public void setSdkReference(@NotNull JpsSdkType<?> type, @NotNull JpsLibrary sdk) {
-    myContainer.setChild(new JpsSdkReferenceKind(type), sdk.createReference(this));
+  public void setSdkReference(@NotNull JpsSdkType<?> type, @NotNull JpsLibraryReference sdkReference) {
+    myContainer.setChild(new JpsSdkReferenceKind(type), sdkReference);
   }
   
   @Override
diff --git a/jps/model-impl/src/org/jetbrains/jps/service/impl/JpsServiceManagerImpl.java b/jps/model-impl/src/org/jetbrains/jps/service/impl/JpsServiceManagerImpl.java
new file mode 100644
index 000000000000..4f9c546a4cef
--- /dev/null
+++ b/jps/model-impl/src/org/jetbrains/jps/service/impl/JpsServiceManagerImpl.java
@@ -0,0 +1,33 @@
+package org.jetbrains.jps.service.impl;
+
+import org.jetbrains.jps.service.JpsServiceManager;
+
+import java.util.Iterator;
+import java.util.ServiceConfigurationError;
+import java.util.ServiceLoader;
+import java.util.concurrent.ConcurrentHashMap;
+
+/**
+ * @author nik
+ */
+public class JpsServiceManagerImpl extends JpsServiceManager {
+  private final ConcurrentHashMap<Class, Object> myServices = new ConcurrentHashMap<Class, Object>();
+
+  @Override
+  public <T> T getService(Class<T> serviceClass) {
+    //noinspection unchecked
+    T service = (T)myServices.get(serviceClass);
+    if (service == null) {
+      final Iterator<T> iterator = ServiceLoader.load(serviceClass).iterator();
+      if (!iterator.hasNext()) {
+        throw new ServiceConfigurationError("Implementation for " + serviceClass + " not found");
+      }
+      service = iterator.next();
+      if (iterator.hasNext()) {
+        throw new ServiceConfigurationError("More than one implementation for " + serviceClass + " found: " + service.getClass() + " and " + iterator.next().getClass());
+      }
+      myServices.putIfAbsent(serviceClass, service);
+    }
+    return service;
+  }
+}
diff --git a/jps/model-impl/testSrc/org/jetbrains/jps/model/JpsJavaExtensionTest.java b/jps/model-impl/testSrc/org/jetbrains/jps/model/JpsJavaExtensionTest.java
index a5d3bf2a71fb..0b5609390503 100644
--- a/jps/model-impl/testSrc/org/jetbrains/jps/model/JpsJavaExtensionTest.java
+++ b/jps/model-impl/testSrc/org/jetbrains/jps/model/JpsJavaExtensionTest.java
@@ -1,10 +1,10 @@
 package org.jetbrains.jps.model;
 
+import org.jetbrains.jps.model.java.JpsJavaDependencyExtension;
 import org.jetbrains.jps.model.java.JpsJavaDependencyScope;
 import org.jetbrains.jps.model.java.JpsJavaLibraryType;
 import org.jetbrains.jps.model.java.JpsJavaModuleType;
 import org.jetbrains.jps.model.java.impl.JavaModuleExtensionKind;
-import org.jetbrains.jps.model.java.impl.JpsJavaDependencyExtensionImpl;
 import org.jetbrains.jps.model.java.impl.JpsJavaDependencyExtensionKind;
 import org.jetbrains.jps.model.library.JpsLibrary;
 import org.jetbrains.jps.model.module.JpsDependencyElement;
@@ -31,7 +31,7 @@ public class JpsJavaExtensionTest extends JpsModelTestCase {
     model.commit();
 
     final JpsDependencyElement dep = assertOneElement(assertOneElement(myModel.getProject().getModules()).getDependenciesList().getDependencies());
-    final JpsJavaDependencyExtensionImpl extension = dep.getContainer().getChild(JpsJavaDependencyExtensionKind.INSTANCE);
+    final JpsJavaDependencyExtension extension = dep.getContainer().getChild(JpsJavaDependencyExtensionKind.INSTANCE);
     assertTrue(extension.isExported());
     assertSame(JpsJavaDependencyScope.TEST, extension.getScope());
   }
diff --git a/jps/model-impl/testSrc/org/jetbrains/jps/model/JpsLibraryTest.java b/jps/model-impl/testSrc/org/jetbrains/jps/model/JpsLibraryTest.java
index f437c6d7e192..7410eec8f26e 100644
--- a/jps/model-impl/testSrc/org/jetbrains/jps/model/JpsLibraryTest.java
+++ b/jps/model-impl/testSrc/org/jetbrains/jps/model/JpsLibraryTest.java
@@ -1,11 +1,9 @@
 package org.jetbrains.jps.model;
 
-import org.jetbrains.jps.model.impl.JpsProjectImpl;
 import org.jetbrains.jps.model.java.JpsJavaLibraryType;
 import org.jetbrains.jps.model.library.JpsLibrary;
 import org.jetbrains.jps.model.library.JpsLibraryReference;
 import org.jetbrains.jps.model.library.JpsLibraryRootType;
-import org.jetbrains.jps.model.library.impl.JpsLibraryReferenceImpl;
 
 /**
  * @author nik
@@ -31,14 +29,13 @@ public class JpsLibraryTest extends JpsModelTestCase {
 
   public void testCreateReferenceByLibrary() {
     final JpsLibrary library = myModel.getProject().addLibrary(JpsJavaLibraryType.INSTANCE, "l");
-    final JpsLibraryReference reference = library.createReference(myModel.getProject());
+    final JpsLibraryReference reference = library.createReference().asExternal(myModel);
     assertEquals("l", reference.getLibraryName());
     assertSame(library, reference.resolve());
   }
 
   public void testCreateReferenceByName() {
-    final JpsProjectImpl project = myModel.getProject();
-    JpsLibraryReference reference = new JpsLibraryReferenceImpl(myModel, myDispatcher, "l", myModel.getProject().createReference(project), project);
+    JpsLibraryReference reference = JpsElementFactory.getInstance().createLibraryReference("l", myModel.getProject().createReference()).asExternal(myModel);
     assertEquals("l", reference.getLibraryName());
     assertNull(reference.resolve());
 
diff --git a/jps/model-impl/testSrc/org/jetbrains/jps/model/JpsModelTestCase.java b/jps/model-impl/testSrc/org/jetbrains/jps/model/JpsModelTestCase.java
index fb3b425b68c2..2f3cc044f38a 100644
--- a/jps/model-impl/testSrc/org/jetbrains/jps/model/JpsModelTestCase.java
+++ b/jps/model-impl/testSrc/org/jetbrains/jps/model/JpsModelTestCase.java
@@ -7,7 +7,7 @@ import org.jetbrains.jps.model.impl.JpsModelImpl;
  * @author nik
  */
 public abstract class JpsModelTestCase extends UsefulTestCase {
-  protected JpsModelImpl myModel;
+  protected JpsModel myModel;
   protected TestJpsEventDispatcher myDispatcher;
 
   public void setUp() throws Exception {
diff --git a/jps/model-impl/testSrc/org/jetbrains/jps/model/JpsModuleTest.java b/jps/model-impl/testSrc/org/jetbrains/jps/model/JpsModuleTest.java
index 65ccac9ac2b9..b521774842b4 100644
--- a/jps/model-impl/testSrc/org/jetbrains/jps/model/JpsModuleTest.java
+++ b/jps/model-impl/testSrc/org/jetbrains/jps/model/JpsModuleTest.java
@@ -1,10 +1,8 @@
 package org.jetbrains.jps.model;
 
-import org.jetbrains.jps.model.impl.JpsProjectImpl;
 import org.jetbrains.jps.model.java.*;
 import org.jetbrains.jps.model.library.JpsLibrary;
 import org.jetbrains.jps.model.module.*;
-import org.jetbrains.jps.model.module.impl.JpsModuleReferenceImpl;
 
 import java.util.List;
 
@@ -74,32 +72,31 @@ public class JpsModuleTest extends JpsModelTestCase {
     m.getDependenciesList().getDependencies().get(0).remove();
     m.getDependenciesList().addModuleDependency(dep);
     modifiableModel.commit();
-    assertSame(library, assertOneElement(myDispatcher.retrieveRemoved(JpsLibraryDependency.class)).getLibraryReference().resolve());
+    assertOneElement(myDispatcher.retrieveRemoved(JpsLibraryDependency.class));
     assertSame(dep, assertOneElement(myDispatcher.retrieveAdded(JpsModuleDependency.class)).getModuleReference().resolve());
     assertSame(dep, assertInstanceOf(assertOneElement(module.getDependenciesList().getDependencies()), JpsModuleDependency.class).getModuleReference().resolve());
   }
 
   public void testCreateReferenceByModule() {
     final JpsModule module = myModel.getProject().addModule(JpsJavaModuleType.INSTANCE, "m");
-    final JpsModuleReference reference = module.createReference(myModel.getProject());
+    final JpsModuleReference reference = module.createReference().asExternal(myModel);
     assertEquals("m", reference.getModuleName());
     assertSame(module, reference.resolve());
   }
 
   public void testCreateReferenceByName() {
-    final JpsProjectImpl project = myModel.getProject();
-    final JpsModuleReference reference = new JpsModuleReferenceImpl(myModel, "m", myDispatcher, project);
+    final JpsModuleReference reference = JpsElementFactory.getInstance().createModuleReference("m").asExternal(myModel);
     assertEquals("m", reference.getModuleName());
     assertNull(reference.resolve());
 
-    final JpsModule module = project.addModule(JpsJavaModuleType.INSTANCE, "m");
+    final JpsModule module = myModel.getProject().addModule(JpsJavaModuleType.INSTANCE, "m");
     assertSame(module, reference.resolve());
   }
 
   public void testSdkDependency() {
     JpsLibrary sdk = myModel.getGlobal().addLibrary(JpsJavaSdkType.INSTANCE, "sdk");
     final JpsModule module = myModel.getProject().addModule(JpsJavaModuleType.INSTANCE, "m");
-    module.getSdkReferencesTable().setSdkReference(JpsJavaSdkType.INSTANCE, sdk);
+    module.getSdkReferencesTable().setSdkReference(JpsJavaSdkType.INSTANCE, sdk.createReference());
     module.getDependenciesList().addSdkDependency(JpsJavaSdkType.INSTANCE);
 
     final JpsSdkDependency dependency = assertInstanceOf(assertOneElement(module.getDependenciesList().getDependencies()), JpsSdkDependency.class);
diff --git a/platform/core-api/src/com/intellij/lang/PsiBuilder.java b/platform/core-api/src/com/intellij/lang/PsiBuilder.java
index 24144aec4498..4d756434f4fe 100644
--- a/platform/core-api/src/com/intellij/lang/PsiBuilder.java
+++ b/platform/core-api/src/com/intellij/lang/PsiBuilder.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.
@@ -13,7 +13,6 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package com.intellij.lang;
 
 import com.intellij.openapi.project.Project;
@@ -26,7 +25,7 @@ import org.jetbrains.annotations.NonNls;
 import org.jetbrains.annotations.Nullable;
 
 /**
- * The IDEA side of a custom language parser. Provides lexing results to the
+ * The IDEA side of a custom language parser. Provides lexical analysis results to the
  * plugin and allows the plugin to build the AST tree.
  *
  * @see PsiParser
@@ -54,14 +53,14 @@ public interface PsiBuilder extends UserDataHolder, UserDataHolderUnprotected {
   /**
    * Returns the type of current token from the lexer.
    *
-   * @return the token type, or null when lexing is over.
+   * @return the token type, or null when the token stream is over.
    * @see #setTokenTypeRemapper(ITokenTypeRemapper).
    */
   @Nullable
   IElementType getTokenType();
 
   /**
-   * Sets optional remapper that can change the type of freshly lexed tokens.
+   * Sets optional remapper that can change the type of tokens.
    * Output of getTokenType() is affected by it.
    *
    * @param remapper the remapper object, or null.
@@ -107,14 +106,14 @@ public interface PsiBuilder extends UserDataHolder, UserDataHolderUnprotected {
   /**
    * Returns the text of the current token from the lexer.
    *
-   * @return the token text, or null when the lexing is over.
+   * @return the token text, or null when the token stream is over.
    */
   @NonNls
   @Nullable
   String getTokenText();
 
   /**
-   * Returns the start offset of the current token, or the file length when the lexing is over.
+   * Returns the start offset of the current token, or the file length when the token stream is over.
    *
    * @return the token offset.
    */
diff --git a/platform/core-impl/src/com/intellij/lang/impl/ASTNodeBuilder.java b/platform/core-impl/src/com/intellij/lang/impl/ASTNodeBuilder.java
index 40b62aba78de..86013d138565 100644
--- a/platform/core-impl/src/com/intellij/lang/impl/ASTNodeBuilder.java
+++ b/platform/core-impl/src/com/intellij/lang/impl/ASTNodeBuilder.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.
@@ -15,23 +15,20 @@
  */
 package com.intellij.lang.impl;
 
-import com.intellij.lang.PsiBuilder;
 import com.intellij.psi.tree.IElementType;
 import org.jetbrains.annotations.Nullable;
 
 /**
- * Created by IntelliJ IDEA.
- * User: Maxim.Mossienko
- * Date: 11/5/11
- * Time: 6:31 PM
+ * @author Maxim.Mossienko
+ * @since 5.11.2011
  */
 public interface ASTNodeBuilder {
   @Nullable
-  IElementType getElementType(int lexemIndex);
+  IElementType getElementType(int lexemeIndex);
   
   interface ASTUnparsedNodeMarker {
     ASTNodeBuilder getBuilder();
-    int getStartLexemIndex();
-    int getEndLexemIndex();
+    int getStartLexemeIndex();
+    int getEndLexemeIndex();
   }
 }
diff --git a/platform/core-impl/src/com/intellij/lang/impl/PsiBuilderImpl.java b/platform/core-impl/src/com/intellij/lang/impl/PsiBuilderImpl.java
index 85fa31f325ff..15ce63211bce 100644
--- a/platform/core-impl/src/com/intellij/lang/impl/PsiBuilderImpl.java
+++ b/platform/core-impl/src/com/intellij/lang/impl/PsiBuilderImpl.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.
@@ -22,10 +22,7 @@ import com.intellij.openapi.diagnostic.Logger;
 import com.intellij.openapi.progress.ProgressIndicator;
 import com.intellij.openapi.progress.ProgressIndicatorProvider;
 import com.intellij.openapi.project.Project;
-import com.intellij.openapi.util.Comparing;
-import com.intellij.openapi.util.Key;
-import com.intellij.openapi.util.Ref;
-import com.intellij.openapi.util.UserDataHolderBase;
+import com.intellij.openapi.util.*;
 import com.intellij.psi.PsiErrorElement;
 import com.intellij.psi.PsiFile;
 import com.intellij.psi.TokenType;
@@ -34,6 +31,7 @@ import com.intellij.psi.impl.source.resolve.FileContextUtil;
 import com.intellij.psi.impl.source.text.BlockSupportImpl;
 import com.intellij.psi.impl.source.text.DiffLog;
 import com.intellij.psi.impl.source.tree.*;
+import com.intellij.psi.impl.source.tree.Factory;
 import com.intellij.psi.text.BlockSupport;
 import com.intellij.psi.tree.*;
 import com.intellij.util.CharTable;
@@ -267,8 +265,8 @@ public class PsiBuilderImpl extends UserDataHolderBase implements PsiBuilder, AS
   }
 
   @Override
-  public IElementType getElementType(int lexemIndex) {
-    return lexemIndex < myLexemeCount && lexemIndex >= 0 ? myLexTypes[lexemIndex] : null;
+  public IElementType getElementType(int lexemeIndex) {
+    return lexemeIndex < myLexemeCount && lexemeIndex >= 0 ? myLexTypes[lexemeIndex] : null;
   }
 
   public abstract static class ProductionMarker extends Node {
@@ -555,12 +553,12 @@ public class PsiBuilderImpl extends UserDataHolderBase implements PsiBuilder, AS
     }
 
     @Override
-    public int getStartLexemIndex() {
+    public int getStartLexemeIndex() {
       return myStartIndex;
     }
 
     @Override
-    public int getEndLexemIndex() {
+    public int getEndLexemeIndex() {
       return myEndIndex;
     }
 
@@ -911,7 +909,7 @@ public class PsiBuilderImpl extends UserDataHolderBase implements PsiBuilder, AS
     ((StartMarker)marker).myDoneMarker.myCollapse = true;
   }
 
-  @SuppressWarnings({"UseOfSystemOutOrSystemErr", "SuspiciousMethodCalls"})
+  @SuppressWarnings({"UseOfSystemOutOrSystemErr", "SuspiciousMethodCalls", "ThrowableResultOfMethodCallIgnored"})
   private void doValidityChecks(final Marker marker, @Nullable final Marker before) {
     final DoneMarker doneMarker = ((StartMarker)marker).myDoneMarker;
     if (doneMarker != null) {
@@ -969,8 +967,7 @@ public class PsiBuilderImpl extends UserDataHolderBase implements PsiBuilder, AS
       return buildTree();
     }
     finally {
-      for (int i = 0, myProductionSize = myProduction.size(); i < myProductionSize; i++) {
-        ProductionMarker marker = myProduction.get(i);
+      for (ProductionMarker marker : myProduction) {
         if (marker instanceof StartMarker) {
           START_MARKERS.recycle((StartMarker)marker);
         }
@@ -1009,6 +1006,7 @@ public class PsiBuilderImpl extends UserDataHolderBase implements PsiBuilder, AS
 
   private ASTNode createRootAST(final StartMarker rootMarker) {
     final IElementType type = rootMarker.getTokenType();
+    @SuppressWarnings("NullableProblems")
     final ASTNode rootNode = type instanceof ILazyParseableElementType ?
                              ASTFactory.lazy((ILazyParseableElementType)type, null) : createComposite(rootMarker);
     if (myCharTable == null) {
@@ -1162,7 +1160,8 @@ public class PsiBuilderImpl extends UserDataHolderBase implements PsiBuilder, AS
   }
 
   private final class RelativeTokenTypesView extends AbstractList<IElementType> {
-    private int start, size;
+    private int start;
+    private int size;
 
     private void configure(int _start, int _end) {
       size = _end - _start;
@@ -1369,12 +1368,12 @@ public class PsiBuilderImpl extends UserDataHolderBase implements PsiBuilder, AS
                n2 instanceof Token && ((Token)n2).myBuilder.myWhitespaces.contains(n2.getTokenType());
       }
 
-      return derefToken(n1.getElementType()) == derefToken(n2.getTokenType());
+      return dereferenceToken(n1.getElementType()) == dereferenceToken(n2.getTokenType());
     }
 
-    public static IElementType derefToken(IElementType probablyWrapper) {
+    public static IElementType dereferenceToken(IElementType probablyWrapper) {
       if (probablyWrapper instanceof TokenWrapper) {
-        return derefToken(((TokenWrapper)probablyWrapper).getDelegate());
+        return dereferenceToken(((TokenWrapper)probablyWrapper).getDelegate());
       }
       return probablyWrapper;
     }
@@ -1538,9 +1537,9 @@ public class PsiBuilderImpl extends UserDataHolderBase implements PsiBuilder, AS
       return curToken;
     }
 
-    private void insertLeaf(IElementType type, PsiBuilderImpl builder, int startLexemIndex, int endLexemIndex) {
-      final int start = builder.myLexStarts[startLexemIndex];
-      final int end = builder.myLexStarts[endLexemIndex];
+    private void insertLeaf(IElementType type, PsiBuilderImpl builder, int startLexemeIndex, int endLexemeIndex) {
+      final int start = builder.myLexStarts[startLexemeIndex];
+      final int end = builder.myLexStarts[endLexemeIndex];
       if (start > end || ((start == end) && !(type instanceof ILeafElementType))) return;
 
       final Token lexeme;
@@ -1548,8 +1547,8 @@ public class PsiBuilderImpl extends UserDataHolderBase implements PsiBuilder, AS
         lexeme = myLazyPool.alloc();
         LazyParseableToken lazyParseableToken = (LazyParseableToken)lexeme;
         lazyParseableToken.myParent = this;
-        lazyParseableToken.myStartIndex = startLexemIndex;
-        lazyParseableToken.myEndIndex = endLexemIndex;
+        lazyParseableToken.myStartIndex = startLexemeIndex;
+        lazyParseableToken.myEndIndex = endLexemeIndex;
       }
       else {
         lexeme = myPool.alloc();
diff --git a/platform/icons/src/actions/cleanHeavy.png b/platform/icons/src/actions/cleanHeavy.png
deleted file mode 100644
index 157e9c6243e1..000000000000
Binary files a/platform/icons/src/actions/cleanHeavy.png and /dev/null differ
diff --git a/platform/icons/src/actions/collapsePanel.png b/platform/icons/src/actions/collapsePanel.png
deleted file mode 100644
index dc3b89c56bfd..000000000000
Binary files a/platform/icons/src/actions/collapsePanel.png and /dev/null differ
diff --git a/platform/icons/src/actions/createFromUsage_off.png b/platform/icons/src/actions/createFromUsage_off.png
deleted file mode 100644
index 95f5a676c0ba..000000000000
Binary files a/platform/icons/src/actions/createFromUsage_off.png and /dev/null differ
diff --git a/platform/icons/src/actions/intentionOffBulb.png b/platform/icons/src/actions/intentionOffBulb.png
deleted file mode 100644
index 1cfd1d4706c5..000000000000
Binary files a/platform/icons/src/actions/intentionOffBulb.png and /dev/null differ
diff --git a/platform/icons/src/fileTypes/facesFile.png b/platform/icons/src/fileTypes/facesFile.png
deleted file mode 100644
index 67f7cee6d515..000000000000
Binary files a/platform/icons/src/fileTypes/facesFile.png and /dev/null differ
diff --git a/platform/icons/src/fileTypes/facesXFile.png b/platform/icons/src/fileTypes/facesXFile.png
deleted file mode 100644
index f351cf96192d..000000000000
Binary files a/platform/icons/src/fileTypes/facesXFile.png and /dev/null differ
diff --git a/platform/icons/src/general/navbarSeparatorActive.png b/platform/icons/src/general/navbarSeparatorActive.png
deleted file mode 100644
index a1e23b2c6bd9..000000000000
Binary files a/platform/icons/src/general/navbarSeparatorActive.png and /dev/null differ
diff --git a/platform/icons/src/general/navbarSeparatorGradient.png b/platform/icons/src/general/navbarSeparatorGradient.png
deleted file mode 100644
index d1ac02af49e3..000000000000
Binary files a/platform/icons/src/general/navbarSeparatorGradient.png and /dev/null differ
diff --git a/platform/icons/src/general/navbarSeparatorPassive.png b/platform/icons/src/general/navbarSeparatorPassive.png
deleted file mode 100644
index 32feca4fa123..000000000000
Binary files a/platform/icons/src/general/navbarSeparatorPassive.png and /dev/null differ
diff --git a/platform/icons/src/general/progressTransparentPlaceHolder.png b/platform/icons/src/general/progressTransparentPlaceHolder.png
deleted file mode 100644
index 1528cdc502fb..000000000000
Binary files a/platform/icons/src/general/progressTransparentPlaceHolder.png and /dev/null differ
diff --git a/platform/icons/src/general/projectProperties.png b/platform/icons/src/general/projectProperties.png
deleted file mode 100644
index 147974a4ce2b..000000000000
Binary files a/platform/icons/src/general/projectProperties.png and /dev/null differ
diff --git a/platform/icons/src/ide/defaultProfile.png b/platform/icons/src/ide/defaultProfile.png
deleted file mode 100644
index f671c6296af7..000000000000
Binary files a/platform/icons/src/ide/defaultProfile.png and /dev/null differ
diff --git a/platform/icons/src/ide/defaultProjectProfile.png b/platform/icons/src/ide/defaultProjectProfile.png
deleted file mode 100644
index aef4c38b9e48..000000000000
Binary files a/platform/icons/src/ide/defaultProjectProfile.png and /dev/null differ
diff --git a/platform/icons/src/ide/facetDetected.png b/platform/icons/src/ide/facetDetected.png
deleted file mode 100644
index dee914875196..000000000000
Binary files a/platform/icons/src/ide/facetDetected.png and /dev/null differ
diff --git a/platform/icons/src/ide/macroToolbar1.png b/platform/icons/src/ide/macroToolbar1.png
deleted file mode 100644
index 37e3088bdaaa..000000000000
Binary files a/platform/icons/src/ide/macroToolbar1.png and /dev/null differ
diff --git a/platform/icons/src/ide/macroToolbar2.png b/platform/icons/src/ide/macroToolbar2.png
deleted file mode 100644
index 8c37c348c42d..000000000000
Binary files a/platform/icons/src/ide/macroToolbar2.png and /dev/null differ
diff --git a/platform/icons/src/javaee/JavaeeAppModuleGroup.png b/platform/icons/src/javaee/JavaeeAppModuleGroup.png
deleted file mode 100644
index 381b866f9543..000000000000
Binary files a/platform/icons/src/javaee/JavaeeAppModuleGroup.png and /dev/null differ
diff --git a/platform/icons/src/javaee/ejbModuleGroup.png b/platform/icons/src/javaee/ejbModuleGroup.png
deleted file mode 100644
index 85f31a46e003..000000000000
Binary files a/platform/icons/src/javaee/ejbModuleGroup.png and /dev/null differ
diff --git a/platform/icons/src/javaee/javaModuleGroup.png b/platform/icons/src/javaee/javaModuleGroup.png
deleted file mode 100644
index 6ce7278a73f7..000000000000
Binary files a/platform/icons/src/javaee/javaModuleGroup.png and /dev/null differ
diff --git a/platform/icons/src/javaee/messageBeanBig.png b/platform/icons/src/javaee/messageBeanBig.png
deleted file mode 100644
index ae6155cb8f38..000000000000
Binary files a/platform/icons/src/javaee/messageBeanBig.png and /dev/null differ
diff --git a/platform/icons/src/javaee/sessionBeanBig.png b/platform/icons/src/javaee/sessionBeanBig.png
deleted file mode 100644
index 686578db52bd..000000000000
Binary files a/platform/icons/src/javaee/sessionBeanBig.png and /dev/null differ
diff --git a/platform/icons/src/javaee/typeBinary.png b/platform/icons/src/javaee/typeBinary.png
deleted file mode 100644
index 85b1f148fe6a..000000000000
Binary files a/platform/icons/src/javaee/typeBinary.png and /dev/null differ
diff --git a/platform/icons/src/javaee/typeDateTime.png b/platform/icons/src/javaee/typeDateTime.png
deleted file mode 100644
index bc3c4a2adfac..000000000000
Binary files a/platform/icons/src/javaee/typeDateTime.png and /dev/null differ
diff --git a/platform/icons/src/javaee/typeNotNull.png b/platform/icons/src/javaee/typeNotNull.png
deleted file mode 100644
index a1e66734c856..000000000000
Binary files a/platform/icons/src/javaee/typeNotNull.png and /dev/null differ
diff --git a/platform/icons/src/javaee/typeNullable.png b/platform/icons/src/javaee/typeNullable.png
deleted file mode 100644
index 477206812d0d..000000000000
Binary files a/platform/icons/src/javaee/typeNullable.png and /dev/null differ
diff --git a/platform/icons/src/javaee/typeNumeric.png b/platform/icons/src/javaee/typeNumeric.png
deleted file mode 100644
index cd4b7e052bc3..000000000000
Binary files a/platform/icons/src/javaee/typeNumeric.png and /dev/null differ
diff --git a/platform/icons/src/javaee/typeString.png b/platform/icons/src/javaee/typeString.png
deleted file mode 100644
index 5a85c5bf5007..000000000000
Binary files a/platform/icons/src/javaee/typeString.png and /dev/null differ
diff --git a/platform/icons/src/modules/CenterGeneralTitleBar.png b/platform/icons/src/modules/CenterGeneralTitleBar.png
deleted file mode 100644
index 02df149bf1d5..000000000000
Binary files a/platform/icons/src/modules/CenterGeneralTitleBar.png and /dev/null differ
diff --git a/platform/icons/src/modules/addExistingModule.png b/platform/icons/src/modules/addExistingModule.png
deleted file mode 100644
index 76848904b9a8..000000000000
Binary files a/platform/icons/src/modules/addExistingModule.png and /dev/null differ
diff --git a/platform/icons/src/modules/addLibraries.png b/platform/icons/src/modules/addLibraries.png
deleted file mode 100644
index d4848c203344..000000000000
Binary files a/platform/icons/src/modules/addLibraries.png and /dev/null differ
diff --git a/platform/icons/src/modules/bottomCenter.png b/platform/icons/src/modules/bottomCenter.png
deleted file mode 100644
index 88588016fd39..000000000000
Binary files a/platform/icons/src/modules/bottomCenter.png and /dev/null differ
diff --git a/platform/icons/src/modules/bottomLeftCorner.png b/platform/icons/src/modules/bottomLeftCorner.png
deleted file mode 100644
index a3aa6c37f17f..000000000000
Binary files a/platform/icons/src/modules/bottomLeftCorner.png and /dev/null differ
diff --git a/platform/icons/src/modules/bottomRightCorner.png b/platform/icons/src/modules/bottomRightCorner.png
deleted file mode 100644
index 1bcdae5362fd..000000000000
Binary files a/platform/icons/src/modules/bottomRightCorner.png and /dev/null differ
diff --git a/platform/icons/src/modules/classpath.png b/platform/icons/src/modules/classpath.png
deleted file mode 100644
index 487b7c80f93b..000000000000
Binary files a/platform/icons/src/modules/classpath.png and /dev/null differ
diff --git a/platform/icons/src/modules/createNewModule.png b/platform/icons/src/modules/createNewModule.png
deleted file mode 100644
index 2ffbe0a8b4a6..000000000000
Binary files a/platform/icons/src/modules/createNewModule.png and /dev/null differ
diff --git a/platform/icons/src/modules/dependencies.png b/platform/icons/src/modules/dependencies.png
deleted file mode 100644
index cb2033c58b72..000000000000
Binary files a/platform/icons/src/modules/dependencies.png and /dev/null differ
diff --git a/platform/icons/src/modules/edit.png b/platform/icons/src/modules/edit.png
deleted file mode 100644
index bd9bca941726..000000000000
Binary files a/platform/icons/src/modules/edit.png and /dev/null differ
diff --git a/platform/icons/src/modules/editLibraries.png b/platform/icons/src/modules/editLibraries.png
deleted file mode 100644
index 2d16bf4a9d6e..000000000000
Binary files a/platform/icons/src/modules/editLibraries.png and /dev/null differ
diff --git a/platform/icons/src/modules/javadoc.png b/platform/icons/src/modules/javadoc.png
deleted file mode 100644
index 20255eb973f8..000000000000
Binary files a/platform/icons/src/modules/javadoc.png and /dev/null differ
diff --git a/platform/icons/src/modules/libraries.png b/platform/icons/src/modules/libraries.png
deleted file mode 100644
index 4544dd9d5361..000000000000
Binary files a/platform/icons/src/modules/libraries.png and /dev/null differ
diff --git a/platform/icons/src/modules/order.png b/platform/icons/src/modules/order.png
deleted file mode 100644
index fb80bd0084de..000000000000
Binary files a/platform/icons/src/modules/order.png and /dev/null differ
diff --git a/platform/icons/src/modules/paths.png b/platform/icons/src/modules/paths.png
deleted file mode 100644
index 4285ad82dc89..000000000000
Binary files a/platform/icons/src/modules/paths.png and /dev/null differ
diff --git a/platform/icons/src/modules/remove.png b/platform/icons/src/modules/remove.png
deleted file mode 100644
index aa2ea96ec66c..000000000000
Binary files a/platform/icons/src/modules/remove.png and /dev/null differ
diff --git a/platform/icons/src/javaee/JavaeeAppModuleBig.png b/platform/icons/src/modules/types/JavaeeAppModule.png
similarity index 100%
rename from platform/icons/src/javaee/JavaeeAppModuleBig.png
rename to platform/icons/src/modules/types/JavaeeAppModule.png
diff --git a/platform/icons/src/javaee/ejbModuleBig.png b/platform/icons/src/modules/types/ejbModule.png
similarity index 100%
rename from platform/icons/src/javaee/ejbModuleBig.png
rename to platform/icons/src/modules/types/ejbModule.png
diff --git a/platform/icons/src/modules/emptyProjectType.png b/platform/icons/src/modules/types/emptyProjectType.png
similarity index 100%
rename from platform/icons/src/modules/emptyProjectType.png
rename to platform/icons/src/modules/types/emptyProjectType.png
diff --git a/platform/icons/src/modules/javaModule.png b/platform/icons/src/modules/types/javaModule.png
similarity index 100%
rename from platform/icons/src/modules/javaModule.png
rename to platform/icons/src/modules/types/javaModule.png
diff --git a/platform/icons/src/modules/pluginModule.png b/platform/icons/src/modules/types/pluginModule.png
similarity index 100%
rename from platform/icons/src/modules/pluginModule.png
rename to platform/icons/src/modules/types/pluginModule.png
diff --git a/platform/icons/src/javaee/webModuleBig.png b/platform/icons/src/modules/types/webModule.png
similarity index 100%
rename from platform/icons/src/javaee/webModuleBig.png
rename to platform/icons/src/modules/types/webModule.png
diff --git a/platform/icons/src/modules/unmarkSource.png b/platform/icons/src/modules/unmarkSource.png
deleted file mode 100644
index 0e25ad6864ef..000000000000
Binary files a/platform/icons/src/modules/unmarkSource.png and /dev/null differ
diff --git a/platform/icons/src/modules/unmarkTests.png b/platform/icons/src/modules/unmarkTests.png
deleted file mode 100644
index 7c2c8ddba4da..000000000000
Binary files a/platform/icons/src/modules/unmarkTests.png and /dev/null differ
diff --git a/platform/icons/src/nodes/DataSourceDisabled.png b/platform/icons/src/nodes/DataSourceDisabled.png
deleted file mode 100644
index fdb2867176d6..000000000000
Binary files a/platform/icons/src/nodes/DataSourceDisabled.png and /dev/null differ
diff --git a/platform/icons/src/nodes/addLocalWeblogicInstance.png b/platform/icons/src/nodes/addLocalWeblogicInstance.png
deleted file mode 100644
index 7a9585796a6b..000000000000
Binary files a/platform/icons/src/nodes/addLocalWeblogicInstance.png and /dev/null differ
diff --git a/platform/icons/src/nodes/dataConnection.png b/platform/icons/src/nodes/dataConnection.png
deleted file mode 100644
index 8ef69de745ad..000000000000
Binary files a/platform/icons/src/nodes/dataConnection.png and /dev/null differ
diff --git a/platform/icons/src/nodes/dataFkColumn.png b/platform/icons/src/nodes/dataFkColumn.png
deleted file mode 100644
index 1b94da3f816d..000000000000
Binary files a/platform/icons/src/nodes/dataFkColumn.png and /dev/null differ
diff --git a/platform/icons/src/nodes/dataForeignKey.png b/platform/icons/src/nodes/dataForeignKey.png
deleted file mode 100644
index 742126ea36df..000000000000
Binary files a/platform/icons/src/nodes/dataForeignKey.png and /dev/null differ
diff --git a/platform/icons/src/nodes/dataIndex.png b/platform/icons/src/nodes/dataIndex.png
deleted file mode 100644
index 8e9801ea7fe8..000000000000
Binary files a/platform/icons/src/nodes/dataIndex.png and /dev/null differ
diff --git a/platform/icons/src/nodes/dataPkColumn.png b/platform/icons/src/nodes/dataPkColumn.png
deleted file mode 100644
index c4e82b9dee42..000000000000
Binary files a/platform/icons/src/nodes/dataPkColumn.png and /dev/null differ
diff --git a/platform/icons/src/nodes/dataPrimaryKey.png b/platform/icons/src/nodes/dataPrimaryKey.png
deleted file mode 100644
index 52c79c576767..000000000000
Binary files a/platform/icons/src/nodes/dataPrimaryKey.png and /dev/null differ
diff --git a/platform/icons/src/nodes/dataSequence.png b/platform/icons/src/nodes/dataSequence.png
deleted file mode 100644
index 2329ad48f9f2..000000000000
Binary files a/platform/icons/src/nodes/dataSequence.png and /dev/null differ
diff --git a/platform/icons/src/nodes/ejbNewGroup.png b/platform/icons/src/nodes/ejbNewGroup.png
deleted file mode 100644
index 4601cc2255ef..000000000000
Binary files a/platform/icons/src/nodes/ejbNewGroup.png and /dev/null differ
diff --git a/platform/icons/src/nodes/enterpriseClient.png b/platform/icons/src/nodes/enterpriseClient.png
deleted file mode 100644
index 1b6b2a48bfcb..000000000000
Binary files a/platform/icons/src/nodes/enterpriseClient.png and /dev/null differ
diff --git a/platform/icons/src/nodes/enterpriseResource.png b/platform/icons/src/nodes/enterpriseResource.png
deleted file mode 100644
index 694926a1f490..000000000000
Binary files a/platform/icons/src/nodes/enterpriseResource.png and /dev/null differ
diff --git a/platform/icons/src/nodes/junitTestClass.png b/platform/icons/src/nodes/junitTestClass.png
deleted file mode 100644
index 7b54beafa118..000000000000
Binary files a/platform/icons/src/nodes/junitTestClass.png and /dev/null differ
diff --git a/platform/icons/src/nodes/lockedSingle.png b/platform/icons/src/nodes/lockedSingle.png
deleted file mode 100644
index b79341be6da4..000000000000
Binary files a/platform/icons/src/nodes/lockedSingle.png and /dev/null differ
diff --git a/platform/icons/src/nodes/moduleJar.png b/platform/icons/src/nodes/moduleJar.png
deleted file mode 100644
index 0ae972e0510c..000000000000
Binary files a/platform/icons/src/nodes/moduleJar.png and /dev/null differ
diff --git a/platform/icons/src/nodes/namedBunch.png b/platform/icons/src/nodes/namedBunch.png
deleted file mode 100644
index 7086f8972237..000000000000
Binary files a/platform/icons/src/nodes/namedBunch.png and /dev/null differ
diff --git a/platform/icons/src/nodes/parentsIntroduction.png b/platform/icons/src/nodes/parentsIntroduction.png
deleted file mode 100644
index c1d53c5bdf7a..000000000000
Binary files a/platform/icons/src/nodes/parentsIntroduction.png and /dev/null differ
diff --git a/platform/icons/src/nodes/pin.png b/platform/icons/src/nodes/pin.png
deleted file mode 100644
index 75fa2654d9aa..000000000000
Binary files a/platform/icons/src/nodes/pin.png and /dev/null differ
diff --git a/platform/icons/src/nodes/ppJdk.png b/platform/icons/src/nodes/ppJdk.png
deleted file mode 100644
index 791e64de5cb4..000000000000
Binary files a/platform/icons/src/nodes/ppJdk.png and /dev/null differ
diff --git a/platform/icons/src/nodes/softeningIntroduction.png b/platform/icons/src/nodes/softeningIntroduction.png
deleted file mode 100644
index f36451a25c88..000000000000
Binary files a/platform/icons/src/nodes/softeningIntroduction.png and /dev/null differ
diff --git a/platform/icons/src/objectBrowser/hideEmptyPackages.png b/platform/icons/src/objectBrowser/hideEmptyPackages.png
deleted file mode 100644
index f9343e76b95d..000000000000
Binary files a/platform/icons/src/objectBrowser/hideEmptyPackages.png and /dev/null differ
diff --git a/platform/icons/src/objectBrowser/hideFields.png b/platform/icons/src/objectBrowser/hideFields.png
deleted file mode 100644
index d23863622945..000000000000
Binary files a/platform/icons/src/objectBrowser/hideFields.png and /dev/null differ
diff --git a/platform/icons/src/objectBrowser/showGlobalInspections.png b/platform/icons/src/objectBrowser/showGlobalInspections.png
deleted file mode 100644
index df53e391c792..000000000000
Binary files a/platform/icons/src/objectBrowser/showGlobalInspections.png and /dev/null differ
diff --git a/platform/icons/src/objectBrowser/showStructure.png b/platform/icons/src/objectBrowser/showStructure.png
deleted file mode 100644
index 10cacfba8cc0..000000000000
Binary files a/platform/icons/src/objectBrowser/showStructure.png and /dev/null differ
diff --git a/platform/icons/src/actions/apache.png b/platform/icons/src/providers/apache.png
similarity index 100%
rename from platform/icons/src/actions/apache.png
rename to platform/icons/src/providers/apache.png
diff --git a/platform/icons/src/nodes/beaSmall.png b/platform/icons/src/providers/bea.png
similarity index 100%
rename from platform/icons/src/nodes/beaSmall.png
rename to platform/icons/src/providers/bea.png
diff --git a/platform/icons/src/actions/cvs.png b/platform/icons/src/providers/cvs.png
similarity index 100%
rename from platform/icons/src/actions/cvs.png
rename to platform/icons/src/providers/cvs.png
diff --git a/platform/icons/src/actions/eclipse.png b/platform/icons/src/providers/eclipse.png
similarity index 100%
rename from platform/icons/src/actions/eclipse.png
rename to platform/icons/src/providers/eclipse.png
diff --git a/platform/icons/src/actions/hibernate.png b/platform/icons/src/providers/hibernate.png
similarity index 100%
rename from platform/icons/src/actions/hibernate.png
rename to platform/icons/src/providers/hibernate.png
diff --git a/platform/icons/src/actions/ibm.png b/platform/icons/src/providers/ibm.png
similarity index 100%
rename from platform/icons/src/actions/ibm.png
rename to platform/icons/src/providers/ibm.png
diff --git a/platform/icons/src/actions/microsoft.png b/platform/icons/src/providers/microsoft.png
similarity index 100%
rename from platform/icons/src/actions/microsoft.png
rename to platform/icons/src/providers/microsoft.png
diff --git a/platform/icons/src/actions/mysql.png b/platform/icons/src/providers/mysql.png
similarity index 100%
rename from platform/icons/src/actions/mysql.png
rename to platform/icons/src/providers/mysql.png
diff --git a/platform/icons/src/actions/oracle.png b/platform/icons/src/providers/oracle.png
similarity index 100%
rename from platform/icons/src/actions/oracle.png
rename to platform/icons/src/providers/oracle.png
diff --git a/platform/icons/src/actions/postgresql.png b/platform/icons/src/providers/postgresql.png
similarity index 100%
rename from platform/icons/src/actions/postgresql.png
rename to platform/icons/src/providers/postgresql.png
diff --git a/platform/icons/src/actions/sqlite.png b/platform/icons/src/providers/sqlite.png
similarity index 100%
rename from platform/icons/src/actions/sqlite.png
rename to platform/icons/src/providers/sqlite.png
diff --git a/platform/icons/src/actions/sun.png b/platform/icons/src/providers/sun.png
similarity index 100%
rename from platform/icons/src/actions/sun.png
rename to platform/icons/src/providers/sun.png
diff --git a/platform/icons/src/nodes/addRemoteWeblogicInstance.png b/platform/icons/src/toolbarDecorator/addRemoteDatasource.png
similarity index 100%
rename from platform/icons/src/nodes/addRemoteWeblogicInstance.png
rename to platform/icons/src/toolbarDecorator/addRemoteDatasource.png
diff --git a/platform/icons/src/vcs/showfilter.png b/platform/icons/src/vcs/showfilter.png
deleted file mode 100644
index c422ddc546e8..000000000000
Binary files a/platform/icons/src/vcs/showfilter.png and /dev/null differ
diff --git a/platform/lang-api/src/com/intellij/ui/popup/util/DetailView.java b/platform/lang-api/src/com/intellij/ui/popup/util/DetailView.java
index f065366ab209..c195f9789f62 100644
--- a/platform/lang-api/src/com/intellij/ui/popup/util/DetailView.java
+++ b/platform/lang-api/src/com/intellij/ui/popup/util/DetailView.java
@@ -18,6 +18,7 @@ package com.intellij.ui.popup.util;
 import com.intellij.openapi.editor.Editor;
 import com.intellij.openapi.editor.LogicalPosition;
 import com.intellij.openapi.editor.markup.TextAttributes;
+import com.intellij.openapi.util.UserDataHolder;
 import com.intellij.openapi.vfs.VirtualFile;
 import org.jetbrains.annotations.Nullable;
 
@@ -30,16 +31,75 @@ import javax.swing.*;
  * Time: 5:34 AM
  * To change this template use File | Settings | File Templates.
  */
-public interface DetailView {
-  void updateWithItem(ItemWrapper wrapper);
+public interface DetailView extends UserDataHolder {
 
   Editor getEditor();
 
-  void navigateInPreviewEditor(VirtualFile file, LogicalPosition positionToNavigate, TextAttributes lineAttributes);
+  void navigateInPreviewEditor(PreviewEditorState editorState);
 
   JPanel getDetailPanel();
 
   void setDetailPanel(@Nullable JPanel panel);
 
   void clearEditor();
+
+  PreviewEditorState getEditorState();
+
+  class PreviewEditorState {
+
+    public static PreviewEditorState EMPTY = new PreviewEditorState(null, null, null);
+
+    public static PreviewEditorState create(VirtualFile file, int line) {
+      return new PreviewEditorState(file, new LogicalPosition(line, 0), null);
+    }
+
+    public static PreviewEditorState create(VirtualFile file, int line, TextAttributes attributes) {
+      return new PreviewEditorState(file, new LogicalPosition(line, 0), attributes);
+    }
+
+    @Override
+    public boolean equals(Object o) {
+      if (this == o) return true;
+      if (o == null || getClass() != o.getClass()) return false;
+
+      PreviewEditorState state = (PreviewEditorState)o;
+
+      if (myAttributes != null ? !myAttributes.equals(state.myAttributes) : state.myAttributes != null) return false;
+      if (myFile != null ? !myFile.equals(state.myFile) : state.myFile != null) return false;
+      if (myNavigate != null ? !myNavigate.equals(state.myNavigate) : state.myNavigate != null) return false;
+
+      return true;
+    }
+
+    @Override
+    public int hashCode() {
+      int result = myFile != null ? myFile.hashCode() : 0;
+      result = 31 * result + (myNavigate != null ? myNavigate.hashCode() : 0);
+      result = 31 * result + (myAttributes != null ? myAttributes.hashCode() : 0);
+      return result;
+    }
+
+    public VirtualFile getFile() {
+      return myFile;
+    }
+
+    public LogicalPosition getNavigate() {
+      return myNavigate;
+    }
+
+    public TextAttributes getAttributes() {
+      return myAttributes;
+    }
+
+    private final VirtualFile myFile;
+    private final LogicalPosition myNavigate;
+    private final TextAttributes myAttributes;
+
+    public PreviewEditorState(VirtualFile file, LogicalPosition navigate, TextAttributes attributes) {
+
+      myFile = file;
+      myNavigate = navigate;
+      myAttributes = attributes;
+    }
+  }
 }
diff --git a/platform/lang-api/src/com/intellij/ui/popup/util/ItemWrapper.java b/platform/lang-api/src/com/intellij/ui/popup/util/ItemWrapper.java
index a84bac7f454d..c1c4d0bcc221 100644
--- a/platform/lang-api/src/com/intellij/ui/popup/util/ItemWrapper.java
+++ b/platform/lang-api/src/com/intellij/ui/popup/util/ItemWrapper.java
@@ -16,20 +16,12 @@
 package com.intellij.ui.popup.util;
 
 import com.intellij.openapi.project.Project;
-import com.intellij.openapi.ui.popup.JBPopup;
 import com.intellij.ui.ColoredListCellRenderer;
 import com.intellij.ui.ColoredTreeCellRenderer;
 import org.jetbrains.annotations.Nullable;
 
 import javax.swing.*;
 
-/**
-* Created with IntelliJ IDEA.
-* User: zajac
-* Date: 5/6/12
-* Time: 2:05 AM
-* To change this template use File | Settings | File Templates.
-*/
 public interface ItemWrapper {
   void setupRenderer(ColoredListCellRenderer renderer, Project project, boolean selected);
 
@@ -37,8 +29,6 @@ public interface ItemWrapper {
 
   void updateAccessoryView(JComponent label);
 
-  void execute(Project project, JBPopup popup);
-
   String speedSearchText();
 
   @Nullable
diff --git a/platform/lang-api/src/com/intellij/ui/popup/util/SplitterItem.java b/platform/lang-api/src/com/intellij/ui/popup/util/SplitterItem.java
index 4c038b103861..1b3bf2bd64cc 100644
--- a/platform/lang-api/src/com/intellij/ui/popup/util/SplitterItem.java
+++ b/platform/lang-api/src/com/intellij/ui/popup/util/SplitterItem.java
@@ -56,11 +56,6 @@ public class SplitterItem implements ItemWrapper {
     //To change body of implemented methods use File | Settings | File Templates.
   }
 
-  @Override
-  public void execute(Project project, JBPopup popup) {
-    //To change body of implemented methods use File | Settings | File Templates.
-  }
-
   @Override
   public String speedSearchText() {
     return "";  //To change body of implemented methods use File | Settings | File Templates.
diff --git a/platform/lang-impl/src/com/intellij/codeInsight/generation/CommentByBlockCommentHandler.java b/platform/lang-impl/src/com/intellij/codeInsight/generation/CommentByBlockCommentHandler.java
index fe09c10d5f18..3325c4f1d27c 100644
--- a/platform/lang-impl/src/com/intellij/codeInsight/generation/CommentByBlockCommentHandler.java
+++ b/platform/lang-impl/src/com/intellij/codeInsight/generation/CommentByBlockCommentHandler.java
@@ -313,7 +313,7 @@ public class CommentByBlockCommentHandler implements CodeInsightActionHandler {
   @Nullable
   private static Commenter findCommenter(PsiFile file, Editor editor) {
     final FileType fileType = file.getFileType();
-    if (fileType instanceof CustomSyntaxTableFileType) {
+    if (fileType instanceof AbstractFileType) {
       return ((AbstractFileType)fileType).getCommenter();
     }
 
diff --git a/platform/lang-impl/src/com/intellij/find/EditorSearchComponent.java b/platform/lang-impl/src/com/intellij/find/EditorSearchComponent.java
index a860dac383f8..2ad2a9060126 100644
--- a/platform/lang-impl/src/com/intellij/find/EditorSearchComponent.java
+++ b/platform/lang-impl/src/com/intellij/find/EditorSearchComponent.java
@@ -273,8 +273,10 @@ public class EditorSearchComponent extends EditorHeaderComponent implements Data
 
     myLeadPanel.add(myToolbarComponent);
 
-    if (myToolbarComponent instanceof ActionToolbarImpl) {
-      new ShowMoreOptions(myToolbarComponent, mySearchField);
+    if (secondaryActionsAvailable()) {
+      if (myToolbarComponent instanceof ActionToolbarImpl) {
+        new ShowMoreOptions(myToolbarComponent, mySearchField);
+      }
     }
 
 
@@ -358,11 +360,11 @@ public class EditorSearchComponent extends EditorHeaderComponent implements Data
     myActionsToolbar.setSecondaryActionsTooltip("More Options(" + ShowMoreOptions.SHORT_CUT + ")");
 
     actionGroup.addAction(new ToggleWholeWordsOnlyAction(this));
-    if (FindManagerImpl.ourHasSearchInCommentsAndLiterals) {
+    if (secondaryActionsAvailable()) {
       actionGroup.addAction(new ToggleInCommentsAction(this)).setAsSecondary(true);
       actionGroup.addAction(new ToggleInLiteralsOnlyAction(this)).setAsSecondary(true);
     }
-    actionGroup.addAction(new TogglePreserveCaseAction(this)).setAsSecondary(true);
+    actionGroup.addAction(new TogglePreserveCaseAction(this));
     actionGroup.addAction(new ToggleSelectionOnlyAction(this));
 
 
@@ -372,6 +374,10 @@ public class EditorSearchComponent extends EditorHeaderComponent implements Data
     myToolbarComponent.setOpaque(false);
   }
 
+  private boolean secondaryActionsAvailable() {
+    return FindManagerImpl.ourHasSearchInCommentsAndLiterals;
+  }
+
   private void setupSearchFieldListener() {
     mySearchField.getDocument().addDocumentListener(new DocumentListener() {
       @Override
@@ -484,9 +490,9 @@ public class EditorSearchComponent extends EditorHeaderComponent implements Data
     myReplaceField = createTextField(myReplacementPane);
     myReplaceUndo = new TextComponentUndoProvider(myReplaceField);
 
-    if (myToolbarComponent instanceof ActionToolbarImpl) {
-      new ShowMoreOptions(myToolbarComponent, myReplaceField);
-    }
+    //if (myToolbarComponent instanceof ActionToolbarImpl) {
+    //  new ShowMoreOptions(myToolbarComponent, myReplaceField);
+    //}
 
     DocumentListener replaceFieldListener = new DocumentListener() {
       @Override
diff --git a/platform/lang-impl/src/com/intellij/find/actions/ShowUsagesAction.java b/platform/lang-impl/src/com/intellij/find/actions/ShowUsagesAction.java
index 6bcbd42a0ebf..4dffeb5f5e5e 100644
--- a/platform/lang-impl/src/com/intellij/find/actions/ShowUsagesAction.java
+++ b/platform/lang-impl/src/com/intellij/find/actions/ShowUsagesAction.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2000-2010 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.
@@ -460,7 +460,8 @@ public class ShowUsagesAction extends AnAction implements PopupAction {
       else {
         s = title + " (" + UsageViewBundle.message("usages.n", usages.size()) + " found)";
       }
-      builder.setTitle(suggestSecondInvocation(options, handler, s));
+      builder.setTitle("<html>" + s + "</html>");
+      builder.setAdText(getSecondInvocationTitle(options, handler));
     }
 
     builder.setMovable(true).setResizable(true);
@@ -555,16 +556,26 @@ public class ShowUsagesAction extends AnAction implements PopupAction {
   }
 
   private static String suggestSecondInvocation(FindUsagesOptions options, FindUsagesHandler handler, String s) {
-    if (getShowUsagesShortcut() != null) {
-      GlobalSearchScope maximalScope = getMaximalScope(handler);
-      if (!notNullizeScope(options, handler.getProject()).equals(maximalScope)) {
-        s += "<br><small>Press " + KeymapUtil.getShortcutText(getShowUsagesShortcut()) +
-             " again to search in " + maximalScope.getDisplayName() + "</small>";
-      }
+    final String title = getSecondInvocationTitle(options, handler);
+
+    if (title != null) {
+        s += "<br><small>Press " + title + "</small>";
     }
     return "<html><body>" + s + "</body></html>";
   }
 
+  @Nullable
+  private static String getSecondInvocationTitle(FindUsagesOptions options, FindUsagesHandler handler) {
+    if (getShowUsagesShortcut() != null) {
+       GlobalSearchScope maximalScope = getMaximalScope(handler);
+       if (!notNullizeScope(options, handler.getProject()).equals(maximalScope)) {
+         return "Press " + KeymapUtil.getShortcutText(getShowUsagesShortcut()) +
+              " again to search in " + maximalScope.getDisplayName();
+       }
+     }
+     return null;
+  }
+
   private void searchEverywhere(FindUsagesOptions options,
                                 FindUsagesHandler handler,
                                 Editor editor,
diff --git a/platform/lang-impl/src/com/intellij/find/editorHeaderActions/ToggleMatchCase.java b/platform/lang-impl/src/com/intellij/find/editorHeaderActions/ToggleMatchCase.java
index 2c046f81a319..c6eb2dde40c2 100644
--- a/platform/lang-impl/src/com/intellij/find/editorHeaderActions/ToggleMatchCase.java
+++ b/platform/lang-impl/src/com/intellij/find/editorHeaderActions/ToggleMatchCase.java
@@ -20,7 +20,7 @@ import com.intellij.find.FindSettings;
 import com.intellij.openapi.actionSystem.AnActionEvent;
 
 public class ToggleMatchCase extends EditorHeaderToggleAction {
-  private static final String CASE_SENSITIVE = "&Case Sensitive";
+  private static final String CASE_SENSITIVE = "&Match Case";
 
   public ToggleMatchCase(EditorSearchComponent editorSearchComponent) {
     super(editorSearchComponent, CASE_SENSITIVE);
diff --git a/platform/lang-impl/src/com/intellij/find/editorHeaderActions/TogglePreserveCaseAction.java b/platform/lang-impl/src/com/intellij/find/editorHeaderActions/TogglePreserveCaseAction.java
index 03b5f19b93cc..1afb00177923 100644
--- a/platform/lang-impl/src/com/intellij/find/editorHeaderActions/TogglePreserveCaseAction.java
+++ b/platform/lang-impl/src/com/intellij/find/editorHeaderActions/TogglePreserveCaseAction.java
@@ -5,7 +5,7 @@ import com.intellij.find.FindModel;
 import com.intellij.openapi.actionSystem.AnActionEvent;
 
 public class TogglePreserveCaseAction extends EditorHeaderToggleAction  implements SecondaryHeaderAction {
-  private static final String TEXT = "&Preserve Case";
+  private static final String TEXT = "Preserve &Case";
 
   public TogglePreserveCaseAction(EditorSearchComponent editorSearchComponent) {
     super(editorSearchComponent, TEXT);
diff --git a/platform/lang-impl/src/com/intellij/find/editorHeaderActions/ToggleSelectionOnlyAction.java b/platform/lang-impl/src/com/intellij/find/editorHeaderActions/ToggleSelectionOnlyAction.java
index 63111e0e2693..2a8c6ee8add7 100644
--- a/platform/lang-impl/src/com/intellij/find/editorHeaderActions/ToggleSelectionOnlyAction.java
+++ b/platform/lang-impl/src/com/intellij/find/editorHeaderActions/ToggleSelectionOnlyAction.java
@@ -4,7 +4,7 @@ import com.intellij.find.EditorSearchComponent;
 import com.intellij.openapi.actionSystem.AnActionEvent;
 
 public class ToggleSelectionOnlyAction extends EditorHeaderToggleAction {
-  private static final String SELECTION_ONLY = "&Selection Only";
+  private static final String SELECTION_ONLY = "In &Selection";
 
   public ToggleSelectionOnlyAction(EditorSearchComponent editorSearchComponent) {
     super(editorSearchComponent, SELECTION_ONLY);
diff --git a/platform/lang-impl/src/com/intellij/find/editorHeaderActions/ToggleWholeWordsOnlyAction.java b/platform/lang-impl/src/com/intellij/find/editorHeaderActions/ToggleWholeWordsOnlyAction.java
index 03ab03cb5032..e3fff478f6a7 100644
--- a/platform/lang-impl/src/com/intellij/find/editorHeaderActions/ToggleWholeWordsOnlyAction.java
+++ b/platform/lang-impl/src/com/intellij/find/editorHeaderActions/ToggleWholeWordsOnlyAction.java
@@ -5,7 +5,7 @@ import com.intellij.find.FindSettings;
 import com.intellij.openapi.actionSystem.AnActionEvent;
 
 public class ToggleWholeWordsOnlyAction extends EditorHeaderToggleAction {
-  private static final String WHOLE_WORDS_ONLY = "W&hole Words";
+  private static final String WHOLE_WORDS_ONLY = "W&ords";
 
   public ToggleWholeWordsOnlyAction(EditorSearchComponent editorSearchComponent) {
     super(editorSearchComponent, WHOLE_WORDS_ONLY);
diff --git a/platform/lang-impl/src/com/intellij/ide/bookmarks/BookmarkItem.java b/platform/lang-impl/src/com/intellij/ide/bookmarks/BookmarkItem.java
index 68151a1dfc01..75d3dd2da9fa 100644
--- a/platform/lang-impl/src/com/intellij/ide/bookmarks/BookmarkItem.java
+++ b/platform/lang-impl/src/com/intellij/ide/bookmarks/BookmarkItem.java
@@ -15,11 +15,9 @@
  */
 package com.intellij.ide.bookmarks;
 
-import com.intellij.openapi.editor.LogicalPosition;
 import com.intellij.openapi.editor.markup.EffectType;
 import com.intellij.openapi.editor.markup.TextAttributes;
 import com.intellij.openapi.project.Project;
-import com.intellij.openapi.ui.popup.JBPopup;
 import com.intellij.openapi.util.Iconable;
 import com.intellij.openapi.vcs.FileStatus;
 import com.intellij.openapi.vcs.FileStatusManager;
@@ -110,22 +108,17 @@ public class BookmarkItem implements ItemWrapper {
     return myBookmark.getFile().getName() + " " + myBookmark.getDescription();
   }
 
-  public void execute(Project project, JBPopup popup) {
-    popup.cancel();
-    myBookmark.navigate();
-    popup.cancel();
-  }
-
   public String footerText() {
     return myBookmark.getFile().getPresentableUrl();
   }
 
   @Override
   public void updateDetailView(final DetailView panel) {
-    VirtualFile file = myBookmark.getFile();
-    LogicalPosition positionToNavigate = new LogicalPosition(myBookmark.getLine(), 0);
+    doUpdateDetailView(panel);
+  }
 
-    panel.navigateInPreviewEditor(file, positionToNavigate, null);
+  private void doUpdateDetailView(DetailView panel) {
+    panel.navigateInPreviewEditor(DetailView.PreviewEditorState.create(myBookmark.getFile(), myBookmark.getLine()));
   }
 
   @Override
diff --git a/platform/lang-impl/src/com/intellij/ide/bookmarks/actions/BookmarksAction.java b/platform/lang-impl/src/com/intellij/ide/bookmarks/actions/BookmarksAction.java
index 70875e35aa49..4e513fad4c78 100644
--- a/platform/lang-impl/src/com/intellij/ide/bookmarks/actions/BookmarksAction.java
+++ b/platform/lang-impl/src/com/intellij/ide/bookmarks/actions/BookmarksAction.java
@@ -23,7 +23,8 @@ import com.intellij.ide.bookmarks.Bookmark;
 import com.intellij.ide.bookmarks.BookmarkItem;
 import com.intellij.ide.bookmarks.BookmarkManager;
 import com.intellij.openapi.actionSystem.*;
-import com.intellij.openapi.editor.*;
+import com.intellij.openapi.editor.Document;
+import com.intellij.openapi.editor.Editor;
 import com.intellij.openapi.fileEditor.FileDocumentManager;
 import com.intellij.openapi.project.DumbAware;
 import com.intellij.openapi.project.Project;
@@ -32,6 +33,8 @@ import com.intellij.openapi.vfs.VirtualFile;
 import com.intellij.openapi.wm.IdeFocusManager;
 import com.intellij.openapi.wm.ToolWindowManager;
 import com.intellij.ui.components.JBList;
+import com.intellij.ui.popup.util.DetailViewImpl;
+import com.intellij.ui.popup.util.ItemWrapper;
 import com.intellij.ui.popup.util.MasterDetailPopupBuilder;
 import com.intellij.ui.speedSearch.FilteringListModel;
 import org.jetbrains.annotations.Nullable;
@@ -121,6 +124,15 @@ public class BookmarksAction extends AnAction implements DumbAware, MasterDetail
     return new Object[0];  //To change body of implemented methods use File | Settings | File Templates.
   }
 
+  @Override
+  public void itemChosen(ItemWrapper item, Project project, JBPopup popup) {
+    if (item instanceof BookmarkItem) {
+      Bookmark bookmark = ((BookmarkItem)item).getBookmark();
+      popup.cancel();
+      bookmark.navigate();
+    }
+  }
+
   private static DefaultListModel buildModel(Project project) {
     final DefaultListModel model = new DefaultListModel();
 
diff --git a/platform/lang-impl/src/com/intellij/ide/navigationToolbar/NavBarListener.java b/platform/lang-impl/src/com/intellij/ide/navigationToolbar/NavBarListener.java
index f78c9c7e95a9..07a1da0a968d 100644
--- a/platform/lang-impl/src/com/intellij/ide/navigationToolbar/NavBarListener.java
+++ b/platform/lang-impl/src/com/intellij/ide/navigationToolbar/NavBarListener.java
@@ -273,7 +273,8 @@ public class NavBarListener extends WolfTheProblemSolver.ProblemListener
       final ActionCallback firstCharTyped = new ActionCallback();
       focusManager.typeAheadUntil(firstCharTyped);
       myPanel.moveDown();
-      ApplicationManager.getApplication().invokeLater(new Runnable() {
+      //noinspection SSBasedInspection
+      SwingUtilities.invokeLater(new Runnable() {
         public void run() {
           try {
             final Robot robot = new Robot();
diff --git a/platform/lang-impl/src/com/intellij/ide/navigationToolbar/NavBarPanel.java b/platform/lang-impl/src/com/intellij/ide/navigationToolbar/NavBarPanel.java
index 92da1859926a..45f288bedef2 100644
--- a/platform/lang-impl/src/com/intellij/ide/navigationToolbar/NavBarPanel.java
+++ b/platform/lang-impl/src/com/intellij/ide/navigationToolbar/NavBarPanel.java
@@ -104,7 +104,7 @@ public class NavBarPanel extends JPanel implements DataProvider, PopupOwner, Dis
   private boolean myDisposed = false;
   private RelativePoint myLocationCache;
 
-  public NavBarPanel(final Project project) {
+  public NavBarPanel(final Project project, boolean docked) {
     super(new FlowLayout(FlowLayout.LEFT, 0 , 0));
     myProject = project;
     myModel = new NavBarModel(myProject);
@@ -123,11 +123,14 @@ public class NavBarPanel extends JPanel implements DataProvider, PopupOwner, Dis
       }
     };
 
-    final ActionCallback typeAheadDone = new ActionCallback();
-    IdeFocusManager.getInstance(project).typeAheadUntil(typeAheadDone);
     myUpdateQueue.queueModelUpdateFromFocus();
     myUpdateQueue.queueRebuildUi();
-    myUpdateQueue.queueTypeAheadDone(typeAheadDone);
+    if (!docked) {
+      final ActionCallback typeAheadDone = new ActionCallback();
+      IdeFocusManager.getInstance(project).typeAheadUntil(typeAheadDone);
+      myUpdateQueue.queueTypeAheadDone(typeAheadDone);
+    }
+
     Disposer.register(project, this);
   }
 
diff --git a/platform/lang-impl/src/com/intellij/ide/navigationToolbar/NavBarRootPaneExtension.java b/platform/lang-impl/src/com/intellij/ide/navigationToolbar/NavBarRootPaneExtension.java
index da947c50a98a..b6adf3f44c5c 100644
--- a/platform/lang-impl/src/com/intellij/ide/navigationToolbar/NavBarRootPaneExtension.java
+++ b/platform/lang-impl/src/com/intellij/ide/navigationToolbar/NavBarRootPaneExtension.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.
@@ -191,7 +191,7 @@ public class NavBarRootPaneExtension extends IdeRootPaneNorthExtension {
         if (myNavigationBar != null && !Disposer.isDisposed(myNavigationBar)) {
           Disposer.dispose(myNavigationBar);
         }
-        myNavigationBar = new NavBarPanel(myProject);
+        myNavigationBar = new NavBarPanel(myProject, true);
         myWrapperPanel.putClientProperty("NavBarPanel", myNavigationBar);
         myNavigationBar.getModel().setFixedComponent(true);
 
diff --git a/platform/lang-impl/src/com/intellij/ide/navigationToolbar/ShowNavBarAction.java b/platform/lang-impl/src/com/intellij/ide/navigationToolbar/ShowNavBarAction.java
index 053b3199028b..73d4182bae9b 100644
--- a/platform/lang-impl/src/com/intellij/ide/navigationToolbar/ShowNavBarAction.java
+++ b/platform/lang-impl/src/com/intellij/ide/navigationToolbar/ShowNavBarAction.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.
@@ -39,7 +39,7 @@ public class ShowNavBarAction extends AnAction implements DumbAware, PopupAction
         final Component component = PlatformDataKeys.CONTEXT_COMPONENT.getData(context);
         if (!isInsideNavBar(component)) {
           final Editor editor = PlatformDataKeys.EDITOR.getData(context);
-          final NavBarPanel toolbarPanel = new NavBarPanel(project);
+          final NavBarPanel toolbarPanel = new NavBarPanel(project, false);
           toolbarPanel.showHint(editor, context);
         }
       }
diff --git a/platform/lang-impl/src/com/intellij/openapi/module/EmptyModuleType.java b/platform/lang-impl/src/com/intellij/openapi/module/EmptyModuleType.java
index e53f4db3e997..d7571adffad4 100644
--- a/platform/lang-impl/src/com/intellij/openapi/module/EmptyModuleType.java
+++ b/platform/lang-impl/src/com/intellij/openapi/module/EmptyModuleType.java
@@ -23,9 +23,7 @@ import org.jetbrains.annotations.NonNls;
 import javax.swing.*;
 
 public class EmptyModuleType extends ModuleType<EmptyModuleBuilder> {
-  private static final Icon ICON = AllIcons.Modules.EmptyProjectType;
-  private static final Icon NODE_ICON_OPEN = AllIcons.Nodes.ModuleOpen;
-  private static final Icon NODE_ICON_CLOSED = AllIcons.Nodes.ModuleClosed;
+  private static final Icon ICON = AllIcons.Modules.Types.EmptyProjectType;
   @NonNls public static final String EMPTY_MODULE = "EMPTY_MODULE";
   //private static final EmptyModuleType ourInstance = new EmptyModuleType();
 
@@ -59,6 +57,6 @@ public class EmptyModuleType extends ModuleType<EmptyModuleBuilder> {
   }
 
   public Icon getNodeIcon(boolean isOpened) {
-    return isOpened ? NODE_ICON_OPEN : NODE_ICON_CLOSED;
+    return isOpened ? AllIcons.Nodes.ModuleOpen : AllIcons.Nodes.ModuleClosed;
   }
 }
diff --git a/platform/lang-impl/src/com/intellij/openapi/module/WebModuleTypeBase.java b/platform/lang-impl/src/com/intellij/openapi/module/WebModuleTypeBase.java
index 00c61edf05d4..b3e7326b3e34 100644
--- a/platform/lang-impl/src/com/intellij/openapi/module/WebModuleTypeBase.java
+++ b/platform/lang-impl/src/com/intellij/openapi/module/WebModuleTypeBase.java
@@ -28,7 +28,7 @@ import javax.swing.*;
 public abstract class WebModuleTypeBase<T extends ModuleBuilder> extends ModuleType<T> {
   @NonNls public static final String WEB_MODULE = "WEB_MODULE";
 
-  private static final Icon MODULE_ICON = AllIcons.Javaee.WebModuleBig;
+  private static final Icon MODULE_ICON = AllIcons.Modules.Types.WebModule;
   private static final Icon MODULE_NODE_ICON_OPEN = AllIcons.Nodes.ModuleOpen;
   private static final Icon MODULE_NODE_ICON_CLOSED = AllIcons.Nodes.ModuleClosed;
 
diff --git a/platform/lang-impl/src/com/intellij/ui/popup/util/DetailViewImpl.java b/platform/lang-impl/src/com/intellij/ui/popup/util/DetailViewImpl.java
index 4327addc74c9..494b1d649b3d 100644
--- a/platform/lang-impl/src/com/intellij/ui/popup/util/DetailViewImpl.java
+++ b/platform/lang-impl/src/com/intellij/ui/popup/util/DetailViewImpl.java
@@ -26,8 +26,12 @@ import com.intellij.openapi.editor.markup.RangeHighlighter;
 import com.intellij.openapi.editor.markup.TextAttributes;
 import com.intellij.openapi.fileEditor.FileDocumentManager;
 import com.intellij.openapi.project.Project;
+import com.intellij.openapi.util.Key;
+import com.intellij.openapi.util.UserDataHolder;
+import com.intellij.openapi.util.UserDataHolderBase;
 import com.intellij.openapi.vfs.VirtualFile;
 import com.intellij.ui.components.JBScrollPane;
+import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;
 
 import javax.swing.*;
@@ -40,7 +44,7 @@ import java.awt.*;
 * Time: 2:04 AM
 * To change this template use File | Settings | File Templates.
 */
-public class DetailViewImpl extends JPanel implements DetailView {
+public class DetailViewImpl extends JPanel implements DetailView, UserDataHolder {
   private final Project myProject;
   private Editor myEditor;
   private ItemWrapper myWrapper;
@@ -51,6 +55,7 @@ public class DetailViewImpl extends JPanel implements DetailView {
   private JLabel myNothingToShow = new JLabel("Nothing to show");
   private JLabel myNothingToShowInEditor = new JLabel("Nothing to show");
   private RangeHighlighter myHighlighter;
+  private PreviewEditorState myEditorState = PreviewEditorState.EMPTY;
 
   public DetailViewImpl(Project project) {
     super(new BorderLayout());
@@ -60,34 +65,24 @@ public class DetailViewImpl extends JPanel implements DetailView {
     myNothingToShowInEditor.setHorizontalAlignment(JLabel.CENTER);
   }
 
-  @Override
-  public void updateWithItem(ItemWrapper wrapper) {
-    if (myWrapper != wrapper) {
-      myWrapper = wrapper;
-      if (wrapper != null) {
-        wrapper.updateDetailView(this);
-      }
-      else {
-        clearEditor();
-        repaint();
-      }
-
-      revalidate();
-    }
-  }
-
   @Override
   public void clearEditor() {
     if (getEditor() != null) {
       clearHightlighting();
       remove(getEditor().getComponent());
       EditorFactory.getInstance().releaseEditor(getEditor());
+      myEditorState = PreviewEditorState.EMPTY;
       setEditor(null);
       add(myNothingToShowInEditor, BorderLayout.CENTER);
       repaint();
     }
   }
 
+  @Override
+  public PreviewEditorState getEditorState() {
+    return myEditorState;
+  }
+
   @Override
   public void removeNotify() {
     super.removeNotify();
@@ -104,7 +99,12 @@ public class DetailViewImpl extends JPanel implements DetailView {
   }
 
   @Override
-  public void navigateInPreviewEditor(VirtualFile file, LogicalPosition positionToNavigate, @Nullable TextAttributes lineAttributes) {
+  public void navigateInPreviewEditor(PreviewEditorState editorState) {
+    myEditorState = editorState;
+
+    final VirtualFile file = editorState.getFile();
+    final LogicalPosition positionToNavigate = editorState.getNavigate();
+    final TextAttributes lineAttributes = editorState.getAttributes();
     Document document = FileDocumentManager.getInstance().getDocument(file);
     Project project = myProject;
 
@@ -134,10 +134,9 @@ public class DetailViewImpl extends JPanel implements DetailView {
       getEditor().getScrollingModel().scrollToCaret(ScrollType.CENTER);
 
       clearHightlighting();
-      if (lineAttributes != null){
+      if (lineAttributes != null) {
         myHighlighter = getEditor().getMarkupModel().addLineHighlighter(positionToNavigate.line, HighlighterLayer.SELECTION - 1,
                                                                         lineAttributes);
-
       }
     }
     else {
@@ -188,4 +187,16 @@ public class DetailViewImpl extends JPanel implements DetailView {
     }
     myDetailPanel = panel;
   }
+
+  final UserDataHolderBase myDataHolderBase = new UserDataHolderBase();
+
+  @Override
+  public <T> T getUserData(@NotNull Key<T> key) {
+    return myDataHolderBase.getUserData(key);
+  }
+
+  @Override
+  public <T> void putUserData(@NotNull Key<T> key, @Nullable T value) {
+    myDataHolderBase.putUserData(key, value);
+  }
 }
diff --git a/platform/lang-impl/src/com/intellij/ui/popup/util/MasterDetailPopupBuilder.java b/platform/lang-impl/src/com/intellij/ui/popup/util/MasterDetailPopupBuilder.java
index 257197ead096..37d4add0c33d 100644
--- a/platform/lang-impl/src/com/intellij/ui/popup/util/MasterDetailPopupBuilder.java
+++ b/platform/lang-impl/src/com/intellij/ui/popup/util/MasterDetailPopupBuilder.java
@@ -20,6 +20,8 @@ import com.intellij.openapi.actionSystem.ActionManager;
 import com.intellij.openapi.actionSystem.ActionToolbar;
 import com.intellij.openapi.project.Project;
 import com.intellij.openapi.ui.popup.JBPopup;
+import com.intellij.openapi.ui.popup.JBPopupListener;
+import com.intellij.openapi.ui.popup.LightweightWindowEvent;
 import com.intellij.openapi.ui.popup.PopupChooserBuilder;
 import com.intellij.openapi.wm.IdeFocusManager;
 import com.intellij.ui.ColoredListCellRenderer;
@@ -42,13 +44,6 @@ import java.awt.event.KeyAdapter;
 import java.awt.event.KeyEvent;
 import java.io.File;
 
-/**
- * Created with IntelliJ IDEA.
- * User: zajac
- * Date: 5/6/12
- * Time: 2:06 PM
- * To change this template use File | Settings | File Templates.
- */
 public class MasterDetailPopupBuilder {
 
   private static final Color BORDER_COLOR = Gray._135;
@@ -57,26 +52,27 @@ public class MasterDetailPopupBuilder {
   private Delegate myDelegate;
   private boolean myCloseOnEnter;
 
-  public DetailViewImpl getDetailView() {
-    return myDetailView;
-  }
+  private DetailView myDetailView;
 
-  private DetailViewImpl myDetailView;
   private JLabel myPathLabel;
+
   private JBPopup myPopup;
   private Alarm myUpdateAlarm;
-
-
   private JComponent myChooserComponent;
+  private ActionToolbar myActionToolbar;
+  private boolean myAddDetailViewToEast = true;
+
+
+  public MasterDetailPopupBuilder setDetailView(DetailView detailView) {
+    myDetailView = detailView;
+    return this;
+  }
 
   public ActionToolbar getActionToolbar() {
     return myActionToolbar;
   }
 
-  private ActionToolbar myActionToolbar;
-
   public MasterDetailPopupBuilder(Project project) {
-
     myProject = project;
   }
 
@@ -106,11 +102,20 @@ public class MasterDetailPopupBuilder {
     myUpdateAlarm.cancelAllRequests();
     myUpdateAlarm.addRequest(new Runnable() {
       public void run() {
-        myDetailView.updateWithItem(wrapper1);
+        doUpdateDetailViewWithItem(wrapper1);
       }
     }, 100);
   }
 
+  protected void doUpdateDetailViewWithItem(ItemWrapper wrapper1) {
+    if (wrapper1 != null) {
+      wrapper1.updateDetailView(myDetailView);
+    }
+    else {
+      myDetailView.clearEditor();
+    }
+  }
+
   public JBPopup createMasterDetailPopup() {
 
     setupRenderer();
@@ -122,7 +127,10 @@ public class MasterDetailPopupBuilder {
     myPathLabel.setFont(font.deriveFont((float)10));
 
     myUpdateAlarm = new Alarm(Alarm.ThreadToUse.SWING_THREAD);
-    myDetailView = new DetailViewImpl(myProject);
+
+    if (myDetailView == null) {
+      myDetailView = new DetailViewImpl(myProject);
+    }
 
     JPanel footerPanel = new JPanel(new BorderLayout()) {
       @Override
@@ -139,14 +147,13 @@ public class MasterDetailPopupBuilder {
         IdeFocusManager.getInstance(myProject).doWhenFocusSettlesDown(new Runnable() {
           public void run() {
             Object[] values = getSelectedItems();
-
             if (values.length == 1) {
-              ((ItemWrapper)values[0]).execute(myProject, myPopup);
+              myDelegate.itemChosen((ItemWrapper)values[0], myProject, myPopup);
             }
             else {
               for (Object value : values) {
                 if (value instanceof ItemWrapper) {
-                  ((ItemWrapper)value).execute(myProject, myPopup);
+                  myDelegate.itemChosen((ItemWrapper)value, myProject, myPopup);
                 }
               }
             }
@@ -158,21 +165,34 @@ public class MasterDetailPopupBuilder {
     footerPanel.setBorder(BorderFactory.createEmptyBorder(4, 4, 4, 4));
     footerPanel.add(myPathLabel);
 
-    myActionToolbar = ActionManager.getInstance().createActionToolbar("", myActions, true);
-    myActionToolbar.setReservePlaceAutoPopupIcon(false);
-    myActionToolbar.setMinimumButtonSize(new Dimension(20, 20));
-    final JComponent toolBar = myActionToolbar.getComponent();
-    toolBar.setOpaque(false);
+    JComponent toolBar = null;
+    if (myActions != null) {
+      myActionToolbar = ActionManager.getInstance().createActionToolbar("", myActions, true);
+      myActionToolbar.setReservePlaceAutoPopupIcon(false);
+      myActionToolbar.setMinimumButtonSize(new Dimension(20, 20));
+      toolBar = myActionToolbar.getComponent();
+      toolBar.setOpaque(false);
+    }
 
-    final PopupChooserBuilder builder = createInnerBuilder();
-    myPopup = builder.
-      setTitle(myDelegate.getTitle()).
+    final PopupChooserBuilder builder = createInnerBuilder().
       setMovable(true).
       setResizable(true).
       setAutoselectOnMouseMove(false).
       setSettingButton(toolBar).
-      setSouthComponent(footerPanel).
-      setEastComponent(myDetailView).
+      setSouthComponent(footerPanel);
+
+    if (myAddDetailViewToEast) {
+      builder.
+        setEastComponent((JComponent)myDetailView);
+    }
+
+    String title = myDelegate.getTitle();
+    if (title != null) {
+      builder.setTitle(title);
+    }
+
+
+    builder.
       setItemChoosenCallback(runnable).
       setCloseOnEnter(myCloseOnEnter).
       setMayBeParent(true).
@@ -181,7 +201,20 @@ public class MasterDetailPopupBuilder {
         public String fun(Object o) {
           return ((ItemWrapper)o).speedSearchText();
         }
-      }).createPopup();
+      });
+
+    myPopup = builder.createPopup();
+    myPopup.addListener(new JBPopupListener() {
+      @Override
+      public void beforeShown(LightweightWindowEvent event) {
+        //To change body of implemented methods use File | Settings | File Templates.
+      }
+
+      @Override
+      public void onClosed(LightweightWindowEvent event) {
+        myDetailView.clearEditor();
+      }
+    });
     return myPopup;
   }
 
@@ -214,11 +247,16 @@ public class MasterDetailPopupBuilder {
 
   private void updateDetailViewLater() {
     //noinspection SSBasedInspection
-    SwingUtilities.invokeLater(new Runnable() {
-      public void run() {
-        doUpdateDetailView();
-      }
-    });
+    //SwingUtilities.invokeLater(new Runnable() {
+    //  public void run() {
+    //    doUpdateDetailView();
+    //  }
+    //});
+    doUpdateDetailView();
+  }
+
+  public void setAddDetailViewToEast(boolean addDetailViewToEast) {
+    myAddDetailViewToEast = addDetailViewToEast;
   }
 
   public static boolean allowedToRemoveItems(Object[] values) {
@@ -271,7 +309,7 @@ public class MasterDetailPopupBuilder {
     }
   }
 
-  public MasterDetailPopupBuilder setActionsGroup(ActionGroup actions) {
+  public MasterDetailPopupBuilder setActionsGroup(@Nullable ActionGroup actions) {
     myActions = actions;
     return this;
   }
@@ -332,6 +370,7 @@ public class MasterDetailPopupBuilder {
   }
 
   public interface Delegate {
+    @Nullable
     String getTitle();
 
     void handleMnemonic(KeyEvent e, Project project, JBPopup popup);
@@ -340,6 +379,8 @@ public class MasterDetailPopupBuilder {
     JComponent createAccessoryView(Project project);
 
     Object[] getSelectedItemsInTree();
+
+    void itemChosen(ItemWrapper item, Project project, JBPopup popup);
   }
 
   public static class ListItemRenderer extends JPanel implements ListCellRenderer {
diff --git a/platform/platform-api/src/com/intellij/openapi/actionSystem/ex/ComboBoxAction.java b/platform/platform-api/src/com/intellij/openapi/actionSystem/ex/ComboBoxAction.java
index 5034dddbc5c7..249c8321b92b 100644
--- a/platform/platform-api/src/com/intellij/openapi/actionSystem/ex/ComboBoxAction.java
+++ b/platform/platform-api/src/com/intellij/openapi/actionSystem/ex/ComboBoxAction.java
@@ -18,6 +18,7 @@ package com.intellij.openapi.actionSystem.ex;
 import com.intellij.icons.AllIcons;
 import com.intellij.ide.DataManager;
 import com.intellij.openapi.actionSystem.*;
+import com.intellij.openapi.ui.popup.JBPopup;
 import com.intellij.openapi.ui.popup.JBPopupFactory;
 import com.intellij.openapi.ui.popup.ListPopup;
 import com.intellij.openapi.util.IconLoader;
@@ -160,7 +161,7 @@ public abstract class ComboBoxAction extends AnAction implements CustomComponent
         }
       };
 
-      ListPopup popup = createPopup(onDispose);
+      JBPopup popup = createPopup(onDispose);
 
       popup.show(new RelativePoint(this, new Point(0, this.getHeight() - 1)));
     }
@@ -171,7 +172,7 @@ public abstract class ComboBoxAction extends AnAction implements CustomComponent
       return myForcePressed ? null : super.getToolTipText();
     }
 
-    protected ListPopup createPopup(Runnable onDispose) {
+    protected JBPopup createPopup(Runnable onDispose) {
       DefaultActionGroup group = createPopupActionGroup(this);
 
       DataContext context = getDataContext();
diff --git a/platform/platform-api/src/com/intellij/openapi/ui/popup/ListPopup.java b/platform/platform-api/src/com/intellij/openapi/ui/popup/ListPopup.java
index 86ff18f455ad..df8c5b042043 100644
--- a/platform/platform-api/src/com/intellij/openapi/ui/popup/ListPopup.java
+++ b/platform/platform-api/src/com/intellij/openapi/ui/popup/ListPopup.java
@@ -16,6 +16,7 @@
 
 package com.intellij.openapi.ui.popup;
 
+import javax.swing.event.ListSelectionListener;
 import java.awt.event.InputEvent;
 
 /**
@@ -52,4 +53,5 @@ public interface ListPopup extends JBPopup {
    */
   void setHandleAutoSelectionBeforeShow(boolean autoHandle);
 
+  void addListSelectionListener(ListSelectionListener listSelectionListener);
 }
diff --git a/platform/platform-api/src/com/intellij/ui/ColoredTreeCellRenderer.java b/platform/platform-api/src/com/intellij/ui/ColoredTreeCellRenderer.java
index 73122be7dae5..afb002e73bb5 100644
--- a/platform/platform-api/src/com/intellij/ui/ColoredTreeCellRenderer.java
+++ b/platform/platform-api/src/com/intellij/ui/ColoredTreeCellRenderer.java
@@ -41,8 +41,8 @@ public abstract class ColoredTreeCellRenderer extends SimpleColoredComponent imp
   protected boolean myFocused;
 
   protected JTree myTree;
-  private boolean myOpaque = true;
 
+  private boolean myOpaque = true;
   public final Component getTreeCellRendererComponent(
     JTree tree,
     Object value,
@@ -122,6 +122,10 @@ public abstract class ColoredTreeCellRenderer extends SimpleColoredComponent imp
     return this;
   }
 
+  public JTree getTree() {
+    return myTree;
+  }
+
   protected boolean isFocused() {
     return myTree.hasFocus();
   }
diff --git a/platform/platform-api/src/com/intellij/util/Icons.java b/platform/platform-api/src/com/intellij/util/Icons.java
deleted file mode 100644
index 21fc60149ece..000000000000
--- a/platform/platform-api/src/com/intellij/util/Icons.java
+++ /dev/null
@@ -1,64 +0,0 @@
-/*
- * Copyright 2000-2009 JetBrains s.r.o.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package com.intellij.util;
-
-import com.intellij.icons.AllIcons;
-
-import javax.swing.*;
-
-/**
- * @deprecated use {@link PlatformIcons} for generic icons and corresponding classes from plugins for plugin-specific icons
- * @see PlatformIcons
- */
-public abstract class Icons implements PlatformIcons {
-  @Deprecated public static final Icon EJB_CLASS_ICON = AllIcons.Javaee.EjbClass;
-  @Deprecated public static final Icon EJB_INTERCEPTOR_CLASS_ICON = AllIcons.Javaee.InterceptorClass;
-  @Deprecated public static final Icon EJB_HOME_INTERFACE_ICON = AllIcons.Javaee.Home;
-  @Deprecated public static final Icon EJB_LOCAL_HOME_INTERFACE_ICON = AllIcons.Javaee.LocalHome;
-  @Deprecated public static final Icon EJB_LOCAL_INTERFACE_ICON = AllIcons.Javaee.Local;
-  @Deprecated public static final Icon EJB_REMOTE_INTERFACE_ICON = AllIcons.Javaee.Remote;
-  @Deprecated public static final Icon EJB_ICON = AllIcons.Nodes.Ejb;
-  @Deprecated public static final Icon EJB_CREATE_METHOD_ICON = AllIcons.Nodes.EjbCreateMethod;
-  @Deprecated public static final Icon EJB_FINDER_METHOD_ICON = AllIcons.Nodes.EjbFinderMethod;
-  @Deprecated public static final Icon EJB_BUSINESS_METHOD_ICON = AllIcons.Nodes.EjbBusinessMethod;
-  @Deprecated public static final Icon EJB_CMP_FIELD_ICON = AllIcons.Nodes.EjbCmpField;
-  @Deprecated public static final Icon EJB_CMR_FIELD_ICON = AllIcons.Nodes.EjbCmrField;
-  @Deprecated public static final Icon EJB_PRIMARY_KEY_CLASS = AllIcons.Nodes.EjbPrimaryKeyClass;
-  @Deprecated public static final Icon EJB_REFERENCE = AllIcons.Nodes.EjbReference;
-  @Deprecated public static final Icon EJB_FIELD_PK = AllIcons.Nodes.FieldPK;
-
-  @Deprecated public static final Icon DATASOURCE_ICON = AllIcons.Nodes.DataSource;
-  @Deprecated public static final Icon DATASOURCE_DISABLED_ICON = AllIcons.Nodes.DataSourceDisabled;
-  @Deprecated public static final Icon DATASOURCE_TABLE_ICON = AllIcons.Nodes.DataTables;
-  @Deprecated public static final Icon DATASOURCE_VIEW_ICON = AllIcons.Nodes.DataView;
-  @Deprecated public static final Icon DATASOURCE_SEQUENCE_ICON = AllIcons.Nodes.DataSequence;
-  @Deprecated public static final Icon DATASOURCE_COLUMN_ICON = AllIcons.Nodes.DataColumn;
-  @Deprecated public static final Icon DATASOURCE_FK_COLUMN_ICON = AllIcons.Nodes.DataFkColumn;
-  @Deprecated public static final Icon DATASOURCE_PK_COLUMN_ICON = AllIcons.Nodes.DataPkColumn;
-
-  @Deprecated public static final Icon WEB_FOLDER_OPEN = AllIcons.Nodes.WebFolderOpen;
-  @Deprecated public static final Icon WEB_FOLDER_CLOSED = AllIcons.Nodes.WebFolderClosed;
-
-  @Deprecated public static final Icon DATASOURCE_REMOTE_INSTANCE = AllIcons.Nodes.AddRemoteWeblogicInstance;
-
-  @Deprecated public static final Icon ANT_TARGET_ICON = AllIcons.Ant.Target;
-  @Deprecated public static final Icon ANT_META_TARGET_ICON = AllIcons.Ant.MetaTarget;
-
-  @Deprecated public static final Icon JUNIT_TEST_CLASS_ICON = AllIcons.Nodes.JunitTestClass;
-
-  @Deprecated public static final Icon PARENTS_INTRODUCTION_ICON = AllIcons.Nodes.ParentsIntroduction;
-  @Deprecated public static final Icon SOFTENING_INTRODUCTION_ICON = AllIcons.Nodes.SofteningIntroduction;
-}
diff --git a/platform/platform-impl/src/com/intellij/ui/popup/list/ListPopupImpl.java b/platform/platform-impl/src/com/intellij/ui/popup/list/ListPopupImpl.java
index ba29b515cea4..29455c59589b 100644
--- a/platform/platform-impl/src/com/intellij/ui/popup/list/ListPopupImpl.java
+++ b/platform/platform-impl/src/com/intellij/ui/popup/list/ListPopupImpl.java
@@ -364,6 +364,7 @@ public class ListPopupImpl extends WizardPopup implements ListPopup {
   }
 
 
+  @Override
   public void addListSelectionListener(ListSelectionListener listSelectionListener) {
     myList.addListSelectionListener(listSelectionListener);
   }
diff --git a/platform/platform-resources-en/src/messages/CodeInsightBundle.properties b/platform/platform-resources-en/src/messages/CodeInsightBundle.properties
index 91dbe3809874..17413a924376 100644
--- a/platform/platform-resources-en/src/messages/CodeInsightBundle.properties
+++ b/platform/platform-resources-en/src/messages/CodeInsightBundle.properties
@@ -156,7 +156,9 @@ intention.make.type.generic.family=Make Type Generic
 intention.make.type.generic.text=Change type of {0} to {1}
 intention.split.if.family=Split If
 intention.split.if.text=Split into 2 if's
+intention.refactoring.family=Refactoring
 intention.introduce.variable.text=Introduce local variable
+intention.encapsulate.field.text=Encapsulate field
 intention.implement.abstract.method.family=Implement Abstract Method
 intention.implement.abstract.method.text=Implement method ''{0}''
 intention.override.method.text=Override method ''{0}''
diff --git a/platform/platform-tests/testSrc/com/intellij/psi/util/NameUtilTest.java b/platform/platform-tests/testSrc/com/intellij/psi/util/NameUtilTest.java
index c2a329e9dcae..ef0108a05aa4 100644
--- a/platform/platform-tests/testSrc/com/intellij/psi/util/NameUtilTest.java
+++ b/platform/platform-tests/testSrc/com/intellij/psi/util/NameUtilTest.java
@@ -390,6 +390,10 @@ public class NameUtilTest extends UsefulTestCase {
     assertPreference(" Boo", "boolean", "Boolean", NameUtil.MatchingCaseSensitivity.NONE);
   }
 
+  public void testPreferEarlyMatching() {
+    assertPreference(" path", "getAbsolutePath", "findPath");
+  }
+
   public void testMeaningfulMatchingDegree() {
     assertTrue(new MinusculeMatcher(" EUC-", NameUtil.MatchingCaseSensitivity.FIRST_LETTER).matchingDegree("x-EUC-TW") > Integer.MIN_VALUE);
   }
diff --git a/platform/util/src/com/intellij/icons/AllIcons.java b/platform/util/src/com/intellij/icons/AllIcons.java
index 63f47dd06a29..9a388af621e6 100644
--- a/platform/util/src/com/intellij/icons/AllIcons.java
+++ b/platform/util/src/com/intellij/icons/AllIcons.java
@@ -9,7 +9,6 @@ public class AllIcons {
   public static class Actions {
     public static final Icon AddFacesSupport = IconLoader.getIcon("/actions/addFacesSupport.png"); 
     public static final Icon Annotate = IconLoader.getIcon("/actions/annotate.png"); 
-    public static final Icon Apache = IconLoader.getIcon("/actions/apache.png"); 
     public static final Icon Back = IconLoader.getIcon("/actions/back.png"); 
     public static final Icon Browser_externalJavaDoc = IconLoader.getIcon("/actions/browser-externalJavaDoc.png"); 
     public static final Icon Cancel = IconLoader.getIcon("/actions/cancel.png"); 
@@ -19,28 +18,23 @@ public class AllIcons {
     public static final Icon Checked_small_selected = IconLoader.getIcon("/actions/checked_small_selected.png"); 
     public static final Icon CheckOut = IconLoader.getIcon("/actions/checkOut.png"); 
     public static final Icon Clean = IconLoader.getIcon("/actions/clean.png"); 
-    public static final Icon CleanHeavy = IconLoader.getIcon("/actions/cleanHeavy.png"); 
     public static final Icon CleanLight = IconLoader.getIcon("/actions/cleanLight.png"); 
     public static final Icon Close = IconLoader.getIcon("/actions/close.png"); 
     public static final Icon CloseHovered = IconLoader.getIcon("/actions/closeHovered.png"); 
     public static final Icon CloseNew = IconLoader.getIcon("/actions/closeNew.png"); 
     public static final Icon CloseNewHovered = IconLoader.getIcon("/actions/closeNewHovered.png"); 
     public static final Icon Collapseall = IconLoader.getIcon("/actions/collapseall.png"); 
-    public static final Icon CollapsePanel = IconLoader.getIcon("/actions/collapsePanel.png"); 
     public static final Icon Commit = IconLoader.getIcon("/actions/commit.png"); 
     public static final Icon Compile = IconLoader.getIcon("/actions/compile.png"); 
     public static final Icon ConsoleHistory = IconLoader.getIcon("/actions/consoleHistory.png"); 
     public static final Icon Copy = IconLoader.getIcon("/actions/copy.png"); 
     public static final Icon CreateFromUsage = IconLoader.getIcon("/actions/createFromUsage.png"); 
-    public static final Icon CreateFromUsage_off = IconLoader.getIcon("/actions/createFromUsage_off.png"); 
     public static final Icon CreatePatch = IconLoader.getIcon("/actions/createPatch.png"); 
     public static final Icon Cross = IconLoader.getIcon("/actions/cross.png"); 
-    public static final Icon Cvs = IconLoader.getIcon("/actions/cvs.png"); 
     public static final Icon Delete = IconLoader.getIcon("/actions/delete.png"); 
     public static final Icon Diff = IconLoader.getIcon("/actions/diff.png"); 
     public static final Icon DiffWithCurrent = IconLoader.getIcon("/actions/diffWithCurrent.png"); 
     public static final Icon Dump = IconLoader.getIcon("/actions/dump.png"); 
-    public static final Icon Eclipse = IconLoader.getIcon("/actions/eclipse.png"); 
     public static final Icon Edit = IconLoader.getIcon("/actions/edit.png"); 
     public static final Icon EditSource = IconLoader.getIcon("/actions/editSource.png"); 
     public static final Icon ErDiagram = IconLoader.getIcon("/actions/erDiagram.png"); 
@@ -58,12 +52,9 @@ public class AllIcons {
     public static final Icon Get = IconLoader.getIcon("/actions/get.png"); 
     public static final Icon GroupByMethod = IconLoader.getIcon("/actions/groupByMethod.png"); 
     public static final Icon Help = IconLoader.getIcon("/actions/help.png"); 
-    public static final Icon Hibernate = IconLoader.getIcon("/actions/hibernate.png"); 
-    public static final Icon Ibm = IconLoader.getIcon("/actions/ibm.png"); 
     public static final Icon Import = IconLoader.getIcon("/actions/import.png"); 
     public static final Icon Install = IconLoader.getIcon("/actions/install.png"); 
     public static final Icon IntentionBulb = IconLoader.getIcon("/actions/intentionBulb.png"); 
-    public static final Icon IntentionOffBulb = IconLoader.getIcon("/actions/intentionOffBulb.png"); 
     public static final Icon Lightning = IconLoader.getIcon("/actions/lightning.png"); 
     public static final Icon Menu_cut = IconLoader.getIcon("/actions/menu-cut.png"); 
     public static final Icon Menu_find = IconLoader.getIcon("/actions/menu-find.png"); 
@@ -72,22 +63,18 @@ public class AllIcons {
     public static final Icon Menu_paste = IconLoader.getIcon("/actions/menu-paste.png"); 
     public static final Icon Menu_replace = IconLoader.getIcon("/actions/menu-replace.png"); 
     public static final Icon Menu_saveall = IconLoader.getIcon("/actions/menu-saveall.png"); 
-    public static final Icon Microsoft = IconLoader.getIcon("/actions/microsoft.png"); 
     public static final Icon Minimize = IconLoader.getIcon("/actions/minimize.png"); 
     public static final Icon Modul = IconLoader.getIcon("/actions/modul.png"); 
     public static final Icon Move_to_button_top = IconLoader.getIcon("/actions/move-to-button-top.png"); 
     public static final Icon Move_to_button = IconLoader.getIcon("/actions/move-to-button.png"); 
     public static final Icon MoveDown = IconLoader.getIcon("/actions/moveDown.png"); 
     public static final Icon MoveUp = IconLoader.getIcon("/actions/moveUp.png"); 
-    public static final Icon Mysql = IconLoader.getIcon("/actions/mysql.png"); 
     public static final Icon New = IconLoader.getIcon("/actions/new.png"); 
     public static final Icon NewFolder = IconLoader.getIcon("/actions/newFolder.png"); 
     public static final Icon Nextfile = IconLoader.getIcon("/actions/nextfile.png"); 
     public static final Icon NextOccurence = IconLoader.getIcon("/actions/nextOccurence.png"); 
-    public static final Icon Oracle = IconLoader.getIcon("/actions/oracle.png"); 
     public static final Icon Pause = IconLoader.getIcon("/actions/pause.png"); 
     public static final Icon PopFrame = IconLoader.getIcon("/actions/popFrame.png"); 
-    public static final Icon Postgresql = IconLoader.getIcon("/actions/postgresql.png"); 
     public static final Icon Prevfile = IconLoader.getIcon("/actions/prevfile.png"); 
     public static final Icon Preview = IconLoader.getIcon("/actions/preview.png"); 
     public static final Icon PreviousOccurence = IconLoader.getIcon("/actions/previousOccurence.png"); 
@@ -126,11 +113,9 @@ public class AllIcons {
     public static final Icon SortDesc = IconLoader.getIcon("/actions/sortDesc.png"); 
     public static final Icon SplitHorizontally = IconLoader.getIcon("/actions/splitHorizontally.png"); 
     public static final Icon SplitVertically = IconLoader.getIcon("/actions/splitVertically.png"); 
-    public static final Icon Sqlite = IconLoader.getIcon("/actions/sqlite.png"); 
     public static final Icon StartDebugger = IconLoader.getIcon("/actions/startDebugger.png"); 
     public static final Icon StepOut = IconLoader.getIcon("/actions/stepOut.png"); 
     public static final Icon Submit1 = IconLoader.getIcon("/actions/submit1.png"); 
-    public static final Icon Sun = IconLoader.getIcon("/actions/sun.png"); 
     public static final Icon Suspend = IconLoader.getIcon("/actions/suspend.png"); 
     public static final Icon SwapPanels = IconLoader.getIcon("/actions/swapPanels.png"); 
     public static final Icon Sync = IconLoader.getIcon("/actions/sync.png"); 
@@ -311,8 +296,6 @@ public class AllIcons {
     public static final Icon Dtd = IconLoader.getIcon("/fileTypes/dtd.png"); 
     public static final Icon Facelets = IconLoader.getIcon("/fileTypes/facelets.png"); 
     public static final Icon FacesConfig = IconLoader.getIcon("/fileTypes/facesConfig.png"); 
-    public static final Icon FacesFile = IconLoader.getIcon("/fileTypes/facesFile.png"); 
-    public static final Icon FacesXFile = IconLoader.getIcon("/fileTypes/facesXFile.png"); 
     public static final Icon Html = IconLoader.getIcon("/fileTypes/html.png"); 
     public static final Icon Idl = IconLoader.getIcon("/fileTypes/idl.png"); 
     public static final Icon Java = IconLoader.getIcon("/fileTypes/java.png"); 
@@ -419,9 +402,6 @@ public class AllIcons {
     public static final Icon MoreTabs = IconLoader.getIcon("/general/moreTabs.png"); 
     public static final Icon Mouse = IconLoader.getIcon("/general/mouse.png"); 
     public static final Icon MouseShortcut = IconLoader.getIcon("/general/mouseShortcut.png"); 
-    public static final Icon NavbarSeparatorActive = IconLoader.getIcon("/general/navbarSeparatorActive.png"); 
-    public static final Icon NavbarSeparatorGradient = IconLoader.getIcon("/general/navbarSeparatorGradient.png"); 
-    public static final Icon NavbarSeparatorPassive = IconLoader.getIcon("/general/navbarSeparatorPassive.png"); 
     public static final Icon NoAnalysis = IconLoader.getIcon("/general/noAnalysis.png"); 
     public static final Icon OpenProject = IconLoader.getIcon("/general/openProject.png"); 
     public static final Icon OverridenMethod = IconLoader.getIcon("/general/overridenMethod.png"); 
@@ -431,8 +411,6 @@ public class AllIcons {
     public static final Icon Pin_tab = IconLoader.getIcon("/general/pin_tab.png"); 
     public static final Icon PluginManager = IconLoader.getIcon("/general/pluginManager.png"); 
     public static final Icon Progress = IconLoader.getIcon("/general/progress.png"); 
-    public static final Icon ProgressTransparentPlaceHolder = IconLoader.getIcon("/general/progressTransparentPlaceHolder.png"); 
-    public static final Icon ProjectProperties = IconLoader.getIcon("/general/projectProperties.png"); 
     public static final Icon ProjectSettings = IconLoader.getIcon("/general/projectSettings.png"); 
     public static final Icon ProjectStructure = IconLoader.getIcon("/general/projectStructure.png"); 
     public static final Icon ProjectTab = IconLoader.getIcon("/general/projectTab.png"); 
@@ -565,8 +543,6 @@ public class AllIcons {
   }
   
   public static class Ide {
-    public static final Icon DefaultProfile = IconLoader.getIcon("/ide/defaultProfile.png"); 
-    public static final Icon DefaultProjectProfile = IconLoader.getIcon("/ide/defaultProjectProfile.png"); 
     
     public static class Dnd {
       public static final Icon Bottom = IconLoader.getIcon("/ide/dnd/bottom.png"); 
@@ -580,7 +556,6 @@ public class AllIcons {
     public static final Icon Error_notifications = IconLoader.getIcon("/ide/error_notifications.png"); 
     public static final Icon ErrorPoint = IconLoader.getIcon("/ide/errorPoint.png"); 
     public static final Icon ErrorSign = IconLoader.getIcon("/ide/errorSign.png"); 
-    public static final Icon FacetDetected = IconLoader.getIcon("/ide/facetDetected.png"); 
     public static final Icon FatalError_read = IconLoader.getIcon("/ide/fatalError-read.png"); 
     public static final Icon FatalError = IconLoader.getIcon("/ide/fatalError.png"); 
     public static final Icon HectorNo = IconLoader.getIcon("/ide/hectorNo.png"); 
@@ -603,8 +578,6 @@ public class AllIcons {
       public static final Icon Recording_stop = IconLoader.getIcon("/ide/macro/recording_stop.png"); 
 
     }
-    public static final Icon MacroToolbar1 = IconLoader.getIcon("/ide/macroToolbar1.png"); 
-    public static final Icon MacroToolbar2 = IconLoader.getIcon("/ide/macroToolbar2.png"); 
     public static final Icon Notifications = IconLoader.getIcon("/ide/notifications.png"); 
     public static final Icon Pipette = IconLoader.getIcon("/ide/pipette.png"); 
     public static final Icon Pipette_rollover = IconLoader.getIcon("/ide/pipette_rollover.png"); 
@@ -656,8 +629,6 @@ public class AllIcons {
     public static final Icon Ejb_jar_xml = IconLoader.getIcon("/javaee/ejb-jar_xml.png"); 
     public static final Icon EjbClass = IconLoader.getIcon("/javaee/ejbClass.png"); 
     public static final Icon EjbModule = IconLoader.getIcon("/javaee/ejbModule.png"); 
-    public static final Icon EjbModuleBig = IconLoader.getIcon("/javaee/ejbModuleBig.png"); 
-    public static final Icon EjbModuleGroup = IconLoader.getIcon("/javaee/ejbModuleGroup.png"); 
     public static final Icon EmbeddedAttributeOverlay = IconLoader.getIcon("/javaee/embeddedAttributeOverlay.png"); 
     public static final Icon EntityBean = IconLoader.getIcon("/javaee/entityBean.png"); 
     public static final Icon EntityBeanBig = IconLoader.getIcon("/javaee/entityBeanBig.png"); 
@@ -666,14 +637,10 @@ public class AllIcons {
     public static final Icon InterceptorClass = IconLoader.getIcon("/javaee/interceptorClass.png"); 
     public static final Icon InterceptorMethod = IconLoader.getIcon("/javaee/interceptorMethod.png"); 
     public static final Icon JavaeeAppModule = IconLoader.getIcon("/javaee/JavaeeAppModule.png"); 
-    public static final Icon JavaeeAppModuleBig = IconLoader.getIcon("/javaee/JavaeeAppModuleBig.png"); 
-    public static final Icon JavaeeAppModuleGroup = IconLoader.getIcon("/javaee/JavaeeAppModuleGroup.png"); 
-    public static final Icon JavaModuleGroup = IconLoader.getIcon("/javaee/javaModuleGroup.png"); 
     public static final Icon JpaFacet = IconLoader.getIcon("/javaee/jpaFacet.png"); 
     public static final Icon Local = IconLoader.getIcon("/javaee/local.png"); 
     public static final Icon LocalHome = IconLoader.getIcon("/javaee/localHome.png"); 
     public static final Icon MessageBean = IconLoader.getIcon("/javaee/messageBean.png"); 
-    public static final Icon MessageBeanBig = IconLoader.getIcon("/javaee/messageBeanBig.png"); 
     public static final Icon PersistenceAttribute = IconLoader.getIcon("/javaee/persistenceAttribute.png"); 
     public static final Icon PersistenceEmbeddable = IconLoader.getIcon("/javaee/persistenceEmbeddable.png"); 
     public static final Icon PersistenceEntity = IconLoader.getIcon("/javaee/persistenceEntity.png"); 
@@ -685,17 +652,9 @@ public class AllIcons {
     public static final Icon PersistenceUnit = IconLoader.getIcon("/javaee/persistenceUnit.png"); 
     public static final Icon Remote = IconLoader.getIcon("/javaee/remote.png"); 
     public static final Icon SessionBean = IconLoader.getIcon("/javaee/sessionBean.png"); 
-    public static final Icon SessionBeanBig = IconLoader.getIcon("/javaee/sessionBeanBig.png"); 
-    public static final Icon TypeBinary = IconLoader.getIcon("/javaee/typeBinary.png"); 
-    public static final Icon TypeDateTime = IconLoader.getIcon("/javaee/typeDateTime.png"); 
-    public static final Icon TypeNotNull = IconLoader.getIcon("/javaee/typeNotNull.png"); 
-    public static final Icon TypeNullable = IconLoader.getIcon("/javaee/typeNullable.png"); 
-    public static final Icon TypeNumeric = IconLoader.getIcon("/javaee/typeNumeric.png"); 
-    public static final Icon TypeString = IconLoader.getIcon("/javaee/typeString.png"); 
     public static final Icon UpdateRunningApplication = IconLoader.getIcon("/javaee/updateRunningApplication.png"); 
     public static final Icon Web_xml = IconLoader.getIcon("/javaee/web_xml.png"); 
     public static final Icon WebModule = IconLoader.getIcon("/javaee/webModule.png"); 
-    public static final Icon WebModuleBig = IconLoader.getIcon("/javaee/webModuleBig.png"); 
     public static final Icon WebModuleGroup = IconLoader.getIcon("/javaee/webModuleGroup.png"); 
     public static final Icon WebService = IconLoader.getIcon("/javaee/WebService.png"); 
     public static final Icon WebServiceClient = IconLoader.getIcon("/javaee/WebServiceClient.png"); 
@@ -712,37 +671,18 @@ public class AllIcons {
   
   public static class Modules {
     public static final Icon AddContentEntry = IconLoader.getIcon("/modules/addContentEntry.png"); 
-    public static final Icon AddExistingModule = IconLoader.getIcon("/modules/addExistingModule.png"); 
-    public static final Icon AddLibraries = IconLoader.getIcon("/modules/addLibraries.png"); 
     public static final Icon Annotation = IconLoader.getIcon("/modules/annotation.png"); 
-    public static final Icon BottomCenter = IconLoader.getIcon("/modules/bottomCenter.png"); 
-    public static final Icon BottomLeftCorner = IconLoader.getIcon("/modules/bottomLeftCorner.png"); 
-    public static final Icon BottomRightCorner = IconLoader.getIcon("/modules/bottomRightCorner.png"); 
-    public static final Icon CenterGeneralTitleBar = IconLoader.getIcon("/modules/CenterGeneralTitleBar.png"); 
-    public static final Icon Classpath = IconLoader.getIcon("/modules/classpath.png"); 
-    public static final Icon CreateNewModule = IconLoader.getIcon("/modules/createNewModule.png"); 
     public static final Icon DeleteContentFolder = IconLoader.getIcon("/modules/deleteContentFolder.png"); 
     public static final Icon DeleteContentFolderRollover = IconLoader.getIcon("/modules/deleteContentFolderRollover.png"); 
     public static final Icon DeleteContentRoot = IconLoader.getIcon("/modules/deleteContentRoot.png"); 
     public static final Icon DeleteContentRootRollover = IconLoader.getIcon("/modules/deleteContentRootRollover.png"); 
-    public static final Icon Dependencies = IconLoader.getIcon("/modules/dependencies.png"); 
-    public static final Icon Edit = IconLoader.getIcon("/modules/edit.png"); 
-    public static final Icon EditLibraries = IconLoader.getIcon("/modules/editLibraries.png"); 
-    public static final Icon EmptyProjectType = IconLoader.getIcon("/modules/emptyProjectType.png"); 
     public static final Icon ExcludeFolder = IconLoader.getIcon("/modules/excludeFolder.png"); 
     public static final Icon ExcludeRootClosed = IconLoader.getIcon("/modules/excludeRootClosed.png"); 
     public static final Icon ExcludeRootOpened = IconLoader.getIcon("/modules/excludeRootOpened.png"); 
-    public static final Icon Javadoc = IconLoader.getIcon("/modules/javadoc.png"); 
-    public static final Icon JavaModule = IconLoader.getIcon("/modules/javaModule.png"); 
-    public static final Icon Libraries = IconLoader.getIcon("/modules/libraries.png"); 
     public static final Icon Library = IconLoader.getIcon("/modules/library.png"); 
     public static final Icon Merge = IconLoader.getIcon("/modules/merge.png"); 
     public static final Icon ModulesNode = IconLoader.getIcon("/modules/modulesNode.png"); 
-    public static final Icon Order = IconLoader.getIcon("/modules/order.png"); 
     public static final Icon Output = IconLoader.getIcon("/modules/output.png"); 
-    public static final Icon Paths = IconLoader.getIcon("/modules/paths.png"); 
-    public static final Icon PluginModule = IconLoader.getIcon("/modules/pluginModule.png"); 
-    public static final Icon Remove = IconLoader.getIcon("/modules/remove.png"); 
     public static final Icon SetPackagePrefix = IconLoader.getIcon("/modules/setPackagePrefix.png"); 
     public static final Icon SetPackagePrefixRollover = IconLoader.getIcon("/modules/setPackagePrefixRollover.png"); 
     public static final Icon SourceClosed = IconLoader.getIcon("/modules/sourceClosed.png"); 
@@ -755,8 +695,16 @@ public class AllIcons {
     public static final Icon TestRootOpened = IconLoader.getIcon("/modules/testRootOpened.png"); 
     public static final Icon TestSourceClosed = IconLoader.getIcon("/modules/testSourceClosed.png"); 
     public static final Icon TestSourceOpened = IconLoader.getIcon("/modules/testSourceOpened.png"); 
-    public static final Icon UnmarkSource = IconLoader.getIcon("/modules/unmarkSource.png"); 
-    public static final Icon UnmarkTests = IconLoader.getIcon("/modules/unmarkTests.png"); 
+    
+    public static class Types {
+      public static final Icon EjbModule = IconLoader.getIcon("/modules/types/ejbModule.png"); 
+      public static final Icon EmptyProjectType = IconLoader.getIcon("/modules/types/emptyProjectType.png"); 
+      public static final Icon JavaeeAppModule = IconLoader.getIcon("/modules/types/JavaeeAppModule.png"); 
+      public static final Icon JavaModule = IconLoader.getIcon("/modules/types/javaModule.png"); 
+      public static final Icon PluginModule = IconLoader.getIcon("/modules/types/pluginModule.png"); 
+      public static final Icon WebModule = IconLoader.getIcon("/modules/types/webModule.png"); 
+
+    }
     public static final Icon UnmarkWebroot = IconLoader.getIcon("/modules/unmarkWebroot.png"); 
     public static final Icon WebRoot = IconLoader.getIcon("/modules/webRoot.png"); 
 
@@ -766,14 +714,11 @@ public class AllIcons {
     public static final Icon AbstractClass = IconLoader.getIcon("/nodes/abstractClass.png"); 
     public static final Icon AbstractException = IconLoader.getIcon("/nodes/abstractException.png"); 
     public static final Icon AbstractMethod = IconLoader.getIcon("/nodes/abstractMethod.png"); 
-    public static final Icon AddLocalWeblogicInstance = IconLoader.getIcon("/nodes/addLocalWeblogicInstance.png"); 
-    public static final Icon AddRemoteWeblogicInstance = IconLoader.getIcon("/nodes/addRemoteWeblogicInstance.png"); 
     public static final Icon Advice = IconLoader.getIcon("/nodes/advice.png"); 
     public static final Icon Annotationtype = IconLoader.getIcon("/nodes/annotationtype.png"); 
     public static final Icon AnonymousClass = IconLoader.getIcon("/nodes/anonymousClass.png"); 
     public static final Icon Artifact = IconLoader.getIcon("/nodes/artifact.png"); 
     public static final Icon Aspect = IconLoader.getIcon("/nodes/aspect.png"); 
-    public static final Icon BeaSmall = IconLoader.getIcon("/nodes/beaSmall.png"); 
     public static final Icon C_plocal = IconLoader.getIcon("/nodes/c_plocal.png"); 
     public static final Icon C_private = IconLoader.getIcon("/nodes/c_private.png"); 
     public static final Icon C_protected = IconLoader.getIcon("/nodes/c_protected.png"); 
@@ -786,16 +731,8 @@ public class AllIcons {
     public static final Icon Cvs_global = IconLoader.getIcon("/nodes/cvs_global.png"); 
     public static final Icon Cvs_roots = IconLoader.getIcon("/nodes/cvs_roots.png"); 
     public static final Icon DataColumn = IconLoader.getIcon("/nodes/dataColumn.png"); 
-    public static final Icon DataConnection = IconLoader.getIcon("/nodes/dataConnection.png"); 
-    public static final Icon DataFkColumn = IconLoader.getIcon("/nodes/dataFkColumn.png"); 
-    public static final Icon DataForeignKey = IconLoader.getIcon("/nodes/dataForeignKey.png"); 
-    public static final Icon DataIndex = IconLoader.getIcon("/nodes/dataIndex.png"); 
-    public static final Icon DataPkColumn = IconLoader.getIcon("/nodes/dataPkColumn.png"); 
-    public static final Icon DataPrimaryKey = IconLoader.getIcon("/nodes/dataPrimaryKey.png"); 
     public static final Icon DataSchema = IconLoader.getIcon("/nodes/dataSchema.png"); 
-    public static final Icon DataSequence = IconLoader.getIcon("/nodes/dataSequence.png"); 
     public static final Icon DataSource = IconLoader.getIcon("/nodes/DataSource.png"); 
-    public static final Icon DataSourceDisabled = IconLoader.getIcon("/nodes/DataSourceDisabled.png"); 
     public static final Icon DataTables = IconLoader.getIcon("/nodes/DataTables.png"); 
     public static final Icon DataView = IconLoader.getIcon("/nodes/dataView.png"); 
     public static final Icon Deploy = IconLoader.getIcon("/nodes/deploy.png"); 
@@ -805,13 +742,10 @@ public class AllIcons {
     public static final Icon EjbCmrField = IconLoader.getIcon("/nodes/ejbCmrField.png"); 
     public static final Icon EjbCreateMethod = IconLoader.getIcon("/nodes/ejbCreateMethod.png"); 
     public static final Icon EjbFinderMethod = IconLoader.getIcon("/nodes/ejbFinderMethod.png"); 
-    public static final Icon EjbNewGroup = IconLoader.getIcon("/nodes/ejbNewGroup.png"); 
     public static final Icon EjbPrimaryKeyClass = IconLoader.getIcon("/nodes/ejbPrimaryKeyClass.png"); 
     public static final Icon EjbReference = IconLoader.getIcon("/nodes/ejbReference.png"); 
     public static final Icon EmptyNode = IconLoader.getIcon("/nodes/emptyNode.png"); 
-    public static final Icon EnterpriseClient = IconLoader.getIcon("/nodes/enterpriseClient.png"); 
     public static final Icon EnterpriseProject = IconLoader.getIcon("/nodes/enterpriseProject.png"); 
-    public static final Icon EnterpriseResource = IconLoader.getIcon("/nodes/enterpriseResource.png"); 
     public static final Icon EntryPoints = IconLoader.getIcon("/nodes/entryPoints.png"); 
     public static final Icon Enum = IconLoader.getIcon("/nodes/enum.png"); 
     public static final Icon ErrorIntroduction = IconLoader.getIcon("/nodes/errorIntroduction.png"); 
@@ -849,7 +783,6 @@ public class AllIcons {
 
     }
     public static final Icon Jsr45 = IconLoader.getIcon("/nodes/jsr45.png"); 
-    public static final Icon JunitTestClass = IconLoader.getIcon("/nodes/junitTestClass.png"); 
     public static final Icon JunitTestMark = IconLoader.getIcon("/nodes/junitTestMark.png"); 
     public static final Icon KeymapAnt = IconLoader.getIcon("/nodes/keymapAnt.png"); 
     public static final Icon KeymapAntOpen = IconLoader.getIcon("/nodes/keymapAntOpen.png"); 
@@ -860,14 +793,11 @@ public class AllIcons {
     public static final Icon KeymapTools = IconLoader.getIcon("/nodes/keymapTools.png"); 
     public static final Icon KeymapToolsOpen = IconLoader.getIcon("/nodes/keymapToolsOpen.png"); 
     public static final Icon Locked = IconLoader.getIcon("/nodes/locked.png"); 
-    public static final Icon LockedSingle = IconLoader.getIcon("/nodes/lockedSingle.png"); 
     public static final Icon Method = IconLoader.getIcon("/nodes/method.png"); 
     public static final Icon ModuleClosed = IconLoader.getIcon("/nodes/ModuleClosed.png"); 
     public static final Icon ModuleGroupClosed = IconLoader.getIcon("/nodes/moduleGroupClosed.png"); 
     public static final Icon ModuleGroupOpen = IconLoader.getIcon("/nodes/moduleGroupOpen.png"); 
-    public static final Icon ModuleJar = IconLoader.getIcon("/nodes/moduleJar.png"); 
     public static final Icon ModuleOpen = IconLoader.getIcon("/nodes/ModuleOpen.png"); 
-    public static final Icon NamedBunch = IconLoader.getIcon("/nodes/namedBunch.png"); 
     public static final Icon NewException = IconLoader.getIcon("/nodes/newException.png"); 
     public static final Icon NewFolder = IconLoader.getIcon("/nodes/newFolder.png"); 
     public static final Icon NewParameter = IconLoader.getIcon("/nodes/newParameter.png"); 
@@ -876,8 +806,6 @@ public class AllIcons {
     public static final Icon PackageOpen = IconLoader.getIcon("/nodes/packageOpen.png"); 
     public static final Icon Padlock = IconLoader.getIcon("/nodes/padlock.png"); 
     public static final Icon Parameter = IconLoader.getIcon("/nodes/parameter.png"); 
-    public static final Icon ParentsIntroduction = IconLoader.getIcon("/nodes/parentsIntroduction.png"); 
-    public static final Icon Pin = IconLoader.getIcon("/nodes/pin.png"); 
     public static final Icon PinToolWindow = IconLoader.getIcon("/nodes/pinToolWindow.png"); 
     public static final Icon Plugin = IconLoader.getIcon("/nodes/plugin.png"); 
     public static final Icon Pluginnotinstalled = IconLoader.getIcon("/nodes/pluginnotinstalled.png"); 
@@ -886,7 +814,6 @@ public class AllIcons {
     public static final Icon PpFile = IconLoader.getIcon("/nodes/ppFile.png"); 
     public static final Icon PpInvalid = IconLoader.getIcon("/nodes/ppInvalid.png"); 
     public static final Icon PpJar = IconLoader.getIcon("/nodes/ppJar.png"); 
-    public static final Icon PpJdk = IconLoader.getIcon("/nodes/ppJdk.png"); 
     public static final Icon PpJdkClosed = IconLoader.getIcon("/nodes/ppJdkClosed.png"); 
     public static final Icon PpJdkOpen = IconLoader.getIcon("/nodes/ppJdkOpen.png"); 
     public static final Icon PpLib = IconLoader.getIcon("/nodes/ppLib.png"); 
@@ -909,7 +836,6 @@ public class AllIcons {
     public static final Icon SecurityRole = IconLoader.getIcon("/nodes/SecurityRole.png"); 
     public static final Icon Servlet = IconLoader.getIcon("/nodes/servlet.png"); 
     public static final Icon ServletMapping = IconLoader.getIcon("/nodes/servletMapping.png"); 
-    public static final Icon SofteningIntroduction = IconLoader.getIcon("/nodes/softeningIntroduction.png"); 
     public static final Icon SortBySeverity = IconLoader.getIcon("/nodes/sortBySeverity.png"); 
     public static final Icon SourceFolder = IconLoader.getIcon("/nodes/sourceFolder.png"); 
     public static final Icon Sql = IconLoader.getIcon("/nodes/sql.png"); 
@@ -942,14 +868,10 @@ public class AllIcons {
     public static final Icon Browser = IconLoader.getIcon("/objectBrowser/browser.png"); 
     public static final Icon CompactEmptyPackages = IconLoader.getIcon("/objectBrowser/compactEmptyPackages.png"); 
     public static final Icon FlattenPackages = IconLoader.getIcon("/objectBrowser/flattenPackages.png"); 
-    public static final Icon HideEmptyPackages = IconLoader.getIcon("/objectBrowser/hideEmptyPackages.png"); 
-    public static final Icon HideFields = IconLoader.getIcon("/objectBrowser/hideFields.png"); 
     public static final Icon ShowEditorHighlighting = IconLoader.getIcon("/objectBrowser/showEditorHighlighting.png"); 
-    public static final Icon ShowGlobalInspections = IconLoader.getIcon("/objectBrowser/showGlobalInspections.png"); 
     public static final Icon ShowLibraryContents = IconLoader.getIcon("/objectBrowser/showLibraryContents.png"); 
     public static final Icon ShowMembers = IconLoader.getIcon("/objectBrowser/showMembers.png"); 
     public static final Icon ShowModules = IconLoader.getIcon("/objectBrowser/showModules.png"); 
-    public static final Icon ShowStructure = IconLoader.getIcon("/objectBrowser/showStructure.png"); 
     public static final Icon SortByType = IconLoader.getIcon("/objectBrowser/sortByType.png"); 
     public static final Icon Sorted = IconLoader.getIcon("/objectBrowser/sorted.png"); 
     public static final Icon Variable = IconLoader.getIcon("/objectBrowser/variable.png"); 
@@ -1020,6 +942,22 @@ public class AllIcons {
 
   }
   
+  public static class Providers {
+    public static final Icon Apache = IconLoader.getIcon("/providers/apache.png"); 
+    public static final Icon Bea = IconLoader.getIcon("/providers/bea.png"); 
+    public static final Icon Cvs = IconLoader.getIcon("/providers/cvs.png"); 
+    public static final Icon Eclipse = IconLoader.getIcon("/providers/eclipse.png"); 
+    public static final Icon Hibernate = IconLoader.getIcon("/providers/hibernate.png"); 
+    public static final Icon Ibm = IconLoader.getIcon("/providers/ibm.png"); 
+    public static final Icon Microsoft = IconLoader.getIcon("/providers/microsoft.png"); 
+    public static final Icon Mysql = IconLoader.getIcon("/providers/mysql.png"); 
+    public static final Icon Oracle = IconLoader.getIcon("/providers/oracle.png"); 
+    public static final Icon Postgresql = IconLoader.getIcon("/providers/postgresql.png"); 
+    public static final Icon Sqlite = IconLoader.getIcon("/providers/sqlite.png"); 
+    public static final Icon Sun = IconLoader.getIcon("/providers/sun.png"); 
+
+  }
+  
   public static class RunConfigurations {
     public static final Icon Applet = IconLoader.getIcon("/runConfigurations/applet.png"); 
     public static final Icon Application = IconLoader.getIcon("/runConfigurations/application.png"); 
@@ -1081,6 +1019,7 @@ public class AllIcons {
     public static final Icon AddLink = IconLoader.getIcon("/toolbarDecorator/addLink.png"); 
     public static final Icon AddPackage = IconLoader.getIcon("/toolbarDecorator/addPackage.png"); 
     public static final Icon AddPattern = IconLoader.getIcon("/toolbarDecorator/addPattern.png"); 
+    public static final Icon AddRemoteDatasource = IconLoader.getIcon("/toolbarDecorator/addRemoteDatasource.png"); 
     public static final Icon AddYouTrack = IconLoader.getIcon("/toolbarDecorator/addYouTrack.png"); 
     public static final Icon Analyze = IconLoader.getIcon("/toolbarDecorator/analyze.png"); 
     public static final Icon Edit = IconLoader.getIcon("/toolbarDecorator/edit.png"); 
@@ -1126,7 +1065,6 @@ public class AllIcons {
     public static final Icon Refresh = IconLoader.getIcon("/vcs/refresh.png"); 
     public static final Icon Remove = IconLoader.getIcon("/vcs/remove.png"); 
     public static final Icon ResetStrip = IconLoader.getIcon("/vcs/resetStrip.png"); 
-    public static final Icon Showfilter = IconLoader.getIcon("/vcs/showfilter.png"); 
     public static final Icon StripDown = IconLoader.getIcon("/vcs/stripDown.png"); 
     public static final Icon StripNull = IconLoader.getIcon("/vcs/stripNull.png"); 
     public static final Icon StripUp = IconLoader.getIcon("/vcs/stripUp.png"); 
diff --git a/platform/util/src/com/intellij/psi/codeStyle/MinusculeMatcher.java b/platform/util/src/com/intellij/psi/codeStyle/MinusculeMatcher.java
index 32074ac649f6..6daebde0ffec 100644
--- a/platform/util/src/com/intellij/psi/codeStyle/MinusculeMatcher.java
+++ b/platform/util/src/com/intellij/psi/codeStyle/MinusculeMatcher.java
@@ -276,8 +276,9 @@ public class MinusculeMatcher implements Matcher {
 
     boolean prefixMatching = first != null && first.getStartOffset() == 0;
     boolean middleWordStart = first != null && first.getStartOffset() > 0 && NameUtil.isWordStart(name, first.getStartOffset());
+    int startIndex = first != null ? first.getStartOffset() : 42;
 
-    return -fragmentCount + matchingCase * 10 + commonStart + (prefixMatching ? 2 : middleWordStart ? 1 : 0) * 100;
+    return -fragmentCount + matchingCase * 10 + commonStart - startIndex + (prefixMatching ? 2 : middleWordStart ? 1 : 0) * 100;
   }
 
   @Override
diff --git a/platform/util/src/com/intellij/ui/CaptionPanel.java b/platform/util/src/com/intellij/ui/CaptionPanel.java
index ec2c436517ef..0d2b16cf178d 100644
--- a/platform/util/src/com/intellij/ui/CaptionPanel.java
+++ b/platform/util/src/com/intellij/ui/CaptionPanel.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.
@@ -87,7 +87,7 @@ public class CaptionPanel extends JPanel {
 
   public void addSettingsComponent(Component component) {
     if (mySettingComponent == null) {
-      mySettingComponent = new JPanel(new FlowLayout());
+      mySettingComponent = new JPanel(new FlowLayout(FlowLayout.LEFT, 0, 0));
       mySettingComponent.setComponentOrientation(ComponentOrientation.LEFT_TO_RIGHT);
       add(mySettingComponent, BorderLayout.WEST);
       mySettingComponent.setOpaque(false);
diff --git a/platform/xdebugger-api/src/com/intellij/xdebugger/breakpoints/ui/BreakpointItem.java b/platform/xdebugger-api/src/com/intellij/xdebugger/breakpoints/ui/BreakpointItem.java
index 82abf3ad6522..c8d0ac85aaa8 100644
--- a/platform/xdebugger-api/src/com/intellij/xdebugger/breakpoints/ui/BreakpointItem.java
+++ b/platform/xdebugger-api/src/com/intellij/xdebugger/breakpoints/ui/BreakpointItem.java
@@ -16,14 +16,13 @@
 package com.intellij.xdebugger.breakpoints.ui;
 
 import com.intellij.openapi.editor.Editor;
-import com.intellij.openapi.editor.LogicalPosition;
 import com.intellij.openapi.editor.colors.EditorColorsManager;
 import com.intellij.openapi.editor.impl.DocumentMarkupModel;
 import com.intellij.openapi.editor.markup.MarkupModel;
 import com.intellij.openapi.editor.markup.RangeHighlighter;
 import com.intellij.openapi.editor.markup.TextAttributes;
 import com.intellij.openapi.project.Project;
-import com.intellij.openapi.ui.popup.JBPopup;
+import com.intellij.openapi.util.Key;
 import com.intellij.openapi.vfs.VirtualFile;
 import com.intellij.ui.ColorUtil;
 import com.intellij.ui.ColoredListCellRenderer;
@@ -43,17 +42,25 @@ import javax.swing.*;
  * To change this template use File | Settings | File Templates.
  */
 public abstract class BreakpointItem implements ItemWrapper {
+  protected static final Key<Object> BREAKPOINT_ITEM = Key.create("BreakpointItem");
+
   public abstract Object getBreakpoint();
 
   public abstract boolean isEnabled();
 
   public abstract void setEnabled(boolean state);
 
-  protected void showInEditor(DetailView panel, VirtualFile virtualFile, int line) {
+  protected boolean showInEditor(DetailView panel, VirtualFile virtualFile, int line) {
     TextAttributes attributes =
       EditorColorsManager.getInstance().getGlobalScheme().getAttributes(DebuggerColors.BREAKPOINT_ATTRIBUTES);
 
-    panel.navigateInPreviewEditor(virtualFile, new LogicalPosition(line, 0), attributes);
+    DetailView.PreviewEditorState state = DetailView.PreviewEditorState.create(virtualFile, line, attributes);
+
+    if (state.equals(panel.getEditorState())) {
+      return false;
+    }
+
+    panel.navigateInPreviewEditor(state);
 
     TextAttributes softerAttributes = attributes.clone();
     softerAttributes.setBackgroundColor(ColorUtil.softer(softerAttributes.getBackgroundColor()));
@@ -72,10 +79,7 @@ public abstract class BreakpointItem implements ItemWrapper {
         }
       }
     }
-  }
-
-  @Override
-  public void execute(Project project, JBPopup popup) {
+    return true;
   }
 
   @Override
@@ -86,14 +90,49 @@ public abstract class BreakpointItem implements ItemWrapper {
 
   @Override
   public void setupRenderer(ColoredListCellRenderer renderer, Project project, boolean selected) {
-    setupGenericRenderer(renderer);
+    setupGenericRenderer(renderer, true);
   }
 
   @Override
   public void setupRenderer(ColoredTreeCellRenderer renderer) {
-    setupGenericRenderer(renderer);
+    boolean plainView = renderer.getTree().getClientProperty("plainView") != null;
+    setupGenericRenderer(renderer, plainView);
   }
 
-  protected abstract void setupGenericRenderer(SimpleColoredComponent renderer);
+  @Override
+  public void updateDetailView(DetailView panel) {
 
+    if (panel.getUserData(BREAKPOINT_ITEM) == getBreakpoint()) {
+      return;
+    }
+
+    doUpdateDetailView(panel);
+
+    panel.putUserData(BREAKPOINT_ITEM, getBreakpoint());
+  }
+
+  protected abstract void setupGenericRenderer(SimpleColoredComponent renderer, boolean plainView);
+
+  public abstract Icon getIcon();
+
+  public abstract String getDisplayText();
+
+  protected abstract void doUpdateDetailView(DetailView panel);
+
+  @Override
+  public boolean equals(Object o) {
+    if (this == o) return true;
+    if (o == null || getClass() != o.getClass()) return false;
+
+    BreakpointItem item = (BreakpointItem)o;
+
+    if (getBreakpoint() != null ? !getBreakpoint().equals(item.getBreakpoint()) : item.getBreakpoint() != null) return false;
+
+    return true;
+  }
+
+  @Override
+  public int hashCode() {
+    return getBreakpoint() != null ? getBreakpoint().hashCode() : 0;
+  }
 }
diff --git a/platform/xdebugger-impl/src/com/intellij/xdebugger/impl/breakpoints/XBreakpointItem.java b/platform/xdebugger-impl/src/com/intellij/xdebugger/impl/breakpoints/XBreakpointItem.java
index 3df95722ff41..9e22e023753f 100644
--- a/platform/xdebugger-impl/src/com/intellij/xdebugger/impl/breakpoints/XBreakpointItem.java
+++ b/platform/xdebugger-impl/src/com/intellij/xdebugger/impl/breakpoints/XBreakpointItem.java
@@ -46,22 +46,28 @@ class XBreakpointItem extends BreakpointItem {
 
   @Override
   public void setupRenderer(ColoredListCellRenderer renderer, Project project, boolean selected) {
-    setupGenericRenderer(renderer);
+    setupGenericRenderer(renderer, false);
   }
 
   @Override
   public void setupRenderer(ColoredTreeCellRenderer renderer) {
-    setupGenericRenderer(renderer);
+    setupGenericRenderer(renderer, false);
   }
 
-  protected void setupGenericRenderer(SimpleColoredComponent renderer) {
-    //renderer.setIcon(getIcon());
+  protected void setupGenericRenderer(SimpleColoredComponent renderer, boolean plainView) {
+    if (plainView) {
+      renderer.setIcon(getIcon());
+    }
     final SimpleTextAttributes attributes =
       myBreakpoint.isEnabled() ? SimpleTextAttributes.SIMPLE_CELL_ATTRIBUTES : SimpleTextAttributes.GRAYED_ATTRIBUTES;
-    renderer.append(XBreakpointUtil.getShortText(myBreakpoint), attributes);
+    renderer.append(getDisplayText(), attributes);
   }
 
-  private Icon getIcon() {
+  public String getDisplayText() {
+    return XBreakpointUtil.getShortText(myBreakpoint);
+  }
+
+  public Icon getIcon() {
     return ((XBreakpointBase)myBreakpoint).getIcon();
   }
 
@@ -75,21 +81,22 @@ class XBreakpointItem extends BreakpointItem {
     return ((XBreakpointBase)myBreakpoint).getType().getDisplayText(myBreakpoint);
   }
 
-  @Override
-  public void updateDetailView(DetailView panel) {
+  public void doUpdateDetailView(DetailView panel) {
     Project project = ((XBreakpointBase)myBreakpoint).getProject();
 
+    XSourcePosition sourcePosition = myBreakpoint.getSourcePosition();
+    if (sourcePosition != null) {
+      if (!showInEditor(panel, sourcePosition.getFile(), sourcePosition.getLine())) {
+        return;
+      }
+    } else {
+      panel.clearEditor();
+    }
+
     XLightBreakpointPropertiesPanel<XBreakpoint<?>> propertiesPanel =
       new XLightBreakpointPropertiesPanel<XBreakpoint<?>>(project, getManager(), myBreakpoint, true);
     propertiesPanel.loadProperties();
     panel.setDetailPanel(propertiesPanel.getMainPanel());
-
-    XSourcePosition sourcePosition = myBreakpoint.getSourcePosition();
-    if (sourcePosition != null) {
-      showInEditor(panel, sourcePosition.getFile(), sourcePosition.getLine());
-    } else {
-      panel.clearEditor();
-    }
   }
 
   private XBreakpointManagerImpl getManager() {
diff --git a/platform/xdebugger-impl/src/com/intellij/xdebugger/impl/breakpoints/ui/BreakpointsMasterDetailPopupFactory.java b/platform/xdebugger-impl/src/com/intellij/xdebugger/impl/breakpoints/ui/BreakpointsMasterDetailPopupFactory.java
index 748c2789f3f2..8d4bb612ce6c 100644
--- a/platform/xdebugger-impl/src/com/intellij/xdebugger/impl/breakpoints/ui/BreakpointsMasterDetailPopupFactory.java
+++ b/platform/xdebugger-impl/src/com/intellij/xdebugger/impl/breakpoints/ui/BreakpointsMasterDetailPopupFactory.java
@@ -22,6 +22,7 @@ import com.intellij.openapi.ui.popup.JBPopup;
 import com.intellij.openapi.ui.popup.JBPopupListener;
 import com.intellij.openapi.ui.popup.LightweightWindowEvent;
 import com.intellij.xdebugger.impl.DebuggerSupport;
+import com.intellij.xdebugger.impl.breakpoints.ui.tree.BreakpointMasterDetailPopupBuilder;
 import org.jetbrains.annotations.Nullable;
 
 import java.util.ArrayList;
@@ -31,22 +32,26 @@ import java.util.List;
 
 public class BreakpointsMasterDetailPopupFactory {
 
-  private final List<BreakpointPanelProvider> myBreakpointPanelProviders;
   private Project myProject;
   private Balloon myBalloonToHide;
 
   public BreakpointsMasterDetailPopupFactory(Project project) {
     myProject = project;
-    myBreakpointPanelProviders = new ArrayList<BreakpointPanelProvider>();
+    collectPanelProviders();
+  }
+
+  public static List<BreakpointPanelProvider> collectPanelProviders() {
+    List<BreakpointPanelProvider> panelProviders = new ArrayList<BreakpointPanelProvider>();
     for (DebuggerSupport debuggerSupport : DebuggerSupport.getDebuggerSupports()) {
-      myBreakpointPanelProviders.add(debuggerSupport.getBreakpointPanelProvider());
+      panelProviders.add(debuggerSupport.getBreakpointPanelProvider());
     }
-    Collections.sort(myBreakpointPanelProviders, new Comparator<BreakpointPanelProvider>() {
+    Collections.sort(panelProviders, new Comparator<BreakpointPanelProvider>() {
       @Override
       public int compare(BreakpointPanelProvider o1, BreakpointPanelProvider o2) {
         return o2.getPriority() - o1.getPriority();
       }
     });
+    return panelProviders;
   }
 
   public void setBalloonToHide(Balloon balloonToHide) {
@@ -60,7 +65,7 @@ public class BreakpointsMasterDetailPopupFactory {
   public JBPopup createPopup(@Nullable Object initialBreakpoint) {
     BreakpointMasterDetailPopupBuilder builder = new BreakpointMasterDetailPopupBuilder(myProject);
     builder.setInitialBreakpoint(initialBreakpoint);
-    builder.setBreakpointsPanelProviders(myBreakpointPanelProviders);
+    builder.setBreakpointsPanelProviders(collectPanelProviders());
     final JBPopup popup = builder.createPopup();
     popup.addListener(new JBPopupListener() {
       @Override
diff --git a/platform/xdebugger-impl/src/com/intellij/xdebugger/impl/breakpoints/ui/tree/BreakpointItemNode.java b/platform/xdebugger-impl/src/com/intellij/xdebugger/impl/breakpoints/ui/tree/BreakpointItemNode.java
new file mode 100644
index 000000000000..4393ce9389d4
--- /dev/null
+++ b/platform/xdebugger-impl/src/com/intellij/xdebugger/impl/breakpoints/ui/tree/BreakpointItemNode.java
@@ -0,0 +1,33 @@
+/*
+ * 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.xdebugger.impl.breakpoints.ui.tree;
+
+import com.intellij.ui.CheckedTreeNode;
+import com.intellij.xdebugger.breakpoints.ui.BreakpointItem;
+
+class BreakpointItemNode extends CheckedTreeNode {
+  private final BreakpointItem myBreakpoint;
+
+  BreakpointItemNode(final BreakpointItem breakpoint) {
+    super(breakpoint);
+    myBreakpoint = breakpoint;
+    setChecked(breakpoint.isEnabled());
+  }
+
+  public BreakpointItem getBreakpointItem() {
+    return myBreakpoint;
+  }
+}
diff --git a/platform/xdebugger-impl/src/com/intellij/xdebugger/impl/breakpoints/ui/BreakpointItemsTree.java b/platform/xdebugger-impl/src/com/intellij/xdebugger/impl/breakpoints/ui/tree/BreakpointItemsTreeController.java
similarity index 74%
rename from platform/xdebugger-impl/src/com/intellij/xdebugger/impl/breakpoints/ui/BreakpointItemsTree.java
rename to platform/xdebugger-impl/src/com/intellij/xdebugger/impl/breakpoints/ui/tree/BreakpointItemsTreeController.java
index 13fe05927c62..b94ec8b72ed8 100644
--- a/platform/xdebugger-impl/src/com/intellij/xdebugger/impl/breakpoints/ui/BreakpointItemsTree.java
+++ b/platform/xdebugger-impl/src/com/intellij/xdebugger/impl/breakpoints/ui/tree/BreakpointItemsTreeController.java
@@ -13,13 +13,11 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.intellij.xdebugger.impl.breakpoints.ui;
+package com.intellij.xdebugger.impl.breakpoints.ui.tree;
 
 import com.intellij.ide.util.treeView.TreeState;
 import com.intellij.openapi.util.MultiValuesMap;
-import com.intellij.ui.CheckboxTree;
 import com.intellij.ui.CheckedTreeNode;
-import com.intellij.ui.SimpleTextAttributes;
 import com.intellij.util.ui.tree.TreeUtil;
 import com.intellij.xdebugger.breakpoints.XBreakpoint;
 import com.intellij.xdebugger.breakpoints.XBreakpointManager;
@@ -39,7 +37,7 @@ import java.util.*;
 /**
  * @author nik, zajac
  */
-public class BreakpointItemsTree extends CheckboxTree {
+public class BreakpointItemsTreeController implements BreakpointsCheckboxTree.Delegate {
   //private final TreeNodeComparator myComparator;
   private final CheckedTreeNode myRoot;
   private final Map<BreakpointItem, BreakpointItemNode> myNodes = new HashMap<BreakpointItem, BreakpointItemNode>();
@@ -50,14 +48,20 @@ public class BreakpointItemsTree extends CheckboxTree {
 
   private final MultiValuesMap<XBreakpointGroupingRule, XBreakpointGroup> myGroups = new MultiValuesMap<XBreakpointGroupingRule, XBreakpointGroup>();
 
-  private BreakpointItemsTree(final CheckedTreeNode root,
-                              Collection<XBreakpointGroupingRule> groupingRules) {
-    super(new BreakpointsTreeCellRenderer(), root);
-    myRoot = root;
+  private JTree myTreeView;
+
+  public BreakpointItemsTreeController(Collection<XBreakpointGroupingRule> groupingRules) {
+    myRoot = new CheckedTreeNode("root");
     //myComparator = new TreeNodeComparator<B>(type, breakpointManager);
     setGroupingRulesInternal(groupingRules);
+  }
 
-    getEmptyText().setText("No Breakpoints");
+  public void setTreeView(JTree treeView) {
+    myTreeView = treeView;
+    if (treeView instanceof BreakpointsCheckboxTree) {
+      ((BreakpointsCheckboxTree)treeView).setDelegate(this);
+    }
+    myTreeView.setShowsRootHandles(!myGroupingRules.isEmpty());
   }
 
   public void setDelegate(BreakpointItemsTreeDelegate delegate) {
@@ -66,15 +70,10 @@ public class BreakpointItemsTree extends CheckboxTree {
 
   private void setGroupingRulesInternal(final Collection<XBreakpointGroupingRule> groupingRules) {
     myGroupingRules = new ArrayList<XBreakpointGroupingRule>(groupingRules);
-    setShowsRootHandles(!groupingRules.isEmpty());
-  }
-
-  public static BreakpointItemsTree createTree(final Collection<XBreakpointGroupingRule> groupingRules) {
-    return new BreakpointItemsTree(new CheckedTreeNode("root"), groupingRules);
   }
 
   public void buildTree(@NotNull Collection<? extends BreakpointItem> breakpoints) {
-    final TreeState state = TreeState.createOn(this, myRoot);
+    final TreeState state = TreeState.createOn(myTreeView, myRoot);
     myRoot.removeAllChildren();
     myNodes.clear();
     myGroupNodes.clear();
@@ -86,9 +85,9 @@ public class BreakpointItemsTree extends CheckboxTree {
       myNodes.put(breakpoint, node);
     }
     //TreeUtil.sort(myRoot, myComparator);
-    ((DefaultTreeModel)getModel()).nodeStructureChanged(myRoot);
-    state.applyTo(this, myRoot);
-    TreeUtil.expandAll(this);
+    ((DefaultTreeModel)(myTreeView.getModel())).nodeStructureChanged(myRoot);
+    state.applyTo(myTreeView, myRoot);
+    TreeUtil.expandAll(myTreeView);
   }
 
 
@@ -146,24 +145,28 @@ public class BreakpointItemsTree extends CheckboxTree {
   }
 
   @Override
-  protected void onDoubleClick(CheckedTreeNode node) {
+  public void didSelectNode(CheckedTreeNode node) {
     if (node instanceof BreakpointItemNode) {
       myDelegate.execute(((BreakpointItemNode)node).getBreakpointItem());
     }
   }
 
   @Override
-  protected void onNodeStateChanged(final CheckedTreeNode node) {
+  public void nodeStateChanged(CheckedTreeNode node) {
     if (node instanceof BreakpointItemNode) {
       ((BreakpointItemNode)node).getBreakpointItem().setEnabled(node.isChecked());
     }
   }
 
   public void setGroupingRules(Collection<XBreakpointGroupingRule> groupingRules) {
-    List<BreakpointItem> selectedBreakpoints = getSelectedBreakpoints();
-    List<BreakpointItem> allBreakpoints = new ArrayList<BreakpointItem>(myNodes.keySet());
-
     setGroupingRulesInternal(groupingRules);
+    rebuildTree(new ArrayList<BreakpointItem>(myNodes.keySet()));
+  }
+
+  public void rebuildTree(Collection<BreakpointItem> items) {
+    List<BreakpointItem> selectedBreakpoints = getSelectedBreakpoints();
+    Collection<BreakpointItem> allBreakpoints = items;
+
     buildTree(allBreakpoints);
 
     if (selectedBreakpoints.size() > 0) {
@@ -173,7 +176,7 @@ public class BreakpointItemsTree extends CheckboxTree {
 
   public List<BreakpointItem> getSelectedBreakpoints() {
     final ArrayList<BreakpointItem> list = new ArrayList<BreakpointItem>();
-    TreePath[] selectionPaths = getSelectionPaths();
+    TreePath[] selectionPaths = myTreeView.getSelectionPaths();
     if (selectionPaths == null || selectionPaths.length == 0) return list;
 
     for (TreePath selectionPath : selectionPaths) {
@@ -193,58 +196,12 @@ public class BreakpointItemsTree extends CheckboxTree {
   public void selectBreakpointItem(final BreakpointItem breakpoint) {
     BreakpointItemNode node = myNodes.get(breakpoint);
     if (node != null) {
-      TreeUtil.selectNode(this, node);
+      TreeUtil.selectNode(myTreeView, node);
     }
   }
 
-  private static class BreakpointsTreeCellRenderer extends CheckboxTreeCellRenderer {
-    @Override
-    public void customizeRenderer(JTree tree, Object value, boolean selected, boolean expanded, boolean leaf, int row, boolean hasFocus) {
-      if (value instanceof BreakpointItemNode) {
-        BreakpointItemNode node = (BreakpointItemNode)value;
-        BreakpointItem breakpoint = node.getBreakpointItem();
-        breakpoint.setupRenderer(getTextRenderer());
-      }
-      else if (value instanceof BreakpointsGroupNode) {
-        XBreakpointGroup group = ((BreakpointsGroupNode)value).getGroup();
-        getTextRenderer().setIcon(group.getIcon(expanded));
-        getTextRenderer().append(group.getName(), SimpleTextAttributes.SIMPLE_CELL_ATTRIBUTES);
-      }
-    }
-  }
-
-  private static class BreakpointsGroupNode<G extends XBreakpointGroup> extends CheckedTreeNode {
-    private final G myGroup;
-    private final int myLevel;
-
-    private BreakpointsGroupNode(G group, int level) {
-      super(group);
-      myLevel = level;
-      setChecked(false);
-      myGroup = group;
-    }
-
-    public G getGroup() {
-      return myGroup;
-    }
-
-    public int getLevel() {
-      return myLevel;
-    }
-  }
-  
-  private static class BreakpointItemNode extends CheckedTreeNode {
-    private final BreakpointItem myBreakpoint;
-
-    private BreakpointItemNode(final BreakpointItem breakpoint) {
-      super(breakpoint);
-      myBreakpoint = breakpoint;
-      setChecked(breakpoint.isEnabled());
-    }
-
-    public BreakpointItem getBreakpointItem() {
-      return myBreakpoint;
-    }
+  public CheckedTreeNode getRoot() {
+    return myRoot;
   }
 
   private static class TreeNodeComparator<B extends XBreakpoint<?>> implements Comparator<TreeNode> {
diff --git a/platform/xdebugger-impl/src/com/intellij/xdebugger/impl/breakpoints/ui/BreakpointMasterDetailPopupBuilder.java b/platform/xdebugger-impl/src/com/intellij/xdebugger/impl/breakpoints/ui/tree/BreakpointMasterDetailPopupBuilder.java
similarity index 58%
rename from platform/xdebugger-impl/src/com/intellij/xdebugger/impl/breakpoints/ui/BreakpointMasterDetailPopupBuilder.java
rename to platform/xdebugger-impl/src/com/intellij/xdebugger/impl/breakpoints/ui/tree/BreakpointMasterDetailPopupBuilder.java
index fce09fb83953..1514342a3546 100644
--- a/platform/xdebugger-impl/src/com/intellij/xdebugger/impl/breakpoints/ui/BreakpointMasterDetailPopupBuilder.java
+++ b/platform/xdebugger-impl/src/com/intellij/xdebugger/impl/breakpoints/ui/tree/BreakpointMasterDetailPopupBuilder.java
@@ -13,53 +13,94 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.intellij.xdebugger.impl.breakpoints.ui;
+package com.intellij.xdebugger.impl.breakpoints.ui.tree;
 
 import com.intellij.openapi.actionSystem.AnAction;
 import com.intellij.openapi.actionSystem.AnActionEvent;
 import com.intellij.openapi.actionSystem.DefaultActionGroup;
 import com.intellij.openapi.actionSystem.ex.CheckboxAction;
-import com.intellij.openapi.editor.colors.EditorColorsManager;
-import com.intellij.openapi.editor.colors.EditorColorsScheme;
-import com.intellij.openapi.editor.colors.ex.DefaultColorSchemesManager;
-import com.intellij.openapi.editor.colors.impl.EditorColorsSchemeImpl;
-import com.intellij.openapi.editor.markup.EffectType;
-import com.intellij.openapi.editor.markup.TextAttributes;
 import com.intellij.openapi.project.Project;
 import com.intellij.openapi.ui.popup.JBPopup;
 import com.intellij.openapi.ui.popup.JBPopupFactory;
 import com.intellij.openapi.ui.popup.JBPopupListener;
 import com.intellij.openapi.ui.popup.LightweightWindowEvent;
 import com.intellij.ui.IdeBorderFactory;
+import com.intellij.ui.popup.util.DetailView;
+import com.intellij.ui.popup.util.ItemWrapper;
 import com.intellij.ui.popup.util.MasterDetailPopupBuilder;
 import com.intellij.util.IconUtil;
 import com.intellij.util.PlatformIcons;
 import com.intellij.util.containers.HashSet;
 import com.intellij.xdebugger.breakpoints.ui.BreakpointItem;
 import com.intellij.xdebugger.breakpoints.ui.XBreakpointGroupingRule;
-import com.intellij.xdebugger.ui.DebuggerColors;
+import com.intellij.xdebugger.impl.breakpoints.ui.BreakpointPanelProvider;
+import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;
 
 import javax.swing.*;
-import java.awt.*;
 import java.awt.event.KeyEvent;
-import java.util.ArrayList;
-import java.util.Collection;
-import java.util.List;
-import java.util.Set;
+import java.util.*;
 
 public class BreakpointMasterDetailPopupBuilder {
 
   private Project myProject;
   private MasterDetailPopupBuilder myPopupBuilder;
-  private Collection<BreakpointPanelProvider> myBreakpointsPanelProviders;
-  private BreakpointItemsTree myTree;
+  private Collection<BreakpointPanelProvider> myBreakpointsPanelProviders = Collections.emptyList();
+  private BreakpointItemsTreeController myTreeController;
   private final List<XBreakpointGroupingRule> myRulesAvailable = new ArrayList<XBreakpointGroupingRule>();
     
   private final Set<XBreakpointGroupingRule> myRulesEnabled = new HashSet<XBreakpointGroupingRule>();
 
   @Nullable private Object myInitialBreakpoint;
 
+  @Nullable private BreakpointChosenCallback myCallback = null;
+
+  private boolean myAddDetailViewToEast = true;
+
+  private DetailView myDetailView;
+
+  private boolean myIsViewer;
+
+  private boolean myPlainView = false;
+
+  public boolean isPlainView() {
+    return myPlainView;
+  }
+
+  public void setPlainView(boolean plainView) {
+    myPlainView = plainView;
+  }
+
+  public Collection<BreakpointItem> getBreakpointItems() {
+    return myBreakpointItems;
+  }
+
+  public void setBreakpointItems(Collection<BreakpointItem> breakpointItems) {
+    myBreakpointItems = breakpointItems;
+  }
+
+  private Collection<BreakpointItem> myBreakpointItems = new ArrayList<BreakpointItem>();
+
+  public void setDetailView(DetailView detailView) {
+    myDetailView = detailView;
+  }
+
+  public void setAddDetailViewToEast(boolean addDetailViewToEast) {
+    myAddDetailViewToEast = addDetailViewToEast;
+  }
+
+  public void setCallback(BreakpointChosenCallback callback) {
+    myCallback = callback;
+  }
+
+  public void setIsViewer(boolean isViewer) {
+    myIsViewer = isViewer;
+  }
+
+  public interface BreakpointChosenCallback {
+    void breakpointChosen(Project project, BreakpointItem breakpointItem, JBPopup popup);
+  }
+
   public void setInitialBreakpoint(@Nullable Object initialBreakpoint) {
     myInitialBreakpoint = initialBreakpoint;
   }
@@ -67,34 +108,50 @@ public class BreakpointMasterDetailPopupBuilder {
   public BreakpointMasterDetailPopupBuilder(Project project) {
     myProject = project;
   }
-  
 
   public JBPopup createPopup() {
     myPopupBuilder = new MasterDetailPopupBuilder(myProject);
 
+    if (myDetailView != null) {
+      myPopupBuilder.setDetailView(myDetailView);
+    }
+    myPopupBuilder.setAddDetailViewToEast(myAddDetailViewToEast);
+
     for (BreakpointPanelProvider provider : myBreakpointsPanelProviders) {
       provider.createBreakpointsGroupingRules(myRulesAvailable);
     }
 
-    for (XBreakpointGroupingRule rule : myRulesAvailable) {
-      if (rule.isAlwaysEnabled()) {
-        myRulesEnabled.add(rule);
+    if (!myIsViewer) {
+      for (XBreakpointGroupingRule rule : myRulesAvailable) {
+        if (rule.isAlwaysEnabled()) {
+          myRulesEnabled.add(rule);
+        }
       }
     }
 
     DefaultActionGroup actions = createActions();
 
 
-    myTree = BreakpointItemsTree.createTree(getEnabledRulesList());
+    myTreeController = new BreakpointItemsTreeController(getEnabledRulesList());
 
-    final ArrayList<BreakpointItem> breakpoints = collectItems();
-    myTree.buildTree(breakpoints);
+    JTree tree = myIsViewer ? new BreakpointsSimpleTree(myTreeController) : new BreakpointsCheckboxTree(myTreeController);
+
+    if (myPlainView) {
+      tree.putClientProperty("plainView", Boolean.TRUE);
+    }
+
+    myTreeController.setTreeView(tree);
+
+    collectItems();
+
+    myTreeController.buildTree(myBreakpointItems);
 
 
     final BreakpointPanelProvider.BreakpointsListener listener = new BreakpointPanelProvider.BreakpointsListener() {
       @Override
       public void breakpointsChanged() {
-        myTree.buildTree(collectItems());
+        collectItems();
+        myTreeController.rebuildTree(myBreakpointItems);
       }
     };
 
@@ -102,41 +159,55 @@ public class BreakpointMasterDetailPopupBuilder {
       provider.addListener(listener, myProject);
     }
 
+    final MasterDetailPopupBuilder.Delegate delegate = new MasterDetailPopupBuilder.Delegate() {
+      @Nullable
+      @Override
+      public String getTitle() {
+        return myIsViewer ? null : "Breakpoints";
+      }
+
+      @Override
+      public void handleMnemonic(KeyEvent e, Project project, JBPopup popup) {
+        //To change body of implemented methods use File | Settings | File Templates.
+      }
+
+      public JComponent createAccessoryView(Project project) {
+        return new JCheckBox();
+      }
+
+      @Override
+      public Object[] getSelectedItemsInTree() {
+        final List<BreakpointItem> res = myTreeController.getSelectedBreakpoints();
+        return res.toArray(new Object[res.size()]);
+      }
+
+      @Override
+      public void itemChosen(ItemWrapper item, Project project, JBPopup popup) {
+        if (!(item instanceof BreakpointItem)) {
+          return;
+        }
+        if (myCallback != null){
+          myCallback.breakpointChosen(project, (BreakpointItem)item,  popup);
+        }
+      }
+    };
+
     final JBPopup popup = myPopupBuilder.
       setActionsGroup(actions).
-      setTree(myTree).
-      setDelegate(new MasterDetailPopupBuilder.Delegate() {
-        @Override
-        public String getTitle() {
-          return "Breakpoints";
-        }
+      setTree(tree).
+      setDelegate(delegate).
+      setCloseOnEnter(false).createMasterDetailPopup();
 
-        @Override
-        public void handleMnemonic(KeyEvent e, Project project, JBPopup popup) {
-          //To change body of implemented methods use File | Settings | File Templates.
-        }
+    tree.setBorder(IdeBorderFactory.createBorder());
 
-        public JComponent createAccessoryView(Project project) {
-          return new JCheckBox();
-        }
-
-        @Override
-        public Object[] getSelectedItemsInTree() {
-          final List<BreakpointItem> res = myTree.getSelectedBreakpoints();
-          return res.toArray(new Object[res.size()]);
-        }
-      }).setCloseOnEnter(false).createMasterDetailPopup();
-
-    myTree.setBorder(IdeBorderFactory.createBorder());
-
-    myTree.setDelegate(new BreakpointItemsTree.BreakpointItemsTreeDelegate() {
+    myTreeController.setDelegate(new BreakpointItemsTreeController.BreakpointItemsTreeDelegate() {
       @Override
       public void execute(BreakpointItem item) {
-        item.execute(myProject, popup);
+        delegate.itemChosen(item, myProject, popup);
       }
     });
 
-    initSelection(breakpoints);
+    initSelection(myBreakpointItems);
 
     popup.addListener(new JBPopupListener() {
       @Override
@@ -155,31 +226,26 @@ public class BreakpointMasterDetailPopupBuilder {
     return popup;
   }
 
-  void initSelection(ArrayList<BreakpointItem> breakpoints) {
+  void initSelection(Collection<BreakpointItem> breakpoints) {
     boolean found = false;
     for (BreakpointItem breakpoint : breakpoints) {
       if (breakpoint.getBreakpoint() == myInitialBreakpoint) {
-        myTree.selectBreakpointItem(breakpoint);
+        myTreeController.selectBreakpointItem(breakpoint);
         found = true;
         break;
       }
     }
 
     if (!found && !breakpoints.isEmpty()) {
-      myTree.selectBreakpointItem(breakpoints.get(0));
+      myTreeController.selectBreakpointItem(breakpoints.iterator().next());
     }
   }
 
-  EditorColorsScheme createScheme() {
-    final EditorColorsScheme scheme =
-      new EditorColorsSchemeImpl(EditorColorsManager.getInstance().getGlobalScheme(), DefaultColorSchemesManager.getInstance());
-    scheme.setName("abc");
-    scheme
-      .setAttributes(DebuggerColors.BREAKPOINT_ATTRIBUTES, new TextAttributes(Color.black, Color.CYAN, null, EffectType.BOXED, Font.BOLD));
-    return scheme;
-  }
-
+  @Nullable
   DefaultActionGroup createActions() {
+    if (myIsViewer) {
+      return null;
+    }
     DefaultActionGroup actions = new DefaultActionGroup();
     final DefaultActionGroup breakpointTypes = new DefaultActionGroup();
     for (BreakpointPanelProvider provider : myBreakpointsPanelProviders) {
@@ -215,15 +281,16 @@ public class BreakpointMasterDetailPopupBuilder {
     return actions;
   }
 
-  ArrayList<BreakpointItem> collectItems() {
-    ArrayList<BreakpointItem> items = new ArrayList<BreakpointItem>();
-    for (BreakpointPanelProvider panelProvider : myBreakpointsPanelProviders) {
-      panelProvider.provideBreakpointItems(myProject, items);
+  void collectItems() {
+    if (!myBreakpointsPanelProviders.isEmpty()) {
+      myBreakpointItems.clear();
+      for (BreakpointPanelProvider panelProvider : myBreakpointsPanelProviders) {
+        panelProvider.provideBreakpointItems(myProject, myBreakpointItems);
+      }
     }
-    return items;
   }
 
-  public void setBreakpointsPanelProviders(Collection<BreakpointPanelProvider> breakpointsPanelProviders) {
+  public void setBreakpointsPanelProviders(@NotNull Collection<BreakpointPanelProvider> breakpointsPanelProviders) {
     myBreakpointsPanelProviders = breakpointsPanelProviders;
   }
 
@@ -249,7 +316,7 @@ public class BreakpointMasterDetailPopupBuilder {
       else {
         myRulesEnabled.remove(myRule);
       }
-      myTree.setGroupingRules(getEnabledRulesList());
+      myTreeController.setGroupingRules(getEnabledRulesList());
     }
   }
 
diff --git a/platform/xdebugger-impl/src/com/intellij/xdebugger/impl/breakpoints/ui/tree/BreakpointsCheckboxTree.java b/platform/xdebugger-impl/src/com/intellij/xdebugger/impl/breakpoints/ui/tree/BreakpointsCheckboxTree.java
new file mode 100644
index 000000000000..2194b662d719
--- /dev/null
+++ b/platform/xdebugger-impl/src/com/intellij/xdebugger/impl/breakpoints/ui/tree/BreakpointsCheckboxTree.java
@@ -0,0 +1,55 @@
+/*
+ * 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.xdebugger.impl.breakpoints.ui.tree;
+
+import com.intellij.ui.CheckboxTree;
+import com.intellij.ui.CheckedTreeNode;
+
+public class BreakpointsCheckboxTree extends CheckboxTree {
+
+
+  @Override
+  protected void onDoubleClick(CheckedTreeNode node) {
+    super.onDoubleClick(node);
+    if (myDelegate != null) {
+      myDelegate.didSelectNode(node);
+    }
+  }
+
+  @Override
+  protected void onNodeStateChanged(CheckedTreeNode node) {
+    super.onNodeStateChanged(node);
+    if (myDelegate != null) {
+      myDelegate.nodeStateChanged(node);
+    }
+  }
+
+  interface Delegate {
+    void didSelectNode(CheckedTreeNode node);
+
+    void nodeStateChanged(CheckedTreeNode node);
+  }
+
+  public void setDelegate(Delegate delegate) {
+    myDelegate = delegate;
+  }
+
+  private Delegate myDelegate = null;
+
+  public BreakpointsCheckboxTree(BreakpointItemsTreeController model) {
+    super(new BreakpointsTreeCellRenderer.BreakpointsCheckboxTreeCellRenderer(), model.getRoot());
+  }
+}
diff --git a/platform/xdebugger-impl/src/com/intellij/xdebugger/impl/breakpoints/ui/tree/BreakpointsGroupNode.java b/platform/xdebugger-impl/src/com/intellij/xdebugger/impl/breakpoints/ui/tree/BreakpointsGroupNode.java
new file mode 100644
index 000000000000..d6868352d8a8
--- /dev/null
+++ b/platform/xdebugger-impl/src/com/intellij/xdebugger/impl/breakpoints/ui/tree/BreakpointsGroupNode.java
@@ -0,0 +1,39 @@
+/*
+ * 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.xdebugger.impl.breakpoints.ui.tree;
+
+import com.intellij.ui.CheckedTreeNode;
+import com.intellij.xdebugger.breakpoints.ui.XBreakpointGroup;
+
+class BreakpointsGroupNode<G extends XBreakpointGroup> extends CheckedTreeNode {
+  private final G myGroup;
+  private final int myLevel;
+
+  BreakpointsGroupNode(G group, int level) {
+    super(group);
+    myLevel = level;
+    setChecked(false);
+    myGroup = group;
+  }
+
+  public G getGroup() {
+    return myGroup;
+  }
+
+  public int getLevel() {
+    return myLevel;
+  }
+}
diff --git a/platform/xdebugger-impl/src/com/intellij/xdebugger/impl/breakpoints/ui/tree/BreakpointsSimpleTree.java b/platform/xdebugger-impl/src/com/intellij/xdebugger/impl/breakpoints/ui/tree/BreakpointsSimpleTree.java
new file mode 100644
index 000000000000..b7e1c70d900c
--- /dev/null
+++ b/platform/xdebugger-impl/src/com/intellij/xdebugger/impl/breakpoints/ui/tree/BreakpointsSimpleTree.java
@@ -0,0 +1,26 @@
+/*
+ * 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.xdebugger.impl.breakpoints.ui.tree;
+
+import com.intellij.ui.treeStructure.Tree;
+
+public class BreakpointsSimpleTree extends Tree {
+  public BreakpointsSimpleTree(BreakpointItemsTreeController controller) {
+    super(controller.getRoot());
+    setCellRenderer(new BreakpointsTreeCellRenderer.BreakpointsSimpleTreeCellRenderer());
+    setRootVisible(false);
+  }
+}
diff --git a/platform/xdebugger-impl/src/com/intellij/xdebugger/impl/breakpoints/ui/tree/BreakpointsTreeCellRenderer.java b/platform/xdebugger-impl/src/com/intellij/xdebugger/impl/breakpoints/ui/tree/BreakpointsTreeCellRenderer.java
new file mode 100644
index 000000000000..0878e291903d
--- /dev/null
+++ b/platform/xdebugger-impl/src/com/intellij/xdebugger/impl/breakpoints/ui/tree/BreakpointsTreeCellRenderer.java
@@ -0,0 +1,67 @@
+/*
+ * 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.xdebugger.impl.breakpoints.ui.tree;
+
+import com.intellij.ui.CheckboxTree;
+import com.intellij.ui.ColoredTreeCellRenderer;
+import com.intellij.ui.SimpleTextAttributes;
+import com.intellij.xdebugger.breakpoints.ui.BreakpointItem;
+import com.intellij.xdebugger.breakpoints.ui.XBreakpointGroup;
+
+import javax.swing.*;
+
+class BreakpointsTreeCellRenderer  {
+  private static void customizeRenderer(JTree tree,
+                                       Object value,
+                                       boolean selected,
+                                       boolean expanded,
+                                       boolean leaf,
+                                       int row,
+                                       boolean hasFocus,
+                                       ColoredTreeCellRenderer renderer) {
+    if (value instanceof BreakpointItemNode) {
+      BreakpointItemNode node = (BreakpointItemNode)value;
+      BreakpointItem breakpoint = node.getBreakpointItem();
+      breakpoint.setupRenderer(renderer);
+    }
+    else if (value instanceof BreakpointsGroupNode) {
+      XBreakpointGroup group = ((BreakpointsGroupNode)value).getGroup();
+      renderer.setIcon(group.getIcon(expanded));
+      renderer.append(group.getName(), SimpleTextAttributes.SIMPLE_CELL_ATTRIBUTES);
+    }
+  }
+
+  public static class BreakpointsCheckboxTreeCellRenderer extends CheckboxTree.CheckboxTreeCellRenderer {
+    @Override
+    public void customizeRenderer(JTree tree, Object value, boolean selected, boolean expanded, boolean leaf, int row, boolean hasFocus) {
+      BreakpointsTreeCellRenderer.customizeRenderer(tree, value, selected, expanded, leaf, row, hasFocus, getTextRenderer());
+    }
+  }
+
+  public static class BreakpointsSimpleTreeCellRenderer extends ColoredTreeCellRenderer {
+
+    @Override
+    public void customizeCellRenderer(JTree tree,
+                                      Object value,
+                                      boolean selected,
+                                      boolean expanded,
+                                      boolean leaf,
+                                      int row,
+                                      boolean hasFocus) {
+      BreakpointsTreeCellRenderer.customizeRenderer(tree, value, selected, expanded, leaf, row, hasFocus, this);
+    }
+  }
+}
diff --git a/plugins/InspectionGadgets/src/com/siyeh/ig/j2me/SimplifiableIfStatementInspection.java b/plugins/InspectionGadgets/src/com/siyeh/ig/j2me/SimplifiableIfStatementInspection.java
index 0c01d1fcb0e2..c490e76bdce1 100644
--- a/plugins/InspectionGadgets/src/com/siyeh/ig/j2me/SimplifiableIfStatementInspection.java
+++ b/plugins/InspectionGadgets/src/com/siyeh/ig/j2me/SimplifiableIfStatementInspection.java
@@ -17,6 +17,7 @@ package com.siyeh.ig.j2me;
 
 import com.intellij.codeInspection.ProblemDescriptor;
 import com.intellij.openapi.project.Project;
+import com.intellij.openapi.util.text.StringUtil;
 import com.intellij.psi.*;
 import com.intellij.psi.tree.IElementType;
 import com.intellij.psi.util.PsiTreeUtil;
@@ -53,7 +54,8 @@ public class SimplifiableIfStatementInspection extends BaseInspection {
   @NotNull
   public String buildErrorString(Object... infos) {
     final PsiIfStatement statement = (PsiIfStatement)infos[0];
-    return InspectionGadgetsBundle.message("simplifiable.if.statement.problem.descriptor", calculateReplacementStatement(statement));
+    return InspectionGadgetsBundle.message("simplifiable.if.statement.problem.descriptor", 
+                                           StringUtil.escapeXml(calculateReplacementStatement(statement)));
   }
 
   @Nullable
diff --git a/plugins/IntentionPowerPak/src/com/siyeh/ipp/trivialif/ReplaceIfWithConditionalIntention.java b/plugins/IntentionPowerPak/src/com/siyeh/ipp/trivialif/ReplaceIfWithConditionalIntention.java
index faa30fd258d9..fb1bbd251bb5 100644
--- a/plugins/IntentionPowerPak/src/com/siyeh/ipp/trivialif/ReplaceIfWithConditionalIntention.java
+++ b/plugins/IntentionPowerPak/src/com/siyeh/ipp/trivialif/ReplaceIfWithConditionalIntention.java
@@ -170,11 +170,14 @@ public class ReplaceIfWithConditionalIntention extends Intention {
                                            PsiExpression elseValue,
                                            PsiType requiredType) {
     condition = ParenthesesUtils.stripParentheses(condition);
-    thenValue = PsiDiamondTypeUtil.expandTopLevelDiamondsInside(ParenthesesUtils.stripParentheses(thenValue));
+    thenValue = ParenthesesUtils.stripParentheses(thenValue);
+    elseValue = ParenthesesUtils.stripParentheses(elseValue);
+
+    thenValue = expandDiamondsWhenNeeded(thenValue, requiredType);
     if (thenValue == null) {
       return null;
     }
-    elseValue = PsiDiamondTypeUtil.expandTopLevelDiamondsInside(ParenthesesUtils.stripParentheses(elseValue));
+    elseValue = expandDiamondsWhenNeeded(elseValue, requiredType);
     if (elseValue == null) {
       return null;
     }
@@ -217,6 +220,15 @@ public class ReplaceIfWithConditionalIntention extends Intention {
     return conditional.toString();
   }
 
+  private static PsiExpression expandDiamondsWhenNeeded(PsiExpression thenValue, PsiType requiredType) {
+    if (thenValue instanceof PsiNewExpression) {
+      if (!PsiDiamondTypeUtil.canChangeContextForDiamond((PsiNewExpression)thenValue, requiredType)) {
+        return PsiDiamondTypeUtil.expandTopLevelDiamondsInside(thenValue);
+      }
+    }
+    return thenValue;
+  }
+
   private static String getExpressionText(PsiExpression expression) {
     if (ParenthesesUtils.getPrecedence(expression) <=
         ParenthesesUtils.CONDITIONAL_PRECEDENCE) {
diff --git a/plugins/IntentionPowerPak/test/com/siyeh/ipp/trivialif/replaceIfWithConditional/ReplaceableAssignmentsWithDiamondsLeave.java b/plugins/IntentionPowerPak/test/com/siyeh/ipp/trivialif/replaceIfWithConditional/ReplaceableAssignmentsWithDiamondsLeave.java
new file mode 100644
index 000000000000..47b35995ff25
--- /dev/null
+++ b/plugins/IntentionPowerPak/test/com/siyeh/ipp/trivialif/replaceIfWithConditional/ReplaceableAssignmentsWithDiamondsLeave.java
@@ -0,0 +1,17 @@
+public class TestCompletion {
+
+  public static <T, V> ParallelPipeline<T, V> test(T base, V newStage, T upstream) {
+    if <caret>(base != null) {
+      return new ParallelPipeline<>(base, newStage);
+    }
+    else {
+      return new ParallelPipeline<>(upstream, newStage);
+    }
+  }
+
+  private static class ParallelPipeline<T, V> {
+    public ParallelPipeline(T p0, V p1) {
+    }
+  }
+}
+
diff --git a/plugins/IntentionPowerPak/test/com/siyeh/ipp/trivialif/replaceIfWithConditional/ReplaceableAssignmentsWithDiamondsLeave_after.java b/plugins/IntentionPowerPak/test/com/siyeh/ipp/trivialif/replaceIfWithConditional/ReplaceableAssignmentsWithDiamondsLeave_after.java
new file mode 100644
index 000000000000..a11449b495b4
--- /dev/null
+++ b/plugins/IntentionPowerPak/test/com/siyeh/ipp/trivialif/replaceIfWithConditional/ReplaceableAssignmentsWithDiamondsLeave_after.java
@@ -0,0 +1,12 @@
+public class TestCompletion {
+
+  public static <T, V> ParallelPipeline<T, V> test(T base, V newStage, T upstream) {
+      return base != null ? new ParallelPipeline<>(base, newStage) : new ParallelPipeline<>(upstream, newStage);
+  }
+
+  private static class ParallelPipeline<T, V> {
+    public ParallelPipeline(T p0, V p1) {
+    }
+  }
+}
+
diff --git a/plugins/IntentionPowerPak/testSrc/com/siyeh/ipp/trivialif/ReplaceIfWithConditionalIntentionTest.java b/plugins/IntentionPowerPak/testSrc/com/siyeh/ipp/trivialif/ReplaceIfWithConditionalIntentionTest.java
index f4a51a62f53e..9cbfe40f0d35 100644
--- a/plugins/IntentionPowerPak/testSrc/com/siyeh/ipp/trivialif/ReplaceIfWithConditionalIntentionTest.java
+++ b/plugins/IntentionPowerPak/testSrc/com/siyeh/ipp/trivialif/ReplaceIfWithConditionalIntentionTest.java
@@ -28,6 +28,10 @@ public class ReplaceIfWithConditionalIntentionTest extends IPPTestCase {
     doTest();
   }
 
+  public void testReplaceableAssignmentsWithDiamondsLeave() {
+    doTest();
+  }
+
   @Override
   protected String getIntentionName() {
     return IntentionPowerPackBundle.message("replace.if.with.conditional.intention.name");
diff --git a/plugins/android-designer/src/com/intellij/android/designer/model/morphing/GridLayout.java b/plugins/android-designer/src/com/intellij/android/designer/model/morphing/GridLayout.java
index 2d106bad3b54..c21b4664ffcb 100644
--- a/plugins/android-designer/src/com/intellij/android/designer/model/morphing/GridLayout.java
+++ b/plugins/android-designer/src/com/intellij/android/designer/model/morphing/GridLayout.java
@@ -16,6 +16,7 @@
 package com.intellij.android.designer.model.morphing;
 
 import com.intellij.android.designer.model.*;
+import com.intellij.android.designer.model.grid.GridInfo;
 import com.intellij.android.designer.model.layout.grid.RadGridLayoutComponent;
 import com.intellij.android.designer.model.layout.table.RadTableLayout;
 import com.intellij.android.designer.model.layout.table.RadTableLayoutComponent;
@@ -24,24 +25,30 @@ import com.intellij.designer.model.RadComponent;
 import com.intellij.psi.xml.XmlAttribute;
 import com.intellij.psi.xml.XmlTag;
 
+import java.awt.*;
+import java.util.ArrayList;
+import java.util.List;
+
 /**
  * @author Alexander Lobas
  */
 public class GridLayout {
   public static RadViewComponent TableLayout(RadViewComponent component, MetaModel target) throws Exception {
-    final RadComponent[][] components = ((RadGridLayoutComponent)component).getGridComponents(false);
+    final List<RadComponent>[][] components = getGridComponents((RadGridLayoutComponent)component);
     final MetaModel tableRowModel = ViewsMetaManager.getInstance(component.getTag().getProject()).getModelByTag("TableRow");
 
     return new ComponentMorphingTool(component, new RadTableLayoutComponent(), target, new RadTableLayout()) {
       @Override
       protected void convertChildren() throws Exception {
-        for (RadComponent[] rowComponents : components) {
+        for (List<RadComponent>[] rowComponents : components) {
           RadViewComponent newRowComponent = ModelParser.createComponent(null, tableRowModel);
           ModelParser.addComponent(myNewComponent, newRowComponent, null);
 
-          for (RadComponent cellComponent : rowComponents) {
-            if (cellComponent != null) {
-              ModelParser.moveComponent(newRowComponent, (RadViewComponent)cellComponent, null);
+          for (List<RadComponent> cellComponents : rowComponents) {
+            if (cellComponents != null) {
+              for (RadComponent cellComponent : cellComponents) {
+                ModelParser.moveComponent(newRowComponent, (RadViewComponent)cellComponent, null);
+              }
             }
           }
         }
@@ -72,4 +79,21 @@ public class GridLayout {
       }
     }.result();
   }
+
+  private static List<RadComponent>[][] getGridComponents(RadGridLayoutComponent parent) {
+    GridInfo gridInfo = parent.getGridInfo();
+    List<RadComponent>[][] components = new List[gridInfo.rowCount][gridInfo.columnCount];
+
+    for (RadComponent child : parent.getChildren()) {
+      Rectangle cellInfo = RadGridLayoutComponent.getCellInfo(child);
+      List<RadComponent> cellComponents = components[cellInfo.y][cellInfo.x];
+      if (cellComponents == null) {
+        cellComponents = new ArrayList<RadComponent>();
+        components[cellInfo.y][cellInfo.x] = cellComponents;
+      }
+      cellComponents.add(child);
+    }
+
+    return components;
+  }
 }
\ No newline at end of file
diff --git a/plugins/cvs/cvs-plugin/src/com/intellij/cvsSupport2/config/ui/CvsListCellRenderer.java b/plugins/cvs/cvs-plugin/src/com/intellij/cvsSupport2/config/ui/CvsListCellRenderer.java
index fbf80a581f47..6be60f9e79ab 100644
--- a/plugins/cvs/cvs-plugin/src/com/intellij/cvsSupport2/config/ui/CvsListCellRenderer.java
+++ b/plugins/cvs/cvs-plugin/src/com/intellij/cvsSupport2/config/ui/CvsListCellRenderer.java
@@ -25,7 +25,7 @@ import javax.swing.*;
  */
 
 public class CvsListCellRenderer extends AbstractListCellRenderer {
-  private static final Icon ICON = AllIcons.Actions.Cvs;
+  private static final Icon ICON = AllIcons.Providers.Cvs;
 
   protected Icon getPresentableIcon(Object value) {
     if (value == null) return null;
diff --git a/plugins/cvs/cvs-plugin/src/com/intellij/cvsSupport2/ui/CvsTabbedWindow.java b/plugins/cvs/cvs-plugin/src/com/intellij/cvsSupport2/ui/CvsTabbedWindow.java
index e5760a40ea9b..37576f7bcf3a 100644
--- a/plugins/cvs/cvs-plugin/src/com/intellij/cvsSupport2/ui/CvsTabbedWindow.java
+++ b/plugins/cvs/cvs-plugin/src/com/intellij/cvsSupport2/ui/CvsTabbedWindow.java
@@ -108,7 +108,7 @@ public class CvsTabbedWindow {
     ToolWindowManager toolWindowManager = ToolWindowManager.getInstance(myProject);
     ToolWindow toolWindow =
       toolWindowManager.registerToolWindow(ToolWindowId.CVS, myContentManager.getComponent(), ToolWindowAnchor.BOTTOM);
-    toolWindow.setIcon(AllIcons.Actions.Cvs);
+    toolWindow.setIcon(AllIcons.Providers.Cvs);
     toolWindow.installWatcher(myContentManager);
   }
 
diff --git a/plugins/devkit/src/module/PluginModuleType.java b/plugins/devkit/src/module/PluginModuleType.java
index a6099efd6a63..1bc310988075 100644
--- a/plugins/devkit/src/module/PluginModuleType.java
+++ b/plugins/devkit/src/module/PluginModuleType.java
@@ -48,7 +48,7 @@ import java.util.List;
 import java.util.Set;
 
 public class PluginModuleType extends ModuleType<PluginModuleBuilder> {
-  private static final Icon PLUGIN_MODULE_ICON = AllIcons.Modules.PluginModule;
+  private static final Icon PLUGIN_MODULE_ICON = AllIcons.Modules.Types.PluginModule;
   private static final Icon PLUGIN_MODULE_NODE_ICON = AllIcons.Nodes.Plugin;
   private static final Icon ADD_PLUGIN_MODULE_ICON = IconLoader.getIcon("/add_plugin_modulewizard.png");
   @NonNls private static final String ID = "PLUGIN_MODULE";
diff --git a/plugins/git4idea/src/git4idea/update/GitUpdateProcess.java b/plugins/git4idea/src/git4idea/update/GitUpdateProcess.java
index 0602ce75c7cd..f857984995f6 100644
--- a/plugins/git4idea/src/git4idea/update/GitUpdateProcess.java
+++ b/plugins/git4idea/src/git4idea/update/GitUpdateProcess.java
@@ -205,7 +205,7 @@ public class GitUpdateProcess {
       notifyImportantError(myProject, "Error updating " + rootName,
                            "Updating " + rootName + " failed with an error: " + e.getLocalizedMessage());
     } finally {
-      if (incomplete || !!compoundResult.isSuccess()) {
+      if (incomplete || !compoundResult.isSuccess()) {
         mySaver.notifyLocalChangesAreNotRestored();
       }
       else {
diff --git a/plugins/groovy/src/org/jetbrains/plugins/groovy/griffon/GriffonFramework.java b/plugins/groovy/src/org/jetbrains/plugins/groovy/griffon/GriffonFramework.java
index 68a243a46d54..dac9f767412c 100644
--- a/plugins/groovy/src/org/jetbrains/plugins/groovy/griffon/GriffonFramework.java
+++ b/plugins/groovy/src/org/jetbrains/plugins/groovy/griffon/GriffonFramework.java
@@ -18,6 +18,8 @@ package org.jetbrains.plugins.groovy.griffon;
 
 import com.intellij.execution.ExecutionException;
 import com.intellij.execution.configurations.JavaParameters;
+import com.intellij.lang.properties.IProperty;
+import com.intellij.lang.properties.psi.PropertiesFile;
 import com.intellij.openapi.application.AccessToken;
 import com.intellij.openapi.application.WriteAction;
 import com.intellij.openapi.module.Module;
@@ -36,6 +38,8 @@ import com.intellij.openapi.vcs.changes.IgnoredBeanFactory;
 import com.intellij.openapi.vfs.JarFileSystem;
 import com.intellij.openapi.vfs.VfsUtil;
 import com.intellij.openapi.vfs.VirtualFile;
+import com.intellij.psi.PsiFile;
+import com.intellij.psi.PsiManager;
 import gnu.trove.TIntArrayList;
 import org.jetbrains.annotations.NonNls;
 import org.jetbrains.annotations.NotNull;
@@ -49,7 +53,9 @@ import org.jetbrains.plugins.groovy.mvc.MvcProjectStructure;
 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.regex.Matcher;
 import java.util.regex.Pattern;
@@ -246,7 +252,7 @@ public class GriffonFramework extends MvcFramework {
       for (final VirtualFile child : dist.getChildren()) {
         final String name = child.getName();
         if (name.endsWith(".jar")) {
-          if (name.startsWith("griffon-cli-") || name.startsWith("griffon-rt-")) {
+          if (name.startsWith("griffon-cli-") || name.startsWith("griffon-rt-") || name.startsWith("griffon-resources-")) {
             params.getClassPath().add(child);
           }
         }
@@ -296,6 +302,9 @@ public class GriffonFramework extends MvcFramework {
     final String confpath = griffonHomePath + GROOVY_STARTER_CONF;
     params.getVMParametersList().add("-Dgroovy.starter.conf=" + confpath);
 
+    params.getVMParametersList().add(
+      "-Dgroovy.sanitized.stacktraces=\"groovy., org.codehaus.groovy., java., javax., sun., gjdk.groovy., gant., org.codehaus.gant.\"");
+
     params.getProgramParametersList().add("--main");
     params.getProgramParametersList().add("org.codehaus.griffon.cli.GriffonScriptRunner");
     params.getProgramParametersList().add("--conf");
@@ -314,7 +323,7 @@ public class GriffonFramework extends MvcFramework {
     params.getProgramParametersList().add(argsString);
 
     params.setDefaultCharset(module.getProject());
-    
+
     return params;
   }
 
@@ -384,6 +393,24 @@ public class GriffonFramework extends MvcFramework {
     return EP_NAME.findExtension(GriffonFramework.class);
   }
 
+  public VirtualFile getApplicationPropertiesFile(Module module) {
+    final VirtualFile appRoot = findAppRoot(module);
+    return appRoot != null ? appRoot.findChild("application.properties") : null;
+  }
+
+  @Override
+  public String getApplicationName(Module module) {
+    final VirtualFile appProperties = getApplicationPropertiesFile(module);
+    if (appProperties != null) {
+      final PsiFile file = PsiManager.getInstance(module.getProject()).findFile(appProperties);
+      if (file instanceof PropertiesFile) {
+        final IProperty property = ((PropertiesFile)file).findPropertyByKey("application.name");
+        return property != null ? property.getValue() : super.getApplicationName(module);
+      }
+    }
+    return super.getApplicationName(module);
+  }
+
   private static class GriffonProjectStructure extends MvcProjectStructure {
     public GriffonProjectStructure(Module module, final boolean auxModule) {
       super(module, auxModule, getUserHomeGriffon(), GriffonFramework.getInstance().getSdkWorkDir(module));
@@ -395,11 +422,55 @@ public class GriffonFramework extends MvcFramework {
     }
 
     public String[] getSourceFolders() {
-      return new String[]{"griffon-app/controllers", "griffon-app/models", "griffon-app/views", "src/main", "griffon-app/services"};
+      List<String> sourceFolders = new ArrayList<String>();
+
+      for (VirtualFile file : ModuleRootManager.getInstance(myModule).getContentRoots()) {
+        handleSrc(file.findChild("src"), sourceFolders);
+        handleGriffonApp(file.findChild("griffon-app"), sourceFolders);
+        List<GriffonSourceInspector.GriffonSource> sources =
+          GriffonSourceInspector.processModuleMetadata(myModule);
+        for (GriffonSourceInspector.GriffonSource source : sources) {
+          sourceFolders.add(source.getPath());
+        }
+      }
+      return sourceFolders.toArray(new String[sourceFolders.size()]);
+    }
+
+    private void handleGriffonApp(VirtualFile griffonApp, List<String> sourceFolders) {
+      if (griffonApp == null) return;
+      // Add standard artifacts, i.e, models, views, controllers, services, conf, lifecycle
+      for (String child : new String[]{"models", "views", "controllers", "services", "conf", "lifecycle"}) {
+        if (griffonApp.findChild(child) != null) {
+          sourceFolders.add("griffon-app/" + child);
+        }
+      }
+    }
+
+    private void handleSrc(VirtualFile src, List<String> sourceFolders) {
+      if (src == null) return;
+      for (String child : new String[]{"main", "cli"}) {
+        if (src.findChild(child) != null) {
+          sourceFolders.add("src/" + child);
+        }
+      }
+    }
+
+    private void handleTest(VirtualFile test, List<String> sourceFolders) {
+      if (test == null) return;
+      for (String child : new String[]{"unit", "integration", "shared"}) {
+        if (test.findChild(child) != null) {
+          sourceFolders.add("test/" + child);
+        }
+      }
     }
 
     public String[] getTestFolders() {
-      return new String[]{"test/unit", "test/integration"};
+      List<String> sourceFolders = new ArrayList<String>();
+
+      for (VirtualFile file : ModuleRootManager.getInstance(myModule).getContentRoots()) {
+        handleTest(file.findChild("test"), sourceFolders);
+      }
+      return sourceFolders.toArray(new String[sourceFolders.size()]);
     }
 
     public String[] getInvalidSourceFolders() {
diff --git a/plugins/groovy/src/org/jetbrains/plugins/groovy/griffon/GriffonSourceInspector.java b/plugins/groovy/src/org/jetbrains/plugins/groovy/griffon/GriffonSourceInspector.java
new file mode 100644
index 000000000000..ac81fef51829
--- /dev/null
+++ b/plugins/groovy/src/org/jetbrains/plugins/groovy/griffon/GriffonSourceInspector.java
@@ -0,0 +1,250 @@
+/*
+ * 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.groovy.griffon;
+
+import com.intellij.openapi.module.Module;
+import com.intellij.openapi.util.IconLoader;
+import com.intellij.openapi.util.text.StringUtil;
+import com.intellij.openapi.vfs.LocalFileSystem;
+import com.intellij.openapi.vfs.VirtualFile;
+import com.intellij.psi.PsiFile;
+import com.intellij.psi.PsiManager;
+import com.intellij.psi.util.CachedValueProvider;
+import com.intellij.psi.util.CachedValuesManager;
+import com.intellij.psi.xml.XmlAttribute;
+import com.intellij.psi.xml.XmlFile;
+import com.intellij.psi.xml.XmlTag;
+import com.intellij.util.containers.ContainerUtil;
+
+import javax.swing.*;
+import java.io.File;
+import java.util.*;
+
+/**
+ * @author aalmiray
+ */
+public class GriffonSourceInspector {
+  public static List<GriffonSource> processModuleMetadata(final Module module) {
+    return CachedValuesManager.getManager(module.getProject()).getCachedValue(module, new CachedValueProvider<List<GriffonSource>>() {
+      @Override
+      public Result<List<GriffonSource>> compute() {
+        List<GriffonSource> sources = new ArrayList<GriffonSource>();
+        List<VirtualFile> dependencies = new ArrayList<VirtualFile>();
+        ContainerUtil.addIfNotNull(dependencies, GriffonFramework.getInstance().getApplicationPropertiesFile(module));
+        String applicationName = GriffonFramework.getInstance().getApplicationName(module);
+
+        File sdkWorkDir = GriffonFramework.getInstance().getSdkWorkDir(module);
+        // construct $griffonWorkDir/projects/$appName/plugins
+        File pluginsDir = new File(sdkWorkDir, "/projects/" + applicationName + "/plugins/");
+        if (pluginsDir.exists() && pluginsDir.canRead() && pluginsDir.isDirectory()) {
+          //noinspection ConstantConditions
+          for (File pluginDir : pluginsDir.listFiles()) {
+            if (!pluginDir.isDirectory() || !pluginDir.canRead()) continue;
+            File srcIdeSupportDir = new File(pluginDir, "src/ide-support");
+            if (!srcIdeSupportDir.exists() || !srcIdeSupportDir.canRead()) continue;
+            File ideaSupport = new File(srcIdeSupportDir, "idea.xml");
+            VirtualFile ideaMetadata = LocalFileSystem.getInstance().refreshAndFindFileByIoFile(ideaSupport);
+            if (ideaMetadata != null) {
+              dependencies.add(ideaMetadata);
+              PsiFile psiFile = PsiManager.getInstance(module.getProject()).findFile(ideaMetadata);
+              if (psiFile instanceof XmlFile) {
+                XmlTag rootTag = ((XmlFile)psiFile).getRootTag();
+                if (rootTag == null) continue;
+                /*
+                   Metadata file has the following format
+                   <idea-griffon>
+                     <source-root path="src/commons">
+                       <navigation
+                         description="Common Sources"
+                         icon="groovy-icon"
+                         weight="75" />
+                     </source-root>
+                   </idea-griffon>
+                */
+
+                for (XmlTag sourceRootTag : rootTag.findSubTags("source-root")) {
+                  String path = sourceRootTag.getAttributeValue("path");
+                  XmlTag navigationTag = sourceRootTag.findFirstSubTag("navigation");
+                  String description = navigationTag == null ? "" : navigationTag.getAttributeValue("description");
+                  XmlAttribute iconAttr = navigationTag == null ? null : navigationTag.getAttribute("icon");
+                  XmlAttribute weightAttr = navigationTag == null ? null : navigationTag.getAttribute("weight");
+                  String icon = iconAttr != null ? iconAttr.getValue() : "groovy-icon";
+                  int weight = weightAttr != null ? Integer.parseInt(weightAttr.getValue()) : 75;
+
+                  sources.add(new GriffonSource(path, new GriffonSource.Navigation(description, icon, weight)));
+                }
+              }
+            }
+          }
+        }
+        return Result.create(sources, dependencies);
+      }
+    });
+
+  }
+
+  public static class GriffonSource {
+    private final String path;
+    private final Navigation navigation;
+
+    public GriffonSource(String path, Navigation navigation) {
+      this.path = path;
+      this.navigation = navigation;
+    }
+
+    public String getPath() {
+      return path;
+    }
+
+    public Navigation getNavigation() {
+      return navigation;
+    }
+
+    @Override
+    public String toString() {
+      return "GriffonSource{" + "path='" + path + '\'' + ", navigation=" + navigation + '}';
+    }
+
+    @Override
+    public boolean equals(Object o) {
+      if (this == o) return true;
+      if (o == null || getClass() != o.getClass()) return false;
+
+      GriffonSource that = (GriffonSource)o;
+
+      if (!navigation.equals(that.navigation)) return false;
+      if (!path.equals(that.path)) return false;
+
+      return true;
+    }
+
+    @Override
+    public int hashCode() {
+      int result = path.hashCode();
+      result = 31 * result + navigation.hashCode();
+      return result;
+    }
+
+    public static class Navigation {
+      private final String description;
+      private final String icon;
+      private final int weight;
+
+      public Navigation(String description, String icon, int weight) {
+        this.description = getNaturalName(description);
+        this.icon = icon;
+        this.weight = weight;
+      }
+
+      public String getDescription() {
+        return description;
+      }
+
+      public Icon getIcon() {
+        String iconStr = icon.endsWith(".png") ? icon : icon + ".png";
+        if (iconStr.startsWith("/")) {
+          return IconLoader.getIcon(iconStr);
+        }
+        else {
+          return IconLoader.getIcon("/icons/griffon/" + iconStr);
+        }
+      }
+
+      public int getWeight() {
+        return weight;
+      }
+
+      @Override
+      public String toString() {
+        return "Navigation{" + "description='" + description + '\'' + ", icon='" + icon + '\'' + ", weight=" + weight + '}';
+      }
+
+      @Override
+      public boolean equals(Object o) {
+        if (this == o) return true;
+        if (!(o instanceof Navigation)) return false;
+
+        Navigation that = (Navigation)o;
+
+        if (weight != that.weight) return false;
+        if (description != null ? !description.equals(that.description) : that.description != null) return false;
+        if (icon != null ? !icon.equals(that.icon) : that.icon != null) return false;
+
+        return true;
+      }
+
+      @Override
+      public int hashCode() {
+        int result = description != null ? description.hashCode() : 0;
+        result = 31 * result + (icon != null ? icon.hashCode() : 0);
+        result = 31 * result + weight;
+        return result;
+      }
+    }
+  }
+
+  private static String getNaturalName(String name) {
+    name = getShortName(name);
+    List<String> words = new ArrayList<String>();
+    int i = 0;
+    char[] chars = name.toCharArray();
+    for (int j = 0; j < chars.length; j++) {
+      char c = chars[j];
+      String w;
+      if (i >= words.size()) {
+        w = "";
+        words.add(i, w);
+      }
+      else {
+        w = words.get(i);
+      }
+
+      if (Character.isLowerCase(c) || Character.isDigit(c)) {
+        if (Character.isLowerCase(c) && w.length() == 0) {
+          c = Character.toUpperCase(c);
+        }
+        else if (w.length() > 1 && Character.isUpperCase(w.charAt(w.length() - 1))) {
+          w = "";
+          words.add(++i, w);
+        }
+
+        words.set(i, w + c);
+      }
+      else if (Character.isUpperCase(c)) {
+        if ((i == 0 && w.length() == 0) || Character.isUpperCase(w.charAt(w.length() - 1))) {
+          words.set(i, w + c);
+        }
+        else {
+          words.add(++i, String.valueOf(c));
+        }
+      }
+    }
+
+    StringBuilder buf = new StringBuilder();
+    for (Iterator<String> j = words.iterator(); j.hasNext(); ) {
+      String word = j.next();
+      buf.append(word);
+      if (j.hasNext()) {
+        buf.append(' ');
+      }
+    }
+    return buf.toString();
+  }
+
+  private static String getShortName(String className) {
+    return StringUtil.getShortName(className);
+  }
+}
diff --git a/plugins/groovy/src/org/jetbrains/plugins/groovy/griffon/GriffonToolWindowFactory.java b/plugins/groovy/src/org/jetbrains/plugins/groovy/griffon/GriffonToolWindowFactory.java
index d7c0ffa84c13..92e594dccb29 100644
--- a/plugins/groovy/src/org/jetbrains/plugins/groovy/griffon/GriffonToolWindowFactory.java
+++ b/plugins/groovy/src/org/jetbrains/plugins/groovy/griffon/GriffonToolWindowFactory.java
@@ -20,16 +20,20 @@ import com.intellij.ide.projectView.ViewSettings;
 import com.intellij.ide.util.treeView.AbstractTreeNode;
 import com.intellij.openapi.module.Module;
 import com.intellij.openapi.project.Project;
+import com.intellij.openapi.roots.ModuleRootManager;
+import com.intellij.openapi.util.IconLoader;
 import com.intellij.openapi.vfs.VirtualFile;
 import com.intellij.psi.PsiDirectory;
+import com.intellij.psi.PsiFile;
+import com.intellij.psi.PsiManager;
 import com.intellij.util.PlatformIcons;
+import com.intellij.util.containers.hash.LinkedHashMap;
 import org.jetbrains.plugins.groovy.GroovyIcons;
-import org.jetbrains.plugins.groovy.lang.psi.api.statements.typedef.GrTypeDefinition;
-import org.jetbrains.plugins.groovy.mvc.MvcIcons;
 import org.jetbrains.plugins.groovy.mvc.projectView.*;
 
 import javax.swing.*;
 import java.util.List;
+import java.util.Map;
 
 /**
  * @author peter
@@ -42,52 +46,68 @@ public class GriffonToolWindowFactory extends MvcToolWindowDescriptor {
   @Override
   public void fillModuleChildren(List<AbstractTreeNode> result, Module module, ViewSettings viewSettings, VirtualFile root) {
     final Project project = module.getProject();
-    final PsiDirectory domains = findDirectory(project, root, "griffon-app/models");
-    if (domains != null) {
-      result.add(new TopLevelDirectoryNode(module, domains, viewSettings, "Model classes", MvcIcons.DOMAIN_CLASSES_FOLDER, AbstractMvcPsiNodeDescriptor.DOMAIN_CLASSES_FOLDER) {
-        @Override
-        protected AbstractTreeNode createClassNode(final GrTypeDefinition typeDefinition) {
-          return new DomainClassNode(getModule(), typeDefinition, getSettings());
+
+    // process well-known artifact paths
+    for (VirtualFile file : ModuleRootManager.getInstance(module).getSourceRoots()) {
+      PsiDirectory sourceRoot = PsiManager.getInstance(project).findDirectory(file);
+      if (sourceRoot != null) {
+        if ("griffon-app".equals(file.getParent().getName())) {
+          GriffonDirectoryMetadata metadata = DIRECTORY_METADATA.get(file.getName());
+          if (metadata == null) continue;
+          result.add(new TopLevelDirectoryNode(module, sourceRoot, viewSettings, metadata.description, metadata.icon, metadata.weight));
         }
-      });
-    }
-
-    final PsiDirectory conf = findDirectory(project, root, "griffon-app/conf");
-    if (conf != null) {
-      result.add(new TopLevelDirectoryNode(module, conf, viewSettings, "Configuration", MvcIcons.CONFIG_FOLDER, AbstractMvcPsiNodeDescriptor.CONFIG_FOLDER));
-    }
-
-    final PsiDirectory controllers = findDirectory(project, root, "griffon-app/controllers");
-    if (controllers != null) {
-      result.add(new TopLevelDirectoryNode(module, controllers, viewSettings, "Controllers", MvcIcons.CONTROLLERS_FOLDER, AbstractMvcPsiNodeDescriptor.CONTROLLERS_FOLDER));
-    }
-
-    final PsiDirectory services = findDirectory(project, root, "griffon-app/services");
-    if (services != null) {
-      result.add(new TopLevelDirectoryNode(module, services, viewSettings, "Services", MvcIcons.SERVICE, AbstractMvcPsiNodeDescriptor.SERVICES_FOLDER));
-    }
-
-    final PsiDirectory views = findDirectory(project, root, "griffon-app/views");
-    if (views != null) {
-      result.add(new TopLevelDirectoryNode(module, views, viewSettings, "Views", GroovyIcons.GROOVY_ICON_16x16, AbstractMvcPsiNodeDescriptor.VIEWS_FOLDER));
+      }
     }
 
+    // add standard source folder
     final PsiDirectory srcMain = findDirectory(project, root, "src/main");
     if (srcMain != null) {
-      result.add(new TopLevelDirectoryNode(module, srcMain, viewSettings, "Project Sources", GroovyIcons.GROOVY_ICON_16x16, AbstractMvcPsiNodeDescriptor.SRC_FOLDERS));
+      result.add(new TopLevelDirectoryNode(module, srcMain, viewSettings, "Project Sources", GroovyIcons.GROOVY_ICON_16x16,
+                                           AbstractMvcPsiNodeDescriptor.SRC_FOLDERS));
+    }
+    final PsiDirectory srcCli = findDirectory(project, root, "src/cli");
+    if (srcCli != null) {
+      result.add(new TopLevelDirectoryNode(module, srcCli, viewSettings, "Build Sources", GroovyIcons.GROOVY_ICON_16x16,
+                                           AbstractMvcPsiNodeDescriptor.SRC_FOLDERS));
     }
 
+    // add standard test sources
     final PsiDirectory testsUnit = findDirectory(project, root, "test/unit");
     if (testsUnit != null) {
-      result.add(new TestsTopLevelDirectoryNode(module, testsUnit, viewSettings, "Unit Tests", PlatformIcons.TEST_SOURCE_FOLDER,
-                                                PlatformIcons.TEST_SOURCE_FOLDER));
+      result.add(
+        new TestsTopLevelDirectoryNode(module, testsUnit, viewSettings, "Unit Tests", PlatformIcons.TEST_SOURCE_FOLDER, PlatformIcons.TEST_SOURCE_FOLDER));
     }
-
     final PsiDirectory testsIntegration = findDirectory(project, root, "test/integration");
     if (testsIntegration != null) {
       result.add(new TestsTopLevelDirectoryNode(module, testsIntegration, viewSettings, "Integration Tests", PlatformIcons.TEST_SOURCE_FOLDER,
                                                 PlatformIcons.TEST_SOURCE_FOLDER));
     }
+    final PsiDirectory testsShared = findDirectory(project, root, "test/shared");
+    if (testsShared != null) {
+      result.add(new TestsTopLevelDirectoryNode(module, testsShared, viewSettings, "Shared Test Sources", PlatformIcons.TEST_SOURCE_FOLDER,
+                                                PlatformIcons.TEST_SOURCE_FOLDER));
+    }
+
+    // add additional sources provided by plugins
+    for (VirtualFile file : ModuleRootManager.getInstance(module).getContentRoots()) {
+      List<GriffonSourceInspector.GriffonSource> sources = GriffonSourceInspector.processModuleMetadata(module);
+      for (GriffonSourceInspector.GriffonSource source : sources) {
+        final PsiDirectory dir = findDirectory(project, file, source.getPath());
+        if (dir != null) {
+          result.add(
+            new TopLevelDirectoryNode(module, dir, viewSettings, source.getNavigation().getDescription(), source.getNavigation().getIcon(),
+                                      source.getNavigation().getWeight()));
+        }
+      }
+    }
+
+    final VirtualFile applicationPropertiesFile = GriffonFramework.getInstance().getApplicationPropertiesFile(module);
+    if (applicationPropertiesFile != null) {
+      PsiFile appProperties = PsiManager.getInstance(module.getProject()).findFile(applicationPropertiesFile);
+      if (appProperties != null) {
+        result.add(new FileNode(module, appProperties, null, viewSettings));
+      }
+    }
   }
 
   @Override
@@ -95,5 +115,30 @@ public class GriffonToolWindowFactory extends MvcToolWindowDescriptor {
     return GriffonFramework.GRIFFON_ICON;
   }
 
+  private static final Map<String, GriffonDirectoryMetadata> DIRECTORY_METADATA = new LinkedHashMap<String, GriffonDirectoryMetadata>();
 
+  static {
+    DIRECTORY_METADATA.put("models", new GriffonDirectoryMetadata("Models", loadIcon("folder-models"), 20));
+    DIRECTORY_METADATA.put("views", new GriffonDirectoryMetadata("Views", loadIcon("folder-views"), 30));
+    DIRECTORY_METADATA.put("controllers", new GriffonDirectoryMetadata("Controllers", loadIcon("folder-controllers"), 40));
+    DIRECTORY_METADATA.put("services", new GriffonDirectoryMetadata("Services", loadIcon("folder-services"), 50));
+    DIRECTORY_METADATA.put("lifecycle", new GriffonDirectoryMetadata("Lifecycle", loadIcon("folder-lifecycle"), 60));
+    DIRECTORY_METADATA.put("conf", new GriffonDirectoryMetadata("Configuration", loadIcon("folder-conf"), 65));
+  }
+
+  private static Icon loadIcon(String name) {
+    return IconLoader.getIcon("/icons/griffon/" + name + ".png");
+  }
+
+  private static class GriffonDirectoryMetadata {
+    public final String description;
+    public final Icon icon;
+    public final int weight;
+
+    public GriffonDirectoryMetadata(String description, Icon icon, int weight) {
+      this.description = description;
+      this.icon = icon;
+      this.weight = weight;
+    }
+  }
 }
diff --git a/plugins/groovy/src/org/jetbrains/plugins/groovy/lang/psi/dataFlow/DFAEngine.java b/plugins/groovy/src/org/jetbrains/plugins/groovy/lang/psi/dataFlow/DFAEngine.java
index 0db8157ec869..cd8007094452 100644
--- a/plugins/groovy/src/org/jetbrains/plugins/groovy/lang/psi/dataFlow/DFAEngine.java
+++ b/plugins/groovy/src/org/jetbrains/plugins/groovy/lang/psi/dataFlow/DFAEngine.java
@@ -15,6 +15,7 @@
  */
 package org.jetbrains.plugins.groovy.lang.psi.dataFlow;
 
+import com.intellij.codeInspection.dataFlow.DataFlowRunner;
 import com.intellij.openapi.progress.ProgressManager;
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;
@@ -23,13 +24,15 @@ import org.jetbrains.plugins.groovy.lang.psi.controlFlow.CallInstruction;
 import org.jetbrains.plugins.groovy.lang.psi.controlFlow.ControlFlowBuilderUtil;
 import org.jetbrains.plugins.groovy.lang.psi.controlFlow.Instruction;
 
+import java.lang.management.ManagementFactory;
+import java.lang.management.ThreadMXBean;
 import java.util.*;
 
 /**
  * @author ven
  */
 public class DFAEngine<E> {
-  private static final long ourTimeLimit = 1000;
+  private static final long ourTimeLimit = DataFlowRunner.ourTimeLimit;
 
   private final Instruction[] myFlow;
 
@@ -75,7 +78,8 @@ public class DFAEngine<E> {
 
   @Nullable
   private ArrayList<E> performDFA(boolean timeout) {
-    long startTime = System.currentTimeMillis();
+    ThreadMXBean tm = ManagementFactory.getThreadMXBean();
+    long startTime = tm.getCurrentThreadUserTime();
 
     ArrayList<E> info = new ArrayList<E>(myFlow.length);
     CallEnvironment env = new MyCallEnvironment(myFlow.length);
@@ -97,7 +101,7 @@ public class DFAEngine<E> {
         visited[instr.num()] = true;
 
         while (!workList.isEmpty()) {
-          if (timeout && System.currentTimeMillis() - startTime > ourTimeLimit) return null;
+          if (timeout && tm.getCurrentThreadUserTime() - startTime > ourTimeLimit) return null;
 
           ProgressManager.checkCanceled();
           final Instruction curr = workList.remove();
diff --git a/plugins/groovy/src/org/jetbrains/plugins/groovy/mvc/MvcFramework.java b/plugins/groovy/src/org/jetbrains/plugins/groovy/mvc/MvcFramework.java
index 5af78e09db0f..83e7f3b66509 100644
--- a/plugins/groovy/src/org/jetbrains/plugins/groovy/mvc/MvcFramework.java
+++ b/plugins/groovy/src/org/jetbrains/plugins/groovy/mvc/MvcFramework.java
@@ -504,10 +504,16 @@ public abstract class MvcFramework {
     final File grailsWorkDir = getSdkWorkDir(module);
     if (grailsWorkDir == null) return null;
 
+    final String applicationName = getApplicationName(module);
+    if (applicationName == null) return null;
+
+    return new File(grailsWorkDir, "projects/" + applicationName + "/plugins");
+  }
+
+  public String getApplicationName(Module module) {
     final VirtualFile root = findAppRoot(module);
     if (root == null) return null;
-
-    return new File(grailsWorkDir, "projects/" + root.getName() + "/plugins");
+    return root.getName();
   }
 
   protected abstract String getCommonPluginSuffix();
diff --git a/plugins/groovy/src/org/jetbrains/plugins/groovy/mvc/MvcProjectStructure.java b/plugins/groovy/src/org/jetbrains/plugins/groovy/mvc/MvcProjectStructure.java
index 362ff85dc872..7a5ac5781bf1 100644
--- a/plugins/groovy/src/org/jetbrains/plugins/groovy/mvc/MvcProjectStructure.java
+++ b/plugins/groovy/src/org/jetbrains/plugins/groovy/mvc/MvcProjectStructure.java
@@ -32,23 +32,22 @@ public abstract class MvcProjectStructure {
   protected final Module myModule;
   private final boolean myAuxModule;
   private final String myUserHomeSdkRoot;
-  private final String mySdkWorkDir;
+  private final String mySdkWorkDirPath;
 
   public MvcProjectStructure(Module module, boolean auxModule, String userHomeSdkRoot, final File sdkWorkDir) {
     myAuxModule = auxModule;
     myModule = module;
     myUserHomeSdkRoot = userHomeSdkRoot;
     final VirtualFile sdkWorkDirVFile = MvcModuleStructureUtil.refreshAndFind(sdkWorkDir);
-    mySdkWorkDir = sdkWorkDirVFile == null ? "" : sdkWorkDirVFile.getPath() + "/";
+    mySdkWorkDirPath = sdkWorkDirVFile == null ? "" : sdkWorkDirVFile.getPath() + "/";
   }
 
-
   public boolean isValidContentRoot(@NotNull VirtualFile file) {
     if (file.getPath().startsWith(myUserHomeSdkRoot)) {
       if (!myAuxModule) {
         return false;
       }
-      if (!file.getPath().startsWith(mySdkWorkDir)) {
+      if (!file.getPath().startsWith(mySdkWorkDirPath)) {
         return false;
       }
     }
diff --git a/plugins/groovy/src/org/jetbrains/plugins/groovy/mvc/projectView/TopLevelDirectoryNode.java b/plugins/groovy/src/org/jetbrains/plugins/groovy/mvc/projectView/TopLevelDirectoryNode.java
index 407303011dc7..571beead4c35 100644
--- a/plugins/groovy/src/org/jetbrains/plugins/groovy/mvc/projectView/TopLevelDirectoryNode.java
+++ b/plugins/groovy/src/org/jetbrains/plugins/groovy/mvc/projectView/TopLevelDirectoryNode.java
@@ -18,6 +18,7 @@ package org.jetbrains.plugins.groovy.mvc.projectView;
 import com.intellij.ide.projectView.ViewSettings;
 import com.intellij.ide.projectView.PresentationData;
 import com.intellij.openapi.module.Module;
+import com.intellij.openapi.util.Comparing;
 import com.intellij.psi.PsiDirectory;
 import org.jetbrains.annotations.NotNull;
 
@@ -41,6 +42,11 @@ public class TopLevelDirectoryNode extends AbstractFolderNode {
     myIcon = icon;
   }
 
+  @Override
+  public boolean equals(Object object) {
+    return super.equals(object) && Comparing.equal(myTitle, ((TopLevelDirectoryNode) object).myTitle);
+  }
+
   @Override
   protected void updateImpl(PresentationData data) {
     data.setPresentableText(myTitle);
diff --git a/plugins/groovy/test/org/jetbrains/plugins/groovy/refactoring/copy/GroovyCopyClassTest.groovy b/plugins/groovy/test/org/jetbrains/plugins/groovy/refactoring/copy/GroovyCopyClassTest.groovy
index c497fda75130..0e5a7605e992 100644
--- a/plugins/groovy/test/org/jetbrains/plugins/groovy/refactoring/copy/GroovyCopyClassTest.groovy
+++ b/plugins/groovy/test/org/jetbrains/plugins/groovy/refactoring/copy/GroovyCopyClassTest.groovy
@@ -60,6 +60,6 @@ public class GroovyCopyClassTest extends LightCodeInsightFixtureTestCase {
     def psiFile = myFixture.psiManager.findFile(file)
     //would be copied as file
     assertFalse(CopyClassesHandler.canCopyClass(myFixture.javaFacade.findClass("foo.$testName", GlobalSearchScope.allScope(project))));
-    assertTrue(CopyClassesHandler.canCopyClass(psiFile));
+    assertFalse(CopyClassesHandler.canCopyClass(psiFile));
   }
 }
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 1cca2564225f..96b31a81b7c2 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
@@ -44,7 +44,7 @@ import java.util.List;
 import java.util.Map;
 
 public class MavenModuleBuilder extends ModuleBuilder implements SourcePathsBuilder {
-  private static final Icon BIG_ICON = AllIcons.Modules.JavaModule;
+  private static final Icon BIG_ICON = AllIcons.Modules.Types.JavaModule;
 
   private MavenProject myAggregatorProject;
   private MavenProject myParentProject;
diff --git a/plugins/tasks/tasks-core/src/com/intellij/tasks/actions/SwitchTaskCombo.java b/plugins/tasks/tasks-core/src/com/intellij/tasks/actions/SwitchTaskCombo.java
index 8b7135769d4c..300981ef56ea 100644
--- a/plugins/tasks/tasks-core/src/com/intellij/tasks/actions/SwitchTaskCombo.java
+++ b/plugins/tasks/tasks-core/src/com/intellij/tasks/actions/SwitchTaskCombo.java
@@ -21,7 +21,7 @@ import com.intellij.openapi.actionSystem.*;
 import com.intellij.openapi.actionSystem.ex.ComboBoxAction;
 import com.intellij.openapi.project.DumbAware;
 import com.intellij.openapi.project.Project;
-import com.intellij.openapi.ui.popup.ListPopup;
+import com.intellij.openapi.ui.popup.JBPopup;
 import com.intellij.openapi.util.Comparing;
 import com.intellij.openapi.util.Key;
 import com.intellij.openapi.util.text.StringUtil;
@@ -65,7 +65,7 @@ public class SwitchTaskCombo extends ComboBoxAction implements DumbAware {
       }
 
       @Override
-      protected ListPopup createPopup(Runnable onDispose) {
+      protected JBPopup createPopup(Runnable onDispose) {
         return SwitchTaskAction.createPopup(DataManager.getInstance().getDataContext(this), onDispose, false);
       }
     };
diff --git a/plugins/ui-designer/src/com/intellij/uiDesigner/designSurface/GuiEditor.java b/plugins/ui-designer/src/com/intellij/uiDesigner/designSurface/GuiEditor.java
index e829de30dae4..6e59ddc09207 100644
--- a/plugins/ui-designer/src/com/intellij/uiDesigner/designSurface/GuiEditor.java
+++ b/plugins/ui-designer/src/com/intellij/uiDesigner/designSurface/GuiEditor.java
@@ -1137,8 +1137,15 @@ public final class GuiEditor extends JPanel implements DataProvider {
     }
 
     public void run() {
+      if (myModule.isDisposed()) {
+        return;
+      }
+      Project project = myModule.getProject();
+      if (project.isDisposed()) {
+        return;
+      }
       LOG.debug("Synchronizing GUI editor " + myFile.getName() + " to document");
-      PsiDocumentManager.getInstance(myModule.getProject()).commitDocument(myDocument);
+      PsiDocumentManager.getInstance(project).commitDocument(myDocument);
       readFromFile(myKeepSelection);
     }
   }
diff --git a/plugins/ui-designer/ui-designer-new/src/com/intellij/designer/actions/AbstractComboBoxAction.java b/plugins/ui-designer/ui-designer-new/src/com/intellij/designer/actions/AbstractComboBoxAction.java
index 90cc87f7926f..6528a310515a 100644
--- a/plugins/ui-designer/ui-designer-new/src/com/intellij/designer/actions/AbstractComboBoxAction.java
+++ b/plugins/ui-designer/ui-designer-new/src/com/intellij/designer/actions/AbstractComboBoxAction.java
@@ -20,6 +20,7 @@ import com.intellij.openapi.actionSystem.AnActionEvent;
 import com.intellij.openapi.actionSystem.DefaultActionGroup;
 import com.intellij.openapi.actionSystem.Presentation;
 import com.intellij.openapi.actionSystem.ex.ComboBoxAction;
+import com.intellij.openapi.ui.popup.JBPopup;
 import com.intellij.openapi.ui.popup.JBPopupFactory;
 import com.intellij.openapi.ui.popup.ListPopup;
 import com.intellij.util.PlatformIcons;
@@ -85,7 +86,7 @@ public abstract class AbstractComboBoxAction<T> extends ComboBoxAction {
     if (myShowDisabledActions) {
       return new ComboBoxButton(presentation) {
         @Override
-        protected ListPopup createPopup(Runnable onDispose) {
+        protected JBPopup createPopup(Runnable onDispose) {
           ListPopup popup = JBPopupFactory.getInstance().createActionGroupPopup(
             null, createPopupActionGroup(this), getDataContext(), JBPopupFactory.ActionSelectionAid.SPEEDSEARCH, true, onDispose,
             getMaxRows());
diff --git a/plugins/ui-designer/ui-designer-new/src/com/intellij/designer/propertyTable/actions/ShowExpert.java b/plugins/ui-designer/ui-designer-new/src/com/intellij/designer/propertyTable/actions/ShowExpert.java
index 3348c8f88736..d355dfdae8bb 100644
--- a/plugins/ui-designer/ui-designer-new/src/com/intellij/designer/propertyTable/actions/ShowExpert.java
+++ b/plugins/ui-designer/ui-designer-new/src/com/intellij/designer/propertyTable/actions/ShowExpert.java
@@ -17,15 +17,20 @@ package com.intellij.designer.propertyTable.actions;
 
 import com.intellij.designer.DesignerBundle;
 import com.intellij.designer.propertyTable.PropertyTable;
+import com.intellij.openapi.actionSystem.ActionPlaces;
 import com.intellij.openapi.actionSystem.AnActionEvent;
 import com.intellij.openapi.actionSystem.Presentation;
 import com.intellij.openapi.actionSystem.ToggleAction;
 import com.intellij.openapi.util.IconLoader;
 
+import javax.swing.*;
+
 /**
  * @author Alexander Lobas
  */
 public class ShowExpert extends ToggleAction {
+  private static final Icon ICON = IconLoader.getIcon("/com/intellij/designer/icons/filter.png");
+
   private final PropertyTable myTable;
 
   public ShowExpert(PropertyTable table) {
@@ -35,7 +40,20 @@ public class ShowExpert extends ToggleAction {
     String text = DesignerBundle.message("designer.properties.show.expert");
     presentation.setText(text);
     presentation.setDescription(text);
-    presentation.setIcon(IconLoader.getIcon("/com/intellij/designer/icons/filter.png"));
+    presentation.setIcon(ICON);
+  }
+
+  @Override
+  public void update(AnActionEvent e) {
+    super.update(e);
+
+    Presentation presentation = e.getPresentation();
+    if (ActionPlaces.GUI_DESIGNER_PROPERTY_INSPECTOR_POPUP.equals(e.getPlace())) {
+      presentation.setIcon(null);
+    }
+    else {
+      presentation.setIcon(ICON);
+    }
   }
 
   @Override
@@ -46,5 +64,8 @@ public class ShowExpert extends ToggleAction {
   @Override
   public void setSelected(AnActionEvent e, boolean state) {
     myTable.showExpert(state);
+    if (ActionPlaces.GUI_DESIGNER_PROPERTY_INSPECTOR_POPUP.equals(e.getPlace())) {
+      getTemplatePresentation().putClientProperty(SELECTED_PROPERTY, state);
+    }
   }
 }
\ No newline at end of file
diff --git a/resources-en/src/intentionDescriptions/EncapsulateFieldAction/after.java.template b/resources-en/src/intentionDescriptions/EncapsulateFieldAction/after.java.template
new file mode 100644
index 000000000000..d791754be04a
--- /dev/null
+++ b/resources-en/src/intentionDescriptions/EncapsulateFieldAction/after.java.template
@@ -0,0 +1,21 @@
+class A {
+  public int field;
+
+  public int getField() {
+      return field;
+  }
+
+  public void setField(int field) {
+      this.field = field;
+  }
+}
+
+class B {
+  void method() {
+    A a = new A();
+
+    a.setField(0);
+    int i = a.getField();
+  }
+}
+
diff --git a/resources-en/src/intentionDescriptions/EncapsulateFieldAction/before.java.template b/resources-en/src/intentionDescriptions/EncapsulateFieldAction/before.java.template
new file mode 100644
index 000000000000..e14450436351
--- /dev/null
+++ b/resources-en/src/intentionDescriptions/EncapsulateFieldAction/before.java.template
@@ -0,0 +1,12 @@
+class A {
+  public int field;
+}
+
+class B {
+  void method() {
+    A a = new A();
+
+    a.<spot>field</spot> = 0;
+    int b = a.field;
+  }
+}
diff --git a/resources-en/src/intentionDescriptions/EncapsulateFieldAction/description.html b/resources-en/src/intentionDescriptions/EncapsulateFieldAction/description.html
new file mode 100644
index 000000000000..5e832c04d34f
--- /dev/null
+++ b/resources-en/src/intentionDescriptions/EncapsulateFieldAction/description.html
@@ -0,0 +1,5 @@
+<html>
+<body>
+This intention replaces direct access to field with use of accessor methods.
+</body>
+</html>
\ No newline at end of file
diff --git a/resources/src/META-INF/IdeaPlugin.xml b/resources/src/META-INF/IdeaPlugin.xml
index 50c1395999d8..605a9c3edae4 100644
--- a/resources/src/META-INF/IdeaPlugin.xml
+++ b/resources/src/META-INF/IdeaPlugin.xml
@@ -639,6 +639,10 @@
       <className>com.intellij.codeInsight.intention.impl.IntroduceVariableAction</className>
       <category>Declaration</category>
     </intentionAction>
+    <intentionAction>
+      <className>com.intellij.codeInsight.intention.impl.EncapsulateFieldAction</className>
+      <category>Declaration</category>
+    </intentionAction>
 
     <intentionAction>
       <className>com.intellij.codeInsight.daemon.impl.quickfix.DelegateWithDefaultParamValueIntentionAction</className>