sebse/android-fuplanner
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Moved Types from tools package to Types

Browse Source
This commit is contained in:
Caesar2011
2018-07-27 16:05:48 +02:00
parent 3fe479884a
commit ef94b7f132
14 changed files with 36 additions and 48 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
app/src/main/java/de/sebse/fuplanner/services/Canteen/types/Canteen.java
View File

@@ -7,8 +7,6 @@ import java.util.Calendar;
import java.util.Iterator;
import java.util.Locale;
import de.sebse.fuplanner.tools.SortedListDay;
public class Canteen implements Serializable, Iterable<Day> {
private final int id;
private final String name;

2
app/src/main/java/de/sebse/fuplanner/services/Canteen/types/Canteens.java
View File

@@ -11,8 +11,6 @@ import java.io.ObjectOutputStream;
import java.io.Serializable;
import java.util.Iterator;
import de.sebse.fuplanner.tools.SortedListCanteen;
public class Canteens implements Serializable, Iterable<Canteen> {
public static final int[] availableCanteens = {27, 28, 42};
private static final String FILE_NAME = "CanteensSaving";

2
app/src/main/java/de/sebse/fuplanner/services/Canteen/types/Day.java
View File

@@ -6,8 +6,6 @@ import java.io.Serializable;
import java.util.Calendar;
import java.util.Iterator;
import de.sebse.fuplanner.tools.SortedListMeal;
public class Day implements Serializable, Iterable<Meal> {
private final int canteenId;
private final Calendar calendar;

10
app/src/main/java/de/sebse/fuplanner/tools/SortedListCanteen.java → app/src/main/java/de/sebse/fuplanner/services/Canteen/types/SortedListCanteen.java
View File

@@ -1,21 +1,21 @@
package de.sebse.fuplanner.tools;
package de.sebse.fuplanner.services.Canteen.types;
import de.sebse.fuplanner.services.Canteen.types.Canteen;
import de.sebse.fuplanner.tools.SortedList;
public class SortedListCanteen extends SortedList<Canteen, Integer, String> {
@Override
int compare(Canteen o1, Canteen o2) {
public int compare(Canteen o1, Canteen o2) {
// TODO correct implementation
return Integer.compare(o1.getId(), o2.getId());
}
@Override
boolean hasIdentifier(Canteen o1, Integer id) {
public boolean hasIdentifier(Canteen o1, Integer id) {
return o1.getId() == id;
}
@Override
boolean hasFilter(Canteen o1, String filter) {
public boolean hasFilter(Canteen o1, String filter) {
return o1.getCity().equals(filter);
}
}

11
app/src/main/java/de/sebse/fuplanner/tools/SortedListDay.java → app/src/main/java/de/sebse/fuplanner/services/Canteen/types/SortedListDay.java
View File

@@ -1,23 +1,22 @@
package de.sebse.fuplanner.tools;
package de.sebse.fuplanner.services.Canteen.types;
import java.util.Calendar;
import de.sebse.fuplanner.services.Canteen.types.Canteen;
import de.sebse.fuplanner.services.Canteen.types.Day;
import de.sebse.fuplanner.tools.SortedList;
public class SortedListDay extends SortedList<Day, Calendar, String> {
@Override
int compare(Day o1, Day o2) {
public int compare(Day o1, Day o2) {
return Canteen.calendarToKey(o1.getCalendar()).compareTo(Canteen.calendarToKey(o2.getCalendar()));
}
@Override
boolean hasIdentifier(Day o1, Calendar id) {
public boolean hasIdentifier(Day o1, Calendar id) {
return Canteen.calendarToKey(o1.getCalendar()).equals(Canteen.calendarToKey(id));
}
@Override
boolean hasFilter(Day o1, String filter) {
public boolean hasFilter(Day o1, String filter) {
return false;
}
}

10
app/src/main/java/de/sebse/fuplanner/tools/SortedListMeal.java → app/src/main/java/de/sebse/fuplanner/services/Canteen/types/SortedListMeal.java
View File

@@ -1,20 +1,20 @@
package de.sebse.fuplanner.tools;
package de.sebse.fuplanner.services.Canteen.types;
import de.sebse.fuplanner.services.Canteen.types.Meal;
import de.sebse.fuplanner.tools.SortedList;
public class SortedListMeal extends SortedList<Meal, Integer, String> {
@Override
int compare(Meal o1, Meal o2) {
public int compare(Meal o1, Meal o2) {
return Integer.compare(o1.getId(), o2.getId());
}
@Override
boolean hasIdentifier(Meal o1, Integer id) {
public boolean hasIdentifier(Meal o1, Integer id) {
return o1.getId() == id;
}
@Override
boolean hasFilter(Meal o1, String filter) {
public boolean hasFilter(Meal o1, String filter) {
return o1.getCategory().equals(filter);
}
}

4
app/src/main/java/de/sebse/fuplanner/services/KVV/KVVModuleList.java
View File

@@ -23,9 +23,9 @@ import de.sebse.fuplanner.services.KVV.types.Gradebook;
import de.sebse.fuplanner.services.KVV.types.Lecturer;
import de.sebse.fuplanner.services.KVV.types.LoginToken;
import de.sebse.fuplanner.services.KVV.types.Modules;
import de.sebse.fuplanner.tools.AssignmentList;
import de.sebse.fuplanner.services.KVV.types.AssignmentList;
import de.sebse.fuplanner.tools.AsyncQueue;
import de.sebse.fuplanner.tools.EventList;
import de.sebse.fuplanner.services.KVV.types.EventList;
import de.sebse.fuplanner.tools.Regex;
import de.sebse.fuplanner.tools.network.HTTPService;
import de.sebse.fuplanner.tools.network.NetworkCallback;

6
app/src/main/java/de/sebse/fuplanner/tools/AssignmentList.java → app/src/main/java/de/sebse/fuplanner/services/KVV/types/AssignmentList.java
View File

@@ -1,11 +1,11 @@
package de.sebse.fuplanner.tools;
package de.sebse.fuplanner.services.KVV.types;
import de.sebse.fuplanner.services.KVV.types.Assignment;
import de.sebse.fuplanner.tools.DateSortedList;
public class AssignmentList extends DateSortedList<Assignment> {
@Override
long getDateByItem(Assignment item) {
public long getDateByItem(Assignment item) {
return item.getDueDate();
}

11
app/src/main/java/de/sebse/fuplanner/services/KVV/types/EventList.java Normal file
View File

@@ -0,0 +1,11 @@
package de.sebse.fuplanner.services.KVV.types;
import de.sebse.fuplanner.tools.DateSortedList;
public class EventList extends DateSortedList<Event> {
@Override
public long getDateByItem(Event item) {
return item.getEndDate();
}
}

3
app/src/main/java/de/sebse/fuplanner/services/KVV/types/Modules.java
View File

@@ -14,11 +14,8 @@ import java.util.ArrayList;
import java.util.HashSet;
import java.util.Iterator;
import de.sebse.fuplanner.tools.AssignmentList;
import de.sebse.fuplanner.tools.Compare;
import de.sebse.fuplanner.tools.EventList;
import de.sebse.fuplanner.tools.Regex;
import de.sebse.fuplanner.tools.SortedModuleList;
/**
* Created by sebastian on 29.10.17.

4
app/src/main/java/de/sebse/fuplanner/tools/SortedModuleList.java → app/src/main/java/de/sebse/fuplanner/services/KVV/types/SortedModuleList.java
View File

@@ -1,4 +1,4 @@
package de.sebse.fuplanner.tools;
package de.sebse.fuplanner.services.KVV.types;
import android.support.annotation.NonNull;
import android.support.annotation.Nullable;
@@ -9,8 +9,6 @@ import java.util.ArrayList;
import java.util.Collections;
import java.util.Iterator;
import de.sebse.fuplanner.services.KVV.types.Modules;
public class SortedModuleList extends AbstractList<Modules.Module> implements Serializable {
private ArrayList<Modules.Module> internalList = new ArrayList<>();

2
app/src/main/java/de/sebse/fuplanner/tools/DateSortedList.java
View File

@@ -101,5 +101,5 @@ public abstract class DateSortedList<T> extends ArrayList<T> {
return false;
}
abstract long getDateByItem(T item);
public abstract long getDateByItem(T item);
}

11
app/src/main/java/de/sebse/fuplanner/tools/EventList.java
View File

@@ -1,11 +0,0 @@
package de.sebse.fuplanner.tools;
import de.sebse.fuplanner.services.KVV.types.Event;
public class EventList extends DateSortedList<Event> {
@Override
long getDateByItem(Event item) {
return item.getEndDate();
}
}

6
app/src/main/java/de/sebse/fuplanner/tools/SortedList.java
View File

@@ -21,11 +21,11 @@ public abstract class SortedList<T, I, F> implements Iterable<T>, Serializable {
this.internalList.remove(index);
}
abstract int compare(T o1, T o2);
public abstract int compare(T o1, T o2);
abstract boolean hasIdentifier(T o1, I id);
public abstract boolean hasIdentifier(T o1, I id);
abstract boolean hasFilter(T o1, F filter);
public abstract boolean hasFilter(T o1, F filter);
@Nullable
public T get(int i) {