|
Lines 154-160
Link Here
|
| 154 |
public final static int REMOTE_MODE = 1; |
154 |
public final static int REMOTE_MODE = 1; |
| 155 |
public final static int LOCAL_MODE = 2; |
155 |
public final static int LOCAL_MODE = 2; |
| 156 |
|
156 |
|
| 157 |
// page settings keys |
157 |
// page settings keys |
| 158 |
private final static String SASH_WEIGHTS = "SASH_WEIGHTS"; //$NON-NLS-1$ |
158 |
private final static String SASH_WEIGHTS = "SASH_WEIGHTS"; //$NON-NLS-1$ |
| 159 |
private final static String INNER_SASH_WEIGHTS = "INNER_SASH_WEIGHTS"; //$NON-NLS-1$ |
159 |
private final static String INNER_SASH_WEIGHTS = "INNER_SASH_WEIGHTS"; //$NON-NLS-1$ |
| 160 |
private final static String SASH_WEIGHTS_SEPARATOR = ";"; //$NON-NLS-1$ |
160 |
private final static String SASH_WEIGHTS_SEPARATOR = ";"; //$NON-NLS-1$ |
|
Lines 1315-1321
Link Here
|
| 1315 |
|
1315 |
|
| 1316 |
|
1316 |
|
| 1317 |
if (!sashForm.isDisposed() && !innerSashForm.isDisposed()) { |
1317 |
if (!sashForm.isDisposed() && !innerSashForm.isDisposed()) { |
| 1318 |
saveState(); // called when switching pages |
1318 |
saveState(); // called when switching pages |
| 1319 |
if (disposeListener != null){ |
1319 |
if (disposeListener != null){ |
| 1320 |
sashForm.getParent().removeDisposeListener(disposeListener); |
1320 |
sashForm.getParent().removeDisposeListener(disposeListener); |
| 1321 |
disposeListener = null; |
1321 |
disposeListener = null; |
|
Lines 1485-1491
Link Here
|
| 1485 |
} |
1485 |
} |
| 1486 |
|
1486 |
|
| 1487 |
public IStatus run(IProgressMonitor monitor) { |
1487 |
public IStatus run(IProgressMonitor monitor) { |
| 1488 |
|
1488 |
final int cachedRefreshFlags= refreshFlags; |
|
|
1489 |
|
| 1489 |
IStatus status = Status.OK_STATUS; |
1490 |
IStatus status = Status.OK_STATUS; |
| 1490 |
|
1491 |
|
| 1491 |
if (fileHistory != null && !shutdown) { |
1492 |
if (fileHistory != null && !shutdown) { |
|
Lines 1493-1499
Link Here
|
| 1493 |
//revisions only |
1494 |
//revisions only |
| 1494 |
boolean localFetched = false; |
1495 |
boolean localFetched = false; |
| 1495 |
boolean needsUpdate = true; |
1496 |
boolean needsUpdate = true; |
| 1496 |
if (!fileHistory.isInitialized() && fileHistory.isIncludeLocal() && (refreshFlags & CVSFileHistory.REFRESH_REMOTE) > 0) { |
1497 |
if (!fileHistory.isInitialized() && fileHistory.isIncludeLocal() && (cachedRefreshFlags & CVSFileHistory.REFRESH_REMOTE) > 0) { |
| 1497 |
// If this is the first refresh, show the local history before hitting the server |
1498 |
// If this is the first refresh, show the local history before hitting the server |
| 1498 |
try { |
1499 |
try { |
| 1499 |
fileHistory.refresh(CVSFileHistory.REFRESH_LOCAL, monitor); |
1500 |
fileHistory.refresh(CVSFileHistory.REFRESH_LOCAL, monitor); |
|
Lines 1510-1516
Link Here
|
| 1510 |
} |
1511 |
} |
| 1511 |
} |
1512 |
} |
| 1512 |
try { |
1513 |
try { |
| 1513 |
fileHistory.refresh(refreshFlags , monitor); |
1514 |
fileHistory.refresh(cachedRefreshFlags , monitor); |
| 1514 |
needsUpdate = true; |
1515 |
needsUpdate = true; |
| 1515 |
} catch (TeamException ex) { |
1516 |
} catch (TeamException ex) { |
| 1516 |
if (Policy.DEBUG_HISTORY) { |
1517 |
if (Policy.DEBUG_HISTORY) { |
