Whitney Martinez 6 lat temu
rodzic
commit
d52e1ac906

+ 30
- 62
.idea/workspace.xml Wyświetl plik

@@ -2,14 +2,8 @@
2 2
 <project version="4">
3 3
   <component name="ChangeListManager">
4 4
     <list default="true" id="268ab437-e0d5-4447-8401-9f321aad6d50" name="Default" comment="">
5
-      <change afterPath="$PROJECT_DIR$/src/main/java/com/zipcodewilmington/productmanager/Manager.java" afterDir="false" />
6
-      <change afterPath="$PROJECT_DIR$/src/test/java/com/zipcodewilmington/productmanager/ManagerTest.java" afterDir="false" />
7
-      <change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" />
8
-      <change beforePath="$PROJECT_DIR$/pom.xml" beforeDir="false" afterPath="$PROJECT_DIR$/pom.xml" afterDir="false" />
9 5
       <change beforePath="$PROJECT_DIR$/src/main/java/com/zipcodewilmington/productmanager/MainApplication.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/zipcodewilmington/productmanager/MainApplication.java" afterDir="false" />
10
-      <change beforePath="$PROJECT_DIR$/src/main/java/com/zipcodewilmington/productmanager/Market.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/zipcodewilmington/productmanager/Market.java" afterDir="false" />
11 6
       <change beforePath="$PROJECT_DIR$/src/main/java/com/zipcodewilmington/productmanager/Product.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/zipcodewilmington/productmanager/Product.java" afterDir="false" />
12
-      <change beforePath="$PROJECT_DIR$/src/test/java/com/zipcodewilmington/productmanager/ProductTest.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/test/java/com/zipcodewilmington/productmanager/ProductTest.java" afterDir="false" />
13 7
     </list>
14 8
     <ignored path="$PROJECT_DIR$/out/" />
15 9
     <ignored path="$PROJECT_DIR$/target/" />
@@ -74,21 +68,22 @@
74 68
     <session id="-1363925760">
75 69
       <usages-collector id="statistics.lifecycle.project">
76 70
         <counts>
77
-          <entry key="project.closed" value="2" />
71
+          <entry key="project.closed" value="3" />
78 72
           <entry key="project.open.time.1" value="2" />
79
-          <entry key="project.opened" value="2" />
73
+          <entry key="project.open.time.9" value="1" />
74
+          <entry key="project.opened" value="3" />
80 75
         </counts>
81 76
       </usages-collector>
82 77
       <usages-collector id="statistics.file.extensions.edit">
83 78
         <counts>
84
-          <entry key="java" value="4990" />
79
+          <entry key="java" value="5060" />
85 80
           <entry key="sql" value="184" />
86 81
           <entry key="xml" value="5" />
87 82
         </counts>
88 83
       </usages-collector>
89 84
       <usages-collector id="statistics.file.types.edit">
90 85
         <counts>
91
-          <entry key="JAVA" value="4990" />
86
+          <entry key="JAVA" value="5060" />
92 87
           <entry key="Scratch" value="184" />
93 88
           <entry key="XML" value="5" />
94 89
         </counts>
@@ -118,8 +113,8 @@
118 113
       <file pinned="false" current-in-tab="true">
119 114
         <entry file="file://$PROJECT_DIR$/src/main/java/com/zipcodewilmington/productmanager/MainApplication.java">
120 115
           <provider selected="true" editor-type-id="text-editor">
121
-            <state relative-caret-position="166">
122
-              <caret line="120" column="68" selection-start-line="120" selection-start-column="68" selection-end-line="120" selection-end-column="68" />
116
+            <state relative-caret-position="375">
117
+              <caret line="129" column="31" selection-start-line="129" selection-start-column="31" selection-end-line="129" selection-end-column="31" />
123 118
               <folding>
124 119
                 <element signature="imports" expanded="true" />
125 120
               </folding>
@@ -131,7 +126,7 @@
131 126
         <entry file="file://$PROJECT_DIR$/src/main/java/com/zipcodewilmington/productmanager/Manager.java">
132 127
           <provider selected="true" editor-type-id="text-editor">
133 128
             <state relative-caret-position="510">
134
-              <caret line="34" column="5" lean-forward="true" selection-start-line="34" selection-start-column="5" selection-end-line="34" selection-end-column="5" />
129
+              <caret line="34" column="5" selection-start-line="34" selection-start-column="5" selection-end-line="34" selection-end-column="5" />
135 130
             </state>
136 131
           </provider>
137 132
         </entry>
@@ -139,16 +134,8 @@
139 134
       <file pinned="false" current-in-tab="false">
140 135
         <entry file="file://$PROJECT_DIR$/src/main/java/com/zipcodewilmington/productmanager/Product.java">
141 136
           <provider selected="true" editor-type-id="text-editor">
142
-            <state relative-caret-position="278">
143
-              <caret line="68" column="50" selection-start-line="68" selection-start-column="50" selection-end-line="68" selection-end-column="50" />
144
-              <folding>
145
-                <element signature="e#855#856#0" expanded="true" />
146
-                <element signature="e#895#896#0" expanded="true" />
147
-                <element signature="e#926#927#0" expanded="true" />
148
-                <element signature="e#953#954#0" expanded="true" />
149
-                <element signature="e#993#994#0" expanded="true" />
150
-                <element signature="e#1025#1026#0" expanded="true" />
151
-              </folding>
137
+            <state relative-caret-position="403">
138
+              <caret line="68" column="51" selection-start-line="68" selection-start-column="51" selection-end-line="68" selection-end-column="51" />
152 139
             </state>
153 140
           </provider>
154 141
         </entry>
@@ -284,7 +271,7 @@
284 271
     <property name="DatabaseDriversLRU" value="mysql" />
285 272
     <property name="WebServerToolWindowFactoryState" value="false" />
286 273
     <property name="aspect.path.notification.shown" value="true" />
287
-    <property name="com.android.tools.idea.instantapp.provision.ProvisionBeforeRunTaskProvider.myTimeStamp" value="1541042294579" />
274
+    <property name="com.android.tools.idea.instantapp.provision.ProvisionBeforeRunTaskProvider.myTimeStamp" value="1541069721329" />
288 275
     <property name="last_opened_file_path" value="$PROJECT_DIR$" />
289 276
     <property name="project.structure.last.edited" value="Project" />
290 277
     <property name="project.structure.proportion" value="0.0" />
@@ -504,6 +491,7 @@
504 491
       <workItem from="1540915392100" duration="924000" />
505 492
       <workItem from="1540922290217" duration="223000" />
506 493
       <workItem from="1540925922296" duration="44535000" />
494
+      <workItem from="1541069272529" duration="450000" />
507 495
     </task>
508 496
     <servers />
509 497
   </component>
@@ -540,7 +528,7 @@
540 528
     </history-entry>
541 529
   </component>
542 530
   <component name="TimeTrackingManager">
543
-    <option name="totallyTimeSpent" value="53796000" />
531
+    <option name="totallyTimeSpent" value="54246000" />
544 532
   </component>
545 533
   <component name="ToolWindowManager">
546 534
     <frame x="93" y="23" width="1187" height="709" extended-state="0" />
@@ -608,27 +596,15 @@
608 596
         </state>
609 597
       </provider>
610 598
     </entry>
611
-    <entry file="file://$PROJECT_DIR$/src/test/java/Market.java">
612
-      <provider selected="true" editor-type-id="text-editor" />
613
-    </entry>
599
+    <entry file="file://$PROJECT_DIR$/src/test/java/Market.java" />
614 600
     <entry file="jar:///Library/Java/JavaVirtualMachines/jdk1.8.0_191.jdk/Contents/Home/src.zip!/java/util/ArrayList.java">
615 601
       <provider selected="true" editor-type-id="text-editor">
616 602
         <state relative-caret-position="-1806">
617 603
           <caret line="164" column="11" selection-start-line="164" selection-start-column="11" selection-end-line="164" selection-end-column="11" />
618
-          <folding>
619
-            <element signature="e#6283#6284#0" expanded="true" />
620
-            <element signature="e#6351#6352#0" expanded="true" />
621
-          </folding>
622
-        </state>
623
-      </provider>
624
-    </entry>
625
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/zipcodewilmington/productmanager/Time_to_close_shop.java">
626
-      <provider selected="true" editor-type-id="text-editor">
627
-        <state relative-caret-position="105">
628
-          <caret line="7" lean-forward="true" selection-start-line="7" selection-end-line="7" />
629 604
         </state>
630 605
       </provider>
631 606
     </entry>
607
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/zipcodewilmington/productmanager/Time_to_close_shop.java" />
632 608
     <entry file="file://$PROJECT_DIR$/pom.xml">
633 609
       <provider selected="true" editor-type-id="text-editor">
634 610
         <state relative-caret-position="239">
@@ -670,45 +646,37 @@
670 646
         </state>
671 647
       </provider>
672 648
     </entry>
673
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/zipcodewilmington/productmanager/Manager.java">
649
+    <entry file="file://$PROJECT_DIR$/../CR-MicroLabs-JavaFundamentals-TalkingPets/pom.xml">
650
+      <provider selected="true" editor-type-id="text-editor" />
651
+    </entry>
652
+    <entry file="file://$PROJECT_DIR$/../../Calculator/Math_methods copy.java">
674 653
       <provider selected="true" editor-type-id="text-editor">
675
-        <state relative-caret-position="510">
676
-          <caret line="34" column="5" lean-forward="true" selection-start-line="34" selection-start-column="5" selection-end-line="34" selection-end-column="5" />
654
+        <state relative-caret-position="408">
655
+          <caret line="73" lean-forward="true" selection-start-line="73" selection-end-line="73" />
677 656
         </state>
678 657
       </provider>
679 658
     </entry>
680
-    <entry file="file://$PROJECT_DIR$/../CR-MicroLabs-JavaFundamentals-TalkingPets/pom.xml">
659
+    <entry file="file://$PROJECT_DIR$/../../calc2/ZCW-MacroLabs-OOP-ScientificCalculator/Math_methods.java">
681 660
       <provider selected="true" editor-type-id="text-editor" />
682 661
     </entry>
683
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/zipcodewilmington/productmanager/Product.java">
662
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/zipcodewilmington/productmanager/Manager.java">
684 663
       <provider selected="true" editor-type-id="text-editor">
685
-        <state relative-caret-position="278">
686
-          <caret line="68" column="50" selection-start-line="68" selection-start-column="50" selection-end-line="68" selection-end-column="50" />
687
-          <folding>
688
-            <element signature="e#855#856#0" expanded="true" />
689
-            <element signature="e#895#896#0" expanded="true" />
690
-            <element signature="e#926#927#0" expanded="true" />
691
-            <element signature="e#953#954#0" expanded="true" />
692
-            <element signature="e#993#994#0" expanded="true" />
693
-            <element signature="e#1025#1026#0" expanded="true" />
694
-          </folding>
664
+        <state relative-caret-position="510">
665
+          <caret line="34" column="5" selection-start-line="34" selection-start-column="5" selection-end-line="34" selection-end-column="5" />
695 666
         </state>
696 667
       </provider>
697 668
     </entry>
698
-    <entry file="file://$PROJECT_DIR$/../../Calculator/Math_methods copy.java">
669
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/zipcodewilmington/productmanager/Product.java">
699 670
       <provider selected="true" editor-type-id="text-editor">
700
-        <state relative-caret-position="408">
701
-          <caret line="73" lean-forward="true" selection-start-line="73" selection-end-line="73" />
671
+        <state relative-caret-position="403">
672
+          <caret line="68" column="51" selection-start-line="68" selection-start-column="51" selection-end-line="68" selection-end-column="51" />
702 673
         </state>
703 674
       </provider>
704 675
     </entry>
705
-    <entry file="file://$PROJECT_DIR$/../../calc2/ZCW-MacroLabs-OOP-ScientificCalculator/Math_methods.java">
706
-      <provider selected="true" editor-type-id="text-editor" />
707
-    </entry>
708 676
     <entry file="file://$PROJECT_DIR$/src/main/java/com/zipcodewilmington/productmanager/MainApplication.java">
709 677
       <provider selected="true" editor-type-id="text-editor">
710
-        <state relative-caret-position="166">
711
-          <caret line="120" column="68" selection-start-line="120" selection-start-column="68" selection-end-line="120" selection-end-column="68" />
678
+        <state relative-caret-position="375">
679
+          <caret line="129" column="31" selection-start-line="129" selection-start-column="31" selection-end-line="129" selection-end-column="31" />
712 680
           <folding>
713 681
             <element signature="imports" expanded="true" />
714 682
           </folding>

+ 6
- 17
src/main/java/com/zipcodewilmington/productmanager/MainApplication.java Wyświetl plik

@@ -57,31 +57,20 @@ public class MainApplication {
57 57
 
58 58
             case 0:
59 59
 
60
+                System.out.println (products[0].getDescription());
60 61
 
61 62
                 counter += products[0].getPrice();
63
+
62 64
                 System.out.println("You know that socks are like cotton bags for your feet?\n");
63 65
 
64 66
 //
65
-//                x-=x;
66
-//
67
-//                if(x < 0){
68
-//
69
-//                    System.out.println("WE RAN OUT! TRY SOMETHING ELSE!");
70
-//                    break;
71
-//
72
-//                }if (x > 0){
73
-//
74
-//                System.out.println("You know that socks are like cotton bags for your feet?\n");
75
-//
76
-//                    break;
77
-//                }
78 67
 
79 68
                     break;
80 69
 
81 70
 
82 71
             case 1:
83 72
 
84
-
73
+                System.out.println (products[1].getDescription());
85 74
                 counter += products[1].getPrice();
86 75
                 System.out.println("What kind of hat? Who knows! Maybe its a ten gallon one. Or a witch hat.");
87 76
 //                x1-=x1;
@@ -98,7 +87,7 @@ public class MainApplication {
98 87
                 break;
99 88
 
100 89
             case 2:
101
-
90
+                System.out.println (products[2].getDescription());
102 91
                 System.out.println("I'll be honest with you, it's a tacky hawaiian shirt but I totally think you can pull it off, at a job interview");
103 92
                 counter += products[2].getPrice();
104 93
 
@@ -117,7 +106,7 @@ public class MainApplication {
117 106
                 break;
118 107
 
119 108
             case 3:
120
-
109
+                System.out.println (products[3].getDescription());
121 110
                 System.out.println("Sweet shades bro \uD83D\uDE0E");
122 111
                 counter += products[3].getPrice();
123 112
 
@@ -138,7 +127,7 @@ public class MainApplication {
138 127
                 if (counter2 >= 3){
139 128
                     System.out.println("Look, if you're just gonna keep bugging me about this maybe you should go.");
140 129
                     System.out.print("You've spent $"+ df.format(counter));
141
-                    break;
130
+                    break loop;
142 131
 
143 132
             }
144 133
         }

+ 1
- 1
src/main/java/com/zipcodewilmington/productmanager/Product.java Wyświetl plik

@@ -66,7 +66,7 @@ public class Product extends Manager {
66 66
     public String getDescription() {
67 67
 
68 68
 
69
-        String x ="This is a "+ name + " It costs " + price +"0" ;
69
+        String x ="This is a "+ name + " It costs $" + price +"0" ;
70 70
 
71 71
 
72 72
         return x;