From mboxrd@z Thu Jan 1 00:00:00 1970 From: Robin Rosenberg Subject: [EGIT PATCH 6/9] Change GitHistoryPage to listen on any repository. Date: Fri, 11 Jul 2008 00:40:48 +0200 Message-ID: <1215729651-26781-7-git-send-email-robin.rosenberg@dewire.com> References: <1215729651-26781-1-git-send-email-robin.rosenberg@dewire.com> <1215729651-26781-2-git-send-email-robin.rosenberg@dewire.com> <1215729651-26781-3-git-send-email-robin.rosenberg@dewire.com> <1215729651-26781-4-git-send-email-robin.rosenberg@dewire.com> <1215729651-26781-5-git-send-email-robin.rosenberg@dewire.com> <1215729651-26781-6-git-send-email-robin.rosenberg@dewire.com> Cc: git@vger.kernel.org, Marek Zawirski , Robin Rosenberg To: "Shawn O. Pearce" X-From: git-owner@vger.kernel.org Fri Jul 11 00:47:58 2008 Return-path: Envelope-to: gcvg-git-2@gmane.org Received: from vger.kernel.org ([209.132.176.167]) by lo.gmane.org with esmtp (Exim 4.50) id 1KH4vV-0004Lo-QO for gcvg-git-2@gmane.org; Fri, 11 Jul 2008 00:47:50 +0200 Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1754293AbYGJWqM (ORCPT ); Thu, 10 Jul 2008 18:46:12 -0400 Received: (majordomo@vger.kernel.org) by vger.kernel.org id S1754322AbYGJWqL (ORCPT ); Thu, 10 Jul 2008 18:46:11 -0400 Received: from [83.140.172.130] ([83.140.172.130]:13132 "EHLO dewire.com" rhost-flags-FAIL-FAIL-OK-OK) by vger.kernel.org with ESMTP id S1754289AbYGJWqE (ORCPT ); Thu, 10 Jul 2008 18:46:04 -0400 Received: from localhost (localhost [127.0.0.1]) by dewire.com (Postfix) with ESMTP id 40F3A147B7EF; Fri, 11 Jul 2008 00:46:02 +0200 (CEST) X-Virus-Scanned: by amavisd-new at dewire.com Received: from dewire.com ([127.0.0.1]) by localhost (torino.dewire.com [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id eQ1Y86oqdLgD; Fri, 11 Jul 2008 00:46:01 +0200 (CEST) Received: from localhost.localdomain (unknown [10.9.0.3]) by dewire.com (Postfix) with ESMTP id A8BBC827593; Fri, 11 Jul 2008 00:45:58 +0200 (CEST) X-Mailer: git-send-email 1.5.6.2.220.g44701 In-Reply-To: <1215729651-26781-6-git-send-email-robin.rosenberg@dewire.com> Sender: git-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: git@vger.kernel.org Archived-At: This makes listening simpler. --- .../egit/ui/internal/history/GitHistoryPage.java | 11 ++++++----- 1 files changed, 6 insertions(+), 5 deletions(-) diff --git a/org.spearce.egit.ui/src/org/spearce/egit/ui/internal/history/GitHistoryPage.java b/org.spearce.egit.ui/src/org/spearce/egit/ui/internal/history/GitHistoryPage.java index 418f3b6..e3ff8d4 100644 --- a/org.spearce.egit.ui/src/org/spearce/egit/ui/internal/history/GitHistoryPage.java +++ b/org.spearce.egit.ui/src/org/spearce/egit/ui/internal/history/GitHistoryPage.java @@ -234,11 +234,16 @@ public class GitHistoryPage extends HistoryPage implements RepositoryListener { attachContextMenu(commentViewer.getControl()); attachContextMenu(fileViewer.getControl()); layout(); + + Repository.addAnyRepositoryChangedListener(this); } private Runnable refschangedRunnable; public void refsChanged(final RefsChangedEvent e) { + if (e.getRepository() != db) + return; + if (getControl().isDisposed()) return; @@ -480,6 +485,7 @@ public class GitHistoryPage extends HistoryPage implements RepositoryListener { } public void dispose() { + Repository.removeAnyRepositoryChangedListener(this); cancelRefreshJob(); if (popupMgr != null) { for (final IContributionItem i : popupMgr.getItems()) { @@ -539,9 +545,6 @@ public class GitHistoryPage extends HistoryPage implements RepositoryListener { revObjectSelectionProvider.setActiveRepository(null); cancelRefreshJob(); - if (db != null) - db.removeRepositoryChangedListener(this); - if (graph == null) return false; @@ -570,8 +573,6 @@ public class GitHistoryPage extends HistoryPage implements RepositoryListener { if (db == null) return false; - db.addRepositoryChangedListener(this); - final AnyObjectId headId; try { headId = db.resolve("HEAD"); -- 1.5.6.2.220.g44701