Attachment #88233 for bug #154861

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

Lines 20-25 Link Here

(-)src/org/eclipse/tptp/platform/log/views/internal/views/LogLabelProvider.java (-1 / +15 lines)
20	import java.util.List;	20	import java.util.List;
21	import java.util.Map;	21	import java.util.Map;
22	import java.util.StringTokenizer;	22	import java.util.StringTokenizer;
		23	import java.util.regex.Pattern;
23		24
24	import org.eclipse.hyades.models.cbe.CBECommonBaseEvent;	25	import org.eclipse.hyades.models.cbe.CBECommonBaseEvent;
25	import org.eclipse.hyades.models.cbe.CBEDefaultEvent;	26	import org.eclipse.hyades.models.cbe.CBEDefaultEvent;
Lines 66-71 Link Here
66	protected ILogViewer viewer;	67	protected ILogViewer viewer;
67	protected IPropertyChangeListener listener;	68	protected IPropertyChangeListener listener;
68		69
		70	protected Pattern compiledPattern = Pattern.compile("[\r\n\t]");
		71
69	public LogLabelProvider(ILogViewer viewer) {	72	public LogLabelProvider(ILogViewer viewer) {
70	super();	73	super();
71	this.viewer = viewer;	74	this.viewer = viewer;
Lines 362-368 Link Here
362	case 3://severity	365	case 3://severity
363	return ((CBECommonBaseEvent)element).getSeverity()+"";	366	return ((CBECommonBaseEvent)element).getSeverity()+"";
364	case 4://msg	367	case 4://msg
365	return TextProcessor.process(((CBECommonBaseEvent)element).getMsg());	368	return formatMessage(TextProcessor.process(((CBECommonBaseEvent) element).getMsg()));
366	case 5://priority	369	case 5://priority
367	return ((CBECommonBaseEvent)element).getPriority()+"";	370	return ((CBECommonBaseEvent)element).getPriority()+"";
368	case 6://situation type	371	case 6://situation type
Lines 627-631 Link Here
627	}	630	}
628		631
629	}	632	}
		633
		634	// bugzilla 154861
		635	protected String formatMessage(String message) {
		636	if ((message != null) && (message.length() > 0)) {
		637	// remove line separator characters from the original message
		638	return compiledPattern.matcher(message).replaceAll(" ");
		639	}
		640
		641	return "";
		642	}
		643
630	}	644	}
631		645

Return to bug 154861