From 7b6307a7041daafac404a02354dc9b33b22fd7ff Mon Sep 17 00:00:00 2001 From: irengrig Date: Wed, 6 Jun 2012 18:08:50 +0400 Subject: [PATCH] correct comparison --- .../idea/svn/commandLine/SvnInfoStructure.java | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/plugins/svn4idea/src/org/jetbrains/idea/svn/commandLine/SvnInfoStructure.java b/plugins/svn4idea/src/org/jetbrains/idea/svn/commandLine/SvnInfoStructure.java index 7916f326ec9c..015788b635eb 100644 --- a/plugins/svn4idea/src/org/jetbrains/idea/svn/commandLine/SvnInfoStructure.java +++ b/plugins/svn4idea/src/org/jetbrains/idea/svn/commandLine/SvnInfoStructure.java @@ -84,17 +84,17 @@ public class SvnInfoStructure { } private SVNConflictReason parseConflictReason(String reason) throws SAXException { - if (ConflictDescriptor.Reason.edited.equals(reason)) { + if (ConflictDescriptor.Reason.edited.name().equals(reason)) { return SVNConflictReason.EDITED; - } else if (ConflictDescriptor.Reason.obstructed.equals(reason)) { + } else if (ConflictDescriptor.Reason.obstructed.name().equals(reason)) { return SVNConflictReason.OBSTRUCTED; - } else if (ConflictDescriptor.Reason.deleted.equals(reason)) { + } else if (ConflictDescriptor.Reason.deleted.name().equals(reason)) { return SVNConflictReason.DELETED; - } else if (ConflictDescriptor.Reason.missing.equals(reason)) { + } else if (ConflictDescriptor.Reason.missing.name().equals(reason)) { return SVNConflictReason.MISSING; - } else if (ConflictDescriptor.Reason.unversioned.equals(reason)) { + } else if (ConflictDescriptor.Reason.unversioned.name().equals(reason)) { return SVNConflictReason.UNVERSIONED; - } else if (ConflictDescriptor.Reason.added.equals(reason)) { + } else if (ConflictDescriptor.Reason.added.name().equals(reason)) { return SVNConflictReason.ADDED; } if ("edit".equals(reason)) {