Attachment 67846 Details for Bug 186639 – Patch

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

[patch] Patch

org.eclipse.hyades.trace.ui-v1.txt (text/plain), 3.68 KB, created by amehrega

on 2007-05-18 14:46:00 EDT

(hide)

Description:

Filename:

MIME Type:

Creator: amehrega

Created: 2007-05-18 14:46:00 EDT

Size: 3.68 KB

patch

obsolete

>### Eclipse Workspace Patch 1.0
>#P org.eclipse.hyades.trace.ui
>Index: src/org/eclipse/tptp/trace/ui/internal/launcher/deleg/application/PIDelegateHelper.java
>===================================================================
>RCS file: /cvsroot/tptp/platform/org.eclipse.hyades.trace.ui/src/org/eclipse/tptp/trace/ui/internal/launcher/deleg/application/PIDelegateHelper.java,v
>retrieving revision 1.13
>diff -u -r1.13 PIDelegateHelper.java
>--- src/org/eclipse/tptp/trace/ui/internal/launcher/deleg/application/PIDelegateHelper.java	4 May 2007 15:55:49 -0000	1.13
>+++ src/org/eclipse/tptp/trace/ui/internal/launcher/deleg/application/PIDelegateHelper.java	18 May 2007 18:44:39 -0000
>@@ -363,10 +363,8 @@
> 	{		
> 		private String host;
> 		private int port;
>-		private boolean complete;
>-		
>-		private static Node node;
>-		private static String version;
>+		private boolean complete;		
>+		private String version;
> 		
> 		class JVMVersionProcessor implements DataProcessor
> 		{
>@@ -473,15 +471,7 @@
> 				
> 				JVMVersionProcessor jvmProcessor = new JVMVersionProcessor();
> 				host = CommonUITraceConstants.LOCAL_HOST.equals(host) ? InetAddress.getLocalHost().getHostName() : host;
>-				
>-				/* Return cached version, if one is available */
>-				if (node != null && node.isConnected() && 
>-					node.getConnection().getPort() == port && host.equals(node.getName()) && 
>-					version != null)
>-				{					
>-					return;
>-				}
>-				node = PDCoreUtil.profileConnect(host, String.valueOf(port), false);
>+				Node node = PDCoreUtil.profileConnect(host, String.valueOf(port), false);
> 				
> 				if (node == null)
> 				{
>Index: src/org/eclipse/hyades/trace/ui/internal/core/TraceProfileUI.java
>===================================================================
>RCS file: /cvsroot/tptp/platform/org.eclipse.hyades.trace.ui/src/org/eclipse/hyades/trace/ui/internal/core/TraceProfileUI.java,v
>retrieving revision 1.19
>diff -u -r1.19 TraceProfileUI.java
>--- src/org/eclipse/hyades/trace/ui/internal/core/TraceProfileUI.java	23 Apr 2007 15:01:12 -0000	1.19
>+++ src/org/eclipse/hyades/trace/ui/internal/core/TraceProfileUI.java	18 May 2007 18:44:39 -0000
>@@ -547,8 +547,15 @@
> 			destinationTab.initializeFrom(conf);
> 	
> 		this.launchConfiguration = conf;
>-		checkBoxTreeViewer.setInput(new DataCollectorTreeInput(conf));		
>-		initialized = false;
>+				
>+		if (!(checkBoxTreeViewer.getInput() instanceof DataCollectorTreeInput) || 
>+			!((DataCollectorTreeInput)checkBoxTreeViewer.getInput()).getConfiguration().equals(conf))
>+		{
>+			
>+			checkBoxTreeViewer.setInput(new DataCollectorTreeInput(conf));
>+			initialized = false;
>+		}
>+		
> 	}
> 		
> 	
>Index: src/org/eclipse/tptp/trace/ui/internal/launcher/core/DataCollectorTreeContentProvider.java
>===================================================================
>RCS file: /cvsroot/tptp/platform/org.eclipse.hyades.trace.ui/src/org/eclipse/tptp/trace/ui/internal/launcher/core/DataCollectorTreeContentProvider.java,v
>retrieving revision 1.4
>diff -u -r1.4 DataCollectorTreeContentProvider.java
>--- src/org/eclipse/tptp/trace/ui/internal/launcher/core/DataCollectorTreeContentProvider.java	19 Apr 2007 22:10:01 -0000	1.4
>+++ src/org/eclipse/tptp/trace/ui/internal/launcher/core/DataCollectorTreeContentProvider.java	18 May 2007 18:44:39 -0000
>@@ -261,7 +261,19 @@
> 			this.configuration = configuration;
> 		}		
> 		
>-		
>+		/**
>+		 * @see java.lang.Object#equals(java.lang.Object)
>+		 */
>+		public boolean equals(Object o)
>+		{
>+			if (!(o instanceof DataCollectorTreeInput))
>+				return false;
>+			
>+			if (configuration != null)
>+				return configuration.equals(((DataCollectorTreeInput)o).configuration);
>+			
>+			return this == o;
>+		}
> 	}
> 	
>

Actions: View | Diff

Attachments on bug 186639: 67846