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 8c68f2ddf690..1ee12dd5e8df 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
@@ -1,224 +1,227 @@
-/*
- * Copyright 2004-2005 Alexey Efimov
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package com.intellij.openapi.roots.ui.configuration;
-
-import com.intellij.ProjectTopics;
-import com.intellij.openapi.Disposable;
-import com.intellij.openapi.options.ConfigurationException;
-import com.intellij.openapi.project.ProjectBundle;
-import com.intellij.openapi.projectRoots.Sdk;
-import com.intellij.openapi.roots.*;
-import com.intellij.openapi.roots.impl.storage.ClasspathStorage;
-import com.intellij.openapi.roots.impl.storage.ClasspathStorageProvider;
-import com.intellij.openapi.util.IconLoader;
-import com.intellij.ui.OrderPanelListener;
-import org.jetbrains.annotations.NotNull;
-
-import javax.swing.*;
-import java.awt.*;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-
-/**
- * @author Eugene Zhuravlev
- *         Date: Oct 4, 2003
- *         Time: 6:54:57 PM
- */
-public class ClasspathEditor extends ModuleElementsEditor implements ModuleRootListener {
-  public static final String NAME = ProjectBundle.message("modules.classpath.title");
-  public static final Icon ICON = IconLoader.getIcon("/modules/classpath.png");
-
-  private ClasspathPanel myPanel;
-
-  private ClasspathFormatPanel myClasspathFormatPanel;
-
-  public ClasspathEditor(final ModuleConfigurationState state) {
-    super(state);
-
-    final Disposable disposable = new Disposable() {
-      public void dispose() {}
-    };
-    
-    state.getProject().getMessageBus().connect(disposable).subscribe(ProjectTopics.PROJECT_ROOTS, this);
-    registerDisposable(disposable);
-  }
-
-  public boolean isModified() {
-    return super.isModified() || ( myClasspathFormatPanel != null && myClasspathFormatPanel.isModified());
-  }
-
-  public String getHelpTopic() {
-    return "projectStructure.modules.dependencies";
-  }
-
-  public String getDisplayName() {
-    return NAME;
-  }
-
-  public Icon getIcon() {
-    return ICON;
-  }
-
-  public void saveData() {
-    myPanel.stopEditing();
-    flushChangesToModel();
-  }
-
-  public void apply () throws ConfigurationException {
-    if(myClasspathFormatPanel!=null) {
-      myClasspathFormatPanel.apply();
-    }
-  }
-
-  @Override
-  public void canApply() throws ConfigurationException {
-    super.canApply();
-    if (myClasspathFormatPanel != null) {
-      final String storageID = myClasspathFormatPanel.getSelectedClasspathFormat();
-      ClasspathStorage.getProvider(storageID).assertCompatible(getModel());
-    }
-  }
-
-  public JComponent createComponentImpl() {
-    myPanel = new ClasspathPanel(getState());
-
-    myPanel.addListener(new OrderPanelListener() {
-      public void entryMoved() {
-        flushChangesToModel();
-      }
-    });
-
-    final JPanel panel = new JPanel(new BorderLayout());
-    panel.setBorder(BorderFactory.createEmptyBorder(6, 6, 6, 6));
-    panel.add(myPanel, BorderLayout.CENTER);
-
-    final ModuleJdkConfigurable jdkConfigurable =
-      new ModuleJdkConfigurable(this, ProjectStructureConfigurable.getInstance(myProject).getProjectJdksModel()) {
-        @Override
-        protected ModifiableRootModel getRootModel() {
-          return getState().getRootModel();
-        }
-      };
-    panel.add(jdkConfigurable.createComponent(), BorderLayout.NORTH);
-    jdkConfigurable.reset();
-    registerDisposable(jdkConfigurable);
-
-    List<ClasspathStorageProvider> providers = ClasspathStorage.getProviders();
-    if(providers.size()>1){
-      myClasspathFormatPanel = new ClasspathFormatPanel(providers);
-      panel.add(myClasspathFormatPanel, BorderLayout.SOUTH);
-    }
-
-    return panel;
-  }
-
-  public void flushChangesToModel() {
-    List<OrderEntry> entries = myPanel.getEntries();
-    getModel().rearrangeOrderEntries(entries.toArray(new OrderEntry[entries.size()]));
-  }
-
-  public void selectOrderEntry(@NotNull final OrderEntry entry) {
-    myPanel.selectOrderEntry(entry);
-  }
-
-  public void moduleStateChanged() {
-    if (myPanel != null) {
-      myPanel.initFromModel();
-    }
-  }
-
-  public void beforeRootsChange(ModuleRootEvent event) {
-  }
-
-  public void rootsChanged(ModuleRootEvent event) {
-    if (myPanel != null) {
-      myPanel.rootsChanged();
-    }
-  }
-
-  public Sdk setSdk(final Sdk newJDK) {
-    final ModifiableRootModel model = getModel();
-    final Sdk oldSdk = model.getSdk();
-
-    if (newJDK != null) {
-      model.setSdk(newJDK);
-    }
-    else {
-      model.inheritSdk();
-    }
-
-    if (myPanel != null) {
-      myPanel.forceInitFromModel();
-    }
-
-    flushChangesToModel();
-
-    return oldSdk;
-  }
-
-  private class ClasspathFormatPanel extends JPanel {
-
-    private final JComboBox cbClasspathFormat;
-
-    private final Map<String,String> formatIdToDescr = new HashMap<String, String>();
-
-    private ClasspathFormatPanel(final List<ClasspathStorageProvider> providers) {
-      super(new GridBagLayout());
-      add(new JLabel(ProjectBundle.message("project.roots.classpath.format.label")),
-                      new GridBagConstraints(0,0,1,1,0.0, 0.0, GridBagConstraints.NORTHWEST, GridBagConstraints.NONE, new Insets(10, 6, 6, 0), 0, 0));
-
-      for (ClasspathStorageProvider provider : providers){
-        formatIdToDescr.put ( provider.getID(), provider.getDescription());
-      }
-
-      final Object[] items = formatIdToDescr.values().toArray();
-      cbClasspathFormat = new JComboBox(items);
-      updateClasspathFormat();
-      add(cbClasspathFormat,
-                      new GridBagConstraints(1,0,1,1,1.0, 0.0, GridBagConstraints.NORTHWEST, GridBagConstraints.NONE, new Insets(6, 6, 6, 0), 0, 0));
-    }
-
-    private void updateClasspathFormat() {
-      cbClasspathFormat.setSelectedItem(formatIdToDescr.get(getModuleClasspathFormat()));
-    }
-
-    private String getSelectedClasspathFormat() {
-      final String selected = (String)cbClasspathFormat.getSelectedItem();
-      for ( Map.Entry<String,String> entry : formatIdToDescr.entrySet() ) {
-        if ( entry.getValue().equals(selected)) {
-          return entry.getKey();
-        }
-      }
-      throw new IllegalStateException(selected);
-    }
-
-    @NotNull
-    private String getModuleClasspathFormat() {
-      return ClasspathStorage.getStorageType(getModel().getModule());
-    }
-
-    boolean isModified () {
-      return cbClasspathFormat != null && !getSelectedClasspathFormat().equals(getModuleClasspathFormat());
-    }
-
-    void apply () throws ConfigurationException {
-      final String storageID = getSelectedClasspathFormat();
-      ClasspathStorage.getProvider(storageID).assertCompatible(getModel());
-      ClasspathStorage.setStorageType(getModel(), storageID);
-    }
-  }
-}
+/*
+ * Copyright 2004-2005 Alexey Efimov
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package com.intellij.openapi.roots.ui.configuration;
+
+import com.intellij.ProjectTopics;
+import com.intellij.openapi.Disposable;
+import com.intellij.openapi.options.ConfigurationException;
+import com.intellij.openapi.project.ProjectBundle;
+import com.intellij.openapi.projectRoots.Sdk;
+import com.intellij.openapi.roots.ModifiableRootModel;
+import com.intellij.openapi.roots.ModuleRootEvent;
+import com.intellij.openapi.roots.ModuleRootListener;
+import com.intellij.openapi.roots.OrderEntry;
+import com.intellij.openapi.roots.impl.storage.ClasspathStorage;
+import com.intellij.openapi.roots.impl.storage.ClasspathStorageProvider;
+import com.intellij.openapi.util.IconLoader;
+import com.intellij.ui.OrderPanelListener;
+import org.jetbrains.annotations.NotNull;
+
+import javax.swing.*;
+import java.awt.*;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+
+/**
+ * @author Eugene Zhuravlev
+ *         Date: Oct 4, 2003
+ *         Time: 6:54:57 PM
+ */
+public class ClasspathEditor extends ModuleElementsEditor implements ModuleRootListener {
+  public static final String NAME = ProjectBundle.message("modules.classpath.title");
+  public static final Icon ICON = IconLoader.getIcon("/modules/classpath.png");
+
+  private ClasspathPanel myPanel;
+
+  private ClasspathFormatPanel myClasspathFormatPanel;
+
+  public ClasspathEditor(final ModuleConfigurationState state) {
+    super(state);
+
+    final Disposable disposable = new Disposable() {
+      public void dispose() {}
+    };
+    
+    state.getProject().getMessageBus().connect(disposable).subscribe(ProjectTopics.PROJECT_ROOTS, this);
+    registerDisposable(disposable);
+  }
+
+  public boolean isModified() {
+    return super.isModified() || ( myClasspathFormatPanel != null && myClasspathFormatPanel.isModified());
+  }
+
+  public String getHelpTopic() {
+    return "projectStructure.modules.dependencies";
+  }
+
+  public String getDisplayName() {
+    return NAME;
+  }
+
+  public Icon getIcon() {
+    return ICON;
+  }
+
+  public void saveData() {
+    myPanel.stopEditing();
+    flushChangesToModel();
+  }
+
+  public void apply () throws ConfigurationException {
+    if(myClasspathFormatPanel!=null) {
+      myClasspathFormatPanel.apply();
+    }
+  }
+
+  @Override
+  public void canApply() throws ConfigurationException {
+    super.canApply();
+    if (myClasspathFormatPanel != null) {
+      final String storageID = myClasspathFormatPanel.getSelectedClasspathFormat();
+      ClasspathStorage.getProvider(storageID).assertCompatible(getModel());
+    }
+  }
+
+  public JComponent createComponentImpl() {
+    myPanel = new ClasspathPanel(getState());
+
+    myPanel.addListener(new OrderPanelListener() {
+      public void entryMoved() {
+        flushChangesToModel();
+      }
+    });
+
+    final JPanel panel = new JPanel(new BorderLayout());
+    panel.setBorder(BorderFactory.createEmptyBorder(6, 6, 6, 6));
+    panel.add(myPanel, BorderLayout.CENTER);
+
+    final ModuleJdkConfigurable jdkConfigurable =
+      new ModuleJdkConfigurable(this, ProjectStructureConfigurable.getInstance(myProject).getProjectJdksModel()) {
+        @Override
+        protected ModifiableRootModel getRootModel() {
+          return getState().getRootModel();
+        }
+      };
+    panel.add(jdkConfigurable.createComponent(), BorderLayout.NORTH);
+    jdkConfigurable.reset();
+    registerDisposable(jdkConfigurable);
+
+    List<ClasspathStorageProvider> providers = ClasspathStorage.getProviders();
+    if(providers.size()>1){
+      myClasspathFormatPanel = new ClasspathFormatPanel(providers);
+      panel.add(myClasspathFormatPanel, BorderLayout.SOUTH);
+    }
+
+    return panel;
+  }
+
+  public void flushChangesToModel() {
+    List<OrderEntry> entries = myPanel.getEntries();
+    getModel().rearrangeOrderEntries(entries.toArray(new OrderEntry[entries.size()]));
+  }
+
+  public void selectOrderEntry(@NotNull final OrderEntry entry) {
+    myPanel.selectOrderEntry(entry);
+  }
+
+  public void moduleStateChanged() {
+    if (myPanel != null) {
+      myPanel.initFromModel();
+    }
+  }
+
+  public void beforeRootsChange(ModuleRootEvent event) {
+  }
+
+  public void rootsChanged(ModuleRootEvent event) {
+    if (myPanel != null) {
+      myPanel.rootsChanged();
+    }
+  }
+
+  public Sdk setSdk(final Sdk newJDK) {
+    final ModifiableRootModel model = getModel();
+    final Sdk oldSdk = model.getSdk();
+
+    if (newJDK != null) {
+      model.setSdk(newJDK);
+    }
+    else {
+      model.inheritSdk();
+    }
+
+    if (myPanel != null) {
+      myPanel.forceInitFromModel();
+    }
+
+    flushChangesToModel();
+
+    return oldSdk;
+  }
+
+  private class ClasspathFormatPanel extends JPanel {
+
+    private final JComboBox cbClasspathFormat;
+
+    private final Map<String,String> formatIdToDescr = new HashMap<String, String>();
+
+    private ClasspathFormatPanel(final List<ClasspathStorageProvider> providers) {
+      super(new GridBagLayout());
+      add(new JLabel(ProjectBundle.message("project.roots.classpath.format.label")),
+                      new GridBagConstraints(0,0,1,1,0.0, 0.0, GridBagConstraints.NORTHWEST, GridBagConstraints.NONE, new Insets(10, 6, 6, 0), 0, 0));
+
+      for (ClasspathStorageProvider provider : providers){
+        formatIdToDescr.put ( provider.getID(), provider.getDescription());
+      }
+
+      final Object[] items = formatIdToDescr.values().toArray();
+      cbClasspathFormat = new JComboBox(items);
+      updateClasspathFormat();
+      add(cbClasspathFormat,
+                      new GridBagConstraints(1,0,1,1,1.0, 0.0, GridBagConstraints.NORTHWEST, GridBagConstraints.NONE, new Insets(6, 6, 6, 0), 0, 0));
+    }
+
+    private void updateClasspathFormat() {
+      cbClasspathFormat.setSelectedItem(formatIdToDescr.get(getModuleClasspathFormat()));
+    }
+
+    private String getSelectedClasspathFormat() {
+      final String selected = (String)cbClasspathFormat.getSelectedItem();
+      for ( Map.Entry<String,String> entry : formatIdToDescr.entrySet() ) {
+        if ( entry.getValue().equals(selected)) {
+          return entry.getKey();
+        }
+      }
+      throw new IllegalStateException(selected);
+    }
+
+    @NotNull
+    private String getModuleClasspathFormat() {
+      return ClasspathStorage.getStorageType(getModel().getModule());
+    }
+
+    boolean isModified () {
+      return cbClasspathFormat != null && !getSelectedClasspathFormat().equals(getModuleClasspathFormat());
+    }
+
+    void apply () throws ConfigurationException {
+      final String storageID = getSelectedClasspathFormat();
+      ClasspathStorage.getProvider(storageID).assertCompatible(getModel());
+      ClasspathStorage.setStorageType(getModel(), storageID);
+    }
+  }
+}