kelude / canrd-patent · Commits

Commit c5a704bae7b3c16fbae0540523aa750edee2cb17

Authored by litao
1 parent bf2c591d

contact info

Inline Side-by-side
Showing 11 changed files with 667 additions and 307 deletions
.idea/artifacts/patent_war_exploded.xml
  View file @c5a704b
... ... @@ -9,11 +9,12 @@
9 9 <element id="directory" name="lib">
10 10 <element id="library" level="project" name="Maven: org.springframework:spring-webmvc:4.2.3.RELEASE" />
11 11 <element id="library" level="project" name="Maven: org.springframework:spring-beans:4.2.3.RELEASE" />
  12 + <element id="library" level="project" name="Maven: org.springframework:spring-core:4.2.3.RELEASE" />
12 13 <element id="library" level="project" name="Maven: org.springframework:spring-context:4.2.3.RELEASE" />
13 14 <element id="library" level="project" name="Maven: org.springframework:spring-aop:4.2.3.RELEASE" />
14 15 <element id="library" level="project" name="Maven: aopalliance:aopalliance:1.0" />
15   - <element id="library" level="project" name="Maven: org.springframework:spring-core:4.2.3.RELEASE" />
16 16 <element id="library" level="project" name="Maven: org.springframework:spring-expression:4.2.3.RELEASE" />
  17 + <element id="library" level="project" name="Maven: commons-logging:commons-logging:1.1.1" />
17 18 <element id="library" level="project" name="Maven: org.springframework:spring-web:4.2.3.RELEASE" />
18 19 <element id="library" level="project" name="Maven: org.springframework:spring-context-support:4.2.3.RELEASE" />
19 20 <element id="library" level="project" name="Maven: org.springframework:spring-jdbc:4.2.3.RELEASE" />
... ... @@ -24,12 +25,18 @@
24 25 <element id="library" level="project" name="Maven: us.codecraft:webmagic-core:0.5.2" />
25 26 <element id="library" level="project" name="Maven: org.apache.httpcomponents:httpclient:4.3.3" />
26 27 <element id="library" level="project" name="Maven: org.apache.httpcomponents:httpcore:4.3.2" />
  28 + <element id="library" level="project" name="Maven: commons-codec:commons-codec:1.6" />
  29 + <element id="library" level="project" name="Maven: com.google.guava:guava:18.0" />
  30 + <element id="library" level="project" name="Maven: org.apache.commons:commons-lang3:3.4" />
27 31 <element id="library" level="project" name="Maven: us.codecraft:xsoup:0.2.4" />
28   - <element id="library" level="project" name="Maven: commons-collections:commons-collections:3.2.1" />
  32 + <element id="library" level="project" name="Maven: org.jsoup:jsoup:1.8.3" />
29 33 <element id="library" level="project" name="Maven: org.assertj:assertj-core:1.5.0" />
  34 + <element id="library" level="project" name="Maven: org.slf4j:slf4j-api:1.7.13" />
  35 + <element id="library" level="project" name="Maven: commons-collections:commons-collections:3.2.1" />
30 36 <element id="library" level="project" name="Maven: commons-io:commons-io:1.3.2" />
31 37 <element id="library" level="project" name="Maven: com.jayway.jsonpath:json-path:0.8.1" />
32 38 <element id="library" level="project" name="Maven: net.minidev:json-smart:1.1.1" />
  39 + <element id="library" level="project" name="Maven: commons-lang:commons-lang:2.4" />
33 40 <element id="library" level="project" name="Maven: com.alibaba:fastjson:1.2.7" />
34 41 <element id="library" level="project" name="Maven: org.seleniumhq.selenium:selenium-java:2.47.1" />
35 42 <element id="library" level="project" name="Maven: org.seleniumhq.selenium:selenium-edge-driver:2.47.1" />
... ... @@ -38,23 +45,20 @@
38 45 <element id="library" level="project" name="Maven: com.google.code.gson:gson:2.3.1" />
39 46 <element id="library" level="project" name="Maven: org.seleniumhq.selenium:selenium-api:2.47.1" />
40 47 <element id="library" level="project" name="Maven: org.apache.commons:commons-exec:1.3" />
  48 + <element id="library" level="project" name="Maven: net.java.dev.jna:jna-platform:4.1.0" />
41 49 <element id="library" level="project" name="Maven: org.seleniumhq.selenium:selenium-firefox-driver:2.47.1" />
42 50 <element id="library" level="project" name="Maven: org.seleniumhq.selenium:selenium-support:2.47.1" />
43 51 <element id="library" level="project" name="Maven: org.webbitserver:webbit:0.4.14" />
44 52 <element id="library" level="project" name="Maven: io.netty:netty:3.9.8.Final" />
45 53 <element id="library" level="project" name="Maven: org.seleniumhq.selenium:selenium-leg-rc:2.47.1" />
46 54 <element id="library" level="project" name="Maven: org.quartz-scheduler:quartz:2.2.1" />
47   - <element id="library" level="project" name="Maven: net.java.dev.jna:jna-platform:4.1.0" />
48 55 <element id="library" level="project" name="Maven: net.java.dev.jna:jna:4.1.0" />
49 56 <element id="library" level="project" name="Maven: com.fasterxml.jackson.core:jackson-databind:2.6.3" />
50 57 <element id="library" level="project" name="Maven: com.fasterxml.jackson.core:jackson-annotations:2.6.0" />
51 58 <element id="library" level="project" name="Maven: com.fasterxml.jackson.core:jackson-core:2.6.3" />
52 59 <element id="library" level="project" name="Maven: org.apache.httpcomponents:fluent-hc:4.5.1" />
53 60 <element id="library" level="project" name="Maven: org.apache.httpcomponents:httpmime:4.5.1" />
54   - <element id="library" level="project" name="Maven: org.jsoup:jsoup:1.8.3" />
55   - <element id="library" level="project" name="Maven: com.google.guava:guava:18.0" />
56 61 <element id="library" level="project" name="Maven: joda-time:joda-time:2.9.1" />
57   - <element id="library" level="project" name="Maven: org.apache.commons:commons-lang3:3.4" />
58 62 <element id="library" level="project" name="Maven: org.apache.commons:commons-math3:3.3" />
59 63 <element id="library" level="project" name="Maven: org.apache.commons:commons-pool2:2.3" />
60 64 <element id="library" level="project" name="Maven: org.apache.tomcat:tomcat-jdbc:8.0.29" />
... ... @@ -65,7 +69,6 @@
65 69 <element id="library" level="project" name="Maven: org.ow2.asm:asm:4.2" />
66 70 <element id="library" level="project" name="Maven: com.esotericsoftware:minlog:1.3.0" />
67 71 <element id="library" level="project" name="Maven: org.objenesis:objenesis:2.1" />
68   - <element id="library" level="project" name="Maven: org.slf4j:slf4j-api:1.7.13" />
69 72 <element id="library" level="project" name="Maven: org.slf4j:jcl-over-slf4j:1.7.13" />
70 73 <element id="library" level="project" name="Maven: org.slf4j:log4j-over-slf4j:1.7.13" />
71 74 <element id="library" level="project" name="Maven: ch.qos.logback:logback-core:1.1.3" />
... ... @@ -78,10 +81,7 @@
78 81 <element id="library" level="project" name="Maven: org.postgresql:postgresql:9.4-1201-jdbc4" />
79 82 <element id="library" level="project" name="Maven: mysql:mysql-connector-java:5.1.34" />
80 83 <element id="library" level="project" name="Maven: org.apache.velocity:velocity:1.7" />
81   - <element id="library" level="project" name="Maven: commons-lang:commons-lang:2.4" />
82   - <element id="library" level="project" name="Maven: commons-codec:commons-codec:1.6" />
83 84 <element id="library" level="project" name="Maven: commons-httpclient:commons-httpclient:3.0.1" />
84   - <element id="library" level="project" name="Maven: commons-logging:commons-logging:1.1.1" />
85 85 <element id="library" level="project" name="Maven: dom4j:dom4j:1.6.1" />
86 86 <element id="library" level="project" name="Maven: xml-apis:xml-apis:1.0.b2" />
87 87 <element id="library" level="project" name="Maven: jaxen:jaxen:1.1-beta" />
... ...
.idea/compiler.xml
  View file @c5a704b
... ... @@ -17,7 +17,7 @@
17 17 <profile default="true" name="Default" enabled="false">
18 18 <processorPath useClasspath="true" />
19 19 </profile>
20   - <profile default="false" name="Annotation profile for patent" enabled="true">
  20 + <profile default="false" name="Maven default annotation processors profile" enabled="true">
21 21 <sourceOutputDir name="target/generated-sources/annotations" />
22 22 <sourceTestOutputDir name="target/generated-test-sources/test-annotations" />
23 23 <outputRelativeToContentRoot value="true" />
... ...
.idea/workspace.xml
  View file @c5a704b
... ... @@ -2,7 +2,17 @@
2 2 <project version="4">
3 3 <component name="ChangeListManager">
4 4 <list default="true" id="a8f74803-c7c3-405c-9584-6ffd161452f6" name="Default" comment="">
5   - <change type="MODIFICATION" beforePath="$PROJECT_DIR$/src/main/webapp/index.jsp" afterPath="$PROJECT_DIR$/src/main/webapp/index.jsp" />
  5 + <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/src/main/webapp/customer_contact.jsp" />
  6 + <change type="MODIFICATION" beforePath="$PROJECT_DIR$/target/classes/com/canrd/patent/dal/dto/HomePatentTypeOutputDto.class" afterPath="$PROJECT_DIR$/target/classes/com/canrd/patent/dal/dto/HomePatentTypeOutputDto.class" />
  7 + <change type="MODIFICATION" beforePath="$PROJECT_DIR$/target/patent.war" afterPath="$PROJECT_DIR$/target/patent.war" />
  8 + <change type="MODIFICATION" beforePath="$PROJECT_DIR$/target/patent/WEB-INF/classes/com/canrd/patent/dal/dto/HomePatentTypeOutputDto.class" afterPath="$PROJECT_DIR$/target/patent/WEB-INF/classes/com/canrd/patent/dal/dto/HomePatentTypeOutputDto.class" />
  9 + <change type="MODIFICATION" beforePath="$PROJECT_DIR$/.idea/artifacts/patent_war_exploded.xml" afterPath="$PROJECT_DIR$/.idea/artifacts/patent_war_exploded.xml" />
  10 + <change type="MODIFICATION" beforePath="$PROJECT_DIR$/.idea/compiler.xml" afterPath="$PROJECT_DIR$/.idea/compiler.xml" />
  11 + <change type="MODIFICATION" beforePath="$PROJECT_DIR$/.idea/workspace.xml" afterPath="$PROJECT_DIR$/.idea/workspace.xml" />
  12 + <change type="MODIFICATION" beforePath="$PROJECT_DIR$/patent.iml" afterPath="$PROJECT_DIR$/patent.iml" />
  13 + <change type="MODIFICATION" beforePath="$PROJECT_DIR$/src/main/resources.local/props/jdbc.properties" afterPath="$PROJECT_DIR$/src/main/resources.local/props/jdbc.properties" />
  14 + <change type="MODIFICATION" beforePath="$PROJECT_DIR$/target/classes/props/jdbc.properties" afterPath="$PROJECT_DIR$/target/classes/props/jdbc.properties" />
  15 + <change type="MODIFICATION" beforePath="$PROJECT_DIR$/target/patent/WEB-INF/classes/props/jdbc.properties" afterPath="$PROJECT_DIR$/target/patent/WEB-INF/classes/props/jdbc.properties" />
6 16 </list>
7 17 <ignored path="patent.iws" />
8 18 <ignored path=".idea/workspace.xml" />
... ... @@ -24,62 +34,42 @@
24 34 <favorites_list name="patent" />
25 35 </component>
26 36 <component name="FileEditorManager">
27   - <leaf>
  37 + <leaf SIDE_TABS_SIZE_LIMIT_KEY="300">
28 38 <file leaf-file-name="HelloController.java" pinned="false" current-in-tab="false">
29 39 <entry file="file://$PROJECT_DIR$/src/main/java/com/canrd/patent/web/HelloController.java">
30 40 <provider selected="true" editor-type-id="text-editor">
31   - <state vertical-scroll-proportion="0.0">
32   - <caret line="22" column="13" selection-start-line="22" selection-start-column="13" selection-end-line="22" selection-end-column="13" />
  41 + <state relative-caret-position="-268">
  42 + <caret line="40" column="8" selection-start-line="40" selection-start-column="8" selection-end-line="40" selection-end-column="8" />
33 43 <folding />
34 44 </state>
35 45 </provider>
36 46 </entry>
37 47 </file>
38   - <file leaf-file-name="ddl.sql" pinned="false" current-in-tab="false">
39   - <entry file="file://$PROJECT_DIR$/doc/sql/ddl.sql">
  48 + <file leaf-file-name="pay.jsp" pinned="false" current-in-tab="false">
  49 + <entry file="file://$PROJECT_DIR$/src/main/webapp/pay.jsp">
40 50 <provider selected="true" editor-type-id="text-editor">
41   - <state vertical-scroll-proportion="-0.5555556">
42   - <caret line="1" column="0" selection-start-line="1" selection-start-column="0" selection-end-line="1" selection-end-column="0" />
  51 + <state relative-caret-position="1215">
  52 + <caret line="120" column="71" selection-start-line="120" selection-start-column="71" selection-end-line="120" selection-end-column="71" />
43 53 <folding />
44 54 </state>
45 55 </provider>
46 56 </entry>
47 57 </file>
48   - <file leaf-file-name="Untitled.sql" pinned="false" current-in-tab="false">
49   - <entry file="file://$PROJECT_DIR$/doc/sql/Untitled.sql">
  58 + <file leaf-file-name="customer_contact.jsp" pinned="false" current-in-tab="true">
  59 + <entry file="file://$PROJECT_DIR$/src/main/webapp/customer_contact.jsp">
50 60 <provider selected="true" editor-type-id="text-editor">
51   - <state vertical-scroll-proportion="-2.2222223">
52   - <caret line="8" column="39" selection-start-line="8" selection-start-column="39" selection-end-line="8" selection-end-column="39" />
  61 + <state relative-caret-position="248">
  62 + <caret line="36" column="10" selection-start-line="36" selection-start-column="10" selection-end-line="36" selection-end-column="10" />
53 63 <folding />
54 64 </state>
55 65 </provider>
56 66 </entry>
57 67 </file>
58   - <file leaf-file-name="fdfs.properties" pinned="false" current-in-tab="false">
59   - <entry file="file://$PROJECT_DIR$/src/main/resources.local/props/fdfs.properties">
  68 + <file leaf-file-name="pom.xml" pinned="false" current-in-tab="false">
  69 + <entry file="file://$PROJECT_DIR$/pom.xml">
60 70 <provider selected="true" editor-type-id="text-editor">
61   - <state vertical-scroll-proportion="0.0">
62   - <caret line="0" column="0" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="0" />
63   - <folding />
64   - </state>
65   - </provider>
66   - </entry>
67   - </file>
68   - <file leaf-file-name="jdbc.properties" pinned="false" current-in-tab="false">
69   - <entry file="file://$PROJECT_DIR$/src/main/resources.local/props/jdbc.properties">
70   - <provider selected="true" editor-type-id="text-editor">
71   - <state vertical-scroll-proportion="0.0">
72   - <caret line="1" column="51" selection-start-line="1" selection-start-column="45" selection-end-line="1" selection-end-column="51" />
73   - <folding />
74   - </state>
75   - </provider>
76   - </entry>
77   - </file>
78   - <file leaf-file-name="index.jsp" pinned="false" current-in-tab="true">
79   - <entry file="file://$PROJECT_DIR$/src/main/webapp/index.jsp">
80   - <provider selected="true" editor-type-id="text-editor">
81   - <state vertical-scroll-proportion="0.18844222">
82   - <caret line="6" column="66" selection-start-line="6" selection-start-column="66" selection-end-line="6" selection-end-column="66" />
  71 + <state relative-caret-position="-180">
  72 + <caret line="24" column="24" selection-start-line="24" selection-start-column="24" selection-end-line="24" selection-end-column="24" />
83 73 <folding />
84 74 </state>
85 75 </provider>
... ... @@ -91,10 +81,10 @@
91 81 <option name="RECENT_TEMPLATES">
92 82 <list>
93 83 <option value="jsf" />
94   - <option value="Jsp File" />
95 84 <option value="Enum" />
96 85 <option value="Class" />
97 86 <option value="CSS File" />
  87 + <option value="Jsp File" />
98 88 </list>
99 89 </option>
100 90 </component>
... ... @@ -109,9 +99,6 @@
109 99 <component name="IdeDocumentHistory">
110 100 <option name="CHANGED_PATHS">
111 101 <list>
112   - <option value="$PROJECT_DIR$/src/main/webapp/include/footer.jsp" />
113   - <option value="$PROJECT_DIR$/src/main/webapp/case-manage.jsp" />
114   - <option value="$PROJECT_DIR$/src/main/webapp/css/home.css" />
115 102 <option value="$PROJECT_DIR$/src/main/java/com/canrd/patent/dal/enums/PaidTypeEnum.java" />
116 103 <option value="$PROJECT_DIR$/src/main/java/com/canrd/patent/dal/dto/HomePatentTypeOutputDto.java" />
117 104 <option value="$PROJECT_DIR$/src/main/java/com/canrd/patent/common/utils/TextUtils.java" />
... ... @@ -160,12 +147,17 @@
160 147 <option value="$PROJECT_DIR$/src/main/webapp/css/case-manage.css" />
161 148 <option value="$PROJECT_DIR$/doc/sql/ddl.sql" />
162 149 <option value="$PROJECT_DIR$/src/main/webapp/index.jsp" />
  150 + <option value="$PROJECT_DIR$/src/main/resources.local/props/jdbc.properties" />
  151 + <option value="$PROJECT_DIR$/src/main/webapp/customerContact.jsp" />
  152 + <option value="$PROJECT_DIR$/src/main/webapp/customer_contact.jsp" />
163 153 </list>
164 154 </option>
165 155 </component>
166   - <component name="JsBuildToolGruntFileManager" detection-done="true" />
  156 + <component name="JsBuildToolGruntFileManager" detection-done="true" sorting="DEFINITION_ORDER" />
  157 + <component name="JsBuildToolPackageJson" detection-done="true" sorting="DEFINITION_ORDER" />
167 158 <component name="JsGulpfileManager">
168 159 <detection-done>true</detection-done>
  160 + <sorting>DEFINITION_ORDER</sorting>
169 161 </component>
170 162 <component name="LogFilters">
171 163 <option name="FILTER_ERRORS" value="false" />
... ... @@ -177,7 +169,9 @@
177 169 <component name="MavenImportPreferences">
178 170 <option name="generalSettings">
179 171 <MavenGeneralSettings>
180   - <option name="mavenHome" value="$USER_HOME$/install/apache-maven-3.2.5" />
  172 + <option name="localRepository" value="$MAVEN_REPOSITORY$" />
  173 + <option name="mavenHome" value="/usr/share/maven" />
  174 + <option name="userSettingsFile" value="$MAVEN_REPOSITORY$/settings.xml" />
181 175 </MavenGeneralSettings>
182 176 </option>
183 177 <option name="disabledProfiles">
... ... @@ -238,14 +232,11 @@
238 232 </PATH>
239 233 </treeState>
240 234 </component>
241   - <component name="NamedScopeManager">
242   - <order />
243   - </component>
244 235 <component name="ProjectFrameBounds">
245   - <option name="x" value="1280" />
246   - <option name="y" value="23" />
247   - <option name="width" value="1920" />
248   - <option name="height" value="1057" />
  236 + <option name="x" value="65" />
  237 + <option name="y" value="24" />
  238 + <option name="width" value="1855" />
  239 + <option name="height" value="1056" />
249 240 </component>
250 241 <component name="ProjectLevelVcsManager" settingsEditedManually="false">
251 242 <OptionsSetting value="true" id="Add" />
... ... @@ -268,10 +259,11 @@
268 259 <autoscrollToSource />
269 260 <autoscrollFromSource />
270 261 <sortByType />
  262 + <manualOrder />
  263 + <foldersAlwaysOnTop value="true" />
271 264 </navigator>
272 265 <panes>
273 266 <pane id="Scratches" />
274   - <pane id="Scope" />
275 267 <pane id="ProjectPane">
276 268 <subPane>
277 269 <PATH>
... ... @@ -449,10 +441,11 @@
449 441 </subPane>
450 442 </pane>
451 443 <pane id="PackagesPane" />
  444 + <pane id="Scope" />
452 445 </panes>
453 446 </component>
454 447 <component name="PropertiesComponent">
455   - <property name="settings.editor.selected.configurable" value="vcs.Git" />
  448 + <property name="settings.editor.selected.configurable" value="MavenSettings" />
456 449 <property name="settings.editor.splitter.proportion" value="0.2" />
457 450 <property name="project.structure.last.edited" value="Project" />
458 451 <property name="project.structure.proportion" value="0.0" />
... ... @@ -484,66 +477,201 @@
484 477 <recent name="$PROJECT_DIR$/src/main/webapp/views" />
485 478 </key>
486 479 </component>
487   - <component name="RunManager" selected="Tomcat Server.patent">
488   - <configuration default="false" name="CaseTypeEnum" type="Application" factoryName="Application" temporary="true" nameIsGenerated="true">
489   - <extension name="coverage" enabled="false" merge="false" sample_coverage="true" runner="idea">
490   - <pattern>
491   - <option name="PATTERN" value="com.canrd.patent.dal.enums.*" />
492   - <option name="ENABLED" value="true" />
493   - </pattern>
494   - </extension>
495   - <option name="MAIN_CLASS_NAME" value="com.canrd.patent.dal.enums.CaseTypeEnum" />
496   - <option name="VM_PARAMETERS" />
497   - <option name="PROGRAM_PARAMETERS" />
498   - <option name="WORKING_DIRECTORY" value="$PROJECT_DIR$" />
499   - <option name="ALTERNATIVE_JRE_PATH_ENABLED" value="false" />
500   - <option name="ALTERNATIVE_JRE_PATH" />
501   - <option name="ENABLE_SWING_INSPECTOR" value="false" />
502   - <option name="ENV_VARIABLES" />
503   - <option name="PASS_PARENT_ENVS" value="true" />
504   - <module name="patent" />
505   - <envs />
506   - <method />
  480 + <component name="RunManager" selected="Tomcat Server.customer_contact.jsp (3)">
  481 + <configuration default="false" name="customer_contact.jsp (5)" type="#com.intellij.j2ee.web.tomcat.TomcatRunConfigurationFactory" factoryName="Local" temporary="true" APPLICATION_SERVER_NAME="tomcat8" ALTERNATIVE_JRE_ENABLED="false">
  482 + <option name="OPEN_IN_BROWSER_URL" value="http://localhost:8080/customer_contact.jsp" />
  483 + <deployment>
  484 + <artifact name="patent:war">
  485 + <settings>
  486 + <option name="CONTEXT_PATH" value="/" />
  487 + </settings>
  488 + </artifact>
  489 + </deployment>
  490 + <server-settings>
  491 + <option name="BASE_DIRECTORY_NAME" value="customer_contact_jsp_(5)_patent_5" />
  492 + </server-settings>
  493 + <predefined_log_file id="Tomcat" enabled="true" />
  494 + <predefined_log_file id="Tomcat Catalina" enabled="true" />
  495 + <predefined_log_file id="Tomcat Manager" enabled="false" />
  496 + <predefined_log_file id="Tomcat Host Manager" enabled="false" />
  497 + <predefined_log_file id="Tomcat Localhost Access" enabled="false" />
  498 + <extension name="coverage" enabled="false" merge="false" sample_coverage="true" runner="idea" />
  499 + <ConfigurationWrapper VM_VAR="JAVA_OPTS" RunnerId="Run">
  500 + <option name="USE_ENV_VARIABLES" value="true" />
  501 + <STARTUP>
  502 + <option name="USE_DEFAULT" value="true" />
  503 + <option name="SCRIPT" value="" />
  504 + <option name="VM_PARAMETERS" value="" />
  505 + <option name="PROGRAM_PARAMETERS" value="" />
  506 + </STARTUP>
  507 + <SHUTDOWN>
  508 + <option name="USE_DEFAULT" value="true" />
  509 + <option name="SCRIPT" value="" />
  510 + <option name="VM_PARAMETERS" value="" />
  511 + <option name="PROGRAM_PARAMETERS" value="" />
  512 + </SHUTDOWN>
  513 + </ConfigurationWrapper>
  514 + <method>
  515 + <option name="BuildArtifacts" enabled="true">
  516 + <artifact name="patent:war" />
  517 + </option>
  518 + </method>
507 519 </configuration>
508   - <configuration default="false" name="TextUtils" type="Application" factoryName="Application" temporary="true" nameIsGenerated="true">
509   - <extension name="coverage" enabled="false" merge="false" sample_coverage="true" runner="idea">
510   - <pattern>
511   - <option name="PATTERN" value="com.canrd.patent.common.utils.*" />
512   - <option name="ENABLED" value="true" />
513   - </pattern>
514   - </extension>
515   - <option name="MAIN_CLASS_NAME" value="com.canrd.patent.common.utils.TextUtils" />
516   - <option name="VM_PARAMETERS" />
517   - <option name="PROGRAM_PARAMETERS" />
518   - <option name="WORKING_DIRECTORY" value="$PROJECT_DIR$" />
519   - <option name="ALTERNATIVE_JRE_PATH_ENABLED" value="false" />
520   - <option name="ALTERNATIVE_JRE_PATH" />
521   - <option name="ENABLE_SWING_INSPECTOR" value="false" />
522   - <option name="ENV_VARIABLES" />
523   - <option name="PASS_PARENT_ENVS" value="true" />
524   - <module name="patent" />
525   - <envs />
526   - <method />
  520 + <configuration default="false" name="customer_contact.jsp" type="#com.intellij.j2ee.web.tomcat.TomcatRunConfigurationFactory" factoryName="Local" temporary="true" APPLICATION_SERVER_NAME="tomcat8" ALTERNATIVE_JRE_ENABLED="false">
  521 + <option name="OPEN_IN_BROWSER_URL" value="http://localhost:8080/customer_contact.jsp" />
  522 + <deployment>
  523 + <artifact name="patent:war">
  524 + <settings>
  525 + <option name="CONTEXT_PATH" value="/" />
  526 + </settings>
  527 + </artifact>
  528 + </deployment>
  529 + <server-settings>
  530 + <option name="BASE_DIRECTORY_NAME" value="customer_contact_jsp_patent_6" />
  531 + </server-settings>
  532 + <predefined_log_file id="Tomcat" enabled="true" />
  533 + <predefined_log_file id="Tomcat Catalina" enabled="true" />
  534 + <predefined_log_file id="Tomcat Manager" enabled="false" />
  535 + <predefined_log_file id="Tomcat Host Manager" enabled="false" />
  536 + <predefined_log_file id="Tomcat Localhost Access" enabled="false" />
  537 + <extension name="coverage" enabled="false" merge="false" sample_coverage="true" runner="idea" />
  538 + <ConfigurationWrapper VM_VAR="JAVA_OPTS" RunnerId="Run">
  539 + <option name="USE_ENV_VARIABLES" value="true" />
  540 + <STARTUP>
  541 + <option name="USE_DEFAULT" value="true" />
  542 + <option name="SCRIPT" value="" />
  543 + <option name="VM_PARAMETERS" value="" />
  544 + <option name="PROGRAM_PARAMETERS" value="" />
  545 + </STARTUP>
  546 + <SHUTDOWN>
  547 + <option name="USE_DEFAULT" value="true" />
  548 + <option name="SCRIPT" value="" />
  549 + <option name="VM_PARAMETERS" value="" />
  550 + <option name="PROGRAM_PARAMETERS" value="" />
  551 + </SHUTDOWN>
  552 + </ConfigurationWrapper>
  553 + <method>
  554 + <option name="BuildArtifacts" enabled="true">
  555 + <artifact name="patent:war" />
  556 + </option>
  557 + </method>
527 558 </configuration>
528   - <configuration default="false" name="CasementService" type="Application" factoryName="Application" temporary="true" nameIsGenerated="true">
529   - <extension name="coverage" enabled="false" merge="false" sample_coverage="true" runner="idea">
530   - <pattern>
531   - <option name="PATTERN" value="com.canrd.patent.service.*" />
532   - <option name="ENABLED" value="true" />
533   - </pattern>
534   - </extension>
535   - <option name="MAIN_CLASS_NAME" value="com.canrd.patent.service.CasementService" />
536   - <option name="VM_PARAMETERS" />
537   - <option name="PROGRAM_PARAMETERS" />
538   - <option name="WORKING_DIRECTORY" value="$PROJECT_DIR$" />
539   - <option name="ALTERNATIVE_JRE_PATH_ENABLED" value="false" />
540   - <option name="ALTERNATIVE_JRE_PATH" />
541   - <option name="ENABLE_SWING_INSPECTOR" value="false" />
542   - <option name="ENV_VARIABLES" />
543   - <option name="PASS_PARENT_ENVS" value="true" />
544   - <module name="patent" />
545   - <envs />
546   - <method />
  559 + <configuration default="false" name="customer_contact.jsp (1)" type="#com.intellij.j2ee.web.tomcat.TomcatRunConfigurationFactory" factoryName="Local" temporary="true" APPLICATION_SERVER_NAME="tomcat8" ALTERNATIVE_JRE_ENABLED="false">
  560 + <option name="OPEN_IN_BROWSER_URL" value="http://localhost:8080/customer_contact.jsp" />
  561 + <deployment>
  562 + <artifact name="patent:war">
  563 + <settings>
  564 + <option name="CONTEXT_PATH" value="/" />
  565 + </settings>
  566 + </artifact>
  567 + </deployment>
  568 + <server-settings>
  569 + <option name="BASE_DIRECTORY_NAME" value="customer_contact_jsp_(1)_patent_6" />
  570 + </server-settings>
  571 + <predefined_log_file id="Tomcat" enabled="true" />
  572 + <predefined_log_file id="Tomcat Catalina" enabled="true" />
  573 + <predefined_log_file id="Tomcat Manager" enabled="false" />
  574 + <predefined_log_file id="Tomcat Host Manager" enabled="false" />
  575 + <predefined_log_file id="Tomcat Localhost Access" enabled="false" />
  576 + <extension name="coverage" enabled="false" merge="false" sample_coverage="true" runner="idea" />
  577 + <ConfigurationWrapper VM_VAR="JAVA_OPTS" RunnerId="Run">
  578 + <option name="USE_ENV_VARIABLES" value="true" />
  579 + <STARTUP>
  580 + <option name="USE_DEFAULT" value="true" />
  581 + <option name="SCRIPT" value="" />
  582 + <option name="VM_PARAMETERS" value="" />
  583 + <option name="PROGRAM_PARAMETERS" value="" />
  584 + </STARTUP>
  585 + <SHUTDOWN>
  586 + <option name="USE_DEFAULT" value="true" />
  587 + <option name="SCRIPT" value="" />
  588 + <option name="VM_PARAMETERS" value="" />
  589 + <option name="PROGRAM_PARAMETERS" value="" />
  590 + </SHUTDOWN>
  591 + </ConfigurationWrapper>
  592 + <method>
  593 + <option name="BuildArtifacts" enabled="true">
  594 + <artifact name="patent:war" />
  595 + </option>
  596 + </method>
  597 + </configuration>
  598 + <configuration default="false" name="customer_contact.jsp (2)" type="#com.intellij.j2ee.web.tomcat.TomcatRunConfigurationFactory" factoryName="Local" temporary="true" APPLICATION_SERVER_NAME="tomcat8" ALTERNATIVE_JRE_ENABLED="false">
  599 + <option name="OPEN_IN_BROWSER_URL" value="http://localhost:8080/customer_contact.jsp" />
  600 + <deployment>
  601 + <artifact name="patent:war">
  602 + <settings>
  603 + <option name="CONTEXT_PATH" value="/" />
  604 + </settings>
  605 + </artifact>
  606 + </deployment>
  607 + <server-settings>
  608 + <option name="BASE_DIRECTORY_NAME" value="customer_contact_jsp_(2)_patent_6" />
  609 + </server-settings>
  610 + <predefined_log_file id="Tomcat" enabled="true" />
  611 + <predefined_log_file id="Tomcat Catalina" enabled="true" />
  612 + <predefined_log_file id="Tomcat Manager" enabled="false" />
  613 + <predefined_log_file id="Tomcat Host Manager" enabled="false" />
  614 + <predefined_log_file id="Tomcat Localhost Access" enabled="false" />
  615 + <extension name="coverage" enabled="false" merge="false" sample_coverage="true" runner="idea" />
  616 + <ConfigurationWrapper VM_VAR="JAVA_OPTS" RunnerId="Run">
  617 + <option name="USE_ENV_VARIABLES" value="true" />
  618 + <STARTUP>
  619 + <option name="USE_DEFAULT" value="true" />
  620 + <option name="SCRIPT" value="" />
  621 + <option name="VM_PARAMETERS" value="" />
  622 + <option name="PROGRAM_PARAMETERS" value="" />
  623 + </STARTUP>
  624 + <SHUTDOWN>
  625 + <option name="USE_DEFAULT" value="true" />
  626 + <option name="SCRIPT" value="" />
  627 + <option name="VM_PARAMETERS" value="" />
  628 + <option name="PROGRAM_PARAMETERS" value="" />
  629 + </SHUTDOWN>
  630 + </ConfigurationWrapper>
  631 + <method>
  632 + <option name="BuildArtifacts" enabled="true">
  633 + <artifact name="patent:war" />
  634 + </option>
  635 + </method>
  636 + </configuration>
  637 + <configuration default="false" name="customer_contact.jsp (3)" type="#com.intellij.j2ee.web.tomcat.TomcatRunConfigurationFactory" factoryName="Local" temporary="true" APPLICATION_SERVER_NAME="tomcat8" ALTERNATIVE_JRE_ENABLED="false">
  638 + <option name="OPEN_IN_BROWSER_URL" value="http://localhost:8080/customer_contact.jsp" />
  639 + <deployment>
  640 + <artifact name="patent:war">
  641 + <settings>
  642 + <option name="CONTEXT_PATH" value="/" />
  643 + </settings>
  644 + </artifact>
  645 + </deployment>
  646 + <server-settings>
  647 + <option name="BASE_DIRECTORY_NAME" value="customer_contact_jsp_(3)_patent_6" />
  648 + </server-settings>
  649 + <predefined_log_file id="Tomcat" enabled="true" />
  650 + <predefined_log_file id="Tomcat Catalina" enabled="true" />
  651 + <predefined_log_file id="Tomcat Manager" enabled="false" />
  652 + <predefined_log_file id="Tomcat Host Manager" enabled="false" />
  653 + <predefined_log_file id="Tomcat Localhost Access" enabled="false" />
  654 + <extension name="coverage" enabled="false" merge="false" sample_coverage="true" runner="idea" />
  655 + <ConfigurationWrapper VM_VAR="JAVA_OPTS" RunnerId="Run">
  656 + <option name="USE_ENV_VARIABLES" value="true" />
  657 + <STARTUP>
  658 + <option name="USE_DEFAULT" value="true" />
  659 + <option name="SCRIPT" value="" />
  660 + <option name="VM_PARAMETERS" value="" />
  661 + <option name="PROGRAM_PARAMETERS" value="" />
  662 + </STARTUP>
  663 + <SHUTDOWN>
  664 + <option name="USE_DEFAULT" value="true" />
  665 + <option name="SCRIPT" value="" />
  666 + <option name="VM_PARAMETERS" value="" />
  667 + <option name="PROGRAM_PARAMETERS" value="" />
  668 + </SHUTDOWN>
  669 + </ConfigurationWrapper>
  670 + <method>
  671 + <option name="BuildArtifacts" enabled="true">
  672 + <artifact name="patent:war" />
  673 + </option>
  674 + </method>
547 675 </configuration>
548 676 <configuration default="true" type="#com.intellij.j2ee.web.tomcat.TomcatRunConfigurationFactory" factoryName="Local" ALTERNATIVE_JRE_ENABLED="false">
549 677 <deployment />
... ... @@ -564,22 +692,21 @@
564 692 </configuration>
565 693 <configuration default="true" type="AndroidRunConfigurationType" factoryName="Android Application">
566 694 <module name="" />
567   - <option name="ACTIVITY_CLASS" value="" />
568   - <option name="MODE" value="default_activity" />
569 695 <option name="DEPLOY" value="true" />
570 696 <option name="ARTIFACT_NAME" value="" />
  697 + <option name="PM_INSTALL_OPTIONS" value="" />
  698 + <option name="ACTIVITY_EXTRA_FLAGS" value="" />
  699 + <option name="MODE" value="default_activity" />
571 700 <option name="TARGET_SELECTION_MODE" value="EMULATOR" />
572   - <option name="USE_LAST_SELECTED_DEVICE" value="false" />
573 701 <option name="PREFERRED_AVD" value="" />
574   - <option name="USE_COMMAND_LINE" value="true" />
575   - <option name="COMMAND_LINE" value="" />
576   - <option name="WIPE_USER_DATA" value="false" />
577   - <option name="DISABLE_BOOT_ANIMATION" value="false" />
578   - <option name="NETWORK_SPEED" value="full" />
579   - <option name="NETWORK_LATENCY" value="none" />
580 702 <option name="CLEAR_LOGCAT" value="false" />
581 703 <option name="SHOW_LOGCAT_AUTOMATICALLY" value="true" />
582   - <option name="FILTER_LOGCAT_AUTOMATICALLY" value="true" />
  704 + <option name="SKIP_NOOP_APK_INSTALLATIONS" value="true" />
  705 + <option name="FORCE_STOP_RUNNING_APP" value="true" />
  706 + <option name="USE_LAST_SELECTED_DEVICE" value="false" />
  707 + <option name="PREFERRED_AVD" value="" />
  708 + <option name="DEEP_LINK" value="" />
  709 + <option name="ACTIVITY_CLASS" value="" />
583 710 <method />
584 711 </configuration>
585 712 <configuration default="true" type="AndroidTestRunConfigurationType" factoryName="Android Tests">
... ... @@ -589,18 +716,15 @@
589 716 <option name="METHOD_NAME" value="" />
590 717 <option name="CLASS_NAME" value="" />
591 718 <option name="PACKAGE_NAME" value="" />
  719 + <option name="EXTRA_OPTIONS" value="" />
592 720 <option name="TARGET_SELECTION_MODE" value="EMULATOR" />
593   - <option name="USE_LAST_SELECTED_DEVICE" value="false" />
594 721 <option name="PREFERRED_AVD" value="" />
595   - <option name="USE_COMMAND_LINE" value="true" />
596   - <option name="COMMAND_LINE" value="" />
597   - <option name="WIPE_USER_DATA" value="false" />
598   - <option name="DISABLE_BOOT_ANIMATION" value="false" />
599   - <option name="NETWORK_SPEED" value="full" />
600   - <option name="NETWORK_LATENCY" value="none" />
601 722 <option name="CLEAR_LOGCAT" value="false" />
602 723 <option name="SHOW_LOGCAT_AUTOMATICALLY" value="true" />
603   - <option name="FILTER_LOGCAT_AUTOMATICALLY" value="true" />
  724 + <option name="SKIP_NOOP_APK_INSTALLATIONS" value="true" />
  725 + <option name="FORCE_STOP_RUNNING_APP" value="true" />
  726 + <option name="USE_LAST_SELECTED_DEVICE" value="false" />
  727 + <option name="PREFERRED_AVD" value="" />
604 728 <method />
605 729 </configuration>
606 730 <configuration default="true" type="Applet" factoryName="Applet">
... ... @@ -625,6 +749,65 @@
625 749 <envs />
626 750 <method />
627 751 </configuration>
  752 + <configuration default="true" type="ArquillianJUnit" factoryName="">
  753 + <extension name="coverage" enabled="false" merge="false" sample_coverage="true" runner="idea" />
  754 + <module name="" />
  755 + <option name="arquillianRunConfiguration">
  756 + <value>
  757 + <option name="containerStateName" value="" />
  758 + </value>
  759 + </option>
  760 + <option name="ALTERNATIVE_JRE_PATH_ENABLED" value="false" />
  761 + <option name="ALTERNATIVE_JRE_PATH" />
  762 + <option name="PACKAGE_NAME" />
  763 + <option name="MAIN_CLASS_NAME" />
  764 + <option name="METHOD_NAME" />
  765 + <option name="TEST_OBJECT" value="class" />
  766 + <option name="VM_PARAMETERS" />
  767 + <option name="PARAMETERS" />
  768 + <option name="WORKING_DIRECTORY" />
  769 + <option name="ENV_VARIABLES" />
  770 + <option name="PASS_PARENT_ENVS" value="true" />
  771 + <option name="TEST_SEARCH_SCOPE">
  772 + <value defaultName="singleModule" />
  773 + </option>
  774 + <envs />
  775 + <patterns />
  776 + <method />
  777 + </configuration>
  778 + <configuration default="true" type="ArquillianTestNG" factoryName="">
  779 + <extension name="coverage" enabled="false" merge="false" sample_coverage="true" runner="idea" />
  780 + <module name="" />
  781 + <option name="arquillianRunConfiguration">
  782 + <value>
  783 + <option name="containerStateName" value="" />
  784 + </value>
  785 + </option>
  786 + <option name="ALTERNATIVE_JRE_PATH_ENABLED" value="false" />
  787 + <option name="ALTERNATIVE_JRE_PATH" />
  788 + <option name="SUITE_NAME" />
  789 + <option name="PACKAGE_NAME" />
  790 + <option name="MAIN_CLASS_NAME" />
  791 + <option name="METHOD_NAME" />
  792 + <option name="GROUP_NAME" />
  793 + <option name="TEST_OBJECT" value="CLASS" />
  794 + <option name="VM_PARAMETERS" />
  795 + <option name="PARAMETERS" />
  796 + <option name="WORKING_DIRECTORY" />
  797 + <option name="OUTPUT_DIRECTORY" />
  798 + <option name="ANNOTATION_TYPE" />
  799 + <option name="ENV_VARIABLES" />
  800 + <option name="PASS_PARENT_ENVS" value="true" />
  801 + <option name="TEST_SEARCH_SCOPE">
  802 + <value defaultName="singleModule" />
  803 + </option>
  804 + <option name="USE_DEFAULT_REPORTERS" value="false" />
  805 + <option name="PROPERTIES_FILE" />
  806 + <envs />
  807 + <properties />
  808 + <listeners />
  809 + <method />
  810 + </configuration>
628 811 <configuration default="true" type="CucumberJavaRunConfigurationType" factoryName="Cucumber java">
629 812 <extension name="coverage" enabled="false" merge="false" sample_coverage="true" runner="idea" />
630 813 <option name="myFilePath" />
... ... @@ -710,13 +893,12 @@
710 893 <method />
711 894 </configuration>
712 895 <configuration default="true" type="GrailsRunConfigurationType" factoryName="Grails">
713   - <module name="" />
714 896 <setting name="vmparams" value="" />
715 897 <setting name="cmdLine" value="run-app" />
716   - <setting name="depsClasspath" value="false" />
717 898 <setting name="passParentEnv" value="true" />
718   - <extension name="coverage" enabled="false" merge="false" sample_coverage="true" runner="idea" />
719 899 <setting name="launchBrowser" value="false" />
  900 + <setting name="depsClasspath" value="false" />
  901 + <extension name="coverage" enabled="false" merge="false" sample_coverage="true" runner="idea" />
720 902 <method />
721 903 </configuration>
722 904 <configuration default="true" type="JUnit" factoryName="JUnit">
... ... @@ -740,14 +922,76 @@
740 922 <patterns />
741 923 <method />
742 924 </configuration>
  925 + <configuration default="true" type="JUnitTestDiscovery" factoryName="JUnit Test Discovery" changeList="All">
  926 + <extension name="coverage" enabled="false" merge="false" sample_coverage="true" runner="idea" />
  927 + <module name="" />
  928 + <option name="ALTERNATIVE_JRE_PATH_ENABLED" value="false" />
  929 + <option name="ALTERNATIVE_JRE_PATH" />
  930 + <option name="PACKAGE_NAME" />
  931 + <option name="MAIN_CLASS_NAME" />
  932 + <option name="METHOD_NAME" />
  933 + <option name="TEST_OBJECT" value="class" />
  934 + <option name="VM_PARAMETERS" />
  935 + <option name="PARAMETERS" />
  936 + <option name="WORKING_DIRECTORY" />
  937 + <option name="ENV_VARIABLES" />
  938 + <option name="PASS_PARENT_ENVS" value="true" />
  939 + <option name="TEST_SEARCH_SCOPE">
  940 + <value defaultName="singleModule" />
  941 + </option>
  942 + <envs />
  943 + <patterns />
  944 + <method />
  945 + </configuration>
743 946 <configuration default="true" type="JarApplication" factoryName="JAR Application">
744 947 <extension name="coverage" enabled="false" merge="false" sample_coverage="true" runner="idea" />
745 948 <envs />
746 949 <method />
747 950 </configuration>
  951 + <configuration default="true" type="Java Scratch" factoryName="Java Scratch">
  952 + <extension name="coverage" enabled="false" merge="false" sample_coverage="true" runner="idea" />
  953 + <option name="SCRATCH_FILE_ID" value="0" />
  954 + <option name="MAIN_CLASS_NAME" />
  955 + <option name="VM_PARAMETERS" />
  956 + <option name="PROGRAM_PARAMETERS" />
  957 + <option name="WORKING_DIRECTORY" />
  958 + <option name="ALTERNATIVE_JRE_PATH_ENABLED" value="false" />
  959 + <option name="ALTERNATIVE_JRE_PATH" />
  960 + <option name="ENABLE_SWING_INSPECTOR" value="false" />
  961 + <option name="ENV_VARIABLES" />
  962 + <option name="PASS_PARENT_ENVS" value="true" />
  963 + <module name="" />
  964 + <envs />
  965 + <method />
  966 + </configuration>
748 967 <configuration default="true" type="JavascriptDebugType" factoryName="JavaScript Debug">
749 968 <method />
750 969 </configuration>
  970 + <configuration default="true" type="JetRunConfigurationType" factoryName="Kotlin">
  971 + <extension name="coverage" enabled="false" merge="false" sample_coverage="true" runner="idea" />
  972 + <option name="MAIN_CLASS_NAME" />
  973 + <option name="VM_PARAMETERS" />
  974 + <option name="PROGRAM_PARAMETERS" />
  975 + <option name="WORKING_DIRECTORY" />
  976 + <option name="ALTERNATIVE_JRE_PATH_ENABLED" value="false" />
  977 + <option name="ALTERNATIVE_JRE_PATH" />
  978 + <option name="PASS_PARENT_ENVS" value="true" />
  979 + <module name="patent" />
  980 + <envs />
  981 + <method />
  982 + </configuration>
  983 + <configuration default="true" type="KotlinStandaloneScriptRunConfigurationType" factoryName="Kotlin script">
  984 + <extension name="coverage" enabled="false" merge="false" sample_coverage="true" runner="idea" />
  985 + <option name="filePath" />
  986 + <option name="vmParameters" />
  987 + <option name="alternativeJrePath" />
  988 + <option name="programParameters" />
  989 + <option name="passParentEnvs" value="true" />
  990 + <option name="workingDirectory" />
  991 + <option name="isAlternativeJrePathEnabled" value="false" />
  992 + <envs />
  993 + <method />
  994 + </configuration>
751 995 <configuration default="true" type="MavenRunConfiguration" factoryName="Maven">
752 996 <MavenSettings>
753 997 <option name="myGeneralSettings" />
... ... @@ -812,7 +1056,36 @@
812 1056 <listeners />
813 1057 <method />
814 1058 </configuration>
  1059 + <configuration default="true" type="TestNGTestDiscovery" factoryName="TestNG Test Discovery" changeList="All">
  1060 + <extension name="coverage" enabled="false" merge="false" sample_coverage="true" runner="idea" />
  1061 + <module name="" />
  1062 + <option name="ALTERNATIVE_JRE_PATH_ENABLED" value="false" />
  1063 + <option name="ALTERNATIVE_JRE_PATH" />
  1064 + <option name="SUITE_NAME" />
  1065 + <option name="PACKAGE_NAME" />
  1066 + <option name="MAIN_CLASS_NAME" />
  1067 + <option name="METHOD_NAME" />
  1068 + <option name="GROUP_NAME" />
  1069 + <option name="TEST_OBJECT" value="CLASS" />
  1070 + <option name="VM_PARAMETERS" />
  1071 + <option name="PARAMETERS" />
  1072 + <option name="WORKING_DIRECTORY" />
  1073 + <option name="OUTPUT_DIRECTORY" />
  1074 + <option name="ANNOTATION_TYPE" />
  1075 + <option name="ENV_VARIABLES" />
  1076 + <option name="PASS_PARENT_ENVS" value="true" />
  1077 + <option name="TEST_SEARCH_SCOPE">
  1078 + <value defaultName="singleModule" />
  1079 + </option>
  1080 + <option name="USE_DEFAULT_REPORTERS" value="false" />
  1081 + <option name="PROPERTIES_FILE" />
  1082 + <envs />
  1083 + <properties />
  1084 + <listeners />
  1085 + <method />
  1086 + </configuration>
815 1087 <configuration default="true" type="js.build_tools.gulp" factoryName="Gulp.js">
  1088 + <node-interpreter>project</node-interpreter>
816 1089 <node-options />
817 1090 <gulpfile />
818 1091 <tasks />
... ... @@ -821,13 +1094,20 @@
821 1094 <envs />
822 1095 <method />
823 1096 </configuration>
  1097 + <configuration default="true" type="js.build_tools.npm" factoryName="npm">
  1098 + <command value="run-script" />
  1099 + <scripts />
  1100 + <node-interpreter value="project" />
  1101 + <envs />
  1102 + <method />
  1103 + </configuration>
824 1104 <configuration default="true" type="osgi.bnd.run" factoryName="Run Launcher">
825 1105 <method />
826 1106 </configuration>
827 1107 <configuration default="true" type="osgi.bnd.run" factoryName="Test Launcher (JUnit)">
828 1108 <method />
829 1109 </configuration>
830   - <configuration default="false" name="patent" type="#com.intellij.j2ee.web.tomcat.TomcatRunConfigurationFactory" factoryName="Local" APPLICATION_SERVER_NAME="Tomcat 8" ALTERNATIVE_JRE_ENABLED="false" ALTERNATIVE_JRE_PATH="">
  1110 + <configuration default="false" name="patent" type="#com.intellij.j2ee.web.tomcat.TomcatRunConfigurationFactory" factoryName="Local" APPLICATION_SERVER_NAME="tomcat8" ALTERNATIVE_JRE_ENABLED="false">
831 1111 <option name="SHOW_DIALOG_ON_UPDATE" value="false" />
832 1112 <deployment>
833 1113 <artifact name="patent:war exploded">
... ... @@ -899,21 +1179,27 @@
899 1179 </option>
900 1180 </method>
901 1181 </configuration>
902   - <list size="4">
  1182 + <list size="6">
903 1183 <item index="0" class="java.lang.String" itemvalue="Tomcat Server.patent" />
904   - <item index="1" class="java.lang.String" itemvalue="Application.CaseTypeEnum" />
905   - <item index="2" class="java.lang.String" itemvalue="Application.TextUtils" />
906   - <item index="3" class="java.lang.String" itemvalue="Application.CasementService" />
  1184 + <item index="1" class="java.lang.String" itemvalue="Tomcat Server.customer_contact.jsp (5)" />
  1185 + <item index="2" class="java.lang.String" itemvalue="Tomcat Server.customer_contact.jsp" />
  1186 + <item index="3" class="java.lang.String" itemvalue="Tomcat Server.customer_contact.jsp (1)" />
  1187 + <item index="4" class="java.lang.String" itemvalue="Tomcat Server.customer_contact.jsp (2)" />
  1188 + <item index="5" class="java.lang.String" itemvalue="Tomcat Server.customer_contact.jsp (3)" />
907 1189 </list>
908 1190 <recent_temporary>
909   - <list size="3">
910   - <item index="0" class="java.lang.String" itemvalue="Application.CasementService" />
911   - <item index="1" class="java.lang.String" itemvalue="Application.CaseTypeEnum" />
912   - <item index="2" class="java.lang.String" itemvalue="Application.TextUtils" />
  1191 + <list size="5">
  1192 + <item index="0" class="java.lang.String" itemvalue="Tomcat Server.customer_contact.jsp (3)" />
  1193 + <item index="1" class="java.lang.String" itemvalue="Tomcat Server.customer_contact.jsp (2)" />
  1194 + <item index="2" class="java.lang.String" itemvalue="Tomcat Server.customer_contact.jsp (1)" />
  1195 + <item index="3" class="java.lang.String" itemvalue="Tomcat Server.customer_contact.jsp" />
  1196 + <item index="4" class="java.lang.String" itemvalue="Tomcat Server.customer_contact.jsp (5)" />
913 1197 </list>
914 1198 </recent_temporary>
915 1199 </component>
916   - <component name="ShelveChangesManager" show_recycled="false" />
  1200 + <component name="ShelveChangesManager" show_recycled="false">
  1201 + <option name="remove_strategy" value="false" />
  1202 + </component>
917 1203 <component name="SvnConfiguration">
918 1204 <configuration />
919 1205 </component>
... ... @@ -922,6 +1208,7 @@
922 1208 <changelist id="a8f74803-c7c3-405c-9584-6ffd161452f6" name="Default" comment="" />
923 1209 <created>1468214759106</created>
924 1210 <option name="number" value="Default" />
  1211 + <option name="presentableId" value="Default" />
925 1212 <updated>1468214759106</updated>
926 1213 <workItem from="1468214760432" duration="1049000" />
927 1214 <workItem from="1468234772794" duration="330000" />
... ... @@ -938,70 +1225,74 @@
938 1225 <workItem from="1469243959439" duration="3683000" />
939 1226 <workItem from="1469260205882" duration="12837000" />
940 1227 <workItem from="1469585749367" duration="1353000" />
  1228 + <workItem from="1471243326631" duration="16302000" />
941 1229 </task>
942 1230 <servers />
943 1231 </component>
944 1232 <component name="TimeTrackingManager">
945   - <option name="totallyTimeSpent" value="95728000" />
  1233 + <option name="totallyTimeSpent" value="112030000" />
946 1234 </component>
947 1235 <component name="ToolWindowManager">
948   - <frame x="1280" y="23" width="1920" height="1057" extended-state="6" />
949   - <editor active="true" />
  1236 + <frame x="65" y="24" width="1855" height="1056" extended-state="6" />
  1237 + <editor active="false" />
950 1238 <layout>
951   - <window_info id="Palette&#9;" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" sideWeight="0.5" order="2" side_tool="false" content_ui="tabs" />
952   - <window_info id="UI Designer" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" sideWeight="0.5" order="2" side_tool="false" content_ui="tabs" />
953   - <window_info id="Designer" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" sideWeight="0.5" order="3" side_tool="false" content_ui="tabs" />
954   - <window_info id="Terminal" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.55129534" sideWeight="0.5" order="7" side_tool="false" content_ui="tabs" />
955   - <window_info id="Palette" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" sideWeight="0.5" order="3" side_tool="false" content_ui="tabs" />
956   - <window_info id="Ant Build" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.25" sideWeight="0.5" order="1" side_tool="false" content_ui="tabs" />
957   - <window_info id="Database" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" sideWeight="0.5" order="3" side_tool="false" content_ui="tabs" />
958   - <window_info id="Java Enterprise" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" sideWeight="0.5" order="7" side_tool="false" content_ui="tabs" />
959   - <window_info id="Debug" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="true" weight="0.53367877" sideWeight="0.5" order="3" side_tool="false" content_ui="tabs" />
960   - <window_info id="Event Log" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" sideWeight="0.5" order="7" side_tool="true" content_ui="tabs" />
961   - <window_info id="Favorites" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" sideWeight="0.5" order="2" side_tool="true" content_ui="tabs" />
962   - <window_info id="Version Control" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.32953367" sideWeight="0.5" order="7" side_tool="false" content_ui="tabs" />
963   - <window_info id="Messages" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.44974095" sideWeight="0.5" order="7" side_tool="false" content_ui="tabs" />
964   - <window_info id="Web" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" sideWeight="0.5" order="2" side_tool="true" content_ui="tabs" />
965   - <window_info id="TODO" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" sideWeight="0.5" order="6" side_tool="false" content_ui="tabs" />
966   - <window_info id="Structure" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.25" sideWeight="0.5" order="1" side_tool="false" content_ui="tabs" />
967   - <window_info id="Maven Projects" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="true" weight="0.19222577" sideWeight="0.5" order="3" side_tool="false" content_ui="tabs" />
968   - <window_info id="Application Servers" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.53812635" sideWeight="0.5" order="7" side_tool="false" content_ui="tabs" />
969   - <window_info id="Project" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="true" weight="0.20021299" sideWeight="0.5" order="0" side_tool="false" content_ui="combo" />
970   - <window_info id="Run" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.36165804" sideWeight="0.5" order="2" side_tool="false" content_ui="tabs" />
971   - <window_info id="Hierarchy" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.25" sideWeight="0.5" order="2" side_tool="false" content_ui="combo" />
972   - <window_info id="Cvs" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.25" sideWeight="0.5" order="4" side_tool="false" content_ui="tabs" />
973   - <window_info id="Message" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" sideWeight="0.5" order="0" side_tool="false" content_ui="tabs" />
974   - <window_info id="Find" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.3896373" sideWeight="0.5" order="1" side_tool="false" content_ui="tabs" />
975   - <window_info id="Commander" active="false" anchor="right" auto_hide="false" internal_type="SLIDING" type="SLIDING" visible="false" weight="0.4" sideWeight="0.5" order="0" side_tool="false" content_ui="tabs" />
976   - <window_info id="Inspection" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.4" sideWeight="0.5" order="5" side_tool="false" content_ui="tabs" />
  1239 + <window_info id="Palette" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="3" side_tool="false" content_ui="tabs" />
  1240 + <window_info id="TODO" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="6" side_tool="false" content_ui="tabs" />
  1241 + <window_info id="Messages" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.4495708" sideWeight="0.5" order="7" side_tool="false" content_ui="tabs" />
  1242 + <window_info id="Palette&#9;" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="2" side_tool="false" content_ui="tabs" />
  1243 + <window_info id="Java Enterprise" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="7" side_tool="false" content_ui="tabs" />
  1244 + <window_info id="Capture Analysis" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="-1" side_tool="false" content_ui="tabs" />
  1245 + <window_info id="Event Log" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="7" side_tool="true" content_ui="tabs" />
  1246 + <window_info id="Application Servers" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.53812635" sideWeight="0.5" order="7" side_tool="false" content_ui="tabs" />
  1247 + <window_info id="Maven Projects" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="true" show_stripe_button="true" weight="0.28689885" sideWeight="0.5" order="3" side_tool="false" content_ui="tabs" />
  1248 + <window_info id="Version Control" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.32953367" sideWeight="0.5" order="7" side_tool="false" content_ui="tabs" />
  1249 + <window_info id="Run" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.18884121" sideWeight="0.5" order="2" side_tool="false" content_ui="tabs" />
  1250 + <window_info id="Spring" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="-1" side_tool="false" content_ui="tabs" />
  1251 + <window_info id="Terminal" active="true" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="true" show_stripe_button="true" weight="0.29613733" sideWeight="0.5" order="7" side_tool="false" content_ui="tabs" />
  1252 + <window_info id="Capture Tool" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="-1" side_tool="false" content_ui="tabs" />
  1253 + <window_info id="Designer" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="3" side_tool="false" content_ui="tabs" />
  1254 + <window_info id="Project" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="true" show_stripe_button="true" weight="0.20011055" sideWeight="0.5" order="0" side_tool="false" content_ui="combo" />
  1255 + <window_info id="Web" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="2" side_tool="true" content_ui="tabs" />
  1256 + <window_info id="Database" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="3" side_tool="false" content_ui="tabs" />
  1257 + <window_info id="Structure" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.25" sideWeight="0.5" order="1" side_tool="false" content_ui="tabs" />
  1258 + <window_info id="Ant Build" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.25" sideWeight="0.5" order="1" side_tool="false" content_ui="tabs" />
  1259 + <window_info id="UI Designer" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="2" side_tool="false" content_ui="tabs" />
  1260 + <window_info id="Favorites" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="2" side_tool="true" content_ui="tabs" />
  1261 + <window_info id="Debug" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.5332618" sideWeight="0.5" order="3" side_tool="false" content_ui="tabs" />
  1262 + <window_info id="Cvs" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.25" sideWeight="0.5" order="4" side_tool="false" content_ui="tabs" />
  1263 + <window_info id="Message" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="0" side_tool="false" content_ui="tabs" />
  1264 + <window_info id="Commander" active="false" anchor="right" auto_hide="false" internal_type="SLIDING" type="SLIDING" visible="false" show_stripe_button="true" weight="0.4" sideWeight="0.5" order="0" side_tool="false" content_ui="tabs" />
  1265 + <window_info id="Hierarchy" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.25" sideWeight="0.5" order="2" side_tool="false" content_ui="combo" />
  1266 + <window_info id="Inspection" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.4" sideWeight="0.5" order="5" side_tool="false" content_ui="tabs" />
  1267 + <window_info id="Find" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.3896373" sideWeight="0.5" order="1" side_tool="false" content_ui="tabs" />
977 1268 </layout>
978 1269 <layout-to-restore>
979   - <window_info id="UI Designer" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" sideWeight="0.5" order="2" side_tool="false" content_ui="tabs" />
980   - <window_info id="Palette&#9;" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" sideWeight="0.5" order="3" side_tool="false" content_ui="tabs" />
981   - <window_info id="Database" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" sideWeight="0.5" order="3" side_tool="false" content_ui="tabs" />
982   - <window_info id="Ant Build" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.25" sideWeight="0.5" order="1" side_tool="false" content_ui="tabs" />
983   - <window_info id="Java Enterprise" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" sideWeight="0.5" order="7" side_tool="false" content_ui="tabs" />
984   - <window_info id="Event Log" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" sideWeight="0.5" order="8" side_tool="true" content_ui="tabs" />
985   - <window_info id="Version Control" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" sideWeight="0.5" order="9" side_tool="false" content_ui="tabs" />
986   - <window_info id="TODO" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" sideWeight="0.5" order="6" side_tool="false" content_ui="tabs" />
987   - <window_info id="Application Servers" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.53812635" sideWeight="0.5" order="10" side_tool="false" content_ui="tabs" />
988   - <window_info id="Project" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="true" weight="0.24313408" sideWeight="0.5" order="0" side_tool="false" content_ui="combo" />
989   - <window_info id="Run" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.36165804" sideWeight="0.5" order="2" side_tool="false" content_ui="tabs" />
990   - <window_info id="Hierarchy" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.25" sideWeight="0.5" order="2" side_tool="false" content_ui="combo" />
991   - <window_info id="Cvs" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.25" sideWeight="0.5" order="4" side_tool="false" content_ui="tabs" />
992   - <window_info id="Designer" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" sideWeight="0.5" order="4" side_tool="false" content_ui="tabs" />
993   - <window_info id="Palette" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" sideWeight="0.5" order="5" side_tool="false" content_ui="tabs" />
994   - <window_info id="Terminal" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.140625" sideWeight="0.5" order="11" side_tool="false" content_ui="tabs" />
995   - <window_info id="Message" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" sideWeight="0.5" order="0" side_tool="false" content_ui="tabs" />
996   - <window_info id="Find" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.528125" sideWeight="0.5" order="1" side_tool="false" content_ui="tabs" />
997   - <window_info id="Debug" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="true" weight="0.090625" sideWeight="0.5" order="3" side_tool="false" content_ui="tabs" />
998   - <window_info id="Favorites" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" sideWeight="0.5" order="4" side_tool="true" content_ui="tabs" />
999   - <window_info id="Messages" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.26943004" sideWeight="0.5" order="12" side_tool="false" content_ui="tabs" />
1000   - <window_info id="Web" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" sideWeight="0.5" order="5" side_tool="true" content_ui="tabs" />
1001   - <window_info id="Structure" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.25" sideWeight="0.5" order="1" side_tool="false" content_ui="tabs" />
1002   - <window_info id="Maven Projects" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="true" weight="0.08642972" sideWeight="0.5" order="6" side_tool="false" content_ui="tabs" />
1003   - <window_info id="Commander" active="false" anchor="right" auto_hide="false" internal_type="SLIDING" type="SLIDING" visible="false" weight="0.4" sideWeight="0.5" order="0" side_tool="false" content_ui="tabs" />
1004   - <window_info id="Inspection" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.4" sideWeight="0.5" order="5" side_tool="false" content_ui="tabs" />
  1270 + <window_info id="Cvs" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.25" sideWeight="0.5" order="4" side_tool="false" content_ui="tabs" />
  1271 + <window_info id="Palette" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="5" side_tool="false" content_ui="tabs" />
  1272 + <window_info id="Message" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="0" side_tool="false" content_ui="tabs" />
  1273 + <window_info id="Commander" active="false" anchor="right" auto_hide="false" internal_type="SLIDING" type="SLIDING" visible="false" show_stripe_button="true" weight="0.4" sideWeight="0.5" order="0" side_tool="false" content_ui="tabs" />
  1274 + <window_info id="Event Log" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="8" side_tool="true" content_ui="tabs" />
  1275 + <window_info id="Application Servers" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.53812635" sideWeight="0.5" order="10" side_tool="false" content_ui="tabs" />
  1276 + <window_info id="Maven Projects" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="true" show_stripe_button="true" weight="0.08642972" sideWeight="0.5" order="6" side_tool="false" content_ui="tabs" />
  1277 + <window_info id="Hierarchy" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.25" sideWeight="0.5" order="2" side_tool="false" content_ui="combo" />
  1278 + <window_info id="Designer" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="4" side_tool="false" content_ui="tabs" />
  1279 + <window_info id="Database" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="3" side_tool="false" content_ui="tabs" />
  1280 + <window_info id="Structure" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.25" sideWeight="0.5" order="1" side_tool="false" content_ui="tabs" />
  1281 + <window_info id="Ant Build" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.25" sideWeight="0.5" order="1" side_tool="false" content_ui="tabs" />
  1282 + <window_info id="UI Designer" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="2" side_tool="false" content_ui="tabs" />
  1283 + <window_info id="Debug" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="true" show_stripe_button="true" weight="0.090625" sideWeight="0.5" order="3" side_tool="false" content_ui="tabs" />
  1284 + <window_info id="TODO" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="6" side_tool="false" content_ui="tabs" />
  1285 + <window_info id="Messages" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.26943004" sideWeight="0.5" order="12" side_tool="false" content_ui="tabs" />
  1286 + <window_info id="Palette&#9;" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="3" side_tool="false" content_ui="tabs" />
  1287 + <window_info id="Java Enterprise" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="7" side_tool="false" content_ui="tabs" />
  1288 + <window_info id="Inspection" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.4" sideWeight="0.5" order="5" side_tool="false" content_ui="tabs" />
  1289 + <window_info id="Version Control" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="9" side_tool="false" content_ui="tabs" />
  1290 + <window_info id="Run" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.36165804" sideWeight="0.5" order="2" side_tool="false" content_ui="tabs" />
  1291 + <window_info id="Terminal" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.140625" sideWeight="0.5" order="11" side_tool="false" content_ui="tabs" />
  1292 + <window_info id="Project" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="true" show_stripe_button="true" weight="0.24313408" sideWeight="0.5" order="0" side_tool="false" content_ui="combo" />
  1293 + <window_info id="Web" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="5" side_tool="true" content_ui="tabs" />
  1294 + <window_info id="Find" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.528125" sideWeight="0.5" order="1" side_tool="false" content_ui="tabs" />
  1295 + <window_info id="Favorites" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="4" side_tool="true" content_ui="tabs" />
1005 1296 </layout-to-restore>
1006 1297 </component>
1007 1298 <component name="Vcs.Log.UiProperties">
... ... @@ -1026,31 +1317,16 @@
1026 1317 <option name="FILTER_TARGETS" value="false" />
1027 1318 </component>
1028 1319 <component name="editorHistoryManager">
1029   - <entry file="jar://$APPLICATION_HOME_DIR$/lib/idea.jar!/resources/html5-schema/html5/block.rnc">
1030   - <provider selected="true" editor-type-id="text-editor">
1031   - <state vertical-scroll-proportion="0.0">
1032   - <caret line="12" column="16" selection-start-line="12" selection-start-column="16" selection-end-line="12" selection-end-column="16" />
1033   - <folding />
1034   - </state>
1035   - </provider>
1036   - </entry>
1037   - <entry file="file://$PROJECT_DIR$/src/main/webapp/css/pay.css">
1038   - <provider selected="true" editor-type-id="text-editor">
1039   - <state vertical-scroll-proportion="0.0">
1040   - <caret line="12" column="0" selection-start-line="12" selection-start-column="0" selection-end-line="12" selection-end-column="0" />
1041   - </state>
1042   - </provider>
1043   - </entry>
1044 1320 <entry file="file://$PROJECT_DIR$/src/main/resources/mapper/OrderMapper.xml">
1045 1321 <provider selected="true" editor-type-id="text-editor">
1046   - <state vertical-scroll-proportion="0.0">
  1322 + <state relative-caret-position="0">
1047 1323 <caret line="181" column="20" selection-start-line="181" selection-start-column="20" selection-end-line="181" selection-end-column="20" />
1048 1324 </state>
1049 1325 </provider>
1050 1326 </entry>
1051 1327 <entry file="file://$PROJECT_DIR$/src/main/resources.local/logback.xml">
1052 1328 <provider selected="true" editor-type-id="text-editor">
1053   - <state vertical-scroll-proportion="-6.111111">
  1329 + <state relative-caret-position="0">
1054 1330 <caret line="11" column="43" selection-start-line="11" selection-start-column="43" selection-end-line="11" selection-end-column="43" />
1055 1331 <folding />
1056 1332 </state>
... ... @@ -1058,42 +1334,36 @@
1058 1334 </entry>
1059 1335 <entry file="file://$PROJECT_DIR$/src/main/java/com/canrd/patent/dal/mapper/OrderMapper.java">
1060 1336 <provider selected="true" editor-type-id="text-editor">
1061   - <state vertical-scroll-proportion="0.0">
  1337 + <state relative-caret-position="0">
1062 1338 <caret line="62" column="22" selection-start-line="62" selection-start-column="22" selection-end-line="62" selection-end-column="22" />
1063 1339 </state>
1064 1340 </provider>
1065 1341 </entry>
1066   - <entry file="jar://$MAVEN_REPOSITORY$/org/springframework/spring-core/4.2.3.RELEASE/spring-core-4.2.3.RELEASE-sources.jar!/org/springframework/util/Assert.java">
1067   - <provider selected="true" editor-type-id="text-editor">
1068   - <state vertical-scroll-proportion="0.0">
1069   - <caret line="125" column="13" selection-start-line="125" selection-start-column="13" selection-end-line="125" selection-end-column="13" />
1070   - </state>
1071   - </provider>
1072   - </entry>
  1342 + <entry file="jar://$MAVEN_REPOSITORY$/org/springframework/spring-core/4.2.3.RELEASE/spring-core-4.2.3.RELEASE-sources.jar!/org/springframework/util/Assert.java" />
1073 1343 <entry file="file://$PROJECT_DIR$/src/main/webapp/error.jsp">
1074 1344 <provider selected="true" editor-type-id="text-editor">
1075   - <state vertical-scroll-proportion="0.0">
  1345 + <state relative-caret-position="0">
1076 1346 <caret line="6" column="58" selection-start-line="6" selection-start-column="58" selection-end-line="6" selection-end-column="58" />
1077 1347 </state>
1078 1348 </provider>
1079 1349 </entry>
1080 1350 <entry file="file://$PROJECT_DIR$/src/main/webapp/notice.jsp">
1081 1351 <provider selected="true" editor-type-id="text-editor">
1082   - <state vertical-scroll-proportion="0.0">
  1352 + <state relative-caret-position="0">
1083 1353 <caret line="27" column="24" selection-start-line="27" selection-start-column="24" selection-end-line="27" selection-end-column="24" />
1084 1354 </state>
1085 1355 </provider>
1086 1356 </entry>
1087 1357 <entry file="file://$PROJECT_DIR$/src/main/java/com/canrd/patent/web/OrderDataController.java">
1088 1358 <provider selected="true" editor-type-id="text-editor">
1089   - <state vertical-scroll-proportion="0.0">
  1359 + <state relative-caret-position="0">
1090 1360 <caret line="8" column="32" selection-start-line="8" selection-start-column="13" selection-end-line="8" selection-end-column="32" />
1091 1361 </state>
1092 1362 </provider>
1093 1363 </entry>
1094 1364 <entry file="file://$PROJECT_DIR$/src/test/resources/mbg/generatorConfig.xml">
1095 1365 <provider selected="true" editor-type-id="text-editor">
1096   - <state vertical-scroll-proportion="0.0">
  1366 + <state relative-caret-position="0">
1097 1367 <caret line="51" column="204" selection-start-line="51" selection-start-column="13" selection-end-line="51" selection-end-column="204" />
1098 1368 <folding />
1099 1369 </state>
... ... @@ -1101,196 +1371,182 @@
1101 1371 </entry>
1102 1372 <entry file="file://$PROJECT_DIR$/src/main/java/com/canrd/patent/dal/model/Order.java">
1103 1373 <provider selected="true" editor-type-id="text-editor">
1104   - <state vertical-scroll-proportion="0.0">
  1374 + <state relative-caret-position="0">
1105 1375 <caret line="4" column="13" selection-start-line="4" selection-start-column="13" selection-end-line="4" selection-end-column="13" />
1106 1376 </state>
1107 1377 </provider>
1108 1378 </entry>
1109 1379 <entry file="file://$PROJECT_DIR$/src/main/java/com/canrd/patent/dal/mapper/CasementMapper.java">
1110 1380 <provider selected="true" editor-type-id="text-editor">
1111   - <state vertical-scroll-proportion="0.0">
  1381 + <state relative-caret-position="0">
1112 1382 <caret line="7" column="17" selection-start-line="7" selection-start-column="17" selection-end-line="7" selection-end-column="17" />
1113 1383 </state>
1114 1384 </provider>
1115 1385 </entry>
1116 1386 <entry file="file://$PROJECT_DIR$/src/main/java/com/canrd/patent/dal/enums/OrderStatusEnum.java">
1117 1387 <provider selected="true" editor-type-id="text-editor">
1118   - <state vertical-scroll-proportion="0.0">
  1388 + <state relative-caret-position="0">
1119 1389 <caret line="7" column="4" selection-start-line="7" selection-start-column="4" selection-end-line="7" selection-end-column="4" />
1120 1390 </state>
1121 1391 </provider>
1122 1392 </entry>
1123 1393 <entry file="file://$PROJECT_DIR$/src/main/java/com/canrd/patent/web/IndexController.java">
1124 1394 <provider selected="true" editor-type-id="text-editor">
1125   - <state vertical-scroll-proportion="0.0">
  1395 + <state relative-caret-position="0">
1126 1396 <caret line="16" column="25" selection-start-line="16" selection-start-column="25" selection-end-line="16" selection-end-column="25" />
1127 1397 </state>
1128 1398 </provider>
1129 1399 </entry>
1130 1400 <entry file="file://$PROJECT_DIR$/src/main/java/com/canrd/patent/web/CasementPageController.java">
1131 1401 <provider selected="true" editor-type-id="text-editor">
1132   - <state vertical-scroll-proportion="0.0">
  1402 + <state relative-caret-position="0">
1133 1403 <caret line="49" column="21" selection-start-line="49" selection-start-column="21" selection-end-line="49" selection-end-column="21" />
1134 1404 </state>
1135 1405 </provider>
1136 1406 </entry>
1137 1407 <entry file="file://$PROJECT_DIR$/src/main/java/com/canrd/patent/service/CaseHandlingService.java">
1138 1408 <provider selected="true" editor-type-id="text-editor">
1139   - <state vertical-scroll-proportion="0.0">
  1409 + <state relative-caret-position="0">
1140 1410 <caret line="44" column="52" selection-start-line="44" selection-start-column="52" selection-end-line="44" selection-end-column="52" />
1141 1411 </state>
1142 1412 </provider>
1143 1413 </entry>
1144 1414 <entry file="file://$PROJECT_DIR$/src/main/java/com/canrd/patent/service/OrderService.java">
1145 1415 <provider selected="true" editor-type-id="text-editor">
1146   - <state vertical-scroll-proportion="-6.148148">
  1416 + <state relative-caret-position="0">
1147 1417 <caret line="31" column="0" selection-start-line="31" selection-start-column="0" selection-end-line="31" selection-end-column="0" />
1148 1418 </state>
1149 1419 </provider>
1150 1420 </entry>
1151 1421 <entry file="file://$PROJECT_DIR$/src/main/java/com/canrd/patent/dal/enums/ReduceTypeEnum.java">
1152 1422 <provider selected="true" editor-type-id="text-editor">
1153   - <state vertical-scroll-proportion="0.0">
  1423 + <state relative-caret-position="0">
1154 1424 <caret line="5" column="0" selection-start-line="5" selection-start-column="0" selection-end-line="5" selection-end-column="0" />
1155 1425 </state>
1156 1426 </provider>
1157 1427 </entry>
1158 1428 <entry file="file://$PROJECT_DIR$/src/main/java/com/canrd/patent/dal/dto/CaseOutputDto.java">
1159 1429 <provider selected="true" editor-type-id="text-editor">
1160   - <state vertical-scroll-proportion="0.0">
  1430 + <state relative-caret-position="0">
1161 1431 <caret line="11" column="32" selection-start-line="11" selection-start-column="19" selection-end-line="11" selection-end-column="32" />
1162 1432 </state>
1163 1433 </provider>
1164 1434 </entry>
1165 1435 <entry file="file://$PROJECT_DIR$/src/main/java/com/canrd/patent/dal/dto/OrderListOutputDto.java">
1166 1436 <provider selected="true" editor-type-id="text-editor">
1167   - <state vertical-scroll-proportion="0.0">
  1437 + <state relative-caret-position="0">
1168 1438 <caret line="17" column="16" selection-start-line="17" selection-start-column="16" selection-end-line="17" selection-end-column="16" />
1169 1439 </state>
1170 1440 </provider>
1171 1441 </entry>
1172 1442 <entry file="file://$PROJECT_DIR$/src/main/webapp/css/footer.css">
1173 1443 <provider selected="true" editor-type-id="text-editor">
1174   - <state vertical-scroll-proportion="-1.1945702">
  1444 + <state relative-caret-position="0">
1175 1445 <caret line="0" column="0" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="0" />
1176 1446 </state>
1177 1447 </provider>
1178 1448 </entry>
1179 1449 <entry file="file://$PROJECT_DIR$/src/main/webapp/include/header.jsp">
1180 1450 <provider selected="true" editor-type-id="text-editor">
1181   - <state vertical-scroll-proportion="-5.0">
  1451 + <state relative-caret-position="0">
1182 1452 <caret line="8" column="62" selection-start-line="8" selection-start-column="62" selection-end-line="8" selection-end-column="62" />
1183 1453 </state>
1184 1454 </provider>
1185 1455 </entry>
1186 1456 <entry file="file://$PROJECT_DIR$/src/main/java/com/canrd/patent/dal/model/Casement.java">
1187 1457 <provider selected="true" editor-type-id="text-editor">
1188   - <state vertical-scroll-proportion="0.0">
  1458 + <state relative-caret-position="0">
1189 1459 <caret line="4" column="13" selection-start-line="4" selection-start-column="13" selection-end-line="4" selection-end-column="13" />
1190 1460 </state>
1191 1461 </provider>
1192 1462 </entry>
1193 1463 <entry file="file://$PROJECT_DIR$/src/main/java/com/canrd/patent/dal/dto/OrderOutputDto.java">
1194 1464 <provider selected="true" editor-type-id="text-editor">
1195   - <state vertical-scroll-proportion="0.0">
  1465 + <state relative-caret-position="0">
1196 1466 <caret line="8" column="41" selection-start-line="8" selection-start-column="41" selection-end-line="8" selection-end-column="41" />
1197 1467 </state>
1198 1468 </provider>
1199 1469 </entry>
1200 1470 <entry file="file://$PROJECT_DIR$/src/main/java/com/canrd/patent/web/OrderPageController.java">
1201 1471 <provider selected="true" editor-type-id="text-editor">
1202   - <state vertical-scroll-proportion="0.0">
  1472 + <state relative-caret-position="0">
1203 1473 <caret line="80" column="58" selection-start-line="80" selection-start-column="58" selection-end-line="80" selection-end-column="58" />
1204 1474 </state>
1205 1475 </provider>
1206 1476 </entry>
1207 1477 <entry file="file://$PROJECT_DIR$/src/main/webapp/css/user_side_bar.css">
1208 1478 <provider selected="true" editor-type-id="text-editor">
1209   - <state vertical-scroll-proportion="0.0">
  1479 + <state relative-caret-position="0">
1210 1480 <caret line="0" column="0" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="0" />
1211 1481 </state>
1212 1482 </provider>
1213 1483 </entry>
1214 1484 <entry file="file://$PROJECT_DIR$/src/main/webapp/include/user_side.jsp">
1215 1485 <provider selected="true" editor-type-id="text-editor">
1216   - <state vertical-scroll-proportion="-5.0">
  1486 + <state relative-caret-position="0">
1217 1487 <caret line="8" column="67" selection-start-line="8" selection-start-column="67" selection-end-line="8" selection-end-column="67" />
1218 1488 </state>
1219 1489 </provider>
1220 1490 </entry>
1221   - <entry file="file://$PROJECT_DIR$/src/main/webapp/css/case-detail.css">
1222   - <provider selected="true" editor-type-id="text-editor">
1223   - <state vertical-scroll-proportion="0.0">
1224   - <caret line="34" column="0" selection-start-line="34" selection-start-column="0" selection-end-line="34" selection-end-column="0" />
1225   - </state>
1226   - </provider>
1227   - </entry>
1228 1491 <entry file="file://$PROJECT_DIR$/src/main/webapp/css/order_detail.css">
1229 1492 <provider selected="true" editor-type-id="text-editor">
1230   - <state vertical-scroll-proportion="0.0">
  1493 + <state relative-caret-position="0">
1231 1494 <caret line="34" column="0" selection-start-line="34" selection-start-column="0" selection-end-line="34" selection-end-column="0" />
1232 1495 </state>
1233 1496 </provider>
1234 1497 </entry>
1235 1498 <entry file="file://$PROJECT_DIR$/src/main/webapp/css/header.css">
1236 1499 <provider selected="true" editor-type-id="text-editor">
1237   - <state vertical-scroll-proportion="0.0">
  1500 + <state relative-caret-position="0">
1238 1501 <caret line="1" column="0" selection-start-line="1" selection-start-column="0" selection-end-line="32" selection-end-column="1" />
1239 1502 </state>
1240 1503 </provider>
1241 1504 </entry>
1242 1505 <entry file="file://$PROJECT_DIR$/src/main/webapp/case_detail.jsp">
1243 1506 <provider selected="true" editor-type-id="text-editor">
1244   - <state vertical-scroll-proportion="58.75">
  1507 + <state relative-caret-position="0">
1245 1508 <caret line="19" column="31" selection-start-line="19" selection-start-column="31" selection-end-line="19" selection-end-column="31" />
1246 1509 </state>
1247 1510 </provider>
1248 1511 </entry>
1249 1512 <entry file="file://$PROJECT_DIR$/src/main/webapp/order_detail.jsp">
1250 1513 <provider selected="true" editor-type-id="text-editor">
1251   - <state vertical-scroll-proportion="-12.5">
  1514 + <state relative-caret-position="0">
1252 1515 <caret line="20" column="12" selection-start-line="20" selection-start-column="12" selection-end-line="20" selection-end-column="69" />
1253 1516 </state>
1254 1517 </provider>
1255 1518 </entry>
1256 1519 <entry file="file://$PROJECT_DIR$/src/main/webapp/case_manage.jsp">
1257 1520 <provider selected="true" editor-type-id="text-editor">
1258   - <state vertical-scroll-proportion="-3.75">
  1521 + <state relative-caret-position="0">
1259 1522 <caret line="6" column="61" selection-start-line="6" selection-start-column="61" selection-end-line="6" selection-end-column="61" />
1260 1523 </state>
1261 1524 </provider>
1262 1525 </entry>
1263 1526 <entry file="file://$PROJECT_DIR$/src/main/webapp/css/case-manage.css">
1264 1527 <provider selected="true" editor-type-id="text-editor">
1265   - <state vertical-scroll-proportion="0.0">
  1528 + <state relative-caret-position="0">
1266 1529 <caret line="40" column="0" selection-start-line="40" selection-start-column="0" selection-end-line="40" selection-end-column="0" />
1267 1530 </state>
1268 1531 </provider>
1269 1532 </entry>
1270   - <entry file="file://$PROJECT_DIR$/src/main/webapp/pay.jsp">
1271   - <provider selected="true" editor-type-id="text-editor">
1272   - <state vertical-scroll-proportion="0.9375">
1273   - <caret line="120" column="71" selection-start-line="120" selection-start-column="71" selection-end-line="120" selection-end-column="71" />
1274   - </state>
1275   - </provider>
1276   - </entry>
1277 1533 <entry file="file://$PROJECT_DIR$/src/main/webapp/pay_result.jsp">
1278 1534 <provider selected="true" editor-type-id="text-editor">
1279   - <state vertical-scroll-proportion="0.8238636">
  1535 + <state relative-caret-position="0">
1280 1536 <caret line="29" column="7" selection-start-line="29" selection-start-column="7" selection-end-line="29" selection-end-column="64" />
1281 1537 </state>
1282 1538 </provider>
1283 1539 </entry>
1284 1540 <entry file="file://$PROJECT_DIR$/src/main/webapp/service.jsp">
1285 1541 <provider selected="true" editor-type-id="text-editor">
1286   - <state vertical-scroll-proportion="-1.1931819">
  1542 + <state relative-caret-position="0">
1287 1543 <caret line="0" column="0" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="0" />
1288 1544 </state>
1289 1545 </provider>
1290 1546 </entry>
1291 1547 <entry file="file://$PROJECT_DIR$/src/main/webapp/css/patent-index.css">
1292 1548 <provider selected="true" editor-type-id="text-editor">
1293   - <state vertical-scroll-proportion="-7.703704">
  1549 + <state relative-caret-position="0">
1294 1550 <caret line="116" column="2" selection-start-line="116" selection-start-column="1" selection-end-line="116" selection-end-column="2" />
1295 1551 </state>
1296 1552 </provider>
... ... @@ -1302,14 +1558,14 @@
1302 1558 </entry>
1303 1559 <entry file="file://$PROJECT_DIR$/src/main/webapp/css/home.css">
1304 1560 <provider selected="true" editor-type-id="text-editor">
1305   - <state vertical-scroll-proportion="0.0">
  1561 + <state relative-caret-position="0">
1306 1562 <caret line="29" column="0" selection-start-line="29" selection-start-column="0" selection-end-line="29" selection-end-column="0" />
1307 1563 </state>
1308 1564 </provider>
1309 1565 </entry>
1310 1566 <entry file="file://$PROJECT_DIR$/src/main/webapp/home_patent.jsp">
1311 1567 <provider selected="true" editor-type-id="text-editor">
1312   - <state vertical-scroll-proportion="-32.375">
  1568 + <state relative-caret-position="0">
1313 1569 <caret line="300" column="57" selection-start-line="300" selection-start-column="46" selection-end-line="300" selection-end-column="57" />
1314 1570 </state>
1315 1571 </provider>
... ... @@ -1334,50 +1590,82 @@
1334 1590 <state />
1335 1591 </provider>
1336 1592 </entry>
1337   - <entry file="file://$PROJECT_DIR$/src/main/java/com/canrd/patent/web/HelloController.java">
  1593 + <entry file="file://$PROJECT_DIR$/src/main/resources.local/props/fdfs.properties">
1338 1594 <provider selected="true" editor-type-id="text-editor">
1339   - <state vertical-scroll-proportion="0.0">
1340   - <caret line="22" column="13" selection-start-line="22" selection-start-column="13" selection-end-line="22" selection-end-column="13" />
  1595 + <state relative-caret-position="-393">
  1596 + <caret line="0" column="0" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="0" />
  1597 + <folding />
  1598 + </state>
  1599 + </provider>
  1600 + </entry>
  1601 + <entry file="file://$PROJECT_DIR$/doc/sql/Untitled.sql">
  1602 + <provider selected="true" editor-type-id="text-editor">
  1603 + <state relative-caret-position="102">
  1604 + <caret line="8" column="39" selection-start-line="8" selection-start-column="39" selection-end-line="8" selection-end-column="39" />
1341 1605 <folding />
1342 1606 </state>
1343 1607 </provider>
1344 1608 </entry>
1345 1609 <entry file="file://$PROJECT_DIR$/doc/sql/ddl.sql">
1346 1610 <provider selected="true" editor-type-id="text-editor">
1347   - <state vertical-scroll-proportion="-0.5555556">
  1611 + <state relative-caret-position="15">
1348 1612 <caret line="1" column="0" selection-start-line="1" selection-start-column="0" selection-end-line="1" selection-end-column="0" />
1349 1613 <folding />
1350 1614 </state>
1351 1615 </provider>
1352 1616 </entry>
1353   - <entry file="file://$PROJECT_DIR$/doc/sql/Untitled.sql">
  1617 + <entry file="file://$PROJECT_DIR$/src/main/webapp/index.jsp">
1354 1618 <provider selected="true" editor-type-id="text-editor">
1355   - <state vertical-scroll-proportion="-2.2222223">
1356   - <caret line="8" column="39" selection-start-line="8" selection-start-column="39" selection-end-line="8" selection-end-column="39" />
  1619 + <state relative-caret-position="-1751">
  1620 + <caret line="6" column="66" selection-start-line="6" selection-start-column="66" selection-end-line="6" selection-end-column="66" />
1357 1621 <folding />
1358 1622 </state>
1359 1623 </provider>
1360 1624 </entry>
1361   - <entry file="file://$PROJECT_DIR$/src/main/resources.local/props/fdfs.properties">
  1625 + <entry file="file://$PROJECT_DIR$/src/main/resources.local/props/jdbc.properties">
1362 1626 <provider selected="true" editor-type-id="text-editor">
1363   - <state vertical-scroll-proportion="0.0">
1364   - <caret line="0" column="0" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="0" />
  1627 + <state relative-caret-position="90">
  1628 + <caret line="6" column="30" selection-start-line="6" selection-start-column="30" selection-end-line="6" selection-end-column="30" />
1365 1629 <folding />
1366 1630 </state>
1367 1631 </provider>
1368 1632 </entry>
1369   - <entry file="file://$PROJECT_DIR$/src/main/resources.local/props/jdbc.properties">
  1633 + <entry file="file://$PROJECT_DIR$/src/main/webapp/pay.jsp">
1370 1634 <provider selected="true" editor-type-id="text-editor">
1371   - <state vertical-scroll-proportion="0.0">
1372   - <caret line="1" column="51" selection-start-line="1" selection-start-column="45" selection-end-line="1" selection-end-column="51" />
  1635 + <state relative-caret-position="1215">
  1636 + <caret line="120" column="71" selection-start-line="120" selection-start-column="71" selection-end-line="120" selection-end-column="71" />
1373 1637 <folding />
1374 1638 </state>
1375 1639 </provider>
1376 1640 </entry>
1377   - <entry file="file://$PROJECT_DIR$/src/main/webapp/index.jsp">
  1641 + <entry file="file://$PROJECT_DIR$/src/main/java/com/canrd/patent/web/HelloController.java">
1378 1642 <provider selected="true" editor-type-id="text-editor">
1379   - <state vertical-scroll-proportion="0.18844222">
1380   - <caret line="6" column="66" selection-start-line="6" selection-start-column="66" selection-end-line="6" selection-end-column="66" />
  1643 + <state relative-caret-position="-268">
  1644 + <caret line="40" column="8" selection-start-line="40" selection-start-column="8" selection-end-line="40" selection-end-column="8" />
  1645 + <folding />
  1646 + </state>
  1647 + </provider>
  1648 + </entry>
  1649 + <entry file="file://$PROJECT_DIR$/pom.xml">
  1650 + <provider selected="true" editor-type-id="text-editor">
  1651 + <state relative-caret-position="-180">
  1652 + <caret line="24" column="24" selection-start-line="24" selection-start-column="24" selection-end-line="24" selection-end-column="24" />
  1653 + <folding />
  1654 + </state>
  1655 + </provider>
  1656 + </entry>
  1657 + <entry file="file://$PROJECT_DIR$/src/main/webapp/css/case-detail.css">
  1658 + <provider selected="true" editor-type-id="text-editor">
  1659 + <state relative-caret-position="15">
  1660 + <caret line="34" column="0" selection-start-line="34" selection-start-column="0" selection-end-line="34" selection-end-column="0" />
  1661 + <folding />
  1662 + </state>
  1663 + </provider>
  1664 + </entry>
  1665 + <entry file="file://$PROJECT_DIR$/src/main/webapp/customer_contact.jsp">
  1666 + <provider selected="true" editor-type-id="text-editor">
  1667 + <state relative-caret-position="248">
  1668 + <caret line="36" column="10" selection-start-line="36" selection-start-column="10" selection-end-line="36" selection-end-column="10" />
1381 1669 <folding />
1382 1670 </state>
1383 1671 </provider>
... ...
patent.iml
  View file @c5a704b
... ... @@ -32,11 +32,12 @@
32 32 <orderEntry type="sourceFolder" forTests="false" />
33 33 <orderEntry type="library" name="Maven: org.springframework:spring-webmvc:4.2.3.RELEASE" level="project" />
34 34 <orderEntry type="library" name="Maven: org.springframework:spring-beans:4.2.3.RELEASE" level="project" />
  35 + <orderEntry type="library" name="Maven: org.springframework:spring-core:4.2.3.RELEASE" level="project" />
35 36 <orderEntry type="library" name="Maven: org.springframework:spring-context:4.2.3.RELEASE" level="project" />
36 37 <orderEntry type="library" name="Maven: org.springframework:spring-aop:4.2.3.RELEASE" level="project" />
37 38 <orderEntry type="library" name="Maven: aopalliance:aopalliance:1.0" level="project" />
38   - <orderEntry type="library" name="Maven: org.springframework:spring-core:4.2.3.RELEASE" level="project" />
39 39 <orderEntry type="library" name="Maven: org.springframework:spring-expression:4.2.3.RELEASE" level="project" />
  40 + <orderEntry type="library" name="Maven: commons-logging:commons-logging:1.1.1" level="project" />
40 41 <orderEntry type="library" name="Maven: org.springframework:spring-web:4.2.3.RELEASE" level="project" />
41 42 <orderEntry type="library" name="Maven: org.springframework:spring-context-support:4.2.3.RELEASE" level="project" />
42 43 <orderEntry type="library" name="Maven: org.springframework:spring-jdbc:4.2.3.RELEASE" level="project" />
... ... @@ -47,12 +48,18 @@
47 48 <orderEntry type="library" name="Maven: us.codecraft:webmagic-core:0.5.2" level="project" />
48 49 <orderEntry type="library" name="Maven: org.apache.httpcomponents:httpclient:4.3.3" level="project" />
49 50 <orderEntry type="library" name="Maven: org.apache.httpcomponents:httpcore:4.3.2" level="project" />
  51 + <orderEntry type="library" name="Maven: commons-codec:commons-codec:1.6" level="project" />
  52 + <orderEntry type="library" name="Maven: com.google.guava:guava:18.0" level="project" />
  53 + <orderEntry type="library" name="Maven: org.apache.commons:commons-lang3:3.4" level="project" />
50 54 <orderEntry type="library" name="Maven: us.codecraft:xsoup:0.2.4" level="project" />
51   - <orderEntry type="library" name="Maven: commons-collections:commons-collections:3.2.1" level="project" />
  55 + <orderEntry type="library" name="Maven: org.jsoup:jsoup:1.8.3" level="project" />
52 56 <orderEntry type="library" name="Maven: org.assertj:assertj-core:1.5.0" level="project" />
  57 + <orderEntry type="library" name="Maven: org.slf4j:slf4j-api:1.7.13" level="project" />
  58 + <orderEntry type="library" name="Maven: commons-collections:commons-collections:3.2.1" level="project" />
53 59 <orderEntry type="library" name="Maven: commons-io:commons-io:1.3.2" level="project" />
54 60 <orderEntry type="library" name="Maven: com.jayway.jsonpath:json-path:0.8.1" level="project" />
55 61 <orderEntry type="library" name="Maven: net.minidev:json-smart:1.1.1" level="project" />
  62 + <orderEntry type="library" name="Maven: commons-lang:commons-lang:2.4" level="project" />
56 63 <orderEntry type="library" name="Maven: com.alibaba:fastjson:1.2.7" level="project" />
57 64 <orderEntry type="library" name="Maven: org.seleniumhq.selenium:selenium-java:2.47.1" level="project" />
58 65 <orderEntry type="library" name="Maven: org.seleniumhq.selenium:selenium-edge-driver:2.47.1" level="project" />
... ... @@ -61,23 +68,20 @@
61 68 <orderEntry type="library" name="Maven: com.google.code.gson:gson:2.3.1" level="project" />
62 69 <orderEntry type="library" name="Maven: org.seleniumhq.selenium:selenium-api:2.47.1" level="project" />
63 70 <orderEntry type="library" name="Maven: org.apache.commons:commons-exec:1.3" level="project" />
  71 + <orderEntry type="library" name="Maven: net.java.dev.jna:jna-platform:4.1.0" level="project" />
64 72 <orderEntry type="library" name="Maven: org.seleniumhq.selenium:selenium-firefox-driver:2.47.1" level="project" />
65 73 <orderEntry type="library" name="Maven: org.seleniumhq.selenium:selenium-support:2.47.1" level="project" />
66 74 <orderEntry type="library" name="Maven: org.webbitserver:webbit:0.4.14" level="project" />
67 75 <orderEntry type="library" name="Maven: io.netty:netty:3.9.8.Final" level="project" />
68 76 <orderEntry type="library" name="Maven: org.seleniumhq.selenium:selenium-leg-rc:2.47.1" level="project" />
69 77 <orderEntry type="library" name="Maven: org.quartz-scheduler:quartz:2.2.1" level="project" />
70   - <orderEntry type="library" name="Maven: net.java.dev.jna:jna-platform:4.1.0" level="project" />
71 78 <orderEntry type="library" name="Maven: net.java.dev.jna:jna:4.1.0" level="project" />
72 79 <orderEntry type="library" name="Maven: com.fasterxml.jackson.core:jackson-databind:2.6.3" level="project" />
73 80 <orderEntry type="library" name="Maven: com.fasterxml.jackson.core:jackson-annotations:2.6.0" level="project" />
74 81 <orderEntry type="library" name="Maven: com.fasterxml.jackson.core:jackson-core:2.6.3" level="project" />
75 82 <orderEntry type="library" name="Maven: org.apache.httpcomponents:fluent-hc:4.5.1" level="project" />
76 83 <orderEntry type="library" name="Maven: org.apache.httpcomponents:httpmime:4.5.1" level="project" />
77   - <orderEntry type="library" name="Maven: org.jsoup:jsoup:1.8.3" level="project" />
78   - <orderEntry type="library" name="Maven: com.google.guava:guava:18.0" level="project" />
79 84 <orderEntry type="library" name="Maven: joda-time:joda-time:2.9.1" level="project" />
80   - <orderEntry type="library" name="Maven: org.apache.commons:commons-lang3:3.4" level="project" />
81 85 <orderEntry type="library" name="Maven: org.apache.commons:commons-math3:3.3" level="project" />
82 86 <orderEntry type="library" name="Maven: org.apache.commons:commons-pool2:2.3" level="project" />
83 87 <orderEntry type="library" name="Maven: org.apache.tomcat:tomcat-jdbc:8.0.29" level="project" />
... ... @@ -88,7 +92,6 @@
88 92 <orderEntry type="library" name="Maven: org.ow2.asm:asm:4.2" level="project" />
89 93 <orderEntry type="library" name="Maven: com.esotericsoftware:minlog:1.3.0" level="project" />
90 94 <orderEntry type="library" name="Maven: org.objenesis:objenesis:2.1" level="project" />
91   - <orderEntry type="library" name="Maven: org.slf4j:slf4j-api:1.7.13" level="project" />
92 95 <orderEntry type="library" name="Maven: org.slf4j:jcl-over-slf4j:1.7.13" level="project" />
93 96 <orderEntry type="library" name="Maven: org.slf4j:log4j-over-slf4j:1.7.13" level="project" />
94 97 <orderEntry type="library" name="Maven: ch.qos.logback:logback-core:1.1.3" level="project" />
... ... @@ -103,16 +106,13 @@
103 106 <orderEntry type="library" name="Maven: org.postgresql:postgresql:9.4-1201-jdbc4" level="project" />
104 107 <orderEntry type="library" name="Maven: mysql:mysql-connector-java:5.1.34" level="project" />
105 108 <orderEntry type="library" name="Maven: org.apache.velocity:velocity:1.7" level="project" />
106   - <orderEntry type="library" name="Maven: commons-lang:commons-lang:2.4" level="project" />
107   - <orderEntry type="library" name="Maven: commons-codec:commons-codec:1.6" level="project" />
108 109 <orderEntry type="library" name="Maven: commons-httpclient:commons-httpclient:3.0.1" level="project" />
109   - <orderEntry type="library" name="Maven: commons-logging:commons-logging:1.1.1" level="project" />
  110 + <orderEntry type="library" scope="TEST" name="Maven: junit:junit:4.11" level="project" />
110 111 <orderEntry type="library" name="Maven: dom4j:dom4j:1.6.1" level="project" />
111 112 <orderEntry type="library" name="Maven: xml-apis:xml-apis:1.0.b2" level="project" />
112 113 <orderEntry type="library" name="Maven: jaxen:jaxen:1.1-beta" level="project" />
113 114 <orderEntry type="library" name="Maven: sshxcute:sshxcute:1.0" level="project" />
114 115 <orderEntry type="library" scope="TEST" name="Maven: org.springframework:spring-test:4.2.3.RELEASE" level="project" />
115   - <orderEntry type="library" scope="TEST" name="Maven: junit:junit:4.11" level="project" />
116 116 <orderEntry type="library" scope="TEST" name="Maven: org.hamcrest:hamcrest-core:1.3" level="project" />
117 117 </component>
118 118 </module>
119 119 \ No newline at end of file
... ...
src/main/resources.local/props/jdbc.properties
  View file @c5a704b
1 1 # \u3010DEV\u3011
2 2 jdbc.canrd.url = jdbc:mysql://127.0.0.1:3306/patent?characterEncoding=utf8
3 3 jdbc.canrd.username = root
4   -jdbc.canrd.password = miao.1201
  4 +jdbc.canrd.password = 123123
5 5 jdbc.canrd.max.conn = 10
6 6 jdbc.canrd.min.conn = 1
7 7 jdbc.canrd.wait.millis = 10000
8 8 \ No newline at end of file
... ...
src/main/webapp/customer_contact.jsp 0 → 100644
  View file @c5a704b
  1 +<%--
  2 + Created by IntelliJ IDEA.
  3 + User: litao
  4 + Date: 16-8-15
  5 + Time: 下午2:49
  6 + To change this template use File | Settings | File Templates.
  7 +--%>
  8 +<%@ page contentType="text/html;charset=UTF-8" language="java" %>
  9 +<html>
  10 +<head>
  11 + <title>新增收件人信息</title>
  12 + <style>
  13 + label.required:before {
  14 + content:"*";
  15 + color:#EF5F5F;
  16 + }
  17 + label {
  18 + display:inline-block;
  19 + width:100px;
  20 + text-align:right;
  21 + padding-right:4px;
  22 + border-color:green;
  23 + border-style:solid;
  24 + }
  25 + input {
  26 + margin:2px;
  27 + vertical-align:middle;
  28 + border-color:green;
  29 + border-style:solid;
  30 + }
  31 + </style>
  32 + <script type="text/javascript">
  33 + alert(document.getElementById("r").clientWidth);
  34 + </script>
  35 +</head>
  36 +<body>
  37 + <form>
  38 + <div>
  39 + <label id="r" class="required">收件人:</label>
  40 + <input type="text" name="receiver" required="required"
  41 + oninvalid="setCustomValidity('不能为空')" oninput="setCustomValidity('')" />
  42 + </div>
  43 + <div>
  44 + <label class="required">收件地址:</label>
  45 + <input type="text" name="addressHead" required="required"
  46 + oninvalid="setCustomValidity('不能为空')" oninput="setCustomValidity('')" />
  47 + </div>
  48 + <div>
  49 + <label class="required">详细地址:</label>
  50 + <input type="text" name="addressDetail" required="required"
  51 + oninvalid="setCustomValidity('不能为空')" oninput="setCustomValidity('')" />
  52 + </div>
  53 + <div>
  54 + <label class="required">邮编:</label>
  55 + <input type="text" name="postcode" required="required"
  56 + oninvalid="setCustomValidity('不能为空')" oninput="setCustomValidity('')" />
  57 + </div>
  58 + <div>
  59 + <label class="required">手机:</label>
  60 + <input type="text" name="cellphone" required="required"
  61 + oninvalid="setCustomValidity('不能为空')" oninput="setCustomValidity('')" />
  62 + </div>
  63 + <div>
  64 + <label>座机号:</label>
  65 + <input type="text" name="telephone"/>
  66 + </div>
  67 + <div><input type="submit" value="确认" />&nbsp;&nbsp;&nbsp;&nbsp;
  68 + <input type="submit" value="取消"/>
  69 + </div>
  70 + </form>
  71 +</body>
  72 +</html>
... ...
target/classes/com/canrd/patent/dal/dto/HomePatentTypeOutputDto.class
View file @c5a704b
No preview for this file type
target/classes/props/jdbc.properties
  View file @c5a704b
1 1 # \u3010DEV\u3011
2 2 jdbc.canrd.url = jdbc:mysql://127.0.0.1:3306/patent?characterEncoding=utf8
3 3 jdbc.canrd.username = root
4   -jdbc.canrd.password = miao.1201
  4 +jdbc.canrd.password = 123123
5 5 jdbc.canrd.max.conn = 10
6 6 jdbc.canrd.min.conn = 1
7 7 jdbc.canrd.wait.millis = 10000
8 8 \ No newline at end of file
... ...
target/patent.war
View file @c5a704b
No preview for this file type
target/patent/WEB-INF/classes/com/canrd/patent/dal/dto/HomePatentTypeOutputDto.class
View file @c5a704b
No preview for this file type
target/patent/WEB-INF/classes/props/jdbc.properties
  View file @c5a704b
1 1 # \u3010DEV\u3011
2 2 jdbc.canrd.url = jdbc:mysql://127.0.0.1:3306/patent?characterEncoding=utf8
3 3 jdbc.canrd.username = root
4   -jdbc.canrd.password = miao.1201
  4 +jdbc.canrd.password = 123123
5 5 jdbc.canrd.max.conn = 10
6 6 jdbc.canrd.min.conn = 1
7 7 jdbc.canrd.wait.millis = 10000
8 8 \ No newline at end of file
... ...