Attachment 124157 Details for Bug 258907 – Fix v01

[patch] Fix v01

clipboard.txt (text/plain), 4.76 KB, created by Tomasz Zarna

on 2009-01-29 10:56:03 EST

(hide)

Description:

Filename:

MIME Type:

Creator: Tomasz Zarna

Created: 2009-01-29 10:56:03 EST

Size: 4.76 KB

patch

obsolete

>### Eclipse Workspace Patch 1.0
>#P org.eclipse.compare
>Index: compare/org/eclipse/compare/structuremergeviewer/IStructureCreator2.java
>===================================================================
>RCS file: /cvsroot/eclipse/org.eclipse.compare/plugins/org.eclipse.compare/compare/org/eclipse/compare/structuremergeviewer/IStructureCreator2.java,v
>retrieving revision 1.9
>diff -u -r1.9 IStructureCreator2.java
>--- compare/org/eclipse/compare/structuremergeviewer/IStructureCreator2.java	22 May 2007 20:19:52 -0000	1.9
>+++ compare/org/eclipse/compare/structuremergeviewer/IStructureCreator2.java	29 Jan 2009 15:54:56 -0000
>@@ -1,5 +1,5 @@
> /*******************************************************************************
>- * Copyright (c) 2006, 2007 IBM Corporation and others.
>+ * Copyright (c) 2006, 2009 IBM Corporation and others.
>  * All rights reserved. This program and the accompanying materials
>  * are made available under the terms of the Eclipse Public License v1.0
>  * which accompanies this distribution, and is available at
>@@ -16,13 +16,12 @@
> import org.eclipse.core.runtime.IProgressMonitor;
> 
> /**
>- * An extension to the {@link IStructureCreator} interface that supports the
>- * use of shared documents.
>- * <p>
>- * This interface is not intended to be implemented by clients. Client should instead
>- * subclass {@link StructureCreator}.
>- * </p>
>+ * An extension to the {@link IStructureCreator} interface that supports the use
>+ * of shared documents.
>+ * 
>  * @since 3.3
>+ * @noimplement This interface is not intended to be implemented by clients.
>+ *              Client should instead subclass {@link StructureCreator}.
>  */
> public interface IStructureCreator2 extends IStructureCreator {
> 	
>Index: compare/org/eclipse/compare/structuremergeviewer/StructureDiffViewer.java
>===================================================================
>RCS file: /cvsroot/eclipse/org.eclipse.compare/plugins/org.eclipse.compare/compare/org/eclipse/compare/structuremergeviewer/StructureDiffViewer.java,v
>retrieving revision 1.50
>diff -u -r1.50 StructureDiffViewer.java
>--- compare/org/eclipse/compare/structuremergeviewer/StructureDiffViewer.java	23 Jan 2009 09:08:51 -0000	1.50
>+++ compare/org/eclipse/compare/structuremergeviewer/StructureDiffViewer.java	29 Jan 2009 15:54:56 -0000
>@@ -30,16 +30,10 @@
>  * 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;
>Index: .settings/.api_filters
>===================================================================
>RCS file: /cvsroot/eclipse/org.eclipse.compare/plugins/org.eclipse.compare/.settings/.api_filters,v
>retrieving revision 1.2
>diff -u -r1.2 .api_filters
>--- .settings/.api_filters	7 Jan 2009 13:00:43 -0000	1.2
>+++ .settings/.api_filters	29 Jan 2009 15:54:56 -0000
>@@ -1,5 +1,19 @@
> <?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>
>@@ -21,11 +35,4 @@
>             </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>

Actions: View | Diff

Attachments on bug 258907: 124157