1 22 package org.netbeans.lib.cvsclient.response; 23 24 import java.util.*; 25 26 import org.netbeans.lib.cvsclient.admin.*; 27 import org.netbeans.lib.cvsclient.event.*; 28 import org.netbeans.lib.cvsclient.util.*; 29 30 37 class MergedResponse extends UpdatedResponse { 38 39 47 public void process(LoggedDataInputStream dis, ResponseServices services) 48 throws ResponseException { 49 super.process(dis, services); 50 EventManager manager = services.getEventManager(); 51 if (manager.isFireEnhancedEventSet()) { 52 manager.fireCVSEvent(new EnhancedMessageEvent(this, EnhancedMessageEvent.MERGED_PATH, localFile)); 53 } 54 } 55 56 64 protected String getEntryConflict(Date date, boolean hadConflicts) { 65 if (!hadConflicts) { 66 return "Result of merge"; } 68 else { 69 return "Result of merge+" + getDateFormatter().format(date); 71 } 72 } 73 74 } 75 | Popular Tags |