Author: snjeza Date: 2010-05-26 15:59:50 -0400 (Wed, 26 May 2010) New Revision: 22341 Modified: branches/3.2.helios/examples/plugins/org.jboss.tools.project.examples/META-INF/MANIFEST.MF branches/3.2.helios/examples/plugins/org.jboss.tools.project.examples/src/org/jboss/tools/project/examples/filetransfer/ECFExamplesTransport.java branches/3.2.helios/examples/plugins/org.jboss.tools.project.examples/src/org/jboss/tools/project/examples/model/ProjectFix.java Log: https://jira.jboss.org/browse/JBIDE-6341 23 compile errors in org.jboss.tools.project.examples Modified: branches/3.2.helios/examples/plugins/org.jboss.tools.project.examples/META-INF/MANIFEST.MF =================================================================== --- branches/3.2.helios/examples/plugins/org.jboss.tools.project.examples/META-INF/MANIFEST.MF 2010-05-26 19:55:40 UTC (rev 22340) +++ branches/3.2.helios/examples/plugins/org.jboss.tools.project.examples/META-INF/MANIFEST.MF 2010-05-26 19:59:50 UTC (rev 22341) @@ -29,7 +29,8 @@ org.eclipse.equinox.p2.ui, org.eclipse.equinox.p2.ui.sdk, org.eclipse.equinox.p2.metadata, - org.jboss.tools.portlet.core + org.jboss.tools.portlet.core, + org.eclipse.equinox.p2.operations Bundle-ActivationPolicy: lazy Bundle-Localization: plugin Export-Package: org.jboss.tools.project.examples, Modified: branches/3.2.helios/examples/plugins/org.jboss.tools.project.examples/src/org/jboss/tools/project/examples/filetransfer/ECFExamplesTransport.java =================================================================== --- branches/3.2.helios/examples/plugins/org.jboss.tools.project.examples/src/org/jboss/tools/project/examples/filetransfer/ECFExamplesTransport.java 2010-05-26 19:55:40 UTC (rev 22340) +++ branches/3.2.helios/examples/plugins/org.jboss.tools.project.examples/src/org/jboss/tools/project/examples/filetransfer/ECFExamplesTransport.java 2010-05-26 19:59:50 UTC (rev 22341) @@ -41,8 +41,9 @@ import org.eclipse.ecf.filetransfer.service.IRetrieveFileTransferFactory; import org.eclipse.ecf.provider.filetransfer.retrieve.AbstractRetrieveFileTransfer; import org.eclipse.equinox.internal.p2.core.helpers.ServiceHelper; -import org.eclipse.equinox.internal.provisional.p2.core.IServiceUI; -import org.eclipse.equinox.internal.provisional.p2.core.IServiceUI.AuthenticationInfo; +import org.eclipse.equinox.p2.core.IProvisioningAgent; +import org.eclipse.equinox.p2.core.UIServices; +import org.eclipse.equinox.p2.core.UIServices.AuthenticationInfo; import org.eclipse.equinox.security.storage.ISecurePreferences; import org.eclipse.equinox.security.storage.SecurePreferencesFactory; import org.eclipse.equinox.security.storage.StorageException; @@ -425,9 +426,8 @@ // ignore } } - ServiceTracker adminUITracker = new ServiceTracker(ProjectExamplesActivator.getBundleContext(), IServiceUI.class.getName(), null); - adminUITracker.open(); - IServiceUI adminUIService = (IServiceUI) adminUITracker.getService(); + IProvisioningAgent agent = (IProvisioningAgent) ServiceHelper.getService(ProjectExamplesActivator.getBundleContext(), IProvisioningAgent.SERVICE_NAME); + UIServices adminUIService = (UIServices) agent.getService(UIServices.SERVICE_NAME); AuthenticationInfo loginDetails = null; if (adminUIService != null) loginDetails = adminUIService.getUsernamePassword(hostLocation.toString()); Modified: branches/3.2.helios/examples/plugins/org.jboss.tools.project.examples/src/org/jboss/tools/project/examples/model/ProjectFix.java =================================================================== --- branches/3.2.helios/examples/plugins/org.jboss.tools.project.examples/src/org/jboss/tools/project/examples/model/ProjectFix.java 2010-05-26 19:55:40 UTC (rev 22340) +++ branches/3.2.helios/examples/plugins/org.jboss.tools.project.examples/src/org/jboss/tools/project/examples/model/ProjectFix.java 2010-05-26 19:59:50 UTC (rev 22341) @@ -4,12 +4,14 @@ import java.util.Map; import org.eclipse.equinox.internal.p2.ui.sdk.ProvSDKUIActivator; -import org.eclipse.equinox.internal.provisional.p2.core.ProvisionException; -import org.eclipse.equinox.internal.provisional.p2.ui.IProvHelpContextIds; -import org.eclipse.equinox.internal.provisional.p2.ui.QueryableMetadataRepositoryManager; -import org.eclipse.equinox.internal.provisional.p2.ui.dialogs.InstallWizard; -import org.eclipse.equinox.internal.provisional.p2.ui.dialogs.ProvisioningWizardDialog; -import org.eclipse.equinox.internal.provisional.p2.ui.policy.Policy; +import org.eclipse.equinox.p2.core.ProvisionException; +import org.eclipse.equinox.internal.p2.ui.IProvHelpContextIds; +import org.eclipse.equinox.internal.p2.ui.ProvUIActivator; +import org.eclipse.equinox.internal.p2.ui.QueryableMetadataRepositoryManager; +import org.eclipse.equinox.internal.p2.ui.dialogs.InstallWizard; +import org.eclipse.equinox.internal.p2.ui.dialogs.ProvisioningWizardDialog; +import org.eclipse.equinox.p2.ui.Policy; +import org.eclipse.equinox.p2.ui.ProvisioningUI; import org.eclipse.jface.preference.PreferenceDialog; import org.eclipse.jface.wizard.WizardDialog; import org.eclipse.swt.widgets.Shell; @@ -100,20 +102,14 @@ } } if (PLUGIN_TYPE.equals(type)) { - try { - final String profileId = ProvSDKUIActivator.getSelfProfileId(); - final QueryableMetadataRepositoryManager manager = new QueryableMetadataRepositoryManager(Policy.getDefault().getQueryContext(), false); - InstallWizard wizard = new InstallWizard(Policy.getDefault(), profileId, null, null, manager); - WizardDialog dialog = new ProvisioningWizardDialog(getShell(), wizard); - dialog.create(); - PlatformUI.getWorkbench().getHelpSystem().setHelp(dialog.getShell(), IProvHelpContextIds.INSTALL_WIZARD); - dialog.open(); - } catch (ProvisionException e) { - // TODO Auto-generated catch block - e.printStackTrace(); - ProjectExamplesActivator.log(e); - } - + + ProvisioningUI ui = ProvisioningUI.getDefaultUI(); + InstallWizard wizard = new InstallWizard(ui, null, null, null); + WizardDialog dialog = new ProvisioningWizardDialog(getShell(), wizard); + dialog.create(); + PlatformUI.getWorkbench().getHelpSystem().setHelp(dialog.getShell(),IProvHelpContextIds.INSTALL_WIZARD); + dialog.open(); + } } private Shell getShell() {