Attachment #124157 for bug #258907

View | Details | Raw Unified | Return to bug 258907
Collapse All | Expand All

Lines 1-5 Link Here

(-)compare/org/eclipse/compare/structuremergeviewer/IStructureCreator2.java (-7 / +6 lines)
1	/*******************************************************************************	1	/*******************************************************************************
2	* Copyright (c) 2006, 2007 IBM Corporation and others.	2	* Copyright (c) 2006, 2009 IBM Corporation and others.
3	* All rights reserved. This program and the accompanying materials	3	* All rights reserved. This program and the accompanying materials
4	* are made available under the terms of the Eclipse Public License v1.0	4	* are made available under the terms of the Eclipse Public License v1.0
5	* which accompanies this distribution, and is available at	5	* which accompanies this distribution, and is available at
Lines 16-28 Link Here
16	import org.eclipse.core.runtime.IProgressMonitor;	16	import org.eclipse.core.runtime.IProgressMonitor;
17		17
18	/**	18	/**
19	* An extension to the {@link IStructureCreator} interface that supports the	19	* An extension to the {@link IStructureCreator} interface that supports the use
20	* use of shared documents.	20	* of shared documents.
21	* <p>	21	*
22	* This interface is not intended to be implemented by clients. Client should instead
23	* subclass {@link StructureCreator}.
24	* </p>
25	* @since 3.3	22	* @since 3.3
		23	* @noimplement This interface is not intended to be implemented by clients.
		24	* Client should instead subclass {@link StructureCreator}.
26	*/	25	*/
27	public interface IStructureCreator2 extends IStructureCreator {	26	public interface IStructureCreator2 extends IStructureCreator {
28		27




 * A diff tree viewer that can be configured with a <code>IStructureCreator</code>
 * to retrieve a hierarchical structure from the input object (an <code>ICompareInput</code>)
 * and perform a two-way or three-way compare on it.
 * <p>
 * This class may be instantiated; it is not intended to be subclassed outside
 * this package.
 * </p>
 *
 * @see IStructureCreator
 * @see ICompareInput
 * @noextend This class is not intended to be subclassed by clients.
 */
		
public class StructureDiffViewer extends DiffTreeViewer {
	private Differencer fDifferencer;
	private boolean fThreeWay= false;




<?xml version="1.0" encoding="UTF-8" standalone="no"?>
<component id="org.eclipse.compare" version="2">
    <resource path="compare/org/eclipse/compare/structuremergeviewer/IStructureCreator2.java" type="org.eclipse.compare.structuremergeviewer.IStructureCreator2">
        <filter id="403853384">
            <message_arguments>
                <message_argument value="org.eclipse.compare.structuremergeviewer.IStructureCreator2"/>
            </message_arguments>
        </filter>
    </resource>
    <resource path="compare/org/eclipse/compare/ISharedDocumentAdapter.java" type="org.eclipse.compare.ISharedDocumentAdapter">
        <filter id="403853384">
            <message_arguments>
                <message_argument value="org.eclipse.compare.ISharedDocumentAdapter"/>
            </message_arguments>
        </filter>
    </resource>
    <resource path="META-INF/MANIFEST.MF" type="org.eclipse.compare.patch.IHunk">
        <filter id="403853384">
            <message_arguments>

            </message_arguments>
        </filter>
    </resource>
    <resource path="compare/org/eclipse/compare/ISharedDocumentAdapter.java" type="org.eclipse.compare.ISharedDocumentAdapter">
        <filter id="403853384">
            <message_arguments>
                <message_argument value="org.eclipse.compare.ISharedDocumentAdapter"/>
            </message_arguments>
        </filter>
    </resource>
</component>

Return to bug 258907

Lines 30-45 Link Here

(-)compare/org/eclipse/compare/structuremergeviewer/StructureDiffViewer.java (-6 lines)
30	* A diff tree viewer that can be configured with a <code>IStructureCreator</code>	30	* A diff tree viewer that can be configured with a <code>IStructureCreator</code>
31	* to retrieve a hierarchical structure from the input object (an <code>ICompareInput</code>)	31	* to retrieve a hierarchical structure from the input object (an <code>ICompareInput</code>)
32	* and perform a two-way or three-way compare on it.	32	* and perform a two-way or three-way compare on it.
33	* <p>
34	* This class may be instantiated; it is not intended to be subclassed outside
35	* this package.
36	* </p>
37	*	33	*
38	* @see IStructureCreator	34	* @see IStructureCreator
39	* @see ICompareInput	35	* @see ICompareInput
40	* @noextend This class is not intended to be subclassed by clients.
41	*/	36	*/
42
43	public class StructureDiffViewer extends DiffTreeViewer {	37	public class StructureDiffViewer extends DiffTreeViewer {
44	private Differencer fDifferencer;	38	private Differencer fDifferencer;
45	private boolean fThreeWay= false;	39	private boolean fThreeWay= false;

Lines 1-5 Link Here

(-).settings/.api_filters (-7 / +14 lines)
1	<?xml version="1.0" encoding="UTF-8" standalone="no"?>	1	<?xml version="1.0" encoding="UTF-8" standalone="no"?>
2	<component id="org.eclipse.compare" version="2">	2	<component id="org.eclipse.compare" version="2">
		3	<resource path="compare/org/eclipse/compare/structuremergeviewer/IStructureCreator2.java" type="org.eclipse.compare.structuremergeviewer.IStructureCreator2">
		4	<filter id="403853384">
		5	<message_arguments>
		6	<message_argument value="org.eclipse.compare.structuremergeviewer.IStructureCreator2"/>
		7	</message_arguments>
		8	</filter>
		9	</resource>
		10	<resource path="compare/org/eclipse/compare/ISharedDocumentAdapter.java" type="org.eclipse.compare.ISharedDocumentAdapter">
		11	<filter id="403853384">
		12	<message_arguments>
		13	<message_argument value="org.eclipse.compare.ISharedDocumentAdapter"/>
		14	</message_arguments>
		15	</filter>
		16	</resource>
3	<resource path="META-INF/MANIFEST.MF" type="org.eclipse.compare.patch.IHunk">	17	<resource path="META-INF/MANIFEST.MF" type="org.eclipse.compare.patch.IHunk">
4	<filter id="403853384">	18	<filter id="403853384">
5	<message_arguments>	19	<message_arguments>
Lines 21-31 Link Here
21	</message_arguments>	35	</message_arguments>
22	</filter>	36	</filter>
23	</resource>	37	</resource>
24	<resource path="compare/org/eclipse/compare/ISharedDocumentAdapter.java" type="org.eclipse.compare.ISharedDocumentAdapter">
25	<filter id="403853384">
26	<message_arguments>
27	<message_argument value="org.eclipse.compare.ISharedDocumentAdapter"/>
28	</message_arguments>
29	</filter>
30	</resource>
31	</component>	38	</component>