From 5529004091005a0ea62f40ee677f4c6a038516ef Mon Sep 17 00:00:00 2001 From: Shaverdova Elena Date: Thu, 26 May 2011 22:45:19 +0400 Subject: [PATCH] tests for phing and ant build files separation --- .../intellij/buildfiles/ForcedBuildFileAttribute.java | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/platform/platform-impl/src/com/intellij/buildfiles/ForcedBuildFileAttribute.java b/platform/platform-impl/src/com/intellij/buildfiles/ForcedBuildFileAttribute.java index 0cfd2cc9e319..c89e3cca19c8 100644 --- a/platform/platform-impl/src/com/intellij/buildfiles/ForcedBuildFileAttribute.java +++ b/platform/platform-impl/src/com/intellij/buildfiles/ForcedBuildFileAttribute.java @@ -82,12 +82,12 @@ public class ForcedBuildFileAttribute { public static void forceFileToFramework(VirtualFile file, String frameworkId, boolean value) { - if (value) {//belongs to other framework - String existingFrameworkId = getFrameworkIdOfBuildFile(file); - if (!StringUtil.isEmpty(existingFrameworkId) && !frameworkId.equals(existingFrameworkId)) { - return; - } + //belongs to other framework - do not override! + String existingFrameworkId = getFrameworkIdOfBuildFile(file); + if (!StringUtil.isEmpty(existingFrameworkId) && !frameworkId.equals(existingFrameworkId)) { + return; } + if (value) {//write framework forceBuildFile(file, frameworkId); }