Merge branch 'master' of git.labs.intellij.net:idea/community

java/compiler/openapi/src/com/intellij/compiler/ant/BuildProperties.java

@@ -72,11 +72,6 @@ public abstract class BuildProperties extends CompositeGenerator {
     return jdks.toArray(new Sdk[jdks.size()]);
   }
 
-  @NonNls
-  public static String getPropertyFileName(Project project) {
-    return getProjectBuildFileName(project) + ".properties";
-  }
-
   @NonNls
   public static String getJdkPathId(@NonNls final String jdkName) {
     return "jdk.classpath." + convertName(jdkName);

java/compiler/openapi/src/com/intellij/compiler/ant/GenerationOptions.java

@@ -23,7 +23,7 @@ import com.intellij.openapi.module.Module;
  * @author anna
  */
 public abstract class GenerationOptions {
-    /**
+  /**
      * This option specifies whether mulitfile or single file ant script is created.
      */
     public final boolean generateSingleFile;
@@ -146,4 +146,7 @@ public abstract class GenerationOptions {
     public abstract boolean isIdeaHomeGenerated();
 
 
+  public abstract String getBuildFileName();
+  
+  public abstract String getPropertiesFileName();
 }