07_02_Start

jchadwick · jchadwick · commit 63dfd8eb0242 · 2016-02-22T01:32:55.000-05:00
diff --git a/KeyValuePairPrinter.ts b/KeyValuePairPrinter.ts
diff --git a/TodoService.ts b/TodoService.ts
@@ -1,8 +1,4 @@
-interface IIdGenerator {
-    nextId: number;
-}
-
-class TodoService implements ITodoService, IIdGenerator {
+class TodoService implements ITodoService {
 
     private static _lastId: number = 0;
 
diff --git a/TodoStateChanger.ts b/TodoStateChanger.ts
diff --git a/app.ts b/app.ts
@@ -1,12 +0,0 @@
-interface IHaveALength {
-    length: number;
-}
-
-function totalLength<T extends IHaveALength>(x: T, y: T) {
-    var total: number = x.length + y.length;
-    return total;
-}
-
-class CustomArray<T> extends Array<T> {}
-
-var length = totalLength([1, 2, 3], new CustomArray<number>())
diff --git a/index.html b/index.html
@@ -10,7 +10,6 @@
     <div id="container" class="container">
     </div>
     <script type="text/javascript" src="model.js"></script>
-    <script type="text/javascript" src="TodoStateChanger.js"></script>
     <script type="text/javascript" src="TodoService.js"></script>
     <script type="text/javascript" src="app.js"></script>
 </body>
diff --git a/model.ts b/model.ts
@@ -1,19 +1,22 @@
-interface ITodoService {
-    add(todo: Todo): Todo;
-    delete(todoId: number): void;
-    getAll(): Todo[];
-    getById(todoId: number): Todo;
-}
+
 
 interface Todo {
     id: number;
     name: string;
     state: TodoState;
 }
 
+/* START: TodoState */
 enum TodoState {
     New = 1,
     Active,
     Complete,
     Deleted
 }
+
+interface ITodoService {
+    add(todo: Todo): Todo;
+    delete(todoId: number): void;
+    getAll(): Todo[];
+    getById(todoId: number): Todo;
+}
