diff options
3 files changed, 10 insertions, 15 deletions
diff --git a/bundles/org.eclipse.team.ui/src/org/eclipse/team/internal/ui/sync/views/SyncSetContentProvider.java b/bundles/org.eclipse.team.ui/src/org/eclipse/team/internal/ui/sync/views/SyncSetContentProvider.java index d1566449d..ddea777a8 100644 --- a/bundles/org.eclipse.team.ui/src/org/eclipse/team/internal/ui/sync/views/SyncSetContentProvider.java +++ b/bundles/org.eclipse.team.ui/src/org/eclipse/team/internal/ui/sync/views/SyncSetContentProvider.java @@ -32,10 +32,7 @@ public abstract class SyncSetContentProvider implements IStructuredContentProvid protected Viewer viewer; protected SyncSet getSyncSet() { - if(viewer == null || viewer.getControl().isDisposed()) { - return null; - } - Object input = viewer.getInput(); + SubscriberInput input = getSubscriberInput(); if (input == null) { return null; } @@ -83,9 +80,9 @@ public abstract class SyncSetContentProvider implements IStructuredContentProvid * @see org.eclipse.jface.viewers.IContentProvider#dispose() */ public void dispose() { - SyncSet syncSet = getSyncSet(); - if (syncSet != null) { - syncSet.removeSyncSetChangedListener(this); + SubscriberInput input = getSubscriberInput(); + if (input != null) { + input.getFilteredSyncSet().removeSyncSetChangedListener(this); } } @@ -210,7 +207,7 @@ public abstract class SyncSetContentProvider implements IStructuredContentProvid * out-of-sync resources. */ public Object[] members(IResource resource) { - IResource[] resources = getSyncSet().members(resource); + IResource[] resources = getSubscriberInput().getFilteredSyncSet().members(resource); Object[] result = new Object[resources.length]; for (int i = 0; i < resources.length; i++) { IResource child = resources[i]; @@ -258,7 +255,7 @@ public abstract class SyncSetContentProvider implements IStructuredContentProvid */ public Object getModelObject(IResource resource) { if (resource.getType() == IResource.ROOT) { - return getSyncSet(); + return getSubscriberInput(); } else { return new SynchronizeViewNode(getSubscriberInput(), resource); } diff --git a/bundles/org.eclipse.team.ui/src/org/eclipse/team/internal/ui/sync/views/SyncSetTreeContentProvider.java b/bundles/org.eclipse.team.ui/src/org/eclipse/team/internal/ui/sync/views/SyncSetTreeContentProvider.java index 64b0c01c1..15278c5cd 100644 --- a/bundles/org.eclipse.team.ui/src/org/eclipse/team/internal/ui/sync/views/SyncSetTreeContentProvider.java +++ b/bundles/org.eclipse.team.ui/src/org/eclipse/team/internal/ui/sync/views/SyncSetTreeContentProvider.java @@ -78,7 +78,7 @@ public class SyncSetTreeContentProvider extends SyncSetContentProvider implement IResource resource = added[i]; Object parent; if (resource.getType() == IResource.PROJECT) { - parent = getSyncSet(); + parent = getSubscriberInput(); } else { parent = getModelParent(resource); } diff --git a/bundles/org.eclipse.team.ui/src/org/eclipse/team/internal/ui/sync/views/TeamSynchronizingPerspective.java b/bundles/org.eclipse.team.ui/src/org/eclipse/team/internal/ui/sync/views/TeamSynchronizingPerspective.java index 4a85311b2..7d40e29d9 100644 --- a/bundles/org.eclipse.team.ui/src/org/eclipse/team/internal/ui/sync/views/TeamSynchronizingPerspective.java +++ b/bundles/org.eclipse.team.ui/src/org/eclipse/team/internal/ui/sync/views/TeamSynchronizingPerspective.java @@ -51,12 +51,10 @@ public class TeamSynchronizingPerspective implements IPerspectiveFactory { */ public void defineLayout(IPageLayout layout) { String editorArea = layout.getEditorArea(); - IFolderLayout top = layout.createFolder("top", IPageLayout.TOP, 0.30f, editorArea); //$NON-NLS-1$ + IFolderLayout top = layout.createFolder("top", IPageLayout.LEFT, 0.25f, editorArea); //$NON-NLS-1$ top.addView(SynchronizeView.VIEW_ID); - top.addView(IPageLayout.ID_PROBLEM_VIEW); - top.addView(IPageLayout.ID_TASK_LIST); - layout.addFastView(IPageLayout.ID_RES_NAV, 0.25f); - layout.addFastView(IPageLayout.ID_OUTLINE, 0.25f); + top.addView(IPageLayout.ID_RES_NAV); + top.addView(IPageLayout.ID_OUTLINE); layout.setEditorAreaVisible(true); } } |