Eric Foster 6 anni fa
parent
commit
1d856f36d4
1 ha cambiato i file con 114 aggiunte e 88 eliminazioni
  1. 114
    88
      ZipCoinRedJavaServer/.idea/workspace.xml

+ 114
- 88
ZipCoinRedJavaServer/.idea/workspace.xml Vedi File

@@ -33,8 +33,32 @@
33 33
       <file leaf-file-name="Transaction.java" pinned="false" current-in-tab="false">
34 34
         <entry file="file://$PROJECT_DIR$/src/main/java/com/zipcoin/model/Transaction.java">
35 35
           <provider selected="true" editor-type-id="text-editor">
36
-            <state relative-caret-position="130">
37
-              <caret line="13" column="20" selection-start-line="13" selection-start-column="20" selection-end-line="13" selection-end-column="20" />
36
+            <state relative-caret-position="156">
37
+              <caret line="58" column="5" selection-start-line="58" selection-start-column="5" selection-end-line="58" selection-end-column="5" />
38
+            </state>
39
+          </provider>
40
+        </entry>
41
+      </file>
42
+      <file leaf-file-name="Block.java" pinned="false" current-in-tab="false">
43
+        <entry file="file://$PROJECT_DIR$/src/main/java/com/zipcoin/model/Block.java">
44
+          <provider selected="true" editor-type-id="text-editor">
45
+            <state relative-caret-position="1230">
46
+              <caret line="82" column="4" selection-start-line="82" selection-start-column="4" selection-end-line="82" selection-end-column="4" />
47
+              <folding>
48
+                <element signature="imports" expanded="true" />
49
+              </folding>
50
+            </state>
51
+          </provider>
52
+        </entry>
53
+      </file>
54
+      <file leaf-file-name="BlockController.java" pinned="false" current-in-tab="true">
55
+        <entry file="file://$PROJECT_DIR$/src/main/java/com/zipcoin/controller/BlockController.java">
56
+          <provider selected="true" editor-type-id="text-editor">
57
+            <state relative-caret-position="88">
58
+              <caret line="14" column="13" selection-start-line="14" selection-start-column="13" selection-end-line="14" selection-end-column="13" />
59
+              <folding>
60
+                <element signature="imports" expanded="true" />
61
+              </folding>
38 62
             </state>
39 63
           </provider>
40 64
         </entry>
@@ -51,8 +75,8 @@
51 75
       <file leaf-file-name="workspace.xml" pinned="false" current-in-tab="false">
52 76
         <entry file="file://$PROJECT_DIR$/.idea/workspace.xml">
53 77
           <provider selected="true" editor-type-id="text-editor">
54
-            <state relative-caret-position="990">
55
-              <caret line="66" column="20" selection-start-line="66" selection-start-column="20" selection-end-line="66" selection-end-column="20" />
78
+            <state relative-caret-position="555">
79
+              <caret line="37" column="20" selection-start-line="37" selection-start-column="20" selection-end-line="37" selection-end-column="20" />
56 80
             </state>
57 81
           </provider>
58 82
         </entry>
@@ -66,10 +90,10 @@
66 90
           </provider>
67 91
         </entry>
68 92
       </file>
69
-      <file leaf-file-name="WalletLoader.java" pinned="false" current-in-tab="true">
93
+      <file leaf-file-name="WalletLoader.java" pinned="false" current-in-tab="false">
70 94
         <entry file="file://$PROJECT_DIR$/src/main/java/com/zipcoin/config/WalletLoader.java">
71 95
           <provider selected="true" editor-type-id="text-editor">
72
-            <state relative-caret-position="284">
96
+            <state relative-caret-position="435">
73 97
               <caret line="34" column="5" selection-start-line="34" selection-start-column="5" selection-end-line="34" selection-end-column="5" />
74 98
             </state>
75 99
           </provider>
@@ -82,6 +106,7 @@
82 106
       <list>
83 107
         <option value="$PROJECT_DIR$/pom.xml" />
84 108
         <option value="$PROJECT_DIR$/src/main/java/com/zipcoin/config/WalletLoader.java" />
109
+        <option value="$PROJECT_DIR$/src/main/java/com/zipcoin/model/Transaction.java" />
85 110
       </list>
86 111
     </option>
87 112
   </component>
@@ -117,7 +142,7 @@
117 142
   <component name="NodePackageJsonFileManager">
118 143
     <packageJsonPaths />
119 144
   </component>
120
-  <component name="ProjectFrameBounds">
145
+  <component name="ProjectFrameBounds" fullScreen="true">
121 146
     <option name="y" value="23" />
122 147
     <option name="width" value="1280" />
123 148
     <option name="height" value="713" />
@@ -128,6 +153,8 @@
128 153
     </navigator>
129 154
     <panes>
130 155
       <pane id="PackagesPane" />
156
+      <pane id="Scope" />
157
+      <pane id="AndroidView" />
131 158
       <pane id="ProjectPane">
132 159
         <subPane>
133 160
           <expand>
@@ -170,12 +197,28 @@
170 197
               <item name="zipcoin" type="462c0819:PsiDirectoryNode" />
171 198
               <item name="config" type="462c0819:PsiDirectoryNode" />
172 199
             </path>
200
+            <path>
201
+              <item name="ZipCoin-RED" type="b2602c69:ProjectViewProjectNode" />
202
+              <item name="ZipCoinRedJavaServer" type="462c0819:PsiDirectoryNode" />
203
+              <item name="src" type="462c0819:PsiDirectoryNode" />
204
+              <item name="main" type="462c0819:PsiDirectoryNode" />
205
+              <item name="java" type="462c0819:PsiDirectoryNode" />
206
+              <item name="zipcoin" type="462c0819:PsiDirectoryNode" />
207
+              <item name="controller" type="462c0819:PsiDirectoryNode" />
208
+            </path>
209
+            <path>
210
+              <item name="ZipCoin-RED" type="b2602c69:ProjectViewProjectNode" />
211
+              <item name="ZipCoinRedJavaServer" type="462c0819:PsiDirectoryNode" />
212
+              <item name="src" type="462c0819:PsiDirectoryNode" />
213
+              <item name="main" type="462c0819:PsiDirectoryNode" />
214
+              <item name="java" type="462c0819:PsiDirectoryNode" />
215
+              <item name="zipcoin" type="462c0819:PsiDirectoryNode" />
216
+              <item name="model" type="462c0819:PsiDirectoryNode" />
217
+            </path>
173 218
           </expand>
174 219
           <select />
175 220
         </subPane>
176 221
       </pane>
177
-      <pane id="AndroidView" />
178
-      <pane id="Scope" />
179 222
     </panes>
180 223
   </component>
181 224
   <component name="PropertiesComponent">
@@ -275,72 +318,49 @@
275 318
       <option name="presentableId" value="Default" />
276 319
       <updated>1533221514750</updated>
277 320
       <workItem from="1533221516219" duration="17000" />
321
+      <workItem from="1533244438155" duration="2092000" />
278 322
     </task>
279 323
     <servers />
280 324
   </component>
281 325
   <component name="TimeTrackingManager">
282
-    <option name="totallyTimeSpent" value="1589000" />
326
+    <option name="totallyTimeSpent" value="5206000" />
283 327
   </component>
284 328
   <component name="ToolWindowManager">
285 329
     <frame x="0" y="0" width="1280" height="800" extended-state="0" />
286 330
     <layout>
287
-      <window_info anchor="right" id="Palette" order="3" />
288
-      <window_info anchor="bottom" id="Event Log" order="7" side_tool="true" />
289
-      <window_info anchor="right" id="Maven Projects" order="3" />
290
-      <window_info anchor="bottom" id="Database Changes" order="7" show_stripe_button="false" />
291
-      <window_info id="Capture Tool" order="2" />
292
-      <window_info id="Designer" order="2" />
293
-      <window_info anchor="right" id="Database" order="3" />
331
+      <window_info anchor="right" id="Palette" order="5" />
332
+      <window_info anchor="bottom" id="Event Log" order="10" side_tool="true" />
333
+      <window_info anchor="right" id="Maven Projects" order="5" />
334
+      <window_info anchor="bottom" id="Database Changes" order="10" show_stripe_button="false" />
335
+      <window_info id="Capture Tool" order="5" />
336
+      <window_info id="Designer" order="5" />
337
+      <window_info anchor="right" id="Database" order="5" />
294 338
       <window_info id="Structure" order="1" side_tool="true" weight="0.25" />
295 339
       <window_info anchor="right" id="Ant Build" order="1" weight="0.25" />
296
-      <window_info id="UI Designer" order="2" />
340
+      <window_info id="UI Designer" order="5" />
297 341
       <window_info anchor="bottom" id="Debug" order="3" weight="0.4" />
298 342
       <window_info anchor="bottom" id="TODO" order="6" />
299
-      <window_info anchor="bottom" id="Messages" order="7" />
300
-      <window_info anchor="right" id="Palette&#9;" order="3" />
301
-      <window_info id="Image Layers" order="2" />
343
+      <window_info anchor="right" id="Palette&#9;" order="5" />
344
+      <window_info id="Image Layers" order="5" />
302 345
       <window_info anchor="bottom" id="Java Enterprise" order="7" />
303
-      <window_info anchor="right" id="Capture Analysis" order="3" />
304
-      <window_info active="true" anchor="bottom" id="Run Dashboard" order="7" visible="true" weight="0.47310343" />
305
-      <window_info anchor="bottom" id="Run" order="2" weight="0.12012987" />
306
-      <window_info anchor="bottom" id="Version Control" order="7" show_stripe_button="false" />
307
-      <window_info anchor="bottom" id="Spring" order="7" />
308
-      <window_info anchor="bottom" id="Terminal" order="7" />
309
-      <window_info content_ui="combo" id="Project" order="0" visible="true" weight="0.2536349" />
310
-      <window_info anchor="right" id="Bean Validation" order="3" />
311
-      <window_info id="Web" order="2" side_tool="true" />
312
-      <window_info anchor="right" id="Theme Preview" order="3" />
313
-      <window_info id="Favorites" order="2" side_tool="true" />
314
-      <window_info anchor="bottom" id="Message" order="0" />
346
+      <window_info anchor="right" id="Capture Analysis" order="5" />
347
+      <window_info anchor="bottom" id="Version Control" order="10" show_stripe_button="false" />
315 348
       <window_info anchor="bottom" id="Run" order="2" />
316
-      <window_info anchor="bottom" id="Event Log" order="10" side_tool="true" />
317
-      <window_info active="true" content_ui="combo" id="Project" order="0" visible="true" weight="0.24959612" />
318
-      <window_info id="Favorites" order="5" side_tool="true" />
319
-      <window_info anchor="right" id="Ant Build" order="1" weight="0.25" />
320
-      <window_info anchor="right" id="Theme Preview" order="5" />
349
+      <window_info anchor="bottom" id="Spring" order="7" />
321 350
       <window_info anchor="bottom" id="Terminal" order="10" />
322
-      <window_info id="Structure" order="1" side_tool="true" weight="0.25" />
323
-      <window_info anchor="right" id="Palette" order="5" />
324
-      <window_info anchor="right" id="Palette&#9;" order="5" />
325
-      <window_info anchor="right" id="Maven Projects" order="5" />
351
+      <window_info active="true" content_ui="combo" id="Project" order="0" visible="true" weight="0.2536349" />
352
+      <window_info anchor="right" id="Bean Validation" order="3" />
326 353
       <window_info id="Web" order="5" side_tool="true" />
327
-      <window_info anchor="bottom" id="Database Changes" order="10" show_stripe_button="false" />
328
-      <window_info anchor="bottom" id="Run Dashboard" order="7" visible="true" weight="0.060064934" />
329
-      <window_info anchor="right" content_ui="combo" id="Hierarchy" order="2" weight="0.25" />
330
-      <window_info id="Image Layers" order="5" />
331
-      <window_info anchor="right" id="Database" order="5" />
332
-      <window_info id="Capture Tool" order="5" />
333
-      <window_info anchor="bottom" id="Version Control" order="10" show_stripe_button="false" />
334
-      <window_info anchor="right" id="Capture Analysis" order="5" />
335
-      <window_info anchor="bottom" id="TODO" order="6" />
354
+      <window_info anchor="right" id="Theme Preview" order="5" />
355
+      <window_info id="Favorites" order="5" side_tool="true" />
336 356
       <window_info anchor="bottom" id="Inspection" order="5" weight="0.4" />
357
+      <window_info anchor="right" id="Commander" internal_type="SLIDING" order="0" type="SLIDING" weight="0.4" />
337 358
       <window_info anchor="bottom" id="Cvs" order="4" weight="0.25" />
338
-      <window_info id="UI Designer" order="5" />
339
-      <window_info anchor="bottom" id="Find" order="1" />
340
-      <window_info anchor="bottom" id="Debug" order="3" weight="0.4" />
359
+      <window_info anchor="bottom" id="Run Dashboard" order="7" visible="true" weight="0.060064934" />
341 360
       <window_info anchor="bottom" id="Messages" order="9" weight="0.3298969" />
342
-      <window_info anchor="right" id="Commander" internal_type="SLIDING" order="0" type="SLIDING" weight="0.4" />
343
-      <window_info id="Designer" order="5" />
361
+      <window_info anchor="bottom" id="Message" order="0" />
362
+      <window_info anchor="right" content_ui="combo" id="Hierarchy" order="2" weight="0.25" />
363
+      <window_info anchor="bottom" id="Find" order="1" />
344 364
     </layout>
345 365
   </component>
346 366
   <component name="TypeScriptGeneratedFilesManager">
@@ -407,8 +427,8 @@
407 427
     <entry file="file://$PROJECT_DIR$/src/test/java/redCoin/minerTest.java" />
408 428
     <entry file="file://$PROJECT_DIR$/.idea/workspace.xml">
409 429
       <provider selected="true" editor-type-id="text-editor">
410
-        <state relative-caret-position="990">
411
-          <caret line="66" column="20" selection-start-line="66" selection-start-column="20" selection-end-line="66" selection-end-column="20" />
430
+        <state relative-caret-position="555">
431
+          <caret line="37" column="20" selection-start-line="37" selection-start-column="20" selection-end-line="37" selection-end-column="20" />
412 432
         </state>
413 433
       </provider>
414 434
     </entry>
@@ -431,13 +451,6 @@
431 451
         </state>
432 452
       </provider>
433 453
     </entry>
434
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/zipcoin/model/Transaction.java">
435
-      <provider selected="true" editor-type-id="text-editor">
436
-        <state relative-caret-position="130">
437
-          <caret line="13" column="20" selection-start-line="13" selection-start-column="20" selection-end-line="13" selection-end-column="20" />
438
-        </state>
439
-      </provider>
440
-    </entry>
441 454
     <entry file="file://$PROJECT_DIR$/src/main/java/com/zipcoin/config/PersistenceConfiguration.java" />
442 455
     <entry file="file://$PROJECT_DIR$/src/main/java/com/zipcoin/repository/BlockRepository.java">
443 456
       <provider selected="true" editor-type-id="text-editor">
@@ -473,31 +486,38 @@
473 486
         </state>
474 487
       </provider>
475 488
     </entry>
476
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/zipcoin/model/Block.java">
489
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/zipcoin/controller/HomeController.java">
477 490
       <provider selected="true" editor-type-id="text-editor">
478
-        <state relative-caret-position="930">
479
-          <caret line="82" column="4" selection-start-line="82" selection-start-column="4" selection-end-line="82" selection-end-column="4" />
491
+        <state relative-caret-position="90">
492
+          <caret line="9" column="5" selection-start-line="9" selection-start-column="5" selection-end-line="9" selection-end-column="5" />
480 493
         </state>
481 494
       </provider>
482 495
     </entry>
483
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/zipcoin/controller/BlockController.java">
496
+    <entry file="file://$PROJECT_DIR$/pom.xml">
484 497
       <provider selected="true" editor-type-id="text-editor">
485
-        <state relative-caret-position="105">
486
-          <caret line="7" column="15" selection-start-line="7" selection-start-column="15" selection-end-line="7" selection-end-column="15" />
498
+        <state relative-caret-position="135">
499
+          <caret line="9" selection-start-line="9" selection-end-line="9" />
487 500
         </state>
488 501
       </provider>
489 502
     </entry>
490
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/zipcoin/controller/HomeController.java">
503
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/zipcoin/controller/WalletController.java">
491 504
       <provider selected="true" editor-type-id="text-editor">
492
-        <state relative-caret-position="90">
493
-          <caret line="9" column="5" selection-start-line="9" selection-start-column="5" selection-end-line="9" selection-end-column="5" />
505
+        <state relative-caret-position="66">
506
+          <caret line="14" column="13" selection-start-line="14" selection-start-column="13" selection-end-line="14" selection-end-column="13" />
494 507
         </state>
495 508
       </provider>
496 509
     </entry>
497
-    <entry file="file://$PROJECT_DIR$/pom.xml">
510
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/zipcoin/config/WalletLoader.java">
498 511
       <provider selected="true" editor-type-id="text-editor">
499
-        <state relative-caret-position="135">
500
-          <caret line="9" selection-start-line="9" selection-end-line="9" />
512
+        <state relative-caret-position="435">
513
+          <caret line="34" column="5" selection-start-line="34" selection-start-column="5" selection-end-line="34" selection-end-column="5" />
514
+        </state>
515
+      </provider>
516
+    </entry>
517
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/zipcoin/config/TransactionLoader.java">
518
+      <provider selected="true" editor-type-id="text-editor">
519
+        <state relative-caret-position="75">
520
+          <caret line="10" column="13" selection-start-line="10" selection-start-column="13" selection-end-line="10" selection-end-column="13" />
501 521
         </state>
502 522
       </provider>
503 523
     </entry>
@@ -508,31 +528,37 @@
508 528
         </state>
509 529
       </provider>
510 530
     </entry>
511
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/zipcoin/controller/WalletController.java">
531
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/zipcoin/model/Transaction.java">
512 532
       <provider selected="true" editor-type-id="text-editor">
513
-        <state relative-caret-position="66">
514
-          <caret line="14" column="13" selection-start-line="14" selection-start-column="13" selection-end-line="14" selection-end-column="13" />
533
+        <state relative-caret-position="156">
534
+          <caret line="58" column="5" selection-start-line="58" selection-start-column="5" selection-end-line="58" selection-end-column="5" />
515 535
         </state>
516 536
       </provider>
517 537
     </entry>
518
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/zipcoin/config/BlockLoader.java">
538
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/zipcoin/model/Block.java">
519 539
       <provider selected="true" editor-type-id="text-editor">
520
-        <state relative-caret-position="75">
521
-          <caret line="10" column="17" selection-start-line="10" selection-start-column="17" selection-end-line="10" selection-end-column="17" />
540
+        <state relative-caret-position="1230">
541
+          <caret line="82" column="4" selection-start-line="82" selection-start-column="4" selection-end-line="82" selection-end-column="4" />
542
+          <folding>
543
+            <element signature="imports" expanded="true" />
544
+          </folding>
522 545
         </state>
523 546
       </provider>
524 547
     </entry>
525
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/zipcoin/config/TransactionLoader.java">
548
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/zipcoin/config/BlockLoader.java">
526 549
       <provider selected="true" editor-type-id="text-editor">
527 550
         <state relative-caret-position="75">
528
-          <caret line="10" column="13" selection-start-line="10" selection-start-column="13" selection-end-line="10" selection-end-column="13" />
551
+          <caret line="10" column="17" selection-start-line="10" selection-start-column="17" selection-end-line="10" selection-end-column="17" />
529 552
         </state>
530 553
       </provider>
531 554
     </entry>
532
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/zipcoin/config/WalletLoader.java">
555
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/zipcoin/controller/BlockController.java">
533 556
       <provider selected="true" editor-type-id="text-editor">
534
-        <state relative-caret-position="284">
535
-          <caret line="34" column="5" selection-start-line="34" selection-start-column="5" selection-end-line="34" selection-end-column="5" />
557
+        <state relative-caret-position="88">
558
+          <caret line="14" column="13" selection-start-line="14" selection-start-column="13" selection-end-line="14" selection-end-column="13" />
559
+          <folding>
560
+            <element signature="imports" expanded="true" />
561
+          </folding>
536 562
         </state>
537 563
       </provider>
538 564
     </entry>