Aleena Rose-Mathew 6 лет назад
Родитель
Сommit
741d97b3fc
1 измененных файлов: 97 добавлений и 31 удалений
  1. 97
    31
      .idea/workspace.xml

+ 97
- 31
.idea/workspace.xml Просмотреть файл

@@ -1,7 +1,9 @@
1 1
 <?xml version="1.0" encoding="UTF-8"?>
2 2
 <project version="4">
3 3
   <component name="ChangeListManager">
4
-    <list default="true" id="f54e258d-da71-464b-8271-7897ae55d27f" name="Default" comment="" />
4
+    <list default="true" id="f54e258d-da71-464b-8271-7897ae55d27f" name="Default" comment="">
5
+      <change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" />
6
+    </list>
5 7
     <ignored path="$PROJECT_DIR$/target/" />
6 8
     <option name="EXCLUDED_CONVERTED_TO_IGNORED" value="true" />
7 9
     <option name="TRACKING_ENABLED" value="true" />
@@ -25,7 +27,55 @@
25 27
     <select />
26 28
   </component>
27 29
   <component name="FileEditorManager">
28
-    <leaf />
30
+    <leaf>
31
+      <file leaf-file-name="README.md" pinned="false" current-in-tab="false">
32
+        <entry file="file://$PROJECT_DIR$/README.md">
33
+          <provider selected="true" editor-type-id="split-provider[text-editor;markdown-preview-editor]">
34
+            <state split_layout="SPLIT">
35
+              <first_editor />
36
+              <second_editor />
37
+            </state>
38
+          </provider>
39
+        </entry>
40
+      </file>
41
+      <file leaf-file-name="Block.java" pinned="false" current-in-tab="false">
42
+        <entry file="file://$PROJECT_DIR$/ZipCoinRedJavaServer/src/main/java/com/zipcoin/model/Block.java">
43
+          <provider selected="true" editor-type-id="text-editor">
44
+            <state relative-caret-position="75">
45
+              <caret line="7" column="14" selection-start-line="7" selection-start-column="14" selection-end-line="7" selection-end-column="14" />
46
+            </state>
47
+          </provider>
48
+        </entry>
49
+      </file>
50
+      <file leaf-file-name="Miner.java" pinned="false" current-in-tab="false">
51
+        <entry file="file://$PROJECT_DIR$/ZipCoinRedJavaServer/src/main/java/com/zipcoin/model/Miner.java">
52
+          <provider selected="true" editor-type-id="text-editor" />
53
+        </entry>
54
+      </file>
55
+      <file leaf-file-name="BlockController.java" pinned="false" current-in-tab="false">
56
+        <entry file="file://$PROJECT_DIR$/ZipCoinRedJavaServer/src/main/java/com/zipcoin/controller/BlockController.java">
57
+          <provider selected="true" editor-type-id="text-editor" />
58
+        </entry>
59
+      </file>
60
+      <file leaf-file-name="HomeController.java" pinned="false" current-in-tab="false">
61
+        <entry file="file://$PROJECT_DIR$/ZipCoinRedJavaServer/src/main/java/com/zipcoin/controller/HomeController.java">
62
+          <provider selected="true" editor-type-id="text-editor">
63
+            <state relative-caret-position="45">
64
+              <caret line="4" column="15" lean-forward="true" selection-start-line="4" selection-start-column="15" selection-end-line="4" selection-end-column="15" />
65
+            </state>
66
+          </provider>
67
+        </entry>
68
+      </file>
69
+      <file leaf-file-name="BlockRepository.java" pinned="false" current-in-tab="true">
70
+        <entry file="file://$PROJECT_DIR$/ZipCoinRedJavaServer/src/main/java/com/zipcoin/repository/BlockRepository.java">
71
+          <provider selected="true" editor-type-id="text-editor">
72
+            <state relative-caret-position="30">
73
+              <caret line="3" column="61" lean-forward="true" selection-start-line="3" selection-start-column="61" selection-end-line="3" selection-end-column="61" />
74
+            </state>
75
+          </provider>
76
+        </entry>
77
+      </file>
78
+    </leaf>
29 79
   </component>
30 80
   <component name="FileTemplateManagerImpl">
31 81
     <option name="RECENT_TEMPLATES">
@@ -82,10 +132,9 @@
82 132
     <packageJsonPaths />
83 133
   </component>
84 134
   <component name="ProjectFrameBounds" fullScreen="true">
85
-    <option name="x" value="-29" />
86
-    <option name="y" value="38" />
135
+    <option name="y" value="23" />
87 136
     <option name="width" value="1280" />
88
-    <option name="height" value="713" />
137
+    <option name="height" value="716" />
89 138
   </component>
90 139
   <component name="ProjectLevelVcsManager" settingsEditedManually="true">
91 140
     <ConfirmationsSetting value="2" id="Add" />
@@ -95,9 +144,6 @@
95 144
       <foldersAlwaysOnTop value="true" />
96 145
     </navigator>
97 146
     <panes>
98
-      <pane id="PackagesPane" />
99
-      <pane id="AndroidView" />
100
-      <pane id="Scope" />
101 147
       <pane id="ProjectPane">
102 148
         <subPane>
103 149
           <expand>
@@ -190,6 +236,9 @@
190 236
           <select />
191 237
         </subPane>
192 238
       </pane>
239
+      <pane id="PackagesPane" />
240
+      <pane id="AndroidView" />
241
+      <pane id="Scope" />
193 242
     </panes>
194 243
   </component>
195 244
   <component name="PropertiesComponent">
@@ -375,6 +424,7 @@
375 424
       <workItem from="1531772346214" duration="3133000" />
376 425
       <workItem from="1531775595883" duration="5604000" />
377 426
       <workItem from="1531837614306" duration="20000" />
427
+      <workItem from="1533220890005" duration="420000" />
378 428
     </task>
379 429
     <servers />
380 430
   </component>
@@ -408,7 +458,7 @@
408 458
     </history-entry>
409 459
   </component>
410 460
   <component name="TimeTrackingManager">
411
-    <option name="totallyTimeSpent" value="14321000" />
461
+    <option name="totallyTimeSpent" value="14741000" />
412 462
   </component>
413 463
   <component name="ToolWindowManager">
414 464
     <frame x="0" y="0" width="1280" height="800" extended-state="0" />
@@ -419,14 +469,14 @@
419 469
       <window_info id="Image Layers" order="2" />
420 470
       <window_info anchor="right" id="Capture Analysis" order="3" />
421 471
       <window_info anchor="bottom" id="Event Log" order="7" side_tool="true" />
422
-      <window_info anchor="right" id="Maven Projects" order="3" />
472
+      <window_info anchor="right" id="Maven Projects" order="3" visible="true" weight="0.32956383" />
423 473
       <window_info anchor="bottom" id="Database Changes" order="7" show_stripe_button="false" />
424 474
       <window_info anchor="bottom" id="Run" order="2" weight="0.19586207" />
425 475
       <window_info anchor="bottom" id="Version Control" order="7" />
426 476
       <window_info anchor="bottom" id="Terminal" order="7" weight="0.32954547" />
427 477
       <window_info id="Capture Tool" order="2" />
428 478
       <window_info id="Designer" order="2" />
429
-      <window_info active="true" content_ui="combo" id="Project" order="0" visible="true" weight="0.26494345" />
479
+      <window_info active="true" content_ui="combo" id="Project" order="0" visible="true" weight="0.26898223" />
430 480
       <window_info anchor="right" id="Database" order="3" />
431 481
       <window_info id="Structure" order="1" side_tool="true" weight="0.25" />
432 482
       <window_info anchor="right" id="Ant Build" order="1" weight="0.25" />
@@ -438,13 +488,13 @@
438 488
       <window_info anchor="bottom" id="Spring" order="9" />
439 489
       <window_info anchor="bottom" id="Inspection" order="5" weight="0.4" />
440 490
       <window_info anchor="right" id="Commander" internal_type="SLIDING" order="0" type="SLIDING" weight="0.4" />
491
+      <window_info anchor="bottom" id="Find" order="1" weight="0.32954547" />
441 492
       <window_info anchor="bottom" id="Cvs" order="4" weight="0.25" />
442 493
       <window_info anchor="bottom" id="Messages" order="9" weight="0.3298969" />
443 494
       <window_info anchor="bottom" id="Message" order="0" />
444 495
       <window_info anchor="right" id="Bean Validation" order="4" />
445 496
       <window_info anchor="right" content_ui="combo" id="Hierarchy" order="2" weight="0.25" />
446 497
       <window_info anchor="bottom" id="Java Enterprise" order="8" />
447
-      <window_info anchor="bottom" id="Find" order="1" weight="0.32954547" />
448 498
     </layout>
449 499
   </component>
450 500
   <component name="TypeScriptGeneratedFilesManager">
@@ -454,17 +504,6 @@
454 504
     <option name="myLimit" value="2678400000" />
455 505
   </component>
456 506
   <component name="editorHistoryManager">
457
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/zipcoin/redCoin/Main.java" />
458
-    <entry file="file://$PROJECT_DIR$/src/test/java/com/zipcoin/redCoin/testMain.java" />
459
-    <entry file="file://$PROJECT_DIR$/pom.xml" />
460
-    <entry file="file://$PROJECT_DIR$/src/test/java/redCoin/minerTest.java" />
461
-    <entry file="file://$PROJECT_DIR$/.idea/workspace.xml">
462
-      <provider selected="true" editor-type-id="text-editor">
463
-        <state relative-caret-position="405">
464
-          <caret line="27" selection-start-line="27" selection-end-line="27" selection-end-column="12" />
465
-        </state>
466
-      </provider>
467
-    </entry>
468 507
     <entry file="file://$PROJECT_DIR$/.idea/ZipCoin-RED.iml" />
469 508
     <entry file="file://$PROJECT_DIR$/pom.xml" />
470 509
     <entry file="file://$PROJECT_DIR$/src/main/java/com/zipcoin/redCoin/Main.java" />
@@ -505,14 +544,6 @@
505 544
     <entry file="file://$PROJECT_DIR$/src/main/java/com/zipcoin/redCoin/Main.java" />
506 545
     <entry file="file://$PROJECT_DIR$/src/test/java/mainTest.java" />
507 546
     <entry file="file://$PROJECT_DIR$/src/test/java/com/zipcoin/redCoin/testMain.java" />
508
-    <entry file="file://$PROJECT_DIR$/README.md">
509
-      <provider selected="true" editor-type-id="split-provider[text-editor;markdown-preview-editor]">
510
-        <state split_layout="SPLIT">
511
-          <first_editor />
512
-          <second_editor />
513
-        </state>
514
-      </provider>
515
-    </entry>
516 547
     <entry file="file://$PROJECT_DIR$/src/main/resources/db.migration/mine_block.sql" />
517 548
     <entry file="file://$PROJECT_DIR$/src/main/resources/db.migration/V2__mine_block.sql" />
518 549
     <entry file="file://$PROJECT_DIR$/src/main/java/redCoin/Miner/Miner.java" />
@@ -530,6 +561,41 @@
530 561
     <entry file="file://$PROJECT_DIR$/src/main/java/com/zipcoin/model/Miner.java" />
531 562
     <entry file="file://$PROJECT_DIR$/src/test/java/com/zipcoin/redCoin/miner/test/minerTest.java" />
532 563
     <entry file="file://$PROJECT_DIR$/src/main/java/com/zipcoin/controller/BlockController.java" />
564
+    <entry file="file://$PROJECT_DIR$/README.md">
565
+      <provider selected="true" editor-type-id="split-provider[text-editor;markdown-preview-editor]">
566
+        <state split_layout="SPLIT">
567
+          <first_editor />
568
+          <second_editor />
569
+        </state>
570
+      </provider>
571
+    </entry>
572
+    <entry file="file://$PROJECT_DIR$/ZipCoinRedJavaServer/src/main/java/com/zipcoin/model/Block.java">
573
+      <provider selected="true" editor-type-id="text-editor">
574
+        <state relative-caret-position="75">
575
+          <caret line="7" column="14" selection-start-line="7" selection-start-column="14" selection-end-line="7" selection-end-column="14" />
576
+        </state>
577
+      </provider>
578
+    </entry>
579
+    <entry file="file://$PROJECT_DIR$/ZipCoinRedJavaServer/src/main/java/com/zipcoin/model/Miner.java">
580
+      <provider selected="true" editor-type-id="text-editor" />
581
+    </entry>
582
+    <entry file="file://$PROJECT_DIR$/ZipCoinRedJavaServer/src/main/java/com/zipcoin/controller/BlockController.java">
583
+      <provider selected="true" editor-type-id="text-editor" />
584
+    </entry>
585
+    <entry file="file://$PROJECT_DIR$/ZipCoinRedJavaServer/src/main/java/com/zipcoin/controller/HomeController.java">
586
+      <provider selected="true" editor-type-id="text-editor">
587
+        <state relative-caret-position="45">
588
+          <caret line="4" column="15" lean-forward="true" selection-start-line="4" selection-start-column="15" selection-end-line="4" selection-end-column="15" />
589
+        </state>
590
+      </provider>
591
+    </entry>
592
+    <entry file="file://$PROJECT_DIR$/ZipCoinRedJavaServer/src/main/java/com/zipcoin/repository/BlockRepository.java">
593
+      <provider selected="true" editor-type-id="text-editor">
594
+        <state relative-caret-position="30">
595
+          <caret line="3" column="61" lean-forward="true" selection-start-line="3" selection-start-column="61" selection-end-line="3" selection-end-column="61" />
596
+        </state>
597
+      </provider>
598
+    </entry>
533 599
   </component>
534 600
   <component name="masterDetails">
535 601
     <states>