Attachment 130191 Details for Bug 249087 – patch

[patch] patch

patch.txt (text/plain), 14.27 KB, created by Jacek Pospychala

on 2009-03-29 17:42:00 EDT

(hide)

Description:

Filename:

MIME Type:

Creator: Jacek Pospychala

Created: 2009-03-29 17:42:00 EDT

Size: 14.27 KB

patch

obsolete

>### Eclipse Workspace Patch 1.0
>#P org.eclipse.pde.runtime
>Index: src/org/eclipse/pde/internal/runtime/PDERuntimePluginImages.java
>===================================================================
>RCS file: /cvsroot/eclipse/pde/ui/org.eclipse.pde.runtime/src/org/eclipse/pde/internal/runtime/PDERuntimePluginImages.java,v
>retrieving revision 1.43
>diff -u -r1.43 PDERuntimePluginImages.java
>--- src/org/eclipse/pde/internal/runtime/PDERuntimePluginImages.java	10 Mar 2009 13:56:42 -0000	1.43
>+++ src/org/eclipse/pde/internal/runtime/PDERuntimePluginImages.java	29 Mar 2009 21:42:08 -0000
>@@ -1,5 +1,5 @@
> /*******************************************************************************
>- * Copyright (c) 2000, 2008 IBM Corporation and others.
>+ * Copyright (c) 2000, 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
>@@ -78,6 +78,7 @@
> 	public static final ImageDescriptor DESC_PROPERTY_OBJ = create(PATH_OBJ, "property_obj.gif"); //$NON-NLS-1$
> 	public static final ImageDescriptor DESC_PLUGINS_OBJ = create(PATH_OBJ, "plugins_obj.gif"); //$NON-NLS-1$
> 	public static final ImageDescriptor DESC_FRAGMENT_OBJ = create(PATH_OBJ, "frgmt_obj.gif"); //$NON-NLS-1$
>+	public static final ImageDescriptor DESC_PACKAGE_OBJ = create(PATH_OBJ, "package_obj.gif"); //$NON-NLS-1$
> 
> 	/*
> 	 * Overlays
>Index: src/org/eclipse/pde/internal/runtime/pderuntimeresources.properties
>===================================================================
>RCS file: /cvsroot/eclipse/pde/ui/org.eclipse.pde.runtime/src/org/eclipse/pde/internal/runtime/pderuntimeresources.properties,v
>retrieving revision 1.85
>diff -u -r1.85 pderuntimeresources.properties
>--- src/org/eclipse/pde/internal/runtime/pderuntimeresources.properties	28 Mar 2009 19:37:50 -0000	1.85
>+++ src/org/eclipse/pde/internal/runtime/pderuntimeresources.properties	29 Mar 2009 21:42:08 -0000
>@@ -43,8 +43,10 @@
> RegistryBrowser_Service=&Service
> RegistryBrowser_Services=services
> RegistryBrowserLabelProvider_contributedBy=contributed by: {0}
>+RegistryBrowserLabelProvider_ExportedPackages=Exported packages
> RegistryBrowserLabelProvider_fragment=\ fragment
> RegistryBrowserLabelProvider_Fragments=Fragments
>+RegistryBrowserLabelProvider_ImportedPackages=Imported packages
> RegistryBrowserLabelProvider_Properties=Properties
> RegistryBrowserLabelProvider_RegisteredBy=Registered by 
> RegistryBrowserLabelProvider_usedServices=Used Services
>Index: src/org/eclipse/pde/internal/runtime/PDERuntimeMessages.java
>===================================================================
>RCS file: /cvsroot/eclipse/pde/ui/org.eclipse.pde.runtime/src/org/eclipse/pde/internal/runtime/PDERuntimeMessages.java,v
>retrieving revision 1.35
>diff -u -r1.35 PDERuntimeMessages.java
>--- src/org/eclipse/pde/internal/runtime/PDERuntimeMessages.java	28 Mar 2009 19:37:50 -0000	1.35
>+++ src/org/eclipse/pde/internal/runtime/PDERuntimeMessages.java	29 Mar 2009 21:42:07 -0000
>@@ -102,10 +102,14 @@
> 
> 	public static String RegistryBrowserLabelProvider_contributedBy;
> 
>+	public static String RegistryBrowserLabelProvider_ExportedPackages;
>+
> 	public static String RegistryBrowserLabelProvider_fragment;
> 
> 	public static String RegistryBrowserLabelProvider_Fragments;
> 
>+	public static String RegistryBrowserLabelProvider_ImportedPackages;
>+
> 	public static String RegistryBrowserLabelProvider_Properties;
> 
> 	public static String RegistryBrowserLabelProvider_RegisteredBy;
>Index: src/org/eclipse/pde/internal/runtime/registry/model/BundlePrerequisite.java
>===================================================================
>RCS file: /cvsroot/eclipse/pde/ui/org.eclipse.pde.runtime/src/org/eclipse/pde/internal/runtime/registry/model/BundlePrerequisite.java,v
>retrieving revision 1.2
>diff -u -r1.2 BundlePrerequisite.java
>--- src/org/eclipse/pde/internal/runtime/registry/model/BundlePrerequisite.java	29 Dec 2008 18:57:23 -0000	1.2
>+++ src/org/eclipse/pde/internal/runtime/registry/model/BundlePrerequisite.java	29 Mar 2009 21:42:10 -0000
>@@ -1,5 +1,5 @@
> /*******************************************************************************
>- * Copyright (c) 2006 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
>@@ -15,6 +15,15 @@
> 	private boolean isExported;
> 	private String name;
> 	private String version;
>+	private boolean isPackage;
>+
>+	public void setPackage(boolean isPackage) {
>+		this.isPackage = isPackage;
>+	}
>+
>+	public boolean isPackage() {
>+		return isPackage;
>+	}
> 
> 	public void setExported(boolean isExported) {
> 		this.isExported = isExported;
>Index: src/org/eclipse/pde/internal/runtime/registry/model/Folder.java
>===================================================================
>RCS file: /cvsroot/eclipse/pde/ui/org.eclipse.pde.runtime/src/org/eclipse/pde/internal/runtime/registry/model/Folder.java,v
>retrieving revision 1.3
>diff -u -r1.3 Folder.java
>--- src/org/eclipse/pde/internal/runtime/registry/model/Folder.java	10 Mar 2009 13:56:42 -0000	1.3
>+++ src/org/eclipse/pde/internal/runtime/registry/model/Folder.java	29 Mar 2009 21:42:10 -0000
>@@ -21,6 +21,8 @@
> 	public static final int F_PROPERTIES = 7;
> 	public static final int F_USING_BUNDLES = 8;
> 	public static final int F_FRAGMENTS = 9;
>+	public static final int F_IMPORTED_PACKAGES = 10;
>+	public static final int F_EXPORTED_PACKAGES = 11;
> 
> 	private int id;
> 	private Object parent;
>@@ -58,6 +60,10 @@
> 				return ((ServiceRegistration) parent).getUsingBundles();
> 			case F_FRAGMENTS :
> 				return ((Bundle) parent).getFragments();
>+			case F_IMPORTED_PACKAGES :
>+				return ((Bundle) parent).getImportedPackages();
>+			case F_EXPORTED_PACKAGES :
>+				return ((Bundle) parent).getExportedPackages();
> 		}
> 
> 		return null;
>Index: src/org/eclipse/pde/internal/runtime/registry/model/Bundle.java
>===================================================================
>RCS file: /cvsroot/eclipse/pde/ui/org.eclipse.pde.runtime/src/org/eclipse/pde/internal/runtime/registry/model/Bundle.java,v
>retrieving revision 1.4
>diff -u -r1.4 Bundle.java
>--- src/org/eclipse/pde/internal/runtime/registry/model/Bundle.java	10 Mar 2009 13:56:42 -0000	1.4
>+++ src/org/eclipse/pde/internal/runtime/registry/model/Bundle.java	29 Mar 2009 21:42:10 -0000
>@@ -28,6 +28,8 @@
> 	private int state;
> 	private long id;
> 	private BundleLibrary[] libraries = new BundleLibrary[0];
>+	private BundlePrerequisite[] importedPackages = new BundlePrerequisite[0];
>+	private BundlePrerequisite[] exportedPackages = new BundlePrerequisite[0];
> 
> 	private String fragmentHost;
> 	private String fragmentHostVersion;
>@@ -221,4 +223,20 @@
> 			return new Bundle[0];
> 		return model.getFragments(this);
> 	}
>+
>+	public void setImportedPackages(BundlePrerequisite[] importedPackages) {
>+		this.importedPackages = importedPackages;
>+	}
>+
>+	public BundlePrerequisite[] getImportedPackages() {
>+		return importedPackages;
>+	}
>+
>+	public void setExportedPackages(BundlePrerequisite[] exportedPackages) {
>+		this.exportedPackages = exportedPackages;
>+	}
>+
>+	public BundlePrerequisite[] getExportedPackages() {
>+		return exportedPackages;
>+	}
> }
>Index: src/org/eclipse/pde/internal/runtime/registry/model/LocalRegistryBackend.java
>===================================================================
>RCS file: /cvsroot/eclipse/pde/ui/org.eclipse.pde.runtime/src/org/eclipse/pde/internal/runtime/registry/model/LocalRegistryBackend.java,v
>retrieving revision 1.8
>diff -u -r1.8 LocalRegistryBackend.java
>--- src/org/eclipse/pde/internal/runtime/registry/model/LocalRegistryBackend.java	23 Mar 2009 15:17:34 -0000	1.8
>+++ src/org/eclipse/pde/internal/runtime/registry/model/LocalRegistryBackend.java	29 Mar 2009 21:42:11 -0000
>@@ -190,6 +190,14 @@
> 		if (libraries != null)
> 			adapter.setLibraries(libraries);
> 
>+		BundlePrerequisite[] importPackages = (BundlePrerequisite[]) getManifestHeaderArray(bundle, Constants.IMPORT_PACKAGE);
>+		if (importPackages != null)
>+			adapter.setImportedPackages(importPackages);
>+
>+		BundlePrerequisite[] exportPackages = (BundlePrerequisite[]) getManifestHeaderArray(bundle, Constants.EXPORT_PACKAGE);
>+		if (exportPackages != null)
>+			adapter.setExportedPackages(exportPackages);
>+
> 		return adapter;
> 	}
> 
>@@ -318,16 +326,22 @@
> 					array[i] = library;
> 				}
> 				return array;
>-			} else if (headerKey.equals(Constants.REQUIRE_BUNDLE)) {
>+			} else if (headerKey.equals(Constants.REQUIRE_BUNDLE) || headerKey.equals(Constants.IMPORT_PACKAGE) || headerKey.equals(Constants.EXPORT_PACKAGE)) {
> 				BundlePrerequisite[] array = new BundlePrerequisite[elements.length];
> 				for (int i = 0; i < elements.length; i++) {
> 					ManifestElement element = elements[i];
> 
> 					BundlePrerequisite prereq = new BundlePrerequisite();
> 					prereq.setName(element.getValue());
>-					prereq.setVersion(element.getAttribute(Constants.BUNDLE_VERSION_ATTRIBUTE));
>-					String visibility = element.getDirective(Constants.VISIBILITY_DIRECTIVE);
>-					prereq.setExported(Constants.VISIBILITY_REEXPORT.equals(visibility));
>+					if (headerKey.equals(Constants.REQUIRE_BUNDLE)) {
>+						prereq.setVersion(element.getAttribute(Constants.BUNDLE_VERSION_ATTRIBUTE));
>+						String visibility = element.getDirective(Constants.VISIBILITY_DIRECTIVE);
>+						prereq.setExported(Constants.VISIBILITY_REEXPORT.equals(visibility));
>+					} else {
>+						prereq.setVersion(element.getAttribute(Constants.VERSION_ATTRIBUTE));
>+						prereq.setPackage(true);
>+					}
>+
> 					array[i] = prereq;
> 				}
> 				return array;
>Index: src/org/eclipse/pde/internal/runtime/registry/RegistryBrowserContentProvider.java
>===================================================================
>RCS file: /cvsroot/eclipse/pde/ui/org.eclipse.pde.runtime/src/org/eclipse/pde/internal/runtime/registry/RegistryBrowserContentProvider.java,v
>retrieving revision 1.37
>diff -u -r1.37 RegistryBrowserContentProvider.java
>--- src/org/eclipse/pde/internal/runtime/registry/RegistryBrowserContentProvider.java	10 Mar 2009 13:56:42 -0000	1.37
>+++ src/org/eclipse/pde/internal/runtime/registry/RegistryBrowserContentProvider.java	29 Mar 2009 21:42:08 -0000
>@@ -65,11 +65,15 @@
> 
> 			Bundle bundle = (Bundle) element;
> 
>-			List folders = new ArrayList(7);
>+			List folders = new ArrayList(9);
> 
> 			folders.add(new Attribute(Attribute.F_LOCATION, bundle.getLocation()));
> 			if (bundle.getImports().length > 0)
> 				folders.add(new Folder(Folder.F_IMPORTS, bundle));
>+			if (bundle.getImportedPackages().length > 0)
>+				folders.add(new Folder(Folder.F_IMPORTED_PACKAGES, bundle));
>+			if (bundle.getExportedPackages().length > 0)
>+				folders.add(new Folder(Folder.F_EXPORTED_PACKAGES, bundle));
> 			if (bundle.getLibraries().length > 0)
> 				folders.add(new Folder(Folder.F_LIBRARIES, bundle));
> 			if (bundle.getExtensionPoints().length > 0)
>Index: src/org/eclipse/pde/internal/runtime/registry/RegistryBrowserLabelProvider.java
>===================================================================
>RCS file: /cvsroot/eclipse/pde/ui/org.eclipse.pde.runtime/src/org/eclipse/pde/internal/runtime/registry/RegistryBrowserLabelProvider.java,v
>retrieving revision 1.42
>diff -u -r1.42 RegistryBrowserLabelProvider.java
>--- src/org/eclipse/pde/internal/runtime/registry/RegistryBrowserLabelProvider.java	19 Mar 2009 14:27:46 -0000	1.42
>+++ src/org/eclipse/pde/internal/runtime/registry/RegistryBrowserLabelProvider.java	29 Mar 2009 21:42:10 -0000
>@@ -10,6 +10,8 @@
>  *******************************************************************************/
> package org.eclipse.pde.internal.runtime.registry;
> 
>+import org.eclipse.pde.internal.runtime.PDERuntimeMessages;
>+
> import java.util.Arrays;
> import org.eclipse.jface.resource.ImageDescriptor;
> import org.eclipse.jface.viewers.*;
>@@ -44,6 +46,7 @@
> 	private Image fPropertyImage;
> 	private Image fServicePropertyImage;
> 	private Image fFragmentImage;
>+	private Image fPackageImage;
> 	private RegistryBrowser fRegistryBrowser;
> 
> 	public RegistryBrowserLabelProvider(RegistryBrowser browser) {
>@@ -66,6 +69,7 @@
> 		fPropertyImage = PDERuntimePluginImages.DESC_PROPERTY_OBJ.createImage();
> 		fPluginsImage = PDERuntimePluginImages.DESC_PLUGINS_OBJ.createImage();
> 		fFragmentImage = PDERuntimePluginImages.DESC_FRAGMENT_OBJ.createImage();
>+		fPackageImage = PDERuntimePluginImages.DESC_PACKAGE_OBJ.createImage();
> 
> 		ImageDescriptor activePluginDesc = new OverlayIcon(PDERuntimePluginImages.DESC_PLUGIN_OBJ, new ImageDescriptor[][] {{PDERuntimePluginImages.DESC_RUN_CO}});
> 		fActivePluginImage = activePluginDesc.createImage();
>@@ -108,6 +112,7 @@
> 		fServicePropertyImage.dispose();
> 		fPluginsImage.dispose();
> 		fFragmentImage.dispose();
>+		fPackageImage.dispose();
> 	}
> 
> 	public Image getImage(Object element) {
>@@ -175,6 +180,9 @@
> 					return fPluginsImage;
> 				case Folder.F_FRAGMENTS :
> 					return fPluginsImage;
>+				case Folder.F_EXPORTED_PACKAGES :
>+				case Folder.F_IMPORTED_PACKAGES :
>+					return fPackageImage;
> 			}
> 			return null;
> 		}
>@@ -185,8 +193,14 @@
> 		if (element instanceof ExtensionPoint)
> 			return fExtensionPointImage;
> 
>-		if (element instanceof BundlePrerequisite)
>-			return ((BundlePrerequisite) element).isExported() ? fExpReqPluginImage : fReqPluginImage;
>+		if (element instanceof BundlePrerequisite) {
>+			BundlePrerequisite prereq = (BundlePrerequisite) element;
>+
>+			if (prereq.isPackage())
>+				return fPackageImage;
>+
>+			return prereq.isExported() ? fExpReqPluginImage : fReqPluginImage;
>+		}
> 
> 		if (element instanceof BundleLibrary)
> 			return fLibraryImage;
>@@ -258,6 +272,12 @@
> 				case Folder.F_IMPORTS :
> 					text = PDERuntimeMessages.RegistryView_folders_imports;
> 					break;
>+				case Folder.F_IMPORTED_PACKAGES :
>+					text = PDERuntimeMessages.RegistryBrowserLabelProvider_ImportedPackages;
>+					break;
>+				case Folder.F_EXPORTED_PACKAGES :
>+					text = PDERuntimeMessages.RegistryBrowserLabelProvider_ExportedPackages;
>+					break;
> 				case Folder.F_LIBRARIES :
> 					text = PDERuntimeMessages.RegistryView_folders_libraries;
> 					break;

Flags:

caniszczyk: iplog+

Actions: View | Diff

Attachments on bug 249087: 130184 | 130191 | 130192