Attachment 75768 Details for Bug 199169 – patch

[patch] patch

patch199169.txt (text/plain), 3.47 KB, created by Adam Archer

on 2007-08-09 10:30:25 EDT

(hide)

Description:

Filename:

MIME Type:

Creator: Adam Archer

Created: 2007-08-09 10:30:25 EDT

Size: 3.47 KB

patch

obsolete

>### Eclipse Workspace Patch 1.0
>#P org.eclipse.pde.ui
>Index: src/org/eclipse/pde/internal/ui/compare/ManifestStructureCreator.java
>===================================================================
>RCS file: /cvsroot/eclipse/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/compare/ManifestStructureCreator.java,v
>retrieving revision 1.10
>diff -u -r1.10 ManifestStructureCreator.java
>--- src/org/eclipse/pde/internal/ui/compare/ManifestStructureCreator.java	26 Jul 2007 03:16:31 -0000	1.10
>+++ src/org/eclipse/pde/internal/ui/compare/ManifestStructureCreator.java	9 Aug 2007 14:17:31 -0000
>@@ -92,6 +92,9 @@
> 		args[1] = 0;	// and here the offset of the first character of the line 
> 		
> 		try {
>+			String id = "Manifest"; //$NON-NLS-1$
>+			ManifestNode parent = new ManifestNode(root, 0, id,
>+					doc, 0, doc.getLength());
> 			monitor = beginWork(monitor);
> 			StringBuffer headerBuffer = new StringBuffer();
> 			int headerStart = 0;
>@@ -102,7 +105,7 @@
> 					return;
> 					
> 				if (line.length() <= 0) {
>-					saveNode(root, doc, headerBuffer.toString(), headerStart); // empty line, save buffer to node
>+					saveNode(parent, doc, headerBuffer.toString(), headerStart); // empty line, save buffer to node
> 					continue;
> 				}
> 				if (line.charAt(0) == ' ') {
>@@ -112,7 +115,7 @@
> 				}
> 				
> 				// save old buffer and start loading again
>-				saveNode(root, doc, headerBuffer.toString(), headerStart);
>+				saveNode(parent, doc, headerBuffer.toString(), headerStart);
> 				
> 				headerStart = lineStart;
> 				headerBuffer.replace(0, headerBuffer.length(), line);
>@@ -138,7 +141,7 @@
> 	private void saveNode(DocumentRangeNode root, IDocument doc, String header, int start) {
> 		if (header.length() > 0)
> 			new ManifestNode(
>-				root, 0, extractKey(header),
>+				root, 1, extractKey(header),
> 				doc, start, header.length());
> 	}
> 
>Index: src/org/eclipse/pde/internal/ui/compare/PluginStructureCreator.java
>===================================================================
>RCS file: /cvsroot/eclipse/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/compare/PluginStructureCreator.java,v
>retrieving revision 1.1
>diff -u -r1.1 PluginStructureCreator.java
>--- src/org/eclipse/pde/internal/ui/compare/PluginStructureCreator.java	26 Jul 2007 03:16:31 -0000	1.1
>+++ src/org/eclipse/pde/internal/ui/compare/PluginStructureCreator.java	9 Aug 2007 14:17:31 -0000
>@@ -27,6 +27,7 @@
> 
> public class PluginStructureCreator extends StructureCreator {
> 
>+	public static final int ROOT = 0;
> 	public static final int LIBRARY = 1;
> 	public static final int IMPORT = 2;
> 	public static final int EXTENSION_POINT = 3;
>@@ -120,14 +121,20 @@
> 		boolean isFragment = isFragment(input);
> 		PluginModelBase model = createModel(input, document, isFragment);
> 		try {
>-			createChildren(rootNode, model, labelProvider, resources);
>+			String id = isFragment ? "fragment" : "plugin"; //$NON-NLS-1$ //$NON-NLS-2$
>+			ImageDescriptor icon = isFragment ? PDEPluginImages.DESC_FRAGMENT_MF_OBJ : PDEPluginImages.DESC_PLUGIN_MF_OBJ;
>+			PluginNode parent = new PluginNode(rootNode, ROOT, id,
>+					resources.createImage(icon), document, 0, document.getLength());
>+			createChildren(parent, model, labelProvider, resources);
> 		} finally {
> 			model.dispose();
> 		}
> 	}
> 	
> 	private boolean isFragment(Object input) {
>-		//TODO
>+		if (input instanceof ITypedElement &&
>+				((ITypedElement)input).getName().equals("fragment.xml")) //$NON-NLS-1$
>+			return true;
> 		return false;
> 	}
>

Actions: View | Diff

Attachments on bug 199169: 75768