diff -r 7586c266b52e -r 2a3ee24764bb project_files/Android-build/SDL-android-project/src/org/hedgewars/hedgeroid/EngineProtocol/Scheme.java --- a/project_files/Android-build/SDL-android-project/src/org/hedgewars/hedgeroid/EngineProtocol/Scheme.java Sat Dec 03 18:49:17 2011 +0100 +++ b/project_files/Android-build/SDL-android-project/src/org/hedgewars/hedgeroid/EngineProtocol/Scheme.java Sat Dec 03 18:50:29 2011 +0100 @@ -44,13 +44,12 @@ //private ArrayList basic; private Integer gamemod; private ArrayList basic;; - private static ArrayList> basicflags = new ArrayList>(); + private static ArrayList> basicflags = new ArrayList>();//TODO why is it static? public Scheme(String _name, ArrayList _basic, int _gamemod){ name = _name; gamemod = _gamemod; basic = _basic; - } public Scheme(Parcel in){ @@ -329,7 +328,6 @@ } public int describeContents() { - // TODO Auto-generated method stub return 0; } @@ -337,7 +335,6 @@ dest.writeString(name); dest.writeInt(gamemod); dest.writeList(basic); - } public void readFromParcel(Parcel src){ @@ -357,11 +354,6 @@ }; public int compareTo(Scheme another) { - boolean equalsDefault = name.toLowerCase().equals("default"); - boolean otherEqualsDefault = another.name.toLowerCase().equals("default"); - if(equalsDefault && otherEqualsDefault) return 0; - else if(equalsDefault && !otherEqualsDefault) return -1; - else if((!equalsDefault) && otherEqualsDefault) return 1; - else return name.compareTo(another.name); + return name.compareTo(another.name); } }