From 2b326ee76a4477daf798a919d3c45e84cda5299b Mon Sep 17 00:00:00 2001
From: anna <Anna.Kozlova@jetbrains.com>
Date: Tue, 22 Oct 2013 19:22:32 +0200
Subject: [PATCH] eclipse: default natures simple registration

---
 plugins/eclipse/common-eclipse-util/src/EclipseXml.java    | 1 +
 .../idea/eclipse/importWizard/EclipseImportBuilder.java    | 2 +-
 .../idea/eclipse/importWizard/EclipseNatureImporter.java   | 7 +++++--
 3 files changed, 7 insertions(+), 3 deletions(-)

diff --git a/plugins/eclipse/common-eclipse-util/src/EclipseXml.java b/plugins/eclipse/common-eclipse-util/src/EclipseXml.java
index d9069462cb3a..2c3cbaaddb7d 100644
--- a/plugins/eclipse/common-eclipse-util/src/EclipseXml.java
+++ b/plugins/eclipse/common-eclipse-util/src/EclipseXml.java
@@ -44,6 +44,7 @@ public interface EclipseXml {
   @NonNls String GROOVY_DSL_CONTAINER = "GROOVY_DSL_SUPPORT";
   @NonNls String GROOVY_SUPPORT = "GROOVY_SUPPORT";
   @NonNls String JREBEL_NATURE = "org.zeroturnaround.eclipse.jrebelNature";
+  @NonNls String JAVA_NATURE = "org.eclipse.jdt.core.javanature";
   @NonNls String SONAR_NATURE = "org.sonar.ide.eclipse.core.sonarNature";
   @NonNls String JUNIT3 = JUNIT_CONTAINER + "/" + "3.8.1";
   @NonNls String JUNIT4 = JUNIT_CONTAINER + "/" + "4";
diff --git a/plugins/eclipse/src/org/jetbrains/idea/eclipse/importWizard/EclipseImportBuilder.java b/plugins/eclipse/src/org/jetbrains/idea/eclipse/importWizard/EclipseImportBuilder.java
index 93304b6db0c8..a640a134b901 100644
--- a/plugins/eclipse/src/org/jetbrains/idea/eclipse/importWizard/EclipseImportBuilder.java
+++ b/plugins/eclipse/src/org/jetbrains/idea/eclipse/importWizard/EclipseImportBuilder.java
@@ -513,7 +513,7 @@ public class EclipseImportBuilder extends ProjectImportBuilder<String> implement
 
   public static void collectUnknownNatures(String path, Map<String, String> naturesNames, String separator) {
     final Set<String> natures = collectNatures(path);
-    natures.remove("org.eclipse.jdt.core.javanature");
+    natures.removeAll(EclipseNatureImporter.getDefaultNatures());
 
     for (EclipseNatureImporter importer : EclipseNatureImporter.EP_NAME.getExtensions()) {
       natures.remove(importer.getNatureName());
diff --git a/plugins/eclipse/src/org/jetbrains/idea/eclipse/importWizard/EclipseNatureImporter.java b/plugins/eclipse/src/org/jetbrains/idea/eclipse/importWizard/EclipseNatureImporter.java
index 7dd0a36378df..225af6686bdf 100644
--- a/plugins/eclipse/src/org/jetbrains/idea/eclipse/importWizard/EclipseNatureImporter.java
+++ b/plugins/eclipse/src/org/jetbrains/idea/eclipse/importWizard/EclipseNatureImporter.java
@@ -23,6 +23,7 @@ import com.intellij.util.containers.HashSet;
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.idea.eclipse.EclipseXml;
 
+import java.util.Arrays;
 import java.util.List;
 import java.util.Set;
 
@@ -43,12 +44,14 @@ public abstract class EclipseNatureImporter {
     final Set<String> allCons = new HashSet<String>();
     allCons.add(EclipseXml.GROOVY_SUPPORT);
     allCons.add(EclipseXml.GROOVY_DSL_CONTAINER);
-    allCons.add(EclipseXml.JREBEL_NATURE);
-    allCons.add(EclipseXml.SONAR_NATURE);
 
     for (EclipseNatureImporter provider : Extensions.getExtensions(EP_NAME)) {
       allCons.addAll(provider.getProvidedCons());
     }
     return allCons;
   }
+  
+  public static List<String> getDefaultNatures() {
+    return Arrays.asList(EclipseXml.JAVA_NATURE, EclipseXml.JREBEL_NATURE, EclipseXml.SONAR_NATURE);
+  }
 }