Attachment #79486 for bug #135633

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

View | Details | Raw Unified | Return to bug 135633
Collapse All | Expand All




import org.eclipse.pde.internal.runtime.PDERuntimePluginImages;
import org.eclipse.swt.graphics.Image;

import com.ibm.icu.text.DateFormat;
import com.ibm.icu.text.SimpleDateFormat;

public class LogViewLabelProvider
	extends LabelProvider
	implements ITableLabelProvider {

			if (entry.getPluginId() != null)
				return entry.getPluginId();
		case 2:
			return entry.getFormattedDate();
				DateFormat formatter = new SimpleDateFormat(LogEntry.F_DATE_FORMAT);
				return formatter.format(entry.getDate());
			}
		}
		return ""; //$NON-NLS-1$
	}




import org.eclipse.ui.PlatformUI;

import com.ibm.icu.text.Collator;
import com.ibm.icu.text.DateFormat;
import com.ibm.icu.text.SimpleDateFormat;

public class EventDetailsDialog extends TrayDialog {
	private LogEntry entry, parentEntry;


		resetTotalElementCount();
		
		String strDate = entry.getFormattedDate();
		dateLabel.setText(strDate);
		if (date != null) {
			DateFormat formatter = new SimpleDateFormat(LogEntry.F_DATE_FORMAT);
			strDate = formatter.format(date);
		}
		dateLabel.setText(strDate != null ? strDate : ""); //$NON-NLS-1$
		severityImageLabel.setImage(labelProvider.getColumnImage(entry, 0));
		severityLabel.setText(entry.getSeverityText());
		msgText.setText(entry.getMessage() != null ? entry.getMessage() : ""); //$NON-NLS-1$

Lines 12-20 Link Here

(-)src/org/eclipse/pde/internal/runtime/logview/LogEntry.java (-11 / +20 lines)
12		12
13	import java.io.PrintWriter;	13	import java.io.PrintWriter;
14	import java.io.StringWriter;	14	import java.io.StringWriter;
15	import com.ibm.icu.text.DateFormat;
16	import com.ibm.icu.text.SimpleDateFormat;
17
18	import java.text.ParseException;	15	import java.text.ParseException;
19	import java.util.ArrayList;	16	import java.util.ArrayList;
20	import java.util.Date;	17	import java.util.Date;
Lines 26-34 Link Here
26	import org.eclipse.pde.internal.runtime.PDERuntimeMessages;	23	import org.eclipse.pde.internal.runtime.PDERuntimeMessages;
27	import org.eclipse.ui.model.IWorkbenchAdapter;	24	import org.eclipse.ui.model.IWorkbenchAdapter;
28		25
		26	import com.ibm.icu.text.SimpleDateFormat;
		27
29	public class LogEntry extends PlatformObject implements IWorkbenchAdapter {	28	public class LogEntry extends PlatformObject implements IWorkbenchAdapter {
30		29
31	public static final String F_DATE_FORMAT = "yyyy-MM-dd HH:mm:ss.SSS"; //$NON-NLS-1$	30	public static final String F_DATE_FORMAT = "yyyy-MM-dd HH:mm:ss.SSS"; //$NON-NLS-1$
		31	private static final SimpleDateFormat F_SDF = new SimpleDateFormat(F_DATE_FORMAT);
32		32
33	private ArrayList children;	33	private ArrayList children;
34	private LogEntry parent;	34	private LogEntry parent;
Lines 36-41 Link Here
36	private int severity;	36	private int severity;
37	private int code;	37	private int code;
38	private Date fDate;	38	private Date fDate;
		39	private String fDateString;
39	private String message;	40	private String message;
40	private String stack;	41	private String stack;
41	private LogSession session;	42	private LogSession session;
Lines 78-83 Link Here
78	fDate = new Date(0); // unknown date - return epoch	79	fDate = new Date(0); // unknown date - return epoch
79	return fDate;	80	return fDate;
80	}	81	}
		82	public String getFormattedDate() {
		83	if (fDateString == null)
		84	fDateString = F_SDF.format(getDate());
		85	return fDateString;
		86	}
81	public String getSeverityText() {	87	public String getSeverityText() {
82	return getSeverityText(severity);	88	return getSeverityText(severity);
83	}	89	}
Lines 180-190 Link Here
180	dateBuffer.append(token);	186	dateBuffer.append(token);
181	}	187	}
182	}	188	}
183	DateFormat formatter = new SimpleDateFormat(F_DATE_FORMAT);
184	try {	189	try {
185	Date date = formatter.parse(dateBuffer.toString());	190	Date date = F_SDF.parse(dateBuffer.toString());
186	if (date != null)	191	if (date != null) {
187	fDate = date;	192	fDate = date;
		193	fDateString = F_SDF.format(fDate);
		194	}
188	} catch (ParseException e) {	195	} catch (ParseException e) {
189	}	196	}
190	}	197	}
Lines 232-242 Link Here
232	dateBuffer.append(token);	239	dateBuffer.append(token);
233	}	240	}
234	}	241	}
235	DateFormat formatter = new SimpleDateFormat(F_DATE_FORMAT);
236	try {	242	try {
237	Date date = formatter.parse(dateBuffer.toString());	243	Date date = F_SDF.parse(dateBuffer.toString());
238	if (date != null)	244	if (date != null) {
239	fDate = date;	245	fDate = date;
		246	fDateString = F_SDF.format(fDate);
		247	}
240	} catch (ParseException e) {	248	} catch (ParseException e) {
241	}	249	}
242	return depth;	250	return depth;
Lines 262-267 Link Here
262	severity = status.getSeverity();	270	severity = status.getSeverity();
263	code = status.getCode();	271	code = status.getCode();
264	fDate = new Date();	272	fDate = new Date();
		273	fDateString = F_SDF.format(fDate);
265	message = status.getMessage();	274	message = status.getMessage();
266	Throwable throwable = status.getException();	275	Throwable throwable = status.getException();
267	if (throwable != null) {	276	if (throwable != null) {

Return to bug 135633

Lines 49-56 Link Here

(-)src/org/eclipse/pde/internal/runtime/logview/EventDetailsDialog.java (-9 / +2 lines)
49	import org.eclipse.ui.PlatformUI;	49	import org.eclipse.ui.PlatformUI;
50		50
51	import com.ibm.icu.text.Collator;	51	import com.ibm.icu.text.Collator;
52	import com.ibm.icu.text.DateFormat;
53	import com.ibm.icu.text.SimpleDateFormat;
54		52
55	public class EventDetailsDialog extends TrayDialog {	53	public class EventDetailsDialog extends TrayDialog {
56	private LogEntry entry, parentEntry;	54	private LogEntry entry, parentEntry;
Lines 353-365 Link Here
353		351
354	resetTotalElementCount();	352	resetTotalElementCount();
355		353
356	Date date = entry.getDate();	354	String strDate = entry.getFormattedDate();
357	String strDate = null;	355	dateLabel.setText(strDate);
358	if (date != null) {
359	DateFormat formatter = new SimpleDateFormat(LogEntry.F_DATE_FORMAT);
360	strDate = formatter.format(date);
361	}
362	dateLabel.setText(strDate != null ? strDate : ""); //$NON-NLS-1$
363	severityImageLabel.setImage(labelProvider.getColumnImage(entry, 0));	356	severityImageLabel.setImage(labelProvider.getColumnImage(entry, 0));
364	severityLabel.setText(entry.getSeverityText());	357	severityLabel.setText(entry.getSeverityText());
365	msgText.setText(entry.getMessage() != null ? entry.getMessage() : ""); //$NON-NLS-1$	358	msgText.setText(entry.getMessage() != null ? entry.getMessage() : ""); //$NON-NLS-1$