Nextrek

URLs

Explore

Commits

Diff Revisions 10 vs 11 for /Android/Minstrek/MinstrekLib/src/nextrek/minstrek/core/BookModel.java

		@@ -7,8 +7,6 @@
7	7		import java.util.Locale;
8	8		import java.util.Map.Entry;
9	9
10		-	import nextrek.minstrek.utils.BookUtils;
11		-
12	10		import android.content.Context;
13	11		import android.util.Log;
14	12
		@@ -17,10 +15,10 @@
17	15		private static final String TAG = "BookModel";
18	16		String bookName;
19	17		PageModelList pages;
20		-	ConditionList events;
21		-	ConditionList objects;
	18	+	FlagList events;
	19	+	FlagList objects;
22	20
23		-	public BookModel(String bookName, PageModelList pages, ConditionList events, ConditionList objects) {
	21	+	public BookModel(String bookName, PageModelList pages, FlagList events, FlagList objects) {
24	22		this.bookName = bookName;
25	23		this.pages = pages;
26	24		this.events = events;
		@@ -66,7 +64,7 @@
66	64		String flagName = TKV[1];
67	65		boolean flagValue = Boolean.valueOf(TKV[2]);
68	66
69		-	ConditionList list = null;
	67	+	FlagList list = null;
70	68		if (flagCategory.equalsIgnoreCase("evento")) {
71	69		list = events;
72	70		}
		@@ -123,7 +121,7 @@
123	121		String flagName = TKV[1];
124	122		boolean newValue = Boolean.valueOf(TKV[2]);
125	123
126		-	ConditionList list = null;
	124	+	FlagList list = null;
127	125		if (flagCategory.equalsIgnoreCase("evento")) {
128	126		list = events;
129	127		}
		@@ -146,11 +144,11 @@
146	144		return bookName;
147	145		}
148	146
149		-	public ConditionList getEvents() {
	147	+	public FlagList getEvents() {
150	148		return this.events;
151	149		}
152	150
153		-	public ConditionList getObjects() {
	151	+	public FlagList getObjects() {
154	152		return this.objects;
155	153		}
156	154
		@@ -196,4 +194,21 @@
196	194		return;
197	195		}
198	196		}
	197	+
	198	+	public void shutdown() {
	199	+	if (pages != null) {
	200	+	pages.clear();
	201	+	pages = null;
	202	+	}
	203	+
	204	+	if (events != null) {
	205	+	events.clear();
	206	+	events = null;
	207	+	}
	208	+
	209	+	if (objects != null) {
	210	+	objects.clear();
	211	+	events = null;
	212	+	}
	213	+	}
199	214		}

View View this file contents

History View the full history

Feeds

Commits for /Android/Minstrek/MinstrekLib/src/nextrek/minstrek/core/BookModel.java