|
|
@@ -1,8 +1,89 @@
|
|
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 afterPath="$PROJECT_DIR$/.idea/compiler.xml" afterDir="false" />
|
|
|
6
|
+ <change afterPath="$PROJECT_DIR$/.idea/encodings.xml" afterDir="false" />
|
|
|
7
|
+ <change afterPath="$PROJECT_DIR$/.idea/libraries/Maven__antlr_antlr_2_7_7.xml" afterDir="false" />
|
|
|
8
|
+ <change afterPath="$PROJECT_DIR$/.idea/libraries/Maven__aopalliance_aopalliance_1_0.xml" afterDir="false" />
|
|
|
9
|
+ <change afterPath="$PROJECT_DIR$/.idea/libraries/Maven__ch_qos_logback_logback_classic_1_1_3.xml" afterDir="false" />
|
|
|
10
|
+ <change afterPath="$PROJECT_DIR$/.idea/libraries/Maven__ch_qos_logback_logback_core_1_1_3.xml" afterDir="false" />
|
|
|
11
|
+ <change afterPath="$PROJECT_DIR$/.idea/libraries/Maven__com_fasterxml_classmate_1_1_0.xml" afterDir="false" />
|
|
|
12
|
+ <change afterPath="$PROJECT_DIR$/.idea/libraries/Maven__com_fasterxml_jackson_core_jackson_annotations_2_6_4.xml" afterDir="false" />
|
|
|
13
|
+ <change afterPath="$PROJECT_DIR$/.idea/libraries/Maven__com_fasterxml_jackson_core_jackson_core_2_6_4.xml" afterDir="false" />
|
|
|
14
|
+ <change afterPath="$PROJECT_DIR$/.idea/libraries/Maven__com_fasterxml_jackson_core_jackson_databind_2_6_4.xml" afterDir="false" />
|
|
|
15
|
+ <change afterPath="$PROJECT_DIR$/.idea/libraries/Maven__com_h2database_h2_1_4_190.xml" afterDir="false" />
|
|
|
16
|
+ <change afterPath="$PROJECT_DIR$/.idea/libraries/Maven__commons_codec_commons_codec_1_10.xml" afterDir="false" />
|
|
|
17
|
+ <change afterPath="$PROJECT_DIR$/.idea/libraries/Maven__dom4j_dom4j_1_6_1.xml" afterDir="false" />
|
|
|
18
|
+ <change afterPath="$PROJECT_DIR$/.idea/libraries/Maven__javax_transaction_javax_transaction_api_1_2.xml" afterDir="false" />
|
|
|
19
|
+ <change afterPath="$PROJECT_DIR$/.idea/libraries/Maven__javax_validation_validation_api_1_1_0_Final.xml" afterDir="false" />
|
|
|
20
|
+ <change afterPath="$PROJECT_DIR$/.idea/libraries/Maven__junit_junit_4_12.xml" afterDir="false" />
|
|
|
21
|
+ <change afterPath="$PROJECT_DIR$/.idea/libraries/Maven__org_apache_tomcat_embed_tomcat_embed_core_8_0_30.xml" afterDir="false" />
|
|
|
22
|
+ <change afterPath="$PROJECT_DIR$/.idea/libraries/Maven__org_apache_tomcat_embed_tomcat_embed_el_8_0_30.xml" afterDir="false" />
|
|
|
23
|
+ <change afterPath="$PROJECT_DIR$/.idea/libraries/Maven__org_apache_tomcat_embed_tomcat_embed_logging_juli_8_0_30.xml" afterDir="false" />
|
|
|
24
|
+ <change afterPath="$PROJECT_DIR$/.idea/libraries/Maven__org_apache_tomcat_embed_tomcat_embed_websocket_8_0_30.xml" afterDir="false" />
|
|
|
25
|
+ <change afterPath="$PROJECT_DIR$/.idea/libraries/Maven__org_apache_tomcat_tomcat_jdbc_8_0_30.xml" afterDir="false" />
|
|
|
26
|
+ <change afterPath="$PROJECT_DIR$/.idea/libraries/Maven__org_apache_tomcat_tomcat_juli_8_0_30.xml" afterDir="false" />
|
|
|
27
|
+ <change afterPath="$PROJECT_DIR$/.idea/libraries/Maven__org_aspectj_aspectjweaver_1_8_7.xml" afterDir="false" />
|
|
|
28
|
+ <change afterPath="$PROJECT_DIR$/.idea/libraries/Maven__org_flywaydb_flyway_core_3_2_1.xml" afterDir="false" />
|
|
|
29
|
+ <change afterPath="$PROJECT_DIR$/.idea/libraries/Maven__org_hamcrest_hamcrest_core_1_3.xml" afterDir="false" />
|
|
|
30
|
+ <change afterPath="$PROJECT_DIR$/.idea/libraries/Maven__org_hamcrest_hamcrest_library_1_3.xml" afterDir="false" />
|
|
|
31
|
+ <change afterPath="$PROJECT_DIR$/.idea/libraries/Maven__org_hibernate_common_hibernate_commons_annotations_4_0_5_Final.xml" afterDir="false" />
|
|
|
32
|
+ <change afterPath="$PROJECT_DIR$/.idea/libraries/Maven__org_hibernate_hibernate_core_4_3_11_Final.xml" afterDir="false" />
|
|
|
33
|
+ <change afterPath="$PROJECT_DIR$/.idea/libraries/Maven__org_hibernate_hibernate_entitymanager_4_3_11_Final.xml" afterDir="false" />
|
|
|
34
|
+ <change afterPath="$PROJECT_DIR$/.idea/libraries/Maven__org_hibernate_hibernate_validator_5_2_2_Final.xml" afterDir="false" />
|
|
|
35
|
+ <change afterPath="$PROJECT_DIR$/.idea/libraries/Maven__org_hibernate_javax_persistence_hibernate_jpa_2_1_api_1_0_0_Final.xml" afterDir="false" />
|
|
|
36
|
+ <change afterPath="$PROJECT_DIR$/.idea/libraries/Maven__org_javassist_javassist_3_18_1_GA.xml" afterDir="false" />
|
|
|
37
|
+ <change afterPath="$PROJECT_DIR$/.idea/libraries/Maven__org_jboss_jandex_1_1_0_Final.xml" afterDir="false" />
|
|
|
38
|
+ <change afterPath="$PROJECT_DIR$/.idea/libraries/Maven__org_jboss_logging_jboss_logging_3_3_0_Final.xml" afterDir="false" />
|
|
|
39
|
+ <change afterPath="$PROJECT_DIR$/.idea/libraries/Maven__org_jboss_logging_jboss_logging_annotations_1_2_0_Beta1.xml" afterDir="false" />
|
|
|
40
|
+ <change afterPath="$PROJECT_DIR$/.idea/libraries/Maven__org_mockito_mockito_core_1_10_19.xml" afterDir="false" />
|
|
|
41
|
+ <change afterPath="$PROJECT_DIR$/.idea/libraries/Maven__org_objenesis_objenesis_2_1.xml" afterDir="false" />
|
|
|
42
|
+ <change afterPath="$PROJECT_DIR$/.idea/libraries/Maven__org_slf4j_jcl_over_slf4j_1_7_13.xml" afterDir="false" />
|
|
|
43
|
+ <change afterPath="$PROJECT_DIR$/.idea/libraries/Maven__org_slf4j_jul_to_slf4j_1_7_13.xml" afterDir="false" />
|
|
|
44
|
+ <change afterPath="$PROJECT_DIR$/.idea/libraries/Maven__org_slf4j_log4j_over_slf4j_1_7_13.xml" afterDir="false" />
|
|
|
45
|
+ <change afterPath="$PROJECT_DIR$/.idea/libraries/Maven__org_slf4j_slf4j_api_1_7_13.xml" afterDir="false" />
|
|
|
46
|
+ <change afterPath="$PROJECT_DIR$/.idea/libraries/Maven__org_springframework_boot_spring_boot_1_3_1_RELEASE.xml" afterDir="false" />
|
|
|
47
|
+ <change afterPath="$PROJECT_DIR$/.idea/libraries/Maven__org_springframework_boot_spring_boot_autoconfigure_1_3_1_RELEASE.xml" afterDir="false" />
|
|
|
48
|
+ <change afterPath="$PROJECT_DIR$/.idea/libraries/Maven__org_springframework_boot_spring_boot_starter_1_3_1_RELEASE.xml" afterDir="false" />
|
|
|
49
|
+ <change afterPath="$PROJECT_DIR$/.idea/libraries/Maven__org_springframework_boot_spring_boot_starter_aop_1_3_1_RELEASE.xml" afterDir="false" />
|
|
|
50
|
+ <change afterPath="$PROJECT_DIR$/.idea/libraries/Maven__org_springframework_boot_spring_boot_starter_data_jpa_1_3_1_RELEASE.xml" afterDir="false" />
|
|
|
51
|
+ <change afterPath="$PROJECT_DIR$/.idea/libraries/Maven__org_springframework_boot_spring_boot_starter_jdbc_1_3_1_RELEASE.xml" afterDir="false" />
|
|
|
52
|
+ <change afterPath="$PROJECT_DIR$/.idea/libraries/Maven__org_springframework_boot_spring_boot_starter_logging_1_3_1_RELEASE.xml" afterDir="false" />
|
|
|
53
|
+ <change afterPath="$PROJECT_DIR$/.idea/libraries/Maven__org_springframework_boot_spring_boot_starter_test_1_3_1_RELEASE.xml" afterDir="false" />
|
|
|
54
|
+ <change afterPath="$PROJECT_DIR$/.idea/libraries/Maven__org_springframework_boot_spring_boot_starter_tomcat_1_3_1_RELEASE.xml" afterDir="false" />
|
|
|
55
|
+ <change afterPath="$PROJECT_DIR$/.idea/libraries/Maven__org_springframework_boot_spring_boot_starter_validation_1_3_1_RELEASE.xml" afterDir="false" />
|
|
|
56
|
+ <change afterPath="$PROJECT_DIR$/.idea/libraries/Maven__org_springframework_boot_spring_boot_starter_web_1_3_1_RELEASE.xml" afterDir="false" />
|
|
|
57
|
+ <change afterPath="$PROJECT_DIR$/.idea/libraries/Maven__org_springframework_data_spring_data_commons_1_11_2_RELEASE.xml" afterDir="false" />
|
|
|
58
|
+ <change afterPath="$PROJECT_DIR$/.idea/libraries/Maven__org_springframework_data_spring_data_jpa_1_9_2_RELEASE.xml" afterDir="false" />
|
|
|
59
|
+ <change afterPath="$PROJECT_DIR$/.idea/libraries/Maven__org_springframework_spring_aop_4_2_4_RELEASE.xml" afterDir="false" />
|
|
|
60
|
+ <change afterPath="$PROJECT_DIR$/.idea/libraries/Maven__org_springframework_spring_aspects_4_2_4_RELEASE.xml" afterDir="false" />
|
|
|
61
|
+ <change afterPath="$PROJECT_DIR$/.idea/libraries/Maven__org_springframework_spring_beans_4_2_4_RELEASE.xml" afterDir="false" />
|
|
|
62
|
+ <change afterPath="$PROJECT_DIR$/.idea/libraries/Maven__org_springframework_spring_context_4_2_4_RELEASE.xml" afterDir="false" />
|
|
|
63
|
+ <change afterPath="$PROJECT_DIR$/.idea/libraries/Maven__org_springframework_spring_core_4_2_4_RELEASE.xml" afterDir="false" />
|
|
|
64
|
+ <change afterPath="$PROJECT_DIR$/.idea/libraries/Maven__org_springframework_spring_expression_4_2_4_RELEASE.xml" afterDir="false" />
|
|
|
65
|
+ <change afterPath="$PROJECT_DIR$/.idea/libraries/Maven__org_springframework_spring_jdbc_4_2_4_RELEASE.xml" afterDir="false" />
|
|
|
66
|
+ <change afterPath="$PROJECT_DIR$/.idea/libraries/Maven__org_springframework_spring_orm_4_2_4_RELEASE.xml" afterDir="false" />
|
|
|
67
|
+ <change afterPath="$PROJECT_DIR$/.idea/libraries/Maven__org_springframework_spring_test_4_2_4_RELEASE.xml" afterDir="false" />
|
|
|
68
|
+ <change afterPath="$PROJECT_DIR$/.idea/libraries/Maven__org_springframework_spring_tx_4_2_4_RELEASE.xml" afterDir="false" />
|
|
|
69
|
+ <change afterPath="$PROJECT_DIR$/.idea/libraries/Maven__org_springframework_spring_web_4_2_4_RELEASE.xml" afterDir="false" />
|
|
|
70
|
+ <change afterPath="$PROJECT_DIR$/.idea/libraries/Maven__org_springframework_spring_webmvc_4_2_4_RELEASE.xml" afterDir="false" />
|
|
|
71
|
+ <change afterPath="$PROJECT_DIR$/.idea/libraries/Maven__org_yaml_snakeyaml_1_16.xml" afterDir="false" />
|
|
|
72
|
+ <change afterPath="$PROJECT_DIR$/.idea/libraries/Maven__xml_apis_xml_apis_1_0_b2.xml" afterDir="false" />
|
|
|
73
|
+ <change afterPath="$PROJECT_DIR$/.idea/misc.xml" afterDir="false" />
|
|
|
74
|
+ <change afterPath="$PROJECT_DIR$/.idea/modules.xml" afterDir="false" />
|
|
|
75
|
+ <change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" />
|
|
|
76
|
+ <change beforePath="$PROJECT_DIR$/ZipCoinRedIonicClient/.sourcemaps/main.js.map" beforeDir="false" afterPath="$PROJECT_DIR$/ZipCoinRedIonicClient/.sourcemaps/main.js.map" afterDir="false" />
|
|
|
77
|
+ <change beforePath="$PROJECT_DIR$/ZipCoinRedIonicClient/src/pages/home/home.html" beforeDir="false" afterPath="$PROJECT_DIR$/ZipCoinRedIonicClient/src/pages/home/home.html" afterDir="false" />
|
|
|
78
|
+ <change beforePath="$PROJECT_DIR$/ZipCoinRedIonicClient/src/pages/home/home.ts" beforeDir="false" afterPath="$PROJECT_DIR$/ZipCoinRedIonicClient/src/pages/home/home.ts" afterDir="false" />
|
|
|
79
|
+ <change beforePath="$PROJECT_DIR$/ZipCoinRedIonicClient/www/build/main.js" beforeDir="false" afterPath="$PROJECT_DIR$/ZipCoinRedIonicClient/www/build/main.js" afterDir="false" />
|
|
|
80
|
+ <change beforePath="$PROJECT_DIR$/ZipCoinRedIonicClient/www/build/main.js.map" beforeDir="false" afterPath="$PROJECT_DIR$/ZipCoinRedIonicClient/www/build/main.js.map" afterDir="false" />
|
|
|
81
|
+ <change beforePath="$PROJECT_DIR$/ZipCoinRedIonicClient/www/build/vendor.js.map" beforeDir="false" afterPath="$PROJECT_DIR$/ZipCoinRedIonicClient/www/build/vendor.js.map" afterDir="false" />
|
|
|
82
|
+ <change beforePath="$PROJECT_DIR$/ZipCoinRedJavaServer/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/ZipCoinRedJavaServer/.idea/workspace.xml" afterDir="false" />
|
|
|
83
|
+ <change beforePath="$PROJECT_DIR$/ZipCoinRedJavaServer/ZipCoin-RED.iml" beforeDir="false" afterPath="$PROJECT_DIR$/ZipCoinRedJavaServer/ZipCoin-RED.iml" afterDir="false" />
|
|
|
84
|
+ </list>
|
|
5
|
85
|
<ignored path="$PROJECT_DIR$/target/" />
|
|
|
86
|
+ <ignored path="$PROJECT_DIR$/ZipCoinRedJavaServer/target/" />
|
|
6
|
87
|
<option name="EXCLUDED_CONVERTED_TO_IGNORED" value="true" />
|
|
7
|
88
|
<option name="TRACKING_ENABLED" value="true" />
|
|
8
|
89
|
<option name="SHOW_DIALOG" value="false" />
|
|
|
@@ -25,7 +106,53 @@
|
|
25
|
106
|
<select />
|
|
26
|
107
|
</component>
|
|
27
|
108
|
<component name="FileEditorManager">
|
|
28
|
|
- <leaf />
|
|
|
109
|
+ <leaf SIDE_TABS_SIZE_LIMIT_KEY="300">
|
|
|
110
|
+ <file leaf-file-name="ZipCoinApp.java" pinned="false" current-in-tab="false">
|
|
|
111
|
+ <entry file="file://$PROJECT_DIR$/ZipCoinRedJavaServer/src/main/java/com/zipcoin/ZipCoinApp.java">
|
|
|
112
|
+ <provider selected="true" editor-type-id="text-editor">
|
|
|
113
|
+ <state relative-caret-position="230">
|
|
|
114
|
+ <caret line="13" selection-start-line="13" selection-end-line="13" />
|
|
|
115
|
+ </state>
|
|
|
116
|
+ </provider>
|
|
|
117
|
+ </entry>
|
|
|
118
|
+ </file>
|
|
|
119
|
+ <file leaf-file-name="Miner.java" pinned="false" current-in-tab="false">
|
|
|
120
|
+ <entry file="file://$PROJECT_DIR$/ZipCoinRedJavaServer/src/main/java/com/zipcoin/model/Miner.java">
|
|
|
121
|
+ <provider selected="true" editor-type-id="text-editor">
|
|
|
122
|
+ <state relative-caret-position="-15">
|
|
|
123
|
+ <caret line="2" column="13" selection-start-line="2" selection-start-column="13" selection-end-line="2" selection-end-column="13" />
|
|
|
124
|
+ </state>
|
|
|
125
|
+ </provider>
|
|
|
126
|
+ </entry>
|
|
|
127
|
+ </file>
|
|
|
128
|
+ <file leaf-file-name="BlockRepository.java" pinned="false" current-in-tab="false">
|
|
|
129
|
+ <entry file="file://$PROJECT_DIR$/ZipCoinRedJavaServer/src/main/java/com/zipcoin/repository/BlockRepository.java">
|
|
|
130
|
+ <provider selected="true" editor-type-id="text-editor">
|
|
|
131
|
+ <state relative-caret-position="92">
|
|
|
132
|
+ <caret line="5" column="17" selection-start-line="5" selection-start-column="17" selection-end-line="5" selection-end-column="17" />
|
|
|
133
|
+ </state>
|
|
|
134
|
+ </provider>
|
|
|
135
|
+ </entry>
|
|
|
136
|
+ </file>
|
|
|
137
|
+ <file leaf-file-name="BlockController.java" pinned="false" current-in-tab="true">
|
|
|
138
|
+ <entry file="file://$PROJECT_DIR$/ZipCoinRedJavaServer/src/main/java/com/zipcoin/controller/BlockController.java">
|
|
|
139
|
+ <provider selected="true" editor-type-id="text-editor">
|
|
|
140
|
+ <state relative-caret-position="-37">
|
|
|
141
|
+ <caret line="12" column="30" selection-start-line="12" selection-start-column="30" selection-end-line="12" selection-end-column="30" />
|
|
|
142
|
+ </state>
|
|
|
143
|
+ </provider>
|
|
|
144
|
+ </entry>
|
|
|
145
|
+ </file>
|
|
|
146
|
+ <file leaf-file-name="PersistenceConfiguration.java" pinned="false" current-in-tab="false">
|
|
|
147
|
+ <entry file="file://$PROJECT_DIR$/ZipCoinRedJavaServer/src/main/java/com/zipcoin/config/PersistenceConfiguration.java">
|
|
|
148
|
+ <provider selected="true" editor-type-id="text-editor">
|
|
|
149
|
+ <state relative-caret-position="138">
|
|
|
150
|
+ <caret line="13" column="13" selection-start-line="13" selection-start-column="13" selection-end-line="13" selection-end-column="13" />
|
|
|
151
|
+ </state>
|
|
|
152
|
+ </provider>
|
|
|
153
|
+ </entry>
|
|
|
154
|
+ </file>
|
|
|
155
|
+ </leaf>
|
|
29
|
156
|
</component>
|
|
30
|
157
|
<component name="FileTemplateManagerImpl">
|
|
31
|
158
|
<option name="RECENT_TEMPLATES">
|
|
|
@@ -82,10 +209,10 @@
|
|
82
|
209
|
<packageJsonPaths />
|
|
83
|
210
|
</component>
|
|
84
|
211
|
<component name="ProjectFrameBounds" fullScreen="true">
|
|
85
|
|
- <option name="x" value="-29" />
|
|
86
|
|
- <option name="y" value="38" />
|
|
87
|
|
- <option name="width" value="1280" />
|
|
88
|
|
- <option name="height" value="713" />
|
|
|
212
|
+ <option name="x" value="67" />
|
|
|
213
|
+ <option name="y" value="36" />
|
|
|
214
|
+ <option name="width" value="1043" />
|
|
|
215
|
+ <option name="height" value="699" />
|
|
89
|
216
|
</component>
|
|
90
|
217
|
<component name="ProjectLevelVcsManager" settingsEditedManually="true">
|
|
91
|
218
|
<ConfirmationsSetting value="2" id="Add" />
|
|
|
@@ -95,37 +222,37 @@
|
|
95
|
222
|
<foldersAlwaysOnTop value="true" />
|
|
96
|
223
|
</navigator>
|
|
97
|
224
|
<panes>
|
|
98
|
|
- <pane id="Scope" />
|
|
99
|
|
- <pane id="PackagesPane" />
|
|
100
|
225
|
<pane id="AndroidView" />
|
|
|
226
|
+ <pane id="Course" />
|
|
|
227
|
+ <pane id="Scope" />
|
|
101
|
228
|
<pane id="ProjectPane">
|
|
102
|
229
|
<subPane>
|
|
103
|
230
|
<expand>
|
|
104
|
231
|
<path>
|
|
105
|
232
|
<item name="ZipCoin-RED" type="b2602c69:ProjectViewProjectNode" />
|
|
106
|
|
- <item name="ZipCoin-RED" type="462c0819:PsiDirectoryNode" />
|
|
|
233
|
+ <item name="ZipCoinRedJavaServer" type="462c0819:PsiDirectoryNode" />
|
|
107
|
234
|
</path>
|
|
108
|
235
|
<path>
|
|
109
|
236
|
<item name="ZipCoin-RED" type="b2602c69:ProjectViewProjectNode" />
|
|
110
|
|
- <item name="ZipCoin-RED" type="462c0819:PsiDirectoryNode" />
|
|
|
237
|
+ <item name="ZipCoinRedJavaServer" type="462c0819:PsiDirectoryNode" />
|
|
111
|
238
|
<item name="src" type="462c0819:PsiDirectoryNode" />
|
|
112
|
239
|
</path>
|
|
113
|
240
|
<path>
|
|
114
|
241
|
<item name="ZipCoin-RED" type="b2602c69:ProjectViewProjectNode" />
|
|
115
|
|
- <item name="ZipCoin-RED" type="462c0819:PsiDirectoryNode" />
|
|
|
242
|
+ <item name="ZipCoinRedJavaServer" type="462c0819:PsiDirectoryNode" />
|
|
116
|
243
|
<item name="src" type="462c0819:PsiDirectoryNode" />
|
|
117
|
244
|
<item name="main" type="462c0819:PsiDirectoryNode" />
|
|
118
|
245
|
</path>
|
|
119
|
246
|
<path>
|
|
120
|
247
|
<item name="ZipCoin-RED" type="b2602c69:ProjectViewProjectNode" />
|
|
121
|
|
- <item name="ZipCoin-RED" type="462c0819:PsiDirectoryNode" />
|
|
|
248
|
+ <item name="ZipCoinRedJavaServer" type="462c0819:PsiDirectoryNode" />
|
|
122
|
249
|
<item name="src" type="462c0819:PsiDirectoryNode" />
|
|
123
|
250
|
<item name="main" type="462c0819:PsiDirectoryNode" />
|
|
124
|
251
|
<item name="java" type="462c0819:PsiDirectoryNode" />
|
|
125
|
252
|
</path>
|
|
126
|
253
|
<path>
|
|
127
|
254
|
<item name="ZipCoin-RED" type="b2602c69:ProjectViewProjectNode" />
|
|
128
|
|
- <item name="ZipCoin-RED" type="462c0819:PsiDirectoryNode" />
|
|
|
255
|
+ <item name="ZipCoinRedJavaServer" type="462c0819:PsiDirectoryNode" />
|
|
129
|
256
|
<item name="src" type="462c0819:PsiDirectoryNode" />
|
|
130
|
257
|
<item name="main" type="462c0819:PsiDirectoryNode" />
|
|
131
|
258
|
<item name="java" type="462c0819:PsiDirectoryNode" />
|
|
|
@@ -133,63 +260,45 @@
|
|
133
|
260
|
</path>
|
|
134
|
261
|
<path>
|
|
135
|
262
|
<item name="ZipCoin-RED" type="b2602c69:ProjectViewProjectNode" />
|
|
136
|
|
- <item name="ZipCoin-RED" type="462c0819:PsiDirectoryNode" />
|
|
|
263
|
+ <item name="ZipCoinRedJavaServer" type="462c0819:PsiDirectoryNode" />
|
|
137
|
264
|
<item name="src" type="462c0819:PsiDirectoryNode" />
|
|
138
|
265
|
<item name="main" type="462c0819:PsiDirectoryNode" />
|
|
139
|
266
|
<item name="java" type="462c0819:PsiDirectoryNode" />
|
|
140
|
267
|
<item name="zipcoin" type="462c0819:PsiDirectoryNode" />
|
|
141
|
|
- <item name="controller" type="462c0819:PsiDirectoryNode" />
|
|
|
268
|
+ <item name="config" type="462c0819:PsiDirectoryNode" />
|
|
142
|
269
|
</path>
|
|
143
|
270
|
<path>
|
|
144
|
271
|
<item name="ZipCoin-RED" type="b2602c69:ProjectViewProjectNode" />
|
|
145
|
|
- <item name="ZipCoin-RED" type="462c0819:PsiDirectoryNode" />
|
|
|
272
|
+ <item name="ZipCoinRedJavaServer" type="462c0819:PsiDirectoryNode" />
|
|
146
|
273
|
<item name="src" type="462c0819:PsiDirectoryNode" />
|
|
147
|
274
|
<item name="main" type="462c0819:PsiDirectoryNode" />
|
|
148
|
275
|
<item name="java" type="462c0819:PsiDirectoryNode" />
|
|
149
|
276
|
<item name="zipcoin" type="462c0819:PsiDirectoryNode" />
|
|
150
|
|
- <item name="model" type="462c0819:PsiDirectoryNode" />
|
|
|
277
|
+ <item name="controller" type="462c0819:PsiDirectoryNode" />
|
|
151
|
278
|
</path>
|
|
152
|
279
|
<path>
|
|
153
|
280
|
<item name="ZipCoin-RED" type="b2602c69:ProjectViewProjectNode" />
|
|
154
|
|
- <item name="ZipCoin-RED" type="462c0819:PsiDirectoryNode" />
|
|
|
281
|
+ <item name="ZipCoinRedJavaServer" type="462c0819:PsiDirectoryNode" />
|
|
155
|
282
|
<item name="src" type="462c0819:PsiDirectoryNode" />
|
|
156
|
283
|
<item name="main" type="462c0819:PsiDirectoryNode" />
|
|
157
|
|
- <item name="resources" type="462c0819:PsiDirectoryNode" />
|
|
158
|
|
- </path>
|
|
159
|
|
- <path>
|
|
160
|
|
- <item name="ZipCoin-RED" type="b2602c69:ProjectViewProjectNode" />
|
|
161
|
|
- <item name="ZipCoin-RED" type="462c0819:PsiDirectoryNode" />
|
|
162
|
|
- <item name="src" type="462c0819:PsiDirectoryNode" />
|
|
163
|
|
- <item name="test" type="462c0819:PsiDirectoryNode" />
|
|
164
|
|
- </path>
|
|
165
|
|
- <path>
|
|
166
|
|
- <item name="ZipCoin-RED" type="b2602c69:ProjectViewProjectNode" />
|
|
167
|
|
- <item name="ZipCoin-RED" type="462c0819:PsiDirectoryNode" />
|
|
168
|
|
- <item name="src" type="462c0819:PsiDirectoryNode" />
|
|
169
|
|
- <item name="test" type="462c0819:PsiDirectoryNode" />
|
|
170
|
284
|
<item name="java" type="462c0819:PsiDirectoryNode" />
|
|
|
285
|
+ <item name="zipcoin" type="462c0819:PsiDirectoryNode" />
|
|
|
286
|
+ <item name="model" type="462c0819:PsiDirectoryNode" />
|
|
171
|
287
|
</path>
|
|
172
|
288
|
<path>
|
|
173
|
289
|
<item name="ZipCoin-RED" type="b2602c69:ProjectViewProjectNode" />
|
|
174
|
|
- <item name="ZipCoin-RED" type="462c0819:PsiDirectoryNode" />
|
|
175
|
|
- <item name="src" type="462c0819:PsiDirectoryNode" />
|
|
176
|
|
- <item name="test" type="462c0819:PsiDirectoryNode" />
|
|
177
|
|
- <item name="java" type="462c0819:PsiDirectoryNode" />
|
|
178
|
|
- <item name="redCoin" type="462c0819:PsiDirectoryNode" />
|
|
179
|
|
- </path>
|
|
180
|
|
- <path>
|
|
181
|
|
- <item name="ZipCoin-RED" type="b2602c69:ProjectViewProjectNode" />
|
|
182
|
|
- <item name="ZipCoin-RED" type="462c0819:PsiDirectoryNode" />
|
|
|
290
|
+ <item name="ZipCoinRedJavaServer" type="462c0819:PsiDirectoryNode" />
|
|
183
|
291
|
<item name="src" type="462c0819:PsiDirectoryNode" />
|
|
184
|
|
- <item name="test" type="462c0819:PsiDirectoryNode" />
|
|
|
292
|
+ <item name="main" type="462c0819:PsiDirectoryNode" />
|
|
185
|
293
|
<item name="java" type="462c0819:PsiDirectoryNode" />
|
|
186
|
|
- <item name="redCoin" type="462c0819:PsiDirectoryNode" />
|
|
187
|
|
- <item name="test" type="462c0819:PsiDirectoryNode" />
|
|
|
294
|
+ <item name="zipcoin" type="462c0819:PsiDirectoryNode" />
|
|
|
295
|
+ <item name="repository" type="462c0819:PsiDirectoryNode" />
|
|
188
|
296
|
</path>
|
|
189
|
297
|
</expand>
|
|
190
|
298
|
<select />
|
|
191
|
299
|
</subPane>
|
|
192
|
300
|
</pane>
|
|
|
301
|
+ <pane id="PackagesPane" />
|
|
193
|
302
|
</panes>
|
|
194
|
303
|
</component>
|
|
195
|
304
|
<component name="PropertiesComponent">
|
|
|
@@ -375,6 +484,8 @@
|
|
375
|
484
|
<workItem from="1531772346214" duration="3133000" />
|
|
376
|
485
|
<workItem from="1531775595883" duration="5604000" />
|
|
377
|
486
|
<workItem from="1531837614306" duration="20000" />
|
|
|
487
|
+ <workItem from="1532024920972" duration="1933000" />
|
|
|
488
|
+ <workItem from="1532095197895" duration="1931000" />
|
|
378
|
489
|
</task>
|
|
379
|
490
|
<servers />
|
|
380
|
491
|
</component>
|
|
|
@@ -408,64 +519,45 @@
|
|
408
|
519
|
</history-entry>
|
|
409
|
520
|
</component>
|
|
410
|
521
|
<component name="TimeTrackingManager">
|
|
411
|
|
- <option name="totallyTimeSpent" value="14388000" />
|
|
|
522
|
+ <option name="totallyTimeSpent" value="18185000" />
|
|
412
|
523
|
</component>
|
|
413
|
524
|
<component name="ToolWindowManager">
|
|
414
|
|
- <frame x="0" y="22" width="1680" height="970" extended-state="6" />
|
|
|
525
|
+ <frame x="0" y="0" width="1280" height="800" extended-state="6" />
|
|
|
526
|
+ <editor active="true" />
|
|
415
|
527
|
<layout>
|
|
416
|
528
|
<window_info anchor="right" id="Palette" order="3" />
|
|
417
|
|
- <window_info anchor="bottom" id="TODO" order="6" />
|
|
418
|
|
- <window_info anchor="right" id="Palette	" order="3" />
|
|
419
|
|
- <window_info id="Image Layers" order="2" />
|
|
420
|
|
- <window_info anchor="right" id="Capture Analysis" order="3" />
|
|
421
|
|
- <window_info anchor="bottom" id="Event Log" order="7" sideWeight="0.50076926" side_tool="true" weight="0.3298969" />
|
|
422
|
|
- <window_info anchor="right" id="Maven Projects" order="3" visible="true" weight="0.1929182" />
|
|
|
529
|
+ <window_info anchor="bottom" id="Event Log" order="7" side_tool="true" />
|
|
|
530
|
+ <window_info anchor="right" id="Maven Projects" order="3" weight="0.32956383" />
|
|
423
|
531
|
<window_info anchor="bottom" id="Database Changes" order="7" show_stripe_button="false" />
|
|
424
|
|
- <window_info anchor="bottom" id="Version Control" order="7" />
|
|
425
|
|
- <window_info anchor="bottom" id="Run" order="2" weight="0.3298969" />
|
|
426
|
|
- <window_info active="true" anchor="bottom" id="Terminal" order="7" sideWeight="0.49923077" visible="true" weight="0.3298969" />
|
|
427
|
532
|
<window_info id="Capture Tool" order="2" />
|
|
428
|
533
|
<window_info id="Designer" order="2" />
|
|
429
|
|
- <window_info content_ui="combo" id="Project" order="0" visible="true" weight="0.15506716" />
|
|
430
|
534
|
<window_info anchor="right" id="Database" order="3" />
|
|
431
|
535
|
<window_info id="Structure" order="1" side_tool="true" weight="0.25" />
|
|
432
|
536
|
<window_info anchor="right" id="Ant Build" order="1" weight="0.25" />
|
|
433
|
537
|
<window_info id="UI Designer" order="2" />
|
|
434
|
|
- <window_info anchor="right" id="Theme Preview" order="3" />
|
|
435
|
|
- <window_info id="Favorites" order="2" side_tool="true" />
|
|
436
|
|
- <window_info anchor="bottom" id="Debug" order="3" weight="0.4" />
|
|
437
|
|
- <window_info anchor="bottom" id="Message" order="0" />
|
|
438
|
|
- <window_info anchor="bottom" id="Event Log" order="7" side_tool="true" />
|
|
439
|
|
- <window_info active="true" content_ui="combo" id="Project" order="0" visible="true" weight="0.26494345" />
|
|
440
|
|
- <window_info id="Favorites" order="2" side_tool="true" />
|
|
441
|
|
- <window_info anchor="right" id="Ant Build" order="1" weight="0.25" />
|
|
442
|
|
- <window_info anchor="bottom" id="Java Enterprise" order="10" />
|
|
443
|
538
|
<window_info anchor="bottom" id="Debug" order="3" weight="0.4" />
|
|
444
|
|
- <window_info anchor="bottom" id="Terminal" order="7" weight="0.32954547" />
|
|
445
|
|
- <window_info id="Structure" order="1" side_tool="true" weight="0.25" />
|
|
446
|
|
- <window_info anchor="right" id="Palette" order="3" />
|
|
|
539
|
+ <window_info anchor="bottom" id="TODO" order="6" />
|
|
|
540
|
+ <window_info anchor="bottom" id="Messages" order="9" weight="0.3298969" />
|
|
447
|
541
|
<window_info anchor="right" id="Palette	" order="3" />
|
|
448
|
|
- <window_info anchor="right" id="Maven Projects" order="3" />
|
|
449
|
|
- <window_info id="Web" order="3" side_tool="true" />
|
|
450
|
|
- <window_info anchor="bottom" id="Database Changes" order="7" show_stripe_button="false" />
|
|
451
|
|
- <window_info anchor="bottom" id="Spring" order="9" />
|
|
452
|
|
- <window_info anchor="right" content_ui="combo" id="Hierarchy" order="2" weight="0.25" />
|
|
453
|
542
|
<window_info id="Image Layers" order="2" />
|
|
454
|
|
- <window_info anchor="right" id="Theme Preview" order="3" />
|
|
455
|
|
- <window_info anchor="right" id="Database" order="3" />
|
|
456
|
|
- <window_info id="Capture Tool" order="2" />
|
|
457
|
|
- <window_info anchor="bottom" id="Version Control" order="7" />
|
|
|
543
|
+ <window_info anchor="bottom" id="Java Enterprise" order="8" />
|
|
458
|
544
|
<window_info anchor="right" id="Capture Analysis" order="3" />
|
|
459
|
|
- <window_info anchor="bottom" id="TODO" order="6" />
|
|
460
|
|
- <window_info anchor="bottom" id="Find" order="1" weight="0.32954547" />
|
|
461
|
|
- <window_info anchor="bottom" id="Inspection" order="5" weight="0.4" />
|
|
462
|
|
- <window_info anchor="bottom" id="Cvs" order="4" weight="0.25" />
|
|
463
|
|
- <window_info id="UI Designer" order="2" />
|
|
|
545
|
+ <window_info anchor="bottom" id="Run" order="2" weight="0.54206896" />
|
|
|
546
|
+ <window_info anchor="bottom" id="Version Control" order="7" />
|
|
|
547
|
+ <window_info anchor="bottom" id="Spring" order="9" />
|
|
|
548
|
+ <window_info anchor="bottom" id="Terminal" order="7" weight="0.32827586" />
|
|
|
549
|
+ <window_info active="true" content_ui="combo" id="Project" order="0" visible="true" weight="0.273021" />
|
|
464
|
550
|
<window_info anchor="right" id="Bean Validation" order="4" />
|
|
465
|
|
- <window_info anchor="bottom" id="Run" order="2" weight="0.19586207" />
|
|
466
|
|
- <window_info anchor="bottom" id="Messages" order="9" weight="0.3298969" />
|
|
|
551
|
+ <window_info id="Web" order="4" side_tool="true" />
|
|
|
552
|
+ <window_info id="Learn" order="5" />
|
|
|
553
|
+ <window_info anchor="right" id="Theme Preview" order="3" />
|
|
|
554
|
+ <window_info id="Favorites" order="2" side_tool="true" />
|
|
|
555
|
+ <window_info anchor="bottom" id="Inspection" order="5" weight="0.4" />
|
|
467
|
556
|
<window_info anchor="right" id="Commander" internal_type="SLIDING" order="0" type="SLIDING" weight="0.4" />
|
|
468
|
|
- <window_info id="Designer" order="2" />
|
|
|
557
|
+ <window_info anchor="bottom" id="Cvs" order="4" weight="0.25" />
|
|
|
558
|
+ <window_info anchor="bottom" id="Message" order="0" />
|
|
|
559
|
+ <window_info anchor="right" content_ui="combo" id="Hierarchy" order="2" weight="0.25" />
|
|
|
560
|
+ <window_info anchor="bottom" id="Find" order="1" weight="0.32954547" />
|
|
469
|
561
|
</layout>
|
|
470
|
562
|
</component>
|
|
471
|
563
|
<component name="TypeScriptGeneratedFilesManager">
|
|
|
@@ -474,18 +566,12 @@
|
|
474
|
566
|
<component name="VcsContentAnnotationSettings">
|
|
475
|
567
|
<option name="myLimit" value="2678400000" />
|
|
476
|
568
|
</component>
|
|
|
569
|
+ <component name="XDebuggerManager">
|
|
|
570
|
+ <breakpoint-manager>
|
|
|
571
|
+ <option name="time" value="1" />
|
|
|
572
|
+ </breakpoint-manager>
|
|
|
573
|
+ </component>
|
|
477
|
574
|
<component name="editorHistoryManager">
|
|
478
|
|
- <entry file="file://$PROJECT_DIR$/src/main/java/com/zipcoin/redCoin/Main.java" />
|
|
479
|
|
- <entry file="file://$PROJECT_DIR$/src/test/java/com/zipcoin/redCoin/testMain.java" />
|
|
480
|
|
- <entry file="file://$PROJECT_DIR$/pom.xml" />
|
|
481
|
|
- <entry file="file://$PROJECT_DIR$/src/test/java/redCoin/minerTest.java" />
|
|
482
|
|
- <entry file="file://$PROJECT_DIR$/.idea/workspace.xml">
|
|
483
|
|
- <provider selected="true" editor-type-id="text-editor">
|
|
484
|
|
- <state relative-caret-position="405">
|
|
485
|
|
- <caret line="27" selection-start-line="27" selection-end-line="27" selection-end-column="12" />
|
|
486
|
|
- </state>
|
|
487
|
|
- </provider>
|
|
488
|
|
- </entry>
|
|
489
|
575
|
<entry file="file://$PROJECT_DIR$/.idea/ZipCoin-RED.iml" />
|
|
490
|
576
|
<entry file="file://$PROJECT_DIR$/pom.xml" />
|
|
491
|
577
|
<entry file="file://$PROJECT_DIR$/src/main/java/com/zipcoin/redCoin/Main.java" />
|
|
|
@@ -526,14 +612,6 @@
|
|
526
|
612
|
<entry file="file://$PROJECT_DIR$/src/main/java/com/zipcoin/redCoin/Main.java" />
|
|
527
|
613
|
<entry file="file://$PROJECT_DIR$/src/test/java/mainTest.java" />
|
|
528
|
614
|
<entry file="file://$PROJECT_DIR$/src/test/java/com/zipcoin/redCoin/testMain.java" />
|
|
529
|
|
- <entry file="file://$PROJECT_DIR$/README.md">
|
|
530
|
|
- <provider selected="true" editor-type-id="split-provider[text-editor;markdown-preview-editor]">
|
|
531
|
|
- <state split_layout="SPLIT">
|
|
532
|
|
- <first_editor />
|
|
533
|
|
- <second_editor />
|
|
534
|
|
- </state>
|
|
535
|
|
- </provider>
|
|
536
|
|
- </entry>
|
|
537
|
615
|
<entry file="file://$PROJECT_DIR$/src/main/resources/db.migration/mine_block.sql" />
|
|
538
|
616
|
<entry file="file://$PROJECT_DIR$/src/main/resources/db.migration/V2__mine_block.sql" />
|
|
539
|
617
|
<entry file="file://$PROJECT_DIR$/src/main/java/redCoin/Miner/Miner.java" />
|
|
|
@@ -551,6 +629,49 @@
|
|
551
|
629
|
<entry file="file://$PROJECT_DIR$/src/main/java/com/zipcoin/model/Miner.java" />
|
|
552
|
630
|
<entry file="file://$PROJECT_DIR$/src/test/java/com/zipcoin/redCoin/miner/test/minerTest.java" />
|
|
553
|
631
|
<entry file="file://$PROJECT_DIR$/src/main/java/com/zipcoin/controller/BlockController.java" />
|
|
|
632
|
+ <entry file="file://$PROJECT_DIR$/README.md">
|
|
|
633
|
+ <provider selected="true" editor-type-id="split-provider[text-editor;markdown-preview-editor]">
|
|
|
634
|
+ <state split_layout="SPLIT">
|
|
|
635
|
+ <first_editor />
|
|
|
636
|
+ <second_editor />
|
|
|
637
|
+ </state>
|
|
|
638
|
+ </provider>
|
|
|
639
|
+ </entry>
|
|
|
640
|
+ <entry file="file://$PROJECT_DIR$/ZipCoinRedJavaServer/src/main/java/com/zipcoin/ZipCoinApp.java">
|
|
|
641
|
+ <provider selected="true" editor-type-id="text-editor">
|
|
|
642
|
+ <state relative-caret-position="230">
|
|
|
643
|
+ <caret line="13" selection-start-line="13" selection-end-line="13" />
|
|
|
644
|
+ </state>
|
|
|
645
|
+ </provider>
|
|
|
646
|
+ </entry>
|
|
|
647
|
+ <entry file="file://$PROJECT_DIR$/ZipCoinRedJavaServer/src/main/java/com/zipcoin/model/Miner.java">
|
|
|
648
|
+ <provider selected="true" editor-type-id="text-editor">
|
|
|
649
|
+ <state relative-caret-position="-15">
|
|
|
650
|
+ <caret line="2" column="13" selection-start-line="2" selection-start-column="13" selection-end-line="2" selection-end-column="13" />
|
|
|
651
|
+ </state>
|
|
|
652
|
+ </provider>
|
|
|
653
|
+ </entry>
|
|
|
654
|
+ <entry file="file://$PROJECT_DIR$/ZipCoinRedJavaServer/src/main/java/com/zipcoin/repository/BlockRepository.java">
|
|
|
655
|
+ <provider selected="true" editor-type-id="text-editor">
|
|
|
656
|
+ <state relative-caret-position="92">
|
|
|
657
|
+ <caret line="5" column="17" selection-start-line="5" selection-start-column="17" selection-end-line="5" selection-end-column="17" />
|
|
|
658
|
+ </state>
|
|
|
659
|
+ </provider>
|
|
|
660
|
+ </entry>
|
|
|
661
|
+ <entry file="file://$PROJECT_DIR$/ZipCoinRedJavaServer/src/main/java/com/zipcoin/config/PersistenceConfiguration.java">
|
|
|
662
|
+ <provider selected="true" editor-type-id="text-editor">
|
|
|
663
|
+ <state relative-caret-position="138">
|
|
|
664
|
+ <caret line="13" column="13" selection-start-line="13" selection-start-column="13" selection-end-line="13" selection-end-column="13" />
|
|
|
665
|
+ </state>
|
|
|
666
|
+ </provider>
|
|
|
667
|
+ </entry>
|
|
|
668
|
+ <entry file="file://$PROJECT_DIR$/ZipCoinRedJavaServer/src/main/java/com/zipcoin/controller/BlockController.java">
|
|
|
669
|
+ <provider selected="true" editor-type-id="text-editor">
|
|
|
670
|
+ <state relative-caret-position="-37">
|
|
|
671
|
+ <caret line="12" column="30" selection-start-line="12" selection-start-column="30" selection-end-line="12" selection-end-column="30" />
|
|
|
672
|
+ </state>
|
|
|
673
|
+ </provider>
|
|
|
674
|
+ </entry>
|
|
554
|
675
|
</component>
|
|
555
|
676
|
<component name="masterDetails">
|
|
556
|
677
|
<states>
|
