Merge branch 'master' into 'gwt25'

Conflicts:
	java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/leaderboard/SortedCellTableWithStylableHeaders.java
This commit is contained in:
D049941
2012-11-22 15:43:03 +01:00
2041 changed files with 139420 additions and 115508 deletions
@@ -1,25 +1,25 @@
package difflib;
import java.io.Serializable;
import java.util.Comparator;
/**
* @author mksenzov
*/
public class DeltaComparator<T> implements Comparator<Delta<T>>, Serializable {
private static final long serialVersionUID = 1L;
public DeltaComparator() {
}
public int compare(final Delta<T> a, final Delta<T> b) {
final int posA = a.getOriginal().getPosition();
final int posB = b.getOriginal().getPosition();
if (posA > posB) {
return 1;
} else if (posA < posB) {
return -1;
}
return 0;
}
package difflib;
import java.io.Serializable;
import java.util.Comparator;
/**
* @author mksenzov
*/
public class DeltaComparator<T> implements Comparator<Delta<T>>, Serializable {
private static final long serialVersionUID = 1L;
public DeltaComparator() {
}
public int compare(final Delta<T> a, final Delta<T> b) {
final int posA = a.getOriginal().getPosition();
final int posB = b.getOriginal().getPosition();
if (posA > posB) {
return 1;
} else if (posA < posB) {
return -1;
}
return 0;
}
}