Author: dgolovin Date: 2012-06-27 14:38:45 -0400 (Wed, 27 Jun 2012) New Revision: 42256 Modified: trunk/central/plugins/org.jboss.tools.central/META-INF/MANIFEST.MF trunk/central/plugins/org.jboss.tools.central/src/org/jboss/tools/central/editors/xpl/DiscoveryViewer.java trunk/central/plugins/org.jboss.tools.central/src/org/jboss/tools/central/editors/xpl/OverviewToolTip.java trunk/central/plugins/org.jboss.tools.central/src/org/jboss/tools/central/editors/xpl/TextSearchControl.java Log: https://issues.jboss.org/browse/JBIDE-12239 Migrate Central module to eclipse Juno patch committed after Snjezana review and approval Modified: trunk/central/plugins/org.jboss.tools.central/META-INF/MANIFEST.MF =================================================================== --- trunk/central/plugins/org.jboss.tools.central/META-INF/MANIFEST.MF 2012-06-27 18:37:48 UTC (rev 42255) +++ trunk/central/plugins/org.jboss.tools.central/META-INF/MANIFEST.MF 2012-06-27 18:38:45 UTC (rev 42256) @@ -19,10 +19,11 @@ org.eclipse.mylyn.commons.core;bundle-version="3.6.0", org.eclipse.mylyn.discovery.ui;bundle-version="3.6.0", org.eclipse.mylyn.discovery.core;bundle-version="3.6.0", - org.eclipse.mylyn.commons.ui;bundle-version="[3.6.0,3.8.0)", + org.eclipse.mylyn.commons.ui;bundle-version="[3.6.0,4.0.0)", org.eclipse.equinox.p2.ui.sdk;bundle-version="1.0.200", org.eclipse.equinox.p2.core;bundle-version="2.1.0", - org.eclipse.equinox.p2.engine;bundle-version="2.1.0" + org.eclipse.equinox.p2.engine;bundle-version="2.1.0", + org.eclipse.mylyn.commons.workbench;bundle-version="3.8.0" Bundle-ActivationPolicy: lazy Bundle-RequiredExecutionEnvironment: JavaSE-1.6 Bundle-Localization: plugin Modified: trunk/central/plugins/org.jboss.tools.central/src/org/jboss/tools/central/editors/xpl/DiscoveryViewer.java =================================================================== --- trunk/central/plugins/org.jboss.tools.central/src/org/jboss/tools/central/editors/xpl/DiscoveryViewer.java 2012-06-27 18:37:48 UTC (rev 42255) +++ trunk/central/plugins/org.jboss.tools.central/src/org/jboss/tools/central/editors/xpl/DiscoveryViewer.java 2012-06-27 18:38:45 UTC (rev 42256) @@ -62,11 +62,11 @@ import org.eclipse.mylyn.internal.discovery.ui.DiscoveryUi; import org.eclipse.mylyn.internal.discovery.ui.wizards.ConnectorDiscoveryWizard; import org.eclipse.mylyn.internal.discovery.ui.wizards.Messages; -import org.eclipse.mylyn.internal.provisional.commons.ui.CommonImages; -import org.eclipse.mylyn.internal.provisional.commons.ui.CommonThemes; -import org.eclipse.mylyn.internal.provisional.commons.ui.GradientCanvas; -import org.eclipse.mylyn.internal.provisional.commons.ui.SelectionProviderAdapter; -import org.eclipse.mylyn.internal.provisional.commons.ui.WorkbenchUtil; +import org.eclipse.mylyn.commons.ui.CommonImages; +import org.eclipse.mylyn.commons.ui.compatibility.CommonThemes; +import org.eclipse.mylyn.commons.ui.GradientCanvas; +import org.eclipse.mylyn.commons.ui.SelectionProviderAdapter; +import org.eclipse.mylyn.commons.workbench.browser.BrowserUtil; import org.eclipse.osgi.util.NLS; import org.eclipse.swt.SWT; import org.eclipse.swt.accessibility.ACC; @@ -239,7 +239,7 @@ providerLabel.addSelectionListener(new SelectionAdapter() { @Override public void widgetSelected(SelectionEvent e) { - WorkbenchUtil.openUrl(connector.getCertification().getUrl(), + BrowserUtil.openUrl(connector.getCertification().getUrl(), IWorkbenchBrowserSupport.AS_EXTERNAL); } }); Modified: trunk/central/plugins/org.jboss.tools.central/src/org/jboss/tools/central/editors/xpl/OverviewToolTip.java =================================================================== --- trunk/central/plugins/org.jboss.tools.central/src/org/jboss/tools/central/editors/xpl/OverviewToolTip.java 2012-06-27 18:37:48 UTC (rev 42255) +++ trunk/central/plugins/org.jboss.tools.central/src/org/jboss/tools/central/editors/xpl/OverviewToolTip.java 2012-06-27 18:38:45 UTC (rev 42256) @@ -17,11 +17,11 @@ import org.eclipse.jface.layout.GridLayoutFactory; import org.eclipse.jface.resource.ImageDescriptor; import org.eclipse.jface.window.ToolTip; +import org.eclipse.mylyn.commons.ui.GradientToolTip; +import org.eclipse.mylyn.commons.workbench.browser.BrowserUtil; import org.eclipse.mylyn.internal.discovery.core.model.AbstractDiscoverySource; import org.eclipse.mylyn.internal.discovery.core.model.Overview; import org.eclipse.mylyn.internal.discovery.ui.wizards.Messages; -import org.eclipse.mylyn.internal.provisional.commons.ui.GradientToolTip; -import org.eclipse.mylyn.internal.provisional.commons.ui.WorkbenchUtil; import org.eclipse.osgi.util.NLS; import org.eclipse.swt.SWT; import org.eclipse.swt.custom.StyledText; @@ -172,7 +172,7 @@ link.setToolTipText(NLS.bind(Messages.ConnectorDescriptorToolTip_detailsLink_tooltip, overview.getUrl())); link.addSelectionListener(new SelectionListener() { public void widgetSelected(SelectionEvent e) { - WorkbenchUtil.openUrl(overview.getUrl(), IWorkbenchBrowserSupport.AS_EXTERNAL); + BrowserUtil.openUrl(overview.getUrl(), IWorkbenchBrowserSupport.AS_EXTERNAL); } public void widgetDefaultSelected(SelectionEvent e) { Modified: trunk/central/plugins/org.jboss.tools.central/src/org/jboss/tools/central/editors/xpl/TextSearchControl.java =================================================================== --- trunk/central/plugins/org.jboss.tools.central/src/org/jboss/tools/central/editors/xpl/TextSearchControl.java 2012-06-27 18:37:48 UTC (rev 42255) +++ trunk/central/plugins/org.jboss.tools.central/src/org/jboss/tools/central/editors/xpl/TextSearchControl.java 2012-06-27 18:38:45 UTC (rev 42256) @@ -31,7 +31,7 @@ import org.eclipse.jface.resource.ImageDescriptor; import org.eclipse.jface.resource.JFaceResources; import org.eclipse.mylyn.internal.commons.ui.CommonsUiPlugin; -import org.eclipse.mylyn.internal.provisional.commons.ui.Messages; +import org.eclipse.mylyn.internal.commons.workbench.Messages; import org.eclipse.swt.SWT; import org.eclipse.swt.accessibility.ACC; import org.eclipse.swt.accessibility.AccessibleAdapter;