Attachment 96294 Details for Bug 201900 – Patch.

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

[patch] Patch.

Defect_201900_patch.txt (text/plain), 12.00 KB, created by Paul Slauenwhite

on 2008-04-16 14:09:29 EDT

(hide)

Description:

Filename:

MIME Type:

Creator: Paul Slauenwhite

Created: 2008-04-16 14:09:29 EDT

Size: 12.00 KB

patch

obsolete

>### Eclipse Workspace Patch 1.0
>#P org.eclipse.hyades.test.tools.ui
>Index: src/org/eclipse/hyades/test/tools/ui/common/internal/editor/BehaviorSection.java
>===================================================================
>RCS file: /cvsroot/tptp/test/org.eclipse.hyades.test.tools.ui/src/org/eclipse/hyades/test/tools/ui/common/internal/editor/BehaviorSection.java,v
>retrieving revision 1.12
>diff -u -r1.12 BehaviorSection.java
>--- src/org/eclipse/hyades/test/tools/ui/common/internal/editor/BehaviorSection.java	21 Jan 2008 16:57:35 -0000	1.12
>+++ src/org/eclipse/hyades/test/tools/ui/common/internal/editor/BehaviorSection.java	16 Apr 2008 18:09:03 -0000
>@@ -67,8 +67,14 @@
> import org.eclipse.ui.actions.SelectionListenerAction;
> 
> /**
>- * @author marcelop
>- * @since 1.0.2
>+ * BehaviorSection.java
>+ * 
>+ * 
>+ * 
>+ * @author Marcelo Paternostro
>+ * @author Paul E. Slauenwhite
>+ * @version April 16, 2008
>+ * @since February 1, 2005
> */
> public class BehaviorSection extends EObjectTreeSection implements IITestSuiteProvider {
> protected static final int HELP_SECTION_CONTROL = 1;
>@@ -276,6 +282,7 @@
> */
> public BehaviorSection(BehaviorForm behaviorForm) {
> super(behaviorForm, Common_Behavior_FragmentsPackage.eINSTANCE.getBVRInteraction_InteractionFragments(), null);
>+ setCollapsable(true);
> }
> 
> /**
>Index: src/org/eclipse/hyades/test/tools/ui/common/internal/editor/TestInvocationDetailForm.java
>===================================================================
>RCS file: /cvsroot/tptp/test/org.eclipse.hyades.test.tools.ui/src/org/eclipse/hyades/test/tools/ui/common/internal/editor/TestInvocationDetailForm.java,v
>retrieving revision 1.4
>diff -u -r1.4 TestInvocationDetailForm.java
>--- src/org/eclipse/hyades/test/tools/ui/common/internal/editor/TestInvocationDetailForm.java	22 Mar 2007 14:42:45 -0000	1.4
>+++ src/org/eclipse/hyades/test/tools/ui/common/internal/editor/TestInvocationDetailForm.java	16 Apr 2008 18:09:04 -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
>@@ -58,14 +58,17 @@
> import org.eclipse.ui.forms.widgets.Hyperlink;
> import org.eclipse.ui.model.IWorkbenchAdapter;
> 
>-
> /**
> * Replaces org.eclipse.hyades.test.tools.ui.common.internal.editor.TestInvocationDetailPage to be able
> * to use Eclipse Form APIs.
>+ * 
>+ * 
> * 
>- * @author Ali Mehregani
>- * @author marcelop
>- * @since 0.3.0
>+ * @author Ali Mehregani
>+ * @author Paul E. Slauenwhite
>+ * @author Marcelo Paternostro
>+ * @version April 16, 2008
>+ * @since August 19, 2005
> */
> public abstract class TestInvocationDetailForm extends AbstractDetailForm 
> implements SelectionListener
>@@ -157,8 +160,8 @@
> c1.setLayoutData(new GridData(GridData.HORIZONTAL_ALIGN_FILL|GridData.GRAB_HORIZONTAL));
> 
> 		testLink = widgetFactory.createHyperlink(c1, "", SWT.WRAP);
>-		testLink.setText(getDeftaultLinkText());
>-		testLink.setToolTipText(getDeftaultLinkToolTip()); 
>+		testLink.setText(getDefaultLinkText());
>+		testLink.setToolTipText(getDefaultLinkToolTip()); 
> GridData testLinkGD = new GridData();
> testLinkGD.grabExcessHorizontalSpace = true;
> testLinkGD.horizontalAlignment = SWT.FILL;		
>@@ -178,12 +181,12 @@
> 
> 	}
> 	
>-	protected String getDeftaultLinkText()
>+	protected String getDefaultLinkText()
> 	{
> 		return "unspecified";
> 	}
> 
>-	protected String getDeftaultLinkToolTip()
>+	protected String getDefaultLinkToolTip()
> 	{
> 		return "";
> 	}
>@@ -271,7 +274,7 @@
> 		{
> 			doPack = true;
> 			imageLabel.setImage(TestUIImages.INSTANCE.getImage(TestUIImages.IMG_ERROR));
>-			testLink.setText(getDeftaultLinkText());
>+			testLink.setText(getDefaultLinkText());
> 			testLink.setData(null);
> 			fileText.setText("");
> 			typeText.setText("");
>Index: src/org/eclipse/hyades/test/tools/ui/common/internal/editor/TestInvocationDetailPage.java
>===================================================================
>RCS file: /cvsroot/tptp/test/org.eclipse.hyades.test.tools.ui/src/org/eclipse/hyades/test/tools/ui/common/internal/editor/TestInvocationDetailPage.java,v
>retrieving revision 1.20
>diff -u -r1.20 TestInvocationDetailPage.java
>--- src/org/eclipse/hyades/test/tools/ui/common/internal/editor/TestInvocationDetailPage.java	17 Jan 2008 02:49:19 -0000	1.20
>+++ src/org/eclipse/hyades/test/tools/ui/common/internal/editor/TestInvocationDetailPage.java	16 Apr 2008 18:09:04 -0000
>@@ -65,8 +65,8 @@
> * 
> * @author Marcelo Paternostro
> * @author Paul E. Slauenwhite
>- * @version January 16, 2008
>- * @since 0.3.0
>+ * @version April 16, 2008
>+ * @since February 1, 2005
> * @see AbstractDetailPage
> * @see SelectionListener
> * @see IHyperlinkListener
>@@ -159,10 +159,12 @@
> imageLabel = widgetFactory.createLabel(linkComposite, ""); //$NON-NLS-1$
> 		imageLabel.setImage(TestUIImages.INSTANCE.getImage(TestUIImages.IMG_ERROR));
> 
>- testLink = widgetFactory.createSelectableLabel(linkComposite, null);
>- //- Bugzilla #95930, the size of the initial text value should be larger than the invoked test name given in setInput
>- testLink.setText(getDeftaultLinkText()+" "); //$NON-NLS-1$
>-		testLink.setToolTipText(getDeftaultLinkToolTip()); 
>+		Composite testLinkComposite = widgetFactory.createComposite(linkComposite);
>+		testLinkComposite.setLayoutData(new GridData(GridData.FILL_HORIZONTAL));
>+
>+ testLink = widgetFactory.createSelectableLabel(testLinkComposite, null);
>+ testLink.setText(getDefaultLinkText());
>+		testLink.setToolTipText(getDefaultLinkToolTip()); 
> testLink.setLayoutData(new GridData(SWT.LEFT, SWT.CENTER, true, false));
> 		widgetFactory.turnIntoHyperlink(testLink, this);
> 
>@@ -188,18 +190,16 @@
> widgetFactory.paintBordersFor(detailComposite);
> 	}
> 	
>-	protected String getDeftaultLinkText()
>+	protected String getDefaultLinkText()
> 	{
> 		return "x"; //$NON-NLS-1$
> 	}
> 
>-	protected String getDeftaultLinkToolTip()
>+	protected String getDefaultLinkToolTip()
> 	{
> 		return ""; //$NON-NLS-1$
> 	}
> 	
>-	
>-
> 	/**
> 	 * @see org.eclipse.hyades.test.ui.internal.editor.form.util.EditorSection#setInput(java.lang.Object)
> 	 */
>@@ -276,7 +276,7 @@
> 		{
> 			doPack = true;
> 			imageLabel.setImage(TestUIImages.INSTANCE.getImage(TestUIImages.IMG_ERROR));
>-			testLink.setText(getDeftaultLinkText());
>+			testLink.setText(getDefaultLinkText());
> 			testLink.setData(null);
> 			fileText.setText(""); //$NON-NLS-1$
> 			typeText.setText(""); //$NON-NLS-1$
>Index: src/org/eclipse/hyades/test/tools/ui/common/internal/editor/TestSuiteForm.java
>===================================================================
>RCS file: /cvsroot/tptp/test/org.eclipse.hyades.test.tools.ui/src/org/eclipse/hyades/test/tools/ui/common/internal/editor/TestSuiteForm.java,v
>retrieving revision 1.14
>diff -u -r1.14 TestSuiteForm.java
>--- src/org/eclipse/hyades/test/tools/ui/common/internal/editor/TestSuiteForm.java	22 Jan 2008 13:24:07 -0000	1.14
>+++ src/org/eclipse/hyades/test/tools/ui/common/internal/editor/TestSuiteForm.java	16 Apr 2008 18:09:04 -0000
>@@ -41,11 +41,12 @@
> 
> /**
> * Source info viewer.
>+ * 
> * 
> * 
> * @author Marcelo Paternostro
> * @author Paul E. Slauenwhite
>- * @version January 22, 2008
>+ * @version April 16, 2008
> * @since February 1, 2005
> */
> abstract public class TestSuiteForm 
>@@ -232,6 +233,7 @@
> 	 */
> 	public boolean activated()
> 	{
>+		updateScrollBars();
> 		return true;
> 	}
> }
>Index: src/org/eclipse/hyades/test/tools/ui/java/internal/junit/editor/JUnitBehaviorForm.java
>===================================================================
>RCS file: /cvsroot/tptp/test/org.eclipse.hyades.test.tools.ui/src/org/eclipse/hyades/test/tools/ui/java/internal/junit/editor/JUnitBehaviorForm.java,v
>retrieving revision 1.8
>diff -u -r1.8 JUnitBehaviorForm.java
>--- src/org/eclipse/hyades/test/tools/ui/java/internal/junit/editor/JUnitBehaviorForm.java	21 Jan 2008 16:59:14 -0000	1.8
>+++ src/org/eclipse/hyades/test/tools/ui/java/internal/junit/editor/JUnitBehaviorForm.java	16 Apr 2008 18:09:04 -0000
>@@ -30,8 +30,14 @@
> import org.eclipse.swt.widgets.Control;
> 
> /**
>- * @author marcelop
>- * @since 0.3.0
>+ * JUnitBehaviorForm.java
>+ * 
>+ * 
>+ * 
>+ * @author Paul E. Slauenwhite
>+ * @author Marcelo Paternostro
>+ * @version April 16, 2008
>+ * @since February 1, 2005
> */
> public class JUnitBehaviorForm
> extends BehaviorForm
>@@ -129,12 +135,12 @@
> 				return ToolsUiPluginResourceBundle.BTN_IS_SYNC; 
> 			}
> 
>-			protected String getDeftaultLinkText()
>+			protected String getDefaultLinkText()
> 			{
> 				return UiPluginResourceBundle.NO_TST_TO_INV; 
> 			}
> 			
>-			protected String getDeftaultLinkToolTip()
>+			protected String getDefaultLinkToolTip()
> 			{
> 				return UiPluginResourceBundle.TIP_INV_TEST; 
> 			}
>#P org.eclipse.tptp.test.tools.manual
>Index: src-ui/org/eclipse/tptp/test/tools/manual/ui/internal/editor/ManualBehaviorForm.java
>===================================================================
>RCS file: /cvsroot/tptp/test/org.eclipse.tptp.test.tools.manual/src-ui/org/eclipse/tptp/test/tools/manual/ui/internal/editor/ManualBehaviorForm.java,v
>retrieving revision 1.3
>diff -u -r1.3 ManualBehaviorForm.java
>--- src-ui/org/eclipse/tptp/test/tools/manual/ui/internal/editor/ManualBehaviorForm.java	17 Jan 2008 02:48:42 -0000	1.3
>+++ src-ui/org/eclipse/tptp/test/tools/manual/ui/internal/editor/ManualBehaviorForm.java	16 Apr 2008 18:09:04 -0000
>@@ -29,12 +29,12 @@
> import org.eclipse.tptp.test.tools.manual.ui.internal.resources.ManualUIResourceBundle;
> 
> /**
>- * Behavior tabbed pane of the Manual Test Editor.
>+ * Behavior form of the Manual Test Editor.
> * 
> * 
> * 
> * @author Paul E. Slauenwhite
>- * @version January 16, 2008
>+ * @version April 16, 2008
> * @since December 5, 2007
> * @see JUnitBehaviorForm
> */
>@@ -112,11 +112,11 @@
> 				return ManualUIResourceBundle.BTN_IS_SYNC; 
> 			}
> 
>-			protected String getDeftaultLinkText(){
>+			protected String getDefaultLinkText(){
> 				return ManualUIResourceBundle.NO_TST_TO_INV; 
> 			}
> 			
>-			protected String getDeftaultLinkToolTip(){
>+			protected String getDefaultLinkToolTip(){
> 				return ManualUIResourceBundle.TIP_INV_TEST; 
> 			}
> 		});
>#P org.eclipse.tptp.test.auto.gui
>Index: src/org/eclipse/tptp/test/auto/gui/internal/editor/AutoGUIBehaviorForm.java
>===================================================================
>RCS file: /cvsroot/tptp/test/org.eclipse.tptp.test.auto.gui/src/org/eclipse/tptp/test/auto/gui/internal/editor/AutoGUIBehaviorForm.java,v
>retrieving revision 1.19
>diff -u -r1.19 AutoGUIBehaviorForm.java
>--- src/org/eclipse/tptp/test/auto/gui/internal/editor/AutoGUIBehaviorForm.java	7 Mar 2008 17:00:16 -0000	1.19
>+++ src/org/eclipse/tptp/test/auto/gui/internal/editor/AutoGUIBehaviorForm.java	16 Apr 2008 18:09:05 -0000
>@@ -90,12 +90,13 @@
> import org.w3c.dom.Text;
> 
> /**
>- * This is the behaviour page of the automated gui test suite
>+ * This is the behavior page of the Aautomated GUI Recorder (AGR) test suite
>+ * 
> * 
> * 
> * @author Ali Mehregani
> * @author Paul E. Slauenwhite
>- * @version March 7, 2008
>+ * @version April 18, 2008
> * @since August 19, 2005
> */
> public class AutoGUIBehaviorForm 
>@@ -606,12 +607,12 @@
> 			return ToolsUiPluginResourceBundle.BTN_IS_SYNC; 
> 		}
> 
>-		protected String getDeftaultLinkText()
>+		protected String getDefaultLinkText()
> 		{
> 			return UiPluginResourceBundle.NO_TST_TO_INV; 
> 		}
> 		
>-		protected String getDeftaultLinkToolTip()
>+		protected String getDefaultLinkToolTip()
> 		{
> 			return UiPluginResourceBundle.TIP_INV_TEST; 
> 		}

Actions: View | Diff

Attachments on bug 201900: 96294