01: /*****************************************************************************
02: * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
03: *
04: * Copyright 1997-2007 Sun Microsystems, Inc. All rights reserved.
05: *
06: * The contents of this file are subject to the terms of either the GNU
07: * General Public License Version 2 only ("GPL") or the Common
08: * Development and Distribution License("CDDL") (collectively, the
09: * "License"). You may not use this file except in compliance with the
10: * License. You can obtain a copy of the License at
11: * http://www.netbeans.org/cddl-gplv2.html
12: * or nbbuild/licenses/CDDL-GPL-2-CP. See the License for the
13: * specific language governing permissions and limitations under the
14: * License. When distributing the software, include this License Header
15: * Notice in each file and include the License file at
16: * nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
17: * particular file as subject to the "Classpath" exception as provided
18: * by Sun in the GPL Version 2 section of the License file that
19: * accompanied this code. If applicable, add the following below the
20: * License Header, with the fields enclosed by brackets [] replaced by
21: * your own identifying information:
22: * "Portions Copyrighted [year] [name of copyright owner]"
23: *
24: * Contributor(s):
25:
26: * The Original Software is the CVS Client Library.
27: * The Initial Developer of the Original Software is Robert Greig.
28: * Portions created by Robert Greig are Copyright (C) 2000.
29: * All Rights Reserved.
30: *
31: * If you wish your version of this file to be governed by only the CDDL
32: * or only the GPL Version 2, indicate your decision by adding
33: * "[Contributor] elects to include this software in this distribution
34: * under the [CDDL or GPL Version 2] license." If you do not indicate a
35: * single choice of license, a recipient has the option to distribute
36: * your version of this file under either the CDDL, the GPL Version 2 or
37: * to extend the choice of license to its licensees as provided above.
38: * However, if you add GPL Version 2 code and therefore, elected the GPL
39: * Version 2 license, then the option applies only if the new code is
40: * made subject to such option by the copyright holder.
41:
42: * Contributor(s): Robert Greig.
43: *****************************************************************************/package org.netbeans.lib.cvsclient.response;
44:
45: import java.util.*;
46:
47: import org.netbeans.lib.cvsclient.admin.*;
48: import org.netbeans.lib.cvsclient.event.*;
49: import org.netbeans.lib.cvsclient.util.*;
50:
51: /**
52: * This response is very similar to an UpdatedResponse except that it backs
53: * up the file being merged, and the file in question will still not be
54: * up-to-date after the merge.
55: * @author Robert Greig
56: * @see org.netbeans.lib.cvsclient.response.UpdatedResponse
57: */
58: class MergedResponse extends UpdatedResponse {
59:
60: /**
61: * Process the data for the response.
62: * @param r the buffered reader allowing the client to read the server's
63: * response. Note that the actual response name has already been read
64: * and the reader is positioned just before the first argument, if any.
65: * @param services various services that are useful to response handlers
66: * @throws ResponseException if something goes wrong handling this response
67: */
68: public void process(LoggedDataInputStream dis,
69: ResponseServices services) throws ResponseException {
70: super .process(dis, services);
71: EventManager manager = services.getEventManager();
72: if (manager.isFireEnhancedEventSet()) {
73: manager.fireCVSEvent(new EnhancedMessageEvent(this ,
74: EnhancedMessageEvent.MERGED_PATH, localFile));
75: }
76: }
77:
78: /**
79: * Returns the Conflict field for the file's entry.
80: * Can be overriden by subclasses.
81: * (For example the MergedResponse that sets the "result of merge" there.)
82: * @param date the date to put in
83: * @param hadConflicts if there were conflicts (e.g after merge)
84: * @return the conflict field
85: */
86: protected String getEntryConflict(Date date, boolean hadConflicts) {
87: if (!hadConflicts) {
88: return "Result of merge"; //NOI18N
89: } else {
90: return "Result of merge+" + //NOI18N
91: getDateFormatter().format(date);
92: }
93: }
94:
95: }
|