Attachment 95537 Details for Bug 174460 – Patch V2

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

Patch V2

Defect_174460_patch_v2.txt (text/plain), 94.02 KB, created by Paul Slauenwhite

on 2008-04-10 10:52:22 EDT

(hide)

Description:

Filename:

MIME Type:

Creator: Paul Slauenwhite

Created: 2008-04-10 10:52:22 EDT

Size: 94.02 KB

patch

obsolete

>### Eclipse Workspace Patch 1.0
>#P org.eclipse.tptp.test.samples
>Index: src/org/eclipse/hyades/test/tools/ui/http/internal/reports/responsetime/ResponseTimeReport.java
>===================================================================
>RCS file: /cvsroot/tptp/test/org.eclipse.tptp.test.samples/src/org/eclipse/hyades/test/tools/ui/http/internal/reports/responsetime/ResponseTimeReport.java,v
>retrieving revision 1.2
>diff -u -r1.2 ResponseTimeReport.java
>--- src/org/eclipse/hyades/test/tools/ui/http/internal/reports/responsetime/ResponseTimeReport.java	27 Oct 2005 22:52:27 -0000	1.2
>+++ src/org/eclipse/hyades/test/tools/ui/http/internal/reports/responsetime/ResponseTimeReport.java	10 Apr 2008 14:51:51 -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
>@@ -61,7 +61,6 @@
> 				responseTime=responseTime.substring(0,responseTime.indexOf(lf));
> 			responseTime=responseTime.trim();
> 					
>-			System.out.println(pageName+":"+responseTime); 
> 			ResponseTimeData data = (ResponseTimeData)findPage(pageName);
> 			if(data==null)
> 			{
>Index: src/org/eclipse/hyades/test/tools/ui/http/internal/reports/responsetime/ResponseTimeReportGenerator.java
>===================================================================
>RCS file: src/org/eclipse/hyades/test/tools/ui/http/internal/reports/responsetime/ResponseTimeReportGenerator.java
>diff -N src/org/eclipse/hyades/test/tools/ui/http/internal/reports/responsetime/ResponseTimeReportGenerator.java
>--- src/org/eclipse/hyades/test/tools/ui/http/internal/reports/responsetime/ResponseTimeReportGenerator.java	3 May 2007 17:09:20 -0000	1.3
>+++ /dev/null	1 Jan 1970 00:00:00 -0000
>@@ -1,68 +0,0 @@
>-/*******************************************************************************
>- * Copyright (c) 2005, 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
>- * http://www.eclipse.org/legal/epl-v10.html
>- * $Id: ResponseTimeReportGenerator.java,v 1.3 2007/05/03 17:09:20 paules Exp $
>- * 
>- * Contributors:
>- * IBM Corporation - initial API and implementation
>- *******************************************************************************/
>-package org.eclipse.hyades.test.tools.ui.http.internal.reports.responsetime;
>-
>-import java.io.InputStream;
>-
>-import org.eclipse.core.resources.IFile;
>-import org.eclipse.core.runtime.IPath;
>-import org.eclipse.hyades.test.tools.ui.http.internal.reports.HTTPReportGenerator;
>-import org.eclipse.hyades.test.tools.ui.http.internal.reports.ReportGraph;
>-import org.eclipse.hyades.test.tools.ui.http.internal.reports.ReportGraphConfiguration;
>-import org.eclipse.jface.viewers.ISelection;
>-import org.eclipse.tptp.test.samples.internal.resources.SamplesPluginResourceBundle;
>-
>-/**
>- * TODO: Provide description for "ReportGenerator1".
>- * @see HTTPReportGenerator
>- */
>-public class ResponseTimeReportGenerator extends HTTPReportGenerator
>-{
>-	
>-	/**
>-	 * TODO: Implement "generate".
>-	 * @see org.eclipse.hyades.ui.report.IReportGenerator#generate
>-	 */
>-	public InputStream generate(IFile outputFile, ISelection sel) throws Exception 
>-	{
>-	 	initResultSelection();
>-	 	if(result==null)
>-			throw new Exception(SamplesPluginResourceBundle.ResponseTimeReportGenerator_PROBLEM); 
>-	 	 
>-	 	 ResponseTimeReport report = new ResponseTimeReport(result);
>-		 ResponseTimeData.resetCumulativeValues();
>-		 
>-		 report.generate();
>-		 		 
>-		 ReportGraphConfiguration graphConfig = setupConfiguration();
>-		 		 
>-		 ReportGraph graph = new ReportGraph(report.getList(),graphConfig);		 
>-		 IPath svgPath = outputFile.getFullPath(); 
>-		 svgPath.removeFileExtension().addFileExtension("svg"); //$NON-NLS-1$
>-		 return graph.generate(svgPath);	
>-	
>-	}
>-
>-	private ReportGraphConfiguration setupConfiguration()
>-	{
>-		ReportGraphConfiguration graphConfig = new ReportGraphConfiguration();
>-		 graphConfig.setTitle(SamplesPluginResourceBundle.ResponseTimeReportGenerator_RESPONSE_TIME); 
>-		 graphConfig.setXTitle(SamplesPluginResourceBundle.ResponseTimeReportGenerator_PAGE); 
>-		 graphConfig.setYTitle(SamplesPluginResourceBundle.ResponseTimeReportGenerator_TIME_S); 
>-		 graphConfig.setLegendTitle(SamplesPluginResourceBundle.ResponseTimeReportGenerator_LEGEND); 
>-		 graphConfig.setTimeStampPrefix(""); //$NON-NLS-1$
>-		 graphConfig.setMinWidth(800);
>-		 graphConfig.setHeight(500);
>-		 graphConfig.setID("org.eclipse.hyades.test.ui.URLTest.ResponseTimeReport");
>-		return graphConfig;
>-	}
>-}
>Index: plugin.properties
>===================================================================
>RCS file: /cvsroot/tptp/test/org.eclipse.tptp.test.samples/plugin.properties,v
>retrieving revision 1.18
>diff -u -r1.18 plugin.properties
>--- plugin.properties	10 Apr 2008 01:18:19 -0000	1.18
>+++ plugin.properties	10 Apr 2008 14:51:51 -0000
>@@ -23,16 +23,19 @@
> providerName 						= Eclipse.org
> 
> #Report
>+REPORT_WINDOW_WTITLE				= Test Report
>+
> REPORT_WINDOW_WIZ_NAME				= Time Frame Historic
>-REPORT_WINDOW_WIZ_DESC				= Create a report with all the executions run within a finite period of time.
>+REPORT_WINDOW_WIZ_DESC				= Create a report with all of the execution results for each selected test within a specified period of time.
> 
> TEST_PASS_REPORT_WIZ_NAME			= Test Pass Report
> TEST_PASS_REPORT_WIZ_DESC			= Create a report with only the most recent execution results for each selected test within a specified period of time.
> 
>-#Test Reports
>-REPORT_WINDOW_WTITLE				= Test Report
> RESP_TIME_TITLE 					= HTTP Page Response Time
>+RESP_TIME_DESC			 = Create a report with the response time for each HTTP page in the the most recent execution results for each selected test.
>+
> HIT_RATE_TITLE 						= HTTP Page Hit Rate
>+HIT_RATE_DESC		 	= Create a report with the hits per second for each HTTP page in the the most recent execution results for each selected test.
> 
> #Test Report font preferences
> TEST_REPORT_FONT_PREFERENCES_PAGE_NAME = Fonts
>Index: plugin.xml
>===================================================================
>RCS file: /cvsroot/tptp/test/org.eclipse.tptp.test.samples/plugin.xml,v
>retrieving revision 1.12
>diff -u -r1.12 plugin.xml
>--- plugin.xml	6 Mar 2008 17:59:20 -0000	1.12
>+++ plugin.xml	10 Apr 2008 14:51:51 -0000
>@@ -15,62 +15,60 @@
> <?eclipse version="3.0"?>
> <plugin>
> 
>- <extension
>- point="org.eclipse.hyades.ui.reportGenerators">
>- <wizard
>- icon="icons/full/etool16/report_window_wiz.gif"
>+	<extension
>+ 	point="org.eclipse.hyades.ui.reportGenerators">
>+
>+	  	
>+ 	<wizard
>+ 	icon="icons/full/etool16/report_window_wiz.gif"
> class="org.eclipse.hyades.test.tools.ui.common.internal.report.ReportWindowWizard"
> description="%REPORT_WINDOW_WIZ_DESC"
> name="%REPORT_WINDOW_WIZ_NAME"
> id="org.eclipse.hyades.test.tools.ui.common.internal.report.ReportWindowWizard"/>
>- </extension>
>-
>- <extension
>- point="org.eclipse.hyades.ui.reportGenerators">
>- <wizard
>+ 
>+	  	
>+		<wizard
> icon="icons/full/etool16/report_window_wiz.gif"
> class="org.eclipse.hyades.test.tools.ui.common.internal.report.TestPassReportWizard"
> description="%TEST_PASS_REPORT_WIZ_DESC"
> name="%TEST_PASS_REPORT_WIZ_NAME"
> id="org.eclipse.hyades.test.tools.ui.common.internal.report.TestPassReportWizard"/>
>- </extension>
> 
>+	  	
>+ 	<wizard
>+ 	icon="icons/full/etool16/report_window_wiz.gif"
>+ class="org.eclipse.hyades.test.tools.ui.http.internal.reports.responsetime.HTTPPageResponseTimeReportGeneratorWizard"
>+ description="%RESP_TIME_DESC"
>+ name="%RESP_TIME_TITLE"
>+ id="org.eclipse.hyades.test.tools.ui.http.internal.reports.responsetime.HTTPPageResponseTimeReportGeneratorWizard"/>
>+
>+	  	
>+ 	<wizard
>+ 	icon="icons/full/etool16/report_window_wiz.gif"
>+ class="org.eclipse.hyades.test.tools.ui.http.internal.reports.hitrate.HTTPPageHitRateReportGeneratorWizard"
>+ description="%HIT_RATE_DESC"
>+ name="%HIT_RATE_TITLE"
>+ id="org.eclipse.hyades.test.tools.ui.http.internal.reports.hitrate.HTTPPageHitRateReportGeneratorWizard.java"/>
>+ 	</extension>
> 
>- <extension
>- point="org.eclipse.ui.views">
>- <category
>- name="%REPORT_WINDOW_WTITLE"
>- id="org.eclipse.tptp.test.samples.views">
>- </category>
>- <view
>+ 	<extension
>+ 	point="org.eclipse.ui.views">
>+ 	<category
>+ 	name="%REPORT_WINDOW_WTITLE"
>+ id="org.eclipse.tptp.test.samples.views"/>
>+	 	<view
> name="%REPORT_WINDOW_WTITLE"
> icon="icons/full/etool16/report_window_wiz.gif"
> category="org.eclipse.hyades.test.ui.views"
> class="org.eclipse.hyades.test.tools.ui.common.internal.report.ReportView"
>- id="org.eclipse.hyades.test.tools.ui.common.internal.report.ReportView">
>- </view>
>- </extension>
>+ id="org.eclipse.hyades.test.tools.ui.common.internal.report.ReportView"/>
>+ 	</extension>
> 
>- <extension point="org.eclipse.ui.preferencePages">
>- <page name="%TEST_REPORT_FONT_PREFERENCES_PAGE_NAME" 
>- category="org.eclipse.hyades.test.ui.internal.preference.ReportGeneratorPage" 
>- class="org.eclipse.hyades.test.tools.ui.common.internal.report.ReportStylesPreferencePage" 
>- id="org.eclipse.hyades.test.tools.ui.common.internal.report.ReportStylesPreferencePage">
>- </page>
>- </extension>
>- <extension
>- id="org.eclispe.hyades.test.http.report"
>- name="org.eclipse.hyades.test.http.report"
>- point="org.eclipse.tptp.platform.common.ui.reportExtensions">
>- <reportDescription
>- name="%RESP_TIME_TITLE"
>- isDefault="true"
>- class="org.eclipse.hyades.test.tools.ui.http.internal.reports.responsetime.ResponseTimeReportGenerator">
>- </reportDescription>
>- <reportDescription
>- name="%HIT_RATE_TITLE"
>- class="org.eclipse.hyades.test.tools.ui.http.internal.reports.hitrate.HitRateReportGenerator">
>- </reportDescription>
>- </extension>
>-
>+ 	<extension 
>+ 		point="org.eclipse.ui.preferencePages">
>+ 	<page name="%TEST_REPORT_FONT_PREFERENCES_PAGE_NAME" 
>+ 	category="org.eclipse.hyades.test.ui.internal.preference.ReportGeneratorPage" 
>+ 	class="org.eclipse.hyades.test.tools.ui.common.internal.report.ReportStylesPreferencePage" 
>+ 	id="org.eclipse.hyades.test.tools.ui.common.internal.report.ReportStylesPreferencePage"/>
>+ 	</extension>
> </plugin>
>Index: src/org/eclipse/tptp/test/samples/internal/resources/SamplesPluginResourceBundle.java
>===================================================================
>RCS file: /cvsroot/tptp/test/org.eclipse.tptp.test.samples/src/org/eclipse/tptp/test/samples/internal/resources/SamplesPluginResourceBundle.java,v
>retrieving revision 1.6
>diff -u -r1.6 SamplesPluginResourceBundle.java
>--- src/org/eclipse/tptp/test/samples/internal/resources/SamplesPluginResourceBundle.java	14 Mar 2008 19:20:33 -0000	1.6
>+++ src/org/eclipse/tptp/test/samples/internal/resources/SamplesPluginResourceBundle.java	10 Apr 2008 14:51:51 -0000
>@@ -19,7 +19,7 @@
> * 
> * 
> * @author Paul E. Slauenwhite
>- * @version March 14, 2008
>+ * @version April 10, 2008
> * @since March 15, 2007
> */
> public final class SamplesPluginResourceBundle extends NLS {
>@@ -34,6 +34,8 @@
> 	public static String JScribWriter_NoVerdict;
> 	public static String Test_Pass_ReportWindow_Title;
> 	public static String Time_Frame_Historic_ReportWindow_Title;
>+	public static String HTTP_Page_Response_Time_ReportWindow_Title;
>+	public static String HTTP_Page_Hit_Rate_ReportWindow_Title;
> 	public static String ReportWindow_Title;
> 	public static String ReportWindowWizardPage_Title;
> 	public static String ReportWindowWizardPage_Description;
>@@ -85,7 +87,6 @@
> 	public static String TestSuiteVisitor_Verdict;
> 	public static String TestSuiteVisitor_NumberOfTestLogs;
> 	public static String SVG_URL;
>-	public static String HitRateReportGenerator_ERROR;
> 	public static String HitRateReportGenerator_HIT_RATE;
> 	public static String HitRateReportGenerator_PAGE;
> 	public static String HitRateReportGenerator_HITS_SEC;
>@@ -112,7 +113,8 @@
> 	public static String ReportGraph_13;
> 	public static String ReportGraph_14;
> 	public static String ReportGraph_15;
>-
>+	public static String OUTPUT_STREAM_ERROR_;
>+	
> 	static {
> 		NLS.initializeMessages(BUNDLE_NAME, SamplesPluginResourceBundle.class);
> 	}
>Index: src/org/eclipse/tptp/test/samples/internal/resources/messages.properties
>===================================================================
>RCS file: /cvsroot/tptp/test/org.eclipse.tptp.test.samples/src/org/eclipse/tptp/test/samples/internal/resources/messages.properties,v
>retrieving revision 1.7
>diff -u -r1.7 messages.properties
>--- src/org/eclipse/tptp/test/samples/internal/resources/messages.properties	14 Mar 2008 19:20:33 -0000	1.7
>+++ src/org/eclipse/tptp/test/samples/internal/resources/messages.properties	10 Apr 2008 14:51:51 -0000
>@@ -20,6 +20,8 @@
> ReportWindow_Title				= Test Report
> Test_Pass_ReportWindow_Title	= Test Pass Report
> Time_Frame_Historic_ReportWindow_Title	= Time Frame Historic
>+HTTP_Page_Response_Time_ReportWindow_Title = HTTP Page Response Time
>+HTTP_Page_Hit_Rate_ReportWindow_Title 	 = HTTP Page Hit Rate
> 
> ReportWindowWizardPage_Title	 						= Select a time frame
> ReportWindowWizardPage_Description						= Enter the start and end date and time ({0}) for the report window.
>@@ -82,7 +84,6 @@
> 
> SVG_URL						 = Charts require the <a href="http://www.adobe.com/svg/viewer/install/main.html">Adobe SVG Viewer</a>
> 
>-HitRateReportGenerator_ERROR=Problem resolving selected test logs
> HitRateReportGenerator_HIT_RATE=Page Hit Rate
> HitRateReportGenerator_PAGE=Page
> HitRateReportGenerator_HITS_SEC=Hits/second
>@@ -115,3 +116,6 @@
> ReportGraph_14=Expected Fail
> ReportGraph_15=Expected Inconclusive
> 
>+OUTPUT_STREAM_ERROR_ = Report generation exception: Unable to close the output stream.
>+
>+
>Index: src/org/eclipse/hyades/test/tools/ui/http/internal/reports/hitrate/HitRateReportGenerator.java
>===================================================================
>RCS file: src/org/eclipse/hyades/test/tools/ui/http/internal/reports/hitrate/HitRateReportGenerator.java
>diff -N src/org/eclipse/hyades/test/tools/ui/http/internal/reports/hitrate/HitRateReportGenerator.java
>--- src/org/eclipse/hyades/test/tools/ui/http/internal/reports/hitrate/HitRateReportGenerator.java	3 May 2007 17:06:29 -0000	1.3
>+++ /dev/null	1 Jan 1970 00:00:00 -0000
>@@ -1,73 +0,0 @@
>-/*******************************************************************************
>- * Copyright (c) 2005, 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
>- * http://www.eclipse.org/legal/epl-v10.html
>- * $Id: HitRateReportGenerator.java,v 1.3 2007/05/03 17:06:29 paules Exp $
>- * 
>- * Contributors:
>- * IBM Corporation - initial API and implementation
>- *******************************************************************************/
>-package org.eclipse.hyades.test.tools.ui.http.internal.reports.hitrate;
>-
>-import java.io.InputStream;
>-
>-import org.eclipse.core.resources.IFile;
>-import org.eclipse.core.runtime.IPath;
>-import org.eclipse.hyades.test.tools.ui.http.internal.reports.HTTPReportGenerator;
>-import org.eclipse.hyades.test.tools.ui.http.internal.reports.ReportGraph;
>-import org.eclipse.hyades.test.tools.ui.http.internal.reports.ReportGraphConfiguration;
>-import org.eclipse.jface.viewers.ISelection;
>-import org.eclipse.tptp.test.samples.internal.resources.SamplesPluginResourceBundle;
>-
>-/**
>- * TODO: Provide description for "ReportGenerator1".
>- * @see HTTPReportGenerator
>- */
>-public class HitRateReportGenerator extends HTTPReportGenerator
>-{
>-	
>-
>-	/**
>-	 * TODO: Implement "generate".
>-	 * @see org.eclipse.hyades.ui.report.IReportGenerator#generate
>-	 */
>-	public InputStream generate(IFile outputFile, ISelection arg1) throws Exception 
>-	{	
>-		
>-		initResultSelection();
>-		if(result ==null)
>-			throw new Exception(SamplesPluginResourceBundle.HitRateReportGenerator_ERROR); 
>-			
>-		 
>-		HitRateReport report = new HitRateReport(result);
>-		
>-		report.generate();
>-		
>-		ReportGraphConfiguration config = setupConfiguration();
>-			
>-		ReportGraph graph = new ReportGraph(report.getList(),config);
>-		 
>-		IPath svgPath = outputFile.getFullPath(); 
>-		svgPath.removeFileExtension().addFileExtension("svg"); //$NON-NLS-1$
>-		return graph.generate(svgPath);		
>-		
>-		
>-	}
>-
>-
>-	private ReportGraphConfiguration setupConfiguration()
>-	{
>-		ReportGraphConfiguration config = new ReportGraphConfiguration();
>-		config.setTitle(SamplesPluginResourceBundle.HitRateReportGenerator_HIT_RATE); 
>-		config.setXTitle(SamplesPluginResourceBundle.HitRateReportGenerator_PAGE); 
>-		config.setYTitle(SamplesPluginResourceBundle.HitRateReportGenerator_HITS_SEC); 
>-		config.setLegendTitle(SamplesPluginResourceBundle.HitRateReportGenerator_LEGEND); 
>-		config.setTimeStampPrefix(""); //$NON-NLS-1$
>-		config.setMinWidth(800);
>-		config.setHeight(500);
>-		config.setID("org.eclipse.hyades.test.ui.URLTest.HitRateReport");
>-		return config;
>-	}
>-}
>Index: src/org/eclipse/hyades/test/tools/ui/common/internal/report/ReportView.java
>===================================================================
>RCS file: /cvsroot/tptp/test/org.eclipse.tptp.test.samples/src/org/eclipse/hyades/test/tools/ui/common/internal/report/ReportView.java,v
>retrieving revision 1.7
>diff -u -r1.7 ReportView.java
>--- src/org/eclipse/hyades/test/tools/ui/common/internal/report/ReportView.java	26 Apr 2007 18:49:42 -0000	1.7
>+++ src/org/eclipse/hyades/test/tools/ui/common/internal/report/ReportView.java	10 Apr 2008 14:51:51 -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
>@@ -27,6 +27,7 @@
> import org.eclipse.tptp.platform.report.drivers.ui.internal.SWTViewer;
> import org.eclipse.tptp.platform.report.ui.dialogs.internal.StyleEditorDialog;
> import org.eclipse.tptp.platform.report.ui.dialogs.internal.ZoomEditorDialog;
>+import org.eclipse.tptp.test.samples.SamplesPlugin;
> import org.eclipse.tptp.test.samples.internal.resources.SamplesPluginResourceBundle;
> import org.eclipse.ui.IEditorDescriptor;
> import org.eclipse.ui.PlatformUI;
>@@ -96,7 +97,7 @@
> }
> catch (WorkbenchException e)
> {
>- System.out.println("Unable to open file = " + link.getTarget());
>+ 	 SamplesPlugin.logError("Unable to open file = " + link.getTarget());
> }
> //return copyImageFile(link.getTarget());
> }
>Index: src/org/eclipse/hyades/test/tools/ui/common/internal/report/ReportWindowWizard.java
>===================================================================
>RCS file: /cvsroot/tptp/test/org.eclipse.tptp.test.samples/src/org/eclipse/hyades/test/tools/ui/common/internal/report/ReportWindowWizard.java,v
>retrieving revision 1.20
>diff -u -r1.20 ReportWindowWizard.java
>--- src/org/eclipse/hyades/test/tools/ui/common/internal/report/ReportWindowWizard.java	14 Mar 2008 19:20:33 -0000	1.20
>+++ src/org/eclipse/hyades/test/tools/ui/common/internal/report/ReportWindowWizard.java	10 Apr 2008 14:51:51 -0000
>@@ -71,7 +71,7 @@
> * 
> * @author Patrick Nedelec
> * @author Paul E. Slauenwhite
>- * @version March 14, 2008
>+ * @version April 10, 2008
> * @since June 6, 2005
> */
> public class ReportWindowWizard extends ReportGeneratorWizard {
>@@ -84,7 +84,14 @@
> 
> private final static String FILE_EXTENSION = "html"; //$NON-NLS-1$
> 
>- /**
>+ /* (non-Javadoc)
>+ * @see org.eclipse.hyades.ui.report.ReportGeneratorWizard#getEditorId()
>+ */
>+ public String getEditorId() {		
>+		return "org.eclipse.ui.browser.editorSupport"; //$NON-NLS-1$
>+	}
>+
>+	/**
> * Constructor
> */
> public ReportWindowWizard() {
>@@ -102,7 +109,6 @@
> locationPage.setTitle(UiPluginResourceBundle.WIZ_TST_REP_PG_TTL); 
> locationPage.setDescription(UiPluginResourceBundle.WIZ_TST_REP_PG_LOC_DSC); 
> locationPage.setFileExtension(FILE_EXTENSION);
>- locationPage.setAllowOverwrite(true);
> }
> 
> protected IStructuredSelection adjustLocation() {
>@@ -226,11 +232,12 @@
> try {
> if (outputStream != null) {
> outputStream.close();
>- }
>- monitor.done();
>+ } 
> } catch (Throwable e) {
>- throw new Exception("Exception caught during the report generation: unable to close the output stream"); //$NON-NLS-1$
>+ throw new Exception(SamplesPluginResourceBundle.OUTPUT_STREAM_ERROR_);
> }
>+ 
>+ monitor.done();
> }
> }
> 
>Index: src/org/eclipse/hyades/test/tools/ui/http/internal/reports/HTTPReportGenerator.java
>===================================================================
>RCS file: src/org/eclipse/hyades/test/tools/ui/http/internal/reports/HTTPReportGenerator.java
>diff -N src/org/eclipse/hyades/test/tools/ui/http/internal/reports/HTTPReportGenerator.java
>--- src/org/eclipse/hyades/test/tools/ui/http/internal/reports/HTTPReportGenerator.java	27 Nov 2007 15:55:22 -0000	1.4
>+++ /dev/null	1 Jan 1970 00:00:00 -0000
>@@ -1,147 +0,0 @@
>-/*******************************************************************************
>- * Copyright (c) 2005, 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
>- * http://www.eclipse.org/legal/epl-v10.html
>- * $Id: HTTPReportGenerator.java,v 1.4 2007/11/27 15:55:22 paules Exp $
>- * 
>- * Contributors:
>- * IBM Corporation - initial API and implementation
>- *******************************************************************************/
>-package org.eclipse.hyades.test.tools.ui.http.internal.reports;
>-
>-import java.util.ArrayList;
>-import java.util.Iterator;
>-import java.util.List;
>-
>-import org.eclipse.emf.common.util.BasicEList;
>-import org.eclipse.emf.common.util.EList;
>-import org.eclipse.hyades.models.common.testprofile.TPFExecutionResult;
>-import org.eclipse.hyades.models.common.testprofile.TPFTest;
>-import org.eclipse.hyades.models.common.testprofile.TPFTestSuite;
>-import org.eclipse.hyades.models.common.util.ExecutionUtil;
>-import org.eclipse.hyades.test.tools.core.common.TestCommon;
>-import org.eclipse.hyades.test.ui.navigator.ITestSuiteProxyNode;
>-import org.eclipse.hyades.ui.report.IReportGenerator;
>-import org.eclipse.jface.viewers.ISelection;
>-import org.eclipse.jface.viewers.IStructuredSelection;
>-import org.eclipse.jface.viewers.StructuredSelection;
>-import org.eclipse.jface.wizard.WizardDialog;
>-import org.eclipse.swt.widgets.Display;
>-
>-/**
>- * Abstract object to be extended by HTTP report generators
>- * 
>- * 
>- * 
>- * @author Ernest Jessee
>- * @author Paul E. Slauenwhite
>- * @version November 27, 2007
>- * @since June 10, 2006
>- */
>-public abstract class HTTPReportGenerator implements IReportGenerator 
>-{
>-
>-	protected StructuredSelection selection = null;
>-
>-	protected TPFTest test = null;
>-	
>-	protected TPFExecutionResult result = null;
>-
>-	private EList selectedTestSuites = null;
>-	 
>-	public void setUsedClasspath(String arg0)
>-	{
>-	}
>-
>-	/**
>-	 * returns the file extension for the report to be generated.
>-	 */
>-	public String getReportFileExtension(ISelection arg0)
>-	{
>-		return "html";
>-	}
>-
>-	/**
>-	 * returns a boolean indicating whether or not this report generator is avalable.
>-	 * @param ISelection theSel
>-	 */
>-	public boolean isAvailable(ISelection selection) 
>-	{ 
>-		
>-		//Step 1: Determine if the selection contains at least one element:
>-		if ((selection == null) || (selection.isEmpty())){ 
>-			return false;
>-		}
>-		
>-		//Step 2: Determine if the selection element contains URL test suite(s) and resolve the selected URL test suite(s):
>- selectedTestSuites = new BasicEList();
>-		Iterator selectionIterator = ((IStructuredSelection) (new StructuredSelection(selection).getFirstElement())).iterator();
>- 
>-		while (selectionIterator.hasNext()) {
>- 
>- Object testSuiteProxyNode = selectionIterator.next();
>-
>- if (testSuiteProxyNode instanceof ITestSuiteProxyNode){
>- 	
>- 	TPFTestSuite testSuite = ((ITestSuiteProxyNode) (testSuiteProxyNode)).getTestSuite();
>- 	
>- 	if(testSuite.getType().equals(TestCommon.HTTP_JUNIT_TEST_SUITE_TYPE)){
>- 		selectedTestSuites.add(testSuite);
>- 	}
>- else{
>-
>- 	selectedTestSuites = null;
>- 			
>- 			return false;
>- }
>- }
>- else{
>-
>- 	selectedTestSuites = null;
>- 			
>- 			return false;
>- }
>- } 
>-		
>-		//Step 3: Determine if at least one URL test suite has been selected:
>-		if(selectedTestSuites.size() == 0){
>-			
>-			selectedTestSuites = null;
>-			
>-			return false;
>-		}
>-		
>-		return true;
>-	}
>-
>-	/**
>-	 * initialzes the TPFExecutionResult object
>-	 *
>-	 */
>-	protected void initResultSelection()
>-	{
>-		
>-		List results = new ArrayList();	
>-		Iterator selectedTestSuitesIterator = selectedTestSuites.iterator();
>-
>-		while(selectedTestSuitesIterator.hasNext()){		
>-			results.addAll(ExecutionUtil.findExecutionResults(((TPFTestSuite)(selectedTestSuitesIterator.next()))));		}
>-		
>-		if(results.size() > 1){
>-			 
>-			ResultsSelectionWizard wiz = new ResultsSelectionWizard(results);
>-			 
>-			new WizardDialog(Display.getDefault().getActiveShell(),wiz).open();			
>-			
>-			result = wiz.getSelectedResult();
>-		 }
>-		 else if(results.size() == 1){
>-		 	result = (TPFExecutionResult)results.get(0);
>-		 }
>-		 else{
>-			result = null;
>-		 }
>-	}
>-}
>Index: src/org/eclipse/hyades/test/tools/ui/http/internal/reports/hitrate/HTTPPageHitRateReportGeneratorWizard.java
>===================================================================
>RCS file: src/org/eclipse/hyades/test/tools/ui/http/internal/reports/hitrate/HTTPPageHitRateReportGeneratorWizard.java
>diff -N src/org/eclipse/hyades/test/tools/ui/http/internal/reports/hitrate/HTTPPageHitRateReportGeneratorWizard.java
>--- /dev/null	1 Jan 1970 00:00:00 -0000
>+++ src/org/eclipse/hyades/test/tools/ui/http/internal/reports/hitrate/HTTPPageHitRateReportGeneratorWizard.java	1 Jan 1970 00:00:00 -0000
>@@ -0,0 +1,109 @@
>+/*******************************************************************************
>+ * Copyright (c) 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
>+ * http://www.eclipse.org/legal/epl-v10.html
>+ * $Id$
>+ * 
>+ * Contributors:
>+ * IBM Corporation - initial API and implementation
>+ *******************************************************************************/
>+package org.eclipse.hyades.test.tools.ui.http.internal.reports.hitrate;
>+
>+import org.eclipse.core.resources.IFile;
>+import org.eclipse.core.runtime.IPath;
>+import org.eclipse.core.runtime.IProgressMonitor;
>+import org.eclipse.hyades.test.tools.ui.http.internal.reports.AbstractHTTPPageReportGeneratorWizard;
>+import org.eclipse.hyades.test.tools.ui.http.internal.reports.ReportGraph;
>+import org.eclipse.hyades.test.tools.ui.http.internal.reports.ReportGraphConfiguration;
>+import org.eclipse.tptp.test.samples.internal.resources.SamplesPluginImageManager;
>+import org.eclipse.tptp.test.samples.internal.resources.SamplesPluginResourceBundle;
>+
>+/**
>+ * HTTPPageHitRateReportGeneratorWizard.java
>+ * 
>+ * 
>+ * 
>+ * @author Paul E. Slauenwhite
>+ * @version April 10, 2008
>+ * @since April 10, 2008
>+ */
>+public class HTTPPageHitRateReportGeneratorWizard extends AbstractHTTPPageReportGeneratorWizard {
>+
>+ /**
>+ * Constructor.
>+ */
>+ public HTTPPageHitRateReportGeneratorWizard() {
>+ 
>+ 	super();
>+ 
>+ 	setWindowTitle(SamplesPluginResourceBundle.HTTP_Page_Hit_Rate_ReportWindow_Title); 
>+ setDefaultPageImageDescriptor(SamplesPluginImageManager.getInstance().getImageDescriptor(SamplesPluginImageManager.IMG_WIZBAN_REPORT_WINDOW));
>+ }
>+ 
>+ /**
>+ * @see org.eclipse.hyades.ui.report.ReportGeneratorWizard#generate(org.eclipse.core.runtime.IProgressMonitor)
>+ */
>+ public IFile generate(IProgressMonitor monitor) throws Exception {
>+ 
>+		IFile outputFile = getReportFile();
>+ 
>+ 	try {
>+
>+ 		monitor.beginTask("", 4); //$NON-NLS-1$ 
>+
>+ 		initResultSelection();
>+
>+ 		monitor.worked(1); 
>+
>+ 		if(result == null){
>+ 			throw new Exception(SamplesPluginResourceBundle.ResponseTimeReportGenerator_PROBLEM);
>+ 		}
>+
>+ 		HitRateReport report = new HitRateReport(result);
>+ 		
>+ 		report.generate();
>+
>+ 		monitor.worked(1); 
>+
>+ 		ReportGraphConfiguration config = setupConfiguration();
>+
>+ 		IPath svgPath = outputFile.getFullPath(); 
>+ 		svgPath.removeFileExtension().addFileExtension("svg"); //$NON-NLS-1$
>+
>+ 		monitor.worked(1); 
>+
>+ 		ReportGraph graph = new ReportGraph(report.getList(),config);		 
>+
>+ if (outputFile.exists()) {
>+ 	outputFile.delete(true, true, null);
>+ }
>+ 
>+ outputFile.create(graph.generate(svgPath), true, null);
>+ 
>+ 		monitor.worked(1); 
>+ 	} 
>+ 	finally { 
>+ monitor.done();
>+ }
>+
>+ 	return outputFile;	
>+ }
>+ 
>+ private ReportGraphConfiguration setupConfiguration()
>+	{
>+		
>+ 	ReportGraphConfiguration config = new ReportGraphConfiguration();
>+		config.setTitle(SamplesPluginResourceBundle.HitRateReportGenerator_HIT_RATE); 
>+		config.setXTitle(SamplesPluginResourceBundle.HitRateReportGenerator_PAGE); 
>+		config.setYTitle(SamplesPluginResourceBundle.HitRateReportGenerator_HITS_SEC); 
>+		config.setLegendTitle(SamplesPluginResourceBundle.HitRateReportGenerator_LEGEND); 
>+		config.setTimeStampPrefix(""); //$NON-NLS-1$
>+		config.setMinWidth(800);
>+		config.setHeight(500);
>+		config.setID("org.eclipse.hyades.test.ui.URLTest.HitRateReport");
>+		
>+		return config;
>+	}
>+}
>Index: src/org/eclipse/hyades/test/tools/ui/http/internal/reports/AbstractHTTPPageReportGeneratorWizard.java
>===================================================================
>RCS file: src/org/eclipse/hyades/test/tools/ui/http/internal/reports/AbstractHTTPPageReportGeneratorWizard.java
>diff -N src/org/eclipse/hyades/test/tools/ui/http/internal/reports/AbstractHTTPPageReportGeneratorWizard.java
>--- /dev/null	1 Jan 1970 00:00:00 -0000
>+++ src/org/eclipse/hyades/test/tools/ui/http/internal/reports/AbstractHTTPPageReportGeneratorWizard.java	1 Jan 1970 00:00:00 -0000
>@@ -0,0 +1,248 @@
>+/*******************************************************************************
>+ * Copyright (c) 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
>+ * http://www.eclipse.org/legal/epl-v10.html
>+ * $Id$
>+ * 
>+ * Contributors:
>+ * IBM Corporation - initial API and implementation
>+ *******************************************************************************/
>+package org.eclipse.hyades.test.tools.ui.http.internal.reports;
>+
>+import java.util.ArrayList;
>+import java.util.Iterator;
>+import java.util.List;
>+
>+import org.eclipse.core.resources.IContainer;
>+import org.eclipse.core.resources.IFile;
>+import org.eclipse.core.resources.IFolder;
>+import org.eclipse.core.resources.IProject;
>+import org.eclipse.core.resources.IResource;
>+import org.eclipse.core.resources.IWorkspace;
>+import org.eclipse.core.resources.ResourcesPlugin;
>+import org.eclipse.core.runtime.CoreException;
>+import org.eclipse.core.runtime.IPath;
>+import org.eclipse.core.runtime.Path;
>+import org.eclipse.emf.common.util.BasicEList;
>+import org.eclipse.emf.common.util.EList;
>+import org.eclipse.hyades.models.common.testprofile.TPFExecutionResult;
>+import org.eclipse.hyades.models.common.testprofile.TPFTestSuite;
>+import org.eclipse.hyades.models.common.util.ExecutionUtil;
>+import org.eclipse.hyades.test.tools.core.common.TestCommon;
>+import org.eclipse.hyades.test.ui.UiPlugin;
>+import org.eclipse.hyades.test.ui.internal.resources.UiPluginResourceBundle;
>+import org.eclipse.hyades.test.ui.navigator.ITestSuiteProxyNode;
>+import org.eclipse.hyades.ui.report.ReportGeneratorWizard;
>+import org.eclipse.jface.viewers.ISelection;
>+import org.eclipse.jface.viewers.IStructuredSelection;
>+import org.eclipse.jface.viewers.StructuredSelection;
>+import org.eclipse.jface.wizard.WizardDialog;
>+import org.eclipse.swt.widgets.Display;
>+import org.eclipse.tptp.platform.common.ui.wizard.LocationPage;
>+
>+/**
>+ * AbstractHTTPPageReportGeneratorWizard.java
>+ * 
>+ * 
>+ * 
>+ * @author Paul E. Slauenwhite
>+ * @version April 10, 2008
>+ * @since April 10, 2008
>+ */
>+public abstract class AbstractHTTPPageReportGeneratorWizard extends ReportGeneratorWizard {
>+
>+ private LocationPage locationPage;
>+ private EList selectedTestSuites = null;
>+	protected TPFExecutionResult result = null;
>+
>+ private final static String FILE_EXTENSION = "html"; //$NON-NLS-1$
>+
>+ /**
>+ * Constructor.
>+ */
>+ public AbstractHTTPPageReportGeneratorWizard() {
>+ 	super(); 
>+ }
>+
>+ /* (non-Javadoc)
>+ * @see org.eclipse.hyades.ui.report.ReportGeneratorWizard#getEditorId()
>+ */
>+ public String getEditorId() {		
>+		return "org.eclipse.ui.browser.editorSupport"; //$NON-NLS-1$
>+	}
>+ 
>+ /**
>+ * @see org.eclipse.hyades.ui.internal.wizard.HyadesWizard#initPages()
>+ */
>+ protected void initPages() {
>+
>+ locationPage = new LocationPage("location", adjustLocation()); //$NON-NLS-1$
>+ locationPage.setTitle(UiPluginResourceBundle.WIZ_TST_REP_PG_TTL); 
>+ locationPage.setDescription(UiPluginResourceBundle.WIZ_TST_REP_PG_LOC_DSC); 
>+ locationPage.setFileExtension(FILE_EXTENSION);
>+ }
>+
>+ protected IStructuredSelection adjustLocation() {
>+ 
>+ 	IStructuredSelection structuredSelection = getSelection();
>+ Object selection = structuredSelection.getFirstElement();
>+ 
>+ if (selection instanceof IResource) {
>+ 
>+ IContainer parent = ((IResource)(selection)).getParent();
>+ 
>+ if ((parent != null) && parent.exists()) {
>+ structuredSelection = new StructuredSelection(parent);
>+ }
>+ }
>+ 
>+ return structuredSelection;
>+ }
>+
>+ /**
>+ * @see org.eclipse.hyades.ui.report.ReportGeneratorWizard#addReportPages()
>+ */
>+ protected void addReportPages() throws Exception {
>+ addPage(locationPage);
>+ }
>+
>+ /**
>+ * @see org.eclipse.jface.wizard.IWizard#canFinish()
>+ */
>+ public boolean canFinish() {
>+ return (locationPage.isPageComplete());
>+ }
>+
>+ /**
>+ * @see org.eclipse.hyades.ui.report.ReportGeneratorWizard#isAvailable(org.eclipse.jface.viewers.ISelection)
>+ */
>+ public boolean isAvailable(ISelection selection) {
>+ 	
>+ 	//Step 1: Determine if the selection contains at least one element:
>+		if ((selection == null) || (selection.isEmpty())){ 
>+			return false;
>+		}
>+		
>+		//Step 2: Determine if the selection element contains URL test suite(s) and resolve the selected URL test suite(s):
>+ selectedTestSuites = new BasicEList();
>+		Iterator selectionIterator = ((IStructuredSelection) (new StructuredSelection(selection).getFirstElement())).iterator();
>+ 
>+		while (selectionIterator.hasNext()) {
>+ 
>+ Object testSuiteProxyNode = selectionIterator.next();
>+
>+ if (testSuiteProxyNode instanceof ITestSuiteProxyNode){
>+ 	
>+ 	TPFTestSuite testSuite = ((ITestSuiteProxyNode) (testSuiteProxyNode)).getTestSuite();
>+ 	
>+ 	if(testSuite.getType().equals(TestCommon.HTTP_JUNIT_TEST_SUITE_TYPE)){
>+ 		selectedTestSuites.add(testSuite);
>+ 	}
>+ else{
>+
>+ 	selectedTestSuites = null;
>+ 			
>+ 			return false;
>+ }
>+ }
>+ else{
>+
>+ 	selectedTestSuites = null;
>+ 			
>+ 			return false;
>+ }
>+ } 
>+		
>+		//Step 3: Determine if at least one URL test suite has been selected:
>+		if(selectedTestSuites.size() == 0){
>+			
>+			selectedTestSuites = null;
>+			
>+			return false;
>+		}
>+		
>+		return true;
>+ }
>+ 
>+ protected void initResultSelection(){
>+		
>+		List results = new ArrayList();	
>+		Iterator selectedTestSuitesIterator = selectedTestSuites.iterator();
>+
>+		while(selectedTestSuitesIterator.hasNext()){		
>+			results.addAll(ExecutionUtil.findExecutionResults(((TPFTestSuite)(selectedTestSuitesIterator.next()))));		}
>+		
>+		if(results.size() > 1){
>+			 
>+			ResultsSelectionWizard wiz = new ResultsSelectionWizard(results);
>+			 
>+			new WizardDialog(Display.getDefault().getActiveShell(),wiz).open();			
>+			
>+			result = wiz.getSelectedResult();
>+		 }
>+		 else if(results.size() == 1){
>+		 	result = (TPFExecutionResult)results.get(0);
>+		 }
>+		 else{
>+			result = null;
>+		 }
>+	}
>+ 
>+ protected IFile getReportFile() {
>+ IFile file = null;
>+ IPath path = locationPage.getContainerFullPath();
>+ IResource res = createContainer(path);
>+ path = new Path(locationPage.getFileName()); //$NON-NLS-1$
>+ file = ((IContainer) res).getFile(path);
>+ return file;
>+ }
>+ 
>+ private IContainer createContainer(IPath path) {
>+ IContainer container = null;
>+ IWorkspace workbench = ResourcesPlugin.getWorkspace();
>+ int segCount = path.segmentCount();
>+
>+ for (int idx = 0; idx < segCount; idx++) {
>+ if (idx == 0) {
>+ //project
>+ IProject project = workbench.getRoot().getProject(path.uptoSegment(idx + 1).toString());
>+ if (project == null || !project.exists()) {
>+ //create the project
>+ try {
>+ project.create(null);
>+ } catch (Exception e) {
>+ UiPlugin.logError(e);
>+ e.printStackTrace();
>+ }
>+ }
>+ try {
>+ project.open(null);
>+ } catch (Exception e) {
>+ }
>+ container = project;
>+ } else // (idx > 1)
>+ { //folder
>+ IFolder folder = workbench.getRoot().getFolder(path.uptoSegment(idx + 1));
>+ if (folder == null || !folder.exists()) {
>+ //create the folder
>+ try {
>+ folder.create(false, true, null);
>+ } catch (Exception e) {
>+ UiPlugin.logError(e);
>+ e.printStackTrace();
>+ }
>+ }
>+ container = folder;
>+ }
>+ }
>+ try {
>+ container.getProject().refreshLocal(IResource.DEPTH_INFINITE, null);
>+ } catch (CoreException exc) {
>+ UiPlugin.logError(exc);
>+ exc.printStackTrace();
>+ }
>+ return container;
>+ }
>+}
>Index: src/org/eclipse/hyades/test/tools/ui/http/internal/reports/responsetime/HTTPPageResponseTimeReportGeneratorWizard.java
>===================================================================
>RCS file: src/org/eclipse/hyades/test/tools/ui/http/internal/reports/responsetime/HTTPPageResponseTimeReportGeneratorWizard.java
>diff -N src/org/eclipse/hyades/test/tools/ui/http/internal/reports/responsetime/HTTPPageResponseTimeReportGeneratorWizard.java
>--- /dev/null	1 Jan 1970 00:00:00 -0000
>+++ src/org/eclipse/hyades/test/tools/ui/http/internal/reports/responsetime/HTTPPageResponseTimeReportGeneratorWizard.java	1 Jan 1970 00:00:00 -0000
>@@ -0,0 +1,110 @@
>+/*******************************************************************************
>+ * Copyright (c) 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
>+ * http://www.eclipse.org/legal/epl-v10.html
>+ * $Id$
>+ * 
>+ * Contributors:
>+ * IBM Corporation - initial API and implementation
>+ *******************************************************************************/
>+package org.eclipse.hyades.test.tools.ui.http.internal.reports.responsetime;
>+
>+import org.eclipse.core.resources.IFile;
>+import org.eclipse.core.runtime.IPath;
>+import org.eclipse.core.runtime.IProgressMonitor;
>+import org.eclipse.hyades.test.tools.ui.http.internal.reports.AbstractHTTPPageReportGeneratorWizard;
>+import org.eclipse.hyades.test.tools.ui.http.internal.reports.ReportGraph;
>+import org.eclipse.hyades.test.tools.ui.http.internal.reports.ReportGraphConfiguration;
>+import org.eclipse.tptp.test.samples.internal.resources.SamplesPluginImageManager;
>+import org.eclipse.tptp.test.samples.internal.resources.SamplesPluginResourceBundle;
>+
>+/**
>+ * HTTPPageResponseTimeReportGeneratorWizard.java
>+ * 
>+ * 
>+ * 
>+ * @author Paul E. Slauenwhite
>+ * @version April 10, 2008
>+ * @since April 10, 2008
>+ */
>+public class HTTPPageResponseTimeReportGeneratorWizard extends AbstractHTTPPageReportGeneratorWizard {
>+
>+ /**
>+ * Constructor.
>+ */
>+ public HTTPPageResponseTimeReportGeneratorWizard() {
>+ 
>+ 	super();
>+ 
>+ 	setWindowTitle(SamplesPluginResourceBundle.HTTP_Page_Response_Time_ReportWindow_Title); 
>+ setDefaultPageImageDescriptor(SamplesPluginImageManager.getInstance().getImageDescriptor(SamplesPluginImageManager.IMG_WIZBAN_REPORT_WINDOW));
>+ }
>+ 
>+ /**
>+ * @see org.eclipse.hyades.ui.report.ReportGeneratorWizard#generate(org.eclipse.core.runtime.IProgressMonitor)
>+ */
>+ public IFile generate(IProgressMonitor monitor) throws Exception {
>+ 
>+		IFile outputFile = getReportFile();
>+ 
>+ 	try {
>+
>+ 		monitor.beginTask("", 4); //$NON-NLS-1$ 
>+
>+ 		initResultSelection();
>+
>+ 		monitor.worked(1); 
>+
>+ 		if(result == null){
>+ 			throw new Exception(SamplesPluginResourceBundle.ResponseTimeReportGenerator_PROBLEM);
>+ 		}
>+
>+ 		ResponseTimeReport report = new ResponseTimeReport(result);
>+ 		ResponseTimeData.resetCumulativeValues();
>+
>+ 		report.generate();
>+
>+ 		monitor.worked(1); 
>+
>+ 		ReportGraphConfiguration graphConfig = setupConfiguration();
>+
>+ 		IPath svgPath = outputFile.getFullPath(); 
>+ 		svgPath.removeFileExtension().addFileExtension("svg"); //$NON-NLS-1$
>+
>+ 		monitor.worked(1); 
>+
>+ 		ReportGraph graph = new ReportGraph(report.getList(),graphConfig);	 		 
>+
>+ if (outputFile.exists()) {
>+ 	outputFile.delete(true, true, null);
>+ }
>+ 
>+ outputFile.create(graph.generate(svgPath), true, null);
>+ 
>+ 		monitor.worked(1); 
>+ 	} 
>+ 	finally { 
>+ monitor.done();
>+ }
>+
>+ 	return outputFile;	
>+ }
>+ 
>+ private ReportGraphConfiguration setupConfiguration()
>+	{
>+		
>+ 	ReportGraphConfiguration graphConfig = new ReportGraphConfiguration();
>+ 	graphConfig.setTitle(SamplesPluginResourceBundle.ResponseTimeReportGenerator_RESPONSE_TIME); 
>+ 	graphConfig.setXTitle(SamplesPluginResourceBundle.ResponseTimeReportGenerator_PAGE); 
>+ 	graphConfig.setYTitle(SamplesPluginResourceBundle.ResponseTimeReportGenerator_TIME_S); 
>+ 	graphConfig.setLegendTitle(SamplesPluginResourceBundle.ResponseTimeReportGenerator_LEGEND); 
>+ 	graphConfig.setTimeStampPrefix(""); //$NON-NLS-1$
>+ 	graphConfig.setMinWidth(800);
>+ 	graphConfig.setHeight(500);
>+ 	graphConfig.setID("org.eclipse.hyades.test.ui.URLTest.ResponseTimeReport");
>+
>+ 	return graphConfig;
>+	}
>+}
>#P org.eclipse.tptp.test.report.birt
>Index: src-ui/org/eclipse/tptp/test/report/birt/ui/internal/wizard/BIRTTabularReportWizard.java
>===================================================================
>RCS file: src-ui/org/eclipse/tptp/test/report/birt/ui/internal/wizard/BIRTTabularReportWizard.java
>diff -N src-ui/org/eclipse/tptp/test/report/birt/ui/internal/wizard/BIRTTabularReportWizard.java
>--- src-ui/org/eclipse/tptp/test/report/birt/ui/internal/wizard/BIRTTabularReportWizard.java	12 Dec 2007 18:31:29 -0000	1.2
>+++ /dev/null	1 Jan 1970 00:00:00 -0000
>@@ -1,119 +0,0 @@
>-/*******************************************************************************
>- * Copyright (c) 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
>- * http://www.eclipse.org/legal/epl-v10.html
>- * $Id: BIRTTabularReportWizard.java,v 1.2 2007/12/12 18:31:29 paules Exp $
>- * 
>- * Contributors:
>- * IBM Corporation - initial API and implementation
>- *******************************************************************************/
>-package org.eclipse.tptp.test.report.birt.ui.internal.wizard;
>-
>-import java.io.File;
>-import java.net.URL;
>-
>-import org.eclipse.core.resources.IContainer;
>-import org.eclipse.core.resources.IFile;
>-import org.eclipse.core.resources.IFolder;
>-import org.eclipse.core.resources.IResource;
>-import org.eclipse.core.runtime.FileLocator;
>-import org.eclipse.core.runtime.Path;
>-import org.eclipse.jface.viewers.IStructuredSelection;
>-import org.eclipse.jface.viewers.StructuredSelection;
>-import org.eclipse.tptp.platform.report.birt.core.internal.impl.IBIRTConstants;
>-import org.eclipse.tptp.platform.report.birt.core.provisional.IReportElement;
>-import org.eclipse.tptp.platform.report.birt.ui.internal.Messages;
>-import org.eclipse.tptp.test.report.birt.BirtPlugin;
>-import org.eclipse.tptp.test.report.birt.internal.elements.TabularTPFTestSuiteReportElement;
>-import org.eclipse.tptp.test.report.birt.internal.elements.util.SerializerConstants;
>-import org.eclipse.tptp.test.report.birt.internal.elements.util.TestContextObject;
>-import org.eclipse.tptp.test.report.birt.ui.internal.TypeTable;
>-import org.eclipse.ui.dialogs.WizardNewFolderMainPage;
>-
>-/**
>- * BIRT tabular report wizard.
>- * 
>- * 
>- * 
>- * @author Sheldon Lee-Loy
>- * @author Paul E. Slauenwhite
>- * @version December 12, 2007
>- * @since December 6, 2007
>- */
>-public class BIRTTabularReportWizard extends BIRTTestReport {
>-
>-	protected TabularTPFTestSuiteReportElement reportElement;
>-	
>-	protected ReportWindowWizardPage reportWindowInputWizardPage;
>- protected WizardNewFolderMainPage locationPage;
>- protected IFolder path;
>- 	
>-	public BIRTTabularReportWizard() {
>-		super();
>-	}		
>-
>-	protected URL getReportTemplateUrl(String filename) {
>-		return FileLocator.find(BirtPlugin.getDefault().getBundle(),new Path(filename), null); 
>-	}
>-
>-	protected IReportElement getReportElement() {		
>-		//Create report element. This report element filters the list of test results based on a time interval
>-		reportElement = new TabularTPFTestSuiteReportElement();
>-		//get the test report context object that contains information needed to generate the report
>-		TestContextObject context = (TestContextObject)reportElement.getContent();		
>-		
>-		context.setStartTime(reportWindowInputWizardPage.getStartTime());
>-		context.setEndTime(reportWindowInputWizardPage.getEndTime());
>-		context.setOnlyConsiderMostRecent(true);		
>-		context.setProperty(SerializerConstants.TYPE_MAPPING, new TypeTable()); 	
>-		context.setProperty(IBIRTConstants.CONTEXT_TEMPLATE_FILE, getReportTemplateUrl("templates"+File.separator+"TabularReport.rptdesign")); //$NON-NLS-1$ //$NON-NLS-2$	
>-		context.setProperty(IBIRTConstants.CONTEXT_CHILD_TEMPLATEFILE, getReportTemplateUrl("templates"+File.separator+"TabularSubReport.rptdesign")); //$NON-NLS-1$ //$NON-NLS-2$
>-		context.setProperty(IBIRTConstants.CONTEXT_OUT_FOLDER, path.getLocation().toPortableString());
>-		context.setProperty(IBIRTConstants.CONTEXT_OUT_FILE, "index.html"); //$NON-NLS-1$
>-		context.setProperty(IBIRTConstants.CONTEXT_IMG_DIR, "images");//$NON-NLS-1$ //$NON-NLS-2$
>-		context.setProperty(IBIRTConstants.CONTEXT_RESOURCE_LOCATOR, getResourceLocator());		
>-		
>-		//pass the set of testexecution results to the report element
>-		reportElement.setContent(selectedTestSuites);
>-		
>-		return reportElement;
>-	}
>-	
>-	protected IFile getReportFile() {
>-		return path.getFile(reportElement.getRootFile());
>-	}
>-
>-	protected void addReportPages() throws Exception {
>- addPage(locationPage);
>- addPage(reportWindowInputWizardPage);
>-	}	
>-	
>-	protected void initPages() {
>- reportWindowInputWizardPage = new ReportWindowWizardPage();		
>- locationPage = new WizardNewFolderMainPage("location", adjustLocation()); //$NON-NLS-1$
>- locationPage.setTitle(Messages._0);
>- locationPage.setDescription(Messages._1);
>-	}
>-
>- protected IStructuredSelection adjustLocation() {
>- IStructuredSelection structuredSelection = getSelection();
>- Object selection = structuredSelection.getFirstElement();
>- if (selection instanceof IResource) {
>- IResource res = (IResource) selection;
>- IContainer parent = res.getParent();
>- if ((parent != null) && parent.exists()) {
>- structuredSelection = new StructuredSelection(parent);
>- }
>- }
>- return structuredSelection;
>- }
>-
>-
>-	public boolean performFinish(){
>-		//need to create folder before generating report
>-		path = locationPage.createNewFolder();
>-		return super.performFinish();
>-	}
>-}
>Index: src-ui/org/eclipse/tptp/test/report/birt/ui/internal/wizard/ReportXMLLogWizard.java
>===================================================================
>RCS file: /cvsroot/tptp/test/org.eclipse.tptp.test.report.birt/src-ui/org/eclipse/tptp/test/report/birt/ui/internal/wizard/ReportXMLLogWizard.java,v
>retrieving revision 1.2
>diff -u -r1.2 ReportXMLLogWizard.java
>--- src-ui/org/eclipse/tptp/test/report/birt/ui/internal/wizard/ReportXMLLogWizard.java	14 Mar 2008 19:16:25 -0000	1.2
>+++ src-ui/org/eclipse/tptp/test/report/birt/ui/internal/wizard/ReportXMLLogWizard.java	10 Apr 2008 14:51:52 -0000
>@@ -34,17 +34,10 @@
> import org.eclipse.jface.viewers.ISelection;
> import org.eclipse.jface.viewers.IStructuredSelection;
> import org.eclipse.jface.viewers.StructuredSelection;
>-import org.eclipse.tptp.platform.report.birt.ui.internal.LocationPage;
>+import org.eclipse.tptp.platform.common.ui.wizard.LocationPage;
> import org.eclipse.tptp.test.report.birt.BirtPlugin;
> import org.eclipse.tptp.test.report.birt.ui.internal.resources.BIRTReportImageManager;
> import org.eclipse.tptp.test.report.birt.ui.internal.resources.Messages;
>-import org.eclipse.ui.IEditorDescriptor;
>-import org.eclipse.ui.IEditorPart;
>-import org.eclipse.ui.IWorkbench;
>-import org.eclipse.ui.IWorkbenchPage;
>-import org.eclipse.ui.PlatformUI;
>-import org.eclipse.ui.ide.IDE;
>-import org.eclipse.ui.part.FileEditorInput;
> 
> /**
> * BIRT test report.
>@@ -53,7 +46,7 @@
> * 
> * @author Sheldon Lee-Loy
> * @author Paul E. Slauenwhite
>- * @version March 14, 2008
>+ * @version April 10, 2008
> * @since December 6, 2007
> */
> public class ReportXMLLogWizard extends ReportGeneratorWizard {
>@@ -139,9 +132,11 @@
> FileOutputStream outputStream = null;
> 
> try {
>- monitor.beginTask("", 4); //$NON-NLS-1$ 
>+ monitor.beginTask("", 2); //$NON-NLS-1$ 
> 
> IFile reportFile = getReportFile();
>+
>+ monitor.worked(1);
> 
> //- Writes the .xml file: 
> File f = new File(reportFile.getLocation().toOSString());
>@@ -158,34 +153,7 @@
> 		} catch (RuntimeException e) {
> 			BirtPlugin.logError(e);
> 		} 		
>- reportFile.getProject().refreshLocal(IResource.DEPTH_INFINITE, null);
>-
>- monitor.worked(1);
> 
>- 
>- // opens the document in a view
>-			boolean editorOpened = false;
>-				
>-			try
>-			{
>-				editorOpened = (openEditor((IFile)reportFile, "org.eclipse.ui.DefaultTextEditor", false) != null); //$NON-NLS-1$
>-			}
>-			catch(Throwable t)
>-			{
>-				BirtPlugin.logError(t);
>-			}				
>-			if(!editorOpened)
>-			{
>-				try
>-				{
>-					openEditor((IFile)reportFile, null, false);
>-				}
>-				catch(Throwable t)
>-				{
>-					BirtPlugin.logError(t);
>-				}
>-			}
>- 	
> monitor.worked(1);
> 
> return reportFile;
>@@ -196,11 +164,16 @@
> }
> monitor.done();
> } catch (Throwable e) {
>- throw new Exception("Exception caught during the report generation: unable to close the output stream"); //$NON-NLS-1$
>+ throw new Exception(Messages.OUTPUT_STREAM_ERROR_);
> }
> }
> }
> 	
>+	
>+	public String getEditorId(){
>+ 	return "org.eclipse.ui.DefaultTextEditor"; //$NON-NLS-1$
>+ }
>+	
> 	public boolean isAvailable(ISelection selection) {
> 
> 		//Step 1: Determine if the selection contains at least one element:
>@@ -241,8 +214,8 @@
> 	protected void initPages() {
> reportWindowInputWizardPage = new ReportWindowWizardPage();		
> locationPage = new LocationPage("location", adjustLocation()); //$NON-NLS-1$
>- locationPage.setTitle("Report"); //$NON-NLS-1$
>- locationPage.setDescription("Define the name and location of the Report."); //$NON-NLS-1$
>+ locationPage.setTitle(Messages._0);
>+ locationPage.setDescription(Messages._1);
> locationPage.setFileExtension(FILE_EXTENSION);
> 	}
> 	
>@@ -258,84 +231,4 @@
> }
> return structuredSelection;
> }
>-	
>-	/**
>-	 * Opens the editor for the specified file.
>-	 * 
>-	 * If <code>editorId</code> is null the default editor is opened. 
>-	 * If substring is true then the <code>editorId</code> value is considered to be 
>-	 * first part of the editor id.
>-	 * 
>-	 * @param file;
>-	 * @param editorId;
>-	 * @param substring;
>-	 * @return The opened editor part or <code>null</code> if this method was not
>-	 * able to open the editor.
>-	 */
>-	public static IEditorPart openEditor(IFile file, String editorId, boolean substring)
>-	{
>-		if(file == null)
>-			return null;
>-			
>-		IWorkbenchPage activePage = getActiveWorkbenchPage();
>-		if(activePage == null)
>-			return null;
>-		
>-		if("".equals(editorId)) //$NON-NLS-1$
>-			editorId = null;
>-		
>-		try
>-		{
>-			if(editorId == null)
>-			{
>-				return IDE.openEditor(activePage, file, true);
>-			}
>-			else
>-			{
>-				IWorkbench workbench = PlatformUI.getWorkbench();
>-				IEditorDescriptor[] editors = workbench.getEditorRegistry().getEditors(file.getName());
>-				if(editors != null)
>-				{
>-					boolean found = false;
>-					for(int i=0, length=editors.length; i<length; i++)
>-					{
>-						if(substring)
>-							found = editors[i].getId().startsWith(editorId);
>-						else
>-							found = editorId.equals(editors[i].getId());
>-							
>-						if(found)
>-							return IDE.openEditor(activePage, new FileEditorInput(file), editors[i].getId());
>-					}
>-				}				
>-			}
>-		}
>-		catch(Exception e)
>-		{
>-			BirtPlugin.logError(e);
>-		}
>-	
>-		return null;
>-	}
>-	
>-	/**
>-	 * Returns an active workbench page.
>-	 * @return IWorkbenchPage
>-	 */
>-	public static IWorkbenchPage getActiveWorkbenchPage()
>-	{
>-		IWorkbench workbench = PlatformUI.getWorkbench();
>-		IWorkbenchPage activePage = null;
>-		if(workbench.getActiveWorkbenchWindow() != null)
>-		{
>-			activePage = workbench.getActiveWorkbenchWindow().getActivePage();
>-		}
>-		else if(workbench.getWorkbenchWindows().length > 0)
>-		{
>-			activePage = workbench.getWorkbenchWindows()[0].getActivePage();
>-		}
>-		
>-		return activePage;
>-	} 
>-
> }
>Index: src-ui/org/eclipse/tptp/test/report/birt/ui/internal/wizard/GenericTestReportWizard.java
>===================================================================
>RCS file: /cvsroot/tptp/test/org.eclipse.tptp.test.report.birt/src-ui/org/eclipse/tptp/test/report/birt/ui/internal/wizard/GenericTestReportWizard.java,v
>retrieving revision 1.3
>diff -u -r1.3 GenericTestReportWizard.java
>--- src-ui/org/eclipse/tptp/test/report/birt/ui/internal/wizard/GenericTestReportWizard.java	14 Mar 2008 19:16:25 -0000	1.3
>+++ src-ui/org/eclipse/tptp/test/report/birt/ui/internal/wizard/GenericTestReportWizard.java	10 Apr 2008 14:51:52 -0000
>@@ -17,16 +17,21 @@
> import org.eclipse.core.resources.IContainer;
> import org.eclipse.core.resources.IFile;
> import org.eclipse.core.resources.IFolder;
>+import org.eclipse.core.resources.IProject;
> import org.eclipse.core.resources.IResource;
>+import org.eclipse.core.resources.IWorkspace;
>+import org.eclipse.core.resources.ResourcesPlugin;
>+import org.eclipse.core.runtime.CoreException;
> import org.eclipse.core.runtime.FileLocator;
>+import org.eclipse.core.runtime.IPath;
> import org.eclipse.core.runtime.Path;
> import org.eclipse.jface.viewers.IStructuredSelection;
> import org.eclipse.jface.viewers.StructuredSelection;
>+import org.eclipse.tptp.platform.common.ui.wizard.LocationPage;
> import org.eclipse.tptp.platform.report.birt.core.internal.impl.IBIRTConstants;
> import org.eclipse.tptp.platform.report.birt.core.internal.impl.ReportElementExtensionRegistryReader;
> import org.eclipse.tptp.platform.report.birt.core.internal.impl.ReportElementImpl;
> import org.eclipse.tptp.platform.report.birt.core.provisional.IReportElement;
>-import org.eclipse.tptp.platform.report.birt.ui.internal.Messages;
> import org.eclipse.tptp.test.report.birt.BirtPlugin;
> import org.eclipse.tptp.test.report.birt.internal.elements.TabularTPFTestSuiteReportElement;
> import org.eclipse.tptp.test.report.birt.internal.elements.TestPassTPFTestSuiteReportElement;
>@@ -34,7 +39,7 @@
> import org.eclipse.tptp.test.report.birt.internal.elements.util.TestContextObject;
> import org.eclipse.tptp.test.report.birt.ui.internal.TypeTable;
> import org.eclipse.tptp.test.report.birt.ui.internal.resources.BIRTReportImageManager;
>-import org.eclipse.ui.dialogs.WizardNewFolderMainPage;
>+import org.eclipse.tptp.test.report.birt.ui.internal.resources.Messages;
> 
> /**
> * Generic test report wizard.
>@@ -43,7 +48,7 @@
> * 
> * @author Sheldon Lee-Loy
> * @author Paul E. Slauenwhite
>- * @version March 14, 2008
>+ * @version April 10, 2008
> * @since December 6, 2007
> */
> public class GenericTestReportWizard extends BIRTTestReport {
>@@ -51,10 +56,11 @@
> 	protected ReportElementImpl reportElement;
> 	
> 	protected ReportWindowWizardPage reportWindowInputWizardPage;
>- protected WizardNewFolderMainPage locationPage;
>- protected IFolder path;
>+ protected LocationPage locationPage;
> protected Properties reportProperties;
> 	
>+ private final static String FILE_EXTENSION = "html"; //$NON-NLS-1$
>+
> 	public GenericTestReportWizard() {
> 		
> 		super();
>@@ -77,18 +83,25 @@
> 		context.setEndTime(reportWindowInputWizardPage.getEndTime());
> 		context.setOnlyConsiderMostRecent(true);				
> 		context.setProperty(SerializerConstants.TYPE_MAPPING, new TypeTable()); 	
>-		context.setProperty(IBIRTConstants.CONTEXT_OUT_FOLDER, path.getLocation().toPortableString());
>-		context.setProperty(IBIRTConstants.CONTEXT_OUT_FILE, "index.html"); //$NON-NLS-1$
>+		context.setProperty(IBIRTConstants.CONTEXT_OUT_FOLDER, getReportFile().getParent().getLocation().toPortableString());
>+		context.setProperty(IBIRTConstants.CONTEXT_OUT_FILE, locationPage.getFileName()); //$NON-NLS-1$
> 		context.setProperty(IBIRTConstants.CONTEXT_IMG_DIR, "images");//$NON-NLS-1$ //$NON-NLS-2$
> 		
>-		//pass the set of testexecution results to the report element
>+		//pass the set of test execution results to the report element
> 		reportElement.setContent(selectedTestSuites);
> 		
> 		return reportElement;
> 	}
> 	
> 	protected IFile getReportFile() {
>-		return path.getFile(reportElement.getRootFile());
>+
>+		IFile file = null;
>+		IPath path = locationPage.getContainerFullPath();
>+		IResource res = createContainer(path);
>+		path = new Path(locationPage.getFileName()); //$NON-NLS-1$
>+		file = ((IContainer) res).getFile(path);
>+
>+		return file;
> 	}
> 
> 	protected void addReportPages() throws Exception {
>@@ -98,9 +111,11 @@
> 	
> 	protected void initPages() {
> reportWindowInputWizardPage = new ReportWindowWizardPage();		
>- locationPage = new WizardNewFolderMainPage("location", adjustLocation()); //$NON-NLS-1$
>- locationPage.setTitle(Messages._0);
>- locationPage.setDescription(Messages._1);
>+ 
>+ locationPage = new LocationPage("location", adjustLocation()); //$NON-NLS-1$
>+ locationPage.setTitle(Messages._0); 
>+ locationPage.setDescription(Messages._1); 
>+ locationPage.setFileExtension(FILE_EXTENSION);
> 
> String id = getId();
> 
>@@ -128,13 +143,6 @@
> return structuredSelection;
> }
> 
>-
>-	public boolean performFinish(){
>-		//need to create folder before generating report
>-		path = locationPage.createNewFolder();
>-		return super.performFinish();
>-	}
>-
> 	public Properties getReportProperties() {
> 		return reportProperties;
> 	}
>@@ -142,4 +150,49 @@
> 	public void setReportProperties(Properties reportProperties) {
> 		this.reportProperties = reportProperties;
> 	}
>+	
>+	private IContainer createContainer(IPath path) {
>+		IContainer container = null;
>+		IWorkspace workbench = ResourcesPlugin.getWorkspace();
>+		int segCount = path.segmentCount();
>+
>+		for (int idx = 0; idx < segCount; idx++) {
>+			if (idx == 0) {
>+				//project
>+				IProject project = workbench.getRoot().getProject(path.uptoSegment(idx + 1).toString());
>+				if (project == null || !project.exists()) {
>+					//create the project
>+					try {
>+						project.create(null);
>+					} catch (Exception e) {
>+						BirtPlugin.logError(e);
>+					}
>+				}
>+				try {
>+					project.open(null);
>+				} catch (Exception e) {
>+				}
>+				container = project;
>+			} else // (idx > 1)
>+			{ //folder
>+				IFolder folder = workbench.getRoot().getFolder(path.uptoSegment(idx + 1));
>+				if (folder == null || !folder.exists()) {
>+					//create the folder
>+					try {
>+						folder.create(false, true, null);
>+					} catch (Exception e) {
>+						BirtPlugin.logError(e);
>+					}
>+				}
>+				container = folder;
>+			}
>+		}
>+		try {
>+			container.getProject().refreshLocal(IResource.DEPTH_INFINITE, null);
>+		} catch (CoreException exc) {
>+			BirtPlugin.logError(exc);
>+			exc.printStackTrace();
>+		}
>+		return container;
>+	}
> }
>Index: src-ui/org/eclipse/tptp/test/report/birt/ui/internal/resources/messages.properties
>===================================================================
>RCS file: /cvsroot/tptp/test/org.eclipse.tptp.test.report.birt/src-ui/org/eclipse/tptp/test/report/birt/ui/internal/resources/messages.properties,v
>retrieving revision 1.2
>diff -u -r1.2 messages.properties
>--- src-ui/org/eclipse/tptp/test/report/birt/ui/internal/resources/messages.properties	14 Mar 2008 19:17:00 -0000	1.2
>+++ src-ui/org/eclipse/tptp/test/report/birt/ui/internal/resources/messages.properties	10 Apr 2008 14:51:52 -0000
>@@ -16,7 +16,8 @@
> #
> # NLS_MESSAGEFORMAT_VAR
> # NLS_ENCODING=UTF-8
>-
>+_0=Report
>+_1=Define the name and location of the report.
> _2=Report Window Wizard Page
> _3=Select a time frame
> _4=Enter the start and end date and time (
>@@ -28,3 +29,4 @@
> BIRT_TEST_REPORT_NAME = HTML Test Pass Report (BIRT)
> BIRT_TABULAR_TEST_REPORT_NAME = HTML Tabular Test Report (BIRT)
> GENERIC_TEST_REPORT_NAME = Test Report (BIRT)
>+OUTPUT_STREAM_ERROR_ = Report generation exception: Unable to close the output stream.
>Index: src-ui/org/eclipse/tptp/test/report/birt/ui/internal/resources/Messages.java
>===================================================================
>RCS file: /cvsroot/tptp/test/org.eclipse.tptp.test.report.birt/src-ui/org/eclipse/tptp/test/report/birt/ui/internal/resources/Messages.java,v
>retrieving revision 1.2
>diff -u -r1.2 Messages.java
>--- src-ui/org/eclipse/tptp/test/report/birt/ui/internal/resources/Messages.java	14 Mar 2008 19:17:00 -0000	1.2
>+++ src-ui/org/eclipse/tptp/test/report/birt/ui/internal/resources/Messages.java	10 Apr 2008 14:51:52 -0000
>@@ -19,7 +19,7 @@
> * 
> * 
> * @author Paul E. Slauenwhite
>- * @version March 14, 2008
>+ * @version April 9, 2008
> * @since December 6, 2007
> */
> public class Messages extends NLS {
>@@ -34,6 +34,9 @@
> 		NLS.initializeMessages(BUNDLE_NAME, Messages.class);
> 	}
> 
>+	public static String _0;
>+
>+	public static String _1;
> 
> 	public static String _2;
> 
>@@ -56,4 +59,6 @@
> 	public static String BIRT_TABULAR_TEST_REPORT_NAME;
> 	
> 	public static String GENERIC_TEST_REPORT_NAME;
>+	
>+	public static String OUTPUT_STREAM_ERROR_;
> }
>Index: plugin.properties
>===================================================================
>RCS file: /cvsroot/tptp/test/org.eclipse.tptp.test.report.birt/plugin.properties,v
>retrieving revision 1.7
>diff -u -r1.7 plugin.properties
>--- plugin.properties	10 Apr 2008 01:16:36 -0000	1.7
>+++ plugin.properties	10 Apr 2008 14:51:52 -0000
>@@ -1,5 +1,5 @@
> ###############################################################################
>-# Copyright (c) 2007 IBM Corporation and others.
>+# Copyright (c) 2007, 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
>@@ -34,4 +34,4 @@
> BIRT_TABULAR_TEST_REPORT_NAME = HTML Tabular Test Report (BIRT)
> BIRT_TABULAR_TEST_REPORT_DESC = Create a tabular report with only the most recent execution results for each selected test within a specified period of time.
> XML_REPORT_NAME = XML Test Report
>-XML_REPORT_DESCRIPTION = Export all test execution information in XML format
>\ No newline at end of file
>+XML_REPORT_DESCRIPTION = Create a report with all of the execution results for each selected test within a specified period of time in an XML format.
>\ No newline at end of file
>#P org.eclipse.hyades.test.ui
>Index: src-recorder/org/eclipse/tptp/test/internal/recorder/ui/wizards/NewTestFromRecordingWizard.java
>===================================================================
>RCS file: /cvsroot/tptp/test/org.eclipse.hyades.test.ui/src-recorder/org/eclipse/tptp/test/internal/recorder/ui/wizards/NewTestFromRecordingWizard.java,v
>retrieving revision 1.17
>diff -u -r1.17 NewTestFromRecordingWizard.java
>--- src-recorder/org/eclipse/tptp/test/internal/recorder/ui/wizards/NewTestFromRecordingWizard.java	13 Mar 2008 17:51:30 -0000	1.17
>+++ src-recorder/org/eclipse/tptp/test/internal/recorder/ui/wizards/NewTestFromRecordingWizard.java	10 Apr 2008 14:51:53 -0000
>@@ -44,7 +44,7 @@
> * 
> * @author Paul E. Slauenwhite
> * @author Jeffery Nevicosi
>- * @version March 13, 2008
>+ * @version April 10, 2008
> * @since September 23, 2005
> */
> public class NewTestFromRecordingWizard extends HyadesWizard implements IGenericRecorderWizard {
>@@ -231,7 +231,7 @@
> 		String scriptGenName = TestGeneratorFactory.getInstance().getGeneratorName(scriptGenID);
> 		String recordingPath = recorder.getRecordingPath();
> 		RecorderFactory.getInstance().controlMessage(recorder, IRecorderListenerFullFeedback.VIEW_MESSAGE,
>-				TestCorePluginResourceBundle.RecorderClient_Test_generation_started_with_generator___4+scriptGenName); 
>+				TestCorePluginResourceBundle.RecorderClient_Test_generation_started_with_generator___4 + " " + scriptGenName); 
> 			
> 		IFile traceFile;
> 		
>@@ -247,7 +247,7 @@
> 		if(traceFile.exists())
> 		{
> 			RecorderFactory.getInstance().controlMessage(recorder, IRecorderListenerFullFeedback.VIEW_MESSAGE,
>-				TestCorePluginResourceBundle.RecorderClient_TEST_TO_BE_GENERATED+recorder.getTestPath()); 
>+				TestCorePluginResourceBundle.RecorderClient_TEST_TO_BE_GENERATED + " " + recorder.getTestPath()); 
> 			TestgenUIWrapper wrapper = new TestgenUIWrapper(scriptGenID, traceFile, recorder.getTestPath());
> 			wrapper.addListener(RecorderControlView.getInstance());
> 			wrapper.launchGenerator();
>Index: src-recorder/org/eclipse/hyades/internal/execution/recorder/ui/wizards/RecorderWizard.java
>===================================================================
>RCS file: /cvsroot/tptp/test/org.eclipse.hyades.test.ui/src-recorder/org/eclipse/hyades/internal/execution/recorder/ui/wizards/RecorderWizard.java,v
>retrieving revision 1.11
>diff -u -r1.11 RecorderWizard.java
>--- src-recorder/org/eclipse/hyades/internal/execution/recorder/ui/wizards/RecorderWizard.java	26 Apr 2007 18:50:09 -0000	1.11
>+++ src-recorder/org/eclipse/hyades/internal/execution/recorder/ui/wizards/RecorderWizard.java	10 Apr 2008 14:51:53 -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
>@@ -34,9 +34,15 @@
> 
> /**
> * Abstract Wizard which should be extended by wizards associated with Recorders. This object automatically handles the recorders 
>- * control view and handles save calls to each individual wizard page is owns.
>- * @author Ernest Jessee
>- * @deprecated - use Generic Recorder Framework (IGenericRecorderWizard and IGenericRecorderPage)
>+ * control view and hanles save calls to each individual wizard page is owns.
>+ * 
>+ * 
>+ * 
>+ * @author Ernest Jessee
>+ * @author Paul E. Slauenwhite
>+ * @version April 10, 2008
>+ * @since February 1, 2005
>+ * @deprecated Use the Generic Recorder Framework (IGenericRecorderWizard and IGenericRecorderPage).
> */
> public abstract class RecorderWizard
> 	extends HyadesNewWizard
>@@ -138,7 +144,7 @@
> 		String scriptGenName = TestGeneratorFactory.getInstance().getGeneratorName(scriptGenID);
> 		String recordingPath = recorder.getRecordingPath();
> 		RecorderFactory.getInstance().controlMessage(recorder, IRecorderListenerFullFeedback.VIEW_MESSAGE,
>-				TestCorePluginResourceBundle.RecorderClient_Test_generation_started_with_generator___4+scriptGenName); 
>+				TestCorePluginResourceBundle.RecorderClient_Test_generation_started_with_generator___4 + " " + scriptGenName); 
> 			
> 		IFile traceFile;
> 		
>@@ -154,7 +160,7 @@
> 		if(traceFile.exists())
> 		{
> 			RecorderFactory.getInstance().controlMessage(recorder, IRecorderListenerFullFeedback.VIEW_MESSAGE,
>-				TestCorePluginResourceBundle.RecorderClient_TEST_TO_BE_GENERATED+recorder.getTestPath()); 
>+				TestCorePluginResourceBundle.RecorderClient_TEST_TO_BE_GENERATED + " " + recorder.getTestPath()); 
> 			TestgenUIWrapper wrapper = new TestgenUIWrapper(scriptGenID, traceFile, recorder.getTestPath());
> 			wrapper.addListener(RecorderControlView.getInstance());
> 			wrapper.launchGenerator();
>Index: src/org/eclipse/hyades/test/ui/internal/resources/messages.properties
>===================================================================
>RCS file: /cvsroot/tptp/test/org.eclipse.hyades.test.ui/src/org/eclipse/hyades/test/ui/internal/resources/messages.properties,v
>retrieving revision 1.24
>diff -u -r1.24 messages.properties
>--- src/org/eclipse/hyades/test/ui/internal/resources/messages.properties	20 Mar 2008 17:48:10 -0000	1.24
>+++ src/org/eclipse/hyades/test/ui/internal/resources/messages.properties	10 Apr 2008 14:51:53 -0000
>@@ -475,8 +475,8 @@
> REP_COL_FILE = Class File
> 
> #Report wizard
>-wizard_Report_Description									= Create a new Report.
>-wizard_Report_NoDataPoolDefinition_Page						= Select the Report to be created.
>+wizard_Report_Description									= Create a new report.
>+wizard_Report_NoDataPoolDefinition_Page						= Select the report to be created.
> preferences_report_TestButton_Succeed						= The {0} class was found and\nit is an instance of IReportGenerator.
> preferences_report_definations_Group = Test Report Definitions
> _ERROR_preferences_report_TestButton_Fail_Instance			= IWAT4018E The {0} class is not an instance of IReportGenerator.
>@@ -553,7 +553,7 @@
> #New Report Action
> NEW_REPORT_TITLE = New Report
> WIZ_TST_REP_PG_TTL = Report
>-WIZ_TST_REP_PG_LOC_DSC = Define the name and location of the Report.
>+WIZ_TST_REP_PG_LOC_DSC = Define the name and location of the report.
> WIZ_TST_REPP_PG_TTL = Report
> WIZ_TST_REPP_PG_LOC_DSC = Select the Report to be created.
> REPORT_TEXT = Report...
>#P org.eclipse.tptp.platform.report.birt.ui
>Index: src/org/eclipse/tptp/platform/report/birt/ui/internal/BIRTReportsWizard.java
>===================================================================
>RCS file: /cvsroot/tptp/platform/org.eclipse.tptp.platform.report.birt.ui/src/org/eclipse/tptp/platform/report/birt/ui/internal/BIRTReportsWizard.java,v
>retrieving revision 1.8
>diff -u -r1.8 BIRTReportsWizard.java
>--- src/org/eclipse/tptp/platform/report/birt/ui/internal/BIRTReportsWizard.java	28 Aug 2006 04:25:49 -0000	1.8
>+++ src/org/eclipse/tptp/platform/report/birt/ui/internal/BIRTReportsWizard.java	10 Apr 2008 14:51:54 -0000
>@@ -1,5 +1,5 @@
> /*******************************************************************************
>- * Copyright (c) 2006 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
>@@ -15,16 +15,8 @@
> import org.eclipse.core.resources.IFile;
> import org.eclipse.core.resources.IResource;
> import org.eclipse.core.runtime.IProgressMonitor;
>-import org.eclipse.hyades.ui.HyadesUIPlugin;
> import org.eclipse.hyades.ui.report.ReportGeneratorWizard;
> import org.eclipse.tptp.platform.report.birt.core.provisional.IReportElement;
>-import org.eclipse.ui.IEditorDescriptor;
>-import org.eclipse.ui.IEditorPart;
>-import org.eclipse.ui.IWorkbench;
>-import org.eclipse.ui.IWorkbenchPage;
>-import org.eclipse.ui.PlatformUI;
>-import org.eclipse.ui.ide.IDE;
>-import org.eclipse.ui.part.FileEditorInput;
> 
> public abstract class BIRTReportsWizard extends ReportGeneratorWizard {
> public final static String EDITOR_ID = "org.eclipse.ui.browser.editorSupport";//$NON-NLS-1$
>@@ -39,7 +31,7 @@
> 
> 
> /**
>- * All BIRT reports should open up the interal web browser.
>+ * All BIRT reports should open up the internal web browser.
> * @return
> */
> 	public String getEditorId() {	
>@@ -74,91 +66,8 @@
> 			try {
> 				monitor.done();
> 			} catch (Throwable e) {
>-				throw new Exception(
>-						"Exception caught during the report generation: unable to close the output stream"); //$NON-NLS-1$
>+				throw new Exception(Messages.OUTPUT_STREAM_ERROR_);
> 			}
> 		}
> 	}
>-
>-	/**
>-	 * Opens the editor for the specified file.
>-	 * 
>-	 * If <code>editorId</code> is null the default editor is opened. 
>-	 * If substring is true then the <code>editorId</code> value is considered to be 
>-	 * first part of the editor id.
>-	 * 
>-	 * @param file;
>-	 * @param editorId;
>-	 * @param substring;
>-	 * @return The opened editor part or <code>null</code> if this method was not
>-	 * able to open the editor.
>-	 */
>-	public static IEditorPart openEditor(IFile file, String editorId, boolean substring)
>-	{
>-		if(file == null)
>-			return null;
>-			
>-		IWorkbenchPage activePage = getActiveWorkbenchPage();
>-		if(activePage == null)
>-			return null;
>-		
>-		if("".equals(editorId))
>-			editorId = null;
>-		
>-		try
>-		{
>-			if(editorId == null)
>-			{
>-				return IDE.openEditor(activePage, file, true);
>-			}
>-			else
>-			{
>-				IWorkbench workbench = PlatformUI.getWorkbench();
>-				IEditorDescriptor[] editors = workbench.getEditorRegistry().getEditors(file.getName());
>-				if(editors != null)
>-				{
>-					boolean found = false;
>-					for(int i=0, length=editors.length; i<length; i++)
>-					{
>-						if(substring)
>-							found = editors[i].getId().startsWith(editorId);
>-						else
>-							found = editorId.equals(editors[i].getId());
>-							
>-						if(found)
>-							return IDE.openEditor(activePage, new FileEditorInput(file), editors[i].getId());
>-					}
>-				}				
>-			}
>-		}
>-		catch(Exception e)
>-		{
>-			HyadesUIPlugin.logError(e);
>-		}
>-	
>-		return null;
>-	}
>-	
>-	/**
>-	 * Returns an active workbench page.
>-	 * @return IWorkbenchPage
>-	 */
>-	public static IWorkbenchPage getActiveWorkbenchPage()
>-	{
>-		IWorkbench workbench = PlatformUI.getWorkbench();
>-		IWorkbenchPage activePage = null;
>-		if(workbench.getActiveWorkbenchWindow() != null)
>-		{
>-			activePage = workbench.getActiveWorkbenchWindow().getActivePage();
>-		}
>-		else if(workbench.getWorkbenchWindows().length > 0)
>-		{
>-			activePage = workbench.getWorkbenchWindows()[0].getActivePage();
>-		}
>-		
>-		return activePage;
>-	}
>-	
>-	
>- 
> }
>Index: src/org/eclipse/tptp/platform/report/birt/ui/internal/messages.properties
>===================================================================
>RCS file: /cvsroot/tptp/platform/org.eclipse.tptp.platform.report.birt.ui/src/org/eclipse/tptp/platform/report/birt/ui/internal/messages.properties,v
>retrieving revision 1.1
>diff -u -r1.1 messages.properties
>--- src/org/eclipse/tptp/platform/report/birt/ui/internal/messages.properties	7 Mar 2006 21:36:08 -0000	1.1
>+++ src/org/eclipse/tptp/platform/report/birt/ui/internal/messages.properties	10 Apr 2008 14:51:54 -0000
>@@ -1,5 +1,5 @@
> ###############################################################################
>-# Copyright (c) 2006 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
>@@ -12,10 +12,10 @@
> # NLS_MESSAGEFORMAT_VAR
> # NLS_ENCODING=UTF-8_0=Report
> _0=Report
>-_1=Define the name and location of the Report.
>+_1=Define the name and location of the report.
> _2 = &Name
>-_21 = The project is empty
>-_22 = The name is empty
>+_21 = The project is empty.
>+_22 = The name is empty.
> _23	 = The name cannot begin with a period.
> _24	 = {0} cannot begin with {1}.
> _25 = {0} cannot contain "{1}".
>@@ -27,3 +27,4 @@
> _4=BIRT Template Selection Page
> _5=Specify the location of the BIRT report template file
> _6=&BIRT template file:
>+OUTPUT_STREAM_ERROR_ = Report generation exception: Unable to close the output stream.
>\ No newline at end of file
>Index: src/org/eclipse/tptp/platform/report/birt/ui/internal/BIRTTemplateReportWizard.java
>===================================================================
>RCS file: /cvsroot/tptp/platform/org.eclipse.tptp.platform.report.birt.ui/src/org/eclipse/tptp/platform/report/birt/ui/internal/BIRTTemplateReportWizard.java,v
>retrieving revision 1.3
>diff -u -r1.3 BIRTTemplateReportWizard.java
>--- src/org/eclipse/tptp/platform/report/birt/ui/internal/BIRTTemplateReportWizard.java	24 Mar 2006 16:18:09 -0000	1.3
>+++ src/org/eclipse/tptp/platform/report/birt/ui/internal/BIRTTemplateReportWizard.java	10 Apr 2008 14:51:54 -0000
>@@ -1,5 +1,5 @@
> /*******************************************************************************
>- * Copyright (c) 2006 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
>@@ -20,6 +20,7 @@
> import org.eclipse.core.resources.IResource;
> import org.eclipse.jface.viewers.IStructuredSelection;
> import org.eclipse.jface.viewers.StructuredSelection;
>+import org.eclipse.tptp.platform.common.ui.wizard.LocationPage;
> 
> 
> 
>Index: src/org/eclipse/tptp/platform/report/birt/ui/internal/LocationPage.java
>===================================================================
>RCS file: src/org/eclipse/tptp/platform/report/birt/ui/internal/LocationPage.java
>diff -N src/org/eclipse/tptp/platform/report/birt/ui/internal/LocationPage.java
>--- src/org/eclipse/tptp/platform/report/birt/ui/internal/LocationPage.java	24 Jan 2008 02:29:47 -0000	1.2
>+++ /dev/null	1 Jan 1970 00:00:00 -0000
>@@ -1,260 +0,0 @@
>-/*******************************************************************************
>- * 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
>- * http://www.eclipse.org/legal/epl-v10.html
>- * $Id: LocationPage.java,v 1.2 2008/01/24 02:29:47 apnan Exp $
>- * 
>- * Contributors:
>- * IBM Corporation - initial API and implementation
>- *******************************************************************************/
>-package org.eclipse.tptp.platform.report.birt.ui.internal;
>-
>-import org.eclipse.core.resources.IResource;
>-import org.eclipse.core.resources.ResourcesPlugin;
>-import org.eclipse.core.runtime.IPath;
>-import org.eclipse.core.runtime.IStatus;
>-import org.eclipse.core.runtime.Status;
>-import org.eclipse.jface.viewers.IStructuredSelection;
>-import org.eclipse.osgi.util.NLS;
>-import org.eclipse.swt.widgets.Composite;
>-import org.eclipse.tptp.platform.report.birt.ui.BirtPlugin;
>-import org.eclipse.ui.dialogs.WizardNewFileCreationPage;
>-
>-/**
>- * Extension of WizardNewFileCreationPage that allows the definition of a
>- * required file extension to be used.
>- * 
>- * @author marcelop
>- * @since 0.0.1
>- */
>-public class LocationPage extends WizardNewFileCreationPage {
>- protected String fileExtension;
>- protected boolean allowOverwrite;
>-
>- /**
>- * Constructor for LocationPage
>- * @param pageName
>- * @param selection
>- */
>- public LocationPage(String pageName, IStructuredSelection selection) {
>- super(pageName, selection);
>- allowOverwrite = false;
>- }
>-
>- public void setAllowOverwrite(boolean allowOverwrite) {
>- this.allowOverwrite = allowOverwrite;
>- }
>-
>- public boolean allowOverwrite() {
>- return allowOverwrite;
>- }
>-
>- /**
>- * Sets the required file extension.
>- * @param fileExtension
>- */
>- public void setFileExtension(String fileExtension) {
>- this.fileExtension = fileExtension;
>- }
>-
>- /**
>- * Returns the required file extension.
>- * @return Sting
>- */
>- public String getFileExtension() {
>- return fileExtension;
>- }
>-
>- /**
>- * @see org.eclipse.ui.dialogs.WizardNewFileCreationPage#validatePage()
>- */
>- protected boolean validatePage() {
>- setMessage(null);
>- //- Displaying a message (information or warning) directly after having had an error does not work without that:
>- setErrorMessage(null);
>-
>- if (!allowOverwrite()) {
>- IPath path = getContainerFullPath();
>- if (path != null) {
>- String fileName = getFileName();
>- if (fileName.length() == 0 || fileName.equals("."+this.getFileExtension())) {
>- setErrorMessage(Messages._22);
>- return false;
>- } else if (fileName.startsWith(".")) { //$NON-NLS-1$
>- setErrorMessage(Messages._23); 
>- return false;
>- }
>- 
>- /*
>- * Test for any invalid characters within the file name determined
>- * by the Operating System.
>- */
>- String invalidChar = validateOSFileName(fileName);
>- if (invalidChar != null) {
>- if (Character.isDigit(invalidChar.charAt(0))) {
>- String[] errors = { Messages._27, Messages._28}; 
>- setErrorMessage(NLS.bind(Messages._24, errors)); 
>- return false;
>- } else if (invalidChar.trim().equals("-")) { //$NON-NLS-1$
>- String[] errors = { Messages._27, "-"}; 
>- setErrorMessage(NLS.bind(Messages._24, errors)); 
>- return false;
>- } else {
>- String[] errors = { Messages._27, invalidChar}; 
>- setErrorMessage(NLS.bind(Messages._25, errors)); 
>- return false;
>- }
>- }
>-
>- IResource resource = ResourcesPlugin.getWorkspace().getRoot().findMember(path.append(fileName));
>- if ((resource != null) && (resource.exists())) {
>- setErrorMessage(Messages._138); 
>- return false;
>- }
>-
>- String fileExtension = getFileExtension();
>- if(fileExtension != null) {
>-	 int lastIndexOfExtension = fileName.lastIndexOf(fileExtension);
>-	 if (lastIndexOfExtension > 0) {
>-	 String name = fileName.substring(0, lastIndexOfExtension - 1);
>-	 if (name.endsWith("." + fileExtension)) { //$NON-NLS-1$
>-	 setMessage(NLS.bind(Messages._26, fileName), IStatus.WARNING); 
>-	 return true;
>-	 }
>-	 }
>- }
>- } else {
>- setErrorMessage(Messages._21); 
>- return false; 
>- }
>- }
>-
>- if (super.validatePage()) return true;
>-
>- return false;
>- }
>-
>- /**
>- * @see org.eclipse.ui.dialogs.WizardNewFileCreationPage#createAdvancedControls(org.eclipse.swt.widgets.Composite)
>- * 
>- * @author pnedelec
>- */
>- protected void createAdvancedControls(Composite parent) {
>- return;
>- }
>-
>- /**
>- * @see org.eclipse.ui.dialogs.WizardNewFileCreationPage#getNewFileLabel()
>- * 
>- * @author pnedelec
>- */
>- protected String getNewFileLabel() {
>- return Messages._2; 
>- }
>-
>- /**
>- * @see org.eclipse.ui.dialogs.WizardNewFileCreationPage#validateLinkedResource()
>- * 
>- * @author pnedelec
>- */
>- protected IStatus validateLinkedResource() {
>- //- Because the Advanced part is missing for this page, without stubbing this method a NPE would be thrown.
>- return new Status(IStatus.OK, BirtPlugin.getID(), IStatus.OK, "", null); //$NON-NLS-1$
>- }
>-
>- /**
>- * @see org.eclipse.ui.dialogs.WizardNewFileCreationPage#getFileName()
>- * 
>- * @author pnedelec
>- */
>- public String getFileName() {
>-// 	- Bugzilla #82262
>- 	String name = super.getFileName();
>- 	// check if file extension is null. bugzilla 84626
>- 	if(fileExtension != null)
>- 		name += "." + fileExtension; //$NON-NLS-1$
>- 	return name;
>- }
>-
>- /**
>- * Returns the text displayed in the Name field.
>- * 
>- * @author pnedelec
>- */
>- public String getItemName() {
>- return super.getFileName();
>- }
>-
>-	/**
>-	 * This method validates the file name to determine if it conforms to 
>-	 * OS file name restrictions.
>-	 * 
>-	 * At this point we are testing for valid file names on Windows and Linux 
>-	 * systems only. In the future more system restrictions may need to be 
>-	 * added.
>-	 * 
>-	 * @param valueStr The file name string being passed in
>-	 * @return The invalid character or null 
>-	 */
>-	public static String validateOSFileName(String valueStr) {
>-		if (valueStr.startsWith("-")) {
>-			return new Character(valueStr.charAt(0)).toString();
>-		}
>-
>-		for (int i = 0; i < valueStr.length(); i++) {
>-			char ch = valueStr.charAt(i);
>-			switch (ch) {
>-				case '<':
>-					return new Character(ch).toString();
>-				case '>':
>-					return new Character(ch).toString();
>-				case '+':
>-					return new Character(ch).toString();
>-				case '|':
>-					return new Character(ch).toString();
>-				case '*':
>-					return new Character(ch).toString();
>-				case '{':
>-					return new Character(ch).toString();
>-				case '}':
>-					return new Character(ch).toString();
>-				case '[':
>-					return new Character(ch).toString();
>-				case ']':
>-					return new Character(ch).toString();
>-				case ':':
>-					return new Character(ch).toString();
>-				case ';':
>-					return new Character(ch).toString();
>-				case ',':
>-					return new Character(ch).toString();
>-				case '"':
>-					return new Character(ch).toString();
>-				case '\'':
>-					return new Character(ch).toString();
>-				case '/':
>-					return new Character(ch).toString();
>-				case '\\':
>-					return new Character(ch).toString();
>-				case '`':
>-					return new Character(ch).toString();
>-				case '~':
>-					return new Character(ch).toString();
>-				case '=':
>-					return new Character(ch).toString();
>-				case '!':
>-					return new Character(ch).toString();
>-				case '?':
>-					return new Character(ch).toString();
>-				case '#':
>-					return new Character(ch).toString();
>-				default:
>-					;
>-			}
>-		}
>-		return null;
>-}
>- 
>-}
>\ No newline at end of file
>Index: src/org/eclipse/tptp/platform/report/birt/ui/internal/Messages.java
>===================================================================
>RCS file: /cvsroot/tptp/platform/org.eclipse.tptp.platform.report.birt.ui/src/org/eclipse/tptp/platform/report/birt/ui/internal/Messages.java,v
>retrieving revision 1.2
>diff -u -r1.2 Messages.java
>--- src/org/eclipse/tptp/platform/report/birt/ui/internal/Messages.java	24 Jan 2008 02:29:47 -0000	1.2
>+++ src/org/eclipse/tptp/platform/report/birt/ui/internal/Messages.java	10 Apr 2008 14:51:54 -0000
>@@ -13,6 +13,15 @@
> 
> import org.eclipse.osgi.util.NLS;
> 
>+/**
>+ * Plug-in level resource bundle.
>+ * 
>+ * 
>+ * 
>+ * @author Paul E. Slauenwhite
>+ * @version April 10, 2008
>+ * @since March 7, 2006
>+ */
> public class Messages extends NLS {
> 	protected static final String BUNDLE_NAME = "org.eclipse.tptp.platform.report.birt.ui.internal.messages"; //$NON-NLS-1$
> 
>@@ -46,4 +55,6 @@
> 
> 	public static String _6;
> 	
>+	public static String OUTPUT_STREAM_ERROR_;
>+	
> }
>#P org.eclipse.tptp.platform.common.ui
>Index: src-common-internal/org/eclipse/tptp/platform/common/ui/internal/messages.properties
>===================================================================
>RCS file: /cvsroot/tptp/platform/org.eclipse.tptp.platform.common.ui/src-common-internal/org/eclipse/tptp/platform/common/ui/internal/messages.properties,v
>retrieving revision 1.13
>diff -u -r1.13 messages.properties
>--- src-common-internal/org/eclipse/tptp/platform/common/ui/internal/messages.properties	26 Feb 2008 21:59:41 -0000	1.13
>+++ src-common-internal/org/eclipse/tptp/platform/common/ui/internal/messages.properties	10 Apr 2008 14:51:56 -0000
>@@ -39,8 +39,8 @@
> _19 = Hyades Editor
> _20 = This is the editor Hyades uses to "launch" other editor.\nYou should not be seeing this.
> 
>-_21 = The project is empty
>-_22 = The name is empty
>+_21 = The project is empty.
>+_22 = The name is empty.
> _23	 = The name cannot begin with a period.
> _24	 = {0} cannot begin with {1}.
> _25 = {0} cannot contain "{1}".
>Index: src-common-internal/org/eclipse/tptp/platform/common/ui/internal/util/UIUtil.java
>===================================================================
>RCS file: /cvsroot/tptp/platform/org.eclipse.tptp.platform.common.ui/src-common-internal/org/eclipse/tptp/platform/common/ui/internal/util/UIUtil.java,v
>retrieving revision 1.4
>diff -u -r1.4 UIUtil.java
>--- src-common-internal/org/eclipse/tptp/platform/common/ui/internal/util/UIUtil.java	24 Jan 2008 02:29:14 -0000	1.4
>+++ src-common-internal/org/eclipse/tptp/platform/common/ui/internal/util/UIUtil.java	10 Apr 2008 14:51:56 -0000
>@@ -20,6 +20,7 @@
> import java.util.Set;
> 
> import org.eclipse.core.resources.IFile;
>+import org.eclipse.core.resources.IResource;
> import org.eclipse.jface.dialogs.MessageDialog;
> import org.eclipse.jface.resource.ImageDescriptor;
> import org.eclipse.jface.viewers.ISelection;
>@@ -317,6 +318,10 @@
> 		
> 		try
> 		{
>+			
>+	 	//Refresh the parent project:
>+	 	file.getProject().refreshLocal(IResource.DEPTH_INFINITE, null);
>+
> 			if(editorId == null)
> 			{
> 				return IDE.openEditor(activePage, file, true);

Actions: View

Attachments on bug 174460: 91904 | 95537