Attachment 87965 Details for Bug 154861 – Patch file

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

[patch] Patch file

tptp_patch_bugzilla154861_20080125.txt (text/plain), 1.80 KB, created by Yasuhisa Gotoh

on 2008-01-27 01:46:30 EST

(hide)

Description:

Filename:

MIME Type:

Creator: Yasuhisa Gotoh

Created: 2008-01-27 01:46:30 EST

Size: 1.80 KB

patch

obsolete

>Index: src/org/eclipse/tptp/platform/log/views/internal/views/LogLabelProvider.java
>===================================================================
>RCS file: /cvsroot/tptp/platform/org.eclipse.tptp.platform.log.views/src/org/eclipse/tptp/platform/log/views/internal/views/LogLabelProvider.java,v
>retrieving revision 1.44
>diff -u -r1.44 LogLabelProvider.java
>--- src/org/eclipse/tptp/platform/log/views/internal/views/LogLabelProvider.java	24 Jan 2008 02:27:43 -0000	1.44
>+++ src/org/eclipse/tptp/platform/log/views/internal/views/LogLabelProvider.java	27 Jan 2008 06:37:21 -0000
>@@ -20,6 +20,7 @@
> import java.util.List;
> import java.util.Map;
> import java.util.StringTokenizer;
>+import java.util.regex.Pattern;
> 
> import org.eclipse.hyades.models.cbe.CBECommonBaseEvent;
> import org.eclipse.hyades.models.cbe.CBEDefaultEvent;
>@@ -66,6 +67,8 @@
> 	protected ILogViewer viewer;
> 	protected IPropertyChangeListener listener;
> 	
>+	protected Pattern compiledPattern = Pattern.compile("[\r\n\t]");
>+
> 	public LogLabelProvider(ILogViewer viewer) {
> 		super();
> 		this.viewer = viewer;
>@@ -362,7 +365,7 @@
> 					case 3://severity
> 						return ((CBECommonBaseEvent)element).getSeverity()+"";
> 					case 4://msg
>-						return TextProcessor.process(((CBECommonBaseEvent)element).getMsg());
>+						return formatMessage(TextProcessor.process(((CBECommonBaseEvent) element).getMsg()));
> 					case 5://priority
> 						return ((CBECommonBaseEvent)element).getPriority()+"";
> 					case 6://situation type
>@@ -627,5 +630,16 @@
> 		}					
> 		
> 	}
>+
>+	// bugzilla 154861
>+	protected String formatMessage(String message) {
>+		if (message != null) {
>+			// remove line separator characters from the original message
>+			return compiledPattern.matcher(message).replaceAll(" ");
>+		}
>+
>+		return null;
>+	}
>+
> }
>

Actions: View | Diff

Attachments on bug 154861: 48469 | 48895 | 87965 | 88233