Attachment #90672 for bug #206356

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

Lines 31-36 Link Here

(-)src/org/eclipse/hyades/test/ui/internal/wizard/DeploymentNewWizard.java (+9 lines)
31	import org.eclipse.jface.wizard.IWizardPage;	31	import org.eclipse.jface.wizard.IWizardPage;
32	import org.eclipse.osgi.util.NLS;	32	import org.eclipse.osgi.util.NLS;
33	import org.eclipse.ui.PartInitException;	33	import org.eclipse.ui.PartInitException;
		34	import org.eclipse.ui.PlatformUI;
34		35
35	/**	36	/**
36	* Extends the HyadesNewWizard to create the Deployment.	37	* Extends the HyadesNewWizard to create the Deployment.
Lines 150-155 Link Here
150	protected void openEditor(IFile file)	151	protected void openEditor(IFile file)
151	throws PartInitException	152	throws PartInitException
152	{	153	{
		154	//Open the Test perspective:
		155	try {
		156	PlatformUI.getWorkbench().showPerspective("org.eclipse.hyades.ui.perspective.TestPerspective",PlatformUI.getWorkbench().getActiveWorkbenchWindow());
		157	}
		158	catch (Exception e) {
		159	//Ignore since Test perspective could not be opened.
		160	}
		161
153	if(UiPlugin.getInstance().getPreferenceStore().getBoolean(TestUI.OPEN_EDITOR))	162	if(UiPlugin.getInstance().getPreferenceStore().getBoolean(TestUI.OPEN_EDITOR))
154	UIUtil.openEditor(file, TestUIExtension.DEPLOYMENT_EDITOR_PART_ID, false);	163	UIUtil.openEditor(file, TestUIExtension.DEPLOYMENT_EDITOR_PART_ID, false);
155	}	164	}




import org.eclipse.jface.dialogs.MessageDialog;
import org.eclipse.jface.window.Window;
import org.eclipse.ui.PartInitException;
import org.eclipse.ui.PlatformUI;

/**
 * Extends the HyadesNewWizard to create the Hyades Generic DataPool.

	protected void openEditor(IFile file) 
	throws PartInitException
	{
		//Open the Test perspective:
		try {											
			PlatformUI.getWorkbench().showPerspective("org.eclipse.hyades.ui.perspective.TestPerspective",PlatformUI.getWorkbench().getActiveWorkbenchWindow());
		} 
		catch (Exception e) {
			//Ignore since Test perspective could not be opened.
		}			
		
		
		if(UiPlugin.getInstance().getPreferenceStore().getBoolean(TestUI.OPEN_EDITOR))
			UIUtil.openEditor(file, TestUIExtension.DATAPOOL_EDITOR_PART_ID, false);
	}

Lines 30-35 Link Here

(-)src/org/eclipse/hyades/test/ui/internal/wizard/ArtifactNewWizard.java (-2 / +16 lines)
30	import org.eclipse.hyades.ui.internal.wizard.HyadesNewWizard;	30	import org.eclipse.hyades.ui.internal.wizard.HyadesNewWizard;
31	import org.eclipse.jface.dialogs.IDialogSettings;	31	import org.eclipse.jface.dialogs.IDialogSettings;
32	import org.eclipse.ui.PartInitException;	32	import org.eclipse.ui.PartInitException;
		33	import org.eclipse.ui.PlatformUI;
33		34
34	/**	35	/**
35	* Extends the HyadesNewWizard to create the Hyades Generic Artifact.	36	* Extends the HyadesNewWizard to create the Hyades Generic Artifact.
Lines 158-170 Link Here
158	return factory.createResource(uri);	159	return factory.createResource(uri);
159	}	160	}
160		161
		162
		163	public void run()
		164	{
161		165
		166	}
		167
162	/**	168	/**
163	* @see org.eclipse.hyades.ui.internal.wizard.HyadesNewWizard#openEditor(org.eclipse.core.resources.IFile)	169	* @see org.eclipse.hyades.ui.internal.wizard.HyadesNewWizard#openEditor(org.eclipse.core.resources.IFile)
164	*/	170	*/
165	protected void openEditor(IFile file)	171	protected void openEditor(IFile file)
166	throws PartInitException	172	throws PartInitException
167	{	173	{
		174	//Open the Test perspective:
		175	try {
		176	PlatformUI.getWorkbench().showPerspective("org.eclipse.hyades.ui.perspective.TestPerspective",PlatformUI.getWorkbench().getActiveWorkbenchWindow());
		177	}
		178	catch (Exception e) {
		179	//Ignore since Test perspective could not be opened.
		180	}
		181
168	if(UiPlugin.getInstance().getPreferenceStore().getBoolean(TestUI.OPEN_EDITOR))	182	if(UiPlugin.getInstance().getPreferenceStore().getBoolean(TestUI.OPEN_EDITOR))
169	UIUtil.openEditor(file, TestUIExtension.ARTIFACT_EDITOR_PART_ID, false);	183	UIUtil.openEditor(file, TestUIExtension.ARTIFACT_EDITOR_PART_ID, false);
170	}	184	}

Lines 32-37 Link Here

(-)src/org/eclipse/hyades/test/ui/wizard/TestSuiteNewWizard2.java (+9 lines)
32	import org.eclipse.hyades.ui.internal.wizard.HyadesNewWizard;	32	import org.eclipse.hyades.ui.internal.wizard.HyadesNewWizard;
33	import org.eclipse.jface.dialogs.IDialogSettings;	33	import org.eclipse.jface.dialogs.IDialogSettings;
34	import org.eclipse.ui.PartInitException;	34	import org.eclipse.ui.PartInitException;
		35	import org.eclipse.ui.PlatformUI;
35		36
36	/**	37	/**
37	* Abstract wizard class to create Test Suite.	38	* Abstract wizard class to create Test Suite.
Lines 158-163 Link Here
158	protected void openEditor(IFile file)	159	protected void openEditor(IFile file)
159	throws PartInitException	160	throws PartInitException
160	{	161	{
		162	//Open the Test perspective:
		163	try {
		164	PlatformUI.getWorkbench().showPerspective("org.eclipse.hyades.ui.perspective.TestPerspective",PlatformUI.getWorkbench().getActiveWorkbenchWindow());
		165	}
		166	catch (Exception e) {
		167	//Ignore since Test perspective could not be opened.
		168	}
		169
161	if(UiPlugin.getInstance().getPreferenceStore().getBoolean(TestUI.OPEN_EDITOR))	170	if(UiPlugin.getInstance().getPreferenceStore().getBoolean(TestUI.OPEN_EDITOR))
162	UIUtil.openEditor(file, TestUIExtension.GENERIC_TEST_SUITE_EDITOR_PART_ID, false);	171	UIUtil.openEditor(file, TestUIExtension.GENERIC_TEST_SUITE_EDITOR_PART_ID, false);
163	}	172	}

Lines 14-19 Link Here

(-)src/org/eclipse/hyades/test/ui/wizard/TestSuiteNewWizard.java (+9 lines)
14	import org.eclipse.core.resources.IFile;	14	import org.eclipse.core.resources.IFile;
15	import org.eclipse.jface.dialogs.IDialogSettings;	15	import org.eclipse.jface.dialogs.IDialogSettings;
16	import org.eclipse.ui.PartInitException;	16	import org.eclipse.ui.PartInitException;
		17	import org.eclipse.ui.PlatformUI;
17		18
18	import org.eclipse.emf.common.util.URI;	19	import org.eclipse.emf.common.util.URI;
19	import org.eclipse.emf.ecore.EObject;	20	import org.eclipse.emf.ecore.EObject;
Lines 154-159 Link Here
154	protected void openEditor(IFile file)	155	protected void openEditor(IFile file)
155	throws PartInitException	156	throws PartInitException
156	{	157	{
		158	//Open the Test perspective:
		159	try {
		160	PlatformUI.getWorkbench().showPerspective("org.eclipse.hyades.ui.perspective.TestPerspective",PlatformUI.getWorkbench().getActiveWorkbenchWindow());
		161	}
		162	catch (Exception e) {
		163	//Ignore since Test perspective could not be opened.
		164	}
		165
157	if(UiPlugin.getInstance().getPreferenceStore().getBoolean(TestUI.OPEN_EDITOR))	166	if(UiPlugin.getInstance().getPreferenceStore().getBoolean(TestUI.OPEN_EDITOR))
158	UIUtil.openEditor(file, TestUIExtension.GENERIC_TEST_SUITE_EDITOR_PART_ID, false);	167	UIUtil.openEditor(file, TestUIExtension.GENERIC_TEST_SUITE_EDITOR_PART_ID, false);
159	}	168	}




import org.eclipse.hyades.ui.internal.wizard.HyadesNewWizard;
import org.eclipse.jface.dialogs.IDialogSettings;
import org.eclipse.ui.PartInitException;
import org.eclipse.ui.PlatformUI;

/**
 * Extends the <code>HyadesNewWizard</code> to create the Hyades Generic Location.

	protected void openEditor(IFile file) 
	throws PartInitException
	{
		//Open the Test perspective:
		try {											
			PlatformUI.getWorkbench().showPerspective("org.eclipse.hyades.ui.perspective.TestPerspective",PlatformUI.getWorkbench().getActiveWorkbenchWindow());
		} 
		catch (Exception e) {
			//Ignore since Test perspective could not be opened.
		}
		
	
		if(UiPlugin.getInstance().getPreferenceStore().getBoolean(TestUI.OPEN_EDITOR))
			UIUtil.openEditor(file, TestUIExtension.LOCATION_EDITOR_PART_ID, false);
	}	

Return to bug 206356

Lines 37-42 Link Here

(-)src/org/eclipse/hyades/test/ui/internal/wizard/DatapoolNewWizard.java (+10 lines)
37	import org.eclipse.jface.dialogs.MessageDialog;	37	import org.eclipse.jface.dialogs.MessageDialog;
38	import org.eclipse.jface.window.Window;	38	import org.eclipse.jface.window.Window;
39	import org.eclipse.ui.PartInitException;	39	import org.eclipse.ui.PartInitException;
		40	import org.eclipse.ui.PlatformUI;
40		41
41	/**	42	/**
42	* Extends the HyadesNewWizard to create the Hyades Generic DataPool.	43	* Extends the HyadesNewWizard to create the Hyades Generic DataPool.
Lines 228-233 Link Here
228	protected void openEditor(IFile file)	229	protected void openEditor(IFile file)
229	throws PartInitException	230	throws PartInitException
230	{	231	{
		232	//Open the Test perspective:
		233	try {
		234	PlatformUI.getWorkbench().showPerspective("org.eclipse.hyades.ui.perspective.TestPerspective",PlatformUI.getWorkbench().getActiveWorkbenchWindow());
		235	}
		236	catch (Exception e) {
		237	//Ignore since Test perspective could not be opened.
		238	}
		239
		240
231	if(UiPlugin.getInstance().getPreferenceStore().getBoolean(TestUI.OPEN_EDITOR))	241	if(UiPlugin.getInstance().getPreferenceStore().getBoolean(TestUI.OPEN_EDITOR))
232	UIUtil.openEditor(file, TestUIExtension.DATAPOOL_EDITOR_PART_ID, false);	242	UIUtil.openEditor(file, TestUIExtension.DATAPOOL_EDITOR_PART_ID, false);
233	}	243	}

Lines 26-31 Link Here

(-)src/org/eclipse/hyades/test/ui/wizard/LocationNewWizard.java (+10 lines)
26	import org.eclipse.hyades.ui.internal.wizard.HyadesNewWizard;	26	import org.eclipse.hyades.ui.internal.wizard.HyadesNewWizard;
27	import org.eclipse.jface.dialogs.IDialogSettings;	27	import org.eclipse.jface.dialogs.IDialogSettings;
28	import org.eclipse.ui.PartInitException;	28	import org.eclipse.ui.PartInitException;
		29	import org.eclipse.ui.PlatformUI;
29		30
30	/**	31	/**
31	* Extends the <code>HyadesNewWizard</code> to create the Hyades Generic Location.	32	* Extends the <code>HyadesNewWizard</code> to create the Hyades Generic Location.
Lines 123-128 Link Here
123	protected void openEditor(IFile file)	124	protected void openEditor(IFile file)
124	throws PartInitException	125	throws PartInitException
125	{	126	{
		127	//Open the Test perspective:
		128	try {
		129	PlatformUI.getWorkbench().showPerspective("org.eclipse.hyades.ui.perspective.TestPerspective",PlatformUI.getWorkbench().getActiveWorkbenchWindow());
		130	}
		131	catch (Exception e) {
		132	//Ignore since Test perspective could not be opened.
		133	}
		134
		135
126	if(UiPlugin.getInstance().getPreferenceStore().getBoolean(TestUI.OPEN_EDITOR))	136	if(UiPlugin.getInstance().getPreferenceStore().getBoolean(TestUI.OPEN_EDITOR))
127	UIUtil.openEditor(file, TestUIExtension.LOCATION_EDITOR_PART_ID, false);	137	UIUtil.openEditor(file, TestUIExtension.LOCATION_EDITOR_PART_ID, false);
128	}	138	}