From edd72a64c4a82f9faccdd38d274cf0871331c9da Mon Sep 17 00:00:00 2001
From: "andreas.schildbach"
 <andreas.schildbach@0924bc21-9374-b0fa-ee44-9ff1593b38f0>
Date: Thu, 12 Aug 2010 21:47:56 +0000
Subject: [PATCH] fixed not displaying messages in departure list entries any
 more

git-svn-id: https://public-transport-enabler.googlecode.com/svn/trunk@78 0924bc21-9374-b0fa-ee44-9ff1593b38f0
---
 src/de/schildbach/pte/BahnProvider.java        |  4 +++-
 src/de/schildbach/pte/MvvProvider.java         |  4 +++-
 .../schildbach/pte/QueryDeparturesResult.java  | 18 ++++++++++++++++--
 src/de/schildbach/pte/RmvProvider.java         |  4 +++-
 src/de/schildbach/pte/SbbProvider.java         |  4 +++-
 src/de/schildbach/pte/VbbProvider.java         |  6 ++++--
 6 files changed, 32 insertions(+), 8 deletions(-)

diff --git a/src/de/schildbach/pte/BahnProvider.java b/src/de/schildbach/pte/BahnProvider.java
index 24f71cf2..234fdaab 100644
--- a/src/de/schildbach/pte/BahnProvider.java
+++ b/src/de/schildbach/pte/BahnProvider.java
@@ -30,6 +30,8 @@ import java.util.Map;
 import java.util.regex.Matcher;
 import java.util.regex.Pattern;
 
+import de.schildbach.pte.QueryDeparturesResult.Status;
+
 /**
  * @author Andreas Schildbach
  */
@@ -491,7 +493,7 @@ public final class BahnProvider implements NetworkProvider
 		}
 		else
 		{
-			return QueryDeparturesResult.NO_INFO;
+			return new QueryDeparturesResult(uri, Status.NO_INFO);
 		}
 	}
 
diff --git a/src/de/schildbach/pte/MvvProvider.java b/src/de/schildbach/pte/MvvProvider.java
index 6ffc3e61..a7758063 100644
--- a/src/de/schildbach/pte/MvvProvider.java
+++ b/src/de/schildbach/pte/MvvProvider.java
@@ -30,6 +30,8 @@ import java.util.Map;
 import java.util.regex.Matcher;
 import java.util.regex.Pattern;
 
+import de.schildbach.pte.QueryDeparturesResult.Status;
+
 /**
  * @author Andreas Schildbach
  */
@@ -545,7 +547,7 @@ public class MvvProvider implements NetworkProvider
 		}
 		else
 		{
-			return QueryDeparturesResult.NO_INFO;
+			return new QueryDeparturesResult(uri, Status.NO_INFO);
 		}
 	}
 
diff --git a/src/de/schildbach/pte/QueryDeparturesResult.java b/src/de/schildbach/pte/QueryDeparturesResult.java
index df7e8d87..c2e3d721 100644
--- a/src/de/schildbach/pte/QueryDeparturesResult.java
+++ b/src/de/schildbach/pte/QueryDeparturesResult.java
@@ -25,10 +25,13 @@ import java.util.List;
  */
 public final class QueryDeparturesResult
 {
-	public static final QueryDeparturesResult NO_INFO = new QueryDeparturesResult(null, 0, null, null, null);
-	public static final QueryDeparturesResult SERVICE_DOWN = new QueryDeparturesResult(null, 0, null, null, null);
+	public enum Status
+	{
+		OK, NO_INFO, SERVICE_DOWN
+	}
 
 	public final String uri;
+	public final Status status;
 	public final int locationId;
 	public final String location;
 	public final Date currentTime;
@@ -38,9 +41,20 @@ public final class QueryDeparturesResult
 			final List<Departure> departures)
 	{
 		this.uri = uri;
+		this.status = Status.OK;
 		this.locationId = locationId;
 		this.location = location;
 		this.currentTime = currentTime;
 		this.departures = departures;
 	}
+
+	public QueryDeparturesResult(final String uri, final Status status)
+	{
+		this.uri = uri;
+		this.status = status;
+		this.locationId = 0;
+		this.location = null;
+		this.currentTime = null;
+		this.departures = null;
+	}
 }
diff --git a/src/de/schildbach/pte/RmvProvider.java b/src/de/schildbach/pte/RmvProvider.java
index 202a14e0..c62eb856 100644
--- a/src/de/schildbach/pte/RmvProvider.java
+++ b/src/de/schildbach/pte/RmvProvider.java
@@ -30,6 +30,8 @@ import java.util.Map;
 import java.util.regex.Matcher;
 import java.util.regex.Pattern;
 
+import de.schildbach.pte.QueryDeparturesResult.Status;
+
 /**
  * @author Andreas Schildbach
  */
@@ -457,7 +459,7 @@ public class RmvProvider implements NetworkProvider
 		}
 		else
 		{
-			return QueryDeparturesResult.NO_INFO;
+			return new QueryDeparturesResult(uri, Status.NO_INFO);
 		}
 	}
 
diff --git a/src/de/schildbach/pte/SbbProvider.java b/src/de/schildbach/pte/SbbProvider.java
index 1702c0d3..4787a95f 100644
--- a/src/de/schildbach/pte/SbbProvider.java
+++ b/src/de/schildbach/pte/SbbProvider.java
@@ -30,6 +30,8 @@ import java.util.Map;
 import java.util.regex.Matcher;
 import java.util.regex.Pattern;
 
+import de.schildbach.pte.QueryDeparturesResult.Status;
+
 /**
  * @author Andreas Schildbach
  */
@@ -408,7 +410,7 @@ public class SbbProvider implements NetworkProvider
 		}
 		else
 		{
-			return QueryDeparturesResult.NO_INFO;
+			return new QueryDeparturesResult(uri, Status.NO_INFO);
 		}
 	}
 
diff --git a/src/de/schildbach/pte/VbbProvider.java b/src/de/schildbach/pte/VbbProvider.java
index bce2e345..1779db98 100644
--- a/src/de/schildbach/pte/VbbProvider.java
+++ b/src/de/schildbach/pte/VbbProvider.java
@@ -31,6 +31,8 @@ import java.util.Map;
 import java.util.regex.Matcher;
 import java.util.regex.Pattern;
 
+import de.schildbach.pte.QueryDeparturesResult.Status;
+
 /**
  * @author Andreas Schildbach
  */
@@ -473,7 +475,7 @@ public final class VbbProvider implements NetworkProvider
 		final int stationId = Integer.parseInt(mStationId.group(1));
 
 		if (P_DEPARTURES_SERVICE_DOWN.matcher(page).find())
-			return QueryDeparturesResult.SERVICE_DOWN;
+			return new QueryDeparturesResult(uri, Status.SERVICE_DOWN);
 
 		// parse page
 		final Matcher mHead = P_DEPARTURES_HEAD.matcher(page);
@@ -525,7 +527,7 @@ public final class VbbProvider implements NetworkProvider
 		}
 		else
 		{
-			return QueryDeparturesResult.NO_INFO;
+			return new QueryDeparturesResult(uri, Status.NO_INFO);
 		}
 	}