Attachment #101954 for bug #188278




package org.eclipse.team.internal.ccvs.ui;


import java.util.Date;
import java.util.ResourceBundle;

import org.eclipse.core.runtime.IProgressMonitor;

            return tmpBundle;
        return actionBundle = ResourceBundle.getBundle(ACTION_BUNDLE);
	}
	
	/**
	 * Print a debug message to the console. Pre-pend the message with the
	 * current date and the name of the current thread.
	 * 
	 * @param message
	 */
	public static void debug(String message) {
		StringBuffer buffer = new StringBuffer();
		buffer.append(new Date(System.currentTimeMillis()));
		buffer.append(" - ["); //$NON-NLS-1$
		buffer.append(Thread.currentThread().getName());
		buffer.append("] "); //$NON-NLS-1$
		buffer.append(message);
		System.out.println(buffer.toString());
	}
}




import org.eclipse.jface.preference.IPreferenceStore;
import org.eclipse.jface.text.*;
import org.eclipse.jface.text.revisions.Revision;
import org.eclipse.jface.text.source.ISourceViewer;
import org.eclipse.jface.text.source.SourceViewer;
import org.eclipse.jface.util.IOpenEventListener;
import org.eclipse.jface.util.OpenStrategy;
import org.eclipse.jface.viewers.*;

import org.eclipse.ui.ide.IDE;
import org.eclipse.ui.part.IPageSite;
import org.eclipse.ui.progress.IProgressConstants;
import org.eclipse.ui.texteditor.ITextEditorActionConstants;

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

public class CVSHistoryPage extends HistoryPage implements IAdaptable, IHistoryCompareAdapter {

		refreshCVSFileHistoryJob.setRefreshFlags(refreshFlags);
		IHistoryPageSite parentSite = getHistoryPageSite();
		if (Policy.DEBUG_HISTORY) {
			Policy.debug("CVSHistoryPage#refreshHistory, about to schedule RefreshCVSFileHistoryJob"); //$NON-NLS-1$
			System.out.println(time + ": CVSHistoryPage#refreshHistory, about to schedule RefreshCVSFileHistoryJob"); //$NON-NLS-1$
		}
		Utils.schedule(refreshCVSFileHistoryJob, getWorkbenchSite(parentSite));
	}

					} catch (TeamException e) {
						// Ignore and try the full refresh
						if (Policy.DEBUG_HISTORY) {
							Policy.debug("RefreshCVSFileHistory#run encountered an exception"); //$NON-NLS-1$
							System.out.println(time + ": RefreshCVSFileHistory#run encountered an exception"); //$NON-NLS-1$
							e.printStackTrace();
						}
					}

					needsUpdate = true;
				} catch (TeamException ex) {
					if (Policy.DEBUG_HISTORY) {
						Policy.debug("RefreshCVSFileHistory#run encountered an exception"); //$NON-NLS-1$
						System.out.println(time + ": RefreshCVSFileHistory#run encountered an exception"); //$NON-NLS-1$
						ex.printStackTrace();
					}
					if (!localFetched) {

						} catch (TeamException e) {
							// Ignore and allow the original exception to go through
							if (Policy.DEBUG_HISTORY) {
								Policy.debug("RefreshCVSFileHistory#run encountered an exception"); //$NON-NLS-1$
								System.out.println(time + ": RefreshCVSFileHistory#run encountered an exception"); //$NON-NLS-1$
								e.printStackTrace();
							}
						}
					}
					status = new CVSStatus(ex.getStatus().getSeverity(), ex.getStatus().getCode(), ex.getMessage(), ex);
				}
				if (needsUpdate) {
					if (Policy.DEBUG_HISTORY)
						Policy.debug("RefreshCVSFileHistory#run: about to call updateTable"); //$NON-NLS-1$
					updateTable();
				}
			}

			if (status != Status.OK_STATUS ) {

			}
			
			if (Policy.DEBUG_HISTORY) {
				Policy.debug("RefreshCVSFileHistory#run finished, status: " + status); //$NON-NLS-1$
				System.out.println(time + ": RefreshCVSFileHistory#run finished, status: " + status); //$NON-NLS-1$
			}
			
			return status;
		}

		private void updateTable() {
			if (Policy.DEBUG_HISTORY)
				Policy.debug("RefreshCVSFileHistory#updateTable: about to run async'd table update"); //$NON-NLS-1$
			if (grouping)
				revisionsFound = sortRevisions();			
			
			Utils.asyncExec(new Runnable() {
				public void run() {
					if (Policy.DEBUG_HISTORY)
						Policy.debug("Updating table"); //$NON-NLS-1$
					historyTableProvider.setLocalRevisionsDisplayed(fileHistory.isIncludeLocal());
					historyTableProvider.setFile(fileHistory, workspaceFile);
					//historyTableProvider.setWorkspaceFile(workspaceFile);

		boolean needRefresh = checkPreviousInput();
		
		if (Policy.DEBUG_HISTORY) {
			Policy.debug("CVSHistoryPage#inputSet, needRefresh = " + needRefresh); //$NON-NLS-1$
			System.out.println(time + ": CVSHistoryPage#inputSet, needRefresh = " + needRefresh); //$NON-NLS-1$
		}

		if (refreshCVSFileHistoryJob != null) {
			needRefresh = true;
			if (!needRefresh && refreshCVSFileHistoryJob.getState() != Job.NONE) {
				// let the old job finish
				if (Policy.DEBUG_HISTORY) {
					Policy.debug("CVSHistoryPage#inputSet, the old job is still running"); //$NON-NLS-1$
					System.out.println(time + ": CVSHistoryPage#inputSet, the old job is still running"); //$NON-NLS-1$
				}
				return true;
			} else {
				// cancel the old job and continue
				if (Policy.DEBUG_HISTORY) {
					Policy.debug("CVSHistoryPage#inputSet, cancel the old job"); //$NON-NLS-1$
					System.out.println(time + ": CVSHistoryPage#inputSet, cancel the old job"); //$NON-NLS-1$
				}
				refreshCVSFileHistoryJob.cancel();
			}

Return to bug 188278

Lines 11-16 Link Here

(-)src/org/eclipse/team/internal/ccvs/ui/Policy.java (+17 lines)
11	package org.eclipse.team.internal.ccvs.ui;	11	package org.eclipse.team.internal.ccvs.ui;
12		12
13		13
		14	import java.util.Date;
14	import java.util.ResourceBundle;	15	import java.util.ResourceBundle;
15		16
16	import org.eclipse.core.runtime.IProgressMonitor;	17	import org.eclipse.core.runtime.IProgressMonitor;
Lines 73-76 Link Here
73	return tmpBundle;	74	return tmpBundle;
74	return actionBundle = ResourceBundle.getBundle(ACTION_BUNDLE);	75	return actionBundle = ResourceBundle.getBundle(ACTION_BUNDLE);
75	}	76	}
		77
		78	/**
		79	* Print a debug message to the console. Pre-pend the message with the
		80	* current date and the name of the current thread.
		81	*
		82	* @param message
		83	*/
		84	public static void debug(String message) {
		85	StringBuffer buffer = new StringBuffer();
		86	buffer.append(new Date(System.currentTimeMillis()));
		87	buffer.append(" - ["); //$NON-NLS-1$
		88	buffer.append(Thread.currentThread().getName());
		89	buffer.append("] "); //$NON-NLS-1$
		90	buffer.append(message);
		91	System.out.println(buffer.toString());
		92	}
76	}	93	}

Lines 32-38 Link Here

(-)src/org/eclipse/team/internal/ccvs/ui/CVSHistoryPage.java (-22 / +21 lines)
32	import org.eclipse.jface.preference.IPreferenceStore;	32	import org.eclipse.jface.preference.IPreferenceStore;
33	import org.eclipse.jface.text.*;	33	import org.eclipse.jface.text.*;
34	import org.eclipse.jface.text.revisions.Revision;	34	import org.eclipse.jface.text.revisions.Revision;
35	import org.eclipse.jface.text.source.*;	35	import org.eclipse.jface.text.source.ISourceViewer;
		36	import org.eclipse.jface.text.source.SourceViewer;
36	import org.eclipse.jface.util.IOpenEventListener;	37	import org.eclipse.jface.util.IOpenEventListener;
37	import org.eclipse.jface.util.OpenStrategy;	38	import org.eclipse.jface.util.OpenStrategy;
38	import org.eclipse.jface.viewers.*;	39	import org.eclipse.jface.viewers.*;
Lines 75-84 Link Here
75	import org.eclipse.ui.ide.IDE;	76	import org.eclipse.ui.ide.IDE;
76	import org.eclipse.ui.part.IPageSite;	77	import org.eclipse.ui.part.IPageSite;
77	import org.eclipse.ui.progress.IProgressConstants;	78	import org.eclipse.ui.progress.IProgressConstants;
78	import org.eclipse.ui.texteditor.*;	79	import org.eclipse.ui.texteditor.ITextEditorActionConstants;
79		80
80	import com.ibm.icu.text.DateFormat;	81	import com.ibm.icu.text.DateFormat;
81	import com.ibm.icu.text.SimpleDateFormat;
82	import com.ibm.icu.util.Calendar;	82	import com.ibm.icu.util.Calendar;
83		83
84	public class CVSHistoryPage extends HistoryPage implements IAdaptable, IHistoryCompareAdapter {	84	public class CVSHistoryPage extends HistoryPage implements IAdaptable, IHistoryCompareAdapter {
Lines 1041-1048 Link Here
1041	refreshCVSFileHistoryJob.setRefreshFlags(refreshFlags);	1041	refreshCVSFileHistoryJob.setRefreshFlags(refreshFlags);
1042	IHistoryPageSite parentSite = getHistoryPageSite();	1042	IHistoryPageSite parentSite = getHistoryPageSite();
1043	if (Policy.DEBUG_HISTORY) {	1043	if (Policy.DEBUG_HISTORY) {
1044	String time = new SimpleDateFormat("m:ss.SSS").format(new Date(System.currentTimeMillis())); //$NON-NLS-1$	1044	Policy.debug("CVSHistoryPage#refreshHistory, about to schedule RefreshCVSFileHistoryJob"); //$NON-NLS-1$
1045	System.out.println(time + ": CVSHistoryPage#refreshHistory, about to schedule RefreshCVSFileHistoryJob"); //$NON-NLS-1$
1046	}	1045	}
1047	Utils.schedule(refreshCVSFileHistoryJob, getWorkbenchSite(parentSite));	1046	Utils.schedule(refreshCVSFileHistoryJob, getWorkbenchSite(parentSite));
1048	}	1047	}
Lines 1421-1428 Link Here
1421	} catch (TeamException e) {	1420	} catch (TeamException e) {
1422	// Ignore and try the full refresh	1421	// Ignore and try the full refresh
1423	if (Policy.DEBUG_HISTORY) {	1422	if (Policy.DEBUG_HISTORY) {
1424	String time = new SimpleDateFormat("m:ss.SSS").format(new Date(System.currentTimeMillis())); //$NON-NLS-1$	1423	Policy.debug("RefreshCVSFileHistory#run encountered an exception"); //$NON-NLS-1$
1425	System.out.println(time + ": RefreshCVSFileHistory#run encountered an exception"); //$NON-NLS-1$
1426	e.printStackTrace();	1424	e.printStackTrace();
1427	}	1425	}
1428	}	1426	}
Lines 1432-1439 Link Here
1432	needsUpdate = true;	1430	needsUpdate = true;
1433	} catch (TeamException ex) {	1431	} catch (TeamException ex) {
1434	if (Policy.DEBUG_HISTORY) {	1432	if (Policy.DEBUG_HISTORY) {
1435	String time = new SimpleDateFormat("m:ss.SSS").format(new Date(System.currentTimeMillis())); //$NON-NLS-1$	1433	Policy.debug("RefreshCVSFileHistory#run encountered an exception"); //$NON-NLS-1$
1436	System.out.println(time + ": RefreshCVSFileHistory#run encountered an exception"); //$NON-NLS-1$
1437	ex.printStackTrace();	1434	ex.printStackTrace();
1438	}	1435	}
1439	if (!localFetched) {	1436	if (!localFetched) {
Lines 1443-1458 Link Here
1443	} catch (TeamException e) {	1440	} catch (TeamException e) {
1444	// Ignore and allow the original exception to go through	1441	// Ignore and allow the original exception to go through
1445	if (Policy.DEBUG_HISTORY) {	1442	if (Policy.DEBUG_HISTORY) {
1446	String time = new SimpleDateFormat("m:ss.SSS").format(new Date(System.currentTimeMillis())); //$NON-NLS-1$	1443	Policy.debug("RefreshCVSFileHistory#run encountered an exception"); //$NON-NLS-1$
1447	System.out.println(time + ": RefreshCVSFileHistory#run encountered an exception"); //$NON-NLS-1$
1448	e.printStackTrace();	1444	e.printStackTrace();
1449	}	1445	}
1450	}	1446	}
1451	}	1447	}
1452	status = new CVSStatus(ex.getStatus().getSeverity(), ex.getStatus().getCode(), ex.getMessage(), ex);	1448	status = new CVSStatus(ex.getStatus().getSeverity(), ex.getStatus().getCode(), ex.getMessage(), ex);
1453	}	1449	}
1454	if (needsUpdate)	1450	if (needsUpdate) {
		1451	if (Policy.DEBUG_HISTORY)
		1452	Policy.debug("RefreshCVSFileHistory#run: about to call updateTable"); //$NON-NLS-1$
1455	updateTable();	1453	updateTable();
		1454	}
1456	}	1455	}
1457		1456
1458	if (status != Status.OK_STATUS ) {	1457	if (status != Status.OK_STATUS ) {
Lines 1461-1479 Link Here
1461	}	1460	}
1462		1461
1463	if (Policy.DEBUG_HISTORY) {	1462	if (Policy.DEBUG_HISTORY) {
1464	String time = new SimpleDateFormat("m:ss.SSS").format(new Date(System.currentTimeMillis())); //$NON-NLS-1$	1463	Policy.debug("RefreshCVSFileHistory#run finished, status: " + status); //$NON-NLS-1$
1465	System.out.println(time + ": RefreshCVSFileHistory#run finished, status: " + status); //$NON-NLS-1$
1466	}	1464	}
1467		1465
1468	return status;	1466	return status;
1469	}	1467	}
1470		1468
1471	private void updateTable() {	1469	private void updateTable() {
		1470	if (Policy.DEBUG_HISTORY)
		1471	Policy.debug("RefreshCVSFileHistory#updateTable: about to run async'd table update"); //$NON-NLS-1$
1472	if (grouping)	1472	if (grouping)
1473	revisionsFound = sortRevisions();	1473	revisionsFound = sortRevisions();
1474
1475	Utils.asyncExec(new Runnable() {	1474	Utils.asyncExec(new Runnable() {
1476	public void run() {	1475	public void run() {
		1476	if (Policy.DEBUG_HISTORY)
		1477	Policy.debug("Updating table"); //$NON-NLS-1$
1477	historyTableProvider.setLocalRevisionsDisplayed(fileHistory.isIncludeLocal());	1478	historyTableProvider.setLocalRevisionsDisplayed(fileHistory.isIncludeLocal());
1478	historyTableProvider.setFile(fileHistory, workspaceFile);	1479	historyTableProvider.setFile(fileHistory, workspaceFile);
1479	//historyTableProvider.setWorkspaceFile(workspaceFile);	1480	//historyTableProvider.setWorkspaceFile(workspaceFile);
Lines 1855-1877 Link Here
1855	boolean needRefresh = checkPreviousInput();	1856	boolean needRefresh = checkPreviousInput();
1856		1857
1857	if (Policy.DEBUG_HISTORY) {	1858	if (Policy.DEBUG_HISTORY) {
1858	String time = new SimpleDateFormat("m:ss.SSS").format(new Date(System.currentTimeMillis())); //$NON-NLS-1$	1859	Policy.debug("CVSHistoryPage#inputSet, needRefresh = " + needRefresh); //$NON-NLS-1$
1859	System.out.println(time + ": CVSHistoryPage#inputSet, needRefresh = " + needRefresh); //$NON-NLS-1$
1860	}	1860	}
1861		1861
1862	if (refreshCVSFileHistoryJob != null) {	1862	if (refreshCVSFileHistoryJob != null) {
		1863	needRefresh = true;
1863	if (!needRefresh && refreshCVSFileHistoryJob.getState() != Job.NONE) {	1864	if (!needRefresh && refreshCVSFileHistoryJob.getState() != Job.NONE) {
1864	// let the old job finish	1865	// let the old job finish
1865	if (Policy.DEBUG_HISTORY) {	1866	if (Policy.DEBUG_HISTORY) {
1866	String time = new SimpleDateFormat("m:ss.SSS").format(new Date(System.currentTimeMillis())); //$NON-NLS-1$	1867	Policy.debug("CVSHistoryPage#inputSet, the old job is still running"); //$NON-NLS-1$
1867	System.out.println(time + ": CVSHistoryPage#inputSet, the old job is still running"); //$NON-NLS-1$
1868	}	1868	}
1869	return true;	1869	return true;
1870	} else {	1870	} else {
1871	// cancel the old job and continue	1871	// cancel the old job and continue
1872	if (Policy.DEBUG_HISTORY) {	1872	if (Policy.DEBUG_HISTORY) {
1873	String time = new SimpleDateFormat("m:ss.SSS").format(new Date(System.currentTimeMillis())); //$NON-NLS-1$	1873	Policy.debug("CVSHistoryPage#inputSet, cancel the old job"); //$NON-NLS-1$
1874	System.out.println(time + ": CVSHistoryPage#inputSet, cancel the old job"); //$NON-NLS-1$
1875	}	1874	}
1876	refreshCVSFileHistoryJob.cancel();	1875	refreshCVSFileHistoryJob.cancel();
1877	}	1876	}