diff --git a/x10dt.ui.launch.cpp.rms/src/x10dt/ui/launch/cpp/rms/launch_configuration/StandaloneRMLaunchConfigurationDynamicTab.java b/x10dt.ui.launch.cpp.rms/src/x10dt/ui/launch/cpp/rms/launch_configuration/StandaloneRMLaunchConfigurationDynamicTab.java index ff030317..8ae7b50f 100644 --- a/x10dt.ui.launch.cpp.rms/src/x10dt/ui/launch/cpp/rms/launch_configuration/StandaloneRMLaunchConfigurationDynamicTab.java +++ b/x10dt.ui.launch.cpp.rms/src/x10dt/ui/launch/cpp/rms/launch_configuration/StandaloneRMLaunchConfigurationDynamicTab.java @@ -53,12 +53,11 @@ public void addContentsChangedListener(final IRMLaunchConfigurationContentsChang this.fListeners.add(listener); } - public RMLaunchValidation canSave(final Control control, final IResourceManager resourceManager, final IPQueue queue) { + public RMLaunchValidation canSave(final Control control) { return new RMLaunchValidation(true, null); } - public void createControl(final Composite parent, final IResourceManager resourceManager, - final IPQueue queue) throws CoreException { + public void createControl(final Composite parent, String id) throws CoreException { this.fControl = new Composite(parent, SWT.NONE); this.fControl.setFont(parent.getFont()); this.fControl.setLayout(new GridLayout(1, false)); @@ -103,8 +102,7 @@ public Control getControl() { return this.fControl; } - public RMLaunchValidation initializeFrom(final Control control, final IResourceManager resourceManager, final IPQueue queue, - final ILaunchConfiguration configuration) { + public RMLaunchValidation initializeFrom(final ILaunchConfiguration configuration) { try { this.fNumPlacesSpinner.setSelection(configuration.getAttribute(ATTR_NUM_PLACES, DEFAULT_NUM_PLACES)); } catch (CoreException except) { @@ -113,16 +111,14 @@ public RMLaunchValidation initializeFrom(final Control control, final IResourceM return new RMLaunchValidation(true, null); } - public RMLaunchValidation isValid(final ILaunchConfiguration launchConfig, final IResourceManager resourceManager, - final IPQueue queue) { + public RMLaunchValidation isValid(final ILaunchConfiguration launchConfig) { if (this.fNumPlacesSpinner.getSelection() < 1) { return new RMLaunchValidation(false, Messages.SRMLCDT_AtLeastOnePlaceMsg); } return new RMLaunchValidation(true, null); } - public RMLaunchValidation performApply(final ILaunchConfigurationWorkingCopy configuration, - final IResourceManager resourceManager, final IPQueue queue) { + public RMLaunchValidation performApply(final ILaunchConfigurationWorkingCopy configuration) { configuration.setAttribute(ATTR_NUM_PLACES, this.fNumPlacesSpinner.getSelection()); return new RMLaunchValidation(true, null); } @@ -131,8 +127,7 @@ public void removeContentsChangedListener(final IRMLaunchConfigurationContentsCh this.fListeners.remove(listener); } - public RMLaunchValidation setDefaults(final ILaunchConfigurationWorkingCopy configuration, - final IResourceManager resourceManager, final IPQueue queue) { + public RMLaunchValidation setDefaults(final ILaunchConfigurationWorkingCopy configuration) { return new RMLaunchValidation(true, null); } diff --git a/x10dt.ui.launch.cpp/icons/obj/x10_application.gif b/x10dt.ui.launch.cpp/icons/obj/x10_application.gif new file mode 100644 index 00000000..30fd706f Binary files /dev/null and b/x10dt.ui.launch.cpp/icons/obj/x10_application.gif differ diff --git a/x10dt.ui.launch.cpp/plugin.xml b/x10dt.ui.launch.cpp/plugin.xml index 46110a6a..9401c8f6 100644 --- a/x10dt.ui.launch.cpp/plugin.xml +++ b/x10dt.ui.launch.cpp/plugin.xml @@ -99,9 +99,9 @@ id="x10dt.ui.cpp.launch.X10LaunchConfigurationTabGroup" type="x10dt.ui.cpp.launch.X10LaunchConfigurationType"> + perspective="x10dt.ui.perspective"> @@ -109,7 +109,7 @@ point="org.eclipse.debug.ui.launchConfigurationTypeImages"> @@ -163,7 +163,7 @@ point="org.eclipse.debug.ui.launchShortcuts"> diff --git a/x10dt.ui.launch.cpp/src/x10dt/ui/launch/cpp/editors/CommunicationInterfaceSectionPart.java b/x10dt.ui.launch.cpp/src/x10dt/ui/launch/cpp/editors/CommunicationInterfaceSectionPart.java index 96cce975..eb680b26 100644 --- a/x10dt.ui.launch.cpp/src/x10dt/ui/launch/cpp/editors/CommunicationInterfaceSectionPart.java +++ b/x10dt.ui.launch.cpp/src/x10dt/ui/launch/cpp/editors/CommunicationInterfaceSectionPart.java @@ -384,17 +384,19 @@ private void createClient(final IManagedForm managedForm, final FormToolkit tool private ICITypeConfigurationPart createCITypeConfigurationPart(final IServiceProvider serviceProvider) { final String remoteServiceId = serviceProvider.getId(); - IResourceManager rm = ModelManager.getInstance().getResourceManagerFromUniqueName(((ResourceManagerServiceProvider)serviceProvider).getUniqueName()); - if (OPEN_MPI_SERVICE_PROVIDER_ID.equals(remoteServiceId)) { - return new OpenMPITypeConfigPart((IOpenMPIResourceManagerConfiguration) rm.getControlConfiguration()); - } else if (MPICH2_SERVICE_PROVIDER_ID.equals(remoteServiceId)) { - return new MPICH2TypeConfigPart((IToolRMConfiguration) rm.getControlConfiguration()); - } else if (PARALLEL_ENVIRONMENT_SERVICE_PROVIDER_ID.equals(remoteServiceId)) { - return new ParallelEnvironmentTypeConfigPart((PEResourceManagerConfiguration) rm.getControlConfiguration()); - } else if (LOAD_LEVELER_SERVICE_PROVIDER_ID.equals(remoteServiceId)) { - //return new LoadLevelerTypeConfigPart((IIBMLLResourceManagerConfiguration) rm.getControlConfiguration()); - return new LoadLevelerTypeConfigPart(); - } else if (SOCKETS_SERVICE_PROVIDER_ID.equals(remoteServiceId)) { +// IResourceManager rm = ModelManager.getInstance().getResourceManagerFromUniqueName(((ResourceManagerServiceProvider)serviceProvider).getUniqueName()); +// if (OPEN_MPI_SERVICE_PROVIDER_ID.equals(remoteServiceId)) { +// return new OpenMPITypeConfigPart((IOpenMPIResourceManagerConfiguration) rm.getControlConfiguration()); +// } else if (MPICH2_SERVICE_PROVIDER_ID.equals(remoteServiceId)) { +// return new MPICH2TypeConfigPart((IToolRMConfiguration) rm.getControlConfiguration()); +// } else if (PARALLEL_ENVIRONMENT_SERVICE_PROVIDER_ID.equals(remoteServiceId)) { +// return new ParallelEnvironmentTypeConfigPart((PEResourceManagerConfiguration) rm.getControlConfiguration()); +// } else if (LOAD_LEVELER_SERVICE_PROVIDER_ID.equals(remoteServiceId)) { +// //return new LoadLevelerTypeConfigPart((IIBMLLResourceManagerConfiguration) rm.getControlConfiguration()); +// return new LoadLevelerTypeConfigPart(); +// } else + + if (SOCKETS_SERVICE_PROVIDER_ID.equals(remoteServiceId)) { return new HostFileAndListTypeConfigPart(); } else if (PAMI_SERVICE_PROVIDER_ID.equals(remoteServiceId)) { return new PAMITypeConfigPart(); diff --git a/x10dt.ui.launch.cpp/src/x10dt/ui/launch/cpp/editors/ConfNameSectionPart.java b/x10dt.ui.launch.cpp/src/x10dt/ui/launch/cpp/editors/ConfNameSectionPart.java index e8aa5b57..eced882c 100644 --- a/x10dt.ui.launch.cpp/src/x10dt/ui/launch/cpp/editors/ConfNameSectionPart.java +++ b/x10dt.ui.launch.cpp/src/x10dt/ui/launch/cpp/editors/ConfNameSectionPart.java @@ -9,6 +9,7 @@ import java.util.Collection; +import org.eclipse.ptp.core.ModelManager; import org.eclipse.ptp.core.PTPCorePlugin; import org.eclipse.ptp.core.events.IResourceManagerChangedEvent; import org.eclipse.ptp.core.events.IResourceManagerAddedEvent; @@ -53,14 +54,14 @@ final class ConfNameSectionPart extends AbstractCommonSectionFormPart implements addCompletePartListener(formPage); ServiceModelManager.getInstance().addEventListener(this, IServiceModelEvent.SERVICE_CONFIGURATION_ADDED | IServiceModelEvent.SERVICE_CONFIGURATION_REMOVED); - PTPCorePlugin.getDefault().getModelManager().addListener(this); + ModelManager.getInstance().addListener(this); } // --- IFormPart's interface methods implementation public void dispose() { ServiceModelManager.getInstance().removeEventListener(this); - PTPCorePlugin.getDefault().getModelManager().removeListener(this); + ModelManager.getInstance().removeListener(this); removeCompletePartListener(getFormPage()); } diff --git a/x10dt.ui.launch.cpp/src/x10dt/ui/launch/cpp/launching/CommunicationInterfaceTab.java b/x10dt.ui.launch.cpp/src/x10dt/ui/launch/cpp/launching/CommunicationInterfaceTab.java index 601a162d..ae450e28 100644 --- a/x10dt.ui.launch.cpp/src/x10dt/ui/launch/cpp/launching/CommunicationInterfaceTab.java +++ b/x10dt.ui.launch.cpp/src/x10dt/ui/launch/cpp/launching/CommunicationInterfaceTab.java @@ -28,6 +28,7 @@ import org.eclipse.osgi.util.NLS; import org.eclipse.ptp.core.IModelManager; import org.eclipse.ptp.core.IPTPLaunchConfigurationConstants; +import org.eclipse.ptp.core.ModelManager; import org.eclipse.ptp.core.PTPCorePlugin; import org.eclipse.ptp.core.elements.IPResourceManager; import org.eclipse.ptp.core.elements.IPUniverse; @@ -95,8 +96,7 @@ public void widgetSelected(final SelectionEvent event) { final IRMLaunchConfigurationDynamicTab rmDynamicTab = getRMLaunchConfigurationDynamicTab(resourceManager); if (rmDynamicTab != null) { updateConfiguration(configuration, rmDynamicTab); - rmDynamicTab.initializeFrom(CommunicationInterfaceTab.this.fComposite, resourceManager, null /* queue */, - getLaunchConfiguration()); + rmDynamicTab.initializeFrom(getLaunchConfiguration()); } } @@ -142,7 +142,7 @@ public void performApply(final ILaunchConfigurationWorkingCopy configuration) { configuration.setAttribute(ATTR_USE_PLATFORM_CONF_DATA, this.fSynchronizationBt.getSelection()); final IRMLaunchConfigurationDynamicTab rmDynamicTab = getRMLaunchConfigurationDynamicTab(this.fResourceManager); if (rmDynamicTab != null) { - final RMLaunchValidation validation = rmDynamicTab.performApply(configuration, this.fResourceManager, null); + final RMLaunchValidation validation = rmDynamicTab.performApply(configuration); if (! validation.isSuccess()) { setErrorMessage(validation.getMessage()); } @@ -151,7 +151,7 @@ public void performApply(final ILaunchConfigurationWorkingCopy configuration) { } public void setDefaults(final ILaunchConfigurationWorkingCopy configuration) { - final IModelManager modelManager = PTPCorePlugin.getDefault().getModelManager(); + final IModelManager modelManager = ModelManager.getInstance(); final IPUniverse universe = modelManager.getUniverse(); IResourceManager resourceManager = null; if (universe != null) { @@ -177,7 +177,7 @@ public void setDefaults(final ILaunchConfigurationWorkingCopy configuration) { setErrorMessage(NLS.bind(LaunchMessages.CIT_NoLaunchConfigForRM, new Object[] { resourceManager.getName() })); } else { - rmDynamicTab.setDefaults(configuration, resourceManager, null); + rmDynamicTab.setDefaults(configuration); } } @@ -279,7 +279,7 @@ public boolean isValid(final ILaunchConfiguration configuration) { if (rmDynamicTab.getControl() == null) { initializeDynamicTab(configuration, rmDynamicTab); } - final RMLaunchValidation validation = rmDynamicTab.isValid(configuration, this.fResourceManager, null); + final RMLaunchValidation validation = rmDynamicTab.isValid(configuration); if (! validation.isSuccess()) { setErrorMessage(validation.getMessage()); return false; @@ -355,14 +355,13 @@ private void initializeDynamicTab(final ILaunchConfiguration configuration, } this.fComposite.setLayout(new GridLayout(1, false)); - rmDynamicTab.createControl(this.fComposite, this.fResourceManager, null /* queue */); + rmDynamicTab.createControl(this.fComposite, this.fResourceManager.getUniqueName()); rmDynamicTab.getControl().setLayoutData(new GridData(SWT.FILL, SWT.FILL, true, true)); if (configuration instanceof ILaunchConfigurationWorkingCopy) { updateConfiguration((ILaunchConfigurationWorkingCopy) configuration, rmDynamicTab); } - rmDynamicTab.initializeFrom(this.fComposite, this.fResourceManager, null /* queue */, - getLaunchConfiguration()); + rmDynamicTab.initializeFrom(getLaunchConfiguration()); this.fParent.setMinSize(this.fComposite.computeSize(this.fSynchronizationBt.getBounds().width, SWT.DEFAULT)); } diff --git a/x10dt.ui.launch.cpp/src/x10dt/ui/launch/cpp/launching/CppApplicationTab.java b/x10dt.ui.launch.cpp/src/x10dt/ui/launch/cpp/launching/CppApplicationTab.java index a3cdf58f..e453abc0 100644 --- a/x10dt.ui.launch.cpp/src/x10dt/ui/launch/cpp/launching/CppApplicationTab.java +++ b/x10dt.ui.launch.cpp/src/x10dt/ui/launch/cpp/launching/CppApplicationTab.java @@ -38,8 +38,10 @@ import org.eclipse.jface.viewers.IStructuredSelection; import org.eclipse.jface.window.Window; import org.eclipse.osgi.util.NLS; +import org.eclipse.ptp.core.IPTPLaunchConfigurationConstants; import org.eclipse.ptp.launch.ui.LaunchConfigurationTab; import org.eclipse.ptp.launch.ui.LaunchImages; +import org.eclipse.ptp.remote.core.exception.RemoteConnectionException; import org.eclipse.swt.SWT; import org.eclipse.swt.events.ModifyEvent; import org.eclipse.swt.events.ModifyListener; @@ -78,6 +80,7 @@ import x10dt.ui.launch.cpp.platform_conf.ICppCompilationConf; import x10dt.ui.launch.cpp.platform_conf.IX10PlatformConf; import x10dt.ui.launch.cpp.platform_conf.X10PlatformConfFactory; +import x10dt.ui.launch.cpp.utils.PTPConfUtils; import x10dt.ui.launch.cpp.utils.PlatformConfUtils; import x10dt.ui.utils.LaunchUtils; @@ -126,7 +129,7 @@ public void performApply(final ILaunchConfigurationWorkingCopy configuration) { configuration.setAttribute(org.eclipse.jdt.launching.IJavaLaunchConfigurationConstants.ATTR_MAIN_TYPE_NAME, this.fMainTypeText.getText().trim()); configuration.setAttribute(ATTR_X10_MAIN_CLASS, this.fMainTypeText.getText().trim()); - + final String content = this.fPgrmArgsText.getText().trim(); configuration.setAttribute(ATTR_ARGUMENTS, (content.length() > 0) ? content : null); @@ -162,9 +165,11 @@ public void setDefaults(final ILaunchConfigurationWorkingCopy configuration) { CppLaunchCore.log(except.getStatus()); } } + configuration.setAttribute(ATTR_WORKING_DIR, (String) null); configuration.setAttribute(ATTR_ARGUMENTS, (String) null); configuration.setAttribute(ATTR_CONSOLE, true); + } // --- Overridden methods diff --git a/x10dt.ui.launch.cpp/src/x10dt/ui/launch/cpp/launching/CppLaunchConfigurationDelegate.java b/x10dt.ui.launch.cpp/src/x10dt/ui/launch/cpp/launching/CppLaunchConfigurationDelegate.java index e05eca10..aa30a4c6 100644 --- a/x10dt.ui.launch.cpp/src/x10dt/ui/launch/cpp/launching/CppLaunchConfigurationDelegate.java +++ b/x10dt.ui.launch.cpp/src/x10dt/ui/launch/cpp/launching/CppLaunchConfigurationDelegate.java @@ -42,12 +42,15 @@ import org.eclipse.core.runtime.SubProgressMonitor; import org.eclipse.debug.core.ILaunch; import org.eclipse.debug.core.ILaunchConfiguration; +import org.eclipse.debug.core.ILaunchConfigurationWorkingCopy; import org.eclipse.debug.core.ILaunchManager; import org.eclipse.imp.preferences.PreferencesService; import org.eclipse.jdt.core.IJavaProject; import org.eclipse.jdt.core.JavaCore; import org.eclipse.jface.dialogs.ErrorDialog; import org.eclipse.osgi.util.NLS; +import org.eclipse.ptp.core.IPTPLaunchConfigurationConstants; +import org.eclipse.ptp.core.ModelManager; import org.eclipse.ptp.core.PTPCorePlugin; import org.eclipse.ptp.core.attributes.ArrayAttribute; import org.eclipse.ptp.core.attributes.AttributeManager; @@ -124,6 +127,7 @@ public void launch(final ILaunchConfiguration configuration, final String mode, monitor.beginTask(null, 10); monitor.subTask(LaunchMessages.CLCD_ExecCreationTaskName); + this.fProject = verifyProject(configuration); // The following check shouldn't be necessary, since this ILaunchConfigurationDelegate implementation @@ -134,8 +138,15 @@ public void launch(final ILaunchConfiguration configuration, final String mode, new Status(IStatus.ERROR, CppLaunchCore.PLUGIN_ID, Constants.EMPTY_STR)); return; } + + if (!monitor.isCanceled() && shouldProcessToLinkStep(fProject) && createExecutable(configuration, fProject, new SubProgressMonitor(monitor, 5)) == 0) { + + ILaunchConfigurationWorkingCopy workingCopy = configuration.getWorkingCopy(); + workingCopy.setAttribute(IPTPLaunchConfigurationConstants.ATTR_RESOURCE_MANAGER_UNIQUENAME, fResourceManager.getUniqueName()); + workingCopy.doSave(); + // Then, performs the launch. if (!monitor.isCanceled()) { // Hijack launch if it's PAMI with LoadLeveler @@ -146,7 +157,8 @@ public void launch(final ILaunchConfiguration configuration, final String mode, } else { monitor.subTask(LaunchMessages.CLCD_LaunchCreationTaskName); updateAttributes(configuration, mode, monitor); - super.launch(configuration, mode, launch, new SubProgressMonitor(monitor, 5)); + //super.launch(configuration, mode, launch, new SubProgressMonitor(monitor, 5)); + runMyCommand(monitor); } } } @@ -155,6 +167,40 @@ public void launch(final ILaunchConfiguration configuration, final String mode, } } + private void runMyCommand(final IProgressMonitor monitor) { + try { + final MessageConsole messageConsole = UIUtils.findOrCreateX10Console(); + final MessageConsoleStream mcStream = messageConsole.newMessageStream(); + messageConsole.clearConsole(); + final String cmd = this.fExecPath; + final List command = new ArrayList(); + command.add(cmd); + final int returnCode = this.fTargetOpHelper.run(command, this.fWorkspaceDir, new IProcessOuputListener() { + + public void read(final String line) { + mcStream.println(line); + } + + public void readError(final String line) { + if (this.fCounter == 0) { + mcStream.println(NLS.bind(LaunchMessages.CLCD_CmdUsedMsg, cmd)); + this.fCounter = 1; + } + mcStream.println(line); + } + + // --- Fields + + int fCounter; + + }, monitor); + mcStream.flush(); + } catch (InterruptedException e){ + //TODO + } catch (IOException e){ + //TODO + } + } private void launchPAMIwLL(final ILaunchConfiguration configuration, final IProject project, final IProgressMonitor monitor) throws CoreException{ @@ -372,7 +418,8 @@ protected void updateAttributes(final ILaunchConfiguration configuration, final //attrMgr.addAttributes(getResourceAttributes(configuration, mode)); // Collects attributes from Environment tab - String[] envArr = getEnvironmentToAppend(configuration); + String[] envArr = null; //org.eclipse.ptp.core.util.LaunchUtils.getEnvironmentToAppend(configuration); + if (this.fIsCygwin) { final StringBuilder sb = new StringBuilder(); sb.append(PATH_ENV).append('='); @@ -420,7 +467,7 @@ protected void updateAttributes(final ILaunchConfiguration configuration, final // Makes sure there is a queue, even if the resources tab doesn't require one to be specified. if (attrMgr.getAttribute(JobAttributes.getQueueIdAttributeDefinition()) == null) { - final IPQueue queue = getQueueDefault((IPResourceManager) this.fResourceManager.getAdapter(IPResourceManager.class)); + final IPQueue queue = org.eclipse.ptp.core.util.LaunchUtils.getQueueDefault((IPResourceManager) this.fResourceManager.getAdapter(IPResourceManager.class)); if (queue == null) { throw new CoreException(new Status(IStatus.ERROR, CppLaunchCore.PLUGIN_ID, LaunchMessages.CLCD_NoRMQueueError)); } @@ -439,7 +486,7 @@ protected void updateAttributes(final ILaunchConfiguration configuration, final // Collects attributes from Arguments tab attrMgr.addAttribute(JobAttributes.getWorkingDirectoryAttributeDefinition().create(this.fWorkspaceDir)); - final String[] argArr = getProgramArguments(configuration); + final String[] argArr = org.eclipse.ptp.core.util.LaunchUtils.getProgramArguments(configuration); if (argArr != null) { attrMgr.addAttribute(JobAttributes.getProgramArgumentsAttributeDefinition().create(argArr)); } @@ -596,8 +643,8 @@ private IFileStore getMainCppFileStore(final String x10MainType, final String wo } private IResourceManager getResourceManagerControl(final ILaunchConfiguration configuration) throws CoreException { - final IPUniverse universe = PTPCorePlugin.getDefault().getModelManager().getUniverse(); - final String rmUniqueName = getResourceManagerUniqueName(configuration); + final IPUniverse universe = ModelManager.getInstance().getUniverse(); + final String rmUniqueName = org.eclipse.ptp.core.util.LaunchUtils.getResourceManagerUniqueName(configuration); for (final IPResourceManager pResourceManager : universe.getResourceManagers()) { IResourceManager resourceManager = (IResourceManager) pResourceManager.getAdapter(IResourceManager.class); if (resourceManager.getUniqueName().equals(rmUniqueName)) { diff --git a/x10dt.ui.launch.cpp/src/x10dt/ui/launch/cpp/launching/X10CppLaunchShortcut.java b/x10dt.ui.launch.cpp/src/x10dt/ui/launch/cpp/launching/X10CppLaunchShortcut.java index 51a3fc3c..b1313687 100644 --- a/x10dt.ui.launch.cpp/src/x10dt/ui/launch/cpp/launching/X10CppLaunchShortcut.java +++ b/x10dt.ui.launch.cpp/src/x10dt/ui/launch/cpp/launching/X10CppLaunchShortcut.java @@ -28,9 +28,11 @@ import org.eclipse.imp.preferences.PreferencesService; import org.eclipse.imp.utils.Pair; import org.eclipse.jdt.launching.IJavaLaunchConfigurationConstants; +import org.eclipse.ptp.core.IPTPLaunchConfigurationConstants; import org.eclipse.ptp.core.elements.IPResourceManager; import org.eclipse.ptp.core.elements.IPMachine; import org.eclipse.ptp.core.elements.IPNode; +import org.eclipse.ptp.core.util.LaunchUtils; import org.eclipse.ptp.rmsystem.IResourceManager; import org.eclipse.ptp.rm.mpi.mpich2.core.launch.MPICH2LaunchConfiguration; import org.eclipse.ptp.rm.mpi.openmpi.core.launch.OpenMPILaunchConfiguration; @@ -74,7 +76,6 @@ protected void setLaunchConfigurationAttributes(final ILaunchConfigurationWorkin workingCopy.setAttribute(ATTR_MAIN_TYPE_NAME, typeInfo.getName()); workingCopy.setAttribute(ATTR_CONSOLE, true); workingCopy.setAttribute(ATTR_X10_MAIN_CLASS, typeInfo.getName()); - final IProject project = typeInfo.getCompilationUnit().getProject().getRawProject(); final IX10PlatformConf platformConf = CppLaunchCore.getInstance().getPlatformConfiguration(project); @@ -100,7 +101,7 @@ protected void setLaunchConfigurationAttributes(final ILaunchConfigurationWorkin } if ((useHostListAttrKey != null) && (hostListAttrKey != null)) { - final IResourceManager resourceManager = PTPConfUtils.findResourceManagerById(platformConf); + final IResourceManager resourceManager = PTPConfUtils.findResourceManagerByName(platformConf.getName()); if (resourceManager != null) { final StringBuilder hostListBuilder = new StringBuilder(); int i = 0; diff --git a/x10dt.ui.launch.cpp/src/x10dt/ui/launch/cpp/platform_conf/ConnectionConfiguration.java b/x10dt.ui.launch.cpp/src/x10dt/ui/launch/cpp/platform_conf/ConnectionConfiguration.java index 7d6d6885..8ded9093 100644 --- a/x10dt.ui.launch.cpp/src/x10dt/ui/launch/cpp/platform_conf/ConnectionConfiguration.java +++ b/x10dt.ui.launch.cpp/src/x10dt/ui/launch/cpp/platform_conf/ConnectionConfiguration.java @@ -14,6 +14,7 @@ import org.eclipse.core.runtime.CoreException; import org.eclipse.core.runtime.NullProgressMonitor; +import org.eclipse.ptp.core.ModelManager; import org.eclipse.ptp.core.PTPCorePlugin; import org.eclipse.ptp.remote.core.IRemoteConnection; import org.eclipse.ptp.remote.core.IRemoteConnectionManager; @@ -170,7 +171,7 @@ public String toString() { } ConnectionConfiguration(final IResourceManagerConfiguration rmConf) { - IResourceManager rm = PTPCorePlugin.getDefault().getModelManager().getResourceManagerFromUniqueName(rmConf.getUniqueName()); + IResourceManager rm = ModelManager.getInstance().getResourceManagerFromUniqueName(rmConf.getUniqueName()); final IRemoteServices remoteServices = PTPRemoteCorePlugin.getDefault().getRemoteServices(rm.getControlConfiguration().getRemoteServicesId()); final IRemoteConnection rmConn = remoteServices.getConnectionManager().getConnection(rm.getControlConfiguration().getConnectionName()); this.fIsLocal = PTPConstants.LOCAL_CONN_SERVICE_ID.equals(remoteServices.getId()); diff --git a/x10dt.ui.launch.cpp/src/x10dt/ui/launch/cpp/platform_conf/LoadLevelerConf.java b/x10dt.ui.launch.cpp/src/x10dt/ui/launch/cpp/platform_conf/LoadLevelerConf.java index 58fa805d..0f90f0f4 100644 --- a/x10dt.ui.launch.cpp/src/x10dt/ui/launch/cpp/platform_conf/LoadLevelerConf.java +++ b/x10dt.ui.launch.cpp/src/x10dt/ui/launch/cpp/platform_conf/LoadLevelerConf.java @@ -12,7 +12,7 @@ import java.util.Arrays; -import org.eclipse.ptp.remote.core.IRemoteProxyOptions; +import org.eclipse.ptp.rm.core.proxy.IRemoteProxyOptions; import org.eclipse.ptp.rm.ibm.ll.core.rmsystem.IIBMLLResourceManagerConfiguration; import org.eclipse.ptp.rmsystem.IResourceManagerConfiguration; import org.eclipse.ptp.services.core.IServiceProvider; diff --git a/x10dt.ui.launch.cpp/src/x10dt/ui/launch/cpp/platform_conf/MessagePassingInterfaceConf.java b/x10dt.ui.launch.cpp/src/x10dt/ui/launch/cpp/platform_conf/MessagePassingInterfaceConf.java index be5cfaf3..5989993e 100644 --- a/x10dt.ui.launch.cpp/src/x10dt/ui/launch/cpp/platform_conf/MessagePassingInterfaceConf.java +++ b/x10dt.ui.launch.cpp/src/x10dt/ui/launch/cpp/platform_conf/MessagePassingInterfaceConf.java @@ -9,6 +9,7 @@ import java.util.Arrays; +import org.eclipse.ptp.core.ModelManager; import org.eclipse.ptp.core.PTPCorePlugin; import org.eclipse.ptp.rm.core.rmsystem.IToolRMConfiguration; import org.eclipse.ptp.rmsystem.IResourceManager; @@ -160,7 +161,7 @@ public String toString() { } MessagePassingInterfaceConf(final IToolRMConfiguration rmConf) { - super(PTPCorePlugin.getDefault().getModelManager().getResourceManagerFromUniqueName(rmConf.getName()).getConfiguration()); //MV - check that rmConf.getName() is a unique name for the resource manager + super(ModelManager.getInstance().getResourceManagerFromUniqueName(rmConf.getName()).getConfiguration()); //MV - check that rmConf.getName() is a unique name for the resource manager //super(rmConf); this.fDefaultToolCmds = rmConf.getUseToolDefaults(); this.fLaunchCmd = rmConf.getLaunchCmd(); diff --git a/x10dt.ui.launch.cpp/src/x10dt/ui/launch/cpp/platform_conf/ParallelEnvironmentConf.java b/x10dt.ui.launch.cpp/src/x10dt/ui/launch/cpp/platform_conf/ParallelEnvironmentConf.java index ebee5cde..72f377e5 100644 --- a/x10dt.ui.launch.cpp/src/x10dt/ui/launch/cpp/platform_conf/ParallelEnvironmentConf.java +++ b/x10dt.ui.launch.cpp/src/x10dt/ui/launch/cpp/platform_conf/ParallelEnvironmentConf.java @@ -7,7 +7,7 @@ *******************************************************************************/ package x10dt.ui.launch.cpp.platform_conf; -import org.eclipse.ptp.remote.core.IRemoteProxyOptions; +import org.eclipse.ptp.rm.core.proxy.IRemoteProxyOptions; import org.eclipse.ptp.rm.ibm.pe.core.PEPreferenceConstants; import org.eclipse.ptp.rm.ibm.pe.core.rmsystem.PEResourceManagerConfiguration; import org.eclipse.ptp.rmsystem.IResourceManagerConfiguration; diff --git a/x10dt.ui.launch.cpp/src/x10dt/ui/launch/cpp/utils/PTPConfUtils.java b/x10dt.ui.launch.cpp/src/x10dt/ui/launch/cpp/utils/PTPConfUtils.java index 46e15599..da5726da 100644 --- a/x10dt.ui.launch.cpp/src/x10dt/ui/launch/cpp/utils/PTPConfUtils.java +++ b/x10dt.ui.launch.cpp/src/x10dt/ui/launch/cpp/utils/PTPConfUtils.java @@ -46,7 +46,7 @@ import org.eclipse.ptp.core.listeners.IResourceManagerListener; import org.eclipse.ptp.remote.core.IRemoteConnection; import org.eclipse.ptp.remote.core.IRemoteConnectionManager; -import org.eclipse.ptp.remote.core.IRemoteProxyOptions; +import org.eclipse.ptp.rm.core.proxy.IRemoteProxyOptions; import org.eclipse.ptp.remote.core.IRemoteServices; import org.eclipse.ptp.remote.core.PTPRemoteCorePlugin; import org.eclipse.ptp.remote.core.exception.RemoteConnectionException; @@ -228,7 +228,7 @@ public static String getCommunicationInterfaceTypeName(final ICommunicationInter * @return A non-null resource manager if we found a match, null otherwise. */ public static IResourceManager findResourceManagerByName(final String platformConfName) { - final IPUniverse universe = (IPUniverse) PTPCorePlugin.getDefault().getModelManager().getUniverse(); + final IPUniverse universe = (IPUniverse) ModelManager.getInstance().getUniverse(); for (final IPResourceManager pResourceManager : universe.getResourceManagers()) { final IResourceManager resourceManager = (IResourceManager) pResourceManager.getAdapter(IResourceManager.class); @@ -248,8 +248,8 @@ public static IResourceManager findResourceManagerByName(final String platformCo * @param platformConf The platform configuration to consider. * @return A non-null resource manager if we found a match, null otherwise. */ - public static IResourceManager findResourceManagerById(final IX10PlatformConf platformConf) { - final IPUniverse universe = (IPUniverse) PTPCorePlugin.getDefault().getModelManager().getUniverse(); + /*public static IResourceManager findResourceManagerById(final IX10PlatformConf platformConf) { + final IPUniverse universe = (IPUniverse) ModelManager.getInstance().getUniverse(); for (final IPResourceManager pResourceManager : universe.getResourceManagers()) { final IResourceManager resourceManager = (IResourceManager) pResourceManager.getAdapter(IResourceManager.class); @@ -260,7 +260,7 @@ public static IResourceManager findResourceManagerById(final IX10PlatformConf pl } return null; - } + }*/ /** * Returns an existing resource manager that is equivalent to information encapsulated in the platform configuration or @@ -276,7 +276,7 @@ public static IResourceManager findResourceManagerById(final IX10PlatformConf pl */ public static IResourceManager getResourceManager(final IX10PlatformConf platformConf) throws RemoteConnectionException, CoreException { - final IPUniverse universe = (IPUniverse) PTPCorePlugin.getDefault().getModelManager().getUniverse(); + final IPUniverse universe = (IPUniverse) ModelManager.getInstance().getUniverse(); for (final IPResourceManager pResourceManager : universe.getResourceManagers()) { final IResourceManager resourceManager = (IResourceManager) pResourceManager.getAdapter(IResourceManager.class); @@ -320,7 +320,7 @@ public static IResourceManager getResourceManager(final IX10PlatformConf platfor * @return A non-null remote connection instance if one has been found, null otherwise. */ public static IRemoteConnection findRemoteConnection(final IConnectionConf connectionConf) { - final IPUniverse universe = (IPUniverse) PTPCorePlugin.getDefault().getModelManager().getUniverse(); + final IPUniverse universe = (IPUniverse) ModelManager.getInstance().getUniverse(); final PTPRemoteCorePlugin plugin = PTPRemoteCorePlugin.getDefault(); final String rmServicesId = connectionConf.isLocal() ? LOCAL_CONN_SERVICE_ID : REMOTE_CONN_SERVICE_ID; diff --git a/x10dt.ui.launch.java/src/x10dt/ui/launch/java/Activator.java b/x10dt.ui.launch.java/src/x10dt/ui/launch/java/Activator.java index f0f3fd0e..bba89dc3 100644 --- a/x10dt.ui.launch.java/src/x10dt/ui/launch/java/Activator.java +++ b/x10dt.ui.launch.java/src/x10dt/ui/launch/java/Activator.java @@ -11,6 +11,7 @@ import org.eclipse.debug.core.ILaunchConfigurationListener; import org.eclipse.debug.core.ILaunchManager; import org.eclipse.imp.preferences.IPreferencesService; +import org.eclipse.ptp.core.ModelManager; import org.eclipse.ptp.core.PTPCorePlugin; import org.eclipse.ptp.core.elements.IPResourceManager; import org.eclipse.ptp.core.elements.IPUniverse; @@ -84,7 +85,7 @@ public void launchConfigurationRemoved(final ILaunchConfiguration configuration) if (configuration.getName().equals(serviceConfiguration.getName())) { final IServiceProvider serviceProvider = serviceConfiguration.getServiceProvider(service); //if (serviceProvider instanceof MultiVMResourceManagerConfiguration) { //MV - Check this - final IPUniverse universe = (IPUniverse) PTPCorePlugin.getDefault().getModelManager().getUniverse(); + final IPUniverse universe = (IPUniverse) ModelManager.getInstance().getUniverse(); for (final IPResourceManager pResourceManager : universe.getResourceManagers()) { final IResourceManager resourceManager = (IResourceManager) pResourceManager.getAdapter(IResourceManager.class); final IResourceManagerConfiguration rmConf = resourceManager.getConfiguration(); diff --git a/x10dt.ui.launch.java/src/x10dt/ui/launch/java/launching/PlacesAndHostsTab.java b/x10dt.ui.launch.java/src/x10dt/ui/launch/java/launching/PlacesAndHostsTab.java index 3592ac03..4b97a36f 100644 --- a/x10dt.ui.launch.java/src/x10dt/ui/launch/java/launching/PlacesAndHostsTab.java +++ b/x10dt.ui.launch.java/src/x10dt/ui/launch/java/launching/PlacesAndHostsTab.java @@ -57,11 +57,11 @@ public void setDefaults(final ILaunchConfigurationWorkingCopy configuration) { } public void initializeFrom(final ILaunchConfiguration configuration) { - this.fX10EnvVarsConfTab.initializeFrom(null /* control */, this.fResourceManager, null /* queue */, configuration); + this.fX10EnvVarsConfTab.initializeFrom(configuration); } public void performApply(final ILaunchConfigurationWorkingCopy configuration) { - this.fX10EnvVarsConfTab.performApply(configuration, this.fResourceManager, null /* queue */); + this.fX10EnvVarsConfTab.performApply(configuration); } public String getName() { @@ -80,7 +80,7 @@ public Image getImage() { } public boolean isValid(final ILaunchConfiguration configuration) { - final RMLaunchValidation validation = this.fX10EnvVarsConfTab.isValid(configuration, this.fResourceManager, null); + final RMLaunchValidation validation = this.fX10EnvVarsConfTab.isValid(configuration); setErrorMessage(null); if (validation.isSuccess()) { return true; @@ -95,7 +95,7 @@ public boolean isValid(final ILaunchConfiguration configuration) { private void createX10EnvVarsInfo(final Composite parent) { this.fX10EnvVarsConfTab = new X10PlacesAndHostsDynamicTab(); try { - this.fX10EnvVarsConfTab.createControl(parent, null /* resourceManager */, null /* queue */); + this.fX10EnvVarsConfTab.createControl(parent, null /* control id */); //MV -- REVISE HERE this.fX10EnvVarsConfTab.addContentsChangedListener(new IRMLaunchConfigurationContentsChangedListener() { public void handleContentsChanged(final IRMLaunchConfigurationDynamicTab factory) { diff --git a/x10dt.ui.launch.java/src/x10dt/ui/launch/java/launching/ResourceManagerHelper.java b/x10dt.ui.launch.java/src/x10dt/ui/launch/java/launching/ResourceManagerHelper.java index 2d04eb53..b1c31c78 100644 --- a/x10dt.ui.launch.java/src/x10dt/ui/launch/java/launching/ResourceManagerHelper.java +++ b/x10dt.ui.launch.java/src/x10dt/ui/launch/java/launching/ResourceManagerHelper.java @@ -33,7 +33,7 @@ import org.eclipse.ptp.core.events.IResourceManagerRemovedEvent; import org.eclipse.ptp.core.listeners.IResourceManagerListener; import org.eclipse.ptp.remote.core.IRemoteConnectionManager; -import org.eclipse.ptp.remote.core.IRemoteProxyOptions; +import org.eclipse.ptp.rm.core.proxy.IRemoteProxyOptions; import org.eclipse.ptp.remote.core.PTPRemoteCorePlugin; import org.eclipse.ptp.remote.core.exception.RemoteConnectionException; import org.eclipse.ptp.remote.remotetools.core.RemoteToolsServices; diff --git a/x10dt.ui.launch.java/src/x10dt/ui/launch/java/launching/VMsLocationTab.java b/x10dt.ui.launch.java/src/x10dt/ui/launch/java/launching/VMsLocationTab.java index 69adb758..fe9e940b 100644 --- a/x10dt.ui.launch.java/src/x10dt/ui/launch/java/launching/VMsLocationTab.java +++ b/x10dt.ui.launch.java/src/x10dt/ui/launch/java/launching/VMsLocationTab.java @@ -45,7 +45,7 @@ import org.eclipse.ptp.core.elements.attributes.ResourceManagerAttributes.State; import org.eclipse.ptp.remote.core.IRemoteConnection; import org.eclipse.ptp.remote.core.IRemoteConnectionManager; -import org.eclipse.ptp.remote.core.IRemoteProxyOptions; +import org.eclipse.ptp.rm.core.proxy.IRemoteProxyOptions; import org.eclipse.ptp.remote.core.IRemoteServices; import org.eclipse.ptp.remote.core.PTPRemoteCorePlugin; import org.eclipse.ptp.remote.core.exception.RemoteConnectionException; diff --git a/x10dt.ui.launch.java/src/x10dt/ui/launch/java/launching/X10LaunchConfigurationDelegate.java b/x10dt.ui.launch.java/src/x10dt/ui/launch/java/launching/X10LaunchConfigurationDelegate.java index 24cd6707..054ad276 100644 --- a/x10dt.ui.launch.java/src/x10dt/ui/launch/java/launching/X10LaunchConfigurationDelegate.java +++ b/x10dt.ui.launch.java/src/x10dt/ui/launch/java/launching/X10LaunchConfigurationDelegate.java @@ -39,6 +39,7 @@ import org.eclipse.jdt.launching.IJavaLaunchConfigurationConstants; import org.eclipse.osgi.util.NLS; import org.eclipse.ptp.core.IPTPLaunchConfigurationConstants; +import org.eclipse.ptp.core.ModelManager; import org.eclipse.ptp.core.PTPCorePlugin; import org.eclipse.ptp.core.attributes.AttributeManager; import org.eclipse.ptp.core.attributes.StringAttribute; @@ -102,9 +103,9 @@ private void updateAttributes(final ILaunchConfiguration configuration, final St final IProgressMonitor monitor) throws CoreException { final SubMonitor progress = SubMonitor.convert(monitor, 30); try { - final String rmUniqueName = getResourceManagerUniqueName(configuration); + final String rmUniqueName = org.eclipse.ptp.core.util.LaunchUtils.getResourceManagerUniqueName(configuration); IResourceManager resourceManager = null; - for (final IPResourceManager prm : PTPCorePlugin.getDefault().getModelManager().getUniverse().getResourceManagers()) { + for (final IPResourceManager prm : ModelManager.getInstance().getUniverse().getResourceManagers()) { IResourceManager rm= (IResourceManager) prm.getAdapter(IResourceManager.class); if (rm.getUniqueName().equals(rmUniqueName)) { resourceManager = rm; @@ -125,7 +126,7 @@ private void updateAttributes(final ILaunchConfiguration configuration, final St // Make sure there is a queue if (attrMgr.getAttribute(JobAttributes.getQueueIdAttributeDefinition()) == null) { - IPQueue queue = getQueueDefault((IPResourceManager)resourceManager.getAdapter(IPResourceManager.class)); + IPQueue queue = org.eclipse.ptp.core.util.LaunchUtils.getQueueDefault((IPResourceManager)resourceManager.getAdapter(IPResourceManager.class)); if (queue == null) { throw new CoreException(new Status(IStatus.ERROR, PTPLaunchPlugin.getUniqueIdentifier(), Messages.XLCD_NoDefaultQueue)); @@ -194,31 +195,31 @@ protected IPath verifyExecutablePath(final ILaunchConfiguration configuration, } } - protected IPath verifyResource(final String path, final ILaunchConfiguration configuration, - final IProgressMonitor monitor) throws CoreException { - final IResourceManagerConfiguration conf = this.fResourceManager.getConfiguration(); - final IRemoteServices remoteServices = PTPRemoteCorePlugin.getDefault().getRemoteServices(this.fResourceManager.getControlConfiguration().getRemoteServicesId()); - if (remoteServices == null) { - throw new CoreException(new Status(IStatus.ERROR, CppLaunchCore.PLUGIN_ID, LaunchMessages.CLCD_NoRemoteServices)); - } - final IRemoteConnectionManager connMgr = remoteServices.getConnectionManager(); - if (connMgr == null) { - throw new CoreException(new Status(IStatus.ERROR, CppLaunchCore.PLUGIN_ID, LaunchMessages.CLCD_NoConnectionMgr)); - } - final IRemoteConnection conn = connMgr.getConnection(this.fResourceManager.getControlConfiguration().getConnectionName()); - if (conn == null) { - throw new CoreException(new Status(IStatus.ERROR, CppLaunchCore.PLUGIN_ID, LaunchMessages.CLCD_NoConnection)); - } - final IRemoteFileManager fileManager = remoteServices.getFileManager(conn); - if (fileManager == null) { - throw new CoreException(new Status(IStatus.ERROR, CppLaunchCore.PLUGIN_ID, LaunchMessages.CLCD_NoFileManager)); - } - if (!fileManager.getResource(path).fetchInfo().exists()) { - throw new CoreException(new Status(IStatus.INFO, CppLaunchCore.PLUGIN_ID, NLS.bind(LaunchMessages.CLCD_PathNotFound, - path))); - } - return new Path(path); - } +// protected IPath verifyResource(final String path, final ILaunchConfiguration configuration, +// final IProgressMonitor monitor) throws CoreException { +// final IResourceManagerConfiguration conf = this.fResourceManager.getConfiguration(); +// final IRemoteServices remoteServices = PTPRemoteCorePlugin.getDefault().getRemoteServices(this.fResourceManager.getControlConfiguration().getRemoteServicesId()); +// if (remoteServices == null) { +// throw new CoreException(new Status(IStatus.ERROR, CppLaunchCore.PLUGIN_ID, LaunchMessages.CLCD_NoRemoteServices)); +// } +// final IRemoteConnectionManager connMgr = remoteServices.getConnectionManager(); +// if (connMgr == null) { +// throw new CoreException(new Status(IStatus.ERROR, CppLaunchCore.PLUGIN_ID, LaunchMessages.CLCD_NoConnectionMgr)); +// } +// final IRemoteConnection conn = connMgr.getConnection(this.fResourceManager.getControlConfiguration().getConnectionName()); +// if (conn == null) { +// throw new CoreException(new Status(IStatus.ERROR, CppLaunchCore.PLUGIN_ID, LaunchMessages.CLCD_NoConnection)); +// } +// final IRemoteFileManager fileManager = remoteServices.getFileManager(conn); +// if (fileManager == null) { +// throw new CoreException(new Status(IStatus.ERROR, CppLaunchCore.PLUGIN_ID, LaunchMessages.CLCD_NoFileManager)); +// } +// if (!fileManager.getResource(path).fetchInfo().exists()) { +// throw new CoreException(new Status(IStatus.INFO, CppLaunchCore.PLUGIN_ID, NLS.bind(LaunchMessages.CLCD_PathNotFound, +// path))); +// } +// return new Path(path); +// } // --- Private code diff --git a/x10dt.ui.launch.rms.core/src/x10dt/ui/launch/rms/core/launch_configuration/X10PlacesAndHostsDynamicTab.java b/x10dt.ui.launch.rms.core/src/x10dt/ui/launch/rms/core/launch_configuration/X10PlacesAndHostsDynamicTab.java index 9d7627ea..70aec505 100644 --- a/x10dt.ui.launch.rms.core/src/x10dt/ui/launch/rms/core/launch_configuration/X10PlacesAndHostsDynamicTab.java +++ b/x10dt.ui.launch.rms.core/src/x10dt/ui/launch/rms/core/launch_configuration/X10PlacesAndHostsDynamicTab.java @@ -96,12 +96,11 @@ public void addContentsChangedListener(final IRMLaunchConfigurationContentsChang this.fListeners.add(listener); } - public RMLaunchValidation canSave(final Control control, final IResourceManager resourceManager, final IPQueue queue) { + public RMLaunchValidation canSave(final Control control) { return new RMLaunchValidation(true, null); } - public void createControl(final Composite parent, final IResourceManager resourceManager, - final IPQueue queue) throws CoreException { + public void createControl(final Composite parent, String id) throws CoreException { this.fControl = new Composite(parent, SWT.NONE); this.fControl.setFont(parent.getFont()); this.fControl.setLayout(new GridLayout(1, false)); @@ -352,11 +351,10 @@ public Control getControl() { } @SuppressWarnings("unchecked") - public RMLaunchValidation initializeFrom(final Control control, final IResourceManager resourceManager, final IPQueue queue, - final ILaunchConfiguration configuration) { + public RMLaunchValidation initializeFrom(final ILaunchConfiguration configuration) { final List hosts = new ArrayList(); - if (resourceManager != null) { - for (final IPMachine machine : ((IPResourceManager) resourceManager.getAdapter(IPResourceManager.class)).getMachines()) { + if (fResourceManager != null) { + for (final IPMachine machine : ((IPResourceManager) fResourceManager.getAdapter(IPResourceManager.class)).getMachines()) { for (final IPNode node : machine.getNodes()) { hosts.add(node.getName()); } @@ -378,8 +376,7 @@ public RMLaunchValidation initializeFrom(final Control control, final IResourceM return new RMLaunchValidation(true, null); } - public RMLaunchValidation isValid(final ILaunchConfiguration launchConfig, final IResourceManager resourceManager, - final IPQueue queue) { + public RMLaunchValidation isValid(final ILaunchConfiguration launchConfig){ if (this.fNumPlacesSpinner.getSelection() < 1) { return new RMLaunchValidation(false, Messages.SRMLCDT_AtLeastOnePlaceMsg); } @@ -400,8 +397,7 @@ public RMLaunchValidation isValid(final ILaunchConfiguration launchConfig, final return new RMLaunchValidation(true, null); } - public RMLaunchValidation performApply(final ILaunchConfigurationWorkingCopy configuration, - final IResourceManager resourceManager, final IPQueue queue) { + public RMLaunchValidation performApply(final ILaunchConfigurationWorkingCopy configuration) { if (this.fHostFileBt != null) configuration.setAttribute(ATTR_USE_HOSTFILE, this.fHostFileBt.getSelection()); if (this.fNumPlacesSpinner != null) @@ -409,6 +405,7 @@ public RMLaunchValidation performApply(final ILaunchConfigurationWorkingCopy con if (this.fHostFileText != null) configuration.setAttribute(ATTR_HOSTFILE, this.fHostFileText.getText().trim()); configuration.setAttribute(ATTR_HOSTLIST, (this.fHosts.isEmpty()) ? null : this.fHosts); + return new RMLaunchValidation(true, null); } @@ -416,8 +413,7 @@ public void removeContentsChangedListener(final IRMLaunchConfigurationContentsCh this.fListeners.remove(listener); } - public RMLaunchValidation setDefaults(final ILaunchConfigurationWorkingCopy configuration, - final IResourceManager resourceManager, final IPQueue queue) { + public RMLaunchValidation setDefaults(final ILaunchConfigurationWorkingCopy configuration) { return new RMLaunchValidation(true, null); }