diff options
Diffstat (limited to 'org.eclipse.egit.ui/src/org/eclipse')
-rw-r--r-- | org.eclipse.egit.ui/src/org/eclipse/egit/ui/internal/clone/GitSelectRepositoryPage.java | 4 | ||||
-rw-r--r-- | org.eclipse.egit.ui/src/org/eclipse/egit/ui/internal/clone/GitSelectWizardPage.java | 5 | ||||
-rw-r--r-- | org.eclipse.egit.ui/src/org/eclipse/egit/ui/internal/dialogs/AbstractBranchSelectionDialog.java | 5 | ||||
-rw-r--r-- | org.eclipse.egit.ui/src/org/eclipse/egit/ui/internal/push/PushTagsPage.java | 5 | ||||
-rw-r--r-- | org.eclipse.egit.ui/src/org/eclipse/egit/ui/internal/repository/RepositoryTreeNodeLabelProvider.java (renamed from org.eclipse.egit.ui/src/org/eclipse/egit/ui/internal/repository/RepositoriesViewLabelProvider.java) | 8 | ||||
-rw-r--r-- | org.eclipse.egit.ui/src/org/eclipse/egit/ui/internal/search/CommitSearchPage.java | 4 |
6 files changed, 14 insertions, 17 deletions
diff --git a/org.eclipse.egit.ui/src/org/eclipse/egit/ui/internal/clone/GitSelectRepositoryPage.java b/org.eclipse.egit.ui/src/org/eclipse/egit/ui/internal/clone/GitSelectRepositoryPage.java index 1c5d86c90a..13292ec400 100644 --- a/org.eclipse.egit.ui/src/org/eclipse/egit/ui/internal/clone/GitSelectRepositoryPage.java +++ b/org.eclipse.egit.ui/src/org/eclipse/egit/ui/internal/clone/GitSelectRepositoryPage.java @@ -29,7 +29,7 @@ import org.eclipse.egit.core.internal.gerrit.GerritUtil; import org.eclipse.egit.ui.Activator; import org.eclipse.egit.ui.internal.UIText; import org.eclipse.egit.ui.internal.repository.RepositoriesViewContentProvider; -import org.eclipse.egit.ui.internal.repository.RepositoriesViewLabelProvider; +import org.eclipse.egit.ui.internal.repository.RepositoryTreeNodeLabelProvider; import org.eclipse.egit.ui.internal.repository.RepositorySearchWizard; import org.eclipse.egit.ui.internal.repository.tree.RepositoryNode; import org.eclipse.egit.ui.internal.repository.tree.RepositoryTreeNode; @@ -161,7 +161,7 @@ public class GitSelectRepositoryPage extends WizardPage { return false; } }); - tv.setLabelProvider(new RepositoriesViewLabelProvider()); + tv.setLabelProvider(new RepositoryTreeNodeLabelProvider()); Composite tb = new Composite(main, SWT.NONE); GridLayoutFactory.fillDefaults().numColumns(1).applyTo(tb); diff --git a/org.eclipse.egit.ui/src/org/eclipse/egit/ui/internal/clone/GitSelectWizardPage.java b/org.eclipse.egit.ui/src/org/eclipse/egit/ui/internal/clone/GitSelectWizardPage.java index cedc7f793f..fce34ef522 100644 --- a/org.eclipse.egit.ui/src/org/eclipse/egit/ui/internal/clone/GitSelectWizardPage.java +++ b/org.eclipse.egit.ui/src/org/eclipse/egit/ui/internal/clone/GitSelectWizardPage.java @@ -23,7 +23,7 @@ import org.eclipse.core.runtime.Path; import org.eclipse.egit.ui.Activator; import org.eclipse.egit.ui.internal.UIText; import org.eclipse.egit.ui.internal.repository.RepositoriesViewContentProvider; -import org.eclipse.egit.ui.internal.repository.RepositoriesViewLabelProvider; +import org.eclipse.egit.ui.internal.repository.RepositoryTreeNodeLabelProvider; import org.eclipse.egit.ui.internal.repository.tree.FolderNode; import org.eclipse.egit.ui.internal.repository.tree.RepositoryTreeNode; import org.eclipse.egit.ui.internal.repository.tree.RepositoryTreeNodeType; @@ -200,8 +200,7 @@ public class GitSelectWizardPage extends WizardPage { tv.setContentProvider(cp); GridDataFactory.fillDefaults().grab(true, true).hint(SWT.DEFAULT, 200) .applyTo(tv.getTree()); - tv.setLabelProvider(new RepositoriesViewLabelProvider()); - + tv.setLabelProvider(new RepositoryTreeNodeLabelProvider()); tv.addSelectionChangedListener(new ISelectionChangedListener() { @Override diff --git a/org.eclipse.egit.ui/src/org/eclipse/egit/ui/internal/dialogs/AbstractBranchSelectionDialog.java b/org.eclipse.egit.ui/src/org/eclipse/egit/ui/internal/dialogs/AbstractBranchSelectionDialog.java index e13b607efb..3c67ee8c4d 100644 --- a/org.eclipse.egit.ui/src/org/eclipse/egit/ui/internal/dialogs/AbstractBranchSelectionDialog.java +++ b/org.eclipse.egit.ui/src/org/eclipse/egit/ui/internal/dialogs/AbstractBranchSelectionDialog.java @@ -27,7 +27,7 @@ import org.eclipse.core.runtime.Path; import org.eclipse.egit.ui.Activator; import org.eclipse.egit.ui.UIUtils; import org.eclipse.egit.ui.internal.repository.RepositoriesViewContentProvider; -import org.eclipse.egit.ui.internal.repository.RepositoriesViewLabelProvider; +import org.eclipse.egit.ui.internal.repository.RepositoryTreeNodeLabelProvider; import org.eclipse.egit.ui.internal.repository.tree.AdditionalRefNode; import org.eclipse.egit.ui.internal.repository.tree.AdditionalRefsNode; import org.eclipse.egit.ui.internal.repository.tree.BranchHierarchyNode; @@ -278,8 +278,7 @@ public abstract class AbstractBranchSelectionDialog extends TitleAreaDialog { selectionModel | SWT.BORDER, filter, true); branchTree = tree.getViewer(); branchTree.setUseHashlookup(true); - branchTree - .setLabelProvider(new RepositoriesViewLabelProvider()); + branchTree.setLabelProvider(new RepositoryTreeNodeLabelProvider()); branchTree.setContentProvider(new RepositoriesViewContentProvider()); ColumnViewerToolTipSupport.enableFor(branchTree); diff --git a/org.eclipse.egit.ui/src/org/eclipse/egit/ui/internal/push/PushTagsPage.java b/org.eclipse.egit.ui/src/org/eclipse/egit/ui/internal/push/PushTagsPage.java index 1c2390c394..4bd444db2f 100644 --- a/org.eclipse.egit.ui/src/org/eclipse/egit/ui/internal/push/PushTagsPage.java +++ b/org.eclipse.egit.ui/src/org/eclipse/egit/ui/internal/push/PushTagsPage.java @@ -24,7 +24,7 @@ import org.eclipse.egit.ui.internal.components.FilteredCheckboxTree; import org.eclipse.egit.ui.internal.components.RemoteSelectionCombo; import org.eclipse.egit.ui.internal.components.RemoteSelectionCombo.SelectionType; import org.eclipse.egit.ui.internal.repository.RepositoriesViewContentProvider; -import org.eclipse.egit.ui.internal.repository.RepositoriesViewLabelProvider; +import org.eclipse.egit.ui.internal.repository.RepositoryTreeNodeLabelProvider; import org.eclipse.egit.ui.internal.repository.tree.TagNode; import org.eclipse.egit.ui.internal.repository.tree.TagsNode; import org.eclipse.jface.layout.GridDataFactory; @@ -134,8 +134,7 @@ public class PushTagsPage extends WizardPage { TagsNode tagsNode = new TagsNode(null, repository); ContentProvider contentProvider = new ContentProvider(tagsNode); treeViewer.setContentProvider(contentProvider); - treeViewer - .setLabelProvider(new RepositoriesViewLabelProvider()); + treeViewer.setLabelProvider(new RepositoryTreeNodeLabelProvider()); treeViewer.setComparator(new ViewerComparator( CommonUtils.STRING_ASCENDING_COMPARATOR)); treeViewer.setInput(tagsNode); diff --git a/org.eclipse.egit.ui/src/org/eclipse/egit/ui/internal/repository/RepositoriesViewLabelProvider.java b/org.eclipse.egit.ui/src/org/eclipse/egit/ui/internal/repository/RepositoryTreeNodeLabelProvider.java index 7fb6ee295f..ebee104fb0 100644 --- a/org.eclipse.egit.ui/src/org/eclipse/egit/ui/internal/repository/RepositoriesViewLabelProvider.java +++ b/org.eclipse.egit.ui/src/org/eclipse/egit/ui/internal/repository/RepositoryTreeNodeLabelProvider.java @@ -32,7 +32,7 @@ import org.eclipse.ui.model.WorkbenchLabelProvider; /** * A decorating label provider for repository tree nodes. */ -public class RepositoriesViewLabelProvider +public class RepositoryTreeNodeLabelProvider extends DecoratingStyledCellLabelProvider implements ILabelProvider, IStyledLabelProvider { @@ -41,13 +41,13 @@ public class RepositoriesViewLabelProvider private final WeakHashMap<Object, StyledString> previousDecoratedLabels = new WeakHashMap<>(); /** - * Creates a new {@link RepositoriesViewLabelProvider}. + * Creates a new {@link RepositoryTreeNodeLabelProvider}. */ - public RepositoriesViewLabelProvider() { + public RepositoryTreeNodeLabelProvider() { this(new WorkbenchLabelProvider()); } - private RepositoriesViewLabelProvider( + private RepositoryTreeNodeLabelProvider( WorkbenchLabelProvider labelProvider) { super(labelProvider, PlatformUI.getWorkbench() .getDecoratorManager().getLabelDecorator(), null); diff --git a/org.eclipse.egit.ui/src/org/eclipse/egit/ui/internal/search/CommitSearchPage.java b/org.eclipse.egit.ui/src/org/eclipse/egit/ui/internal/search/CommitSearchPage.java index 82c3f1c02d..35e6a6e189 100644 --- a/org.eclipse.egit.ui/src/org/eclipse/egit/ui/internal/search/CommitSearchPage.java +++ b/org.eclipse.egit.ui/src/org/eclipse/egit/ui/internal/search/CommitSearchPage.java @@ -28,7 +28,7 @@ import org.eclipse.egit.ui.UIUtils; import org.eclipse.egit.ui.internal.UIIcons; import org.eclipse.egit.ui.internal.UIText; import org.eclipse.egit.ui.internal.repository.RepositoriesViewContentProvider; -import org.eclipse.egit.ui.internal.repository.RepositoriesViewLabelProvider; +import org.eclipse.egit.ui.internal.repository.RepositoryTreeNodeLabelProvider; import org.eclipse.egit.ui.internal.repository.tree.RepositoryNode; import org.eclipse.jface.dialogs.Dialog; import org.eclipse.jface.dialogs.DialogPage; @@ -312,7 +312,7 @@ public class CommitSearchPage extends DialogPage implements ISearchPage { repositoryGroup, SWT.SINGLE | SWT.V_SCROLL | SWT.H_SCROLL | SWT.BORDER); this.repositoryViewer - .setLabelProvider(new RepositoriesViewLabelProvider()); + .setLabelProvider(new RepositoryTreeNodeLabelProvider()); this.repositoryViewer .setContentProvider(new RepositoriesViewContentProvider()); this.repositoryViewer |