Package org.apache.jackrabbit.vault.util.diff

Examples of org.apache.jackrabbit.vault.util.diff.Document$AnnotatedElement

307
308
309
310
311
312
313
314
315
316
317
318
319
            out.writeNewLine();
            out.write("===================================================================");
            out.writeNewLine();

            Reader r0 = getBaseFile(false) == null ? null : getBaseFile(false).getReader();
            Document d0 = new Document(this, LineElementsFactory.create(this, r0, false));
            Reader r1 = file.exists() ? new InputStreamReader(FileUtils.openInputStream(file), Constants.ENCODING) : null;
            Document d1 = new Document(this, LineElementsFactory.create(this, r1, false));

            DocumentDiff diff;
            try {
                diff = d0.diff(d1);
            } finally {
View Full Code Here
728
729
730
731
732
733
734
735
736
737
738
739
740
            // do a 3-way diff between the base, the local and the remote one.
            // we currently do not use document sources, since we don't really have
            // a label to provide (like rev. num, etc).
            Reader r0 = baseFile.getReader();
            Reader r1 = tmpFile.getReader();
            Document baseDoc = new Document(null, LineElementsFactory.create(new MetaFileDocSource(baseFile), r0, false));
            Document leftDoc = new Document(null, LineElementsFactory.create(new FileDocumentSource(file), false, Constants.ENCODING));
            Document rightDoc = new Document(null, LineElementsFactory.create(new MetaFileDocSource(tmpFile), r1, false));

            DocumentDiff3 diff;
            try {
                diff = baseDoc.diff3(leftDoc, rightDoc);
            } finally {
View Full Code Here
849
850
851
852
853
854
855
856
857
858
859
860
861
            // a label to provide (like rev. num, etc).

            MetaFile baseFile = getBaseFile(false);
            Reader r0 = baseFile.getReader();
            Reader r1 = tmpFile.getReader();
            Document baseDoc = new Document(null, LineElementsFactory.create(new MetaFileDocSource(baseFile), r0, false));
            Document leftDoc = new Document(null, LineElementsFactory.create(new FileDocumentSource(file), false, Constants.ENCODING));
            Document rightDoc = new Document(null, LineElementsFactory.create(new MetaFileDocSource(tmpFile), r1, false));

            DocumentDiff3 diff;
            try {
                diff = baseDoc.diff3(leftDoc, rightDoc);
            } finally {
View Full Code Here
TOP

Related Classes of org.apache.jackrabbit.vault.util.diff.Document$AnnotatedElement

  • org.apache.jackrabbit.vault.vlt.VltFile
    • Copyright © 2018 www.massapicom. All rights reserved.
    All source code are property of their respective owners. Java is a trademark of Sun Microsystems, Inc and owned by ORACLE Inc. Contact coftware#gmail.com.