From 0b4b69ee80d109887389dd0b9e83d71b2cb0fb19 Mon Sep 17 00:00:00 2001
From: Christopher Baines <cbaines8@gmail.com>
Date: Wed, 8 Feb 2012 12:14:06 +0000
Subject: Some hacks because not using git properly :(

---
 src/net/cbaines/suma/BuildingActivity.java         | 88 ----------------------
 src/net/cbaines/suma/Preferences.java              |  2 +
 .../suma/SouthamptonUniversityMapActivity.java     |  4 +-
 3 files changed, 4 insertions(+), 90 deletions(-)
 delete mode 100644 src/net/cbaines/suma/BuildingActivity.java

(limited to 'src/net')

diff --git a/src/net/cbaines/suma/BuildingActivity.java b/src/net/cbaines/suma/BuildingActivity.java
deleted file mode 100644
index 7637439..0000000
--- a/src/net/cbaines/suma/BuildingActivity.java
+++ /dev/null
@@ -1,88 +0,0 @@
-/*
- * Southampton University Map App
- * Copyright (C) 2011  Christopher Baines
- * 
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public License
- * as published by the Free Software Foundation; either version 2
- * of the License, or (at your option) any later version.
- * 
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
- */
-
-package net.cbaines.suma;
-
-import java.io.InputStream;
-import java.util.HashSet;
-
-import android.content.Context;
-import android.os.Bundle;
-
-import com.hp.hpl.jena.rdf.model.Model;
-import com.hp.hpl.jena.rdf.model.ModelFactory;
-import com.hp.hpl.jena.util.FileManager;
-import com.j256.ormlite.android.apptools.OrmLiteBaseActivity;
-
-public class BuildingActivity extends OrmLiteBaseActivity<DatabaseHelper> {
-
-    final static String TAG = "BusTimeActivity";
-
-    private boolean dataChanged;
-
-    private Context instance;
-
-    private HashSet<BusRoute> routes = new HashSet<BusRoute>();
-
-    public void onCreate(Bundle savedInstanceState) {
-	super.onCreate(savedInstanceState);
-	setContentView(R.layout.bustimes);
-
-	final DatabaseHelper helper = getHelper();
-
-	// create an empty model
-	Model model = ModelFactory.createDefaultModel();
-
-	// use the FileManager to find the input file
-	InputStream in = getResources().openRawResource(R.raw.u9);
-	if (in == null) {
-	    throw new IllegalArgumentException("File not found");
-	}
-
-	// read the RDF/XML file
-	model.read(in, null);
-	
-	
-
-	instance = this;
-
-    }
-
-    public void onResume() {
-	super.onResume();
-
-    }
-
-    public void onPause() {
-
-	super.onPause();
-    }
-
-    public void finish() {
-	setResult(RESULT_OK, getIntent());
-
-	super.finish();
-    }
-
-    @Override
-    public Object onRetainNonConfigurationInstance() {
-	return null;
-    }
-
-}
diff --git a/src/net/cbaines/suma/Preferences.java b/src/net/cbaines/suma/Preferences.java
index e2c79a0..46a521b 100644
--- a/src/net/cbaines/suma/Preferences.java
+++ b/src/net/cbaines/suma/Preferences.java
@@ -7,6 +7,8 @@ public interface Preferences {
     static final boolean UNI_LINK_BUS_TIMES_ENABLED_BY_DEFAULT = true;
     static final String NON_UNI_LINK_BUS_TIMES = "nonUniLinkLiveBusTimesEnabled";
     static final boolean NON_UNI_LINK_BUS_TIMES_ENABLED_BY_DEFAULT = false;
+    static final String UNI_LINK_BUS_STOPS = "uniLinkBusStop";
+    static final boolean UNI_LINK_BUS_STOPS_ENABLED_BY_DEFAULT = true;
     static final String NON_UNI_LINK_BUS_STOPS = "nonUniLinkBusStop";
     static final boolean NON_UNI_LINK_BUS_STOPS_ENABLED_BY_DEFAULT = false;
 }
diff --git a/src/net/cbaines/suma/SouthamptonUniversityMapActivity.java b/src/net/cbaines/suma/SouthamptonUniversityMapActivity.java
index a5a255e..d6a22d8 100644
--- a/src/net/cbaines/suma/SouthamptonUniversityMapActivity.java
+++ b/src/net/cbaines/suma/SouthamptonUniversityMapActivity.java
@@ -76,7 +76,7 @@ import com.j256.ormlite.dao.Dao;
 public class SouthamptonUniversityMapActivity extends OrmLiteBaseActivity<DatabaseHelper> implements MapViewConstants, Runnable, RouteColorConstants,
 	OnChildClickListener, OnItemClickListener, OnItemLongClickListener, OnSharedPreferenceChangeListener, Preferences {
 
-    private boolean useBundledDatabase = true;
+    private boolean useBundledDatabase = false;
 
     private MapView mapView;
     private MapController mapController;
@@ -689,7 +689,7 @@ public class SouthamptonUniversityMapActivity extends OrmLiteBaseActivity<Databa
 			try {
 			    List<BusStop> busStops;
 			    Log.v(TAG, "Begin fetching BusStops at " + (System.currentTimeMillis() - startTime));
-			    if (activityPrefs.getBoolean(NON_UNI_LINK_BUS_STOPS, NON_UNI_LINK_BUS_STOPS_ENABLED_BY_DEFAULT)) {
+			    if (activityPrefs.getBoolean(UNI_LINK_BUS_STOPS, UNI_LINK_BUS_STOPS_ENABLED_BY_DEFAULT)) {
 				busStops = getHelper().getBusStopDao().queryForAll();
 			    } else {
 				busStops = getHelper().getBusStopDao().queryForEq(BusStop.UNI_LINK_FIELD_NAME, true);
-- 
cgit v1.2.3