Attachment #132475 for bug #258853

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

Lines 19-25 Link Here

(-)META-INF/MANIFEST.MF (-1 / +1 lines)
19	org.eclipse.core.filesystem;bundle-version="1.2.0"	19	org.eclipse.core.filesystem;bundle-version="1.2.0"
20	Export-Package: org.eclipse.pde.api.tools.internal;x-friends:="org.eclipse.pde.api.tools.tests,org.eclipse.pde.api.tools.ui",	20	Export-Package: org.eclipse.pde.api.tools.internal;x-friends:="org.eclipse.pde.api.tools.tests,org.eclipse.pde.api.tools.ui",
21	org.eclipse.pde.api.tools.internal.builder;x-friends:="org.eclipse.pde.api.tools.ui",	21	org.eclipse.pde.api.tools.internal.builder;x-friends:="org.eclipse.pde.api.tools.ui",
22	org.eclipse.pde.api.tools.internal.comparator;x-internal:=true,	22	org.eclipse.pde.api.tools.internal.comparator;x-friends:="org.eclipse.pde.api.tools.ui",
23	org.eclipse.pde.api.tools.internal.descriptors;x-friends:="org.eclipse.pde.api.tools.tests,org.eclipse.pde.api.tools.ui",	23	org.eclipse.pde.api.tools.internal.descriptors;x-friends:="org.eclipse.pde.api.tools.tests,org.eclipse.pde.api.tools.ui",
24	org.eclipse.pde.api.tools.internal.model;x-friends:="org.eclipse.pde.api.tools.tests,org.eclipse.pde.api.tools.ui",	24	org.eclipse.pde.api.tools.internal.model;x-friends:="org.eclipse.pde.api.tools.tests,org.eclipse.pde.api.tools.ui",
25	org.eclipse.pde.api.tools.internal.natures;x-internal:=true,	25	org.eclipse.pde.api.tools.internal.natures;x-internal:=true,

Lines 34-39 Link Here

(-)src/org/eclipse/pde/api/tools/internal/provisional/ApiPlugin.java (-1 / +12 lines)
34	import org.eclipse.pde.api.tools.internal.ApiDescriptionManager;	34	import org.eclipse.pde.api.tools.internal.ApiDescriptionManager;
35	import org.eclipse.pde.api.tools.internal.ApiFilterStore;	35	import org.eclipse.pde.api.tools.internal.ApiFilterStore;
36	import org.eclipse.pde.api.tools.internal.JavadocTagManager;	36	import org.eclipse.pde.api.tools.internal.JavadocTagManager;
		37	import org.eclipse.pde.api.tools.internal.SessionManager;
37	import org.eclipse.pde.api.tools.internal.builder.AbstractProblemDetector;	38	import org.eclipse.pde.api.tools.internal.builder.AbstractProblemDetector;
38	import org.eclipse.pde.api.tools.internal.builder.ApiAnalysisBuilder;	39	import org.eclipse.pde.api.tools.internal.builder.ApiAnalysisBuilder;
39	import org.eclipse.pde.api.tools.internal.builder.ReferenceAnalyzer;	40	import org.eclipse.pde.api.tools.internal.builder.ReferenceAnalyzer;
Lines 146-152 Link Here
146	* Singleton instance of the {@link JavadocTagManager}	147	* Singleton instance of the {@link JavadocTagManager}
147	*/	148	*/
148	private static JavadocTagManager fgTagManager = null;	149	private static JavadocTagManager fgTagManager = null;
149		150	/**
		151	* Singleton instance of the {@link ISessionManager}
		152	*/
		153	private static ISessionManager fgSessionManager = null;
150	/**	154	/**
151	* Private debug options	155	* Private debug options
152	*/	156	*/
Lines 518-523 Link Here
518	}	522	}
519	return SEVERITY_IGNORE;	523	return SEVERITY_IGNORE;
520	}	524	}
		525
		526	public ISessionManager getSessionManager() {
		527	if(fgSessionManager == null) {
		528	fgSessionManager = new SessionManager();
		529	}
		530	return fgSessionManager;
		531	}
521		532
522	/**	533	/**
523	* Returns the enable state for the specific key from the given {@link IProject}.	534	* Returns the enable state for the specific key from the given {@link IProject}.

Lines 2244-2247 Link Here

(-)src/org/eclipse/pde/api/tools/internal/util/Util.java (+5 lines)
2244	return 0;	2244	return 0;
2245	}	2245	}
2246	};	2246	};
		2247
		2248	public static void checkCanceled(IProgressMonitor monitor) {
		2249	if (monitor.isCanceled())
		2250	throw new OperationCanceledException();
		2251	}
2247	}	2252	}




import java.util.Set;

import org.eclipse.core.runtime.CoreException;
import org.eclipse.core.runtime.IProgressMonitor;
import org.eclipse.core.runtime.IStatus;
import org.eclipse.core.runtime.NullProgressMonitor;
import org.eclipse.jdt.core.Flags;
import org.eclipse.pde.api.tools.internal.comparator.ClassFileComparator;
import org.eclipse.pde.api.tools.internal.comparator.Delta;

			final int visibilityModifiers) {
		try {
		
			if (referenceBaseline == null || baseline == null) {
				throw new IllegalArgumentException("The baselines cannot be null"); //$NON-NLS-1$
			}
			if (referenceComponent == null) {
				if (component2 == null) {
					throw new IllegalArgumentException("Both components cannot be null"); //$NON-NLS-1$

						referenceComponentId,
						Util.getComponentVersionsId(referenceComponent));
			}
			if (referenceBaseline == null || baseline == null) {
				throw new IllegalArgumentException("The baselines cannot be null"); //$NON-NLS-1$
			}
			String referenceComponentId = referenceComponent.getId();
			final Delta globalDelta = new Delta();
	

			final int visibilityModifiers) {

		try {
			return compare(referenceComponent, component, referenceComponent == null ? null : referenceComponent.getBaseline(), component.getBaseline(), visibilityModifiers);
		} catch (CoreException e) {
			ApiPlugin.log(e);
		}

	 * @param baseline the given API baseline to compare with
	 * @param visibilityModifiers the given visibility that triggers what visibility should be used for the comparison
	 * @param force a flag to force the comparison of nested API components with the same versions 
	 * @param monitor the given progress monitor to report progress
	 *
	 * @return a delta, an empty delta if no difference is found or null if the delta detection failed
	 * @throws IllegalArgumentException if one of the two baselines is null

			final IApiScope scope,
			final IApiBaseline baseline,
			final int visibilityModifiers,
			final boolean force,
			final IProgressMonitor monitor) throws CoreException {
		if (scope == null || baseline == null) {
			throw new IllegalArgumentException("None of the scope or the baseline must be null"); //$NON-NLS-1$
		}
		IProgressMonitor localMonitor = null;
		if (monitor == null) {
			localMonitor = new NullProgressMonitor();
		} else {
			localMonitor = monitor;
		}
		final Set deltas = new HashSet();
		final CompareApiScopeVisitor visitor = new CompareApiScopeVisitor(deltas, baseline, force, visibilityModifiers, localMonitor);
		scope.accept(visitor);
		if (visitor.containsError()) {
			return null;

		}
		return globalDelta.isEmpty() ? NO_DELTA : globalDelta;
	}

	/**
	 * Returns a delta that corresponds to the comparison of the two given API baselines. 
	 * Nested API components with the same versions are not compared.
	 * <p>Equivalent to: compare(baseline, baseline2, visibilityModifiers, force, null);</p>
	 * 
	 * @param scope the given scope for the comparison
	 * @param baseline the given API baseline to compare with
	 * @param visibilityModifiers the given visibility that triggers what visibility should be used for the comparison
	 * @param force a flag to force the comparison of nested API components with the same versions 
	 *
	 * @return a delta, an empty delta if no difference is found or null if the delta detection failed
	 * @throws IllegalArgumentException if one of the two baselines is null
	 *         CoreException if one of the element in the scope cannot be visited
	 */
	public static IDelta compare(
			final IApiScope scope,
			final IApiBaseline baseline,
			final int visibilityModifiers,
			final boolean force) throws CoreException {
		return compare(scope, baseline, visibilityModifiers, force, null);
	}
	/**
	 * Returns a delta that corresponds to the comparison of the two given API baselines. 
	 * Nested API components with the same versions are not compared.




import java.util.Set;

import org.eclipse.core.runtime.CoreException;
import org.eclipse.core.runtime.IProgressMonitor;
import org.eclipse.pde.api.tools.internal.provisional.ApiPlugin;
import org.eclipse.pde.api.tools.internal.provisional.model.ApiScopeVisitor;
import org.eclipse.pde.api.tools.internal.provisional.model.ApiTypeContainerVisitor;

import org.eclipse.pde.api.tools.internal.provisional.model.IApiComponent;
import org.eclipse.pde.api.tools.internal.provisional.model.IApiTypeContainer;
import org.eclipse.pde.api.tools.internal.provisional.model.IApiTypeRoot;
import org.eclipse.pde.api.tools.internal.util.Util;

/**
 * ApiScope visitor implementation to run the comparison on all elements of the scope.

	int visibilityModifiers;
	boolean force;
	boolean containsErrors = false;
	IProgressMonitor monitor;

	public CompareApiScopeVisitor(
			final Set deltas,
			final IApiBaseline baseline,
			final boolean force,
			final int visibilityModifiers,
			final IProgressMonitor monitor) {
		this.deltas = deltas;
		this.referenceBaseline = baseline;
		this.visibilityModifiers = visibilityModifiers;
		this.force = force;
		this.monitor = monitor;
	}
	
	public boolean visit(IApiBaseline baseline) throws CoreException {
		try {
			Util.checkCanceled(this.monitor);
			IDelta delta = ApiComparator.compare(this.referenceBaseline, baseline, this.visibilityModifiers, this.force);
			if (delta != null) {
				delta.accept(new DeltaVisitor() {
					public void endVisit(IDelta localDelta) {
						if (localDelta.getChildren().length == 0) {
							CompareApiScopeVisitor.this.deltas.add(localDelta);
						}
					}
				});
			} else {
				this.containsErrors = true;
			}
			return false;
		} finally {
			this.monitor.worked(1);
		}
		return false;
	}

	public boolean visit(IApiTypeContainer container) throws CoreException {
		try {
			Util.checkCanceled(this.monitor);
			container.accept(new ApiTypeContainerVisitor() {
				public void visit(String packageName, IApiTypeRoot typeroot) {
					try {
						Util.checkCanceled(CompareApiScopeVisitor.this.monitor);
						compareApiTypeRoot(typeroot);
					} catch (CoreException e) {
						ApiPlugin.log(e);
					}
				}
			});
			return false;
		} finally {
			this.monitor.worked(1);
		}
	}

	public boolean visit(IApiComponent component) throws CoreException {
		try {
			Util.checkCanceled(this.monitor);
			if (component.getErrors() != null) {
				this.containsErrors = true;
				return false;
			}
			IApiComponent referenceComponent = this.referenceBaseline.getApiComponent(component.getId());
			if (referenceComponent != null && referenceComponent.getErrors() != null) {
				this.containsErrors = true;
				return false;
			}
			if (component.isSourceComponent() || component.isSystemComponent()) {
				return false;
			}
			Util.checkCanceled(this.monitor);
			IDelta delta = ApiComparator.compare(referenceComponent, component, this.visibilityModifiers);
			if (delta != null) {
				delta.accept(new DeltaVisitor() {
					public void endVisit(IDelta localDelta) {
						if (localDelta.getChildren().length == 0) {
							CompareApiScopeVisitor.this.deltas.add(localDelta);
						}
					}
				});
			} else {
				this.containsErrors = true;
			}
			return false;
		} finally {
			this.monitor.worked(1);
		}
		return false;
	}
	
	public void visit(IApiTypeRoot root) throws CoreException {
		try {
			Util.checkCanceled(this.monitor);
			compareApiTypeRoot(root);
		} finally {
			this.monitor.worked(1);
		}
	}

	void compareApiTypeRoot(IApiTypeRoot root) throws CoreException {
		IApiComponent apiComponent = root.getApiComponent();
		if (apiComponent == null || apiComponent.isSystemComponent() || apiComponent.isSourceComponent()) {
			return;




/*******************************************************************************
 * Copyright (c) 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
 * http://www.eclipse.org/legal/epl-v10.html
 *
 * Contributors:
 *     IBM Corporation - initial API and implementation
 *******************************************************************************/
package org.eclipse.pde.api.tools.internal;

import java.util.ArrayList;
import java.util.HashSet;
import java.util.Iterator;
import java.util.List;
import java.util.Set;

import org.eclipse.pde.api.tools.internal.provisional.ISession;
import org.eclipse.pde.api.tools.internal.provisional.ISessionListener;
import org.eclipse.pde.api.tools.internal.provisional.ISessionManager;

/**
 * Implementation of the ISessionManager.
 * Synchronize all accesses to prevent concurrent modifications.
 */
public class SessionManager implements ISessionManager {

	// use a list so that we can preserve the order
	private List sessions = new ArrayList();
	private Set listeners = new HashSet();
	private ISession activeSession;

	public synchronized void addSession(ISession session, boolean activate) {
		if (session == null) {
			throw new IllegalArgumentException("The given session cannot be null"); //$NON-NLS-1$
		}
		if (!this.sessions.contains(session)) {
			this.sessions.add(session);
			fireSessionAdded(session);
		}
		if (activate) {
			this.activeSession = session;
			fireSessionActivated(session);
		}
	}

	public synchronized void removeSession(ISession session) {
		if (sessions.remove(session)) {
			if (session.equals(this.activeSession)) {
				this.activeSession = null;
				fireSessionActivated(null);
			}
			fireSessionRemoved(session);
		}
	}

	public synchronized void removeAllSessions() {
		ISession[] allSessions = (ISession[]) this.sessions.toArray(new ISession[this.sessions.size()]);
		this.sessions.clear();
		this.activeSession = null;
		fireSessionActivated(null);
		for (int i = 0; i < allSessions.length; i++) {
			ISession session = allSessions[i];
			fireSessionRemoved(session);
		}
	}

	public synchronized ISession[] getSessions() {
		return (ISession[]) sessions.toArray(new ISession[sessions.size()]);
	}

	public synchronized void addSessionListener(ISessionListener listener) {
		if (listener == null) throw new IllegalArgumentException("The given listener cannot be null"); //$NON-NLS-1$
		listeners.add(listener);
	}

	public synchronized void removeSessionListener(ISessionListener listener) {
		listeners.remove(listener);
	}

	protected synchronized void fireSessionAdded(ISession session) {
		Iterator i = listeners.iterator();
		while (i.hasNext()) {
			((ISessionListener) i.next()).sessionAdded(session);
		}
	}

	protected synchronized void fireSessionRemoved(ISession session) {
		Iterator i = listeners.iterator();
		while (i.hasNext()) {
			((ISessionListener) i.next()).sessionRemoved(session);
		}
	}

	public ISession getActiveSession() {
		return this.activeSession;
	}

	protected synchronized void fireSessionActivated(ISession session) {
		Iterator i = listeners.iterator();
		while (i.hasNext()) {
			((ISessionListener) i.next()).sessionActivated(session);
		}
	}

	public void activateSession(ISession session) {
		if (this.sessions.contains(session) && !session.equals(this.activeSession)) {
			this.activeSession = session;
			fireSessionActivated(session);
		}
	}
}




/*******************************************************************************
 * Copyright (c) 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
 * http://www.eclipse.org/legal/epl-v10.html
 *
 * Contributors:
 *     IBM Corporation - initial API and implementation
 *******************************************************************************/
package org.eclipse.pde.api.tools.internal.provisional;

public interface ITreeNode {
	public static final int CLASS = 1;
	public static final int INTERFACE = 2;
	public static final int ANNOTATION = 3;
	public static final int ENUM = 4;
	public static final int PACKAGE = 5;

	Object[] getChildren();
	boolean hasChildren();
	int getId();
	Object getData();
}




/*******************************************************************************
 * Copyright (c) 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
 * http://www.eclipse.org/legal/epl-v10.html
 *
 * Contributors:
 *     IBM Corporation - initial API and implementation
 *******************************************************************************/
package org.eclipse.pde.api.tools.internal.provisional;

public interface ITreeModel {
	public ITreeNode getRoot();
}




/*******************************************************************************
 * Copyright (c) 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
 * http://www.eclipse.org/legal/epl-v10.html
 *
 * Contributors:
 *     IBM Corporation - initial API and implementation
 *******************************************************************************/
package org.eclipse.pde.api.tools.internal.provisional;

/**
 * Provide information about the API Tooling session.
 */
public interface ISession {
	
	public ITreeModel getModel();
	
	public String getTimestamp();
}




<?xml version="1.0" encoding="iso-8859-1"?>
<!--
	Copyright (c) IBM Corporation and others 2009. This page is made available under license. For full details see the LEGAL in the documentation book that contains this page.
	
	All Platform Debug contexts, those for org.eclipse.debug.ui, are located in this file
	All contexts are grouped by their relation, with all relations grouped alphabetically.
-->
<xsl:stylesheet version="1.0" xmlns:xsl="http://www.w3.org/1999/XSL/Transform">
<xsl:output
               xmlns="http://www.w3.org/1999/xhtml"
               method="xml"
               encoding="ISO-8859-1"
               media-type="text/html"
               doctype-public="-//W3C//DTD XHTML 1.0 Transitional//EN"
               doctype-system="http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd"
               indent="yes"/>
<xsl:template match="/">
<html xmlns="http://www.w3.org/1999/xhtml" lang="en">
	<head>
	<title>Compare Details</title>
		<style type="text/css">
			table {
				border-style: solid;
				border-width: 1px;
				border-color: #666666;
				border-collapse: collapse;
			}
			tbody {
				display:block
			}
			td {
				border-style: solid;
				border-width: 1px;
				border-color: #666666;
			}
			a {
				text-decoration: none;
				font-weight: bold;
			}
			.link {
				color:black;
			}
			.vis {
				display:block;
			}
			.vis tr {
					border-style: solid;
					border-width: 1px;
					border-color: #666666;
			}
			.vis th {
					border-style: solid;
					border-width: 1px;
					border-color: #666666;
					background-color:#CC9933
			}
		</style>
		<script type="text/javascript">
		<xsl:text disable-output-escaping="yes">&lt;</xsl:text>!-- Begin
			var element=false;
			function hideall() {
				var tBodyElements = document.getElementsByTagName('tbody');
				for (i=0;i <xsl:text disable-output-escaping="yes">&lt;</xsl:text> tBodyElements.length;i++) {
					tBodyElements[i].style.display='none';
				}
			}

			function showHide(tBodyID,link) {
				element=document.getElementById(tBodyID);
				if (element.style.display=='none') {
					document.getElementById(link).innerHTML=' - ';
					element.style.display='block';
				} else {
					document.getElementById(link).innerHTML=' + ';
					element.style.display='none';
				}
			}
			onload=hideall;
		// End --<xsl:text disable-output-escaping="yes">&gt;</xsl:text>
		</script>
	</head>
	<body>
		<div align="left">
			<xsl:apply-templates select="deltas"/>
		</div>
		<p>
			<a href="http://validator.w3.org/check?uri=referer">
				<img src="http://www.w3.org/Icons/valid-xhtml10-blue" alt="Valid XHTML 1.0 Strict" height="31" width="88"/>
			</a>
		</p>
	</body>
</html>
</xsl:template>
<xsl:template match="deltas">
	<table>
		<thead>
			<tr class="vis">
				<th class="vis">
					<span onclick="showHide('breaking', 'breakingspan')">
						<span id="breakingspan" class="link" > + </span> List of breaking changes
					</span>
				</th>
			</tr>
		</thead>
		<tbody id="breaking">
			<xsl:for-each select="delta">
				<xsl:if test="(@compatible='false')">
					<tr>
						<td>
							<xsl:value-of disable-output-escaping="yes" select="@message"/>
						</td>
					</tr>
				</xsl:if>
			</xsl:for-each>
		</tbody>
	</table>
	<p></p>
	<table>
		<thead>
			<tr class="vis">
				<th class="vis">
					<span onclick="showHide('compatible', 'compatiblespan')">
						<span id="compatiblespan" class="link"> + </span> List of compatible changes
					</span>
				</th>
			</tr>
		</thead>
		<tbody id="compatible">
			<xsl:for-each select="delta">
				<xsl:if test="(@compatible='true')">
					<tr>
						<td>
							<xsl:value-of disable-output-escaping="yes" select="@message"/>
						</td>
					</tr>
				</xsl:if>
			</xsl:for-each>
		</tbody>
	</table>
</xsl:template>
</xsl:stylesheet>




/*******************************************************************************
 * Copyright (c) 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
 * http://www.eclipse.org/legal/epl-v10.html
 *
 * Contributors:
 *     IBM Corporation - initial API and implementation
 *******************************************************************************/
package org.eclipse.pde.api.tools.internal.provisional;



/**
 * Listener interface for changes of the session manager.
 * 
 * @see ISessionManager#addSessionListener(ISessionListener)
 * @see ISessionManager#removeSessionListener(ISessionListener)
 */
public interface ISessionListener {

	/**
	 * Called when a session has been added.
	 * 
	 * @param addedSession the given added session
	 */  
	public void sessionAdded(ISession addedSession);

	/**
	 * Called when a session has been removed.
	 * 
	 * @param removedSession the given removed session
	 */
	public void sessionRemoved(ISession removedSession);
	
	/**
	 * Called when a new session has been activated or the last session has been
	 * removed. In this case <code>null</code> is passed as a parameter.
	 * 
	 * @param session the given activated session or <code>null</code>
	 */
	public void sessionActivated(ISession session);
}




/*******************************************************************************
 * Copyright (c) 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
 * http://www.eclipse.org/legal/epl-v10.html
 *
 * Contributors:
 *     IBM Corporation - initial API and implementation
 *******************************************************************************/
package org.eclipse.pde.api.tools.internal.provisional;

/**
 * The session manager holds a list of currently available sessions.
 *
 * @noimplement This interface is not intended to be implemented by clients.
 * @noextend This interface is not intended to be extended by clients.
 */
public interface ISessionManager {

	/**
	 * Adds the given session to this session manager. If the session is already
	 * part of this session manager, the method has no effect.
	 * 
	 * @param session the new session
	 * @param activate if <code>true</code> the session will also be activated, <code>false</code> otherwise
	 * @throws IllegalArgumentException if the given session is null
	 */
	public void addSession(ISession session, boolean activate);

	/**
	 * Removes the given session. If the session is not in included in this
	 * session manager, this method has no effect.
	 * 
	 * @param session the given session to remove
	 */
	public void removeSession(ISession session);

	/**
	 * Removes all available sessions.
	 */
	public void removeAllSessions();

	/**
	 * Returns all available sessions registered with this session manager.
	 * 
	 * @return list of available sessions
	 */
	public ISession[] getSessions();

	/**
	 * Adds the given session listener unless it has been added before.
	 * 
	 * @param listener the given session listener to add
	 * @throws IllegalArgumentException if the given listener is null
	 */
	public void addSessionListener(ISessionListener listener);

	/**
	 * Removes the given session listener. If the listener has not been added
	 * before this method has no effect.
	 * 
	 * @param listener the given session listener to remove
	 */
	public void removeSessionListener(ISessionListener listener);

	/**
	 * Returns the active session or <code>null</code> if there is no session.
	 * 
	 * @return active session or <code>null</null>
	 */
	public ISession getActiveSession();
	/**
	 * Activates the given session. If the session is not in included in this
	 * session manager this method has no effect.
	 * 
	 * @param session the given session or <code>null</code> to remove the active session.
	 */
	public void activateSession(ISession session);
}




/*******************************************************************************
 * 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

public class ActionMessages extends NLS {
	private static final String BUNDLE_NAME = "org.eclipse.pde.api.tools.ui.internal.actions.actionmessages"; //$NON-NLS-1$
	public static String ApiToolingSetupObjectContribution_0;
	public static String SelectABaseline;
	public static String SetAsDefault;
	public static String EnterFileName;
	public static String SelectFileName;
	public static String Browse;
	public static String ConvertToHtml;
	public static String CompareDialogTitle;
	public static String CompareDialogCollectingElementTaskName;
	public static String CompareDialogComputeDeltasTaskName;
	public static String CompareWithAction_comparing_apis;
	public static String CompareTaskNoChanges;
	public static String RemoveActiveSessionAction_label;
	public static String RemoveActiveSessionAction_tooltip;
	public static String RemoveAllSessionsAction_label;
	public static String RemoveAllSessionsAction_tooltip;
	public static String SelectSessionAction_label;
	public static String SelectSessionAction_tooltip;
	public static String SelectSessionActionEntry_label;
	public static String DeltaDetailsDialogTitle;
	public static String ExportSessionAction_label;
	public static String ExportSessionAction_tooltip;
	public static String EnterFileNameForExport;
	public static String ExportActionTitle;
	public static String PropertyPackageVisibility;

	public static String PropertyMessageKey;
	public static String PropertyComponentKey;
	public static String PropertyElementTypeKey;
	public static String PropertyFlagsKey;
	public static String PropertyKeyKey;
	public static String PropertyKindKey;
	public static String PropertyNewModifiersKey;
	public static String PropertyOldModifiersKey;
	public static String PropertyRestrictionsKey;
	public static String PropertyTypeNameKey;

	public static String MessageCategory;
	public static String InfoCategory;

	static {
		// initialize resource bundle
		NLS.initializeMessages(BUNDLE_NAME, ActionMessages.class);




###############################################################################
# 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

#     IBM Corporation - initial API and implementation
###############################################################################
ApiToolingSetupObjectContribution_0=Set up API tooling
SelectABaseline=Select a &baseline:
SetAsDefault={0} (default)
EnterFileName=Report &location:
SelectFileName=Select a report location
Browse=Bro&wse...
ConvertToHtml=Con&vert to html
CompareDialogTitle=Compare With Baseline
CompareDialogCollectingElementTaskName=Collecting elements to compare
CompareDialogComputeDeltasTaskName=Computing deltas...
CompareWithAction_comparing_apis=Comparing APIs...
CompareTaskNoChanges=No changes have been found
RemoveActiveSessionAction_label=Remove Active Session
RemoveActiveSessionAction_tooltip=Remove Active Session
RemoveAllSessionsAction_label=Remove All Sessions
RemoveAllSessionsAction_tooltip=Remove All Sessions
SelectSessionAction_label=Select Session
SelectSessionAction_tooltip=Select Session
# {0} int value
# {1} timestamp
SelectSessionActionEntry_label=Session {0} ({1})
DeltaDetailsDialogTitle=Delta Details
ExportSessionAction_label=Export Session
ExportSessionAction_tooltip=Export Session
EnterFileNameForExport=Enter a file name for export:
ExportActionTitle=Export Active Session

PropertyMessageKey=localized message
PropertyComponentKey=component
PropertyPackageVisibility=<package visibility>
PropertyElementTypeKey=element type
PropertyFlagsKey=flags
PropertyKeyKey=key
PropertyKindKey=kind
PropertyNewModifiersKey=new modifiers
PropertyOldModifiersKey=old modifiers
PropertyRestrictionsKey=restrictions
PropertyTypeNameKey=type name

MessageCategory=Message
InfoCategory=Info

Lines 23-31 Link Here

(-)src/org/eclipse/pde/api/tools/ui/internal/ApiUIPlugin.java (-145 / +183 lines)
23	import org.eclipse.jface.dialogs.IDialogSettings;	23	import org.eclipse.jface.dialogs.IDialogSettings;
24	import org.eclipse.jface.resource.ImageDescriptor;	24	import org.eclipse.jface.resource.ImageDescriptor;
25	import org.eclipse.jface.resource.ImageRegistry;	25	import org.eclipse.jface.resource.ImageRegistry;
		26	import org.eclipse.pde.api.tools.internal.provisional.ApiPlugin;
		27	import org.eclipse.pde.api.tools.internal.provisional.ISession;
		28	import org.eclipse.pde.api.tools.internal.provisional.ISessionListener;
		29	import org.eclipse.pde.api.tools.ui.internal.views.APIToolingView;
26	import org.eclipse.swt.graphics.Image;	30	import org.eclipse.swt.graphics.Image;
27	import org.eclipse.swt.widgets.Shell;	31	import org.eclipse.swt.widgets.Shell;
		32	import org.eclipse.ui.IViewPart;
		33	import org.eclipse.ui.IWorkbenchPage;
28	import org.eclipse.ui.IWorkbenchWindow;	34	import org.eclipse.ui.IWorkbenchWindow;
		35	import org.eclipse.ui.PartInitException;
29	import org.eclipse.ui.PlatformUI;	36	import org.eclipse.ui.PlatformUI;
30	import org.eclipse.ui.plugin.AbstractUIPlugin;	37	import org.eclipse.ui.plugin.AbstractUIPlugin;
31	import org.osgi.framework.Bundle;	38	import org.osgi.framework.Bundle;
Lines 38-87 Link Here
38	* @since 1.0.0	45	* @since 1.0.0
39	*/	46	*/
40	public class ApiUIPlugin extends AbstractUIPlugin {	47	public class ApiUIPlugin extends AbstractUIPlugin {
41
42	/**	48	/**
43	* Singleton plug-in	49	* Maps Image descriptors to images for composite images
44	*/
45	private static ApiUIPlugin fgDefault = null;
46
47	/**
48	* The id of the plugin
49	*/	50	*/
50	public static final String PLUGIN_ID = "org.eclipse.pde.api.tools.ui"; //$NON-NLS-1$	51	private static Map fCompositeImages = new HashMap();
51		52
52	/**	53	/**
53	* Status code indicating an unexpected internal error.	54	* Singleton plug-in
54	*/	55	*/
55	public static final int INTERNAL_ERROR = 120;	56	private static ApiUIPlugin fgDefault = null;
56		57
57	/**	58	/**
58	* Root path to icon directories.	59	* Root path to icon directories.
59	*/	60	*/
60	private static final String ICONS_PATH = "$nl$/icons/full/"; //$NON-NLS-1$	61	private static final String ICONS_PATH = "$nl$/icons/full/"; //$NON-NLS-1$
		62
		63	private static final String DLCL = ICONS_PATH + "dlcl16/"; //basic colors - size 16x16 disabled//$NON-NLS-1$
		64
		65	private static final String ELCL = ICONS_PATH + "elcl16/"; //basic colors - size 16x16 //$NON-NLS-1$
61		66
62	/**	67	/**
63	* Relative path to object model icons.	68	* Status code indicating an unexpected internal error.
64	*/	69	*/
65	private final static String OBJECT= ICONS_PATH + "obj16/"; //basic colors - size 16x16 //$NON-NLS-1$	70	public static final int INTERNAL_ERROR = 120;
66	private final static String OVR= ICONS_PATH + "ovr16/"; //basic colors - size 7x8 //$NON-NLS-1$
67	private final static String WIZBAN= ICONS_PATH + "wizban/"; //basic colors - size 16x16 //$NON-NLS-1$
68	private static final String ELCL= ICONS_PATH + "elcl16/"; //basic colors - size 16x16 //$NON-NLS-1$
69
70	/**	71	/**
71	* Maps Image descriptors to images for composite images	72	* Relative path to object model icons.
72	*/	73	*/
73	private static Map fCompositeImages = new HashMap();	74	private final static String OBJECT = ICONS_PATH + "obj16/"; //basic colors - size 16x16 //$NON-NLS-1$
74		75	private final static String OVR = ICONS_PATH + "ovr16/"; //basic colors - size 7x8 //$NON-NLS-1$
75	/**	76	/**
76	* This bundle's OSGi context	77	* The id of the plugin
77	*/	78	*/
78	private BundleContext fBundleContext = null;	79	public static final String PLUGIN_ID = "org.eclipse.pde.api.tools.ui"; //$NON-NLS-1$
		80	private final static String WIZBAN = ICONS_PATH + "wizban/"; //basic colors - size 16x16 //$NON-NLS-1$
79		81
80	/**	82	/**
81	* Constructor	83	* Declare an Image in the registry table.
		84	* @param reg image registry
		85	* @param key The key to use when registering the image
		86	* @param path The path where the image can be found. This path is relative to where
		87	* this plug-in class is found (i.e. typically the packages directory)
82	*/	88	*/
83	public ApiUIPlugin() {	89	private final static void declareRegistryImage(ImageRegistry reg, String key, String path) {
84	fgDefault = this;	90	ImageDescriptor desc = ImageDescriptor.getMissingImageDescriptor();
		91	Bundle bundle = Platform.getBundle(IApiToolsConstants.ID_API_TOOLS_UI_PLUGIN);
		92	URL url = null;
		93	if (bundle != null){
		94	url = FileLocator.find(bundle, new Path(path), null);
		95	desc = ImageDescriptor.createFromURL(url);
		96	}
		97	reg.put(key, desc);
85	}	98	}
86		99
87	/**	100	/**
Lines 97-142 Link Here
97	}	110	}
98		111
99	/**	112	/**
100	* Returns dialog settings with the given name, creating a new section	113	* Returns the image associated with the given image descriptor.
101	* if one does not exist.
102	*	114	*
103	* @param name section name	115	* @param descriptor the image descriptor for which there is a managed image
104	* @return dialog settings	116	* @return the image associated with the image descriptor or <code>null</code>
		117	* if the image descriptor can't create the requested image.
105	*/	118	*/
106	public IDialogSettings getDialogSettingsSection(String name) {	119	public static Image getImage(ImageDescriptor descriptor) {
107	IDialogSettings dialogSettings= getDialogSettings();	120	if (descriptor == null)
108	IDialogSettings section= dialogSettings.getSection(name);	121	descriptor= ImageDescriptor.getMissingImageDescriptor();
109	if (section == null) {	122
110	section= dialogSettings.addNewSection(name);	123	Image result= (Image)fCompositeImages.get(descriptor);
111	}	124	if (result != null)
112	return section;	125	return result;
		126
		127	result= descriptor.createImage();
		128	if (result != null)
		129	fCompositeImages.put(descriptor, result);
		130	return result;
		131	}
		132
		133	/**
		134	* Returns an image descriptor from the registry with the given key or <code>null</code> if none.
		135	*
		136	* @param key image key
		137	* @return image descriptor or <code>null</code>
		138	*/
		139	public static ImageDescriptor getImageDescriptor(String key) {
		140	return getDefault().getImageRegistry().getDescriptor(key);
113	}	141	}
114		142
115	/* (non-Javadoc)	143	/**
116	* @see org.eclipse.ui.plugin.AbstractUIPlugin#initializeImageRegistry(org.eclipse.jface.resource.ImageRegistry)	144	* @return the id of this plugin.
		145	* Value is <code><org.eclipse.pde.api.tools.ui></code>
117	*/	146	*/
118	protected void initializeImageRegistry(ImageRegistry reg) {	147	public static String getPluginIdentifier() {
119	// model objects	148	return PLUGIN_ID;
120	declareRegistryImage(reg, IApiToolsConstants.IMG_OBJ_API_COMPONENT, OBJECT + "api_tools.gif"); //$NON-NLS-1$
121	declareRegistryImage(reg, IApiToolsConstants.IMG_OBJ_API_SYSTEM_LIBRARY, OBJECT + "library_obj.gif"); //$NON-NLS-1$
122	declareRegistryImage(reg, IApiToolsConstants.IMG_OBJ_API_SEARCH, OBJECT + "extract_references.gif"); //$NON-NLS-1$
123	declareRegistryImage(reg, IApiToolsConstants.IMG_OBJ_BUNDLE, OBJECT + "plugin_obj.gif"); //$NON-NLS-1$
124	declareRegistryImage(reg, IApiToolsConstants.IMG_OBJ_FRAGMENT, OBJECT + "frgmt_obj.gif"); //$NON-NLS-1$
125	declareRegistryImage(reg, IApiToolsConstants.IMG_OBJ_ECLIPSE_PROFILE, OBJECT + "eclipse_profile.gif"); //$NON-NLS-1$
126	declareRegistryImage(reg, IApiToolsConstants.IMG_OBJ_BUNDLE_VERSION, OBJECT + "bundleversion.gif"); //$NON-NLS-1$
127	// overlays
128	declareRegistryImage(reg, IApiToolsConstants.IMG_OVR_ERROR, OVR + "error_ovr.gif"); //$NON-NLS-1$
129	declareRegistryImage(reg, IApiToolsConstants.IMG_OVR_WARNING, OVR + "warning_ovr.gif"); //$NON-NLS-1$
130	declareRegistryImage(reg, IApiToolsConstants.IMG_OVR_SUCCESS, OVR + "success_ovr.gif"); //$NON-NLS-1$
131	// wizards
132	declareRegistryImage(reg, IApiToolsConstants.IMG_WIZBAN_PROFILE, WIZBAN + "profile_wiz.png"); //$NON-NLS-1$
133	// enabled images
134	declareRegistryImage(reg, IApiToolsConstants.IMG_ELCL_FILTER, ELCL + "filter_ps.gif"); //$NON-NLS-1$
135	declareRegistryImage(reg, IApiToolsConstants.IMG_ELCL_REMOVE, ELCL + "remove_exc.gif"); //$NON-NLS-1$
136	declareRegistryImage(reg, IApiToolsConstants.IMG_ELCL_OPEN_PAGE, ELCL + "open_page.gif"); //$NON-NLS-1$
137	}	149	}
138		150
139	/**	151	/**
		152	* Returns an image from the registry with the given key or <code>null</code> if none.
		153	*
		154	* @param key image key
		155	* @return image or <code>null</code>
		156	*/
		157	public static Image getSharedImage(String key) {
		158	return getDefault().getImageRegistry().get(key);
		159	}
		160
		161	/**
		162	* Returns the currently active workbench window shell or <code>null</code>
		163	* if none.
		164	*
		165	* @return the currently active workbench window shell or <code>null</code>
		166	*/
		167	public static Shell getShell() {
		168	IWorkbenchWindow window = PlatformUI.getWorkbench().getActiveWorkbenchWindow();
		169	if (window == null) {
		170	IWorkbenchWindow[] windows = PlatformUI.getWorkbench().getWorkbenchWindows();
		171	if (windows.length > 0) {
		172	return windows[0].getShell();
		173	}
		174	}
		175	else {
		176	return window.getShell();
		177	}
		178	return null;
		179	}
		180
		181	/**
140	* Logs the specified status with this plug-in's log.	182	* Logs the specified status with this plug-in's log.
141	*	183	*
142	* @param status status to log	184	* @param status status to log
Lines 183-306 Link Here
183	}	225	}
184		226
185	/**	227	/**
186	* Returns the currently active workbench window shell or <code>null</code>	228	* This bundle's OSGi context
187	* if none.
188	*
189	* @return the currently active workbench window shell or <code>null</code>
190	*/
191	public static Shell getShell() {
192	IWorkbenchWindow window = PlatformUI.getWorkbench().getActiveWorkbenchWindow();
193	if (window == null) {
194	IWorkbenchWindow[] windows = PlatformUI.getWorkbench().getWorkbenchWindows();
195	if (windows.length > 0) {
196	return windows[0].getShell();
197	}
198	}
199	else {
200	return window.getShell();
201	}
202	return null;
203	}
204
205	/**
206	* @return the id of this plugin.
207	* Value is <code><org.eclipse.pde.api.tools.ui></code>
208	*/	229	*/
209	public static String getPluginIdentifier() {	230	private BundleContext fBundleContext = null;
210	return PLUGIN_ID;
211	}
212		231
213	/**	232	private ISessionListener sessionListener = new ISessionListener() {
214	* Declare an Image in the registry table.	233	public void sessionAdded(ISession addedSession) {
215	* @param reg image registry	234	getWorkbench().getDisplay().asyncExec(new Runnable() {
216	* @param key The key to use when registering the image	235	public void run() {
217	* @param path The path where the image can be found. This path is relative to where	236	showAPIToolingView();
218	* this plug-in class is found (i.e. typically the packages directory)	237	}
219	*/	238	});
220	private final static void declareRegistryImage(ImageRegistry reg, String key, String path) {
221	ImageDescriptor desc = ImageDescriptor.getMissingImageDescriptor();
222	Bundle bundle = Platform.getBundle(IApiToolsConstants.ID_API_TOOLS_UI_PLUGIN);
223	URL url = null;
224	if (bundle != null){
225	url = FileLocator.find(bundle, new Path(path), null);
226	desc = ImageDescriptor.createFromURL(url);
227	}	239	}
228	reg.put(key, desc);	240	public void sessionRemoved(ISession removedSession) {
229	}	241	}
230		242	public void sessionActivated(ISession session) {
		243	}
		244	};
		245
231	/**	246	/**
232	* Returns an image from the registry with the given key or <code>null</code> if none.	247	* Constructor
233	*
234	* @param key image key
235	* @return image or <code>null</code>
236	*/	248	*/
237	public static Image getSharedImage(String key) {	249	public ApiUIPlugin() {
238	return getDefault().getImageRegistry().get(key);	250	fgDefault = this;
239	}	251	}
240		252
241	/**	253	/**
242	* Returns the image associated with the given image descriptor.	254	* Returns a service with the specified name or <code>null</code> if none.
243	*	255	*
244	* @param descriptor the image descriptor for which there is a managed image	256	* @param serviceName name of service
245	* @return the image associated with the image descriptor or <code>null</code>	257	* @return service object or <code>null</code> if none
246	* if the image descriptor can't create the requested image.
247	*/	258	*/
248	public static Image getImage(ImageDescriptor descriptor) {	259	public Object acquireService(String serviceName) {
249	if (descriptor == null)	260	ServiceReference reference = fBundleContext.getServiceReference(serviceName);
250	descriptor= ImageDescriptor.getMissingImageDescriptor();	261	if (reference == null)
251		262	return null;
252	Image result= (Image)fCompositeImages.get(descriptor);	263	return fBundleContext.getService(reference);
253	if (result != null)
254	return result;
255
256	result= descriptor.createImage();
257	if (result != null)
258	fCompositeImages.put(descriptor, result);
259	return result;
260	}	264	}
261		265
262	/**	266	/**
263	* Returns an image descriptor from the registry with the given key or <code>null</code> if none.	267	* Returns dialog settings with the given name, creating a new section
		268	* if one does not exist.
264	*	269	*
265	* @param key image key	270	* @param name section name
266	* @return image descriptor or <code>null</code>	271	* @return dialog settings
267	*/	272	*/
268	public static ImageDescriptor getImageDescriptor(String key) {	273	public IDialogSettings getDialogSettingsSection(String name) {
269	return getDefault().getImageRegistry().getDescriptor(key);	274	IDialogSettings dialogSettings= getDialogSettings();
		275	IDialogSettings section= dialogSettings.getSection(name);
		276	if (section == null) {
		277	section= dialogSettings.addNewSection(name);
		278	}
		279	return section;
270	}	280	}
271		281
272	/* (non-Javadoc)	282	/* (non-Javadoc)
273	* @see org.eclipse.ui.plugin.AbstractUIPlugin#stop(org.osgi.framework.BundleContext)	283	* @see org.eclipse.ui.plugin.AbstractUIPlugin#initializeImageRegistry(org.eclipse.jface.resource.ImageRegistry)
274	*/	284	*/
275	public void stop(BundleContext context) throws Exception {	285	protected void initializeImageRegistry(ImageRegistry reg) {
276	// dispose composite images	286	// model objects
277	for (Iterator iter= fCompositeImages.values().iterator(); iter.hasNext(); ) {	287	declareRegistryImage(reg, IApiToolsConstants.IMG_OBJ_API_COMPONENT, OBJECT + "api_tools.gif"); //$NON-NLS-1$
278	Image image= (Image)iter.next();	288	declareRegistryImage(reg, IApiToolsConstants.IMG_OBJ_API_SYSTEM_LIBRARY, OBJECT + "library_obj.gif"); //$NON-NLS-1$
279	image.dispose();	289	declareRegistryImage(reg, IApiToolsConstants.IMG_OBJ_API_SEARCH, OBJECT + "extract_references.gif"); //$NON-NLS-1$
		290	declareRegistryImage(reg, IApiToolsConstants.IMG_OBJ_BUNDLE, OBJECT + "plugin_obj.gif"); //$NON-NLS-1$
		291	declareRegistryImage(reg, IApiToolsConstants.IMG_OBJ_FRAGMENT, OBJECT + "frgmt_obj.gif"); //$NON-NLS-1$
		292	declareRegistryImage(reg, IApiToolsConstants.IMG_OBJ_ECLIPSE_PROFILE, OBJECT + "eclipse_profile.gif"); //$NON-NLS-1$
		293	declareRegistryImage(reg, IApiToolsConstants.IMG_OBJ_BUNDLE_VERSION, OBJECT + "bundleversion.gif"); //$NON-NLS-1$
		294
		295	// overlays
		296	declareRegistryImage(reg, IApiToolsConstants.IMG_OVR_ERROR, OVR + "error_ovr.gif"); //$NON-NLS-1$
		297	declareRegistryImage(reg, IApiToolsConstants.IMG_OVR_WARNING, OVR + "warning_ovr.gif"); //$NON-NLS-1$
		298	declareRegistryImage(reg, IApiToolsConstants.IMG_OVR_SUCCESS, OVR + "success_ovr.gif"); //$NON-NLS-1$
		299	// wizards
		300	declareRegistryImage(reg, IApiToolsConstants.IMG_WIZBAN_PROFILE, WIZBAN + "profile_wiz.png"); //$NON-NLS-1$
		301	// enabled images
		302	declareRegistryImage(reg, IApiToolsConstants.IMG_ELCL_FILTER, ELCL + "filter_ps.gif"); //$NON-NLS-1$
		303	declareRegistryImage(reg, IApiToolsConstants.IMG_ELCL_REMOVE, ELCL + "remove_exc.gif"); //$NON-NLS-1$
		304	declareRegistryImage(reg, IApiToolsConstants.IMG_ELCL_OPEN_PAGE, ELCL + "open_page.gif"); //$NON-NLS-1$
		305	declareRegistryImage(reg, IApiToolsConstants.IMG_ELCL_COMPARE_APIS, ELCL + "compare_apis.gif"); //$NON-NLS-1$
		306	declareRegistryImage(reg, IApiToolsConstants.IMG_ELCL_COMPARE_APIS_DISABLED, DLCL + "compare_apis.gif"); //$NON-NLS-1$
		307	}
		308	void showAPIToolingView() {
		309	IWorkbenchWindow window = getWorkbench().getActiveWorkbenchWindow();
		310	if (window == null) return;
		311	IWorkbenchPage page = window.getActivePage();
		312	if (page != null) {
		313	try {
		314	IViewPart view = page.showView(APIToolingView.ID, null, IWorkbenchPage.VIEW_CREATE);
		315	page.bringToTop(view);
		316	} catch (PartInitException e) {
		317	log(e);
		318	}
280	}	319	}
281	fCompositeImages.clear();
282	fBundleContext = null;
283	super.stop(context);
284	}	320	}
285
286	/* (non-Javadoc)	321	/* (non-Javadoc)
287	* @see org.eclipse.ui.plugin.AbstractUIPlugin#start(org.osgi.framework.BundleContext)	322	* @see org.eclipse.ui.plugin.AbstractUIPlugin#start(org.osgi.framework.BundleContext)
288	*/	323	*/
289	public void start(BundleContext context) throws Exception {	324	public void start(BundleContext context) throws Exception {
290	fBundleContext = context;	325	fBundleContext = context;
		326	ApiPlugin.getDefault().getSessionManager().addSessionListener(this.sessionListener);
291	super.start(context);	327	super.start(context);
292	}	328	}
293		329
294	/**	330	/* (non-Javadoc)
295	* Returns a service with the specified name or <code>null</code> if none.	331	* @see org.eclipse.ui.plugin.AbstractUIPlugin#stop(org.osgi.framework.BundleContext)
296	*
297	* @param serviceName name of service
298	* @return service object or <code>null</code> if none
299	*/	332	*/
300	public Object acquireService(String serviceName) {	333	public void stop(BundleContext context) throws Exception {
301	ServiceReference reference = fBundleContext.getServiceReference(serviceName);	334	// dispose composite images
302	if (reference == null)	335	for (Iterator iter= fCompositeImages.values().iterator(); iter.hasNext(); ) {
303	return null;	336	Image image= (Image)iter.next();
304	return fBundleContext.getService(reference);	337	image.dispose();
		338	}
		339	fCompositeImages.clear();
		340	fBundleContext = null;
		341	ApiPlugin.getDefault().getSessionManager().removeSessionListener(this.sessionListener);
		342	super.stop(context);
305	}	343	}
306	}	344	}

Lines 14-118 Link Here

(-)src/org/eclipse/pde/api/tools/ui/internal/IApiToolsConstants.java (-50 / +56 lines)
14	* @since 1.0.0	14	* @since 1.0.0
15	*/	15	*/
16	public interface IApiToolsConstants {	16	public interface IApiToolsConstants {
17		17	/**
		18	* Empty String constant
		19	*/
		20	public static final String EMPTY_STRING = ""; //$NON-NLS-1$
18	/**	21	/**
19	* Plug-in identifier	22	* Plug-in identifier
20	*/	23	*/
21	public static final String ID_API_TOOLS_UI_PLUGIN = "org.eclipse.pde.api.tools.ui"; //$NON-NLS-1$	24	public static final String ID_API_TOOLS_UI_PLUGIN = "org.eclipse.pde.api.tools.ui"; //$NON-NLS-1$
22	/**	25	/**
23	* Empty String constant	26	* Id for the Api baselines preference page.
		27	* <br>
		28	* Value is: <code>org.eclipse.pde.api.tools.ui.apiprofiles.prefpage</code>
24	*/	29	*/
25	public static final String EMPTY_STRING = ""; //$NON-NLS-1$	30	public static final String ID_BASELINES_PREF_PAGE = "org.eclipse.pde.api.tools.ui.apiprofiles.prefpage"; //$NON-NLS-1$
26	/**	31	/**
27	* Key for API component image.	32	* Id for the API errors / warnings preference page
		33	* <br>
		34	* Value is: <code>org.eclipse.pde.api.tools.ui.apitools.errorwarnings.prefpage</code>
28	*/	35	*/
29	public static final String IMG_OBJ_API_COMPONENT = "IMG_OBJ_API_COMPONENT"; //$NON-NLS-1$	36	public static final String ID_ERRORS_WARNINGS_PREF_PAGE = "org.eclipse.pde.api.tools.ui.apitools.errorwarnings.prefpage"; //$NON-NLS-1$
		37
30	/**	38	/**
31	* Key for API system component image	39	* The id for the API errors / warnings property page
		40	* <br>
		41	* Value is: <code>org.eclipse.pde.api.tools.ui.apitools.warningspage</code>
32	*/	42	*/
33	public static final String IMG_OBJ_API_SYSTEM_LIBRARY = "IMG_OBJ_API_SYSTEM_LIBRARY"; //$NON-NLS-1$	43	public static final String ID_ERRORS_WARNINGS_PROP_PAGE = "org.eclipse.pde.api.tools.ui.apitools.warningspage"; //$NON-NLS-1$
34		44
35	/**	45	/**
36	* Key for API search image	46	* The id for the API problem filters property page
		47	* <br>
		48	* Value is: <code>org.eclipse.pde.api.tools.ui.apitools.filterspage</code>
37	*/	49	*/
38	public static final String IMG_OBJ_API_SEARCH = "IMG_OBJ_API_SEARCH"; //$NON-NLS-1$	50	public static final String ID_FILTERS_PROP_PAGE = "org.eclipse.pde.api.tools.ui.apitools.filterspage"; //$NON-NLS-1$
39		51
40	/**	52	/**
41	* Key for bundle image	53	* Key for a compare api image
42	*/	54	*/
43	public static final String IMG_OBJ_BUNDLE = "IMG_OBJ_BUNDLE"; //$NON-NLS-1$	55	public static final String IMG_ELCL_COMPARE_APIS = "IMG_ELCL_COMPARE_APIS"; //$NON-NLS-1$
44
45	/**	56	/**
46	* Key for fragment image	57	* Key for a compare api disabled image
47	*/	58	*/
48	public static final String IMG_OBJ_FRAGMENT = "IMG_OBJ_FRAGMENT"; //$NON-NLS-1$	59	public static final String IMG_ELCL_COMPARE_APIS_DISABLED = "IMG_ELCL_COMPARE_APIS_DISABLED"; //$NON-NLS-1$
49
50	/**	60	/**
51	* Key for Eclipse SDK/API profile image	61	* Key for filter resolution image
52	*/	62	*/
53	public static final String IMG_OBJ_ECLIPSE_PROFILE = "IMG_OBJ_ECLIPSE_PROFILE"; //$NON-NLS-1$	63	public static final String IMG_ELCL_FILTER = "IMG_ELCL_FILTER"; //$NON-NLS-1$
54		64
55	/**	65	/**
56	* Key for a bundle version image	66	* Key for the open page image
57	*/	67	*/
58	public static final String IMG_OBJ_BUNDLE_VERSION = "IMG_OBJ_BUNDLE_VERSION"; //$NON-NLS-1$	68	public static final String IMG_ELCL_OPEN_PAGE = "IMG_ELCL_OPEN_PAGE"; //$NON-NLS-1$
59		69
60	/**	70	/**
61	* Error overlay.	71	* Key for enabled remove image
62	*/	72	*/
63	public static final String IMG_OVR_ERROR = "IMG_OVR_ERROR"; //$NON-NLS-1$	73	public static final String IMG_ELCL_REMOVE = "IMG_ELCL_REMOVE"; //$NON-NLS-1$
64		74
65	/**	75	/**
66	* Warning overlay	76	* Key for API component image.
67	*/	77	*/
68	public static final String IMG_OVR_WARNING = "IMG_OVR_WARNING"; //$NON-NLS-1$	78	public static final String IMG_OBJ_API_COMPONENT = "IMG_OBJ_API_COMPONENT"; //$NON-NLS-1$
69		79
70	/**	80	/**
71	* Success overlay	81	* Key for API search image
72	*/	82	*/
73	public static final String IMG_OVR_SUCCESS = "IMG_OVR_SUCCESS"; //$NON-NLS-1$	83	public static final String IMG_OBJ_API_SEARCH = "IMG_OBJ_API_SEARCH"; //$NON-NLS-1$
74		84
75	/**	85	/**
76	* Wizard banner for editing an API profile	86	* Key for API system component image
77	*/	87	*/
78	public static final String IMG_WIZBAN_PROFILE = "IMG_WIZBAN_PROFILE"; //$NON-NLS-1$	88	public static final String IMG_OBJ_API_SYSTEM_LIBRARY = "IMG_OBJ_API_SYSTEM_LIBRARY"; //$NON-NLS-1$
79		89
80	/**	90	/**
81	* Id for the Api baselines preference page.	91	* Key for bundle image
82	* <br>
83	* Value is: <code>org.eclipse.pde.api.tools.ui.apiprofiles.prefpage</code>
84	*/	92	*/
85	public static final String ID_BASELINES_PREF_PAGE = "org.eclipse.pde.api.tools.ui.apiprofiles.prefpage"; //$NON-NLS-1$	93	public static final String IMG_OBJ_BUNDLE = "IMG_OBJ_BUNDLE"; //$NON-NLS-1$
86	/**	94	/**
87	* Id for the API errors / warnings preference page	95	* Key for a bundle version image
88	* <br>
89	* Value is: <code>org.eclipse.pde.api.tools.ui.apitools.errorwarnings.prefpage</code>
90	*/	96	*/
91	public static final String ID_ERRORS_WARNINGS_PREF_PAGE = "org.eclipse.pde.api.tools.ui.apitools.errorwarnings.prefpage"; //$NON-NLS-1$	97	public static final String IMG_OBJ_BUNDLE_VERSION = "IMG_OBJ_BUNDLE_VERSION"; //$NON-NLS-1$
92	/**	98	/**
93	* The id for the API problem filters property page	99	* Key for Eclipse SDK/API profile image
94	* <br>
95	* Value is: <code>org.eclipse.pde.api.tools.ui.apitools.filterspage</code>
96	*/	100	*/
97	public static final String ID_FILTERS_PROP_PAGE = "org.eclipse.pde.api.tools.ui.apitools.filterspage"; //$NON-NLS-1$	101	public static final String IMG_OBJ_ECLIPSE_PROFILE = "IMG_OBJ_ECLIPSE_PROFILE"; //$NON-NLS-1$
98	/**	102	/**
99	* The id for the API errors / warnings property page	103	* Key for fragment image
100	* <br>
101	* Value is: <code>org.eclipse.pde.api.tools.ui.apitools.warningspage</code>
102	*/	104	*/
103	public static final String ID_ERRORS_WARNINGS_PROP_PAGE = "org.eclipse.pde.api.tools.ui.apitools.warningspage"; //$NON-NLS-1$	105	public static final String IMG_OBJ_FRAGMENT = "IMG_OBJ_FRAGMENT"; //$NON-NLS-1$
104	/**	106	/**
105	* Key for filter resolution image	107	* Error overlay.
106	*/	108	*/
107	public static final String IMG_ELCL_FILTER = "IMG_ELCL_FILTER"; //$NON-NLS-1$	109	public static final String IMG_OVR_ERROR = "IMG_OVR_ERROR"; //$NON-NLS-1$
108		110
109	/**	111	/**
110	* Key for enabled remove image	112	* Success overlay
111	*/	113	*/
112	public static final String IMG_ELCL_REMOVE = "IMG_ELCL_REMOVE"; //$NON-NLS-1$	114	public static final String IMG_OVR_SUCCESS = "IMG_OVR_SUCCESS"; //$NON-NLS-1$
113		115
114	/**	116	/**
115	* Key for the open page image	117	* Warning overlay
116	*/	118	*/
117	public static final String IMG_ELCL_OPEN_PAGE = "IMG_ELCL_OPEN_PAGE"; //$NON-NLS-1$	119	public static final String IMG_OVR_WARNING = "IMG_OVR_WARNING"; //$NON-NLS-1$
		120	/**
		121	* Wizard banner for editing an API profile
		122	*/
		123	public static final String IMG_WIZBAN_PROFILE = "IMG_WIZBAN_PROFILE"; //$NON-NLS-1$
118	}	124	}

Lines 33-37 Link Here

(-)META-INF/MANIFEST.MF (+1 lines)
33	org.eclipse.pde.api.tools.ui.internal.preferences;x-friends:="org.eclipse.pde.api.tools.tests",	33	org.eclipse.pde.api.tools.ui.internal.preferences;x-friends:="org.eclipse.pde.api.tools.tests",
34	org.eclipse.pde.api.tools.ui.internal.properties;x-friends:="org.eclipse.pde.api.tools.tests",	34	org.eclipse.pde.api.tools.ui.internal.properties;x-friends:="org.eclipse.pde.api.tools.tests",
35	org.eclipse.pde.api.tools.ui.internal.refactoring;x-internal:=true,	35	org.eclipse.pde.api.tools.ui.internal.refactoring;x-internal:=true,
		36	org.eclipse.pde.api.tools.ui.internal.views;x-internal:=true,
36	org.eclipse.pde.api.tools.ui.internal.wizards;x-friends:="org.eclipse.pde.api.tools.tests"	37	org.eclipse.pde.api.tools.ui.internal.wizards;x-friends:="org.eclipse.pde.api.tools.tests"
37	Import-Package: com.ibm.icu.text;version="3.6.1"	38	Import-Package: com.ibm.icu.text;version="3.6.1"

Lines 1-5 Link Here

(-)plugin.properties (-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 43-48 Link Here
43	ApiToolsJavadocProposals.name = API Tools Javadoc Proposals	43	ApiToolsJavadocProposals.name = API Tools Javadoc Proposals
44	MarkerGroupingEntryLabel=API Usage and Compatibility	44	MarkerGroupingEntryLabel=API Usage and Compatibility
45	ApiToolsProposalCategory.name = PDE API Tools Proposals	45	ApiToolsProposalCategory.name = PDE API Tools Proposals
		46	APICompare.name=API Baseline...
		47	Apitoolingview.name=API Tooling
		48	Apitoolingview.category.name=API Tooling
46	FilterDeleteParticipant.name = API Problem Filter Delete Participant	49	FilterDeleteParticipant.name = API Problem Filter Delete Participant
47	FilterRenameParticipant.name = API Problem Filter Rename Participant	50	FilterRenameParticipant.name = API Problem Filter Rename Participant
48	FilterMoveParticipant.name = API Problem Filter Move Participant	51	FilterMoveParticipant.name = API Problem Filter Move Participant
		52	CompareWithMenu.label=Compare With




               value="org.eclipse.pde.api.tools.apiAnalysisNature">
         </filter>
      </objectContribution>
      <objectContribution
            adaptable="false"
            id="org.eclipse.pde.api.tools.ui.compare"
            objectClass="org.eclipse.jdt.core.IJavaElement">
         <action
               class="org.eclipse.pde.api.tools.ui.internal.actions.CompareWithAction"
               enablesFor="+"
               id="org.eclipse.pde.api.tools.ui.action.compare"
               label="%APICompare.name"
               menubarPath="compareWithMenu/compareWithGroup">
         </action>
         <menu
               label="%CompareWithMenu.label"
               path="additions"
               id="compareWithMenu">
            <separator
                  name="compareWithGroup">
            </separator>
         </menu>
      </objectContribution>
   </extension>
   <extension
         point="org.eclipse.ui.propertyPages">

      </markerResolutionGenerator>
   </extension>
   <extension
         point="org.eclipse.ui.views">
      <category
            id="org.eclipse.pde.api.tools.ui.views.apitooling.view.category"
            name="%Apitoolingview.category.name">
      </category>
      <view
            category="org.eclipse.pde.api.tools.ui.views.apitooling.view.category"
            class="org.eclipse.pde.api.tools.ui.internal.views.APIToolingView"
            icon="icons/full/obj16/api_tools.gif"
            id="org.eclipse.pde.api.tools.ui.views.apitooling.views.apitoolingview"
            name="%Apitoolingview.name">
      </view>
   </extension>
   <extension
         point="org.eclipse.ltk.core.refactoring.renameParticipants">
      <renameParticipant
            class="org.eclipse.pde.api.tools.ui.internal.refactoring.FilterRenameParticipant"




/*******************************************************************************
 * Copyright (c) 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
 * http://www.eclipse.org/legal/epl-v10.html
 *
 * Contributors:
 *     IBM Corporation - initial API and implementation
 *******************************************************************************/
package org.eclipse.pde.api.tools.ui.internal.actions;
import org.eclipse.jface.action.Action;
import org.eclipse.jface.resource.ImageDescriptor;
import org.eclipse.pde.api.tools.internal.provisional.ApiPlugin;
import org.eclipse.ui.ISharedImages;
import org.eclipse.ui.PlatformUI;

/**
 * This action removes the active session.
 */
public class RemoveAllSessionsAction extends Action {

	public RemoveAllSessionsAction() {
		setText(ActionMessages.RemoveAllSessionsAction_label);
		setToolTipText(ActionMessages.RemoveAllSessionsAction_tooltip);
		ImageDescriptor enabledImageDescriptor = PlatformUI.getWorkbench().getSharedImages().getImageDescriptor(ISharedImages.IMG_ELCL_REMOVEALL);
		//ImageDescriptor enabledImageDescriptor = PlatformUI.getWorkbench().getSharedImages().getImageDescriptor(ISharedImages.IMG_TOOL_DELETE);
		setImageDescriptor(enabledImageDescriptor);
		ImageDescriptor disabledImageDescriptor = PlatformUI.getWorkbench().getSharedImages().getImageDescriptor(ISharedImages.IMG_ELCL_REMOVEALL_DISABLED);
		//ImageDescriptor disabledImageDescriptor = PlatformUI.getWorkbench().getSharedImages().getImageDescriptor(ISharedImages.IMG_TOOL_DELETE_DISABLED);
		setDisabledImageDescriptor(disabledImageDescriptor);
	}

	public void run() {
		ApiPlugin.getDefault().getSessionManager().removeAllSessions();
	}
}




/*******************************************************************************
 * Copyright (c) 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
 * http://www.eclipse.org/legal/epl-v10.html
 *
 * Contributors:
 *     IBM Corporation - initial API and implementation
 *******************************************************************************/
package org.eclipse.pde.api.tools.ui.internal.actions;

import org.eclipse.jface.action.Action;
import org.eclipse.jface.action.IMenuCreator;
import org.eclipse.osgi.util.NLS;
import org.eclipse.pde.api.tools.internal.provisional.ApiPlugin;
import org.eclipse.pde.api.tools.internal.provisional.ISession;
import org.eclipse.pde.api.tools.internal.provisional.ISessionManager;
import org.eclipse.pde.api.tools.ui.internal.ApiUIPlugin;
import org.eclipse.pde.api.tools.ui.internal.IApiToolsConstants;
import org.eclipse.swt.SWT;
import org.eclipse.swt.events.SelectionAdapter;
import org.eclipse.swt.events.SelectionEvent;
import org.eclipse.swt.widgets.Control;
import org.eclipse.swt.widgets.Menu;
import org.eclipse.swt.widgets.MenuItem;

/**
 * Drop-down action to select the active session.
 */
public class SelectSessionAction extends Action implements IMenuCreator {

	private Menu menu;

	public SelectSessionAction() {
		setText(ActionMessages.SelectSessionAction_label);
		setToolTipText(ActionMessages.SelectSessionAction_tooltip);
		setImageDescriptor(ApiUIPlugin.getImageDescriptor(IApiToolsConstants.IMG_ELCL_COMPARE_APIS));
		setDisabledImageDescriptor(ApiUIPlugin.getImageDescriptor(IApiToolsConstants.IMG_ELCL_COMPARE_APIS_DISABLED));
		setMenuCreator(this);
		setEnabled(false);
	}

	public Menu getMenu(Control parent) {
		if (menu != null) {
			menu.dispose();
		}
		menu = new Menu(parent);

		final ISessionManager manager = ApiPlugin.getDefault().getSessionManager();
		ISession[] sessions = manager.getSessions();
		ISession active = manager.getActiveSession();
		for (int i = 0; i < sessions.length; i++) {
			final ISession session = sessions[i];
			MenuItem item = new MenuItem(menu, SWT.RADIO);
			Object[] labelparams = new Object[] { new Integer(i + 1), session.getTimestamp()};
			item.setText(NLS.bind(ActionMessages.SelectSessionActionEntry_label,
					labelparams));
			item.setSelection(session == active);
			item.addSelectionListener(new SelectionAdapter() {
				public void widgetSelected(SelectionEvent e) {
					manager.activateSession(session);
				}
			});
		}
		return menu;
	}

	public Menu getMenu(Menu parent) {
		return null;
	}

	public void dispose() {
	}

}




/*******************************************************************************
 * Copyright (c) 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
 * http://www.eclipse.org/legal/epl-v10.html
 *
 * Contributors:
 *     IBM Corporation - initial API and implementation
 *******************************************************************************/
package org.eclipse.pde.api.tools.ui.internal.actions;
import org.eclipse.jface.action.Action;
import org.eclipse.jface.resource.ImageDescriptor;
import org.eclipse.pde.api.tools.internal.provisional.ApiPlugin;
import org.eclipse.pde.api.tools.internal.provisional.ISession;
import org.eclipse.pde.api.tools.internal.provisional.ISessionManager;
import org.eclipse.ui.ISharedImages;
import org.eclipse.ui.PlatformUI;
import org.eclipse.ui.actions.ActionFactory;

/**
 * This action removes the active session.
 */
public class RemoveActiveSessionAction extends Action {

	public RemoveActiveSessionAction() {
		setText(ActionMessages.RemoveActiveSessionAction_label);
		setToolTipText(ActionMessages.RemoveActiveSessionAction_tooltip);
		ImageDescriptor enabledImageDescriptor = PlatformUI.getWorkbench().getSharedImages().getImageDescriptor(ISharedImages.IMG_ELCL_REMOVE);
		//ImageDescriptor enabledImageDescriptor = PlatformUI.getWorkbench().getSharedImages().getImageDescriptor(ISharedImages.IMG_TOOL_DELETE);
		setImageDescriptor(enabledImageDescriptor);
		ImageDescriptor disabledImageDescriptor = PlatformUI.getWorkbench().getSharedImages().getImageDescriptor(ISharedImages.IMG_ELCL_REMOVE_DISABLED);
		//ImageDescriptor disabledImageDescriptor = PlatformUI.getWorkbench().getSharedImages().getImageDescriptor(ISharedImages.IMG_TOOL_DELETE_DISABLED);
		setDisabledImageDescriptor(disabledImageDescriptor);
		setActionDefinitionId(ActionFactory.DELETE.getCommandId());
	}

	public void run() {
		ISessionManager manager = ApiPlugin.getDefault().getSessionManager();
		ISession session = manager.getActiveSession();
		if (session != null) {
			manager.removeSession(session);
		}
		ISession[] sessions = manager.getSessions();
		int length = sessions.length;
		if (length > 0) {
			manager.activateSession(sessions[length - 1]);
		}
	}
}




/*******************************************************************************
 * Copyright (c) 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
 * http://www.eclipse.org/legal/epl-v10.html
 *
 * Contributors:
 *     IBM Corporation - initial API and implementation
 *******************************************************************************/
package org.eclipse.pde.api.tools.ui.internal.actions;

import java.util.Arrays;

import org.eclipse.jface.dialogs.Dialog;
import org.eclipse.jface.dialogs.IDialogSettings;
import org.eclipse.jface.window.IShellProvider;
import org.eclipse.osgi.util.NLS;
import org.eclipse.pde.api.tools.internal.provisional.ApiPlugin;
import org.eclipse.pde.api.tools.internal.provisional.IApiBaselineManager;
import org.eclipse.pde.api.tools.internal.provisional.model.IApiBaseline;
import org.eclipse.pde.api.tools.ui.internal.ApiUIPlugin;
import org.eclipse.pde.api.tools.ui.internal.SWTFactory;
import org.eclipse.swt.SWT;
import org.eclipse.swt.events.SelectionAdapter;
import org.eclipse.swt.events.SelectionEvent;
import org.eclipse.swt.layout.GridData;
import org.eclipse.swt.widgets.Combo;
import org.eclipse.swt.widgets.Composite;
import org.eclipse.swt.widgets.Control;
import org.eclipse.swt.widgets.Shell;

/**
 * Compares {@link org.eclipse.pde.api.tools.internal.provisional.model.IApiElement}s
 * to a given {@link IApiBaseline} to get a delta
 * 
 * @since 1.0.1
 */
public class CompareDialog extends Dialog {

	//widget state ids 
	static final String SETTINGS_SECTION = ApiUIPlugin.PLUGIN_ID + ".api.compare"; //$NON-NLS-1$
	static final String BASELINE_STATE = SETTINGS_SECTION + ".baseline"; //$NON-NLS-1$
	
	public String baseline = null;
	String title = null;;
	Combo baselinecombo = null;

	/**
	 * Constructor
	 * @param provider
	 * @param title
	 */
	public CompareDialog(IShellProvider provider, String title) {
		super(provider);
		this.title = title;
	}

	/* (non-Javadoc)
	 * @see org.eclipse.jface.window.Window#configureShell(org.eclipse.swt.widgets.Shell)
	 */
	protected void configureShell(Shell newShell) {
		super.configureShell(newShell);
		newShell.setText(this.title);
	}
	
	/* (non-Javadoc)
	 * @see org.eclipse.jface.dialogs.Dialog#isResizable()
	 */
	protected boolean isResizable() {
		return true;
	}
	
	/* (non-Javadoc)
	 * @see org.eclipse.jface.dialogs.Dialog#createDialogArea(org.eclipse.swt.widgets.Composite)
	 */
	protected Control createDialogArea(Composite parent) {
		Composite comp = SWTFactory.createComposite(parent, 2, 1, GridData.FILL_HORIZONTAL);
		GridData gd = (GridData) comp.getLayoutData();
		gd.widthHint = 310;
		
		SWTFactory.createWrapLabel(comp, ActionMessages.SelectABaseline, 2);
		this.baselinecombo = SWTFactory.createCombo(comp, SWT.BORDER | SWT.FLAT | SWT.READ_ONLY, 2, GridData.FILL_HORIZONTAL, null);
		this.baselinecombo.addSelectionListener(new SelectionAdapter(){
			public void widgetSelected(SelectionEvent e) {
				Combo combo = (Combo) e.widget;
				String[] baselineNames = (String[]) combo.getData();
				String selectedBaselineName = baselineNames[combo.getSelectionIndex()];
				CompareDialog.this.baseline = selectedBaselineName;
			}
		});
		initialize();
		return comp;
	}
	
	/**
	 * Initializes the controls
	 */
	void initialize() {
		IApiBaselineManager apiBaselineManager = ApiPlugin.getDefault().getApiBaselineManager();
		IApiBaseline defaultBaseline = apiBaselineManager.getDefaultApiBaseline();
		String defaultBaselineName = defaultBaseline != null ? defaultBaseline.getName() : null;
		IApiBaseline[] baselines = apiBaselineManager.getApiBaselines();
		int length = baselines.length;
		String[] baselinesItems = new String[length];
		String[] baselinesNames = new String[length];
		// set the names
		for (int i = 0; i < length; i++) {
			String currentBaselineName = baselines[i].getName();
			baselinesNames[i] = currentBaselineName;
		}
		Arrays.sort(baselinesNames);
		// set the labels
		int index = 0;
		for (int i = 0; i < length; i++) {
			String currentBaselineName = baselinesNames[i];
			if (defaultBaselineName != null && defaultBaselineName.equals(currentBaselineName)) {
				baselinesItems[i] = NLS.bind(ActionMessages.SetAsDefault, currentBaselineName);
				this.baseline = currentBaselineName;
				index = i;
			} else {
				baselinesItems[i] = currentBaselineName;
			}
		}
		this.baselinecombo.setItems(baselinesItems);
		this.baselinecombo.setData(baselinesNames);
		this.baselinecombo.select(index);
		
		IDialogSettings settings = ApiUIPlugin.getDefault().getDialogSettings().getSection(SETTINGS_SECTION);
		if(settings != null) {
			restoreComboSelection(this.baselinecombo, BASELINE_STATE, settings, baselinesNames);
		}
	}
	
	/* (non-Javadoc)
	 * @see org.eclipse.jface.dialogs.Dialog#okPressed()
	 */
	protected void okPressed() {
		saveWidgetState();
		super.okPressed();
	}
	/**
	 * Restores the selected item for the given combo based on the stored value from the 
	 * dialog settings
	 * 
	 * @param combo
	 * @param id
	 * @param settings
	 */
	private void restoreComboSelection(Combo combo, String id, IDialogSettings settings, String[] baselinesNames) {
		String value = settings.get(id);
		if(value != null) {
			CompareDialog.this.baseline = value;
			// retrieve the right index in the combo
			int index = 0;
			int length = baselinesNames.length;
			for (int i = 0; i < length; i++) {
				String currentBaselineName = baselinesNames[i];
				if (value.equals(currentBaselineName)) {
					index = i;
					break;
				}
			}
			combo.select(index);
		}
	}
	
	/**
	 * Saves the state of the widgets on the page
	 */
	void saveWidgetState() {
		IDialogSettings rootsettings = ApiUIPlugin.getDefault().getDialogSettings();
		IDialogSettings settings = rootsettings.getSection(SETTINGS_SECTION);
		if(settings == null) {
			settings = rootsettings.addNewSection(SETTINGS_SECTION);
		}
		settings.put(BASELINE_STATE, this.baseline);
	}
}




/*******************************************************************************
 * Copyright (c) 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
 * http://www.eclipse.org/legal/epl-v10.html
 *
 * Contributors:
 *     IBM Corporation - initial API and implementation
 *******************************************************************************/
package org.eclipse.pde.api.tools.ui.internal.views;

import org.eclipse.core.runtime.CoreException;
import org.eclipse.jdt.core.Flags;
import org.eclipse.jdt.ui.JavaUI;
import org.eclipse.jface.action.Action;
import org.eclipse.jface.action.IAction;
import org.eclipse.jface.action.IMenuManager;
import org.eclipse.jface.action.IToolBarManager;
import org.eclipse.jface.action.Separator;
import org.eclipse.jface.resource.ImageDescriptor;
import org.eclipse.jface.viewers.DoubleClickEvent;
import org.eclipse.jface.viewers.IDoubleClickListener;
import org.eclipse.jface.viewers.ISelection;
import org.eclipse.jface.viewers.ISelectionChangedListener;
import org.eclipse.jface.viewers.IStructuredContentProvider;
import org.eclipse.jface.viewers.IStructuredSelection;
import org.eclipse.jface.viewers.ITreeContentProvider;
import org.eclipse.jface.viewers.LabelProvider;
import org.eclipse.jface.viewers.SelectionChangedEvent;
import org.eclipse.jface.viewers.TreeViewer;
import org.eclipse.jface.viewers.Viewer;
import org.eclipse.pde.api.tools.internal.ApiBaselineManager;
import org.eclipse.pde.api.tools.internal.provisional.ApiPlugin;
import org.eclipse.pde.api.tools.internal.provisional.ISession;
import org.eclipse.pde.api.tools.internal.provisional.ISessionListener;
import org.eclipse.pde.api.tools.internal.provisional.ISessionManager;
import org.eclipse.pde.api.tools.internal.provisional.ITreeModel;
import org.eclipse.pde.api.tools.internal.provisional.ITreeNode;
import org.eclipse.pde.api.tools.internal.provisional.comparator.DeltaProcessor;
import org.eclipse.pde.api.tools.internal.provisional.comparator.IDelta;
import org.eclipse.pde.api.tools.internal.provisional.model.IApiBaseline;
import org.eclipse.pde.api.tools.internal.provisional.model.IApiComponent;
import org.eclipse.pde.api.tools.ui.internal.ApiImageDescriptor;
import org.eclipse.pde.api.tools.ui.internal.ApiUIPlugin;
import org.eclipse.pde.api.tools.ui.internal.IApiToolsConstants;
import org.eclipse.pde.api.tools.ui.internal.actions.ExportSessionAction;
import org.eclipse.pde.api.tools.ui.internal.actions.RemoveActiveSessionAction;
import org.eclipse.pde.api.tools.ui.internal.actions.RemoveAllSessionsAction;
import org.eclipse.pde.api.tools.ui.internal.actions.SelectSessionAction;
import org.eclipse.swt.SWT;
import org.eclipse.swt.graphics.Image;
import org.eclipse.swt.widgets.Composite;
import org.eclipse.ui.IActionBars;
import org.eclipse.ui.actions.ActionFactory;
import org.eclipse.ui.part.ViewPart;
import org.eclipse.ui.views.properties.IPropertySheetPage;
import org.eclipse.ui.views.properties.PropertySheetPage;

/**
 * The class is used to show api tooling task results in a tree view.
 */

public class APIToolingView extends ViewPart implements ISessionListener {

	/**
	 * The ID of the view as specified by the extension.
	 */
	public static final String ID = "org.eclipse.pde.api.tools.ui.views.apitooling.views.apitoolingview"; //$NON-NLS-1$

	public TreeViewer viewer;
	private IAction removeActiveSessionAction;
	private IAction removeAllSessionsAction;
	private IAction selectSessionAction;
	private Action doubleClickAction;
	private ExportSessionAction exportSessionAction;

	class ViewContentProvider implements IStructuredContentProvider, ITreeContentProvider {
		ITreeModel model;
		
		public void inputChanged(Viewer v, Object oldInput, Object newInput) {
			this.model = null;
		}
		public void dispose() {
		}
		public Object[] getElements(Object parent) {
			if (parent instanceof ISession) {
				ISession session = (ISession) parent;
				if (this.model == null) {
					this.model = session.getModel();
				}
				return getChildren(this.model.getRoot());
			}
			return getChildren(parent);
		}
		public Object getParent(Object child) {
			return null;
		}
		public Object [] getChildren(Object parent) {
			if (parent instanceof ITreeNode) {
				return ((ITreeNode) parent).getChildren();
			}
			return new Object[0];
		}
		public boolean hasChildren(Object parent) {
			if (parent instanceof ITreeNode) {
				return ((ITreeNode) parent).hasChildren();
			}
			return false;
		}
	}
	class ViewLabelProvider extends LabelProvider {
		public String getText(Object obj) {
			return obj.toString();
		}

		public Image getImage(Object obj) {
			if (obj instanceof ITreeNode) {
				ITreeNode treeNode = (ITreeNode) obj;
				switch(treeNode.getId()) {
					case ITreeNode.CLASS :
						return JavaUI.getSharedImages().getImage(org.eclipse.jdt.ui.ISharedImages.IMG_OBJS_CLASS);
					case ITreeNode.INTERFACE :
						return JavaUI.getSharedImages().getImage(org.eclipse.jdt.ui.ISharedImages.IMG_OBJS_INTERFACE);
					case ITreeNode.ANNOTATION :
						return JavaUI.getSharedImages().getImage(org.eclipse.jdt.ui.ISharedImages.IMG_OBJS_ANNOTATION);
					case ITreeNode.ENUM :
						return JavaUI.getSharedImages().getImage(org.eclipse.jdt.ui.ISharedImages.IMG_OBJS_ENUM);
					case ITreeNode.PACKAGE :
						return JavaUI.getSharedImages().getImage(org.eclipse.jdt.ui.ISharedImages.IMG_OBJS_PACKAGE);
				}
				Object data = treeNode.getData();
				if (data instanceof IDelta) {
					IDelta delta = (IDelta) data;
					Image image = getDeltaElementImage(delta);
					if (image != null) {
						int flags = (DeltaProcessor.isCompatible(delta) ? ApiImageDescriptor.SUCCESS : ApiImageDescriptor.ERROR);
						ImageDescriptor descriptor = ImageDescriptor.createFromImage(image);
						ApiImageDescriptor desc = new ApiImageDescriptor(descriptor, flags);
						return ApiUIPlugin.getImage(desc);
					}
				}
			}
			return null;
		}

		private Image getDeltaElementImage(IDelta delta) {
			switch(delta.getFlags()) {
				case IDelta.API_FIELD :
				case IDelta.FIELD : {
					int modifiers = delta.getNewModifiers();
					switch(delta.getKind()) {
						case IDelta.REMOVED : {
							modifiers = delta.getOldModifiers();
						}
					}
					if (Flags.isPublic(modifiers)) {
						return JavaUI.getSharedImages().getImage(org.eclipse.jdt.ui.ISharedImages.IMG_FIELD_PUBLIC);
					} else if (Flags.isProtected(modifiers)) {
						return JavaUI.getSharedImages().getImage(org.eclipse.jdt.ui.ISharedImages.IMG_FIELD_PROTECTED);
					} else if (Flags.isPrivate(modifiers)){
						return JavaUI.getSharedImages().getImage(org.eclipse.jdt.ui.ISharedImages.IMG_FIELD_PRIVATE);
					} else {
						return JavaUI.getSharedImages().getImage(org.eclipse.jdt.ui.ISharedImages.IMG_FIELD_DEFAULT);
					}
				}
				case IDelta.METHOD :
				case IDelta.METHOD_MOVED_DOWN :
				case IDelta.METHOD_MOVED_UP :
				case IDelta.METHOD_WITH_DEFAULT_VALUE :
				case IDelta.METHOD_WITHOUT_DEFAULT_VALUE :
				case IDelta.CONSTRUCTOR :
				case IDelta.CLINIT : {
					int modifiers = delta.getNewModifiers();
					switch(delta.getKind()) {
						case IDelta.REMOVED : {
							modifiers = delta.getOldModifiers();
						}
					}
					if (Flags.isPublic(modifiers)) {
						return JavaUI.getSharedImages().getImage(org.eclipse.jdt.ui.ISharedImages.IMG_OBJS_PUBLIC);
					} else if (Flags.isProtected(modifiers)) {
						return JavaUI.getSharedImages().getImage(org.eclipse.jdt.ui.ISharedImages.IMG_OBJS_PROTECTED);
					} else if (Flags.isPrivate(modifiers)){
						return JavaUI.getSharedImages().getImage(org.eclipse.jdt.ui.ISharedImages.IMG_OBJS_PRIVATE);
					} else {
						return JavaUI.getSharedImages().getImage(org.eclipse.jdt.ui.ISharedImages.IMG_OBJS_CLASS_DEFAULT);
					}
				}
			}
			switch(delta.getElementType()) {
				case IDelta.ANNOTATION_ELEMENT_TYPE : return JavaUI.getSharedImages().getImage(org.eclipse.jdt.ui.ISharedImages.IMG_OBJS_ANNOTATION);
				case IDelta.ENUM_ELEMENT_TYPE : return JavaUI.getSharedImages().getImage(org.eclipse.jdt.ui.ISharedImages.IMG_OBJS_ENUM);
				case IDelta.CLASS_ELEMENT_TYPE : return JavaUI.getSharedImages().getImage(org.eclipse.jdt.ui.ISharedImages.IMG_OBJS_CLASS);
				case IDelta.INTERFACE_ELEMENT_TYPE : return JavaUI.getSharedImages().getImage(org.eclipse.jdt.ui.ISharedImages.IMG_OBJS_INTERFACE);
				case IDelta.FIELD_ELEMENT_TYPE : {
					int modifiers = delta.getNewModifiers();
					switch(delta.getKind()) {
						case IDelta.REMOVED : {
							modifiers = delta.getOldModifiers();
						}
					}
					if (Flags.isPublic(modifiers)) {
						return JavaUI.getSharedImages().getImage(org.eclipse.jdt.ui.ISharedImages.IMG_FIELD_PUBLIC);
					} else if (Flags.isProtected(modifiers)) {
						return JavaUI.getSharedImages().getImage(org.eclipse.jdt.ui.ISharedImages.IMG_FIELD_PROTECTED);
					} else if (Flags.isPrivate(modifiers)){
						return JavaUI.getSharedImages().getImage(org.eclipse.jdt.ui.ISharedImages.IMG_FIELD_PRIVATE);
					} else {
						return JavaUI.getSharedImages().getImage(org.eclipse.jdt.ui.ISharedImages.IMG_FIELD_DEFAULT);
					}
				}
				case IDelta.METHOD_ELEMENT_TYPE :
				case IDelta.CONSTRUCTOR_ELEMENT_TYPE : {
					int modifiers = delta.getNewModifiers();
					switch(delta.getKind()) {
						case IDelta.REMOVED : {
							modifiers = delta.getOldModifiers();
						}
					}
					if (Flags.isPublic(modifiers)) {
						return JavaUI.getSharedImages().getImage(org.eclipse.jdt.ui.ISharedImages.IMG_OBJS_PUBLIC);
					} else if (Flags.isProtected(modifiers)) {
						return JavaUI.getSharedImages().getImage(org.eclipse.jdt.ui.ISharedImages.IMG_OBJS_PROTECTED);
					} else if (Flags.isPrivate(modifiers)){
						return JavaUI.getSharedImages().getImage(org.eclipse.jdt.ui.ISharedImages.IMG_OBJS_PRIVATE);
					} else {
						return JavaUI.getSharedImages().getImage(org.eclipse.jdt.ui.ISharedImages.IMG_OBJS_CLASS_DEFAULT);
					}
				}
				case IDelta.TYPE_PARAMETER_ELEMENT_TYPE : return JavaUI.getSharedImages().getImage(org.eclipse.jdt.ui.ISharedImages.IMG_OBJS_PUBLIC);
				case IDelta.API_PROFILE_ELEMENT_TYPE : return ApiUIPlugin.getSharedImage(IApiToolsConstants.IMG_OBJ_ECLIPSE_PROFILE);
				case IDelta.API_COMPONENT_ELEMENT_TYPE : {
					String componentVersionId = delta.getComponentVersionId();
					IApiComponent component = null;
					if (componentVersionId != null) {
						int indexOfOpen = componentVersionId.lastIndexOf('(');
						String componentID = componentVersionId.substring(0, indexOfOpen);
						IApiBaseline baseline = ApiBaselineManager.getManager().getWorkspaceBaseline();
						if (baseline != null) {
							IApiComponent apiComponent = baseline.getApiComponent(componentID);
							if (apiComponent != null) {
								component = apiComponent;
							}
						}
					}
					if (component != null) {
						if(component.isSystemComponent()) {
							return ApiUIPlugin.getSharedImage(IApiToolsConstants.IMG_OBJ_API_SYSTEM_LIBRARY);
						}
						try {
							if (component.isFragment()) {
								return ApiUIPlugin.getSharedImage(IApiToolsConstants.IMG_OBJ_FRAGMENT);
							}
						} catch (CoreException e) {
							ApiPlugin.log(e);
						}
						return ApiUIPlugin.getSharedImage(IApiToolsConstants.IMG_OBJ_BUNDLE);
					}
				}
			}
			return null;
		}
	}

	/**
	 * The constructor.
	 */
	public APIToolingView() {
	}
	/**
	 * This is a callback that will allow us
	 * to create the viewer and initialize it.
	 */
	public void createPartControl(Composite parent) {
		this.viewer = new TreeViewer(parent, SWT.MULTI | SWT.H_SCROLL | SWT.V_SCROLL);
		this.viewer.setContentProvider(new ViewContentProvider());
		this.viewer.setLabelProvider(new ViewLabelProvider());
		this.viewer.addSelectionChangedListener(new ISelectionChangedListener() {
			public void selectionChanged(SelectionChangedEvent event) {
				// TODO Auto-generated method stub
				
			}
		});
		ISession[] sessions = ApiPlugin.getDefault().getSessionManager().getSessions();
		if (sessions.length > 0) {
			this.viewer.setInput(sessions[0]);
		}
		createActions();
		updateActions();
		configureToolbar();
		hookDoubleClickAction();

		ApiPlugin.getDefault().getSessionManager().addSessionListener(this);
		
		getSite().setSelectionProvider(this.viewer);
	}
	private void hookDoubleClickAction() {
		this.viewer.addDoubleClickListener(new IDoubleClickListener() {
			public void doubleClick(DoubleClickEvent event) {
				APIToolingView.this.doubleClickAction.run();
			}
		});
	}
	public void dispose() {
		ApiPlugin.getDefault().getSessionManager().removeSessionListener(this);
	}
	protected void configureToolbar() {
		IToolBarManager tbm = getViewSite().getActionBars().getToolBarManager();
		tbm.add(new Separator());
		tbm.add(this.removeActiveSessionAction);
		tbm.add(this.removeAllSessionsAction);
		tbm.add(this.selectSessionAction);
		tbm.add(new Separator());
//		tbm.add(new CollapseAllAction(this.viewer));

		IMenuManager mm = getViewSite().getActionBars().getMenuManager();
		mm.add(this.exportSessionAction);
	}
	private void createActions() {
		final IActionBars actionBars = getViewSite().getActionBars();

		this.removeActiveSessionAction = new RemoveActiveSessionAction();
		actionBars.setGlobalActionHandler(ActionFactory.DELETE.getId(), removeActiveSessionAction);

		this.removeAllSessionsAction = new RemoveAllSessionsAction();
		this.selectSessionAction = new SelectSessionAction();
		this.doubleClickAction = new Action() {
			public void run() {
				ISelection selection = viewer.getSelection();
				if (selection instanceof IStructuredSelection) {
					Object item = ((IStructuredSelection) selection).getFirstElement();
					if (APIToolingView.this.viewer.getExpandedState(item)) {
						APIToolingView.this.viewer.collapseToLevel(item, 1);
					} else {
						APIToolingView.this.viewer.expandToLevel(item, 1);
					}
					if (item instanceof ITreeNode) {
						ITreeNode node = (ITreeNode) item;
						if (node.getData() != null) {
							// show in Properties view
						}
					}
				}
			}
		};
		this.exportSessionAction = new ExportSessionAction(this);
	}
	private void updateActions() {
		this.viewer.getControl().getDisplay().asyncExec(new Runnable() {
			public void run() {
				ISessionManager sessionManager = ApiPlugin.getDefault().getSessionManager();
				ISession active = sessionManager.getActiveSession();
				setContentDescription(active == null ? "" : active.getTimestamp()); //$NON-NLS-1$
				ISession[] sessions =  sessionManager.getSessions();
				boolean atLeastOne = sessions.length >= 1;
				APIToolingView.this.removeActiveSessionAction.setEnabled(atLeastOne);
				APIToolingView.this.removeAllSessionsAction.setEnabled(atLeastOne);
				APIToolingView.this.selectSessionAction.setEnabled(atLeastOne);
				APIToolingView.this.exportSessionAction.setEnabled(active != null);
			}
		});
	}
	/**
	 * Passing the focus request to the viewer's control.
	 */
	public void setFocus() {
		this.viewer.getControl().setFocus();
	}
	public void sessionAdded(final ISession session) {
		this.viewer.getControl().getDisplay().asyncExec(new Runnable() {
			public void run() {
				APIToolingView.this.viewer.setInput(session);
			}
		});
		updateActions();
	}
	public void sessionRemoved(ISession session) {
		this.viewer.setInput(null);
		updateActions();
	}
	
	public void sessionActivated(final ISession session) {
		this.viewer.getControl().getDisplay().asyncExec(new Runnable() {
			public void run() {
				APIToolingView.this.viewer.setInput(session);
			}
		});
		updateActions();
	}
	/**
	 * Returns the property sheet.
	 */
	protected IPropertySheetPage getPropertySheet() {
		return new PropertySheetPage();
	}
	/* (non-Javadoc)
	 * Method declared on IAdaptable
	 */
	public Object getAdapter(Class adapter) {
		if (adapter.equals(IPropertySheetPage.class)) {
			return getPropertySheet();
		}
		return super.getAdapter(adapter);
	}
}




/*******************************************************************************
 * Copyright (c) 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
 * http://www.eclipse.org/legal/epl-v10.html
 *
 * Contributors:
 *     IBM Corporation - initial API and implementation
 *******************************************************************************/
package org.eclipse.pde.api.tools.ui.internal.actions;

import java.io.BufferedWriter;
import java.io.File;
import java.io.FileWriter;
import java.io.IOException;
import java.io.InputStream;

import javax.xml.transform.Result;
import javax.xml.transform.Source;
import javax.xml.transform.Transformer;
import javax.xml.transform.TransformerConfigurationException;
import javax.xml.transform.TransformerException;
import javax.xml.transform.TransformerFactory;
import javax.xml.transform.stream.StreamResult;
import javax.xml.transform.stream.StreamSource;

import org.eclipse.core.runtime.CoreException;
import org.eclipse.core.runtime.IProgressMonitor;
import org.eclipse.core.runtime.IStatus;
import org.eclipse.core.runtime.OperationCanceledException;
import org.eclipse.core.runtime.Status;
import org.eclipse.core.runtime.SubMonitor;
import org.eclipse.core.runtime.jobs.Job;
import org.eclipse.jface.action.Action;
import org.eclipse.jface.window.Window;
import org.eclipse.pde.api.tools.internal.comparator.DeltaXmlVisitor;
import org.eclipse.pde.api.tools.internal.provisional.ApiPlugin;
import org.eclipse.pde.api.tools.internal.provisional.ISession;
import org.eclipse.pde.api.tools.internal.provisional.comparator.IDelta;
import org.eclipse.pde.api.tools.internal.util.Util;
import org.eclipse.pde.api.tools.ui.internal.ApiUIPlugin;
import org.eclipse.pde.api.tools.ui.internal.views.APIToolingView;

/**
 * Drop-down action to select the active session.
 */
public class ExportSessionAction extends Action {
	private static final String DELTAS_XSLT_TRANSFORM_PATH = "/xslt/compare.xsl"; //$NON-NLS-1$
	private static final String XML_FILE_EXTENSION = ".xml"; //$NON-NLS-1$
	private static final String HTML_FILE_EXTENSION = ".html"; //$NON-NLS-1$
	APIToolingView view;
	public ExportSessionAction(APIToolingView view) {
		setText(ActionMessages.ExportSessionAction_label);
		setToolTipText(ActionMessages.ExportSessionAction_tooltip);
		setEnabled(false);
		this.view = view;
	}

	public void run() {
		final ISession activeSession = ApiPlugin.getDefault().getSessionManager().getActiveSession();
		if (activeSession == null) {
			return;
		}
		ExportDialog dialog = new ExportDialog(view.getSite(), ActionMessages.ExportActionTitle);
		int returnCode = dialog.open();
		if (returnCode == Window.CANCEL) {
			return;
		}
		final String reportFileName = dialog.reportPath;
		if (reportFileName == null) {
			return;
		}
		final String lowerCase = reportFileName.toLowerCase();
		if (!lowerCase.endsWith(HTML_FILE_EXTENSION) && !lowerCase.endsWith(XML_FILE_EXTENSION)) {
			return;
		}
		
		Job job = new Job(ActionMessages.CompareWithAction_comparing_apis){
			protected IStatus run(IProgressMonitor monitor) {
				SubMonitor progress = SubMonitor.convert(monitor, 100);
				progress.subTask(ActionMessages.CompareDialogCollectingElementTaskName);
				boolean isHtmlFile = lowerCase.endsWith(HTML_FILE_EXTENSION);
				File xmlOutputFile = null;
				try {
					progress.subTask(ActionMessages.CompareDialogComputeDeltasTaskName);
					File reportFile = new File(reportFileName);
					try {
						progress.worked(25);
						Util.checkCanceled(progress);
						BufferedWriter writer = null;
						try {
							if (isHtmlFile) {
								xmlOutputFile = File.createTempFile(String.valueOf(System.currentTimeMillis()), XML_FILE_EXTENSION);
							} else {
								xmlOutputFile = reportFile;
							}
							if (xmlOutputFile.exists()) {
								xmlOutputFile.delete();
							}
							writer = new BufferedWriter(new FileWriter(xmlOutputFile));
							DeltaXmlVisitor visitor = new DeltaXmlVisitor();
							Object data = activeSession.getModel().getRoot().getData();
							if (data instanceof IDelta) {
								IDelta delta = (IDelta) data;
								progress.worked(25);
								Util.checkCanceled(progress);
								delta.accept(visitor);
								writer.write(visitor.getXML());
								writer.flush();
								progress.worked(25);
							}
						} catch (IOException e) {
							ApiPlugin.log(e);
						} catch (CoreException e) {
							ApiPlugin.log(e);
						} finally {
							if (writer != null) {
								try {
									writer.close();
								} catch(IOException e) {
									// ignore
								}
							}
						}
						if(isHtmlFile) {
							// remaining part is to convert the xml file to html using XSLT
							Util.checkCanceled(progress);
							Source xmlSource = new StreamSource(xmlOutputFile);
							InputStream stream = ApiPlugin.class.getResourceAsStream(DELTAS_XSLT_TRANSFORM_PATH);
							Source xsltSource = new StreamSource(stream);
							try {
								writer = new BufferedWriter(new FileWriter(reportFile));
								Result result = new StreamResult(writer);
								// create an instance of TransformerFactory
								TransformerFactory transFact = TransformerFactory.newInstance();
								Transformer trans = transFact.newTransformer(xsltSource);
								trans.transform(xmlSource, result);
							} catch (TransformerConfigurationException e) {
								ApiUIPlugin.log(e);
							} catch (TransformerException e) {
								ApiUIPlugin.log(e);
							} catch(IOException e) {
								ApiUIPlugin.log(e);
							} finally {
								if (writer != null) {
									try {
										writer.close();
									} catch(IOException e) {
										// ignore
									}
								}
							}
						}
						progress.worked(25);
						return Status.OK_STATUS;
					} catch(OperationCanceledException e) {
						// ignore
						if (xmlOutputFile != null && xmlOutputFile.exists()) {
							xmlOutputFile.delete();
						}
						if (reportFile.exists()) {
							reportFile.delete();
						}
					}
				} finally {
					monitor.done();
				}
				return Status.CANCEL_STATUS;
			}
		};
		job.setSystem(false);
		job.setPriority(Job.LONG);
		job.schedule();
	}
	public void dispose() {
	}

}




/*******************************************************************************
 * Copyright (c) 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
 * http://www.eclipse.org/legal/epl-v10.html
 *
 * Contributors:
 *     IBM Corporation - initial API and implementation
 *******************************************************************************/
package org.eclipse.pde.api.tools.ui.internal.actions;

import java.io.File;

import org.eclipse.core.runtime.Path;
import org.eclipse.jface.dialogs.Dialog;
import org.eclipse.jface.dialogs.IDialogSettings;
import org.eclipse.jface.window.IShellProvider;
import org.eclipse.pde.api.tools.ui.internal.ApiUIPlugin;
import org.eclipse.pde.api.tools.ui.internal.SWTFactory;
import org.eclipse.swt.SWT;
import org.eclipse.swt.events.SelectionAdapter;
import org.eclipse.swt.events.SelectionEvent;
import org.eclipse.swt.layout.GridData;
import org.eclipse.swt.widgets.Button;
import org.eclipse.swt.widgets.Composite;
import org.eclipse.swt.widgets.Control;
import org.eclipse.swt.widgets.FileDialog;
import org.eclipse.swt.widgets.Shell;
import org.eclipse.swt.widgets.Text;

/**
 * Compares {@link org.eclipse.pde.api.tools.internal.provisional.model.IApiElement}s
 * to a given {@link IApiBaseline} to get a delta
 * 
 * @since 1.0.1
 */
public class ExportDialog extends Dialog {

	//widget state ids 
	static final String SETTINGS_SECTION = ApiUIPlugin.PLUGIN_ID + ".api.exportsession"; //$NON-NLS-1$
	static final String REPORT_PATH_STATE = SETTINGS_SECTION + ".reportpath"; //$NON-NLS-1$
	
	private String title = null;;
	private Text reportPathText;
	public String reportPath;

	/**
	 * Constructor
	 * @param provider
	 * @param title
	 */
	public ExportDialog(IShellProvider provider, String title) {
		super(provider);
		this.title = title;
	}

	/* (non-Javadoc)
	 * @see org.eclipse.jface.window.Window#configureShell(org.eclipse.swt.widgets.Shell)
	 */
	protected void configureShell(Shell newShell) {
		super.configureShell(newShell);
		newShell.setText(this.title);
	}
	
	/* (non-Javadoc)
	 * @see org.eclipse.jface.dialogs.Dialog#isResizable()
	 */
	protected boolean isResizable() {
		return true;
	}
	
	/* (non-Javadoc)
	 * @see org.eclipse.jface.dialogs.Dialog#createDialogArea(org.eclipse.swt.widgets.Composite)
	 */
	protected Control createDialogArea(Composite parent) {
		Composite comp = SWTFactory.createComposite(parent, 2, 1, GridData.FILL_HORIZONTAL);
		GridData gd = (GridData) comp.getLayoutData();
		gd.widthHint = 310;

		SWTFactory.createWrapLabel(comp, ActionMessages.EnterFileNameForExport, 2);
		this.reportPathText = SWTFactory.createText(comp, SWT.SINGLE | SWT.BORDER | SWT.FLAT, 1, GridData.BEGINNING | GridData.FILL_HORIZONTAL);
		gd = (GridData) this.reportPathText.getLayoutData();
		gd.grabExcessHorizontalSpace = true;

		Button browseButton = SWTFactory.createPushButton(comp, ActionMessages.Browse, null);
		browseButton.addSelectionListener(new SelectionAdapter() {
			public void widgetSelected(SelectionEvent e) {
				FileDialog dialog = new FileDialog(getShell());
				dialog.setText(ActionMessages.SelectFileName);
				String loctext = ExportDialog.this.reportPathText.getText().trim();
				if (loctext.length() > 0) {
					File file = new File(loctext).getParentFile();
					if (file != null && file.exists()) {
						dialog.setFilterPath(file.getAbsolutePath());
					}
				}
				String newPath = dialog.open();
				if (newPath != null && !new Path(loctext).equals(new Path(newPath))) {
					ExportDialog.this.reportPathText.setText(newPath);
					ExportDialog.this.reportPath = newPath;
				}
			}
		});

		initialize();
		return comp;
	}
	
	/**
	 * Initializes the controls
	 */
	void initialize() {
		IDialogSettings settings = ApiUIPlugin.getDefault().getDialogSettings().getSection(SETTINGS_SECTION);
		if(settings != null) {
			restoreTextSelection(this.reportPathText, REPORT_PATH_STATE, settings);
		}
	}

	/* (non-Javadoc)
	 * @see org.eclipse.jface.dialogs.Dialog#okPressed()
	 */
	protected void okPressed() {
		String oldPath = this.reportPath;
		String newPath = this.reportPathText.getText().trim();
		if (newPath != null && !new Path(oldPath).equals(new Path(newPath))) {
			this.reportPathText.setText(newPath);
			this.reportPath = newPath;
		}
		saveWidgetState();
		super.okPressed();
	}
	/**
	 * Restores the selected item for the given combo based on the stored value from the 
	 * dialog settings
	 * 
	 * @param combo
	 * @param id
	 * @param settings
	 */
	private void restoreTextSelection(Text text, String id, IDialogSettings settings) {
		String value = settings.get(id);
		if(value != null) {
			ExportDialog.this.reportPath = value;
			text.setText(value);
		}
	}
	
	/**
	 * Saves the state of the widgets on the page
	 */
	void saveWidgetState() {
		IDialogSettings rootsettings = ApiUIPlugin.getDefault().getDialogSettings();
		IDialogSettings settings = rootsettings.getSection(SETTINGS_SECTION);
		if(settings == null) {
			settings = rootsettings.addNewSection(SETTINGS_SECTION);
		}
		settings.put(REPORT_PATH_STATE, this.reportPath);
	}
}




/*******************************************************************************
 * Copyright (c) 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
 * http://www.eclipse.org/legal/epl-v10.html
 *
 * Contributors:
 *     IBM Corporation - initial API and implementation
 *******************************************************************************/
package org.eclipse.pde.api.tools.ui.internal.actions;

import java.util.ArrayList;
import java.util.Date;
import java.util.HashMap;
import java.util.List;
import java.util.Map;

import org.eclipse.core.runtime.CoreException;
import org.eclipse.core.runtime.IAdaptable;
import org.eclipse.core.runtime.IProgressMonitor;
import org.eclipse.core.runtime.IStatus;
import org.eclipse.core.runtime.OperationCanceledException;
import org.eclipse.core.runtime.Status;
import org.eclipse.core.runtime.SubMonitor;
import org.eclipse.core.runtime.jobs.Job;
import org.eclipse.jdt.core.Flags;
import org.eclipse.jdt.core.IClassFile;
import org.eclipse.jdt.core.ICompilationUnit;
import org.eclipse.jdt.core.IJavaElement;
import org.eclipse.jdt.core.IJavaProject;
import org.eclipse.jdt.core.IPackageFragment;
import org.eclipse.jdt.core.IPackageFragmentRoot;
import org.eclipse.jdt.core.IType;
import org.eclipse.jdt.core.JavaModelException;
import org.eclipse.jface.action.IAction;
import org.eclipse.jface.viewers.ISelection;
import org.eclipse.jface.viewers.IStructuredSelection;
import org.eclipse.jface.window.Window;
import org.eclipse.pde.api.tools.internal.ApiBaselineManager;
import org.eclipse.pde.api.tools.internal.provisional.ApiPlugin;
import org.eclipse.pde.api.tools.internal.provisional.Factory;
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.ISession;
import org.eclipse.pde.api.tools.internal.provisional.ITreeModel;
import org.eclipse.pde.api.tools.internal.provisional.ITreeNode;
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.comparator.ApiComparator;
import org.eclipse.pde.api.tools.internal.provisional.comparator.ApiScope;
import org.eclipse.pde.api.tools.internal.provisional.comparator.DeltaVisitor;
import org.eclipse.pde.api.tools.internal.provisional.comparator.IDelta;
import org.eclipse.pde.api.tools.internal.provisional.model.IApiBaseline;
import org.eclipse.pde.api.tools.internal.provisional.model.IApiComponent;
import org.eclipse.pde.api.tools.internal.provisional.model.IApiScope;
import org.eclipse.pde.api.tools.internal.provisional.model.IApiType;
import org.eclipse.pde.api.tools.internal.provisional.model.IApiTypeRoot;
import org.eclipse.pde.api.tools.internal.util.Util;
import org.eclipse.ui.IObjectActionDelegate;
import org.eclipse.ui.IWorkbenchPart;
import org.eclipse.ui.IWorkbenchPartSite;
import org.eclipse.ui.views.properties.IPropertyDescriptor;
import org.eclipse.ui.views.properties.IPropertySheetEntry;
import org.eclipse.ui.views.properties.IPropertySource;
import org.eclipse.ui.views.properties.PropertyDescriptor;
import org.eclipse.ui.views.properties.TextPropertyDescriptor;

import com.ibm.icu.text.DateFormat;

public class CompareWithAction implements IObjectActionDelegate {

	public static class DeltaSession implements ISession {
		static Object[] NO_CHILDREN = new Object[0];

		static class TreeNode implements ITreeNode, IPropertySource, IAdaptable {
			private static final IPropertyDescriptor[] NO_PROPERTY_DESCRIPTORS = new IPropertyDescriptor[0];
			// Property id keys
			public static final String ID_MESSAGE = "IDelta.Message"; //$NON-NLS-1$
			public static final String ID_COMPONENT = "IDelta.Component"; //$NON-NLS-1$
			public static final String ID_ELEMENT_TYPE = "IDelta.ElementType"; //$NON-NLS-1$
			public static final String ID_FLAGS = "IDelta.Flags"; //$NON-NLS-1$
			private static final Object ID_KEY = "IDelta.Key"; //$NON-NLS-1$
			private static final Object ID_KIND = "IDelta.Kind"; //$NON-NLS-1$
			private static final Object ID_NEW_MODIFIERS = "IDelta.NewModifiers"; //$NON-NLS-1$
			private static final Object ID_OLD_MODIFIERS = "IDelta.OldModifiers"; //$NON-NLS-1$
			private static final Object ID_RESTRICTIONS = "IDelta.Restrictions"; //$NON-NLS-1$
			private static final Object ID_TYPENAME = "IDelta.TypeName"; //$NON-NLS-1$

			// categories
			public static final String P_MESSAGE_CATEGORY = ActionMessages.MessageCategory;
			public static final String P_INFO_CATEGORY = ActionMessages.InfoCategory;

			public static final String P_MESSAGE = ActionMessages.PropertyMessageKey;
			public static final String P_COMPONENT = ActionMessages.PropertyComponentKey;
			public static final String P_ELEMENT_TYPE = ActionMessages.PropertyElementTypeKey;
			public static final String P_FLAGS = ActionMessages.PropertyFlagsKey;
			public static final String P_KEY = ActionMessages.PropertyKeyKey;
			public static final String P_KIND = ActionMessages.PropertyKindKey;
			public static final String P_NEW_MODIFIERS = ActionMessages.PropertyNewModifiersKey;
			public static final String P_OLD_MODIFIERS = ActionMessages.PropertyOldModifiersKey;
			public static final String P_RESTRICTIONS = ActionMessages.PropertyRestrictionsKey;
			public static final String P_TYPENAME = ActionMessages.PropertyTypeNameKey;

			private static List Descriptors;
			static {
				Descriptors = new ArrayList();

				PropertyDescriptor propertyDescriptor = new TextPropertyDescriptor(ID_MESSAGE, P_MESSAGE);
				propertyDescriptor.setCategory(P_MESSAGE_CATEGORY);
				Descriptors.add(propertyDescriptor);

				propertyDescriptor = new TextPropertyDescriptor(ID_COMPONENT, P_COMPONENT);
				propertyDescriptor.setCategory(P_INFO_CATEGORY);
				Descriptors.add(propertyDescriptor);

				propertyDescriptor = new TextPropertyDescriptor(ID_KEY, P_KEY);
				propertyDescriptor.setCategory(P_INFO_CATEGORY);
				propertyDescriptor.setFilterFlags(new String[] { IPropertySheetEntry.FILTER_ID_EXPERT });
				Descriptors.add(propertyDescriptor);

				propertyDescriptor = new TextPropertyDescriptor(ID_KIND, P_KIND);
				propertyDescriptor.setCategory(P_INFO_CATEGORY);
				Descriptors.add(propertyDescriptor);

				propertyDescriptor = new TextPropertyDescriptor(ID_NEW_MODIFIERS, P_NEW_MODIFIERS);
				propertyDescriptor.setCategory(P_INFO_CATEGORY);
				Descriptors.add(propertyDescriptor);

				propertyDescriptor = new TextPropertyDescriptor(ID_OLD_MODIFIERS, P_OLD_MODIFIERS);
				propertyDescriptor.setCategory(P_INFO_CATEGORY);
				Descriptors.add(propertyDescriptor);

				propertyDescriptor = new TextPropertyDescriptor(ID_RESTRICTIONS, P_RESTRICTIONS);
				propertyDescriptor.setCategory(P_INFO_CATEGORY);
				Descriptors.add(propertyDescriptor);

				propertyDescriptor = new TextPropertyDescriptor(ID_TYPENAME, P_TYPENAME);
				propertyDescriptor.setCategory(P_INFO_CATEGORY);
				Descriptors.add(propertyDescriptor);

				propertyDescriptor = new TextPropertyDescriptor(ID_FLAGS, P_FLAGS);
				propertyDescriptor.setCategory(P_INFO_CATEGORY);
				Descriptors.add(propertyDescriptor);
				
				propertyDescriptor = new TextPropertyDescriptor(ID_ELEMENT_TYPE, P_ELEMENT_TYPE);
				propertyDescriptor.setCategory(P_INFO_CATEGORY);
				Descriptors.add(propertyDescriptor);
			}
			/**
			 * Returns the descriptors
			 */
			static List getDescriptors() {
				return Descriptors;
			}
			Map children;
			String name;
			TreeNode parent;
			Object data;
			int id;

			public TreeNode(int id, String name, Object data) {
				this.name = name;
				this.id = id;
				this.data = data;
			}
			public Object[] getChildren() {
				if (this.children == null) {
					return NO_CHILDREN;
				}
				return this.children.values().toArray(new Object[this.children.size()]);
			}
			public TreeNode getNode(String name) {
				if (this.children == null) {
					return null;
				}
				return (TreeNode) this.children.get(name);
			}
			public int getId() {
				return this.id;
			}
			public void add(TreeNode node) {
				if (this.children == null) {
					this.children = new HashMap();
				}
				this.children.put(node.name, node);
			}
			public boolean hasChildren() {
				return this.children != null && !this.children.isEmpty();
			}
			public String toString() {
				return String.valueOf(this.name);
			}
			public Object getData() {
				return this.data;
			}
			public Object getEditableValue() {
				return null;
			}
			public IPropertyDescriptor[] getPropertyDescriptors() {
				if (this.data != null) {
					return (IPropertyDescriptor[]) getDescriptors().toArray(
							new IPropertyDescriptor[getDescriptors().size()]);
				}
				return NO_PROPERTY_DESCRIPTORS;
			}
			public Object getPropertyValue(Object propKey) {
				if (this.data == null) return null;
				IDelta delta = (IDelta) this.data;
				if (ID_MESSAGE.equals(propKey)) {
					return delta.getMessage();
				}
				if (ID_COMPONENT.equals(propKey)) {
					return delta.getComponentVersionId();
				}
				if (ID_ELEMENT_TYPE.equals(propKey)) {
					int elementType = delta.getElementType();
					StringBuffer buffer = new StringBuffer(Util.getDeltaElementType(elementType));
					buffer.append(" (").append(elementType).append(')'); //$NON-NLS-1$
					return String.valueOf(buffer);
				}
				if (ID_FLAGS.equals(propKey)) {
					int flags = delta.getFlags();
					StringBuffer buffer = new StringBuffer(Util.getDeltaFlagsName(flags));
					buffer.append(" (").append(flags).append(')'); //$NON-NLS-1$
					return String.valueOf(buffer);
				}
				if (ID_KEY.equals(propKey)) {
					return delta.getKey();
				}
				if (ID_KIND.equals(propKey)) {
					int kind = delta.getKind();
					StringBuffer buffer = new StringBuffer(Util.getDeltaKindName(kind));
					buffer.append(" (").append(kind).append(')'); //$NON-NLS-1$
					return String.valueOf(buffer);
				}
				if (ID_NEW_MODIFIERS.equals(propKey)) {
					return getDisplayedModifiers(delta.getNewModifiers());
				}
				if (ID_OLD_MODIFIERS.equals(propKey)) {
					return getDisplayedModifiers(delta.getOldModifiers());
					}
				if (ID_RESTRICTIONS.equals(propKey)) {
					int restrictions = delta.getRestrictions();
					StringBuffer buffer = new StringBuffer(RestrictionModifiers.getRestrictionText(restrictions));
					buffer.append(" (0x").append(Integer.toHexString(restrictions)).append(')'); //$NON-NLS-1$
					return String.valueOf(buffer);
				}
				if (ID_TYPENAME.equals(propKey)) {
					return delta.getTypeName();
				}
				return null;
			}
			public boolean isPropertySet(Object id) {
				return false;
			}
			public void resetPropertyValue(Object id) {
				// nothing to do
			}
			public void setPropertyValue(Object id, Object value) {
				// nothing to do
			}
			/* (non-Javadoc)
			 * Method declared on IAdaptable
			 */
			public Object getAdapter(Class adapter) {
				if (adapter == IPropertySource.class) {
					return this;
				}
				return null;
			}
			private static String getDisplayedModifiers(int newModifiers) {
				StringBuffer buffer = new StringBuffer();
				if(newModifiers == 0) {
					buffer.append(ActionMessages.PropertyPackageVisibility);
				} else {
					if (Flags.isAbstract(newModifiers)) {
						buffer.append("abstract"); //$NON-NLS-1$
					}
					String separator = " | "; //$NON-NLS-1$
					if(Flags.isFinal(newModifiers)) {
						if(buffer.length() > 0) {
							buffer.append(separator);
						}
						buffer.append("final"); //$NON-NLS-1$
					}
					if(Flags.isNative(newModifiers)) {
						if(buffer.length() > 0) {
							buffer.append(separator);
						}
						buffer.append("native"); //$NON-NLS-1$
					}
					if(Flags.isPrivate(newModifiers)) {
						if(buffer.length() > 0) {
							buffer.append(separator);
						}
						buffer.append("private"); //$NON-NLS-1$
					}
					if(Flags.isProtected(newModifiers)) {
						if(buffer.length() > 0) {
							buffer.append(separator);
						}
						buffer.append("protected"); //$NON-NLS-1$
					}
					if(Flags.isPublic(newModifiers)) {
						if(buffer.length() > 0) {
							buffer.append(separator);
						}
						buffer.append("public"); //$NON-NLS-1$
					}
					if(Flags.isStatic(newModifiers)) {
						if(buffer.length() > 0) {
							buffer.append(separator);
						}
						buffer.append("static"); //$NON-NLS-1$
					}
					if(Flags.isStrictfp(newModifiers)) {
						if(buffer.length() > 0) {
							buffer.append(separator);
						}
						buffer.append("strictfp"); //$NON-NLS-1$
					}
					if(Flags.isSynchronized(newModifiers)) {
						if(buffer.length() > 0) {
							buffer.append(separator);
						}
						buffer.append("synchronized"); //$NON-NLS-1$
					}
					if(Flags.isTransient(newModifiers)) {
						if(buffer.length() > 0) {
							buffer.append(separator);
						}
						buffer.append("transient"); //$NON-NLS-1$
					}
					if(Flags.isVolatile(newModifiers)) {
						if(buffer.length() > 0) {
							buffer.append(separator);
						}
						buffer.append("volatile"); //$NON-NLS-1$
					}
					if(Flags.isVarargs(newModifiers)) {
						if(buffer.length() > 0) {
							buffer.append(separator);
						}
						buffer.append("vargars"); //$NON-NLS-1$
					}
				}
				buffer.append(" (0x").append(Integer.toHexString(newModifiers)).append(')'); //$NON-NLS-1$
				return buffer.toString();
			}
		}

		static class TreeModel implements ITreeModel, IAdaptable {
			TreeNode root;

			TreeModel(TreeNode root) {
				this.root = root;
			}
			public ITreeNode getRoot() {
				return this.root;
			}
			public Object getAdapter(Class adapter) {
				// TODO Auto-generated method stub
				return null;
			}
		}

		IDelta delta;
		String baselineName;
		String timestamp;
		
		public DeltaSession(IDelta delta, String baselineName) {
			this.delta = delta;
			this.baselineName = baselineName;
			this.timestamp = DateFormat.getDateTimeInstance(DateFormat.MEDIUM, DateFormat.MEDIUM).format(new Date(System.currentTimeMillis()));
		}
		public ITreeModel getModel() {
			TreeNode root = new TreeNode(0, null, this.delta);
			TreeModel model = new TreeModel(root);
			class TreeBuilder extends DeltaVisitor {
				TreeNode node;
				
				public TreeBuilder(TreeNode node) {
					this.node = node;
				}
				public void endVisit(IDelta delta) {
					if (delta.getChildren().length == 0) {
						String typeName = delta.getTypeName();
						if (typeName == null) {
							this.node.add(new TreeNode(0, delta.getKey(), delta));
						} else if (typeName.length() == 0) {
							this.node.add(new TreeNode(0, delta.getMessage(), delta));
						} else {
							// split the type name (package - type)
							int index = typeName.lastIndexOf('.');
							String packageName = "<default package>"; //$NON-NLS-1$
							String actualTypeName = null;
							if (index != -1) {
								packageName = typeName.substring(0, index);
								actualTypeName = typeName.substring(index + 1);
							} else {
								actualTypeName = typeName;
							}
							TreeNode node2 = this.node.getNode(packageName);
							if (node2 == null) {
								node2 = new TreeNode(ITreeNode.PACKAGE, packageName, null);
								this.node.add(node2);
							}
							TreeNode node3 = node2.getNode(actualTypeName);
							if (node3 == null) {
								int id = 0;
								switch(delta.getElementType()) {
									case IDelta.ANNOTATION_ELEMENT_TYPE :
										id = ITreeNode.ANNOTATION;
										break;
									case IDelta.INTERFACE_ELEMENT_TYPE :
										id = ITreeNode.INTERFACE;
										break;
									case IDelta.CLASS_ELEMENT_TYPE :
										id = ITreeNode.CLASS;
										break;
									case IDelta.ENUM_ELEMENT_TYPE :
										id = ITreeNode.ENUM;
									default :
										// we need to retrieve the type kind
										try {
											String componentVersionId = delta.getComponentVersionId();
											if (componentVersionId != null) {
												int indexOfOpen = componentVersionId.lastIndexOf('(');
												String componentID = componentVersionId.substring(0, indexOfOpen);
												String version = componentVersionId.substring(indexOfOpen + 1, componentVersionId.length() - 1);
												IApiBaseline baseline = ApiBaselineManager.getManager().getApiBaseline(DeltaSession.this.baselineName);
												int modifiers = 0;
												if (baseline != null) {
													IApiComponent apiComponent = baseline.getApiComponent(componentID);
													if (apiComponent != null && version.equals(apiComponent.getVersion())) {
														IApiTypeRoot typeRoot = apiComponent.findTypeRoot(typeName);
														if (typeRoot != null) {
															IApiType structure = typeRoot.getStructure();
															modifiers = structure.getModifiers();
														}
													}
												}
												if (modifiers == 0) {
													// try the workspace baseline
													baseline = ApiBaselineManager.getManager().getWorkspaceBaseline();
													if (baseline != null) {
														IApiComponent apiComponent = baseline.getApiComponent(componentID);
														if (apiComponent != null && version.equals(apiComponent.getVersion())) {
															IApiTypeRoot typeRoot = apiComponent.findTypeRoot(typeName);
															if (typeRoot != null) {
																IApiType structure = typeRoot.getStructure();
																modifiers = structure.getModifiers();
															}
														}
													}
												}
												if (Flags.isEnum(modifiers)) {
													id = ITreeNode.ENUM;
												} else if (Flags.isAnnotation(modifiers)) {
													id = ITreeNode.ANNOTATION;
												} else if (Flags.isInterface(modifiers)) {
													id = ITreeNode.INTERFACE;
												} else {
													id = ITreeNode.CLASS;
												}
											}
										} catch (CoreException e) {
											// ignore
										}
								}
								node3 = new TreeNode(id, actualTypeName, null);
								node2.add(node3);
							}
							node3.add(new TreeNode(0, delta.getMessage(), delta));
						}
					}
				}
			}
			if (this.delta == ApiComparator.NO_DELTA) {
				root.add(new TreeNode(0, ActionMessages.CompareTaskNoChanges, null));
			} else {
				this.delta.accept(new TreeBuilder(root));
			}
			return model;
		}
		
		public String getTimestamp() {
			return this.timestamp;
		}
	}

	private IWorkbenchPartSite workbenchPartSite;
	private ISelection selection = null;
	
	/**
	 * Constructor for Action1.
	 */
	public CompareWithAction() {
		super();
	}

	/**
	 * @see IObjectActionDelegate#setActivePart(IAction, IWorkbenchPart)
	 */
	public void setActivePart(IAction action, IWorkbenchPart targetPart) {
		workbenchPartSite = targetPart.getSite();
	}
	/**
	 * @see IActionDelegate#run(IAction)
	 */
	public void run(IAction action) {
		if (this.selection instanceof IStructuredSelection) {
			final IStructuredSelection structuredSelection=(IStructuredSelection) this.selection;
			CompareDialog dialog = new CompareDialog(workbenchPartSite, ActionMessages.CompareDialogTitle);
			int returnCode = dialog.open();
			if (returnCode == Window.CANCEL) return;
			final String baselineName = dialog.baseline;
			if (baselineName == null) return;
			final IApiBaseline baseline = ApiBaselineManager.getManager().getApiBaseline(baselineName);
			if (baseline == null) {
				return;
			}
			Job job = new Job(ActionMessages.CompareWithAction_comparing_apis){
				protected IStatus run(IProgressMonitor monitor) {
					SubMonitor progress = SubMonitor.convert(monitor, 100);
					progress.subTask(ActionMessages.CompareDialogCollectingElementTaskName);
					SubMonitor loopProgress = progress.newChild(10).setWorkRemaining(structuredSelection.size());
					final IApiScope scope = walkStructureSelection(structuredSelection, loopProgress);
					try {
						progress.subTask(ActionMessages.CompareDialogComputeDeltasTaskName);
						SubMonitor compareProgress = progress.newChild(98).setWorkRemaining(scope.getApiElements().length);
						try {
							IDelta delta = ApiComparator.compare(scope, baseline, VisibilityModifiers.API, false, compareProgress);
							ApiPlugin.getDefault().getSessionManager().addSession(new DeltaSession(delta, baselineName), true);
							progress.worked(1);
							return Status.OK_STATUS;
						} catch (CoreException e) {
							ApiPlugin.log(e);
						} catch(OperationCanceledException e) {
							// ignore
						}
					} finally {
						monitor.done();
					}
					return Status.CANCEL_STATUS;
				}
			};
			job.setSystem(false);
			job.setPriority(Job.LONG);
			job.schedule();
			return;
		}
	}

	public static ApiScope walkStructureSelection(
			IStructuredSelection structuredSelection,
			IProgressMonitor monitor) {
		Object[] selected=structuredSelection.toArray();
		ApiScope scope = new ApiScope();
		IApiBaseline workspaceBaseline = ApiBaselineManager.getManager().getWorkspaceBaseline();
		if (workspaceBaseline == null) {
			return scope;
		}
		for (int i=0, max = selected.length; i < max; i++) {
			Object currentSelection = selected[i];
			if (currentSelection instanceof IJavaElement) {
				monitor.worked(1);
				IJavaElement element =(IJavaElement) currentSelection;
				IJavaProject javaProject = element.getJavaProject();
				try {
					switch (element.getElementType()) {
						case IJavaElement.COMPILATION_UNIT: {
							ICompilationUnit compilationUnit = (ICompilationUnit) element;
							IApiComponent apiComponent = workspaceBaseline.getApiComponent(javaProject.getElementName());
							if (apiComponent != null) {
								addElementFor(compilationUnit, apiComponent, scope);
							}
							break;
						}
						case IJavaElement.PACKAGE_FRAGMENT: {
							IPackageFragment fragment = (IPackageFragment) element;
							IApiComponent apiComponent = workspaceBaseline.getApiComponent(javaProject.getElementName());
							IPackageFragmentRoot packageFragmentRoot = (IPackageFragmentRoot) fragment.getAncestor(IJavaElement.PACKAGE_FRAGMENT_ROOT);
							boolean isArchive = false;
							if (packageFragmentRoot != null) {
								isArchive = packageFragmentRoot.isArchive();
							}
							if (apiComponent != null) {
								addElementFor(fragment, isArchive, apiComponent, scope);
							}
							break;
						}
						case IJavaElement.PACKAGE_FRAGMENT_ROOT: {
							IPackageFragmentRoot fragmentRoot = (IPackageFragmentRoot) element;
							IApiComponent apiComponent = workspaceBaseline.getApiComponent(javaProject.getElementName());
							if (apiComponent != null) {
								addElementFor(fragmentRoot, apiComponent, scope);
							}
							break;
						}
						case IJavaElement.JAVA_PROJECT:
							IApiComponent apiComponent = workspaceBaseline.getApiComponent(javaProject.getElementName());
							if (apiComponent != null) {
								scope.add(apiComponent);
//								IPackageFragmentRoot[] roots = javaProject.getPackageFragmentRoots();
//								for (int j = 0, max2 = roots.length; j < max2; j++) {
//									addElementFor(roots[j], apiComponent, scope);
//								}
							}
							break;
					}
				} catch (JavaModelException e) {
					ApiPlugin.log(e);
				} catch (CoreException e) {
					ApiPlugin.log(e);
				}
			}
		}
		return scope;
	}

	private static void addElementFor(
			IPackageFragmentRoot fragmentRoot, IApiComponent apiComponent,
			ApiScope scope) throws JavaModelException, CoreException {
		boolean isArchive = fragmentRoot.isArchive();
		IJavaElement[] packageFragments = fragmentRoot.getChildren();
		for (int j = 0, max2 = packageFragments.length; j < max2; j++) {
			IPackageFragment packageFragment = (IPackageFragment) packageFragments[j];
			addElementFor(packageFragment, isArchive, apiComponent, scope);
		}
	}

	private static void addElementFor(
			IPackageFragment packageFragment,
			boolean isArchive,
			IApiComponent apiComponent,
			ApiScope scope)
		throws JavaModelException, CoreException {

		// add package fragment elements only if this is an API package
		IApiDescription apiDescription = apiComponent.getApiDescription();
		IApiAnnotations annotations = apiDescription.resolveAnnotations(Factory.packageDescriptor(packageFragment.getElementName()));
		if (annotations == null || !VisibilityModifiers.isAPI(annotations.getVisibility())) {
			return;
		}
		if (isArchive) {
			IClassFile[] classFiles = packageFragment.getClassFiles();
			for (int i = 0, max= classFiles.length; i < max; i++) {
				addElementFor(classFiles[i], apiComponent, scope);
			}
		} else {
			ICompilationUnit[] units = packageFragment.getCompilationUnits();
			for (int i = 0, max= units.length; i < max; i++) {
				addElementFor(units[i], apiComponent, scope);
			}
		}
	}

	private static void addElementFor(IClassFile classFile,
			IApiComponent apiComponent, ApiScope scope) {
		try {
			IApiTypeRoot typeRoot = apiComponent.findTypeRoot(classFile.getType().getFullyQualifiedName());
			if (typeRoot != null) {
				scope.add(typeRoot);
			}
		} catch (CoreException e) {
			ApiPlugin.log(e);
		}
	}

	private static void addElementFor(ICompilationUnit compilationUnit, IApiComponent component, ApiScope scope) throws JavaModelException {
		IType[] types = compilationUnit.getTypes();
		for (int i = 0, max = types.length; i < max; i++) {
			try {
				IApiTypeRoot typeRoot = component.findTypeRoot(types[i].getFullyQualifiedName());
				if (typeRoot != null) {
					scope.add(typeRoot);
				}
			} catch (CoreException e) {
				ApiPlugin.log(e);
			}
		}
	}

	/**
	 * @see IActionDelegate#selectionChanged(IAction, ISelection)
	 */
	public void selectionChanged(IAction action, ISelection selection) {
		this.selection = selection;
	}
}

Return to bug 258853

Lines 15-21 Link Here

(-)src/org/eclipse/pde/api/tools/internal/provisional/comparator/ApiComparator.java (-6 / +38 lines)
15	import java.util.Set;	15	import java.util.Set;
16		16
17	import org.eclipse.core.runtime.CoreException;	17	import org.eclipse.core.runtime.CoreException;
		18	import org.eclipse.core.runtime.IProgressMonitor;
18	import org.eclipse.core.runtime.IStatus;	19	import org.eclipse.core.runtime.IStatus;
		20	import org.eclipse.core.runtime.NullProgressMonitor;
19	import org.eclipse.jdt.core.Flags;	21	import org.eclipse.jdt.core.Flags;
20	import org.eclipse.pde.api.tools.internal.comparator.ClassFileComparator;	22	import org.eclipse.pde.api.tools.internal.comparator.ClassFileComparator;
21	import org.eclipse.pde.api.tools.internal.comparator.Delta;	23	import org.eclipse.pde.api.tools.internal.comparator.Delta;
Lines 355-363 Link Here
355	final int visibilityModifiers) {	357	final int visibilityModifiers) {
356	try {	358	try {
357		359
358	if (referenceBaseline == null \|\| baseline == null) {
359	throw new IllegalArgumentException("The baselines cannot be null"); //$NON-NLS-1$
360	}
361	if (referenceComponent == null) {	360	if (referenceComponent == null) {
362	if (component2 == null) {	361	if (component2 == null) {
363	throw new IllegalArgumentException("Both components cannot be null"); //$NON-NLS-1$	362	throw new IllegalArgumentException("Both components cannot be null"); //$NON-NLS-1$
Lines 381-386 Link Here
381	referenceComponentId,	380	referenceComponentId,
382	Util.getComponentVersionsId(referenceComponent));	381	Util.getComponentVersionsId(referenceComponent));
383	}	382	}
		383	if (referenceBaseline == null \|\| baseline == null) {
		384	throw new IllegalArgumentException("The baselines cannot be null"); //$NON-NLS-1$
		385	}
384	String referenceComponentId = referenceComponent.getId();	386	String referenceComponentId = referenceComponent.getId();
385	final Delta globalDelta = new Delta();	387	final Delta globalDelta = new Delta();
386		388
Lines 443-449 Link Here
443	final int visibilityModifiers) {	445	final int visibilityModifiers) {
444		446
445	try {	447	try {
446	return compare(referenceComponent, component, referenceComponent.getBaseline(), component.getBaseline(), visibilityModifiers);	448	return compare(referenceComponent, component, referenceComponent == null ? null : referenceComponent.getBaseline(), component.getBaseline(), visibilityModifiers);
447	} catch (CoreException e) {	449	} catch (CoreException e) {
448	ApiPlugin.log(e);	450	ApiPlugin.log(e);
449	}	451	}
Lines 665-670 Link Here
665	* @param baseline the given API baseline to compare with	667	* @param baseline the given API baseline to compare with
666	* @param visibilityModifiers the given visibility that triggers what visibility should be used for the comparison	668	* @param visibilityModifiers the given visibility that triggers what visibility should be used for the comparison
667	* @param force a flag to force the comparison of nested API components with the same versions	669	* @param force a flag to force the comparison of nested API components with the same versions
		670	* @param monitor the given progress monitor to report progress
668	*	671	*
669	* @return a delta, an empty delta if no difference is found or null if the delta detection failed	672	* @return a delta, an empty delta if no difference is found or null if the delta detection failed
670	* @throws IllegalArgumentException if one of the two baselines is null	673	* @throws IllegalArgumentException if one of the two baselines is null
Lines 674-685 Link Here
674	final IApiScope scope,	677	final IApiScope scope,
675	final IApiBaseline baseline,	678	final IApiBaseline baseline,
676	final int visibilityModifiers,	679	final int visibilityModifiers,
677	final boolean force) throws CoreException {	680	final boolean force,
		681	final IProgressMonitor monitor) throws CoreException {
678	if (scope == null \|\| baseline == null) {	682	if (scope == null \|\| baseline == null) {
679	throw new IllegalArgumentException("None of the scope or the baseline must be null"); //$NON-NLS-1$	683	throw new IllegalArgumentException("None of the scope or the baseline must be null"); //$NON-NLS-1$
680	}	684	}
		685	IProgressMonitor localMonitor = null;
		686	if (monitor == null) {
		687	localMonitor = new NullProgressMonitor();
		688	} else {
		689	localMonitor = monitor;
		690	}
681	final Set deltas = new HashSet();	691	final Set deltas = new HashSet();
682	final CompareApiScopeVisitor visitor = new CompareApiScopeVisitor(deltas, baseline, force, visibilityModifiers);	692	final CompareApiScopeVisitor visitor = new CompareApiScopeVisitor(deltas, baseline, force, visibilityModifiers, localMonitor);
683	scope.accept(visitor);	693	scope.accept(visitor);
684	if (visitor.containsError()) {	694	if (visitor.containsError()) {
685	return null;	695	return null;
Lines 711-716 Link Here
711	}	721	}
712	return globalDelta.isEmpty() ? NO_DELTA : globalDelta;	722	return globalDelta.isEmpty() ? NO_DELTA : globalDelta;
713	}	723	}
		724
		725	/**
		726	* Returns a delta that corresponds to the comparison of the two given API baselines.
		727	* Nested API components with the same versions are not compared.
		728	* <p>Equivalent to: compare(baseline, baseline2, visibilityModifiers, force, null);</p>
		729	*
		730	* @param scope the given scope for the comparison
		731	* @param baseline the given API baseline to compare with
		732	* @param visibilityModifiers the given visibility that triggers what visibility should be used for the comparison
		733	* @param force a flag to force the comparison of nested API components with the same versions
		734	*
		735	* @return a delta, an empty delta if no difference is found or null if the delta detection failed
		736	* @throws IllegalArgumentException if one of the two baselines is null
		737	* CoreException if one of the element in the scope cannot be visited
		738	*/
		739	public static IDelta compare(
		740	final IApiScope scope,
		741	final IApiBaseline baseline,
		742	final int visibilityModifiers,
		743	final boolean force) throws CoreException {
		744	return compare(scope, baseline, visibilityModifiers, force, null);
		745	}
714	/**	746	/**
715	* Returns a delta that corresponds to the comparison of the two given API baselines.	747	* Returns a delta that corresponds to the comparison of the two given API baselines.
716	* Nested API components with the same versions are not compared.	748	* Nested API components with the same versions are not compared.

Added Link Here

(-)src/org/eclipse/pde/api/tools/internal/SessionManager.java (+113 lines)
1	/*******************************************************************************
2	* Copyright (c) 2009 IBM Corporation and others.
3	* All rights reserved. This program and the accompanying materials
4	* are made available under the terms of the Eclipse Public License v1.0
5	* which accompanies this distribution, and is available at
6	* http://www.eclipse.org/legal/epl-v10.html
7	*
8	* Contributors:
9	* IBM Corporation - initial API and implementation
10	*******************************************************************************/
11	package org.eclipse.pde.api.tools.internal;
12
13	import java.util.ArrayList;
14	import java.util.HashSet;
15	import java.util.Iterator;
16	import java.util.List;
17	import java.util.Set;
18
19	import org.eclipse.pde.api.tools.internal.provisional.ISession;
20	import org.eclipse.pde.api.tools.internal.provisional.ISessionListener;
21	import org.eclipse.pde.api.tools.internal.provisional.ISessionManager;
22
23	/**
24	* Implementation of the ISessionManager.
25	* Synchronize all accesses to prevent concurrent modifications.
26	*/
27	public class SessionManager implements ISessionManager {
28
29	// use a list so that we can preserve the order
30	private List sessions = new ArrayList();
31	private Set listeners = new HashSet();
32	private ISession activeSession;
33
34	public synchronized void addSession(ISession session, boolean activate) {
35	if (session == null) {
36	throw new IllegalArgumentException("The given session cannot be null"); //$NON-NLS-1$
37	}
38	if (!this.sessions.contains(session)) {
39	this.sessions.add(session);
40	fireSessionAdded(session);
41	}
42	if (activate) {
43	this.activeSession = session;
44	fireSessionActivated(session);
45	}
46	}
47
48	public synchronized void removeSession(ISession session) {
49	if (sessions.remove(session)) {
50	if (session.equals(this.activeSession)) {
51	this.activeSession = null;
52	fireSessionActivated(null);
53	}
54	fireSessionRemoved(session);
55	}
56	}
57
58	public synchronized void removeAllSessions() {
59	ISession[] allSessions = (ISession[]) this.sessions.toArray(new ISession[this.sessions.size()]);
60	this.sessions.clear();
61	this.activeSession = null;
62	fireSessionActivated(null);
63	for (int i = 0; i < allSessions.length; i++) {
64	ISession session = allSessions[i];
65	fireSessionRemoved(session);
66	}
67	}
68
69	public synchronized ISession[] getSessions() {
70	return (ISession[]) sessions.toArray(new ISession[sessions.size()]);
71	}
72
73	public synchronized void addSessionListener(ISessionListener listener) {
74	if (listener == null) throw new IllegalArgumentException("The given listener cannot be null"); //$NON-NLS-1$
75	listeners.add(listener);
76	}
77
78	public synchronized void removeSessionListener(ISessionListener listener) {
79	listeners.remove(listener);
80	}
81
82	protected synchronized void fireSessionAdded(ISession session) {
83	Iterator i = listeners.iterator();
84	while (i.hasNext()) {
85	((ISessionListener) i.next()).sessionAdded(session);
86	}
87	}
88
89	protected synchronized void fireSessionRemoved(ISession session) {
90	Iterator i = listeners.iterator();
91	while (i.hasNext()) {
92	((ISessionListener) i.next()).sessionRemoved(session);
93	}
94	}
95
96	public ISession getActiveSession() {
97	return this.activeSession;
98	}
99
100	protected synchronized void fireSessionActivated(ISession session) {
101	Iterator i = listeners.iterator();
102	while (i.hasNext()) {
103	((ISessionListener) i.next()).sessionActivated(session);
104	}
105	}
106
107	public void activateSession(ISession session) {
108	if (this.sessions.contains(session) && !session.equals(this.activeSession)) {
109	this.activeSession = session;
110	fireSessionActivated(session);
111	}
112	}
113	}

Added Link Here

(-)xslt/compare.xsl (+141 lines)
1	<?xml version="1.0" encoding="iso-8859-1"?>
2	<!--
3	Copyright (c) IBM Corporation and others 2009. This page is made available under license. For full details see the LEGAL in the documentation book that contains this page.
4
5	All Platform Debug contexts, those for org.eclipse.debug.ui, are located in this file
6	All contexts are grouped by their relation, with all relations grouped alphabetically.
7	-->
8	<xsl:stylesheet version="1.0" xmlns:xsl="http://www.w3.org/1999/XSL/Transform">
9	<xsl:output
10	xmlns="http://www.w3.org/1999/xhtml"
11	method="xml"
12	encoding="ISO-8859-1"
13	media-type="text/html"
14	doctype-public="-//W3C//DTD XHTML 1.0 Transitional//EN"
15	doctype-system="http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd"
16	indent="yes"/>
17	<xsl:template match="/">
18	<html xmlns="http://www.w3.org/1999/xhtml" lang="en">
19	<head>
20	<title>Compare Details</title>
21	<style type="text/css">
22	table {
23	border-style: solid;
24	border-width: 1px;
25	border-color: #666666;
26	border-collapse: collapse;
27	}
28	tbody {
29	display:block
30	}
31	td {
32	border-style: solid;
33	border-width: 1px;
34	border-color: #666666;
35	}
36	a {
37	text-decoration: none;
38	font-weight: bold;
39	}
40	.link {
41	color:black;
42	}
43	.vis {
44	display:block;
45	}
46	.vis tr {
47	border-style: solid;
48	border-width: 1px;
49	border-color: #666666;
50	}
51	.vis th {
52	border-style: solid;
53	border-width: 1px;
54	border-color: #666666;
55	background-color:#CC9933
56	}
57	</style>
58	<script type="text/javascript">
59	<xsl:text disable-output-escaping="yes"><</xsl:text>!-- Begin
60	var element=false;
61	function hideall() {
62	var tBodyElements = document.getElementsByTagName('tbody');
63	for (i=0;i <xsl:text disable-output-escaping="yes"><</xsl:text> tBodyElements.length;i++) {
64	tBodyElements[i].style.display='none';
65	}
66	}
67
68	function showHide(tBodyID,link) {
69	element=document.getElementById(tBodyID);
70	if (element.style.display=='none') {
71	document.getElementById(link).innerHTML=' - ';
72	element.style.display='block';
73	} else {
74	document.getElementById(link).innerHTML=' + ';
75	element.style.display='none';
76	}
77	}
78	onload=hideall;
79	// End --<xsl:text disable-output-escaping="yes">></xsl:text>
80	</script>
81	</head>
82	<body>
83	<div align="left">
84	<xsl:apply-templates select="deltas"/>
85	</div>
86	<p>
87	<a href="http://validator.w3.org/check?uri=referer">
88	<img src="http://www.w3.org/Icons/valid-xhtml10-blue" alt="Valid XHTML 1.0 Strict" height="31" width="88"/>
89	</a>
90	</p>
91	</body>
92	</html>
93	</xsl:template>
94	<xsl:template match="deltas">
95	<table>
96	<thead>
97	<tr class="vis">
98	<th class="vis">
99	<span onclick="showHide('breaking', 'breakingspan')">
100	<span id="breakingspan" class="link" > + </span> List of breaking changes
101	</span>
102	</th>
103	</tr>
104	</thead>
105	<tbody id="breaking">
106	<xsl:for-each select="delta">
107	<xsl:if test="(@compatible='false')">
108	<tr>
109	<td>
110	<xsl:value-of disable-output-escaping="yes" select="@message"/>
111	</td>
112	</tr>
113	</xsl:if>
114	</xsl:for-each>
115	</tbody>
116	</table>
117	<p></p>
118	<table>
119	<thead>
120	<tr class="vis">
121	<th class="vis">
122	<span onclick="showHide('compatible', 'compatiblespan')">
123	<span id="compatiblespan" class="link"> + </span> List of compatible changes
124	</span>
125	</th>
126	</tr>
127	</thead>
128	<tbody id="compatible">
129	<xsl:for-each select="delta">
130	<xsl:if test="(@compatible='true')">
131	<tr>
132	<td>
133	<xsl:value-of disable-output-escaping="yes" select="@message"/>
134	</td>
135	</tr>
136	</xsl:if>
137	</xsl:for-each>
138	</tbody>
139	</table>
140	</xsl:template>
141	</xsl:stylesheet>

Lines 114-119 Link Here

(-)plugin.xml (+34 lines)
114	value="org.eclipse.pde.api.tools.apiAnalysisNature">	114	value="org.eclipse.pde.api.tools.apiAnalysisNature">
115	</filter>	115	</filter>
116	</objectContribution>	116	</objectContribution>
		117	<objectContribution
		118	adaptable="false"
		119	id="org.eclipse.pde.api.tools.ui.compare"
		120	objectClass="org.eclipse.jdt.core.IJavaElement">
		121	<action
		122	class="org.eclipse.pde.api.tools.ui.internal.actions.CompareWithAction"
		123	enablesFor="+"
		124	id="org.eclipse.pde.api.tools.ui.action.compare"
		125	label="%APICompare.name"
		126	menubarPath="compareWithMenu/compareWithGroup">
		127	</action>
		128	<menu
		129	label="%CompareWithMenu.label"
		130	path="additions"
		131	id="compareWithMenu">
		132	<separator
		133	name="compareWithGroup">
		134	</separator>
		135	</menu>
		136	</objectContribution>
117	</extension>	137	</extension>
118	<extension	138	<extension
119	point="org.eclipse.ui.propertyPages">	139	point="org.eclipse.ui.propertyPages">
Lines 271-276 Link Here
271	</markerResolutionGenerator>	291	</markerResolutionGenerator>
272	</extension>	292	</extension>
273	<extension	293	<extension
		294	point="org.eclipse.ui.views">
		295	<category
		296	id="org.eclipse.pde.api.tools.ui.views.apitooling.view.category"
		297	name="%Apitoolingview.category.name">
		298	</category>
		299	<view
		300	category="org.eclipse.pde.api.tools.ui.views.apitooling.view.category"
		301	class="org.eclipse.pde.api.tools.ui.internal.views.APIToolingView"
		302	icon="icons/full/obj16/api_tools.gif"
		303	id="org.eclipse.pde.api.tools.ui.views.apitooling.views.apitoolingview"
		304	name="%Apitoolingview.name">
		305	</view>
		306	</extension>
		307	<extension
274	point="org.eclipse.ltk.core.refactoring.renameParticipants">	308	point="org.eclipse.ltk.core.refactoring.renameParticipants">
275	<renameParticipant	309	<renameParticipant
276	class="org.eclipse.pde.api.tools.ui.internal.refactoring.FilterRenameParticipant"	310	class="org.eclipse.pde.api.tools.ui.internal.refactoring.FilterRenameParticipant"