Attachment 90997 Details for Bug 206356 – Patch Version 2

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

[patch] Patch Version 2

patch_V2.txt (text/plain), 15.24 KB, created by Paul Slauenwhite

on 2008-02-28 09:20:39 EST

(hide)

Description:

Filename:

MIME Type:

Creator: Paul Slauenwhite

Created: 2008-02-28 09:20:39 EST

Size: 15.24 KB

patch

obsolete

>### Eclipse Workspace Patch 1.0
>#P org.eclipse.hyades.test.ui
>Index: src/org/eclipse/hyades/test/ui/wizard/TestSuiteNewWizard2.java
>===================================================================
>RCS file: /cvsroot/tptp/test/org.eclipse.hyades.test.ui/src/org/eclipse/hyades/test/ui/wizard/TestSuiteNewWizard2.java,v
>retrieving revision 1.5
>diff -u -r1.5 TestSuiteNewWizard2.java
>--- src/org/eclipse/hyades/test/ui/wizard/TestSuiteNewWizard2.java	22 Mar 2007 14:42:03 -0000	1.5
>+++ src/org/eclipse/hyades/test/ui/wizard/TestSuiteNewWizard2.java	28 Feb 2008 14:19:32 -0000
>@@ -1,5 +1,5 @@
> /*******************************************************************************
>- * Copyright (c) 2005, 2007 IBM Corporation and others.
>+ * Copyright (c) 2006, 2008 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
>@@ -28,6 +28,7 @@
> import org.eclipse.hyades.test.ui.TestUIImages;
> import org.eclipse.hyades.test.ui.UiPlugin;
> import org.eclipse.hyades.test.ui.internal.resources.UiPluginResourceBundle;
>+import org.eclipse.hyades.test.ui.util.TestUIUtil;
> import org.eclipse.hyades.ui.internal.util.UIUtil;
> import org.eclipse.hyades.ui.internal.wizard.HyadesNewWizard;
> import org.eclipse.jface.dialogs.IDialogSettings;
>@@ -41,9 +42,13 @@
>  * <li>a name and description page.</li></ul>
>  * At least, clients need to provide the type of the test suite by implementing the <code>getType()</code> method. 
>  * 
>- * @author pnedelec
>- * @author jgout
>- * @since 4.2
>+ * 
>+ * @author  Patrick Nedelic
>+ * @author  Jerome Gout
>+ * @author  Tony Wang
>+ * @author  Paul E. Slauenwhite
>+ * @version February 28, 2008
>+ * @since   March 9, 2006
>  */
> public abstract class TestSuiteNewWizard2 extends HyadesNewWizard
> {
>@@ -158,6 +163,10 @@
> 	protected void openEditor(IFile file) 
> 	throws PartInitException
> 	{
>+		
>+		//Attempt to open the Test Perspective:
>+		TestUIUtil.openTestPerspective();
>+		
> 		if(UiPlugin.getInstance().getPreferenceStore().getBoolean(TestUI.OPEN_EDITOR))
> 			UIUtil.openEditor(file, TestUIExtension.GENERIC_TEST_SUITE_EDITOR_PART_ID, false);
> 	}	
>Index: src/org/eclipse/hyades/test/ui/wizard/TestSuiteNewWizard.java
>===================================================================
>RCS file: /cvsroot/tptp/test/org.eclipse.hyades.test.ui/src/org/eclipse/hyades/test/ui/wizard/TestSuiteNewWizard.java,v
>retrieving revision 1.9
>diff -u -r1.9 TestSuiteNewWizard.java
>--- src/org/eclipse/hyades/test/ui/wizard/TestSuiteNewWizard.java	22 Mar 2007 14:42:03 -0000	1.9
>+++ src/org/eclipse/hyades/test/ui/wizard/TestSuiteNewWizard.java	28 Feb 2008 14:19:32 -0000
>@@ -1,5 +1,5 @@
> /*******************************************************************************
>- * Copyright (c) 2005, 2007 IBM Corporation and others.
>+ * Copyright (c) 2005, 2008 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
>@@ -29,14 +29,18 @@
> import org.eclipse.hyades.test.ui.TestUIImages;
> import org.eclipse.hyades.test.ui.UiPlugin;
> import org.eclipse.hyades.test.ui.internal.resources.UiPluginResourceBundle;
>+import org.eclipse.hyades.test.ui.util.TestUIUtil;
> import org.eclipse.hyades.ui.internal.util.UIUtil;
> import org.eclipse.hyades.ui.internal.wizard.HyadesNewWizard;
> 
> /**
>  * Extends the HyadesNewWizard to create the Hyades Generic Test Suite.
>  * 
>- * @author pnedelec
>- * @since 3.0
>+ * @author  Patrick Nedelic
>+ * @author  Tony Wang
>+ * @author  Paul E. Slauenwhite
>+ * @version February 28, 2008
>+ * @since   February 1, 2005
>  * @deprecated use TestSuiteNewWizard2 instead.
>  */
> public class TestSuiteNewWizard 
>@@ -154,6 +158,10 @@
> 	protected void openEditor(IFile file) 
> 	throws PartInitException
> 	{
>+		
>+		//Attempt to open the Test Perspective:
>+		TestUIUtil.openTestPerspective();
>+		
> 		if(UiPlugin.getInstance().getPreferenceStore().getBoolean(TestUI.OPEN_EDITOR))
> 			UIUtil.openEditor(file, TestUIExtension.GENERIC_TEST_SUITE_EDITOR_PART_ID, false);
> 	}	
>Index: src/org/eclipse/hyades/test/ui/wizard/LocationNewWizard.java
>===================================================================
>RCS file: /cvsroot/tptp/test/org.eclipse.hyades.test.ui/src/org/eclipse/hyades/test/ui/wizard/LocationNewWizard.java,v
>retrieving revision 1.5
>diff -u -r1.5 LocationNewWizard.java
>--- src/org/eclipse/hyades/test/ui/wizard/LocationNewWizard.java	7 Dec 2007 04:04:00 -0000	1.5
>+++ src/org/eclipse/hyades/test/ui/wizard/LocationNewWizard.java	28 Feb 2008 14:19:32 -0000
>@@ -1,5 +1,5 @@
> /*******************************************************************************
>- * Copyright (c) 2005, 2007 IBM Corporation and others.
>+ * Copyright (c) 2006, 2007 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
>@@ -22,6 +22,7 @@
> import org.eclipse.hyades.test.ui.UiPlugin;
> import org.eclipse.hyades.test.ui.internal.resources.UiPluginResourceBundle;
> import org.eclipse.hyades.test.ui.internal.wizard.LocationHostNameWizardPage;
>+import org.eclipse.hyades.test.ui.util.TestUIUtil;
> import org.eclipse.hyades.ui.internal.util.UIUtil;
> import org.eclipse.hyades.ui.internal.wizard.HyadesNewWizard;
> import org.eclipse.jface.dialogs.IDialogSettings;
>@@ -123,6 +124,10 @@
> 	protected void openEditor(IFile file) 
> 	throws PartInitException
> 	{
>+		
>+		//Attempt to open the Test Perspective:
>+		TestUIUtil.openTestPerspective();
>+		
> 		if(UiPlugin.getInstance().getPreferenceStore().getBoolean(TestUI.OPEN_EDITOR))
> 			UIUtil.openEditor(file, TestUIExtension.LOCATION_EDITOR_PART_ID, false);
> 	}	
>Index: src/org/eclipse/hyades/test/ui/util/TestUIUtil.java
>===================================================================
>RCS file: /cvsroot/tptp/test/org.eclipse.hyades.test.ui/src/org/eclipse/hyades/test/ui/util/TestUIUtil.java,v
>retrieving revision 1.10
>diff -u -r1.10 TestUIUtil.java
>--- src/org/eclipse/hyades/test/ui/util/TestUIUtil.java	21 Jan 2008 19:09:13 -0000	1.10
>+++ src/org/eclipse/hyades/test/ui/util/TestUIUtil.java	28 Feb 2008 14:19:32 -0000
>@@ -21,6 +21,7 @@
> import org.eclipse.hyades.models.common.common.CMNNamedElement;
> import org.eclipse.hyades.models.common.facades.behavioral.INamedElement;
> import org.eclipse.hyades.test.core.util.EMFUtil;
>+import org.eclipse.hyades.test.ui.TestUIConstants;
> import org.eclipse.hyades.test.ui.UiPlugin;
> import org.eclipse.hyades.ui.internal.util.UIUtil;
> import org.eclipse.ui.IEditorDescriptor;
>@@ -34,8 +35,14 @@
> import org.eclipse.ui.model.IWorkbenchAdapter;
> 
> /**
>- * @author marcelop
>- * @since 0.3.0
>+ * Test UI utilities.
>+ * <p/>
>+ * 
>+ * 
>+ * @author  Marcelo Paternostro
>+ * @author  Paul E. Slauenwhite
>+ * @version February 28, 2008
>+ * @since   February 1, 2005
>  */
> public class TestUIUtil
> {
>@@ -151,6 +158,26 @@
> 		}
> 		return null;
> 	}
>+	
>+	/**
>+	 * Opens the Test Perspective based on its identifier.
>+	 * <p/>
>+	 *
>+	 * @return True if the Test Perspective can be opened, otherwise false.
>+	 * @see TestUIConstants#TEST_PERSPECTIVE_ID
>+	 */
>+	public static boolean openTestPerspective(){
>+
>+		//Attempt to open the Test perspective:
>+		try {											
>+			PlatformUI.getWorkbench().showPerspective(TestUIConstants.TEST_PERSPECTIVE_ID, PlatformUI.getWorkbench().getActiveWorkbenchWindow());
>+		} 
>+		catch (Exception e) {
>+			return false;
>+		}
>+		
>+		return true;
>+	}
> }
> 
> 
>Index: src/org/eclipse/hyades/test/ui/internal/wizard/DeploymentNewWizard.java
>===================================================================
>RCS file: /cvsroot/tptp/test/org.eclipse.hyades.test.ui/src/org/eclipse/hyades/test/ui/internal/wizard/DeploymentNewWizard.java,v
>retrieving revision 1.9
>diff -u -r1.9 DeploymentNewWizard.java
>--- src/org/eclipse/hyades/test/ui/internal/wizard/DeploymentNewWizard.java	22 Mar 2007 14:42:03 -0000	1.9
>+++ src/org/eclipse/hyades/test/ui/internal/wizard/DeploymentNewWizard.java	28 Feb 2008 14:19:32 -0000
>@@ -25,6 +25,7 @@
> import org.eclipse.hyades.test.ui.TestUIImages;
> import org.eclipse.hyades.test.ui.UiPlugin;
> import org.eclipse.hyades.test.ui.internal.resources.UiPluginResourceBundle;
>+import org.eclipse.hyades.test.ui.util.TestUIUtil;
> import org.eclipse.hyades.ui.internal.util.UIUtil;
> import org.eclipse.hyades.ui.internal.wizard.HyadesNewWizard;
> import org.eclipse.jface.dialogs.IDialogSettings;
>@@ -34,9 +35,13 @@
> 
> /**
>  * Extends the HyadesNewWizard to create the Deployment.
>+ *
>  * 
>- * @author marcelop
>- * @since 0.0.1
>+ * @author  Marcelo Paternostro
>+ * @author  Tony Wang
>+ * @author  Paul E. Slauenwhite
>+ * @version February 28, 2008
>+ * @since   February 1, 2005
>  */
> public class DeploymentNewWizard 
> extends HyadesNewWizard
>@@ -150,6 +155,10 @@
> 	protected void openEditor(IFile file) 
> 	throws PartInitException
> 	{
>+		
>+		//Attempt to open the Test Perspective:
>+		TestUIUtil.openTestPerspective();
>+		
> 		if(UiPlugin.getInstance().getPreferenceStore().getBoolean(TestUI.OPEN_EDITOR))
> 			UIUtil.openEditor(file, TestUIExtension.DEPLOYMENT_EDITOR_PART_ID, false);
> 	}	
>Index: src/org/eclipse/hyades/test/ui/internal/wizard/DatapoolNewWizard.java
>===================================================================
>RCS file: /cvsroot/tptp/test/org.eclipse.hyades.test.ui/src/org/eclipse/hyades/test/ui/internal/wizard/DatapoolNewWizard.java,v
>retrieving revision 1.10
>diff -u -r1.10 DatapoolNewWizard.java
>--- src/org/eclipse/hyades/test/ui/internal/wizard/DatapoolNewWizard.java	22 Mar 2007 14:42:03 -0000	1.10
>+++ src/org/eclipse/hyades/test/ui/internal/wizard/DatapoolNewWizard.java	28 Feb 2008 14:19:32 -0000
>@@ -1,5 +1,5 @@
> /*******************************************************************************
>- * Copyright (c) 2005, 2007 IBM Corporation and others.
>+ * Copyright (c) 2005, 2008 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
>@@ -30,6 +30,7 @@
> import org.eclipse.hyades.test.ui.UiPlugin;
> import org.eclipse.hyades.test.ui.datapool.internal.util.CSVImportExportUtil;
> import org.eclipse.hyades.test.ui.internal.resources.UiPluginResourceBundle;
>+import org.eclipse.hyades.test.ui.util.TestUIUtil;
> import org.eclipse.hyades.ui.internal.util.UIUtil;
> import org.eclipse.hyades.ui.internal.wizard.HyadesNewWizard;
> import org.eclipse.jface.dialogs.ErrorDialog;
>@@ -41,10 +42,13 @@
> /**
>  * Extends the HyadesNewWizard to create the Hyades Generic DataPool.
>  * 
>- * @author psun
>- * @since 0.0.1
>- * @author bjiang
>- * @since 4.0
>+ * 
>+ * @author  Peter Sun
>+ * @author  Bianca Xue Jiang
>+ * @author  Tony Wang
>+ * @author  Paul E. Slauenwhite
>+ * @version February 28, 2008
>+ * @since   February 1, 2005
>  */
> public class DatapoolNewWizard extends HyadesNewWizard {
> 
>@@ -228,6 +232,10 @@
> 	protected void openEditor(IFile file) 
> 	throws PartInitException
> 	{
>+		
>+		//Attempt to open the Test Perspective:
>+		TestUIUtil.openTestPerspective();
>+		
> 		if(UiPlugin.getInstance().getPreferenceStore().getBoolean(TestUI.OPEN_EDITOR))
> 			UIUtil.openEditor(file, TestUIExtension.DATAPOOL_EDITOR_PART_ID, false);
> 	}
>Index: src/org/eclipse/hyades/test/ui/internal/wizard/ArtifactNewWizard.java
>===================================================================
>RCS file: /cvsroot/tptp/test/org.eclipse.hyades.test.ui/src/org/eclipse/hyades/test/ui/internal/wizard/ArtifactNewWizard.java,v
>retrieving revision 1.8
>diff -u -r1.8 ArtifactNewWizard.java
>--- src/org/eclipse/hyades/test/ui/internal/wizard/ArtifactNewWizard.java	22 Mar 2007 14:42:03 -0000	1.8
>+++ src/org/eclipse/hyades/test/ui/internal/wizard/ArtifactNewWizard.java	28 Feb 2008 14:19:32 -0000
>@@ -1,5 +1,5 @@
> /*******************************************************************************
>- * Copyright (c) 2005, 2007 IBM Corporation and others.
>+ * Copyright (c) 2005, 2008 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
>@@ -26,6 +26,7 @@
> import org.eclipse.hyades.test.ui.TestUIImages;
> import org.eclipse.hyades.test.ui.UiPlugin;
> import org.eclipse.hyades.test.ui.internal.resources.UiPluginResourceBundle;
>+import org.eclipse.hyades.test.ui.util.TestUIUtil;
> import org.eclipse.hyades.ui.internal.util.UIUtil;
> import org.eclipse.hyades.ui.internal.wizard.HyadesNewWizard;
> import org.eclipse.jface.dialogs.IDialogSettings;
>@@ -34,10 +35,12 @@
> /**
>  * Extends the HyadesNewWizard to create the Hyades Generic Artifact.
>  * 
>- * @author psun
>- * @since 0.0.1
>- * @author bjiang
>- * @since 1.3
>+ * @author  Peter Sun
>+ * @author  Bianca Xue Jiang
>+ * @author  Tony Wang
>+ * @author  Paul E. Slauenwhite
>+ * @version February 28, 2008
>+ * @since   February 1, 2005
>  */
> public class ArtifactNewWizard extends HyadesNewWizard {
> 	
>@@ -165,6 +168,10 @@
> 	protected void openEditor(IFile file) 
> 	throws PartInitException
> 	{
>+		
>+		//Attempt to open the Test Perspective:
>+		TestUIUtil.openTestPerspective();
>+		
> 		if(UiPlugin.getInstance().getPreferenceStore().getBoolean(TestUI.OPEN_EDITOR))
> 			UIUtil.openEditor(file, TestUIExtension.ARTIFACT_EDITOR_PART_ID, false);
> 	}	
>Index: src/org/eclipse/hyades/test/ui/TestUIConstants.java
>===================================================================
>RCS file: /cvsroot/tptp/test/org.eclipse.hyades.test.ui/src/org/eclipse/hyades/test/ui/TestUIConstants.java,v
>retrieving revision 1.8
>diff -u -r1.8 TestUIConstants.java
>--- src/org/eclipse/hyades/test/ui/TestUIConstants.java	15 Dec 2006 17:05:50 -0000	1.8
>+++ src/org/eclipse/hyades/test/ui/TestUIConstants.java	28 Feb 2008 14:19:32 -0000
>@@ -1,5 +1,5 @@
> /*******************************************************************************
>- * Copyright (c) 2005 IBM Corporation and others.
>+ * Copyright (c) 2005, 2008 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
>@@ -12,11 +12,22 @@
> package org.eclipse.hyades.test.ui;
> 
> /**
>- * Constants storage interface
>- * @author jgout
>+ * Constants storage interface.
>+ * <p>
>+ * 
>+ * 
>+ * @author  Jerome Gout
>+ * @author  Paul E. Slauenwhite
>+ * @version February 28, 2008
>+ * @since   February 1, 2005
>  */
> public interface TestUIConstants {
> 	
>+	/**
>+	 * Test Perspective identifier as defined in the implementation of the <code>org.eclipse.ui.perspectives</code> extension point in this plug-in.
>+	 */
>+	public static final String TEST_PERSPECTIVE_ID = "org.eclipse.hyades.ui.perspective.TestPerspective";
>+	
>     /**
>      * @deprecated use TAG_FRAGMENT instead. We no longer should persiste the full URI because it contains file path
>      */

Actions: View | Diff

Attachments on bug 206356: 90672 | 90997