Attachment #121552 for bug #258882

Some Eclipse Foundation services are deprecated, or will be soon. Please ensure you've read this important communication.

Lines 1-5 Link Here

(-)src/org/eclipse/pde/api/tools/ui/internal/preferences/ApiErrorsWarningsConfigurationBlock.java (-1 / +9 lines)
1	/*******************************************************************************	1	/*******************************************************************************
2	* Copyright (c) 2007, 2008 IBM Corporation and others.	2	* Copyright (c) 2007, 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 227-232 Link Here
227	getApiToolsKey(IApiProblemTypes.API_COMPONENT_REMOVED_API_TYPE);	227	getApiToolsKey(IApiProblemTypes.API_COMPONENT_REMOVED_API_TYPE);
228	private static final Key KEY_API_COMPONENT_REMOVED_TYPE =	228	private static final Key KEY_API_COMPONENT_REMOVED_TYPE =
229	getApiToolsKey(IApiProblemTypes.API_COMPONENT_REMOVED_TYPE);	229	getApiToolsKey(IApiProblemTypes.API_COMPONENT_REMOVED_TYPE);
		230	private static final Key KEY_API_COMPONENT_REMOVED_REEXPORTED_API_TYPE =
		231	getApiToolsKey(IApiProblemTypes.API_COMPONENT_REMOVED_REEXPORTED_API_TYPE);
		232	private static final Key KEY_API_COMPONENT_REMOVED_REEXPORTED_TYPE =
		233	getApiToolsKey(IApiProblemTypes.API_COMPONENT_REMOVED_REEXPORTED_TYPE);
230		234
231	private static final Key KEY_ANNOTATION_ADDED_METHOD_NO_DEFAULT_VALUE =	235	private static final Key KEY_ANNOTATION_ADDED_METHOD_NO_DEFAULT_VALUE =
232	getApiToolsKey(IApiProblemTypes.ANNOTATION_ADDED_METHOD_NO_DEFAULT_VALUE);	236	getApiToolsKey(IApiProblemTypes.ANNOTATION_ADDED_METHOD_NO_DEFAULT_VALUE);
Lines 1022-1031 Link Here
1022	new String[] {	1026	new String[] {
1023	PreferenceMessages.API_COMPONENT_REMOVED_API_TYPE,	1027	PreferenceMessages.API_COMPONENT_REMOVED_API_TYPE,
1024	PreferenceMessages.API_COMPONENT_REMOVED_TYPE,	1028	PreferenceMessages.API_COMPONENT_REMOVED_TYPE,
		1029	PreferenceMessages.API_COMPONENT_REMOVED_REEXPORTED_API_TYPE,
		1030	PreferenceMessages.API_COMPONENT_REMOVED_REEXPORTED_TYPE,
1025	},	1031	},
1026	new Key[] {	1032	new Key[] {
1027	KEY_API_COMPONENT_REMOVED_API_TYPE,	1033	KEY_API_COMPONENT_REMOVED_API_TYPE,
1028	KEY_API_COMPONENT_REMOVED_TYPE,	1034	KEY_API_COMPONENT_REMOVED_TYPE,
		1035	KEY_API_COMPONENT_REMOVED_REEXPORTED_API_TYPE,
		1036	KEY_API_COMPONENT_REMOVED_REEXPORTED_TYPE,
1029	});	1037	});
1030	client = createExpansibleComposite(sbody, PreferenceMessages.CompatibilityClassElement);	1038	client = createExpansibleComposite(sbody, PreferenceMessages.CompatibilityClassElement);
1031	initializeComboControls(	1039	initializeComboControls(

Lines 1-5 Link Here

(-)src/org/eclipse/pde/api/tools/ui/internal/preferences/preferencemessages.properties (-1 / +3 lines)
1	###############################################################################	1	###############################################################################
2	# Copyright (c) 2008 IBM Corporation and others.	2	# Copyright (c) 2008, 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 55-60 Link Here
55		55
56	API_COMPONENT_REMOVED_API_TYPE=An API type has become non-API:	56	API_COMPONENT_REMOVED_API_TYPE=An API type has become non-API:
57	API_COMPONENT_REMOVED_TYPE=A type has been removed:	57	API_COMPONENT_REMOVED_TYPE=A type has been removed:
		58	API_COMPONENT_REMOVED_REEXPORTED_API_TYPE=An API re-exported type has become non-API:
		59	API_COMPONENT_REMOVED_REEXPORTED_TYPE=A re-exported type has been removed:
58		60
59	ANNOTATION_REMOVED_FIELD=A field has been removed:	61	ANNOTATION_REMOVED_FIELD=A field has been removed:
60	ANNOTATION_REMOVED_METHOD=A method has been removed:	62	ANNOTATION_REMOVED_METHOD=A method has been removed:

Lines 1-5 Link Here

(-)src/org/eclipse/pde/api/tools/ui/internal/preferences/PreferenceMessages.java (-1 / +3 lines)
1	/*******************************************************************************	1	/*******************************************************************************
2	* Copyright (c) 2007, 2008 IBM Corporation and others.	2	* Copyright (c) 2007, 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 78-83 Link Here
78		78
79	public static String API_COMPONENT_REMOVED_API_TYPE;	79	public static String API_COMPONENT_REMOVED_API_TYPE;
80	public static String API_COMPONENT_REMOVED_TYPE;	80	public static String API_COMPONENT_REMOVED_TYPE;
		81	public static String API_COMPONENT_REMOVED_REEXPORTED_API_TYPE;
		82	public static String API_COMPONENT_REMOVED_REEXPORTED_TYPE;
81		83
82	public static String ANNOTATION_ADDED_METHOD_NO_DEFAULT_VALUE;	84	public static String ANNOTATION_ADDED_METHOD_NO_DEFAULT_VALUE;
83	public static String ANNOTATION_REMOVED_FIELD;	85	public static String ANNOTATION_REMOVED_FIELD;

Lines 1-5 Link Here

(-)src_ant/org/eclipse/pde/api/tools/internal/tasks/ExcludeListDeltaVisitor.java (-2 / +2 lines)
1	/*******************************************************************************	1	/*******************************************************************************
2	* Copyright (c) 2008 IBM Corporation and others.	2	* Copyright (c) 2008, 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 58-64 Link Here
58	private boolean isExcluded(IDelta delta) {	58	private boolean isExcluded(IDelta delta) {
59	String typeName = delta.getTypeName();	59	String typeName = delta.getTypeName();
60	StringBuffer buffer = new StringBuffer();	60	StringBuffer buffer = new StringBuffer();
61	String componentId = delta.getApiComponentID();	61	String componentId = delta.getComponentVersionId();
62	if (componentId != null) {	62	if (componentId != null) {
63	buffer.append(componentId).append(':');	63	buffer.append(componentId).append(':');
64	}	64	}




/*******************************************************************************
 * Copyright (c) 2008, 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

							return;
						}
						if (VisibilityModifiers.isAPI(visibility)) {
							String deltaComponentID = Util.getDeltaComponentVersionsId(reference);
							delta = new Delta(
									deltaComponentID,
									IDelta.API_COMPONENT_ELEMENT_TYPE,

				} catch (JavaModelException e) {
					ApiPlugin.log(e);
				}
				IProject project = fJavaProject.getProject();
				if (type == null) {
					IResource manifestFile = Util.getManifestFile(project);
					if (manifestFile == null) {
						// Cannot retrieve the manifest.mf file
						return null;

						if (resource == null) {
							return null;
						}
						if (project.findMember(resource.getProjectRelativePath()) == null) {
							resource = null;
							IResource manifestFile = Util.getManifestFile(project);
							if (manifestFile == null) {
								// Cannot retrieve the manifest.mf file
								return null;
							}
							resource = manifestFile;
						}
					} else {
						IResource manifestFile = Util.getManifestFile(project);
						if (manifestFile == null) {
							// Cannot retrieve the manifest.mf file
							return null;

Lines 1-5 Link Here

(-)src/org/eclipse/pde/api/tools/internal/builder/BuildState.java (-2 / +2 lines)
1	/*******************************************************************************	1	/*******************************************************************************
2	* Copyright (c) 2008 IBM Corporation and others.	2	* Copyright (c) 2008, 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 108-114 Link Here
108	private static void writeDelta(IDelta delta, DataOutputStream out) throws IOException {	108	private static void writeDelta(IDelta delta, DataOutputStream out) throws IOException {
109	// encode a delta into the build state	109	// encode a delta into the build state
110	// int elementType, int kind, int flags, int restrictions, int modifiers, String typeName, String key, Object data	110	// int elementType, int kind, int flags, int restrictions, int modifiers, String typeName, String key, Object data
111	String apiComponentID = delta.getApiComponentID();	111	String apiComponentID = delta.getComponentVersionId();
112	boolean hasComponentID = apiComponentID != null;	112	boolean hasComponentID = apiComponentID != null;
113	out.writeBoolean(hasComponentID);	113	out.writeBoolean(hasComponentID);
114	if (hasComponentID) {	114	if (hasComponentID) {

Lines 1-5 Link Here

(-)src/org/eclipse/pde/api/tools/internal/provisional/comparator/DeltaProcessor.java (-1 / +3 lines)
1	/*******************************************************************************	1	/*******************************************************************************
2	* Copyright (c) 2007, 2008 IBM Corporation and others.	2	* Copyright (c) 2007, 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 118-123 Link Here
118	switch(delta.getFlags()) {	118	switch(delta.getFlags()) {
119	case IDelta.TYPE :	119	case IDelta.TYPE :
120	case IDelta.API_TYPE :	120	case IDelta.API_TYPE :
		121	case IDelta.REEXPORTED_API_TYPE :
		122	case IDelta.REEXPORTED_TYPE :
121	return false;	123	return false;
122	}	124	}
123	break;	125	break;




/*******************************************************************************
 * Copyright (c) 2007, 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

	 */
	public static final int SUPER_INTERFACE_WITH_METHODS = 69;
	/**
	 * Delta kind flag that denotes a re-exported type has been added or removed.
	 * <br>
	 * Applies to kinds:
	 * <ul>
	 * <li>{@link #ADDED}</li>
	 * <li>{@link #REMOVED}</li>
	 * </ul>
	 * 
	 * @see #getFlags()
	 */
	public static final int REEXPORTED_TYPE = 70;
	/**
	 * Delta kind flag that denotes changing the visibility of a re-exported type from VisibilityModifiers.API to another visibility.
	 * As a consequence, the corresponding re-exported type is no longer an API type.
	 * <br>
	 * Applies to kinds:
	 * <ul>
	 * <li>{@link #REMOVED}</li>
	 * </ul>
	 * 
	 * @see #getFlags()
	 */
	public static final int REEXPORTED_API_TYPE = 71;
	/**
	 * Return true if the receiver has no children deltas, false otherwise.
	 * 
	 * @return true if the receiver has no children deltas, false otherwise.

	public int getModifiers();
	
	/**
	 * Returns the component identifier including its version identifier in which the given delta is
	 * reported, or <code>null</code>. Can be <code>null</code> if the delta is reported against an
	 * API profile.
	 * 
	 * @return the component id in which the given delta is reported, or <code>null</code> if none
	 */
	public String getComponentVersionId();
	
	/**
	 * Update component version id.
	 * 
	 * @param value the new component version ID
	 */
	public void setComponentVersionId(String value);
}




/*******************************************************************************
 * Copyright (c) 2007, 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

import org.eclipse.pde.api.tools.internal.provisional.ApiPlugin;
import org.eclipse.pde.api.tools.internal.provisional.IApiAnnotations;
import org.eclipse.pde.api.tools.internal.provisional.IApiDescription;
import org.eclipse.pde.api.tools.internal.provisional.IRequiredComponentDescription;
import org.eclipse.pde.api.tools.internal.provisional.RestrictionModifiers;
import org.eclipse.pde.api.tools.internal.provisional.VisibilityModifiers;
import org.eclipse.pde.api.tools.internal.provisional.model.ApiScopeVisitor;

			if (version.getMajor() != version2.getMajor()) {
				globalDelta.add(
					new Delta(
						Util.getDeltaComponentVersionsId(apiComponent2),
						IDelta.API_COMPONENT_ELEMENT_TYPE,
						IDelta.CHANGED,
						IDelta.MAJOR_VERSION,

			} else if (version.getMinor() != version2.getMinor()) {
				globalDelta.add(
					new Delta(
						Util.getDeltaComponentVersionsId(apiComponent2),
						IDelta.API_COMPONENT_ELEMENT_TYPE,
						IDelta.CHANGED,
						IDelta.MINOR_VERSION,

						IDelta.API_COMPONENT,
						null,
						component2.getId(),
						Util.getDeltaComponentVersionsId(component2));
			} else if (component2 == null) {
				String referenceComponentId = referenceComponent.getId();
				return new Delta(

						IDelta.API_COMPONENT,
						null,
						referenceComponentId,
						Util.getDeltaComponentVersionsId(referenceComponent));
			}
			String referenceComponentId = referenceComponent.getId();
			final Delta globalDelta = new Delta();

				if (!componentsEEs.remove(currentEE)) {
					globalDelta.add(
							new Delta(
									Util.getDeltaComponentVersionsId(referenceComponent),
									IDelta.API_COMPONENT_ELEMENT_TYPE,
									IDelta.REMOVED,
									IDelta.EXECUTION_ENVIRONMENT,

									0,
									null,
									referenceComponentId,
									new String[] { currentEE, Util.getDeltaComponentVersionsId(referenceComponent)}));
				}
			}
			for (Iterator iterator = componentsEEs.iterator(); iterator.hasNext(); ) {
				String currentEE = (String) iterator.next();
				globalDelta.add(
						new Delta(
								Util.getDeltaComponentVersionsId(referenceComponent),
								IDelta.API_COMPONENT_ELEMENT_TYPE,
								IDelta.ADDED,
								IDelta.EXECUTION_ENVIRONMENT,

								0,
								null,
								referenceComponentId,
								new String[] { currentEE, Util.getDeltaComponentVersionsId(referenceComponent)}));
			}
			return internalCompare(referenceComponent, component2, referenceBaseline, baseline, visibilityModifiers, globalDelta);
		} catch(CoreException e) {

			if (refElementDescription != null) {
				refVisibility = refElementDescription.getVisibility();
			}
			String deltaComponentID = Util.getDeltaComponentVersionsId(component2);
			if (typeRoot == null) {
				if (isAPI(visibility, typeDescriptor2)) {
					return new Delta(

								} else{
									typeRoot2 = component2.findTypeRoot(typeName, id);
								}
								String deltaComponentID = null;
								IApiComponent provider = null;
								IApiDescription providerApiDesc = null;
								boolean reexported = false;
								if (typeRoot2 == null) {
									// check if the type is provided by a required component (it could have been moved/re-exported)
									IApiComponent[] providers = component2.getBaseline().resolvePackage(component2, packageName);
									int index = 0;
									while (typeRoot2 == null && index < providers.length) {
										IApiComponent p = providers[index];
										if (!p.equals(component2)) {
											typeRoot2 = p.findTypeRoot(typeName, p.getId());
											if (typeRoot2 != null) {
												provider = p;
												providerApiDesc = p.getApiDescription();
												IRequiredComponentDescription[] required = component2.getRequiredComponents();
												for (int k = 0; k < required.length; k++) {
													IRequiredComponentDescription description = required[k];
													if (description.getId().equals(p.getId())) {
														reexported = description.isExported();
														break;
													}
												}
											}
										}
										index++;
									}
								} else {
									provider = component2;
									providerApiDesc = apiDescription2;
								}
								deltaComponentID = Util.getDeltaComponentVersionsId(component2);
								if(typeRoot2 == null) {
									if ((visibility & visibilityModifiers) == 0) {
										// we skip the class file according to their visibility

													typeDescriptor.getModifiers(),
													typeName,
													typeName,
													new String[] { typeName, deltaComponentID }));
								} else {
									if ((visibility & visibilityModifiers) == 0) {
										// we skip the class file according to their visibility
										return;
									}
									IApiType typeDescriptor2 = typeRoot2.getStructure();
									IApiAnnotations elementDescription2 = providerApiDesc.resolveAnnotations(typeDescriptor2.getHandle());
									int visibility2 = 0;
									if (elementDescription2 != null) {
										visibility2 = elementDescription2.getVisibility();

											return;
										}
									}
									if (isAPI(visibility, typeDescriptor)) {
										if (!isAPI(visibility2, typeDescriptor2)) {
											globalDelta.add(
												new Delta(
													deltaComponentID,
													IDelta.API_COMPONENT_ELEMENT_TYPE,
													IDelta.REMOVED,
													reexported ?  IDelta.REEXPORTED_API_TYPE : IDelta.API_TYPE,
													elementDescription2 != null ? elementDescription2.getRestrictions() : RestrictionModifiers.NO_RESTRICTIONS,
													typeDescriptor2.getModifiers(),
													typeName,
													typeName,
													new String[] { typeName, deltaComponentID }));
											return;
										}
									}
									if ((visibility2 & visibilityModifiers) == 0) {
										// we simply report a changed visibility

														new String[] { typeName, deltaComponentID}));
									}
									typeRootBaseLineNames.add(typeName);
									ClassFileComparator comparator = new ClassFileComparator(typeDescriptor, typeRoot2, component, provider, referenceBaseline, baseline, visibilityModifiers);
									IDelta delta = comparator.getDelta();
									IStatus status = comparator.getStatus();
									if(status != null) {

				}
			}
		}
		IRequiredComponentDescription[] requiredComponents = component.getRequiredComponents();
		int length = requiredComponents.length;
		if (length != 0) {
			for (int j = 0; j < length; j++) {
				IRequiredComponentDescription description = requiredComponents[j];
				if (description.isExported()) {
					final String currentComponentID = Util.getDeltaComponentVersionsId(component);
					String descriptionID = description.getId();
					IApiComponent currentRequiredApiComponent = referenceBaseline.getApiComponent(descriptionID);
					final IApiDescription reexportedApiDescription = currentRequiredApiComponent.getApiDescription();
					IApiTypeContainer[] apiTypeContainers = currentRequiredApiComponent.getApiTypeContainers();
					if (apiTypeContainers != null) {
						for (int i = 0, max = apiTypeContainers.length; i < max; i++) {
							IApiTypeContainer container = apiTypeContainers[i];
							try {
								container.accept(new ApiTypeContainerVisitor() {
									public void visit(String packageName, IApiTypeRoot typeRoot) {
										String typeName = typeRoot.getTypeName();
										try {
											IApiType typeDescriptor = typeRoot.getStructure();
											IApiAnnotations elementDescription = reexportedApiDescription.resolveAnnotations(typeDescriptor.getHandle());
											if (typeDescriptor.isMemberType() || typeDescriptor.isAnonymous() || typeDescriptor.isLocal()) {
												// we skip nested types (member, local and anonymous)
												return;
											}
											int visibility = 0;
											if (elementDescription != null) {
												visibility = elementDescription.getVisibility();
											}
											IApiTypeRoot typeRoot2 = null;
											if (isSWT) {
												typeRoot2 = component2.findTypeRoot(typeName);
											} else{
												typeRoot2 = component2.findTypeRoot(typeName, id);
											}
											IApiDescription providerApiDesc = null;
											if (typeRoot2 == null) {
												// check if the type is provided by a required component (it could have been moved/re-exported)
												IApiComponent[] providers = component2.getBaseline().resolvePackage(component2, packageName);
												int index = 0;
												while (typeRoot2 == null && index < providers.length) {
													IApiComponent p = providers[index];
													if (!p.equals(component2)) {
														typeRoot2 = p.findTypeRoot(typeName, p.getId());
														if (typeRoot2 != null) {
															providerApiDesc = p.getApiDescription();
														}
													}
													index++;
												}
											} else {
												providerApiDesc = apiDescription2;
											}
											if(typeRoot2 == null) {
												if ((visibility & visibilityModifiers) == 0) {
													// we skip the class file according to their visibility
													return;
												}
												if (visibilityModifiers == VisibilityModifiers.API) {
													// if the visibility is API, we only consider public and protected types
													if (Util.isDefault(typeDescriptor.getModifiers())
																|| Util.isPrivate(typeDescriptor.getModifiers())) {
														return;
													}
												}
												globalDelta.add(
														new Delta(
																currentComponentID,
																IDelta.API_COMPONENT_ELEMENT_TYPE,
																IDelta.REMOVED,
																IDelta.REEXPORTED_TYPE,
																RestrictionModifiers.NO_RESTRICTIONS,
																typeDescriptor.getModifiers(),
																typeName,
																typeName,
																new String[] { typeName, currentComponentID }));
											} else {
												typeRootBaseLineNames.add(typeName);
												IApiType typeDescriptor2 = typeRoot2.getStructure();
												IApiAnnotations elementDescription2 = providerApiDesc.resolveAnnotations(typeDescriptor2.getHandle());
												int visibility2 = 0;
												if (elementDescription2 != null) {
													visibility2 = elementDescription2.getVisibility();
												}
												// if the visibility is API, we only consider public and protected types
												if (Util.isDefault(typeDescriptor.getModifiers())
														|| Util.isPrivate(typeDescriptor.getModifiers())) {
													return;
												}
												if (isAPI(visibility, typeDescriptor)) {
													if (!isAPI(visibility2, typeDescriptor2)) {
														globalDelta.add(
															new Delta(
																currentComponentID,
																IDelta.API_COMPONENT_ELEMENT_TYPE,
																IDelta.REMOVED,
																IDelta.REEXPORTED_API_TYPE,
																elementDescription2 != null ? elementDescription2.getRestrictions() : RestrictionModifiers.NO_RESTRICTIONS,
																typeDescriptor2.getModifiers(),
																typeName,
																typeName,
																new String[] { typeName, currentComponentID }));
														return;
													}
												}
											}
										} catch (CoreException e) {
											ApiPlugin.log(e);
										}
									}
								});
							} catch (CoreException e) {
								ApiPlugin.log(e);
							}
						}
					}
				}
			}
		}
		if (typeRootContainers2 != null) {
			for (int i = 0, max = typeRootContainers2.length; i < max; i++) {
				IApiTypeContainer container = typeRootContainers2[i];

									return;
								}
								typeRootBaseLineNames.add(typeName);
								String deltaComponentID = Util.getDeltaComponentVersionsId(component2);
								globalDelta.add(
										new Delta(
												deltaComponentID,

												type.getModifiers(),
												typeName,
												typeName,
												new String[] { typeName, deltaComponentID }));
							} catch (CoreException e) {
								ApiPlugin.log(e);
							}

				}
			}
		}
		requiredComponents = component2.getRequiredComponents();
		length = requiredComponents.length;
		if (length != 0) {
			for (int j = 0; j < length; j++) {
				IRequiredComponentDescription description = requiredComponents[j];
				if (description.isExported()) {
					final String currentComponentID = Util.getDeltaComponentVersionsId(component);
					String descriptionID = description.getId();
					IApiComponent currentRequiredApiComponent = baseline.getApiComponent(descriptionID);
					IApiTypeContainer[] apiTypeContainers = currentRequiredApiComponent.getApiTypeContainers();
					final IApiDescription reexportedApiDescription = currentRequiredApiComponent.getApiDescription();
					if (apiTypeContainers != null) {
						for (int i = 0, max = apiTypeContainers.length; i < max; i++) {
							IApiTypeContainer container = apiTypeContainers[i];
							try {
								container.accept(new ApiTypeContainerVisitor() {
									public void visit(String packageName, IApiTypeRoot typeRoot) {
										String typeName = typeRoot.getTypeName();
										try {
											IApiType typeDescriptor = typeRoot.getStructure();
											IApiAnnotations elementDescription = reexportedApiDescription.resolveAnnotations(typeDescriptor.getHandle());
											if (typeDescriptor.isMemberType() || typeDescriptor.isAnonymous() || typeDescriptor.isLocal()) {
												// we skip nested types (member, local and anonymous)
												return;
											}
											if (filterType(visibilityModifiers, elementDescription, typeDescriptor)) {
												return;
											}
											if (typeRootBaseLineNames.contains(typeName)) {
												// already processed
												return;
											}
											typeRootBaseLineNames.add(typeName);
											globalDelta.add(
													new Delta(
															currentComponentID,
															IDelta.API_COMPONENT_ELEMENT_TYPE,
															IDelta.ADDED,
															IDelta.REEXPORTED_TYPE,
															elementDescription != null ? elementDescription.getRestrictions() : RestrictionModifiers.NO_RESTRICTIONS,
															typeDescriptor.getModifiers(),
															typeName,
															typeName,
															new String[] { typeName, currentComponentID }));
										} catch (CoreException e) {
											ApiPlugin.log(e);
										}
									}
								});
							} catch (CoreException e) {
								ApiPlugin.log(e);
							}
						}
					}
				}
			}
		}
		return globalDelta.isEmpty() ? NO_DELTA : globalDelta;
	}


Lines 1-5 Link Here

(-)src/org/eclipse/pde/api/tools/internal/comparator/Delta.java (-2 / +6 lines)
1	/*******************************************************************************	1	/*******************************************************************************
2	* Copyright (c) 2007, 2008 IBM Corporation and others.	2	* Copyright (c) 2007, 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 210-216 Link Here
210	return true;	210	return true;
211	}	211	}
212		212
213	public String getApiComponentID() {	213	public String getComponentVersionId() {
214	return this.componentID;	214	return this.componentID;
215	}	215	}
216		216
Lines 342-345 Link Here
342	}	342	}
343	return String.valueOf(writer.getBuffer());	343	return String.valueOf(writer.getBuffer());
344	}	344	}
		345
		346	public void setComponentVersionId(String value) {
		347	this.componentID = value;
		348	}
345	}	349	}

Lines 1-5 Link Here

(-)src/org/eclipse/pde/api/tools/internal/comparator/DeltaXmlVisitor.java (-2 / +2 lines)
1	/*******************************************************************************	1	/*******************************************************************************
2	* Copyright (c) 2007, 2008 IBM Corporation and others.	2	* Copyright (c) 2007, 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 73-79 Link Here
73	deltaElement.setAttribute(IApiXmlConstants.ATTR_NAME_COMPATIBLE, Boolean.toString(DeltaProcessor.isCompatible(delta)));	73	deltaElement.setAttribute(IApiXmlConstants.ATTR_NAME_COMPATIBLE, Boolean.toString(DeltaProcessor.isCompatible(delta)));
74	deltaElement.setAttribute(IApiXmlConstants.ATTR_NAME_MODIFIERS, Integer.toString(delta.getModifiers()));	74	deltaElement.setAttribute(IApiXmlConstants.ATTR_NAME_MODIFIERS, Integer.toString(delta.getModifiers()));
75	deltaElement.setAttribute(IApiXmlConstants.ATTR_NAME_RESTRICTIONS, Integer.toString(delta.getRestrictions()));	75	deltaElement.setAttribute(IApiXmlConstants.ATTR_NAME_RESTRICTIONS, Integer.toString(delta.getRestrictions()));
76	String apiComponentID = delta.getApiComponentID();	76	String apiComponentID = delta.getComponentVersionId();
77	if (apiComponentID != null) {	77	if (apiComponentID != null) {
78	deltaElement.setAttribute(IApiXmlConstants.ATTR_NAME_COMPONENT_ID, apiComponentID);	78	deltaElement.setAttribute(IApiXmlConstants.ATTR_NAME_COMPONENT_ID, apiComponentID);
79	}	79	}




/*******************************************************************************
 * Copyright (c) 2008, 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

		this.delta.add(delta);
	}
	private void addDelta(int elementType, int kind, int flags, int restrictions, int modifiers, IApiType type, String key, String data) {
		this.addDelta(new Delta(Util.getDeltaComponentVersionsId(this.component2), elementType, kind, flags, restrictions, modifiers, type.getName(), key, data));
	}
	private void addDelta(int elementType, int kind, int flags, int restrictions, int modifiers, IApiType type, String key, String[] datas) {
		this.addDelta(new Delta(Util.getDeltaComponentVersionsId(this.component2), elementType, kind, flags, restrictions, modifiers, type.getName(), key, datas));
	}
	/**
	 * Checks if the super-class set has been change in any way compared to the baseline (grown or reduced or types changed)

								typeMember.getModifiers(),
								this.type1,
								typeMember.getName(),
								new String[] { typeMember.getName().replace('$', '.'), Util.getDeltaComponentVersionsId(component2)});
					} catch (CoreException e) {
						reportStatus(e);
					}

						if (memberTypeElementDescription2 != null) {
							memberTypeVisibility2 = memberTypeElementDescription2.getVisibility();
						}
						String deltaComponentID = Util.getDeltaComponentVersionsId(component2);
						int restrictions = memberTypeElementDescription2 != null ? memberTypeElementDescription2.getRestrictions() : RestrictionModifiers.NO_RESTRICTIONS;
						if (Util.isFinal(this.type2.getModifiers())) {
							restrictions |= RestrictionModifiers.NO_EXTEND;

							typeMember.getModifiers(),
							this.type1,
							typeMember.getName(),
							new String[] { typeMember.getName().replace('$', '.'), Util.getDeltaComponentVersionsId(component2)});
				} catch (CoreException e) {
					reportStatus(e);
				}

									IDelta.RESTRICTIONS,
									restrictions2,
									typeAccess,
									this.type2,
									this.type2.getName(),
									Util.getDescriptorName(type1));
							}
						} else {

											IDelta.RESTRICTIONS,
											restrictions2,
											typeAccess,
											this.type2,
											this.type2.getName(),
											Util.getDescriptorName(type1));
								}
							}

											IDelta.RESTRICTIONS,
											restrictions2,
											typeAccess,
											this.type2,
											this.type2.getName(),
											Util.getDescriptorName(type1));
								}
							}

Lines 1-5 Link Here

(-)src/org/eclipse/pde/api/tools/internal/util/Util.java (-2 / +11 lines)
1	/*******************************************************************************	1	/*******************************************************************************
2	* Copyright (c) 2007, 2008 IBM Corporation and others.	2	* Copyright (c) 2007, 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 677-682 Link Here
677	case IDelta.API_METHOD_WITHOUT_DEFAULT_VALUE : return "API_METHOD_WITHOUT_DEFAULT_VALUE"; //$NON-NLS-1$	677	case IDelta.API_METHOD_WITHOUT_DEFAULT_VALUE : return "API_METHOD_WITHOUT_DEFAULT_VALUE"; //$NON-NLS-1$
678	case IDelta.TYPE_ARGUMENT : return "TYPE_ARGUMENT"; //$NON-NLS-1$	678	case IDelta.TYPE_ARGUMENT : return "TYPE_ARGUMENT"; //$NON-NLS-1$
679	case IDelta.SUPER_INTERFACE_WITH_METHODS : return "SUPER_INTERFACE_WITH_METHODS"; //$NON-NLS-1$	679	case IDelta.SUPER_INTERFACE_WITH_METHODS : return "SUPER_INTERFACE_WITH_METHODS"; //$NON-NLS-1$
		680	case IDelta.REEXPORTED_API_TYPE : return "REEXPORTED_API_TYPE"; //$NON-NLS-1$
		681	case IDelta.REEXPORTED_TYPE : return "REEXPORTED_TYPE"; //$NON-NLS-1$
680	}	682	}
681	return UNKNOWN_FLAGS;	683	return UNKNOWN_FLAGS;
682	}	684	}
Lines 2448-2454 Link Here
2448	return set;	2450	return set;
2449	}	2451	}
2450		2452
2451	public static String getDeltaComponentID(IApiComponent component) {	2453	/**
		2454	* Returns an identifier for the given API component including its version identifier
		2455	* (component id + _ + major + _ + minor + _ + micro)
		2456	*
		2457	* @param component API component
		2458	* @return API component + version identifier
		2459	*/
		2460	public static String getDeltaComponentVersionsId(IApiComponent component) {
2452	try {	2461	try {
2453	StringBuffer buffer = new StringBuffer(component.getId());	2462	StringBuffer buffer = new StringBuffer(component.getId());
2454	String version = component.getVersion();	2463	String version = component.getVersion();

Lines 1-5 Link Here

(-)src/org/eclipse/pde/api/tools/internal/problems/ApiProblemFactory.java (-1 / +3 lines)
1	/*******************************************************************************	1	/*******************************************************************************
2	* Copyright (c) 2008 IBM Corporation and others.	2	* Copyright (c) 2008, 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 553-558 Link Here
553	case IDelta.API_METHOD_WITHOUT_DEFAULT_VALUE: return 130;	553	case IDelta.API_METHOD_WITHOUT_DEFAULT_VALUE: return 130;
554	case IDelta.TYPE_ARGUMENT: return 107;	554	case IDelta.TYPE_ARGUMENT: return 107;
555	case IDelta.SUPERCLASS: return 131;	555	case IDelta.SUPERCLASS: return 131;
		556	case IDelta.REEXPORTED_API_TYPE: return 134;
		557	case IDelta.REEXPORTED_TYPE: return 135;
556	}	558	}
557	}	559	}
558	}	560	}

Lines 1-5 Link Here

(-)src/org/eclipse/pde/api/tools/internal/provisional/problems/IApiProblemTypes.java (-1 / +6 lines)
1	/*******************************************************************************	1	/*******************************************************************************
2	* Copyright (c) 2008 IBM Corporation and others.	2	* Copyright (c) 2008, 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 26-31 Link Here
26	Util.getDeltaPrefererenceKey(IDelta.API_COMPONENT_ELEMENT_TYPE, IDelta.REMOVED, IDelta.TYPE);	26	Util.getDeltaPrefererenceKey(IDelta.API_COMPONENT_ELEMENT_TYPE, IDelta.REMOVED, IDelta.TYPE);
27	public static final String API_COMPONENT_REMOVED_API_TYPE =	27	public static final String API_COMPONENT_REMOVED_API_TYPE =
28	Util.getDeltaPrefererenceKey(IDelta.API_COMPONENT_ELEMENT_TYPE, IDelta.REMOVED, IDelta.API_TYPE);	28	Util.getDeltaPrefererenceKey(IDelta.API_COMPONENT_ELEMENT_TYPE, IDelta.REMOVED, IDelta.API_TYPE);
		29	// Compatibility problems
		30	public static final String API_COMPONENT_REMOVED_REEXPORTED_TYPE =
		31	Util.getDeltaPrefererenceKey(IDelta.API_COMPONENT_ELEMENT_TYPE, IDelta.REMOVED, IDelta.REEXPORTED_TYPE);
		32	public static final String API_COMPONENT_REMOVED_REEXPORTED_API_TYPE =
		33	Util.getDeltaPrefererenceKey(IDelta.API_COMPONENT_ELEMENT_TYPE, IDelta.REMOVED, IDelta.REEXPORTED_API_TYPE);
29	public static final String ANNOTATION_REMOVED_FIELD =	34	public static final String ANNOTATION_REMOVED_FIELD =
30	Util.getDeltaPrefererenceKey(IDelta.ANNOTATION_ELEMENT_TYPE, IDelta.REMOVED, IDelta.FIELD);	35	Util.getDeltaPrefererenceKey(IDelta.ANNOTATION_ELEMENT_TYPE, IDelta.REMOVED, IDelta.FIELD);
31	public static final String ANNOTATION_REMOVED_METHOD =	36	public static final String ANNOTATION_REMOVED_METHOD =

Return to bug 258882

Lines 1-5 Link Here

(-)src/org/eclipse/pde/api/tools/internal/builder/BaseApiAnalyzer.java (-4 / +14 lines)
1	/*******************************************************************************	1	/*******************************************************************************
2	* Copyright (c) 2008 IBM Corporation and others.	2	* Copyright (c) 2008, 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 810-816 Link Here
810	return;	810	return;
811	}	811	}
812	if (VisibilityModifiers.isAPI(visibility)) {	812	if (VisibilityModifiers.isAPI(visibility)) {
813	String deltaComponentID = Util.getDeltaComponentID(reference);	813	String deltaComponentID = Util.getDeltaComponentVersionsId(reference);
814	delta = new Delta(	814	delta = new Delta(
815	deltaComponentID,	815	deltaComponentID,
816	IDelta.API_COMPONENT_ELEMENT_TYPE,	816	IDelta.API_COMPONENT_ELEMENT_TYPE,
Lines 1124-1131 Link Here
1124	} catch (JavaModelException e) {	1124	} catch (JavaModelException e) {
1125	ApiPlugin.log(e);	1125	ApiPlugin.log(e);
1126	}	1126	}
		1127	IProject project = fJavaProject.getProject();
1127	if (type == null) {	1128	if (type == null) {
1128	IResource manifestFile = Util.getManifestFile(fJavaProject.getProject());	1129	IResource manifestFile = Util.getManifestFile(project);
1129	if (manifestFile == null) {	1130	if (manifestFile == null) {
1130	// Cannot retrieve the manifest.mf file	1131	// Cannot retrieve the manifest.mf file
1131	return null;	1132	return null;
Lines 1138-1145 Link Here
1138	if (resource == null) {	1139	if (resource == null) {
1139	return null;	1140	return null;
1140	}	1141	}
		1142	if (project.findMember(resource.getProjectRelativePath()) == null) {
		1143	resource = null;
		1144	IResource manifestFile = Util.getManifestFile(project);
		1145	if (manifestFile == null) {
		1146	// Cannot retrieve the manifest.mf file
		1147	return null;
		1148	}
		1149	resource = manifestFile;
		1150	}
1141	} else {	1151	} else {
1142	IResource manifestFile = Util.getManifestFile(fJavaProject.getProject());	1152	IResource manifestFile = Util.getManifestFile(project);
1143	if (manifestFile == null) {	1153	if (manifestFile == null) {
1144	// Cannot retrieve the manifest.mf file	1154	// Cannot retrieve the manifest.mf file
1145	return null;	1155	return null;

Lines 1-5 Link Here

(-)src/org/eclipse/pde/api/tools/internal/provisional/comparator/IDelta.java (-5 / +37 lines)
1	/*******************************************************************************	1	/*******************************************************************************
2	* Copyright (c) 2007, 2008 IBM Corporation and others.	2	* Copyright (c) 2007, 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 830-835 Link Here
830	*/	830	*/
831	public static final int SUPER_INTERFACE_WITH_METHODS = 69;	831	public static final int SUPER_INTERFACE_WITH_METHODS = 69;
832	/**	832	/**
		833	* Delta kind flag that denotes a re-exported type has been added or removed.
		834	* <br>
		835	* Applies to kinds:
		836	* <ul>
		837	* <li>{@link #ADDED}</li>
		838	* <li>{@link #REMOVED}</li>
		839	* </ul>
		840	*
		841	* @see #getFlags()
		842	*/
		843	public static final int REEXPORTED_TYPE = 70;
		844	/**
		845	* Delta kind flag that denotes changing the visibility of a re-exported type from VisibilityModifiers.API to another visibility.
		846	* As a consequence, the corresponding re-exported type is no longer an API type.
		847	* <br>
		848	* Applies to kinds:
		849	* <ul>
		850	* <li>{@link #REMOVED}</li>
		851	* </ul>
		852	*
		853	* @see #getFlags()
		854	*/
		855	public static final int REEXPORTED_API_TYPE = 71;
		856	/**
833	* Return true if the receiver has no children deltas, false otherwise.	857	* Return true if the receiver has no children deltas, false otherwise.
834	*	858	*
835	* @return true if the receiver has no children deltas, false otherwise.	859	* @return true if the receiver has no children deltas, false otherwise.
Lines 921-930 Link Here
921	public int getModifiers();	945	public int getModifiers();
922		946
923	/**	947	/**
924	* Returns the component id in which the given delta is reported. Might be null if the delta	948	* Returns the component identifier including its version identifier in which the given delta is
925	* is reported against an api profile.	949	* reported, or <code>null</code>. Can be <code>null</code> if the delta is reported against an
		950	* API profile.
		951	*
		952	* @return the component id in which the given delta is reported, or <code>null</code> if none
		953	*/
		954	public String getComponentVersionId();
		955
		956	/**
		957	* Update component version id.
926	*	958	*
927	* @return the component id in which the given delta is reported, null if none	959	* @param value the new component version ID
928	*/	960	*/
929	public String getApiComponentID();	961	public void setComponentVersionId(String value);
930	}	962	}

Lines 1-5 Link Here

(-)src/org/eclipse/pde/api/tools/internal/problems/problemmessages.properties (-3 / +5 lines)
1	###############################################################################	1	###############################################################################
2	# Copyright (c) 2008 IBM Corporation and others.	2	# Copyright (c) 2008, 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 11-17 Link Here
11	# the slot 107 has been removed. So it is open again for another message	11	# the slot 107 has been removed. So it is open again for another message
12	# remove messages for 31, 38, 42,	12	# remove messages for 31, 38, 42,
13	# 45, 46, 47, 48, 49, 50, 51, 52, 53, 57, 58, 59, 60, 62, 63, 65, 68, 70, 71, 74, 75, 80,	13	# 45, 46, 47, 48, 49, 50, 51, 52, 53, 57, 58, 59, 60, 62, 63, 65, 68, 70, 71, 74, 75, 80,
14	# 82, 83, 88, 90, 93, 05, 99, 103, 124	14	# 82, 83, 88, 90, 93, 05
15	#api profile	15	#api profile
16	1 = An API baseline has not been set for the current workspace.	16	1 = An API baseline has not been set for the current workspace.
17		17
Lines 140-143 Link Here
140	25 = The local type {0} defined in {1} illegally extends {2}	140	25 = The local type {0} defined in {1} illegally extends {2}
141	28 = An anonymous type defined in {0} illegally extends {1}	141	28 = An anonymous type defined in {0} illegally extends {1}
142	99 = API analysis aborted: {0} has unresolved constraints: {1}	142	99 = API analysis aborted: {0} has unresolved constraints: {1}
143	30 = The API problem filter for: ''{0}'' is no longer used	143	30 = The API problem filter for: ''{0}'' is no longer used
		144	134 = The re-exported type {0} in {1} is no longer API
		145	135 = The re-exported type {0} has been removed from {1}