Skip to main content
aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMichael Valenta2006-01-24 21:50:47 +0000
committerMichael Valenta2006-01-24 21:50:47 +0000
commit41f2d19fa10728b847a767f5d4f49bd00e8cb488 (patch)
tree2758e695798aadbc9e5267f457c395451db63040
parent42eef85680873768cd0875057fcbf42f6f3c2ac2 (diff)
downloadeclipse.platform.team-41f2d19fa10728b847a767f5d4f49bd00e8cb488.tar.gz
eclipse.platform.team-41f2d19fa10728b847a767f5d4f49bd00e8cb488.tar.xz
eclipse.platform.team-41f2d19fa10728b847a767f5d4f49bd00e8cb488.zip
1. Fixes selection listener disposal
2. Fixes local history page show history
-rw-r--r--bundles/org.eclipse.team.ui/src/org/eclipse/team/internal/ui/history/GenericHistoryView.java4
-rw-r--r--bundles/org.eclipse.team.ui/src/org/eclipse/team/internal/ui/history/LocalHistoryPage.java5
2 files changed, 5 insertions, 4 deletions
diff --git a/bundles/org.eclipse.team.ui/src/org/eclipse/team/internal/ui/history/GenericHistoryView.java b/bundles/org.eclipse.team.ui/src/org/eclipse/team/internal/ui/history/GenericHistoryView.java
index 8ba9c7de9..8e315a81b 100644
--- a/bundles/org.eclipse.team.ui/src/org/eclipse/team/internal/ui/history/GenericHistoryView.java
+++ b/bundles/org.eclipse.team.ui/src/org/eclipse/team/internal/ui/history/GenericHistoryView.java
@@ -393,7 +393,7 @@ public class GenericHistoryView extends ViewPart implements IHistoryView {
}
return null;
}
-
+
public void itemDropped(Object object) {
IResource resource = Utils.getResource(object);
@@ -556,7 +556,7 @@ public class GenericHistoryView extends ViewPart implements IHistoryView {
getSite().getPage().removePartListener(partListener);
getSite().getPage().removePartListener(partListener2);
//Remove the selection listener
- getSite().getPage().addSelectionListener(selectionListener);
+ getSite().getPage().removeSelectionListener(selectionListener);
}
public void localItemDropped(IResource resource) {
diff --git a/bundles/org.eclipse.team.ui/src/org/eclipse/team/internal/ui/history/LocalHistoryPage.java b/bundles/org.eclipse.team.ui/src/org/eclipse/team/internal/ui/history/LocalHistoryPage.java
index 120c51b93..adf31c77f 100644
--- a/bundles/org.eclipse.team.ui/src/org/eclipse/team/internal/ui/history/LocalHistoryPage.java
+++ b/bundles/org.eclipse.team.ui/src/org/eclipse/team/internal/ui/history/LocalHistoryPage.java
@@ -50,12 +50,13 @@ public class LocalHistoryPage extends HistoryPage {
//historyTableProvider.setFile(fileHistory, newfile);
tableViewer.setInput(newfile);
+ return true;
}
- return true;
+ return false;
}
public boolean canShowHistoryFor(Object object) {
- // TODO Auto-generated method stub
+ //don't volunteer to use this page unless forced to do so
return false;
}

Back to the top