Skip to main content
aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRobin Rosenberg2013-04-19 10:43:08 +0000
committerDani Megert2013-04-19 10:43:08 +0000
commitf42b289efc97bf29292d5d1d3cda57f54ee53695 (patch)
tree694ab1176b4e8cb2a01ac0d7232d508786e0c7d7 /org.eclipse.egit.ui
parent12899be499945c01576f7da1df638d8d3a0f30f5 (diff)
downloadegit-f42b289efc97bf29292d5d1d3cda57f54ee53695.tar.gz
egit-f42b289efc97bf29292d5d1d3cda57f54ee53695.tar.xz
egit-f42b289efc97bf29292d5d1d3cda57f54ee53695.zip
Sort files in PullResult dialog
Bug: 405894 Change-Id: I8a32aa953eefdc2d9b237790b8b742d192a2e6bc Signed-off-by: Dani Megert <Daniel_Megert@ch.ibm.com>
Diffstat (limited to 'org.eclipse.egit.ui')
-rw-r--r--org.eclipse.egit.ui/src/org/eclipse/egit/ui/internal/fetch/FetchResultTable.java9
1 files changed, 8 insertions, 1 deletions
diff --git a/org.eclipse.egit.ui/src/org/eclipse/egit/ui/internal/fetch/FetchResultTable.java b/org.eclipse.egit.ui/src/org/eclipse/egit/ui/internal/fetch/FetchResultTable.java
index 157df4b1f9..6acbd15982 100644
--- a/org.eclipse.egit.ui/src/org/eclipse/egit/ui/internal/fetch/FetchResultTable.java
+++ b/org.eclipse.egit.ui/src/org/eclipse/egit/ui/internal/fetch/FetchResultTable.java
@@ -1,5 +1,5 @@
/*******************************************************************************
- * Copyright (c) 2009, 2012 Shawn O. Pearce and others.
+ * Copyright (c) 2009, 2013 Shawn O. Pearce and others.
* All rights reserved. This program and the accompanying materials
* are made available under the terms of the Eclipse Public License v1.0
* which accompanies this distribution, and is available at
@@ -21,6 +21,7 @@ import org.eclipse.egit.ui.internal.UIText;
import org.eclipse.egit.ui.internal.WorkbenchStyledLabelProvider;
import org.eclipse.egit.ui.internal.commit.CommitEditor;
import org.eclipse.egit.ui.internal.commit.RepositoryCommit;
+import org.eclipse.egit.ui.internal.history.FileDiff;
import org.eclipse.jface.layout.GridDataFactory;
import org.eclipse.jface.layout.GridLayoutFactory;
import org.eclipse.jface.resource.ImageDescriptor;
@@ -290,6 +291,12 @@ class FetchResultTable {
&& e2 instanceof RepositoryCommit)
return 0;
+ if (e1 instanceof FileDiff && e2 instanceof FileDiff) {
+ FileDiff f1 = (FileDiff) e1;
+ FileDiff f2 = (FileDiff) e2;
+ return f1.getPath().compareTo(f2.getPath());
+ }
+
return super.compare(viewer, e1, e2);
}

Back to the top