plugins/svn4idea/src/org/jetbrains/idea/svn/ConflictedSvnChange.java

   1 /*
   2  * Copyright 2000-2009 JetBrains s.r.o.
   3  *
   4  * Licensed under the Apache License, Version 2.0 (the "License");
   5  * you may not use this file except in compliance with the License.
   6  * You may obtain a copy of the License at
   7  *
   8  * http://www.apache.org/licenses/LICENSE-2.0
   9  *
  10  * Unless required by applicable law or agreed to in writing, software
  11  * distributed under the License is distributed on an "AS IS" BASIS,
  12  * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
  13  * See the License for the specific language governing permissions and
  14  * limitations under the License.
  15  */
  16 package org.jetbrains.idea.svn;
  17
  18 import com.intellij.openapi.vcs.FilePath;
  19 import com.intellij.openapi.vcs.FileStatus;
  20 import com.intellij.openapi.vcs.changes.Change;
  21 import com.intellij.openapi.vcs.changes.ContentRevision;
  22
  23 import javax.swing.*;
  24
  25 public class ConflictedSvnChange extends Change {
  26   private final ConflictState myConflictState;
  27   // +-
  28   private final FilePath myTreeConflictMarkHolder;
  29
  30   public ConflictedSvnChange(ContentRevision beforeRevision, ContentRevision afterRevision, final ConflictState conflictState,
  31                              final FilePath treeConflictMarkHolder) {
  32     super(beforeRevision, afterRevision);
  33     myConflictState = conflictState;
  34     myTreeConflictMarkHolder = treeConflictMarkHolder;
  35   }
  36
  37   public ConflictedSvnChange(ContentRevision beforeRevision, ContentRevision afterRevision, FileStatus fileStatus,
  38                              final ConflictState conflictState, final FilePath treeConflictMarkHolder) {
  39     super(beforeRevision, afterRevision, fileStatus);
  40     myConflictState = conflictState;
  41     myTreeConflictMarkHolder = treeConflictMarkHolder;
  42   }
  43
  44   public ConflictState getConflictState() {
  45     return myConflictState;
  46   }
  47
  48   @Override
  49   public Icon getAdditionalIcon() {
  50     return myConflictState.getIcon();
  51   }
  52
  53   @Override
  54   public String getDescription() {
  55     final String description = myConflictState.getDescription();
  56     if (description != null) {
  57       return SvnBundle.message("svn.changeview.item.in.conflict.text", description);
  58     }
  59     return description;
  60   }
  61
  62   public FilePath getTreeConflictMarkHolder() {
  63     return myTreeConflictMarkHolder;
  64   }
  65 }