01: /*
02: * This file is part of PFIXCORE.
03: *
04: * PFIXCORE is free software; you can redistribute it and/or modify
05: * it under the terms of the GNU Lesser General Public License as published by
06: * the Free Software Foundation; either version 2 of the License, or
07: * (at your option) any later version.
08: *
09: * PFIXCORE is distributed in the hope that it will be useful,
10: * but WITHOUT ANY WARRANTY; without even the implied warranty of
11: * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
12: * GNU Lesser General Public License for more details.
13: *
14: * You should have received a copy of the GNU Lesser General Public License
15: * along with PFIXCORE; if not, write to the Free Software
16: * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
17: */
18:
19: package de.schlund.pfixcore.editor2.core.exception;
20:
21: /**
22: * Exception signalling include part has been edited by two users concurrently
23: * and conflicts have to be resolved.
24: *
25: * @author Sebastian Marsching <sebastian.marsching@1und1.de>
26: */
27: public class EditorIncludeHasChangedException extends EditorException {
28:
29: private String merged;
30:
31: private String hash;
32:
33: public EditorIncludeHasChangedException(String merged, String hash) {
34: super ();
35: this .merged = merged;
36: this .hash = hash;
37: }
38:
39: /**
40: * Returns a text containing changes from both versions.
41: *
42: * @return Merged text
43: */
44: public String getMerged() {
45: return this .merged;
46: }
47:
48: /**
49: * Returns hash value of the saved text which has been used for the merger.
50: *
51: * @return Hash value of saved version
52: */
53: public String getNewHash() {
54: return this.hash;
55: }
56: }
|