From f5d1109ec384da48d03a9999c8a997df66eb717a Mon Sep 17 00:00:00 2001 From: Sergey Evdokimov Date: Thu, 12 Apr 2012 17:50:52 +0400 Subject: [PATCH] Revert changing of MyValididtyState.equalsTo() --- .../maven/compiler/MavenResourceCompiler.java | 19 +++++-------------- 1 file changed, 5 insertions(+), 14 deletions(-) diff --git a/plugins/maven/src/main/java/org/jetbrains/idea/maven/compiler/MavenResourceCompiler.java b/plugins/maven/src/main/java/org/jetbrains/idea/maven/compiler/MavenResourceCompiler.java index 59372166075c..02f08aa522ab 100644 --- a/plugins/maven/src/main/java/org/jetbrains/idea/maven/compiler/MavenResourceCompiler.java +++ b/plugins/maven/src/main/java/org/jetbrains/idea/maven/compiler/MavenResourceCompiler.java @@ -588,20 +588,11 @@ public class MavenResourceCompiler implements ClassPostProcessingCompiler { if (!(otherState instanceof MyValididtyState)) return false; MyValididtyState that = (MyValididtyState)otherState; - if (mySourceFileTimestamp != that.mySourceFileTimestamp - || myOutputFileTimestamp != that.myOutputFileTimestamp - || myFiltered != that.myFiltered) { - return false; - } - - if (myFiltered) { - if (myPropertiesHashCode != that.myPropertiesHashCode - || !Comparing.strEqual(myEscapeString, that.myEscapeString)) { - return false; - } - } - - return true; + return mySourceFileTimestamp == that.mySourceFileTimestamp + && myOutputFileTimestamp == that.myOutputFileTimestamp + && myFiltered == that.myFiltered + && myPropertiesHashCode == that.myPropertiesHashCode + && Comparing.strEqual(myEscapeString, that.myEscapeString); } public void save(DataOutput out) throws IOException {