new package structure for pte

git-svn-id: https://public-transport-enabler.googlecode.com/svn/trunk@236 0924bc21-9374-b0fa-ee44-9ff1593b38f0

src/de/schildbach/pte/AbstractEfaProvider.java

@@ -32,7 +32,13 @@ import org.xmlpull.v1.XmlPullParser;
 import org.xmlpull.v1.XmlPullParserException;
 import org.xmlpull.v1.XmlPullParserFactory;
 
-import de.schildbach.pte.QueryDeparturesResult.Status;
+import de.schildbach.pte.dto.Autocomplete;
+import de.schildbach.pte.dto.Departure;
+import de.schildbach.pte.dto.QueryDeparturesResult;
+import de.schildbach.pte.dto.Station;
+import de.schildbach.pte.dto.QueryDeparturesResult.Status;
+import de.schildbach.pte.util.Color;
+import de.schildbach.pte.util.ParserUtils;
 import de.schildbach.pte.util.XmlPullUtil;
 
 /**

src/de/schildbach/pte/AbstractHafasProvider.java

@@ -25,6 +25,10 @@ import java.util.Map;
 import java.util.regex.Matcher;
 import java.util.regex.Pattern;
 
+import de.schildbach.pte.dto.Station;
+import de.schildbach.pte.util.Color;
+import de.schildbach.pte.util.ParserUtils;
+
 /**
  * @author Andreas Schildbach
  */

src/de/schildbach/pte/BahnProvider.java

@@ -30,6 +30,17 @@ import java.util.Map;
 import java.util.regex.Matcher;
 import java.util.regex.Pattern;
 
+import de.schildbach.pte.dto.Autocomplete;
+import de.schildbach.pte.dto.Connection;
+import de.schildbach.pte.dto.Departure;
+import de.schildbach.pte.dto.GetConnectionDetailsResult;
+import de.schildbach.pte.dto.QueryConnectionsResult;
+import de.schildbach.pte.dto.QueryDeparturesResult;
+import de.schildbach.pte.dto.Station;
+import de.schildbach.pte.dto.StationLocationResult;
+import de.schildbach.pte.util.Color;
+import de.schildbach.pte.util.ParserUtils;
+
 /**
  * @author Andreas Schildbach
  */

src/de/schildbach/pte/GvhProvider.java

@@ -20,6 +20,11 @@ package de.schildbach.pte;
 import java.io.IOException;
 import java.util.Date;
 
+import de.schildbach.pte.dto.GetConnectionDetailsResult;
+import de.schildbach.pte.dto.QueryConnectionsResult;
+import de.schildbach.pte.dto.StationLocationResult;
+import de.schildbach.pte.util.ParserUtils;
+
 /**
  * @author Andreas Schildbach
  */

src/de/schildbach/pte/LinzProvider.java

@@ -20,6 +20,11 @@ package de.schildbach.pte;
 import java.io.IOException;
 import java.util.Date;
 
+import de.schildbach.pte.dto.GetConnectionDetailsResult;
+import de.schildbach.pte.dto.QueryConnectionsResult;
+import de.schildbach.pte.dto.StationLocationResult;
+import de.schildbach.pte.util.ParserUtils;
+
 /**
  * @author Andreas Schildbach
  */

src/de/schildbach/pte/MvvProvider.java

@@ -30,6 +30,16 @@ import java.util.Map;
 import java.util.regex.Matcher;
 import java.util.regex.Pattern;
 
+import de.schildbach.pte.dto.Autocomplete;
+import de.schildbach.pte.dto.Connection;
+import de.schildbach.pte.dto.GetConnectionDetailsResult;
+import de.schildbach.pte.dto.QueryConnectionsResult;
+import de.schildbach.pte.dto.Station;
+import de.schildbach.pte.dto.StationLocationResult;
+import de.schildbach.pte.exception.SessionExpiredException;
+import de.schildbach.pte.util.Color;
+import de.schildbach.pte.util.ParserUtils;
+
 /**
  * @author Andreas Schildbach
  */

src/de/schildbach/pte/NasaProvider.java

@@ -28,7 +28,14 @@ import java.util.List;
 import java.util.regex.Matcher;
 import java.util.regex.Pattern;
 
-import de.schildbach.pte.QueryDeparturesResult.Status;
+import de.schildbach.pte.dto.Autocomplete;
+import de.schildbach.pte.dto.Departure;
+import de.schildbach.pte.dto.GetConnectionDetailsResult;
+import de.schildbach.pte.dto.QueryConnectionsResult;
+import de.schildbach.pte.dto.QueryDeparturesResult;
+import de.schildbach.pte.dto.StationLocationResult;
+import de.schildbach.pte.dto.QueryDeparturesResult.Status;
+import de.schildbach.pte.util.ParserUtils;
 
 /**
  * @author Andreas Schildbach

src/de/schildbach/pte/NetworkProvider.java

@@ -21,6 +21,13 @@ import java.io.IOException;
 import java.util.Date;
 import java.util.List;
 
+import de.schildbach.pte.dto.Autocomplete;
+import de.schildbach.pte.dto.GetConnectionDetailsResult;
+import de.schildbach.pte.dto.QueryConnectionsResult;
+import de.schildbach.pte.dto.QueryDeparturesResult;
+import de.schildbach.pte.dto.Station;
+import de.schildbach.pte.dto.StationLocationResult;
+
 /**
  * Interface to be implemented by providers of transportation networks
  * 

src/de/schildbach/pte/OebbProvider.java

@@ -32,7 +32,16 @@ import org.json.JSONArray;
 import org.json.JSONException;
 import org.json.JSONObject;
 
-import de.schildbach.pte.QueryDeparturesResult.Status;
+import de.schildbach.pte.dto.Autocomplete;
+import de.schildbach.pte.dto.Connection;
+import de.schildbach.pte.dto.Departure;
+import de.schildbach.pte.dto.GetConnectionDetailsResult;
+import de.schildbach.pte.dto.QueryConnectionsResult;
+import de.schildbach.pte.dto.QueryDeparturesResult;
+import de.schildbach.pte.dto.StationLocationResult;
+import de.schildbach.pte.dto.QueryDeparturesResult.Status;
+import de.schildbach.pte.exception.SessionExpiredException;
+import de.schildbach.pte.util.ParserUtils;
 
 public class OebbProvider extends AbstractHafasProvider
 {

src/de/schildbach/pte/RmvProvider.java

@@ -30,7 +30,16 @@ import java.util.Map;
 import java.util.regex.Matcher;
 import java.util.regex.Pattern;
 
-import de.schildbach.pte.QueryDeparturesResult.Status;
+import de.schildbach.pte.dto.Autocomplete;
+import de.schildbach.pte.dto.Connection;
+import de.schildbach.pte.dto.Departure;
+import de.schildbach.pte.dto.GetConnectionDetailsResult;
+import de.schildbach.pte.dto.QueryConnectionsResult;
+import de.schildbach.pte.dto.QueryDeparturesResult;
+import de.schildbach.pte.dto.Station;
+import de.schildbach.pte.dto.StationLocationResult;
+import de.schildbach.pte.dto.QueryDeparturesResult.Status;
+import de.schildbach.pte.util.ParserUtils;
 
 /**
  * @author Andreas Schildbach

src/de/schildbach/pte/SbbProvider.java

@@ -28,7 +28,15 @@ import java.util.List;
 import java.util.regex.Matcher;
 import java.util.regex.Pattern;
 
-import de.schildbach.pte.QueryDeparturesResult.Status;
+import de.schildbach.pte.dto.Autocomplete;
+import de.schildbach.pte.dto.Connection;
+import de.schildbach.pte.dto.Departure;
+import de.schildbach.pte.dto.GetConnectionDetailsResult;
+import de.schildbach.pte.dto.QueryConnectionsResult;
+import de.schildbach.pte.dto.QueryDeparturesResult;
+import de.schildbach.pte.dto.StationLocationResult;
+import de.schildbach.pte.dto.QueryDeparturesResult.Status;
+import de.schildbach.pte.util.ParserUtils;
 
 /**
  * @author Andreas Schildbach

src/de/schildbach/pte/SncbProvider.java

@@ -26,7 +26,14 @@ import java.util.List;
 import java.util.regex.Matcher;
 import java.util.regex.Pattern;
 
-import de.schildbach.pte.QueryDeparturesResult.Status;
+import de.schildbach.pte.dto.Autocomplete;
+import de.schildbach.pte.dto.Departure;
+import de.schildbach.pte.dto.GetConnectionDetailsResult;
+import de.schildbach.pte.dto.QueryConnectionsResult;
+import de.schildbach.pte.dto.QueryDeparturesResult;
+import de.schildbach.pte.dto.StationLocationResult;
+import de.schildbach.pte.dto.QueryDeparturesResult.Status;
+import de.schildbach.pte.util.ParserUtils;
 
 /**
  * @author Andreas Schildbach

src/de/schildbach/pte/StandardColors.java

@@ -20,6 +20,8 @@ package de.schildbach.pte;
 import java.util.HashMap;
 import java.util.Map;
 
+import de.schildbach.pte.util.Color;
+
 /**
  * @author Andreas Schildbach
  */

src/de/schildbach/pte/TflProvider.java

@@ -26,7 +26,16 @@ import java.util.Map;
 import java.util.regex.Matcher;
 import java.util.regex.Pattern;
 
-import de.schildbach.pte.QueryDeparturesResult.Status;
+import de.schildbach.pte.dto.Autocomplete;
+import de.schildbach.pte.dto.Departure;
+import de.schildbach.pte.dto.GetConnectionDetailsResult;
+import de.schildbach.pte.dto.QueryConnectionsResult;
+import de.schildbach.pte.dto.QueryDeparturesResult;
+import de.schildbach.pte.dto.Station;
+import de.schildbach.pte.dto.StationLocationResult;
+import de.schildbach.pte.dto.QueryDeparturesResult.Status;
+import de.schildbach.pte.util.Color;
+import de.schildbach.pte.util.ParserUtils;
 
 /**
  * @author Andreas Schildbach

src/de/schildbach/pte/VbbProvider.java

@@ -31,7 +31,17 @@ import java.util.Map;
 import java.util.regex.Matcher;
 import java.util.regex.Pattern;
 
-import de.schildbach.pte.QueryDeparturesResult.Status;
+import de.schildbach.pte.dto.Autocomplete;
+import de.schildbach.pte.dto.Connection;
+import de.schildbach.pte.dto.Departure;
+import de.schildbach.pte.dto.GetConnectionDetailsResult;
+import de.schildbach.pte.dto.QueryConnectionsResult;
+import de.schildbach.pte.dto.QueryDeparturesResult;
+import de.schildbach.pte.dto.Station;
+import de.schildbach.pte.dto.StationLocationResult;
+import de.schildbach.pte.dto.QueryDeparturesResult.Status;
+import de.schildbach.pte.util.Color;
+import de.schildbach.pte.util.ParserUtils;
 
 /**
  * @author Andreas Schildbach

src/de/schildbach/pte/VgsProvider.java

@@ -28,7 +28,14 @@ import java.util.List;
 import java.util.regex.Matcher;
 import java.util.regex.Pattern;
 
-import de.schildbach.pte.QueryDeparturesResult.Status;
+import de.schildbach.pte.dto.Autocomplete;
+import de.schildbach.pte.dto.Departure;
+import de.schildbach.pte.dto.GetConnectionDetailsResult;
+import de.schildbach.pte.dto.QueryConnectionsResult;
+import de.schildbach.pte.dto.QueryDeparturesResult;
+import de.schildbach.pte.dto.StationLocationResult;
+import de.schildbach.pte.dto.QueryDeparturesResult.Status;
+import de.schildbach.pte.util.ParserUtils;
 
 /**
  * @author Andreas Schildbach

src/de/schildbach/pte/VrnProvider.java

@@ -19,6 +19,10 @@ package de.schildbach.pte;
 import java.io.IOException;
 import java.util.Date;
 
+import de.schildbach.pte.dto.GetConnectionDetailsResult;
+import de.schildbach.pte.dto.QueryConnectionsResult;
+import de.schildbach.pte.dto.StationLocationResult;
+
 /**
  * @author Andreas Schildbach
  */

src/de/schildbach/pte/VrrProvider.java

@@ -19,6 +19,10 @@ package de.schildbach.pte;
 import java.io.IOException;
 import java.util.Date;
 
+import de.schildbach.pte.dto.GetConnectionDetailsResult;
+import de.schildbach.pte.dto.QueryConnectionsResult;
+import de.schildbach.pte.dto.StationLocationResult;
+
 /**
  * @author Andreas Schildbach
  */

src/de/schildbach/pte/dto/Autocomplete.java

@@ -14,7 +14,7 @@
  * You should have received a copy of the GNU General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-package de.schildbach.pte;
+package de.schildbach.pte.dto;
 
 import de.schildbach.pte.NetworkProvider.LocationType;
 

src/de/schildbach/pte/dto/Connection.java

@@ -15,7 +15,7 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-package de.schildbach.pte;
+package de.schildbach.pte.dto;
 
 import java.io.Serializable;
 import java.util.Date;

src/de/schildbach/pte/dto/Departure.java

@@ -15,7 +15,7 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-package de.schildbach.pte;
+package de.schildbach.pte.dto;
 
 import java.util.Date;
 

src/de/schildbach/pte/dto/GetConnectionDetailsResult.java

@@ -15,7 +15,7 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-package de.schildbach.pte;
+package de.schildbach.pte.dto;
 
 import java.util.Date;
 

src/de/schildbach/pte/dto/QueryConnectionsResult.java

@@ -15,7 +15,7 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-package de.schildbach.pte;
+package de.schildbach.pte.dto;
 
 import java.io.Serializable;
 import java.util.Date;

src/de/schildbach/pte/dto/QueryDeparturesResult.java

@@ -15,7 +15,7 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-package de.schildbach.pte;
+package de.schildbach.pte.dto;
 
 import java.util.List;
 

src/de/schildbach/pte/dto/Station.java

@@ -15,7 +15,7 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-package de.schildbach.pte;
+package de.schildbach.pte.dto;
 
 /**
  * @author Andreas Schildbach

src/de/schildbach/pte/dto/StationLocationResult.java

@@ -15,7 +15,7 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-package de.schildbach.pte;
+package de.schildbach.pte.dto;
 
 /**
  * @author Andreas Schildbach

src/de/schildbach/pte/exception/SessionExpiredException.java

@@ -15,7 +15,7 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-package de.schildbach.pte;
+package de.schildbach.pte.exception;
 
 import java.io.IOException;
 

src/de/schildbach/pte/util/Color.java

@@ -15,7 +15,7 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-package de.schildbach.pte;
+package de.schildbach.pte.util;
 
 /**
  * @author Andreas Schildbach

src/de/schildbach/pte/util/ParserUtils.java

@@ -15,7 +15,7 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-package de.schildbach.pte;
+package de.schildbach.pte.util;
 
 import java.io.IOException;
 import java.io.InputStreamReader;

test/de/schildbach/pte/live/BahnProviderLiveTest.java

@@ -22,11 +22,11 @@ import java.util.Date;
 import org.junit.Test;
 
 import de.schildbach.pte.BahnProvider;
-import de.schildbach.pte.Connection;
-import de.schildbach.pte.QueryConnectionsResult;
-import de.schildbach.pte.QueryDeparturesResult;
 import de.schildbach.pte.NetworkProvider.LocationType;
 import de.schildbach.pte.NetworkProvider.WalkSpeed;
+import de.schildbach.pte.dto.Connection;
+import de.schildbach.pte.dto.QueryConnectionsResult;
+import de.schildbach.pte.dto.QueryDeparturesResult;
 
 /**
  * @author Andreas Schildbach

test/de/schildbach/pte/live/GvhProviderLiveTest.java

@@ -20,9 +20,9 @@ import java.util.List;
 
 import org.junit.Test;
 
-import de.schildbach.pte.Autocomplete;
 import de.schildbach.pte.GvhProvider;
-import de.schildbach.pte.Station;
+import de.schildbach.pte.dto.Autocomplete;
+import de.schildbach.pte.dto.Station;
 
 /**
  * @author Andreas Schildbach

test/de/schildbach/pte/live/LinzProviderLiveTest.java

@@ -22,10 +22,10 @@ import java.util.Date;
 import org.junit.Test;
 
 import de.schildbach.pte.LinzProvider;
-import de.schildbach.pte.QueryConnectionsResult;
-import de.schildbach.pte.QueryDeparturesResult;
 import de.schildbach.pte.NetworkProvider.LocationType;
 import de.schildbach.pte.NetworkProvider.WalkSpeed;
+import de.schildbach.pte.dto.QueryConnectionsResult;
+import de.schildbach.pte.dto.QueryDeparturesResult;
 
 /**
  * @author Andreas Schildbach

test/de/schildbach/pte/live/MvvProviderLiveTest.java

@@ -22,9 +22,9 @@ import java.util.Date;
 import org.junit.Test;
 
 import de.schildbach.pte.MvvProvider;
-import de.schildbach.pte.QueryConnectionsResult;
 import de.schildbach.pte.NetworkProvider.LocationType;
 import de.schildbach.pte.NetworkProvider.WalkSpeed;
+import de.schildbach.pte.dto.QueryConnectionsResult;
 
 /**
  * @author Andreas Schildbach

test/de/schildbach/pte/live/NasaProviderLiveTest.java

@@ -21,8 +21,8 @@ import java.util.List;
 import org.junit.Test;
 
 import de.schildbach.pte.NasaProvider;
-import de.schildbach.pte.QueryDeparturesResult;
+import de.schildbach.pte.dto.QueryDeparturesResult;
-import de.schildbach.pte.Station;
+import de.schildbach.pte.dto.Station;
 
 /**
  * @author Andreas Schildbach

test/de/schildbach/pte/live/OebbProviderLiveTest.java

@@ -23,10 +23,10 @@ import java.util.List;
 import org.junit.Test;
 
 import de.schildbach.pte.OebbProvider;
-import de.schildbach.pte.QueryConnectionsResult;
-import de.schildbach.pte.Station;
 import de.schildbach.pte.NetworkProvider.LocationType;
 import de.schildbach.pte.NetworkProvider.WalkSpeed;
+import de.schildbach.pte.dto.QueryConnectionsResult;
+import de.schildbach.pte.dto.Station;
 
 /**
  * @author Andreas Schildbach

test/de/schildbach/pte/live/RmvProviderLiveTest.java

@@ -21,7 +21,7 @@ import java.util.List;
 import org.junit.Test;
 
 import de.schildbach.pte.RmvProvider;
-import de.schildbach.pte.Station;
+import de.schildbach.pte.dto.Station;
 
 /**
  * @author Andreas Schildbach

test/de/schildbach/pte/live/SbbProviderLiveTest.java

@@ -22,12 +22,12 @@ import java.util.List;
 
 import org.junit.Test;
 
-import de.schildbach.pte.Autocomplete;
-import de.schildbach.pte.QueryConnectionsResult;
 import de.schildbach.pte.SbbProvider;
-import de.schildbach.pte.Station;
 import de.schildbach.pte.NetworkProvider.LocationType;
 import de.schildbach.pte.NetworkProvider.WalkSpeed;
+import de.schildbach.pte.dto.Autocomplete;
+import de.schildbach.pte.dto.QueryConnectionsResult;
+import de.schildbach.pte.dto.Station;
 
 /**
  * @author Andreas Schildbach

test/de/schildbach/pte/live/SncbProviderLiveTest.java

@@ -21,7 +21,7 @@ import java.util.List;
 import org.junit.Test;
 
 import de.schildbach.pte.SncbProvider;
-import de.schildbach.pte.Station;
+import de.schildbach.pte.dto.Station;
 
 /**
  * @author Andreas Schildbach

test/de/schildbach/pte/live/VgsProviderLiveTest.java

@@ -20,9 +20,9 @@ import java.util.List;
 
 import org.junit.Test;
 
-import de.schildbach.pte.QueryDeparturesResult;
-import de.schildbach.pte.Station;
 import de.schildbach.pte.VgsProvider;
+import de.schildbach.pte.dto.QueryDeparturesResult;
+import de.schildbach.pte.dto.Station;
 
 /**
  * @author Andreas Schildbach

test/de/schildbach/pte/live/VrnProviderLiveTest.java

@@ -20,9 +20,9 @@ import java.util.List;
 
 import org.junit.Test;
 
-import de.schildbach.pte.QueryDeparturesResult;
-import de.schildbach.pte.Station;
 import de.schildbach.pte.VrnProvider;
+import de.schildbach.pte.dto.QueryDeparturesResult;
+import de.schildbach.pte.dto.Station;
 
 /**
  * @author Andreas Schildbach

test/de/schildbach/pte/live/VrrProviderLiveTest.java

@@ -20,9 +20,9 @@ import java.util.List;
 
 import org.junit.Test;
 
-import de.schildbach.pte.QueryDeparturesResult;
-import de.schildbach.pte.Station;
 import de.schildbach.pte.VrrProvider;
+import de.schildbach.pte.dto.QueryDeparturesResult;
+import de.schildbach.pte.dto.Station;
 
 /**
  * @author Andreas Schildbach