Permalink
Browse files

Merge branch 'master' of github.com:Pezmc/H14

  • Loading branch information...
2 parents a029cf6 + 5857a88 commit b0c02cf9836a3014b4e04d2c3f37f3aeeef86d48 @Pezmc committed May 9, 2012
Showing with 4,684 additions and 432 deletions.
  1. +16 −2 IBMS/doc/allclasses-frame.html
  2. +16 −2 IBMS/doc/allclasses-noframe.html
  3. +2 −2 IBMS/doc/constant-values.html
  4. +2 −2 IBMS/doc/deprecated-list.html
  5. +2 −2 IBMS/doc/help-doc.html
  6. +2 −2 IBMS/doc/ibms/BusInfo.html
  7. +86 −6 IBMS/doc/ibms/BusStopInfo.html
  8. +2 −2 IBMS/doc/ibms/DriverInfo.html
  9. +2 −2 IBMS/doc/ibms/IBMS.html
  10. +103 −28 IBMS/doc/ibms/Interface.html
  11. +4 −4 IBMS/doc/ibms/InvalidQueryException.html
  12. +405 −0 IBMS/doc/ibms/JourneyPlanner.html
  13. +427 −0 IBMS/doc/ibms/JourneyPlannerInterface.html
  14. +302 −0 IBMS/doc/ibms/LiveInfo.html
  15. +454 −0 IBMS/doc/ibms/LiveInfoInterface.html
  16. +427 −0 IBMS/doc/ibms/NewInterface.html
  17. +4 −4 IBMS/doc/ibms/RDH.html
  18. +84 −71 IBMS/doc/ibms/Roster.html
  19. +280 −0 IBMS/doc/ibms/RosterGenerator.html
  20. +318 −0 IBMS/doc/ibms/Shifts.html
  21. +4 −4 IBMS/doc/ibms/TestDriver.html
  22. +69 −2 IBMS/doc/ibms/TimetableInfo.html
  23. +2 −2 IBMS/doc/ibms/TimetableInfo.timetableKind.html
  24. +2 −2 IBMS/doc/ibms/UserInterface.html
  25. +55 −3 IBMS/doc/ibms/Util.html
  26. +21 −2 IBMS/doc/ibms/database.html
  27. +16 −2 IBMS/doc/ibms/package-frame.html
  28. +32 −3 IBMS/doc/ibms/package-summary.html
  29. +4 −10 IBMS/doc/ibms/package-tree.html
  30. +149 −20 IBMS/doc/index-all.html
  31. +1 −1 IBMS/doc/index.html
  32. +4 −10 IBMS/doc/overview-tree.html
  33. +365 −5 IBMS/doc/serialized-form.html
  34. +2 −1 IBMS/nbproject/project.properties
  35. +19 −0 IBMS/src/ibms/BusRoot.java.bck
  36. +0 −1 IBMS/src/ibms/Driver.java
  37. +183 −0 IBMS/src/ibms/Interface.java.bck
  38. +27 −13 IBMS/src/ibms/JourneyPlanner.java
  39. +86 −14 IBMS/src/ibms/LiveInfo.java
  40. +33 −48 IBMS/src/ibms/LiveInfoInterface.form
  41. +67 −160 IBMS/src/ibms/LiveInfoInterface.java
  42. +321 −0 IBMS/src/ibms/Roster.java.bck
  43. +19 −0 IBMS/src/ibms/TimetableInfo.java
  44. +136 −0 IBMS/test/ibms/JourneyPlannerTest.java
  45. +129 −0 IBMS/test/ibms/LiveInfoTest.java
@@ -2,12 +2,12 @@
<!--NewPage-->
<HTML>
<HEAD>
-<!-- Generated by javadoc (build 1.6.0_20) on Wed Mar 14 22:01:28 GMT 2012 -->
+<!-- Generated by javadoc (build 1.6.0_20) on Wed May 09 09:30:08 BST 2012 -->
<TITLE>
All Classes
</TITLE>
-<META NAME="date" CONTENT="2012-03-14">
+<META NAME="date" CONTENT="2012-05-09">
<LINK REL ="stylesheet" TYPE="text/css" HREF="stylesheet.css" TITLE="Style">
@@ -35,10 +35,24 @@
<BR>
<A HREF="ibms/InvalidQueryException.html" title="class in ibms" target="classFrame">InvalidQueryException</A>
<BR>
+<A HREF="ibms/JourneyPlanner.html" title="class in ibms" target="classFrame">JourneyPlanner</A>
+<BR>
+<A HREF="ibms/JourneyPlannerInterface.html" title="class in ibms" target="classFrame">JourneyPlannerInterface</A>
+<BR>
+<A HREF="ibms/LiveInfo.html" title="class in ibms" target="classFrame">LiveInfo</A>
+<BR>
+<A HREF="ibms/LiveInfoInterface.html" title="class in ibms" target="classFrame">LiveInfoInterface</A>
+<BR>
+<A HREF="ibms/NewInterface.html" title="class in ibms" target="classFrame">NewInterface</A>
+<BR>
<A HREF="ibms/RDH.html" title="class in ibms" target="classFrame">RDH</A>
<BR>
<A HREF="ibms/Roster.html" title="class in ibms" target="classFrame">Roster</A>
<BR>
+<A HREF="ibms/RosterGenerator.html" title="class in ibms" target="classFrame">RosterGenerator</A>
+<BR>
+<A HREF="ibms/Shifts.html" title="class in ibms" target="classFrame">Shifts</A>
+<BR>
<A HREF="ibms/TestDriver.html" title="class in ibms" target="classFrame">TestDriver</A>
<BR>
<A HREF="ibms/TimetableInfo.html" title="class in ibms" target="classFrame">TimetableInfo</A>
@@ -2,12 +2,12 @@
<!--NewPage-->
<HTML>
<HEAD>
-<!-- Generated by javadoc (build 1.6.0_20) on Wed Mar 14 22:01:28 GMT 2012 -->
+<!-- Generated by javadoc (build 1.6.0_20) on Wed May 09 09:30:08 BST 2012 -->
<TITLE>
All Classes
</TITLE>
-<META NAME="date" CONTENT="2012-03-14">
+<META NAME="date" CONTENT="2012-05-09">
<LINK REL ="stylesheet" TYPE="text/css" HREF="stylesheet.css" TITLE="Style">
@@ -35,10 +35,24 @@
<BR>
<A HREF="ibms/InvalidQueryException.html" title="class in ibms">InvalidQueryException</A>
<BR>
+<A HREF="ibms/JourneyPlanner.html" title="class in ibms">JourneyPlanner</A>
+<BR>
+<A HREF="ibms/JourneyPlannerInterface.html" title="class in ibms">JourneyPlannerInterface</A>
+<BR>
+<A HREF="ibms/LiveInfo.html" title="class in ibms">LiveInfo</A>
+<BR>
+<A HREF="ibms/LiveInfoInterface.html" title="class in ibms">LiveInfoInterface</A>
+<BR>
+<A HREF="ibms/NewInterface.html" title="class in ibms">NewInterface</A>
+<BR>
<A HREF="ibms/RDH.html" title="class in ibms">RDH</A>
<BR>
<A HREF="ibms/Roster.html" title="class in ibms">Roster</A>
<BR>
+<A HREF="ibms/RosterGenerator.html" title="class in ibms">RosterGenerator</A>
+<BR>
+<A HREF="ibms/Shifts.html" title="class in ibms">Shifts</A>
+<BR>
<A HREF="ibms/TestDriver.html" title="class in ibms">TestDriver</A>
<BR>
<A HREF="ibms/TimetableInfo.html" title="class in ibms">TimetableInfo</A>
@@ -2,12 +2,12 @@
<!--NewPage-->
<HTML>
<HEAD>
-<!-- Generated by javadoc (build 1.6.0_20) on Wed Mar 14 22:01:28 GMT 2012 -->
+<!-- Generated by javadoc (build 1.6.0_20) on Wed May 09 09:30:08 BST 2012 -->
<TITLE>
Constant Field Values
</TITLE>
-<META NAME="date" CONTENT="2012-03-14">
+<META NAME="date" CONTENT="2012-05-09">
<LINK REL ="stylesheet" TYPE="text/css" HREF="stylesheet.css" TITLE="Style">
@@ -2,12 +2,12 @@
<!--NewPage-->
<HTML>
<HEAD>
-<!-- Generated by javadoc (build 1.6.0_20) on Wed Mar 14 22:01:28 GMT 2012 -->
+<!-- Generated by javadoc (build 1.6.0_20) on Wed May 09 09:30:08 BST 2012 -->
<TITLE>
Deprecated List
</TITLE>
-<META NAME="date" CONTENT="2012-03-14">
+<META NAME="date" CONTENT="2012-05-09">
<LINK REL ="stylesheet" TYPE="text/css" HREF="stylesheet.css" TITLE="Style">
View
@@ -2,12 +2,12 @@
<!--NewPage-->
<HTML>
<HEAD>
-<!-- Generated by javadoc (build 1.6.0_20) on Wed Mar 14 22:01:28 GMT 2012 -->
+<!-- Generated by javadoc (build 1.6.0_20) on Wed May 09 09:30:08 BST 2012 -->
<TITLE>
API Help
</TITLE>
-<META NAME="date" CONTENT="2012-03-14">
+<META NAME="date" CONTENT="2012-05-09">
<LINK REL ="stylesheet" TYPE="text/css" HREF="stylesheet.css" TITLE="Style">
@@ -2,12 +2,12 @@
<!--NewPage-->
<HTML>
<HEAD>
-<!-- Generated by javadoc (build 1.6.0_20) on Wed Mar 14 22:01:27 GMT 2012 -->
+<!-- Generated by javadoc (build 1.6.0_20) on Wed May 09 09:30:06 BST 2012 -->
<TITLE>
BusInfo
</TITLE>
-<META NAME="date" CONTENT="2012-03-14">
+<META NAME="date" CONTENT="2012-05-09">
<LINK REL ="stylesheet" TYPE="text/css" HREF="../stylesheet.css" TITLE="Style">
@@ -2,12 +2,12 @@
<!--NewPage-->
<HTML>
<HEAD>
-<!-- Generated by javadoc (build 1.6.0_20) on Wed Mar 14 22:01:27 GMT 2012 -->
+<!-- Generated by javadoc (build 1.6.0_20) on Wed May 09 09:30:06 BST 2012 -->
<TITLE>
BusStopInfo
</TITLE>
-<META NAME="date" CONTENT="2012-03-14">
+<META NAME="date" CONTENT="2012-05-09">
<LINK REL ="stylesheet" TYPE="text/css" HREF="../stylesheet.css" TITLE="Style">
@@ -74,9 +74,9 @@
</TR>
<TR>
<TD VALIGN="top" CLASS="NavBarCell3"><FONT SIZE="-2">
- SUMMARY:&nbsp;NESTED&nbsp;|&nbsp;FIELD&nbsp;|&nbsp;CONSTR&nbsp;|&nbsp;<A HREF="#method_summary">METHOD</A></FONT></TD>
+ SUMMARY:&nbsp;NESTED&nbsp;|&nbsp;<A HREF="#field_summary">FIELD</A>&nbsp;|&nbsp;CONSTR&nbsp;|&nbsp;<A HREF="#method_summary">METHOD</A></FONT></TD>
<TD VALIGN="top" CLASS="NavBarCell3"><FONT SIZE="-2">
-DETAIL:&nbsp;FIELD&nbsp;|&nbsp;CONSTR&nbsp;|&nbsp;<A HREF="#method_detail">METHOD</A></FONT></TD>
+DETAIL:&nbsp;<A HREF="#field_detail">FIELD</A>&nbsp;|&nbsp;CONSTR&nbsp;|&nbsp;<A HREF="#method_detail">METHOD</A></FONT></TD>
</TR>
</TABLE>
<A NAME="skip-navbar_top"></A>
@@ -119,7 +119,24 @@ <H2>
<HR>
<P>
+<!-- =========== FIELD SUMMARY =========== -->
+<A NAME="field_summary"><!-- --></A>
+<TABLE BORDER="1" WIDTH="100%" CELLPADDING="3" CELLSPACING="0" SUMMARY="">
+<TR BGCOLOR="#CCCCFF" CLASS="TableHeadingColor">
+<TH ALIGN="left" COLSPAN="2"><FONT SIZE="+2">
+<B>Field Summary</B></FONT></TH>
+</TR>
+<TR BGCOLOR="white" CLASS="TableRowColor">
+<TD ALIGN="right" VALIGN="top" WIDTH="1%"><FONT SIZE="-1">
+<CODE>static&nbsp;java.lang.String[]</CODE></FONT></TD>
+<TD><CODE><B><A HREF="../ibms/BusStopInfo.html#areaNamesCache">areaNamesCache</A></B></CODE>
+
+<BR>
+&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;Get the names of all the area codes</TD>
+</TR>
+</TABLE>
+&nbsp;
<!-- ========== METHOD SUMMARY =========== -->
<A NAME="method_summary"><!-- --></A>
@@ -179,6 +196,14 @@ <H2>
</TR>
<TR BGCOLOR="white" CLASS="TableRowColor">
<TD ALIGN="right" VALIGN="top" WIDTH="1%"><FONT SIZE="-1">
+<CODE>static&nbsp;java.lang.String[]</CODE></FONT></TD>
+<TD><CODE><B><A HREF="../ibms/BusStopInfo.html#getAreaNames()">getAreaNames</A></B>()</CODE>
+
+<BR>
+&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</TD>
+</TR>
+<TR BGCOLOR="white" CLASS="TableRowColor">
+<TD ALIGN="right" VALIGN="top" WIDTH="1%"><FONT SIZE="-1">
<CODE>static&nbsp;int[]</CODE></FONT></TD>
<TD><CODE><B><A HREF="../ibms/BusStopInfo.html#getAreas()">getAreas</A></B>()</CODE>
@@ -255,6 +280,15 @@ <H2>
</TR>
<TR BGCOLOR="white" CLASS="TableRowColor">
<TD ALIGN="right" VALIGN="top" WIDTH="1%"><FONT SIZE="-1">
+<CODE>static&nbsp;java.lang.String</CODE></FONT></TD>
+<TD><CODE><B><A HREF="../ibms/BusStopInfo.html#getStopName(int)">getStopName</A></B>(int&nbsp;busStop)</CODE>
+
+<BR>
+&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;Get the SENSIBLE NAME name of a bus stop
+ "Marple,Navigation"</TD>
+</TR>
+<TR BGCOLOR="white" CLASS="TableRowColor">
+<TD ALIGN="right" VALIGN="top" WIDTH="1%"><FONT SIZE="-1">
<CODE>static&nbsp;boolean</CODE></FONT></TD>
<TD><CODE><B><A HREF="../ibms/BusStopInfo.html#isTimingPoint(int)">isTimingPoint</A></B>(int&nbsp;busStop)</CODE>
@@ -283,6 +317,27 @@ <H2>
&nbsp;
<P>
+<!-- ============ FIELD DETAIL =========== -->
+
+<A NAME="field_detail"><!-- --></A>
+<TABLE BORDER="1" WIDTH="100%" CELLPADDING="3" CELLSPACING="0" SUMMARY="">
+<TR BGCOLOR="#CCCCFF" CLASS="TableHeadingColor">
+<TH ALIGN="left" COLSPAN="1"><FONT SIZE="+2">
+<B>Field Detail</B></FONT></TH>
+</TR>
+</TABLE>
+
+<A NAME="areaNamesCache"><!-- --></A><H3>
+areaNamesCache</H3>
+<PRE>
+public static java.lang.String[] <B>areaNamesCache</B></PRE>
+<DL>
+<DD>Get the names of all the area codes
+<P>
+<DL>
+</DL>
+</DL>
+
<!-- ============ METHOD DETAIL ========== -->
<A NAME="method_detail"><!-- --></A>
@@ -390,6 +445,20 @@ <H2>
</DL>
<HR>
+<A NAME="getStopName(int)"><!-- --></A><H3>
+getStopName</H3>
+<PRE>
+public static java.lang.String <B>getStopName</B>(int&nbsp;busStop)</PRE>
+<DL>
+<DD>Get the SENSIBLE NAME name of a bus stop
+ "Marple,Navigation"
+<P>
+<DD><DL>
+</DL>
+</DD>
+</DL>
+<HR>
+
<A NAME="getBusStopsInArea(int)"><!-- --></A><H3>
getBusStopsInArea</H3>
<PRE>
@@ -473,6 +542,17 @@ <H2>
</DL>
<HR>
+<A NAME="getAreaNames()"><!-- --></A><H3>
+getAreaNames</H3>
+<PRE>
+public static java.lang.String[] <B>getAreaNames</B>()</PRE>
+<DL>
+<DD><DL>
+</DL>
+</DD>
+</DL>
+<HR>
+
<A NAME="getAreaCode(int)"><!-- --></A><H3>
getAreaCode</H3>
<PRE>
@@ -573,9 +653,9 @@ <H2>
</TR>
<TR>
<TD VALIGN="top" CLASS="NavBarCell3"><FONT SIZE="-2">
- SUMMARY:&nbsp;NESTED&nbsp;|&nbsp;FIELD&nbsp;|&nbsp;CONSTR&nbsp;|&nbsp;<A HREF="#method_summary">METHOD</A></FONT></TD>
+ SUMMARY:&nbsp;NESTED&nbsp;|&nbsp;<A HREF="#field_summary">FIELD</A>&nbsp;|&nbsp;CONSTR&nbsp;|&nbsp;<A HREF="#method_summary">METHOD</A></FONT></TD>
<TD VALIGN="top" CLASS="NavBarCell3"><FONT SIZE="-2">
-DETAIL:&nbsp;FIELD&nbsp;|&nbsp;CONSTR&nbsp;|&nbsp;<A HREF="#method_detail">METHOD</A></FONT></TD>
+DETAIL:&nbsp;<A HREF="#field_detail">FIELD</A>&nbsp;|&nbsp;CONSTR&nbsp;|&nbsp;<A HREF="#method_detail">METHOD</A></FONT></TD>
</TR>
</TABLE>
<A NAME="skip-navbar_bottom"></A>
@@ -2,12 +2,12 @@
<!--NewPage-->
<HTML>
<HEAD>
-<!-- Generated by javadoc (build 1.6.0_20) on Wed Mar 14 22:01:27 GMT 2012 -->
+<!-- Generated by javadoc (build 1.6.0_20) on Wed May 09 09:30:06 BST 2012 -->
<TITLE>
DriverInfo
</TITLE>
-<META NAME="date" CONTENT="2012-03-14">
+<META NAME="date" CONTENT="2012-05-09">
<LINK REL ="stylesheet" TYPE="text/css" HREF="../stylesheet.css" TITLE="Style">
View
@@ -2,12 +2,12 @@
<!--NewPage-->
<HTML>
<HEAD>
-<!-- Generated by javadoc (build 1.6.0_20) on Wed Mar 14 22:01:27 GMT 2012 -->
+<!-- Generated by javadoc (build 1.6.0_20) on Wed May 09 09:30:06 BST 2012 -->
<TITLE>
IBMS
</TITLE>
-<META NAME="date" CONTENT="2012-03-14">
+<META NAME="date" CONTENT="2012-05-09">
<LINK REL ="stylesheet" TYPE="text/css" HREF="../stylesheet.css" TITLE="Style">
Oops, something went wrong.

0 comments on commit b0c02cf

Please sign in to comment.