aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorBernard Leach2011-06-01 17:37:51 (EDT)
committerChris Aniszczyk2011-06-02 14:53:17 (EDT)
commit6f370ce86d418aad689c0b26a5bea12fc7776e6e (patch)
tree75a5b35fb784a6501b04bc917c6c4ae7e16e1296
parent707b6ee2391b124f781b767da32bec18206a4f73 (diff)
downloadegit-6f370ce86d418aad689c0b26a5bea12fc7776e6e.zip
egit-6f370ce86d418aad689c0b26a5bea12fc7776e6e.tar.gz
egit-6f370ce86d418aad689c0b26a5bea12fc7776e6e.tar.bz2
Remove erroneous StagingView form updaterefs/changes/23/3623/2
Change I44bf628f916bbf3f9f7d391156a3ee685782fdf0 moved the update to a scheduled task however it also introduced a duplicate update after IndexDiff processing. This patch removes the invalid dupe. Change-Id: Ia9ae8b72fc577dadc2971757c061ebb358fb2033 Signed-off-by: Chris Aniszczyk <caniszczyk@gmail.com>
-rw-r--r--org.eclipse.egit.ui/src/org/eclipse/egit/ui/internal/staging/StagingView.java22
1 files changed, 1 insertions, 21 deletions
diff --git a/org.eclipse.egit.ui/src/org/eclipse/egit/ui/internal/staging/StagingView.java b/org.eclipse.egit.ui/src/org/eclipse/egit/ui/internal/staging/StagingView.java
index a9b893b..2464828 100644
--- a/org.eclipse.egit.ui/src/org/eclipse/egit/ui/internal/staging/StagingView.java
+++ b/org.eclipse.egit.ui/src/org/eclipse/egit/ui/internal/staging/StagingView.java
@@ -873,10 +873,7 @@ public class StagingView extends ViewPart {
commitAction.setEnabled(repository.getRepositoryState()
.canCommit());
form.setText(StagingView.getRepositoryName(repository));
- if (repositoryChanged) {
- updateCommitMessageComponent(repositoryChanged);
- clearCommitMessageToggles();
- }
+ updateCommitMessageComponent(repositoryChanged);
updateSectionText();
}
@@ -903,7 +900,6 @@ public class StagingView extends ViewPart {
private IndexDiff doReload(final Repository repository, IProgressMonitor monitor, String jobTitle) {
currentRepository = repository;
- final boolean repositoryChanged = currentRepository == repository;
EclipseGitProgressTransformer jgitMonitor = new EclipseGitProgressTransformer(
monitor);
@@ -921,22 +917,6 @@ public class StagingView extends ViewPart {
removeListeners();
attachListeners(repository);
- form.getDisplay().asyncExec(new Runnable() {
- public void run() {
- if (form.isDisposed())
- return;
- StagingViewUpdate update = new StagingViewUpdate(repository, indexDiff, Collections.<String> emptyList());
- unstagedTableViewer.setInput(update);
- stagedTableViewer.setInput(update);
- commitAction.setEnabled(repository.getRepositoryState()
- .canCommit());
- form.setText(StagingView.getRepositoryName(repository));
- updateCommitMessageComponent(repositoryChanged);
- updateSectionText();
- }
-
- });
-
return indexDiff;
}