Attachment #197097 for bug #347957

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




import java.util.ArrayList;
import java.util.Date;

import org.eclipse.core.runtime.IStatus;
import org.eclipse.ui.IMemento;

class LogReader {

					writer = new PrintWriter(swriter, true);
					writerState = SESSION_STATE;
					updateCurrentSession(session);
					if (!currentSession.equals(session) && !memento.getString(LogView.P_SHOW_ALL_SESSIONS).equals("true")) //$NON-NLS-1$
						entries.clear();
				} else if (state == ENTRY_STATE) {
					LogEntry entry = new LogEntry();

	public synchronized static void addEntry(LogEntry current, ArrayList entries, IMemento memento, boolean useCurrentSession) {
		int severity = current.getSeverity();
		boolean doAdd = true;
		switch(severity) {
			case IStatus.INFO:
				doAdd = memento.getString(LogView.P_LOG_INFO).equals("true"); //$NON-NLS-1$
				break;
			case IStatus.WARNING:
				doAdd = memento.getString(LogView.P_LOG_WARNING).equals("true"); //$NON-NLS-1$
				break;
			case IStatus.ERROR:
				doAdd = memento.getString(LogView.P_LOG_ERROR).equals("true"); //$NON-NLS-1$
				break;
		}
		if (doAdd) {
			if (useCurrentSession)
				current.setSession(currentSession);
			entries.add(0, current);
			
			if (memento.getString(LogView.P_USE_LIMIT).equals("true") //$NON-NLS-1$
				&& entries.size() > memento.getInteger(LogView.P_LOG_LIMIT).intValue())
				entries.remove(entries.size() - 1);
		}
	}





import org.eclipse.ui.IWorkbenchPage;
import org.eclipse.ui.PartInitException;
import org.eclipse.ui.PlatformUI;
import org.eclipse.ui.XMLMemento;
import org.eclipse.ui.part.ViewPart;

public class LogView extends ViewPart implements ILogListener {


//	private Clipboard fClipboard;

	private IMemento fMemento;
	private File fInputFile;
	private String fDirectory;


	private Action createActivateViewAction() {
		Action action = new Action(PDERuntimeMessages.get().LogView_activate) { //       	
			public void run() {
				fMemento.putString(P_ACTIVATE, isChecked() ? "true" : "false"); //$NON-NLS-1$ //$NON-NLS-2$
			}
		};
		action.setChecked(fMemento.getString(P_ACTIVATE).equals("true")); //$NON-NLS-1$
		return action;
	}


	private void createColumns(Tree tree) {
		fColumn1 = new TreeColumn(tree, SWT.LEFT);
		fColumn1.setText(PDERuntimeMessages.get().LogView_column_message); 
		fColumn1.setWidth(fMemento.getInteger(P_COLUMN_1).intValue());
		fColumn1.setWidth(300);
		fColumn1.addSelectionListener(new SelectionAdapter() {
			public void widgetSelected(SelectionEvent e) {

				setComparator(MESSAGE);
				if (!isComparatorSet)
					((EventDetailsDialogAction) fPropertiesAction).setComparator(fComparator);
				fMemento.putInteger(P_ORDER_VALUE, MESSAGE_ORDER);
				fMemento.putInteger(P_ORDER_TYPE, MESSAGE);
				setColumnSorting(fColumn1, MESSAGE_ORDER);
			}
		});

		fColumn2 = new TreeColumn(tree, SWT.LEFT);
		fColumn2.setText(PDERuntimeMessages.get().LogView_column_plugin); 
		fColumn2.setWidth(fMemento.getInteger(P_COLUMN_2).intValue());
		fColumn2.setWidth(150);
		fColumn2.addSelectionListener(new SelectionAdapter() {
			public void widgetSelected(SelectionEvent e) {

				setComparator(PLUGIN);
				if (!isComparatorSet)
					((EventDetailsDialogAction) fPropertiesAction).setComparator(fComparator);
				fMemento.putInteger(P_ORDER_VALUE, PLUGIN_ORDER);
				fMemento.putInteger(P_ORDER_TYPE, PLUGIN);
				setColumnSorting(fColumn2, PLUGIN_ORDER);
			}
		});

		fColumn3 = new TreeColumn(tree, SWT.LEFT);
		fColumn3.setText(PDERuntimeMessages.get().LogView_column_date);
		fColumn3.setWidth(fMemento.getInteger(P_COLUMN_3).intValue());
		fColumn3.setWidth(150);
		fColumn3.addSelectionListener(new SelectionAdapter() {
			public void widgetSelected(SelectionEvent e) {

				fTreeViewer.setComparator(comparator);
				setComparator(DATE);
				((EventDetailsDialogAction) fPropertiesAction).setComparator(fComparator);
				fMemento.putInteger(P_ORDER_VALUE, DATE_ORDER);
				fMemento.putInteger(P_ORDER_TYPE, DATE);
				setColumnSorting(fColumn3, DATE_ORDER);
			}
		});

	}

	private void initializeViewerSorter() {
		byte orderType = fMemento.getInteger(P_ORDER_TYPE).byteValue();
	    byte orderType = DATE;
		ViewerComparator comparator = getViewerComparator(orderType);
		fTreeViewer.setComparator(comparator);
		if (orderType == MESSAGE )
			setColumnSorting(fColumn1, MESSAGE_ORDER);
		else if (orderType == PLUGIN)
			setColumnSorting(fColumn2, PLUGIN_ORDER);
		else if (orderType == DATE)
			setColumnSorting(fColumn3, DATE_ORDER);
	}


	}

	private void handleFilter() {
		FilterDialog dialog = new FilterDialog(PDERuntimePlugin.getActiveWorkbenchShell(), fMemento);
//		FilterDialog dialog = new FilterDialog(PDERuntimePlugin.getActiveWorkbenchShell(), fMemento);
		dialog.create();
		dialog.getShell().setText(PDERuntimeMessages.get().LogView_FilterDialog_title); 
		if (dialog.open() == Window.OK)

		fLogs.clear();
		if (!fInputFile.exists())
			return;
		LogReader.parseLogFile(fInputFile, fLogs, fMemento);
//		LogReader.parseLogFile(fInputFile, fLogs, fMemento);
	}

	public void logging(IStatus status, String plugin) {


	private void pushStatus(IStatus status) {
		LogEntry entry = new LogEntry(status);
		LogReader.addEntry(entry, fLogs, fMemento, true);
//		LogReader.addEntry(entry, fLogs, fMemento, true);
		asyncRefresh();
	}



	public void init(IViewSite site, IMemento memento) throws PartInitException {
		super.init(site, memento);
		if (memento == null)
			this.fMemento = XMLMemento.createWriteRoot("LOGVIEW"); //$NON-NLS-1$
		else
			this.fMemento = memento;
		readSettings();

//		 initialize column ordering 
		final byte type = this.fMemento.getInteger(P_ORDER_TYPE).byteValue();
		switch (type){
		case DATE:
			DATE_ORDER = this.fMemento.getInteger(P_ORDER_VALUE).intValue();
			MESSAGE_ORDER = DESCENDING;
			PLUGIN_ORDER = DESCENDING;
			break;
		case MESSAGE:
			MESSAGE_ORDER = this.fMemento.getInteger(P_ORDER_VALUE).intValue();
			DATE_ORDER = DESCENDING;
			PLUGIN_ORDER = DESCENDING;
			break;
		case PLUGIN:
			PLUGIN_ORDER = this.fMemento.getInteger(P_ORDER_VALUE).intValue();
			MESSAGE_ORDER = DESCENDING;
			DATE_ORDER = DESCENDING;
			break;
		default:
			DATE_ORDER = DESCENDING;
		MESSAGE_ORDER = DESCENDING;
		PLUGIN_ORDER = DESCENDING;
		}
		setComparator(fMemento.getInteger(P_ORDER_TYPE).byteValue());
		setComparator(DATE);
	}

	private void initializeMemento() {
		if (fMemento.getString(P_USE_LIMIT) == null)
			fMemento.putString(P_USE_LIMIT, "true"); //$NON-NLS-1$
		if (fMemento.getInteger(P_LOG_LIMIT) == null)
			fMemento.putInteger(P_LOG_LIMIT, 50);
		if (fMemento.getString(P_LOG_INFO) == null)
			fMemento.putString(P_LOG_INFO, "true"); //$NON-NLS-1$
		if (fMemento.getString(P_LOG_WARNING) == null)
			fMemento.putString(P_LOG_WARNING, "true"); //$NON-NLS-1$
		if (fMemento.getString(P_LOG_ERROR) == null)
			fMemento.putString(P_LOG_ERROR, "true"); //$NON-NLS-1$
		if (fMemento.getString(P_SHOW_ALL_SESSIONS) == null)
			fMemento.putString(P_SHOW_ALL_SESSIONS, "true"); //$NON-NLS-1$
		Integer width = fMemento.getInteger(P_COLUMN_1);
		if (width == null || width.intValue() == 0)
			fMemento.putInteger(P_COLUMN_1, 300);
		width = fMemento.getInteger(P_COLUMN_2);
		if (width == null || width.intValue() == 0)
			fMemento.putInteger(P_COLUMN_2, 150);
		width = fMemento.getInteger(P_COLUMN_3);
		if (width == null || width.intValue() == 0)
			fMemento.putInteger(P_COLUMN_3, 150);
		if (fMemento.getString(P_ACTIVATE) == null)
			fMemento.putString(P_ACTIVATE, "true"); //$NON-NLS-1$

		fMemento.putInteger(P_ORDER_VALUE, DESCENDING);
		fMemento.putInteger(P_ORDER_TYPE, DATE);
	}

	public void saveState(IMemento memento) {
		if (this.fMemento == null || memento == null)
			return;
		this.fMemento.putInteger(P_COLUMN_1, fColumn1.getWidth());
		this.fMemento.putInteger(P_COLUMN_2, fColumn2.getWidth());
		this.fMemento.putInteger(P_COLUMN_3, fColumn3.getWidth());
		this.fMemento.putString(P_ACTIVATE,
				fActivateViewAction.isChecked() ? "true" : "false"); //$NON-NLS-1$ //$NON-NLS-2$
		memento.putMemento(this.fMemento);
		writeSettings();
	}

	private void addMouseListeners() {

			return;
		}
		try {
			fMemento.putString(P_USE_LIMIT, s.getBoolean(P_USE_LIMIT) ? "true":"false"); //$NON-NLS-1$ //$NON-NLS-2$
			fMemento.putString(P_LOG_INFO, s.getBoolean(P_LOG_INFO) ? "true" : "false"); //$NON-NLS-1$ //$NON-NLS-2$
			fMemento.putString(P_LOG_WARNING, s.getBoolean(P_LOG_WARNING) ? "true" : "false"); //$NON-NLS-1$ //$NON-NLS-2$
			fMemento.putString(P_LOG_ERROR, s.getBoolean(P_LOG_ERROR) ? "true" : "false"); //$NON-NLS-1$ //$NON-NLS-2$
			fMemento.putString(P_SHOW_ALL_SESSIONS, s.getBoolean(P_SHOW_ALL_SESSIONS) ? "true" : "false"); //$NON-NLS-1$ //$NON-NLS-2$
			fMemento.putInteger(P_LOG_LIMIT, s.getInt(P_LOG_LIMIT));
			fMemento.putInteger(P_COLUMN_1, p.getInt(P_COLUMN_1) > 0 ? p.getInt(P_COLUMN_1) : 300);
			fMemento.putInteger(P_COLUMN_2, p.getInt(P_COLUMN_2) > 0 ? p.getInt(P_COLUMN_2) : 150);
			fMemento.putInteger(P_COLUMN_3, p.getInt(P_COLUMN_3) > 0 ? p.getInt(P_COLUMN_3) : 150);
			fMemento.putString(P_ACTIVATE, p.getBoolean(P_ACTIVATE) ? "true" : "false"); //$NON-NLS-1$ //$NON-NLS-2$
			int order = p.getInt(P_ORDER_VALUE);
			fMemento.putInteger(P_ORDER_VALUE, order == 0 ? DESCENDING : order);
			fMemento.putInteger(P_ORDER_TYPE, p.getInt(P_ORDER_TYPE));
		} catch (NumberFormatException e) {
			fMemento.putInteger(P_LOG_LIMIT, 50);
			fMemento.putInteger(P_COLUMN_1, 300);
			fMemento.putInteger(P_COLUMN_2, 150);
			fMemento.putInteger(P_COLUMN_3, 150);
			fMemento.putInteger(P_ORDER_TYPE, DATE);
			fMemento.putInteger(P_ORDER_VALUE, DESCENDING);
		}
	}


		IDialogSettings settings = getLogSettings();
		if (settings == null)
			settings = PDERuntimePlugin.getDefault().getDialogSettings().addNewSection(getClass().getName());
		settings.put(P_USE_LIMIT, fMemento.getString(P_USE_LIMIT).equals("true")); //$NON-NLS-1$
		settings.put(P_LOG_LIMIT, fMemento.getInteger(P_LOG_LIMIT).intValue());
		settings.put(P_LOG_INFO, fMemento.getString(P_LOG_INFO).equals("true")); //$NON-NLS-1$
		settings.put(P_LOG_WARNING, fMemento.getString(P_LOG_WARNING).equals("true")); //$NON-NLS-1$
		settings.put(P_LOG_ERROR, fMemento.getString(P_LOG_ERROR).equals("true")); //$NON-NLS-1$
		settings.put(P_SHOW_ALL_SESSIONS, fMemento.getString(P_SHOW_ALL_SESSIONS).equals("true")); //$NON-NLS-1$
	}

	private void writeViewSettings(){
		Preferences preferences = getLogPreferences();
		preferences.setValue(P_COLUMN_1, fMemento.getInteger(P_COLUMN_1).intValue());
		preferences.setValue(P_COLUMN_2, fMemento.getInteger(P_COLUMN_2).intValue());
		preferences.setValue(P_COLUMN_3, fMemento.getInteger(P_COLUMN_3).intValue());
		preferences.setValue(P_ACTIVATE, fMemento.getString(P_ACTIVATE).equals("true")); //$NON-NLS-1$
		int order = fMemento.getInteger(P_ORDER_VALUE).intValue();
		preferences.setValue(P_ORDER_VALUE, order == 0 ? DESCENDING : order);
		preferences.setValue(P_ORDER_TYPE, fMemento.getInteger(P_ORDER_TYPE).intValue());
	}

	public void sortByDateDescending() {

	}
	
	protected Job getOpenLogFileJob() {
		final Display display=Display.getDefault();
		final Shell shell = getViewSite().getShell();
		return new Job(PDERuntimeMessages.get().OpenLogDialog_message) {
			protected IStatus run(IProgressMonitor monitor) {
				boolean failed = true;
				if (fInputFile.length() <= LogReader.MAX_FILE_LENGTH) {
//					failed = !Program.launch(fInputFile.getAbsolutePath());
//					if (failed) {

				}
				if (failed) {
					final OpenLogDialog openDialog = new OpenLogDialog(shell, fInputFile);
					display.asyncExec(new Runnable() {
						public void run() {
							openDialog.create();
							openDialog.open();

Return to bug 347957

Lines 20-25 Link Here

(-)src/org/eclipse/pde/internal/runtime/logview/LogReader.java (-15 / +16 lines)
20	import java.util.ArrayList;	20	import java.util.ArrayList;
21	import java.util.Date;	21	import java.util.Date;
22		22
		23	import org.eclipse.core.runtime.IStatus;
23	import org.eclipse.ui.IMemento;	24	import org.eclipse.ui.IMemento;
24		25
25	class LogReader {	26	class LogReader {
Lines 102-108 Link Here
102	writer = new PrintWriter(swriter, true);	103	writer = new PrintWriter(swriter, true);
103	writerState = SESSION_STATE;	104	writerState = SESSION_STATE;
104	updateCurrentSession(session);	105	updateCurrentSession(session);
105	if (!currentSession.equals(session) /&& !memento.getString(LogView.P_SHOW_ALL_SESSIONS).equals("true")/) //$NON-NLS-1$	106	if (!currentSession.equals(session) && !memento.getString(LogView.P_SHOW_ALL_SESSIONS).equals("true")) //$NON-NLS-1$
106	entries.clear();	107	entries.clear();
107	} else if (state == ENTRY_STATE) {	108	} else if (state == ENTRY_STATE) {
108	LogEntry entry = new LogEntry();	109	LogEntry entry = new LogEntry();
Lines 167-191 Link Here
167	public synchronized static void addEntry(LogEntry current, ArrayList entries, IMemento memento, boolean useCurrentSession) {	168	public synchronized static void addEntry(LogEntry current, ArrayList entries, IMemento memento, boolean useCurrentSession) {
168	int severity = current.getSeverity();	169	int severity = current.getSeverity();
169	boolean doAdd = true;	170	boolean doAdd = true;
170	// switch(severity) {	171	switch(severity) {
171	// case IStatus.INFO:	172	case IStatus.INFO:
172	// doAdd = memento.getString(LogView.P_LOG_INFO).equals("true"); //$NON-NLS-1$	173	doAdd = memento.getString(LogView.P_LOG_INFO).equals("true"); //$NON-NLS-1$
173	// break;	174	break;
174	// case IStatus.WARNING:	175	case IStatus.WARNING:
175	// doAdd = memento.getString(LogView.P_LOG_WARNING).equals("true"); //$NON-NLS-1$	176	doAdd = memento.getString(LogView.P_LOG_WARNING).equals("true"); //$NON-NLS-1$
176	// break;	177	break;
177	// case IStatus.ERROR:	178	case IStatus.ERROR:
178	// doAdd = memento.getString(LogView.P_LOG_ERROR).equals("true"); //$NON-NLS-1$	179	doAdd = memento.getString(LogView.P_LOG_ERROR).equals("true"); //$NON-NLS-1$
179	// break;	180	break;
180	// }	181	}
181	if (doAdd) {	182	if (doAdd) {
182	if (useCurrentSession)	183	if (useCurrentSession)
183	current.setSession(currentSession);	184	current.setSession(currentSession);
184	entries.add(0, current);	185	entries.add(0, current);
185		186
186	// if (memento.getString(LogView.P_USE_LIMIT).equals("true") //$NON-NLS-1$	187	if (memento.getString(LogView.P_USE_LIMIT).equals("true") //$NON-NLS-1$
187	// && entries.size() > memento.getInteger(LogView.P_LOG_LIMIT).intValue())	188	&& entries.size() > memento.getInteger(LogView.P_LOG_LIMIT).intValue())
188	// entries.remove(entries.size() - 1);	189	entries.remove(entries.size() - 1);
189	}	190	}
190	}	191	}
191		192