|
@@ -26,11 +26,11 @@
|
26
|
26
|
</component>
|
27
|
27
|
<component name="FileEditorManager">
|
28
|
28
|
<leaf SIDE_TABS_SIZE_LIMIT_KEY="300">
|
29
|
|
- <file leaf-file-name="Block.java" pinned="false" current-in-tab="false">
|
|
29
|
+ <file leaf-file-name="Block.java" pinned="false" current-in-tab="true">
|
30
|
30
|
<entry file="file://$PROJECT_DIR$/src/main/java/com/zipcoin/model/Block.java">
|
31
|
31
|
<provider selected="true" editor-type-id="text-editor">
|
32
|
|
- <state relative-caret-position="1230">
|
33
|
|
- <caret line="82" column="4" selection-start-line="82" selection-start-column="4" selection-end-line="82" selection-end-column="4" />
|
|
32
|
+ <state relative-caret-position="209">
|
|
33
|
+ <caret line="15" column="31" lean-forward="true" selection-start-line="15" selection-start-column="31" selection-end-line="15" selection-end-column="31" />
|
34
|
34
|
<folding>
|
35
|
35
|
<element signature="imports" expanded="true" />
|
36
|
36
|
</folding>
|
|
@@ -38,11 +38,11 @@
|
38
|
38
|
</provider>
|
39
|
39
|
</entry>
|
40
|
40
|
</file>
|
41
|
|
- <file leaf-file-name="BlockController.java" pinned="false" current-in-tab="true">
|
|
41
|
+ <file leaf-file-name="BlockController.java" pinned="false" current-in-tab="false">
|
42
|
42
|
<entry file="file://$PROJECT_DIR$/src/main/java/com/zipcoin/controller/BlockController.java">
|
43
|
43
|
<provider selected="true" editor-type-id="text-editor">
|
44
|
|
- <state relative-caret-position="205">
|
45
|
|
- <caret line="27" column="5" lean-forward="true" selection-start-line="27" selection-start-column="5" selection-end-line="27" selection-end-column="5" />
|
|
44
|
+ <state relative-caret-position="529">
|
|
45
|
+ <caret line="27" column="5" selection-start-line="27" selection-start-column="5" selection-end-line="27" selection-end-column="5" />
|
46
|
46
|
<folding>
|
47
|
47
|
<element signature="imports" expanded="true" />
|
48
|
48
|
</folding>
|
|
@@ -53,7 +53,7 @@
|
53
|
53
|
<file leaf-file-name="HomeController.java" pinned="false" current-in-tab="false">
|
54
|
54
|
<entry file="file://$PROJECT_DIR$/src/main/java/com/zipcoin/controller/HomeController.java">
|
55
|
55
|
<provider selected="true" editor-type-id="text-editor">
|
56
|
|
- <state relative-caret-position="120">
|
|
56
|
+ <state relative-caret-position="138">
|
57
|
57
|
<caret line="9" column="5" selection-start-line="9" selection-start-column="5" selection-end-line="9" selection-end-column="5" />
|
58
|
58
|
</state>
|
59
|
59
|
</provider>
|
|
@@ -62,8 +62,8 @@
|
62
|
62
|
<file leaf-file-name="application.properties" pinned="false" current-in-tab="false">
|
63
|
63
|
<entry file="file://$PROJECT_DIR$/src/main/resources/application.properties">
|
64
|
64
|
<provider selected="true" editor-type-id="text-editor">
|
65
|
|
- <state relative-caret-position="330">
|
66
|
|
- <caret line="22" column="44" selection-start-line="22" selection-start-column="44" selection-end-line="22" selection-end-column="44" />
|
|
65
|
+ <state relative-caret-position="253">
|
|
66
|
+ <caret line="11" lean-forward="true" selection-start-line="11" selection-end-line="11" />
|
67
|
67
|
</state>
|
68
|
68
|
</provider>
|
69
|
69
|
</entry>
|
|
@@ -71,7 +71,7 @@
|
71
|
71
|
<file leaf-file-name="pom.xml" pinned="false" current-in-tab="false">
|
72
|
72
|
<entry file="file://$PROJECT_DIR$/pom.xml">
|
73
|
73
|
<provider selected="true" editor-type-id="text-editor">
|
74
|
|
- <state relative-caret-position="585">
|
|
74
|
+ <state relative-caret-position="897">
|
75
|
75
|
<caret line="39" column="21" selection-start-line="39" selection-start-column="21" selection-end-line="39" selection-end-column="21" />
|
76
|
76
|
</state>
|
77
|
77
|
</provider>
|
|
@@ -80,7 +80,7 @@
|
80
|
80
|
<file leaf-file-name="BlockRepository.java" pinned="false" current-in-tab="false">
|
81
|
81
|
<entry file="file://$PROJECT_DIR$/src/main/java/com/zipcoin/repository/BlockRepository.java">
|
82
|
82
|
<provider selected="true" editor-type-id="text-editor">
|
83
|
|
- <state relative-caret-position="60">
|
|
83
|
+ <state relative-caret-position="115">
|
84
|
84
|
<caret line="5" column="17" selection-start-line="5" selection-start-column="17" selection-end-line="5" selection-end-column="17" />
|
85
|
85
|
<folding>
|
86
|
86
|
<element signature="imports" expanded="true" />
|
|
@@ -92,7 +92,7 @@
|
92
|
92
|
<file leaf-file-name="ZipCoinApp.java" pinned="false" current-in-tab="false">
|
93
|
93
|
<entry file="file://$PROJECT_DIR$/src/main/java/com/zipcoin/ZipCoinApp.java">
|
94
|
94
|
<provider selected="true" editor-type-id="text-editor">
|
95
|
|
- <state relative-caret-position="75">
|
|
95
|
+ <state relative-caret-position="138">
|
96
|
96
|
<caret line="6" column="13" selection-start-line="6" selection-start-column="13" selection-end-line="6" selection-end-column="13" />
|
97
|
97
|
<folding>
|
98
|
98
|
<element signature="imports" expanded="true" />
|
|
@@ -104,7 +104,7 @@
|
104
|
104
|
<file leaf-file-name="V2__create_block.sql" pinned="false" current-in-tab="false">
|
105
|
105
|
<entry file="file://$PROJECT_DIR$/src/main/resources/db/migration/V2__create_block.sql">
|
106
|
106
|
<provider selected="true" editor-type-id="text-editor">
|
107
|
|
- <state relative-caret-position="105">
|
|
107
|
+ <state relative-caret-position="161">
|
108
|
108
|
<caret line="7" column="2" selection-start-line="7" selection-start-column="2" selection-end-line="7" selection-end-column="2" />
|
109
|
109
|
</state>
|
110
|
110
|
</provider>
|
|
@@ -113,7 +113,7 @@
|
113
|
113
|
<file leaf-file-name="Miner.java" pinned="false" current-in-tab="false">
|
114
|
114
|
<entry file="file://$PROJECT_DIR$/src/main/java/com/zipcoin/model/Miner.java">
|
115
|
115
|
<provider selected="true" editor-type-id="text-editor">
|
116
|
|
- <state relative-caret-position="210">
|
|
116
|
+ <state relative-caret-position="322">
|
117
|
117
|
<caret line="14" column="21" selection-start-line="14" selection-start-column="21" selection-end-line="14" selection-end-column="21" />
|
118
|
118
|
</state>
|
119
|
119
|
</provider>
|
|
@@ -122,7 +122,7 @@
|
122
|
122
|
<file leaf-file-name="minerTest.java" pinned="false" current-in-tab="false">
|
123
|
123
|
<entry file="file://$PROJECT_DIR$/src/test/java/com/zipcoin/redCoin/miner/test/minerTest.java">
|
124
|
124
|
<provider selected="true" editor-type-id="text-editor">
|
125
|
|
- <state relative-caret-position="135">
|
|
125
|
+ <state relative-caret-position="276">
|
126
|
126
|
<caret line="12" column="9" selection-start-line="12" selection-start-column="9" selection-end-line="12" selection-end-column="9" />
|
127
|
127
|
<folding>
|
128
|
128
|
<element signature="imports" expanded="true" />
|
|
@@ -201,6 +201,10 @@
|
201
|
201
|
<foldersAlwaysOnTop value="true" />
|
202
|
202
|
</navigator>
|
203
|
203
|
<panes>
|
|
204
|
+ <pane id="Course" />
|
|
205
|
+ <pane id="Scope" />
|
|
206
|
+ <pane id="PackagesPane" />
|
|
207
|
+ <pane id="AndroidView" />
|
204
|
208
|
<pane id="ProjectPane">
|
205
|
209
|
<subPane>
|
206
|
210
|
<expand>
|
|
@@ -263,9 +267,6 @@
|
263
|
267
|
<select />
|
264
|
268
|
</subPane>
|
265
|
269
|
</pane>
|
266
|
|
- <pane id="PackagesPane" />
|
267
|
|
- <pane id="AndroidView" />
|
268
|
|
- <pane id="Scope" />
|
269
|
270
|
</panes>
|
270
|
271
|
</component>
|
271
|
272
|
<component name="PropertiesComponent">
|
|
@@ -452,6 +453,8 @@
|
452
|
453
|
<workItem from="1531772346214" duration="3133000" />
|
453
|
454
|
<workItem from="1531775595883" duration="5563000" />
|
454
|
455
|
<workItem from="1531837698674" duration="1652000" />
|
|
456
|
+ <workItem from="1531919430062" duration="82000" />
|
|
457
|
+ <workItem from="1531919540581" duration="3064000" />
|
455
|
458
|
</task>
|
456
|
459
|
<servers />
|
457
|
460
|
</component>
|
|
@@ -485,14 +488,14 @@
|
485
|
488
|
</history-entry>
|
486
|
489
|
</component>
|
487
|
490
|
<component name="TimeTrackingManager">
|
488
|
|
- <option name="totallyTimeSpent" value="15912000" />
|
|
491
|
+ <option name="totallyTimeSpent" value="19058000" />
|
489
|
492
|
</component>
|
490
|
493
|
<component name="ToolWindowManager">
|
491
|
494
|
<frame x="0" y="0" width="1280" height="800" extended-state="0" />
|
492
|
495
|
<editor active="true" />
|
493
|
496
|
<layout>
|
494
|
497
|
<window_info anchor="right" id="Palette" order="3" />
|
495
|
|
- <window_info anchor="bottom" id="Event Log" order="7" side_tool="true" />
|
|
498
|
+ <window_info anchor="bottom" id="Event Log" order="7" sideWeight="0.50080776" side_tool="true" visible="true" weight="0.36689654" />
|
496
|
499
|
<window_info anchor="right" id="Maven Projects" order="3" />
|
497
|
500
|
<window_info anchor="bottom" id="Database Changes" order="7" show_stripe_button="false" />
|
498
|
501
|
<window_info id="Capture Tool" order="2" />
|
|
@@ -508,13 +511,14 @@
|
508
|
511
|
<window_info id="Image Layers" order="2" />
|
509
|
512
|
<window_info anchor="bottom" id="Java Enterprise" order="8" />
|
510
|
513
|
<window_info anchor="right" id="Capture Analysis" order="3" />
|
511
|
|
- <window_info anchor="bottom" id="Run" order="2" visible="true" weight="0.36689654" />
|
|
514
|
+ <window_info anchor="bottom" id="Run" order="2" sideWeight="0.49919224" weight="0.36689654" />
|
512
|
515
|
<window_info anchor="bottom" id="Version Control" order="7" />
|
513
|
516
|
<window_info anchor="bottom" id="Spring" order="9" />
|
514
|
517
|
<window_info anchor="bottom" id="Terminal" order="7" weight="0.32954547" />
|
515
|
|
- <window_info active="true" content_ui="combo" id="Project" order="0" visible="true" weight="0.2609047" />
|
|
518
|
+ <window_info active="true" content_ui="combo" id="Project" order="0" visible="true" weight="0.21405493" />
|
516
|
519
|
<window_info anchor="right" id="Bean Validation" order="4" />
|
517
|
520
|
<window_info id="Web" order="4" side_tool="true" />
|
|
521
|
+ <window_info id="Learn" order="5" />
|
518
|
522
|
<window_info anchor="right" id="Theme Preview" order="3" />
|
519
|
523
|
<window_info id="Favorites" order="2" side_tool="true" />
|
520
|
524
|
<window_info anchor="bottom" id="Inspection" order="5" weight="0.4" />
|
|
@@ -633,9 +637,6 @@
|
633
|
637
|
<provider selected="true" editor-type-id="text-editor">
|
634
|
638
|
<state relative-caret-position="449">
|
635
|
639
|
<caret line="78" lean-forward="true" selection-start-line="78" selection-end-line="78" />
|
636
|
|
- <folding>
|
637
|
|
- <element signature="imports" expanded="true" />
|
638
|
|
- </folding>
|
639
|
640
|
</state>
|
640
|
641
|
</provider>
|
641
|
642
|
</entry>
|
|
@@ -644,22 +645,19 @@
|
644
|
645
|
<provider selected="true" editor-type-id="text-editor">
|
645
|
646
|
<state relative-caret-position="420">
|
646
|
647
|
<caret line="28" selection-start-line="28" selection-end-line="28" />
|
647
|
|
- <folding>
|
648
|
|
- <element signature="imports" expanded="true" />
|
649
|
|
- </folding>
|
650
|
648
|
</state>
|
651
|
649
|
</provider>
|
652
|
650
|
</entry>
|
653
|
651
|
<entry file="file://$PROJECT_DIR$/src/main/java/com/zipcoin/controller/HomeController.java">
|
654
|
652
|
<provider selected="true" editor-type-id="text-editor">
|
655
|
|
- <state relative-caret-position="120">
|
|
653
|
+ <state relative-caret-position="138">
|
656
|
654
|
<caret line="9" column="5" selection-start-line="9" selection-start-column="5" selection-end-line="9" selection-end-column="5" />
|
657
|
655
|
</state>
|
658
|
656
|
</provider>
|
659
|
657
|
</entry>
|
660
|
658
|
<entry file="file://$PROJECT_DIR$/src/main/java/com/zipcoin/repository/BlockRepository.java">
|
661
|
659
|
<provider selected="true" editor-type-id="text-editor">
|
662
|
|
- <state relative-caret-position="60">
|
|
660
|
+ <state relative-caret-position="115">
|
663
|
661
|
<caret line="5" column="17" selection-start-line="5" selection-start-column="17" selection-end-line="5" selection-end-column="17" />
|
664
|
662
|
<folding>
|
665
|
663
|
<element signature="imports" expanded="true" />
|
|
@@ -667,69 +665,69 @@
|
667
|
665
|
</state>
|
668
|
666
|
</provider>
|
669
|
667
|
</entry>
|
670
|
|
- <entry file="file://$PROJECT_DIR$/src/main/java/com/zipcoin/ZipCoinApp.java">
|
671
|
|
- <provider selected="true" editor-type-id="text-editor">
|
672
|
|
- <state relative-caret-position="75">
|
673
|
|
- <caret line="6" column="13" selection-start-line="6" selection-start-column="13" selection-end-line="6" selection-end-column="13" />
|
674
|
|
- <folding>
|
675
|
|
- <element signature="imports" expanded="true" />
|
676
|
|
- </folding>
|
677
|
|
- </state>
|
678
|
|
- </provider>
|
679
|
|
- </entry>
|
680
|
668
|
<entry file="file://$PROJECT_DIR$/src/main/resources/db/migration/V2__create_block.sql">
|
681
|
669
|
<provider selected="true" editor-type-id="text-editor">
|
682
|
|
- <state relative-caret-position="105">
|
|
670
|
+ <state relative-caret-position="161">
|
683
|
671
|
<caret line="7" column="2" selection-start-line="7" selection-start-column="2" selection-end-line="7" selection-end-column="2" />
|
684
|
672
|
</state>
|
685
|
673
|
</provider>
|
686
|
674
|
</entry>
|
687
|
675
|
<entry file="file://$PROJECT_DIR$/pom.xml">
|
688
|
676
|
<provider selected="true" editor-type-id="text-editor">
|
689
|
|
- <state relative-caret-position="585">
|
|
677
|
+ <state relative-caret-position="897">
|
690
|
678
|
<caret line="39" column="21" selection-start-line="39" selection-start-column="21" selection-end-line="39" selection-end-column="21" />
|
691
|
679
|
</state>
|
692
|
680
|
</provider>
|
693
|
681
|
</entry>
|
694
|
|
- <entry file="file://$PROJECT_DIR$/src/main/resources/application.properties">
|
695
|
|
- <provider selected="true" editor-type-id="text-editor">
|
696
|
|
- <state relative-caret-position="330">
|
697
|
|
- <caret line="22" column="44" selection-start-line="22" selection-start-column="44" selection-end-line="22" selection-end-column="44" />
|
698
|
|
- </state>
|
699
|
|
- </provider>
|
700
|
|
- </entry>
|
701
|
682
|
<entry file="file://$PROJECT_DIR$/src/test/java/redCoin/Miner/minerTest.java" />
|
702
|
|
- <entry file="file://$PROJECT_DIR$/src/main/java/com/zipcoin/model/Miner.java">
|
|
683
|
+ <entry file="file://$PROJECT_DIR$/src/test/java/com/zipcoin/redCoin/miner/test/minerTest.java">
|
703
|
684
|
<provider selected="true" editor-type-id="text-editor">
|
704
|
|
- <state relative-caret-position="210">
|
705
|
|
- <caret line="14" column="21" selection-start-line="14" selection-start-column="21" selection-end-line="14" selection-end-column="21" />
|
|
685
|
+ <state relative-caret-position="276">
|
|
686
|
+ <caret line="12" column="9" selection-start-line="12" selection-start-column="9" selection-end-line="12" selection-end-column="9" />
|
|
687
|
+ <folding>
|
|
688
|
+ <element signature="imports" expanded="true" />
|
|
689
|
+ </folding>
|
706
|
690
|
</state>
|
707
|
691
|
</provider>
|
708
|
692
|
</entry>
|
709
|
|
- <entry file="file://$PROJECT_DIR$/src/test/java/com/zipcoin/redCoin/miner/test/minerTest.java">
|
|
693
|
+ <entry file="file://$PROJECT_DIR$/src/main/java/com/zipcoin/ZipCoinApp.java">
|
710
|
694
|
<provider selected="true" editor-type-id="text-editor">
|
711
|
|
- <state relative-caret-position="135">
|
712
|
|
- <caret line="12" column="9" selection-start-line="12" selection-start-column="9" selection-end-line="12" selection-end-column="9" />
|
|
695
|
+ <state relative-caret-position="138">
|
|
696
|
+ <caret line="6" column="13" selection-start-line="6" selection-start-column="13" selection-end-line="6" selection-end-column="13" />
|
713
|
697
|
<folding>
|
714
|
698
|
<element signature="imports" expanded="true" />
|
715
|
699
|
</folding>
|
716
|
700
|
</state>
|
717
|
701
|
</provider>
|
718
|
702
|
</entry>
|
719
|
|
- <entry file="file://$PROJECT_DIR$/src/main/java/com/zipcoin/model/Block.java">
|
|
703
|
+ <entry file="file://$PROJECT_DIR$/src/main/resources/application.properties">
|
720
|
704
|
<provider selected="true" editor-type-id="text-editor">
|
721
|
|
- <state relative-caret-position="1230">
|
722
|
|
- <caret line="82" column="4" selection-start-line="82" selection-start-column="4" selection-end-line="82" selection-end-column="4" />
|
|
705
|
+ <state relative-caret-position="253">
|
|
706
|
+ <caret line="11" lean-forward="true" selection-start-line="11" selection-end-line="11" />
|
|
707
|
+ </state>
|
|
708
|
+ </provider>
|
|
709
|
+ </entry>
|
|
710
|
+ <entry file="file://$PROJECT_DIR$/src/main/java/com/zipcoin/controller/BlockController.java">
|
|
711
|
+ <provider selected="true" editor-type-id="text-editor">
|
|
712
|
+ <state relative-caret-position="529">
|
|
713
|
+ <caret line="27" column="5" selection-start-line="27" selection-start-column="5" selection-end-line="27" selection-end-column="5" />
|
723
|
714
|
<folding>
|
724
|
715
|
<element signature="imports" expanded="true" />
|
725
|
716
|
</folding>
|
726
|
717
|
</state>
|
727
|
718
|
</provider>
|
728
|
719
|
</entry>
|
729
|
|
- <entry file="file://$PROJECT_DIR$/src/main/java/com/zipcoin/controller/BlockController.java">
|
|
720
|
+ <entry file="file://$PROJECT_DIR$/src/main/java/com/zipcoin/model/Miner.java">
|
|
721
|
+ <provider selected="true" editor-type-id="text-editor">
|
|
722
|
+ <state relative-caret-position="322">
|
|
723
|
+ <caret line="14" column="21" selection-start-line="14" selection-start-column="21" selection-end-line="14" selection-end-column="21" />
|
|
724
|
+ </state>
|
|
725
|
+ </provider>
|
|
726
|
+ </entry>
|
|
727
|
+ <entry file="file://$PROJECT_DIR$/src/main/java/com/zipcoin/model/Block.java">
|
730
|
728
|
<provider selected="true" editor-type-id="text-editor">
|
731
|
|
- <state relative-caret-position="205">
|
732
|
|
- <caret line="27" column="5" lean-forward="true" selection-start-line="27" selection-start-column="5" selection-end-line="27" selection-end-column="5" />
|
|
729
|
+ <state relative-caret-position="209">
|
|
730
|
+ <caret line="15" column="31" lean-forward="true" selection-start-line="15" selection-start-column="31" selection-end-line="15" selection-end-column="31" />
|
733
|
731
|
<folding>
|
734
|
732
|
<element signature="imports" expanded="true" />
|
735
|
733
|
</folding>
|