Attachment 95668 Details for Bug 201827 – Patch

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

[patch] Patch

Defect_201827_patch.txt (text/plain), 10.69 KB, created by Paul Slauenwhite

on 2008-04-11 09:18:24 EDT

(hide)

Description:

Filename:

MIME Type:

Creator: Paul Slauenwhite

Created: 2008-04-11 09:18:24 EDT

Size: 10.69 KB

patch

obsolete

>### Eclipse Workspace Patch 1.0
>#P org.eclipse.tptp.platform.common.ui
>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.5
>diff -u -r1.5 UIUtil.java
>--- src-common-internal/org/eclipse/tptp/platform/common/ui/internal/util/UIUtil.java	10 Apr 2008 14:53:43 -0000	1.5
>+++ src-common-internal/org/eclipse/tptp/platform/common/ui/internal/util/UIUtil.java	11 Apr 2008 13:18:01 -0000
>@@ -1,5 +1,5 @@
> /*******************************************************************************
>- * Copyright (c) 2005, 2008 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
>@@ -44,10 +44,14 @@
> 
> /**
>  * Contains UI utility methods.
>+ * <p/>
>  * 
>- * @author marcelop
>- * @author popescu
>- * @since 0.0.1
>+ * 
>+ * @author  Marcelo Paternostro
>+ * @author  Valentina Popescu
>+ * @author  Paul E. Slauenwhite
>+ * @version April 11, 2008
>+ * @since   August 16, 2006
>  */
> public class UIUtil
> {
>@@ -319,8 +323,8 @@
> 		try
> 		{
> 			
>-	    	//Refresh the parent project:
>-	    	file.getProject().refreshLocal(IResource.DEPTH_INFINITE, null);
>+	    	//Refresh the file:
>+	    	file.refreshLocal(IResource.DEPTH_ZERO, null);
> 
> 			if(editorId == null)
> 			{
>#P org.eclipse.tptp.test.samples
>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.7
>diff -u -r1.7 SamplesPluginResourceBundle.java
>--- src/org/eclipse/tptp/test/samples/internal/resources/SamplesPluginResourceBundle.java	10 Apr 2008 14:53:23 -0000	1.7
>+++ src/org/eclipse/tptp/test/samples/internal/resources/SamplesPluginResourceBundle.java	11 Apr 2008 13:18:01 -0000
>@@ -19,7 +19,7 @@
>  * 
>  * 
>  * @author      Paul E. Slauenwhite
>- * @version     April 10, 2008
>+ * @version     April 11, 2008
>  * @since       March 15, 2007
>  */
> public final class SamplesPluginResourceBundle extends NLS {
>@@ -113,7 +113,6 @@
> 	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.8
>diff -u -r1.8 messages.properties
>--- src/org/eclipse/tptp/test/samples/internal/resources/messages.properties	10 Apr 2008 14:53:23 -0000	1.8
>+++ src/org/eclipse/tptp/test/samples/internal/resources/messages.properties	11 Apr 2008 13:18:01 -0000
>@@ -116,6 +116,4 @@
> 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/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.21
>diff -u -r1.21 ReportWindowWizard.java
>--- src/org/eclipse/hyades/test/tools/ui/common/internal/report/ReportWindowWizard.java	10 Apr 2008 14:53:22 -0000	1.21
>+++ src/org/eclipse/hyades/test/tools/ui/common/internal/report/ReportWindowWizard.java	11 Apr 2008 13:18:01 -0000
>@@ -54,7 +54,6 @@
> import org.eclipse.tptp.platform.report.drivers.html.DHtmlWriter;
> import org.eclipse.tptp.platform.report.drivers.html.DHtmlWriterException;
> import org.eclipse.tptp.platform.report.drivers.html.DOneDocumentPolicy;
>-import org.eclipse.tptp.platform.report.drivers.internal.Item;
> import org.eclipse.tptp.platform.report.extension.internal.DExtensible;
> import org.eclipse.tptp.platform.report.tools.internal.IDIImageProvider;
> import org.eclipse.tptp.test.samples.internal.resources.SamplesPluginImageManager;
>@@ -71,7 +70,7 @@
>  * 
>  * @author  Patrick Nedelec
>  * @author  Paul E. Slauenwhite
>- * @version April 10, 2008
>+ * @version April 11, 2008
>  * @since   June 6, 2005
>  */
> public class ReportWindowWizard extends ReportGeneratorWizard {
>@@ -166,8 +165,6 @@
>      */
>     public IFile generate(IProgressMonitor monitor) throws Exception {
>        
>-    	FileOutputStream outputStream = null;
>-        
>     	try {
>            
>     		monitor.beginTask("", 4); //$NON-NLS-1$             
>@@ -198,45 +195,23 @@
>             
>             // create the main document
>             DDocument doc = new DDocument("report_document", reportFile.getName()); //$NON-NLS-1$ 
>-            for (int i=0; i< docs.length; i++)
>+            for (int i=0; i< docs.length; i++){
>                 doc.addChild(docs[i]);
>+            }
>             
>-            //DXmlDocumentWriter dxdw = new DXmlDocumentWriter();
>-
>-            //- Writes the .rxml file: 
>-            File f = new File(reportFile.getLocation().toOSString());
>-            //outputStream = new FileOutputStream(f);
>-            //dxdw.write(outputStream, docs);
>             monitor.worked(1);
> 
>             //- Writes the .html file:
>             DDocument[] documents = new DDocument[1];
>             documents[0] = doc;
>-            //TODO: because NPE
>-            generateHtml(documents, f);
>+
>+            generateHtml(documents, new File(reportFile.getLocation().toOSString()));
>+
>             monitor.worked(1);
>-            
>-            // opens the document in a view
>-//            IPreferenceStore store = UiPlugin.getDefault().getPreferenceStore();
>-//
>-//            if (store.getBoolean(TestUI.REPORT_OPEN_EDITOR))
>-//            {
>-//            
>-//                ReportView view = (ReportView)PlatformUI.getWorkbench().getActiveWorkbenchWindow().getActivePage().showView(ReportView.ID);
>-//                if(view!=null) {
>-//                    view.setDocument(doc);
>-//                    view.setFocus();}
>-//            }            
>+
>             return reportFile;
>-        } finally {
>-            try {
>-                if (outputStream != null) {
>-                    outputStream.close();
>-                }            
>-            } catch (Throwable e) {
>-                throw new Exception(SamplesPluginResourceBundle.OUTPUT_STREAM_ERROR_);
>-            }
>-            
>+        } 
>+    	finally {
>             monitor.done();
>         }
>     }
>@@ -248,14 +223,9 @@
>             super(wh, basePath, imgp);
>         }
>         
>-        public void doMethod(DLink item, DExtensible ext, Object arg) throws DHtmlWriterException {
>-            
>-            Item hitem = getWriter().getItem(item);
>-            //getWriter().updateStyleVariables(item);
>-            getWriter().doChildrenItem(item, hitem,ext,arg);
>+        public void doMethod(DLink item, DExtensible ext, Object arg) throws DHtmlWriterException {            
>+            getWriter().doChildrenItem(item, getWriter().getItem(item),ext,arg);
>         }
>-            
>-       
>     }
>     
>     /**
>#P org.eclipse.hyades.test.ui
>Index: src/org/eclipse/hyades/test/ui/internal/wizard/ReportWizard.java
>===================================================================
>RCS file: /cvsroot/tptp/test/org.eclipse.hyades.test.ui/src/org/eclipse/hyades/test/ui/internal/wizard/ReportWizard.java,v
>retrieving revision 1.18
>diff -u -r1.18 ReportWizard.java
>--- src/org/eclipse/hyades/test/ui/internal/wizard/ReportWizard.java	2 Apr 2008 17:30:33 -0000	1.18
>+++ src/org/eclipse/hyades/test/ui/internal/wizard/ReportWizard.java	11 Apr 2008 13:18:02 -0000
>@@ -18,6 +18,8 @@
> import java.util.List;
> 
> import org.eclipse.core.resources.IFile;
>+import org.eclipse.core.resources.IResource;
>+import org.eclipse.core.runtime.CoreException;
> import org.eclipse.core.runtime.IConfigurationElement;
> import org.eclipse.core.runtime.IProgressMonitor;
> import org.eclipse.core.runtime.Platform;
>@@ -41,7 +43,6 @@
> import org.eclipse.jface.wizard.IWizard;
> import org.eclipse.osgi.util.NLS;
> import org.eclipse.ui.actions.WorkspaceModifyOperation;
>-import org.eclipse.ui.wizards.newresource.BasicNewResourceWizard;
> import org.osgi.framework.Bundle;
> 
> /**
>@@ -51,7 +52,7 @@
>  * 
>  * @author  Paul E. Slauenwhite
>  * @author  Patrick Nedelec
>- * @version April 2, 2008
>+ * @version April 11, 2008
>  * @since   February 1, 2005
>  */
> public class ReportWizard extends HyadesWizard {
>@@ -151,13 +152,24 @@
>             FinishOperation op = new FinishOperation();
>             getContainer().run(false, false, op);
>             IFile reportFile = op.getReportFile();
>-            String editorId = op.getEditorId();
>             reportSelectionPage.saveWidgetValues();
>             if (reportFile == null) {
>                 return false;
>             }
>-            BasicNewResourceWizard.selectAndReveal(reportFile, getWorkbench().getActiveWorkbenchWindow());
>-            open(reportFile, editorId);
>+            
>+            //Attempt to refresh the project containing the report file:
>+            try {
>+            	reportFile.getProject().refreshLocal(IResource.DEPTH_INFINITE, null);
>+			} 
>+            catch (CoreException c) {
>+				//Ignore since the project containing the report file could not be refreshed.
>+			}
>+            
>+    		//Attempt to open the Test Perspective:
>+    		TestUIUtilities.openTestPerspective();
>+    		
>+    		//Attempt to open the editor:
>+    		TestUIUtilities.openEditor(reportFile, op.getEditorId());
>         } catch (InterruptedException e) {
>             UiPlugin.logError(e);
>             return false;
>@@ -176,15 +188,6 @@
>         return true;
>     }
> 
>-    private void open(IFile file, String editorId) {
>-
>-		//Attempt to open the Test Perspective:
>-		TestUIUtilities.openTestPerspective();
>-		
>-		//Attempt to open the editor:
>-		TestUIUtilities.openEditor(file, editorId);
>-    }
>-
>     class FinishOperation extends WorkspaceModifyOperation {
>         private IFile indexReport = null;
>         private String editorid = null;

Actions: View | Diff

Attachments on bug 201827: 95668