eclipse/eclipse-policy-comparators.patch
Mat Booth 365159b3a7 Update to latest 4.5.0 I-build
- Drop upstreamed jetty9/servlet and workspace picker patches
- Drop upstreamed patches for bug 903537 and bug 444143
- Update eclipse-build snapshot for ant dependency
- Ship missing features used by some other projects' target platform
- Build with mvn_build macro
- Some spec file clean-up
2015-02-12 12:03:51 +00:00

31 lines
1.3 KiB
Diff

--- eclipse.platform.team/bundles/org.eclipse.compare/compare/org/eclipse/compare/internal/patch/DiffViewerComparator.java.orig 2014-03-27 10:48:13.547706443 +0000
+++ eclipse.platform.team/bundles/org.eclipse.compare/compare/org/eclipse/compare/internal/patch/DiffViewerComparator.java 2014-03-27 10:52:42.615751600 +0000
@@ -49,7 +49,7 @@
return oldStart0 - oldStart1;
}
- return Policy.getComparator().compare(arg0, arg1);
+ return Policy.getComparator().compare((String)arg0, (String)arg1);
}
};
}
--- eclipse.platform.ui/bundles/org.eclipse.ui.ide.application/src/org/eclipse/ui/internal/ide/application/IDEWorkbenchAdvisor.java.orig 2014-03-27 11:27:35.233213660 +0000
+++ eclipse.platform.ui/bundles/org.eclipse.ui.ide.application/src/org/eclipse/ui/internal/ide/application/IDEWorkbenchAdvisor.java 2014-03-27 12:19:30.696748271 +0000
@@ -14,6 +14,7 @@
import java.lang.reflect.InvocationTargetException;
import java.net.URL;
import java.util.ArrayList;
+import java.util.Comparator;
import java.util.Iterator;
import java.util.Map;
import java.util.TreeMap;
@@ -228,7 +229,7 @@
// show Help button in JFace dialogs
TrayDialog.setDialogHelpAvailable(true);
- Policy.setComparator(Collator.getInstance());
+ Policy.setComparator((Comparator)Collator.getInstance());
}
@Override