Kr Younger 6 jaren geleden
bovenliggende
commit
1fa5731a72
2 gewijzigde bestanden met toevoegingen van 30 en 35 verwijderingen
  1. 9
    15
      .idea/workspace.xml
  2. 21
    20
      README.md

+ 9
- 15
.idea/workspace.xml Bestand weergeven

@@ -2,12 +2,6 @@
2 2
 <project version="4">
3 3
   <component name="ChangeListManager">
4 4
     <list default="true" id="926ad23d-2ddc-41ae-980d-780dcc1811fa" name="Default" comment="">
5
-      <change beforePath="" afterPath="$PROJECT_DIR$/Checkbook/src/main/java/AccountBook.java" />
6
-      <change beforePath="" afterPath="$PROJECT_DIR$/Checkbook/src/main/java/GenericAccount.java" />
7
-      <change beforePath="$PROJECT_DIR$/.idea/workspace.xml" afterPath="$PROJECT_DIR$/.idea/workspace.xml" />
8
-      <change beforePath="$PROJECT_DIR$/Checkbook/src/main/java/Checkbook.java" afterPath="$PROJECT_DIR$/Checkbook/src/main/java/Checkbook.java" />
9
-      <change beforePath="$PROJECT_DIR$/Checkbook/src/main/java/Transaction.java" afterPath="$PROJECT_DIR$/Checkbook/src/main/java/Transaction.java" />
10
-      <change beforePath="$PROJECT_DIR$/Checkbook/src/main/java/TransactionType.java" afterPath="$PROJECT_DIR$/Checkbook/src/main/java/TransactionType.java" />
11 5
       <change beforePath="$PROJECT_DIR$/README.md" afterPath="$PROJECT_DIR$/README.md" />
12 6
     </list>
13 7
     <ignored path="$PROJECT_DIR$/Checkbook/target/" />
@@ -24,8 +18,8 @@
24 18
         <entry file="file://$PROJECT_DIR$/README.md">
25 19
           <provider selected="true" editor-type-id="split-provider[text-editor;markdown-preview-editor]">
26 20
             <state split_layout="SPLIT">
27
-              <first_editor relative-caret-position="443">
28
-                <caret line="31" column="29" lean-forward="false" selection-start-line="31" selection-start-column="29" selection-end-line="31" selection-end-column="29" />
21
+              <first_editor relative-caret-position="171">
22
+                <caret line="15" column="0" lean-forward="false" selection-start-line="15" selection-start-column="0" selection-end-line="15" selection-end-column="0" />
29 23
                 <folding />
30 24
               </first_editor>
31 25
               <second_editor />
@@ -78,8 +72,8 @@
78 72
     <sorting>DEFINITION_ORDER</sorting>
79 73
   </component>
80 74
   <component name="ProjectFrameBounds">
81
-    <option name="x" value="91" />
82
-    <option name="y" value="61" />
75
+    <option name="x" value="115" />
76
+    <option name="y" value="45" />
83 77
     <option name="width" value="1538" />
84 78
     <option name="height" value="962" />
85 79
   </component>
@@ -268,15 +262,15 @@
268 262
       <option name="number" value="Default" />
269 263
       <option name="presentableId" value="Default" />
270 264
       <updated>1543958631974</updated>
271
-      <workItem from="1543958633447" duration="2990000" />
265
+      <workItem from="1543958633447" duration="3202000" />
272 266
     </task>
273 267
     <servers />
274 268
   </component>
275 269
   <component name="TimeTrackingManager">
276
-    <option name="totallyTimeSpent" value="2990000" />
270
+    <option name="totallyTimeSpent" value="3202000" />
277 271
   </component>
278 272
   <component name="ToolWindowManager">
279
-    <frame x="91" y="61" width="1538" height="962" extended-state="0" />
273
+    <frame x="115" y="45" width="1538" height="962" extended-state="0" />
280 274
     <editor active="true" />
281 275
     <layout>
282 276
       <window_info id="Palette" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="-1" side_tool="false" content_ui="tabs" />
@@ -424,8 +418,8 @@
424 418
     <entry file="file://$PROJECT_DIR$/README.md">
425 419
       <provider selected="true" editor-type-id="split-provider[text-editor;markdown-preview-editor]">
426 420
         <state split_layout="SPLIT">
427
-          <first_editor relative-caret-position="443">
428
-            <caret line="31" column="29" lean-forward="false" selection-start-line="31" selection-start-column="29" selection-end-line="31" selection-end-column="29" />
421
+          <first_editor relative-caret-position="171">
422
+            <caret line="15" column="0" lean-forward="false" selection-start-line="15" selection-start-column="0" selection-end-line="15" selection-end-column="0" />
429 423
             <folding />
430 424
           </first_editor>
431 425
           <second_editor />

+ 21
- 20
README.md Bestand weergeven

@@ -13,34 +13,35 @@ Checkbook
13 13
  needs to organize and track a series of Transaction objects. See the Transaction class file.
14 14
  Transaction needs to use a few Payee objects for your tests.
15 15
  
16
- * int size()
17
- * boolean isEmpty()
18
- * boolean contains(Transaction element)
19
- * boolean add(Transaction element)
20
- * boolean remove(Transaction element)
21
- * Iterator<Transaction> iterator()
16
+* int size()
17
+* boolean isEmpty()
18
+* boolean contains(Transaction element)
19
+* boolean add(Transaction element)
20
+* boolean remove(Transaction element)
21
+* Iterator<Transaction> iterator()
22 22
  
23 23
  AND
24 24
  
25
- * Transaction[] toArray()
26
- * <Transaction> Transaction[] toArray(Transaction[] a)
25
+* Transaction[] toArray()
26
+* <Transaction> Transaction[] toArray(Transaction[] a)
27 27
  
28
- * double checkbookValue() // sum of all Transactions (both Debits and Credits)
29
- * Transaction getTransactionsForDate(LocalDate aDate)
30
- * Transaction[] getAllTransactionsForPayee(Payee payee)
31
- * Transaction[] getAllDebitTransactions()
32
- * Transaction[] getAllCreditTransactions()
28
+* double checkbookValue() // sum of all Transactions (both Debits and Credits)
29
+* Transaction getTransactionsForDate(LocalDate aDate)
30
+* Transaction[] getAllTransactionsForPayee(Payee payee)
31
+* Transaction[] getAllDebitTransactions()
32
+* Transaction[] getAllCreditTransactions()
33 33
  
34 34
  Special Constructors:
35
- * Checkbook(double cashAmount)
36
- * Checkbook(Payee owner, double cashAmount)
35
+
36
+* Checkbook(double cashAmount)
37
+* Checkbook(Payee owner, double cashAmount)
37 38
  
38 39
  
39
- PLUS (For Extra Points, 10 million extra, to be precise)
40
+PLUS (For Extra Points, 10 million extra, to be precise)
40 41
  
41
- * containsAll(Collection<Transaction> c) 
42
- * boolean addAll(Collection<Transaction> c)
43
- * boolean removeAll(Collection<Transaction> c)
44
- * void clear()
42
+* containsAll(Collection<Transaction> c) 
43
+* boolean addAll(Collection<Transaction> c)
44
+* boolean removeAll(Collection<Transaction> c)
45
+* void clear()
45 46
 
46 47
 finally, make a generic account class, that takes any class which implements the AccountBook interface.