diff options
author | donald.g.dunne | 2015-04-28 17:55:20 +0000 |
---|---|---|
committer | donald.g.dunne | 2015-04-28 17:55:20 +0000 |
commit | 04f41f3df32204b96eccda0b23fbf83066e61ca7 (patch) | |
tree | 036f4a14614015425cb44999f2d4a3322cd54ba8 | |
parent | 85027ead9e0d4f4c327bc84cd8ffc88238c092c6 (diff) | |
download | org.eclipse.osee-04f41f3df32204b96eccda0b23fbf83066e61ca7.tar.gz org.eclipse.osee-04f41f3df32204b96eccda0b23fbf83066e61ca7.tar.xz org.eclipse.osee-04f41f3df32204b96eccda0b23fbf83066e61ca7.zip |
bug[ats_ATS195348]: Show requirement diffs error
Change-Id: I294cde100d7ef0a27c7e01f9ea128e86722561ce
-rw-r--r-- | plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/branch/BranchNameSorter.java | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/branch/BranchNameSorter.java b/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/branch/BranchNameSorter.java index 97020195bd8..6d955e5401f 100644 --- a/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/branch/BranchNameSorter.java +++ b/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/branch/BranchNameSorter.java @@ -12,7 +12,7 @@ package org.eclipse.osee.framework.ui.skynet.branch; import org.eclipse.jface.viewers.Viewer; import org.eclipse.jface.viewers.ViewerSorter; -import org.eclipse.osee.framework.core.model.Branch; +import org.eclipse.osee.framework.core.data.IOseeBranch; /** * Default sorter for branch. Sorts on descriptive name @@ -29,8 +29,10 @@ public class BranchNameSorter extends ViewerSorter { @Override @SuppressWarnings("unchecked") public int compare(Viewer viewer, Object o1, Object o2) { - - return getComparator().compare(((Branch) o1).getName(), ((Branch) o2).getName()); + if ((o1 instanceof IOseeBranch) && (o2 instanceof IOseeBranch)) { + return getComparator().compare(((IOseeBranch) o1).getName(), ((IOseeBranch) o2).getName()); + } + return super.compare(viewer, o1, o2); } }
\ No newline at end of file |