Snapshot idea/138.1029 from git://git.jetbrains.org/idea/community.git

Update from idea/138.538 to idea/138.1029

Change-Id: I828f829a968439a99ec67640990c18ff7c9b58ce

3 files changed, 9 insertions, 6 deletions

diff --git a/plugins/eclipse/src/org/jetbrains/idea/eclipse/config/EclipseFileType.java b/plugins/eclipse/src/org/jetbrains/idea/eclipse/config/EclipseFileType.java
index b4d8cd06a9c6..ad0677d26560 100644
--- a/plugins/eclipse/src/org/jetbrains/idea/eclipse/config/EclipseFileType.java
+++ b/plugins/eclipse/src/org/jetbrains/idea/eclipse/config/EclipseFileType.java
@@ -31,6 +31,9 @@ import javax.swing.*;
  * Author: Vladislav.Kaznacheev
  */
 public class EclipseFileType implements FileType {
+
+  public static final FileType INSTANCE = new EclipseFileType();
+
   @NotNull
   @NonNls
   public String getName() {
diff --git a/plugins/eclipse/src/org/jetbrains/idea/eclipse/config/EclipseFileTypeFactory.java b/plugins/eclipse/src/org/jetbrains/idea/eclipse/config/EclipseFileTypeFactory.java
index 77e64e6dc3b5..8d9c4a8245bf 100644
--- a/plugins/eclipse/src/org/jetbrains/idea/eclipse/config/EclipseFileTypeFactory.java
+++ b/plugins/eclipse/src/org/jetbrains/idea/eclipse/config/EclipseFileTypeFactory.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2000-2009 JetBrains s.r.o.
+ * Copyright 2000-2014 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,7 +15,6 @@
  */
 package org.jetbrains.idea.eclipse.config;
 
-import com.intellij.openapi.fileTypes.FileType;
 import com.intellij.openapi.fileTypes.FileTypeConsumer;
 import com.intellij.openapi.fileTypes.FileTypeFactory;
 import org.jetbrains.annotations.NotNull;
@@ -25,9 +24,8 @@ import org.jetbrains.idea.eclipse.EclipseXml;
  * Author: Vladislav.Kaznacheev
  */
 public class EclipseFileTypeFactory extends FileTypeFactory {
-  private final static FileType fileType = new EclipseFileType();
 
   public void createFileTypes(final @NotNull FileTypeConsumer consumer) {
-    consumer.consume(fileType, EclipseXml.CLASSPATH_EXT + ";" + EclipseXml.PROJECT_EXT);
+    consumer.consume(EclipseFileType.INSTANCE, EclipseXml.CLASSPATH_EXT + ";" + EclipseXml.PROJECT_EXT);
   }
 }
diff --git a/plugins/eclipse/testSources/org/jetbrains/idea/eclipse/EclipseImportWizardTest.java b/plugins/eclipse/testSources/org/jetbrains/idea/eclipse/EclipseImportWizardTest.java
index bbf0d4acfa67..f46eb8b1da21 100644
--- a/plugins/eclipse/testSources/org/jetbrains/idea/eclipse/EclipseImportWizardTest.java
+++ b/plugins/eclipse/testSources/org/jetbrains/idea/eclipse/EclipseImportWizardTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2000-2012 JetBrains s.r.o.
+ * Copyright 2000-2014 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.
@@ -62,7 +62,9 @@ public class EclipseImportWizardTest extends ProjectWizardTestCase {
   }
 
   public void testImportingFromTwoProviders() throws Exception {
-    File file = createTempFile("Foo.java", "class Foo {}");
+    File dir = createTempDirectory();
+    File file = new File(dir, "Foo.java");
+    FileUtil.writeToFile(file, "class Foo {}");
     Module module = importProjectFrom(file.getParent(), null, new ImportFromSourcesProvider(),
                                       new EclipseProjectImportProvider(new EclipseImportBuilder()));
     VirtualFile[] sourceRoots = ModuleRootManager.getInstance(module).getSourceRoots();