Commit a0090f51fb6f67e8db8b3d13e385699932098c56
1 parent
bf2c591d
user table CRUD test
Showing
17 changed files
with
1202 additions
and
397 deletions
.git-credentials
0 → 100644
| 1 | +https://litao:12312312@github.com |
.idea/artifacts/patent_war_exploded.xml
| @@ -9,11 +9,12 @@ | @@ -9,11 +9,12 @@ | ||
| 9 | <element id="directory" name="lib"> | 9 | <element id="directory" name="lib"> |
| 10 | <element id="library" level="project" name="Maven: org.springframework:spring-webmvc:4.2.3.RELEASE" /> | 10 | <element id="library" level="project" name="Maven: org.springframework:spring-webmvc:4.2.3.RELEASE" /> |
| 11 | <element id="library" level="project" name="Maven: org.springframework:spring-beans:4.2.3.RELEASE" /> | 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 | <element id="library" level="project" name="Maven: org.springframework:spring-context:4.2.3.RELEASE" /> | 13 | <element id="library" level="project" name="Maven: org.springframework:spring-context:4.2.3.RELEASE" /> |
| 13 | <element id="library" level="project" name="Maven: org.springframework:spring-aop:4.2.3.RELEASE" /> | 14 | <element id="library" level="project" name="Maven: org.springframework:spring-aop:4.2.3.RELEASE" /> |
| 14 | <element id="library" level="project" name="Maven: aopalliance:aopalliance:1.0" /> | 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 | <element id="library" level="project" name="Maven: org.springframework:spring-expression:4.2.3.RELEASE" /> | 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 | <element id="library" level="project" name="Maven: org.springframework:spring-web:4.2.3.RELEASE" /> | 18 | <element id="library" level="project" name="Maven: org.springframework:spring-web:4.2.3.RELEASE" /> |
| 18 | <element id="library" level="project" name="Maven: org.springframework:spring-context-support:4.2.3.RELEASE" /> | 19 | <element id="library" level="project" name="Maven: org.springframework:spring-context-support:4.2.3.RELEASE" /> |
| 19 | <element id="library" level="project" name="Maven: org.springframework:spring-jdbc:4.2.3.RELEASE" /> | 20 | <element id="library" level="project" name="Maven: org.springframework:spring-jdbc:4.2.3.RELEASE" /> |
| @@ -24,12 +25,18 @@ | @@ -24,12 +25,18 @@ | ||
| 24 | <element id="library" level="project" name="Maven: us.codecraft:webmagic-core:0.5.2" /> | 25 | <element id="library" level="project" name="Maven: us.codecraft:webmagic-core:0.5.2" /> |
| 25 | <element id="library" level="project" name="Maven: org.apache.httpcomponents:httpclient:4.3.3" /> | 26 | <element id="library" level="project" name="Maven: org.apache.httpcomponents:httpclient:4.3.3" /> |
| 26 | <element id="library" level="project" name="Maven: org.apache.httpcomponents:httpcore:4.3.2" /> | 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 | <element id="library" level="project" name="Maven: us.codecraft:xsoup:0.2.4" /> | 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 | <element id="library" level="project" name="Maven: org.assertj:assertj-core:1.5.0" /> | 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 | <element id="library" level="project" name="Maven: commons-io:commons-io:1.3.2" /> | 36 | <element id="library" level="project" name="Maven: commons-io:commons-io:1.3.2" /> |
| 31 | <element id="library" level="project" name="Maven: com.jayway.jsonpath:json-path:0.8.1" /> | 37 | <element id="library" level="project" name="Maven: com.jayway.jsonpath:json-path:0.8.1" /> |
| 32 | <element id="library" level="project" name="Maven: net.minidev:json-smart:1.1.1" /> | 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 | <element id="library" level="project" name="Maven: com.alibaba:fastjson:1.2.7" /> | 40 | <element id="library" level="project" name="Maven: com.alibaba:fastjson:1.2.7" /> |
| 34 | <element id="library" level="project" name="Maven: org.seleniumhq.selenium:selenium-java:2.47.1" /> | 41 | <element id="library" level="project" name="Maven: org.seleniumhq.selenium:selenium-java:2.47.1" /> |
| 35 | <element id="library" level="project" name="Maven: org.seleniumhq.selenium:selenium-edge-driver:2.47.1" /> | 42 | <element id="library" level="project" name="Maven: org.seleniumhq.selenium:selenium-edge-driver:2.47.1" /> |
| @@ -38,23 +45,20 @@ | @@ -38,23 +45,20 @@ | ||
| 38 | <element id="library" level="project" name="Maven: com.google.code.gson:gson:2.3.1" /> | 45 | <element id="library" level="project" name="Maven: com.google.code.gson:gson:2.3.1" /> |
| 39 | <element id="library" level="project" name="Maven: org.seleniumhq.selenium:selenium-api:2.47.1" /> | 46 | <element id="library" level="project" name="Maven: org.seleniumhq.selenium:selenium-api:2.47.1" /> |
| 40 | <element id="library" level="project" name="Maven: org.apache.commons:commons-exec:1.3" /> | 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 | <element id="library" level="project" name="Maven: org.seleniumhq.selenium:selenium-firefox-driver:2.47.1" /> | 49 | <element id="library" level="project" name="Maven: org.seleniumhq.selenium:selenium-firefox-driver:2.47.1" /> |
| 42 | <element id="library" level="project" name="Maven: org.seleniumhq.selenium:selenium-support:2.47.1" /> | 50 | <element id="library" level="project" name="Maven: org.seleniumhq.selenium:selenium-support:2.47.1" /> |
| 43 | <element id="library" level="project" name="Maven: org.webbitserver:webbit:0.4.14" /> | 51 | <element id="library" level="project" name="Maven: org.webbitserver:webbit:0.4.14" /> |
| 44 | <element id="library" level="project" name="Maven: io.netty:netty:3.9.8.Final" /> | 52 | <element id="library" level="project" name="Maven: io.netty:netty:3.9.8.Final" /> |
| 45 | <element id="library" level="project" name="Maven: org.seleniumhq.selenium:selenium-leg-rc:2.47.1" /> | 53 | <element id="library" level="project" name="Maven: org.seleniumhq.selenium:selenium-leg-rc:2.47.1" /> |
| 46 | <element id="library" level="project" name="Maven: org.quartz-scheduler:quartz:2.2.1" /> | 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 | <element id="library" level="project" name="Maven: net.java.dev.jna:jna:4.1.0" /> | 55 | <element id="library" level="project" name="Maven: net.java.dev.jna:jna:4.1.0" /> |
| 49 | <element id="library" level="project" name="Maven: com.fasterxml.jackson.core:jackson-databind:2.6.3" /> | 56 | <element id="library" level="project" name="Maven: com.fasterxml.jackson.core:jackson-databind:2.6.3" /> |
| 50 | <element id="library" level="project" name="Maven: com.fasterxml.jackson.core:jackson-annotations:2.6.0" /> | 57 | <element id="library" level="project" name="Maven: com.fasterxml.jackson.core:jackson-annotations:2.6.0" /> |
| 51 | <element id="library" level="project" name="Maven: com.fasterxml.jackson.core:jackson-core:2.6.3" /> | 58 | <element id="library" level="project" name="Maven: com.fasterxml.jackson.core:jackson-core:2.6.3" /> |
| 52 | <element id="library" level="project" name="Maven: org.apache.httpcomponents:fluent-hc:4.5.1" /> | 59 | <element id="library" level="project" name="Maven: org.apache.httpcomponents:fluent-hc:4.5.1" /> |
| 53 | <element id="library" level="project" name="Maven: org.apache.httpcomponents:httpmime:4.5.1" /> | 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 | <element id="library" level="project" name="Maven: joda-time:joda-time:2.9.1" /> | 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 | <element id="library" level="project" name="Maven: org.apache.commons:commons-math3:3.3" /> | 62 | <element id="library" level="project" name="Maven: org.apache.commons:commons-math3:3.3" /> |
| 59 | <element id="library" level="project" name="Maven: org.apache.commons:commons-pool2:2.3" /> | 63 | <element id="library" level="project" name="Maven: org.apache.commons:commons-pool2:2.3" /> |
| 60 | <element id="library" level="project" name="Maven: org.apache.tomcat:tomcat-jdbc:8.0.29" /> | 64 | <element id="library" level="project" name="Maven: org.apache.tomcat:tomcat-jdbc:8.0.29" /> |
| @@ -65,7 +69,6 @@ | @@ -65,7 +69,6 @@ | ||
| 65 | <element id="library" level="project" name="Maven: org.ow2.asm:asm:4.2" /> | 69 | <element id="library" level="project" name="Maven: org.ow2.asm:asm:4.2" /> |
| 66 | <element id="library" level="project" name="Maven: com.esotericsoftware:minlog:1.3.0" /> | 70 | <element id="library" level="project" name="Maven: com.esotericsoftware:minlog:1.3.0" /> |
| 67 | <element id="library" level="project" name="Maven: org.objenesis:objenesis:2.1" /> | 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 | <element id="library" level="project" name="Maven: org.slf4j:jcl-over-slf4j:1.7.13" /> | 72 | <element id="library" level="project" name="Maven: org.slf4j:jcl-over-slf4j:1.7.13" /> |
| 70 | <element id="library" level="project" name="Maven: org.slf4j:log4j-over-slf4j:1.7.13" /> | 73 | <element id="library" level="project" name="Maven: org.slf4j:log4j-over-slf4j:1.7.13" /> |
| 71 | <element id="library" level="project" name="Maven: ch.qos.logback:logback-core:1.1.3" /> | 74 | <element id="library" level="project" name="Maven: ch.qos.logback:logback-core:1.1.3" /> |
| @@ -78,10 +81,7 @@ | @@ -78,10 +81,7 @@ | ||
| 78 | <element id="library" level="project" name="Maven: org.postgresql:postgresql:9.4-1201-jdbc4" /> | 81 | <element id="library" level="project" name="Maven: org.postgresql:postgresql:9.4-1201-jdbc4" /> |
| 79 | <element id="library" level="project" name="Maven: mysql:mysql-connector-java:5.1.34" /> | 82 | <element id="library" level="project" name="Maven: mysql:mysql-connector-java:5.1.34" /> |
| 80 | <element id="library" level="project" name="Maven: org.apache.velocity:velocity:1.7" /> | 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 | <element id="library" level="project" name="Maven: commons-httpclient:commons-httpclient:3.0.1" /> | 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 | <element id="library" level="project" name="Maven: dom4j:dom4j:1.6.1" /> | 85 | <element id="library" level="project" name="Maven: dom4j:dom4j:1.6.1" /> |
| 86 | <element id="library" level="project" name="Maven: xml-apis:xml-apis:1.0.b2" /> | 86 | <element id="library" level="project" name="Maven: xml-apis:xml-apis:1.0.b2" /> |
| 87 | <element id="library" level="project" name="Maven: jaxen:jaxen:1.1-beta" /> | 87 | <element id="library" level="project" name="Maven: jaxen:jaxen:1.1-beta" /> |
.idea/compiler.xml
| @@ -17,7 +17,7 @@ | @@ -17,7 +17,7 @@ | ||
| 17 | <profile default="true" name="Default" enabled="false"> | 17 | <profile default="true" name="Default" enabled="false"> |
| 18 | <processorPath useClasspath="true" /> | 18 | <processorPath useClasspath="true" /> |
| 19 | </profile> | 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 | <sourceOutputDir name="target/generated-sources/annotations" /> | 21 | <sourceOutputDir name="target/generated-sources/annotations" /> |
| 22 | <sourceTestOutputDir name="target/generated-test-sources/test-annotations" /> | 22 | <sourceTestOutputDir name="target/generated-test-sources/test-annotations" /> |
| 23 | <outputRelativeToContentRoot value="true" /> | 23 | <outputRelativeToContentRoot value="true" /> |
.idea/misc.xml
| @@ -26,65 +26,4 @@ | @@ -26,65 +26,4 @@ | ||
| 26 | <component name="ProjectRootManager" version="2" languageLevel="JDK_1_8" default="true" assert-keyword="true" jdk-15="true" project-jdk-name="1.8" project-jdk-type="JavaSDK"> | 26 | <component name="ProjectRootManager" version="2" languageLevel="JDK_1_8" default="true" assert-keyword="true" jdk-15="true" project-jdk-name="1.8" project-jdk-type="JavaSDK"> |
| 27 | <output url="file://$PROJECT_DIR$/out" /> | 27 | <output url="file://$PROJECT_DIR$/out" /> |
| 28 | </component> | 28 | </component> |
| 29 | - <component name="masterDetails"> | ||
| 30 | - <states> | ||
| 31 | - <state key="GlobalLibrariesConfigurable.UI"> | ||
| 32 | - <settings> | ||
| 33 | - <splitter-proportions> | ||
| 34 | - <option name="proportions"> | ||
| 35 | - <list> | ||
| 36 | - <option value="0.2" /> | ||
| 37 | - </list> | ||
| 38 | - </option> | ||
| 39 | - </splitter-proportions> | ||
| 40 | - </settings> | ||
| 41 | - </state> | ||
| 42 | - <state key="JdkListConfigurable.UI"> | ||
| 43 | - <settings> | ||
| 44 | - <last-edited>1.8</last-edited> | ||
| 45 | - <splitter-proportions> | ||
| 46 | - <option name="proportions"> | ||
| 47 | - <list> | ||
| 48 | - <option value="0.2" /> | ||
| 49 | - </list> | ||
| 50 | - </option> | ||
| 51 | - </splitter-proportions> | ||
| 52 | - </settings> | ||
| 53 | - </state> | ||
| 54 | - <state key="ProjectJDKs.UI"> | ||
| 55 | - <settings> | ||
| 56 | - <last-edited>1.8</last-edited> | ||
| 57 | - <splitter-proportions> | ||
| 58 | - <option name="proportions"> | ||
| 59 | - <list> | ||
| 60 | - <option value="0.2" /> | ||
| 61 | - </list> | ||
| 62 | - </option> | ||
| 63 | - </splitter-proportions> | ||
| 64 | - </settings> | ||
| 65 | - </state> | ||
| 66 | - <state key="ProjectLibrariesConfigurable.UI"> | ||
| 67 | - <settings> | ||
| 68 | - <splitter-proportions> | ||
| 69 | - <option name="proportions"> | ||
| 70 | - <list> | ||
| 71 | - <option value="0.2" /> | ||
| 72 | - </list> | ||
| 73 | - </option> | ||
| 74 | - </splitter-proportions> | ||
| 75 | - </settings> | ||
| 76 | - </state> | ||
| 77 | - <state key="ScopeChooserConfigurable.UI"> | ||
| 78 | - <settings> | ||
| 79 | - <splitter-proportions> | ||
| 80 | - <option name="proportions"> | ||
| 81 | - <list> | ||
| 82 | - <option value="0.2" /> | ||
| 83 | - </list> | ||
| 84 | - </option> | ||
| 85 | - </splitter-proportions> | ||
| 86 | - </settings> | ||
| 87 | - </state> | ||
| 88 | - </states> | ||
| 89 | - </component> | ||
| 90 | </project> | 29 | </project> |
| 91 | \ No newline at end of file | 30 | \ No newline at end of file |
.idea/workspace.xml
| @@ -2,7 +2,22 @@ | @@ -2,7 +2,22 @@ | ||
| 2 | <project version="4"> | 2 | <project version="4"> |
| 3 | <component name="ChangeListManager"> | 3 | <component name="ChangeListManager"> |
| 4 | <list default="true" id="a8f74803-c7c3-405c-9584-6ffd161452f6" name="Default" comment=""> | 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$/authorized_keys" /> |
| 6 | + <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/src/main/java/com/canrd/patent/dal/mapper/UserMapper.java" /> | ||
| 7 | + <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/src/main/java/com/canrd/patent/dal/model/UserModel.java" /> | ||
| 8 | + <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/src/main/java/com/canrd/patent/web/UserController.java" /> | ||
| 9 | + <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/src/main/resources/mapper/user.xml" /> | ||
| 10 | + <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" /> | ||
| 11 | + <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" /> | ||
| 12 | + <change type="MODIFICATION" beforePath="$PROJECT_DIR$/.idea/artifacts/patent_war_exploded.xml" afterPath="$PROJECT_DIR$/.idea/artifacts/patent_war_exploded.xml" /> | ||
| 13 | + <change type="MODIFICATION" beforePath="$PROJECT_DIR$/.idea/compiler.xml" afterPath="$PROJECT_DIR$/.idea/compiler.xml" /> | ||
| 14 | + <change type="MODIFICATION" beforePath="$PROJECT_DIR$/.idea/misc.xml" afterPath="$PROJECT_DIR$/.idea/misc.xml" /> | ||
| 15 | + <change type="MODIFICATION" beforePath="$PROJECT_DIR$/.idea/workspace.xml" afterPath="$PROJECT_DIR$/.idea/workspace.xml" /> | ||
| 16 | + <change type="MODIFICATION" beforePath="$PROJECT_DIR$/patent.iml" afterPath="$PROJECT_DIR$/patent.iml" /> | ||
| 17 | + <change type="MODIFICATION" beforePath="$PROJECT_DIR$/src/main/resources.local/props/jdbc.properties" afterPath="$PROJECT_DIR$/src/main/resources.local/props/jdbc.properties" /> | ||
| 18 | + <change type="MODIFICATION" beforePath="$PROJECT_DIR$/src/main/resources.prod/props/jdbc.properties" afterPath="$PROJECT_DIR$/src/main/resources.prod/props/jdbc.properties" /> | ||
| 19 | + <change type="MODIFICATION" beforePath="$PROJECT_DIR$/target/classes/props/jdbc.properties" afterPath="$PROJECT_DIR$/target/classes/props/jdbc.properties" /> | ||
| 20 | + <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 | </list> | 21 | </list> |
| 7 | <ignored path="patent.iws" /> | 22 | <ignored path="patent.iws" /> |
| 8 | <ignored path=".idea/workspace.xml" /> | 23 | <ignored path=".idea/workspace.xml" /> |
| @@ -24,63 +39,171 @@ | @@ -24,63 +39,171 @@ | ||
| 24 | <favorites_list name="patent" /> | 39 | <favorites_list name="patent" /> |
| 25 | </component> | 40 | </component> |
| 26 | <component name="FileEditorManager"> | 41 | <component name="FileEditorManager"> |
| 27 | - <leaf> | 42 | + <leaf SIDE_TABS_SIZE_LIMIT_KEY="300"> |
| 28 | <file leaf-file-name="HelloController.java" pinned="false" current-in-tab="false"> | 43 | <file leaf-file-name="HelloController.java" pinned="false" current-in-tab="false"> |
| 29 | <entry file="file://$PROJECT_DIR$/src/main/java/com/canrd/patent/web/HelloController.java"> | 44 | <entry file="file://$PROJECT_DIR$/src/main/java/com/canrd/patent/web/HelloController.java"> |
| 30 | <provider selected="true" editor-type-id="text-editor"> | 45 | <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" /> | ||
| 33 | - <folding /> | 46 | + <state relative-caret-position="-15"> |
| 47 | + <caret line="58" column="93" selection-start-line="58" selection-start-column="87" selection-end-line="58" selection-end-column="93" /> | ||
| 48 | + <folding> | ||
| 49 | + <element signature="imports" expanded="true" /> | ||
| 50 | + <element signature="e#1779#1780#0" expanded="true" /> | ||
| 51 | + <element signature="e#1814#1815#0" expanded="true" /> | ||
| 52 | + </folding> | ||
| 34 | </state> | 53 | </state> |
| 35 | </provider> | 54 | </provider> |
| 36 | </entry> | 55 | </entry> |
| 37 | </file> | 56 | </file> |
| 38 | - <file leaf-file-name="ddl.sql" pinned="false" current-in-tab="false"> | ||
| 39 | - <entry file="file://$PROJECT_DIR$/doc/sql/ddl.sql"> | 57 | + <file leaf-file-name="UserController.java" pinned="false" current-in-tab="false"> |
| 58 | + <entry file="file://$PROJECT_DIR$/src/main/java/com/canrd/patent/web/UserController.java"> | ||
| 40 | <provider selected="true" editor-type-id="text-editor"> | 59 | <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" /> | ||
| 43 | - <folding /> | 60 | + <state relative-caret-position="348"> |
| 61 | + <caret line="77" column="26" selection-start-line="77" selection-start-column="26" selection-end-line="77" selection-end-column="26" /> | ||
| 62 | + <folding> | ||
| 63 | + <element signature="imports" expanded="true" /> | ||
| 64 | + <element signature="e#1724#1725#0" expanded="true" /> | ||
| 65 | + <element signature="e#1759#1760#0" expanded="true" /> | ||
| 66 | + </folding> | ||
| 44 | </state> | 67 | </state> |
| 45 | </provider> | 68 | </provider> |
| 46 | </entry> | 69 | </entry> |
| 47 | </file> | 70 | </file> |
| 48 | - <file leaf-file-name="Untitled.sql" pinned="false" current-in-tab="false"> | ||
| 49 | - <entry file="file://$PROJECT_DIR$/doc/sql/Untitled.sql"> | 71 | + <file leaf-file-name="test.xml" pinned="false" current-in-tab="false"> |
| 72 | + <entry file="file://$PROJECT_DIR$/src/main/resources/mapper/test.xml"> | ||
| 50 | <provider selected="true" editor-type-id="text-editor"> | 73 | <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" /> | ||
| 53 | - <folding /> | 74 | + <state relative-caret-position="75"> |
| 75 | + <caret line="5" column="16" selection-start-line="5" selection-start-column="16" selection-end-line="5" selection-end-column="16" /> | ||
| 76 | + <folding> | ||
| 77 | + <marker date="1469608321062" expanded="true" signature="264:294" ph="SELECT id, n... test" /> | ||
| 78 | + <marker date="1469608321062" expanded="true" signature="646:677" ph="delete from " /> | ||
| 79 | + <marker date="1469608321062" expanded="true" signature="781:843" ph="update test " /> | ||
| 80 | + </folding> | ||
| 54 | </state> | 81 | </state> |
| 55 | </provider> | 82 | </provider> |
| 56 | </entry> | 83 | </entry> |
| 57 | </file> | 84 | </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"> | 85 | + <file leaf-file-name="UserMapper.java" pinned="false" current-in-tab="false"> |
| 86 | + <entry file="file://$PROJECT_DIR$/src/main/java/com/canrd/patent/dal/mapper/UserMapper.java"> | ||
| 60 | <provider selected="true" editor-type-id="text-editor"> | 87 | <provider selected="true" editor-type-id="text-editor"> |
| 61 | - <state vertical-scroll-proportion="0.0"> | 88 | + <state relative-caret-position="195"> |
| 89 | + <caret line="13" column="15" selection-start-line="13" selection-start-column="9" selection-end-line="13" selection-end-column="15" /> | ||
| 90 | + <folding> | ||
| 91 | + <element signature="imports" expanded="true" /> | ||
| 92 | + </folding> | ||
| 93 | + </state> | ||
| 94 | + </provider> | ||
| 95 | + </entry> | ||
| 96 | + </file> | ||
| 97 | + <file leaf-file-name="user.xml" pinned="false" current-in-tab="true"> | ||
| 98 | + <entry file="file://$PROJECT_DIR$/src/main/resources/mapper/user.xml"> | ||
| 99 | + <provider selected="true" editor-type-id="text-editor"> | ||
| 100 | + <state relative-caret-position="180"> | ||
| 101 | + <caret line="12" column="32" selection-start-line="12" selection-start-column="32" selection-end-line="12" selection-end-column="32" /> | ||
| 102 | + <folding> | ||
| 103 | + <marker date="1469621367307" expanded="true" signature="264:290" ph="SELECT id, n... user" /> | ||
| 104 | + <marker date="1469621367307" expanded="true" signature="656:687" ph="delete from " /> | ||
| 105 | + <marker date="1469621367307" expanded="true" signature="789:851" ph="update user " /> | ||
| 106 | + </folding> | ||
| 107 | + </state> | ||
| 108 | + </provider> | ||
| 109 | + </entry> | ||
| 110 | + </file> | ||
| 111 | + <file leaf-file-name="CasementMapper.xml" pinned="false" current-in-tab="false"> | ||
| 112 | + <entry file="file://$PROJECT_DIR$/src/main/resources/mapper/CasementMapper.xml"> | ||
| 113 | + <provider selected="true" editor-type-id="text-editor"> | ||
| 114 | + <state relative-caret-position="0"> | ||
| 62 | <caret line="0" column="0" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="0" /> | 115 | <caret line="0" column="0" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="0" /> |
| 63 | - <folding /> | 116 | + <folding> |
| 117 | + <marker date="1469608321062" expanded="true" signature="4936:5039" ph="select from casement" /> | ||
| 118 | + <marker date="1469608321062" expanded="true" signature="5252:5309" ph="delete from " /> | ||
| 119 | + <marker date="1469608321062" expanded="true" signature="5547:5567" ph="delete from " /> | ||
| 120 | + <marker date="1469608321062" expanded="true" signature="8994:9023" ph="select count... casement" /> | ||
| 121 | + <marker date="1469608321062" expanded="true" signature="10985:11656" ph="update casem... " /> | ||
| 122 | + <marker date="1469608321062" expanded="true" signature="12001:13154" ph="update casem... " /> | ||
| 123 | + <marker date="1469608321062" expanded="true" signature="13388:13978" ph="update casem... " /> | ||
| 124 | + </folding> | ||
| 64 | </state> | 125 | </state> |
| 65 | </provider> | 126 | </provider> |
| 66 | </entry> | 127 | </entry> |
| 67 | </file> | 128 | </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"> | 129 | + <file leaf-file-name="OrderMapper.xml" pinned="false" current-in-tab="false"> |
| 130 | + <entry file="file://$PROJECT_DIR$/src/main/resources/mapper/OrderMapper.xml"> | ||
| 70 | <provider selected="true" editor-type-id="text-editor"> | 131 | <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 /> | 132 | + <state relative-caret-position="-3150"> |
| 133 | + <caret line="0" column="0" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="0" /> | ||
| 134 | + <folding> | ||
| 135 | + <marker date="1469608321062" expanded="true" signature="5063:5164" ph="select from orders" /> | ||
| 136 | + <marker date="1469608321062" expanded="true" signature="5377:5432" ph="delete from " /> | ||
| 137 | + <marker date="1469608321062" expanded="true" signature="5667:5685" ph="delete from " /> | ||
| 138 | + <marker date="1469608321062" expanded="true" signature="9443:9470" ph="select count... orders" /> | ||
| 139 | + <marker date="1469608321062" expanded="true" signature="11625:12383" ph="update order... " /> | ||
| 140 | + <marker date="1469608321062" expanded="true" signature="12725:14043" ph="update order... " /> | ||
| 141 | + <marker date="1469608321062" expanded="true" signature="14274:14937" ph="update order... " /> | ||
| 142 | + </folding> | ||
| 74 | </state> | 143 | </state> |
| 75 | </provider> | 144 | </provider> |
| 76 | </entry> | 145 | </entry> |
| 77 | </file> | 146 | </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"> | 147 | + <file leaf-file-name="MybatisTestMapper.xml" pinned="false" current-in-tab="false"> |
| 148 | + <entry file="file://$PROJECT_DIR$/src/main/resources/mapper/MybatisTestMapper.xml"> | ||
| 80 | <provider selected="true" editor-type-id="text-editor"> | 149 | <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" /> | ||
| 83 | - <folding /> | 150 | + <state relative-caret-position="499"> |
| 151 | + <caret line="234" column="39" selection-start-line="234" selection-start-column="39" selection-end-line="234" selection-end-column="39" /> | ||
| 152 | + <folding> | ||
| 153 | + <marker date="1469608321062" expanded="true" signature="4146:4253" ph="select from mybatis_test" /> | ||
| 154 | + <marker date="1469608321062" expanded="true" signature="4466:4527" ph="delete from " /> | ||
| 155 | + <marker date="1469608321062" expanded="true" signature="4768:4792" ph="delete from " /> | ||
| 156 | + <marker date="1469608321062" expanded="true" signature="6382:6415" ph="select count... mybatis_test" /> | ||
| 157 | + <marker date="1469608321062" expanded="true" signature="7340:7491" ph="update mybat... " /> | ||
| 158 | + <marker date="1469608321062" expanded="true" signature="7839:8081" ph="update mybat... " /> | ||
| 159 | + <marker date="1469608321062" expanded="true" signature="8318:8451" ph="update mybat... " /> | ||
| 160 | + </folding> | ||
| 161 | + </state> | ||
| 162 | + </provider> | ||
| 163 | + </entry> | ||
| 164 | + </file> | ||
| 165 | + <file leaf-file-name="UserModel.java" pinned="false" current-in-tab="false"> | ||
| 166 | + <entry file="file://$PROJECT_DIR$/src/main/java/com/canrd/patent/dal/model/UserModel.java"> | ||
| 167 | + <provider selected="true" editor-type-id="text-editor"> | ||
| 168 | + <state relative-caret-position="285"> | ||
| 169 | + <caret line="19" column="30" selection-start-line="19" selection-start-column="30" selection-end-line="19" selection-end-column="30" /> | ||
| 170 | + <folding> | ||
| 171 | + <element signature="e#450#451#0" expanded="true" /> | ||
| 172 | + <element signature="e#596#597#0" expanded="true" /> | ||
| 173 | + <element signature="e#621#622#0" expanded="true" /> | ||
| 174 | + <element signature="e#654#655#0" expanded="true" /> | ||
| 175 | + <element signature="e#682#683#0" expanded="true" /> | ||
| 176 | + <element signature="e#713#714#0" expanded="true" /> | ||
| 177 | + <element signature="e#740#741#0" expanded="true" /> | ||
| 178 | + <element signature="e#780#781#0" expanded="true" /> | ||
| 179 | + <element signature="e#812#813#0" expanded="true" /> | ||
| 180 | + <element signature="e#847#848#0" expanded="true" /> | ||
| 181 | + <element signature="e#878#879#0" expanded="true" /> | ||
| 182 | + <element signature="e#926#927#0" expanded="true" /> | ||
| 183 | + <element signature="e#966#967#0" expanded="true" /> | ||
| 184 | + <element signature="e#1013#1014#0" expanded="true" /> | ||
| 185 | + <element signature="e#1056#1057#0" expanded="true" /> | ||
| 186 | + <element signature="e#1224#1225#0" expanded="true" /> | ||
| 187 | + <element signature="e#1252#1253#0" expanded="true" /> | ||
| 188 | + <element signature="e#1294#1295#0" expanded="true" /> | ||
| 189 | + <element signature="e#1328#1329#0" expanded="true" /> | ||
| 190 | + <element signature="e#1365#1366#0" expanded="true" /> | ||
| 191 | + <element signature="e#1398#1399#0" expanded="true" /> | ||
| 192 | + <element signature="e#1450#1451#0" expanded="true" /> | ||
| 193 | + <element signature="e#1494#1495#0" expanded="true" /> | ||
| 194 | + <element signature="e#1530#1531#0" expanded="true" /> | ||
| 195 | + <element signature="e#1562#1563#0" expanded="true" /> | ||
| 196 | + <element signature="e#1612#1613#0" expanded="true" /> | ||
| 197 | + <element signature="e#1654#1655#0" expanded="true" /> | ||
| 198 | + <element signature="e#1691#1692#0" expanded="true" /> | ||
| 199 | + <element signature="e#1724#1725#0" expanded="true" /> | ||
| 200 | + <element signature="e#1776#1777#0" expanded="true" /> | ||
| 201 | + <element signature="e#1820#1821#0" expanded="true" /> | ||
| 202 | + <element signature="e#1851#1852#0" expanded="true" /> | ||
| 203 | + <element signature="e#1878#1879#0" expanded="true" /> | ||
| 204 | + <element signature="e#1918#1919#0" expanded="true" /> | ||
| 205 | + <element signature="e#1950#1951#0" expanded="true" /> | ||
| 206 | + </folding> | ||
| 84 | </state> | 207 | </state> |
| 85 | </provider> | 208 | </provider> |
| 86 | </entry> | 209 | </entry> |
| @@ -93,8 +216,9 @@ | @@ -93,8 +216,9 @@ | ||
| 93 | <option value="jsf" /> | 216 | <option value="jsf" /> |
| 94 | <option value="Jsp File" /> | 217 | <option value="Jsp File" /> |
| 95 | <option value="Enum" /> | 218 | <option value="Enum" /> |
| 96 | - <option value="Class" /> | ||
| 97 | <option value="CSS File" /> | 219 | <option value="CSS File" /> |
| 220 | + <option value="Interface" /> | ||
| 221 | + <option value="Class" /> | ||
| 98 | </list> | 222 | </list> |
| 99 | </option> | 223 | </option> |
| 100 | </component> | 224 | </component> |
| @@ -109,12 +233,6 @@ | @@ -109,12 +233,6 @@ | ||
| 109 | <component name="IdeDocumentHistory"> | 233 | <component name="IdeDocumentHistory"> |
| 110 | <option name="CHANGED_PATHS"> | 234 | <option name="CHANGED_PATHS"> |
| 111 | <list> | 235 | <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 | - <option value="$PROJECT_DIR$/src/main/java/com/canrd/patent/dal/enums/PaidTypeEnum.java" /> | ||
| 116 | - <option value="$PROJECT_DIR$/src/main/java/com/canrd/patent/dal/dto/HomePatentTypeOutputDto.java" /> | ||
| 117 | - <option value="$PROJECT_DIR$/src/main/java/com/canrd/patent/common/utils/TextUtils.java" /> | ||
| 118 | <option value="$PROJECT_DIR$/src/main/java/com/canrd/patent/dal/model/CasementExample.java" /> | 236 | <option value="$PROJECT_DIR$/src/main/java/com/canrd/patent/dal/model/CasementExample.java" /> |
| 119 | <option value="$PROJECT_DIR$/src/main/java/com/canrd/patent/dal/enums/CaseStatusEnum.java" /> | 237 | <option value="$PROJECT_DIR$/src/main/java/com/canrd/patent/dal/enums/CaseStatusEnum.java" /> |
| 120 | <option value="$PROJECT_DIR$/src/main/java/com/canrd/patent/dal/enums/ReduceTypeEnum.java" /> | 238 | <option value="$PROJECT_DIR$/src/main/java/com/canrd/patent/dal/enums/ReduceTypeEnum.java" /> |
| @@ -160,12 +278,20 @@ | @@ -160,12 +278,20 @@ | ||
| 160 | <option value="$PROJECT_DIR$/src/main/webapp/css/case-manage.css" /> | 278 | <option value="$PROJECT_DIR$/src/main/webapp/css/case-manage.css" /> |
| 161 | <option value="$PROJECT_DIR$/doc/sql/ddl.sql" /> | 279 | <option value="$PROJECT_DIR$/doc/sql/ddl.sql" /> |
| 162 | <option value="$PROJECT_DIR$/src/main/webapp/index.jsp" /> | 280 | <option value="$PROJECT_DIR$/src/main/webapp/index.jsp" /> |
| 281 | + <option value="$PROJECT_DIR$/src/main/resources.local/props/jdbc.properties" /> | ||
| 282 | + <option value="$PROJECT_DIR$/src/main/resources.prod/props/jdbc.properties" /> | ||
| 283 | + <option value="$PROJECT_DIR$/src/main/java/com/canrd/patent/dal/model/UserModel.java" /> | ||
| 284 | + <option value="$PROJECT_DIR$/src/main/java/com/canrd/patent/dal/mapper/UserMapper.java" /> | ||
| 285 | + <option value="$PROJECT_DIR$/src/main/resources/mapper/user.xml" /> | ||
| 286 | + <option value="$PROJECT_DIR$/src/main/java/com/canrd/patent/web/UserController.java" /> | ||
| 163 | </list> | 287 | </list> |
| 164 | </option> | 288 | </option> |
| 165 | </component> | 289 | </component> |
| 166 | - <component name="JsBuildToolGruntFileManager" detection-done="true" /> | 290 | + <component name="JsBuildToolGruntFileManager" detection-done="true" sorting="DEFINITION_ORDER" /> |
| 291 | + <component name="JsBuildToolPackageJson" detection-done="true" sorting="DEFINITION_ORDER" /> | ||
| 167 | <component name="JsGulpfileManager"> | 292 | <component name="JsGulpfileManager"> |
| 168 | <detection-done>true</detection-done> | 293 | <detection-done>true</detection-done> |
| 294 | + <sorting>DEFINITION_ORDER</sorting> | ||
| 169 | </component> | 295 | </component> |
| 170 | <component name="LogFilters"> | 296 | <component name="LogFilters"> |
| 171 | <option name="FILTER_ERRORS" value="false" /> | 297 | <option name="FILTER_ERRORS" value="false" /> |
| @@ -177,9 +303,16 @@ | @@ -177,9 +303,16 @@ | ||
| 177 | <component name="MavenImportPreferences"> | 303 | <component name="MavenImportPreferences"> |
| 178 | <option name="generalSettings"> | 304 | <option name="generalSettings"> |
| 179 | <MavenGeneralSettings> | 305 | <MavenGeneralSettings> |
| 180 | - <option name="mavenHome" value="$USER_HOME$/install/apache-maven-3.2.5" /> | 306 | + <option name="localRepository" value="$MAVEN_REPOSITORY$" /> |
| 307 | + <option name="mavenHome" value="/usr/share/maven" /> | ||
| 308 | + <option name="userSettingsFile" value="$MAVEN_REPOSITORY$/settings.xml" /> | ||
| 181 | </MavenGeneralSettings> | 309 | </MavenGeneralSettings> |
| 182 | </option> | 310 | </option> |
| 311 | + <option name="importingSettings"> | ||
| 312 | + <MavenImportingSettings> | ||
| 313 | + <option name="importAutomatically" value="true" /> | ||
| 314 | + </MavenImportingSettings> | ||
| 315 | + </option> | ||
| 183 | <option name="disabledProfiles"> | 316 | <option name="disabledProfiles"> |
| 184 | <list> | 317 | <list> |
| 185 | <option value="dev" /> | 318 | <option value="dev" /> |
| @@ -238,14 +371,11 @@ | @@ -238,14 +371,11 @@ | ||
| 238 | </PATH> | 371 | </PATH> |
| 239 | </treeState> | 372 | </treeState> |
| 240 | </component> | 373 | </component> |
| 241 | - <component name="NamedScopeManager"> | ||
| 242 | - <order /> | ||
| 243 | - </component> | ||
| 244 | <component name="ProjectFrameBounds"> | 374 | <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" /> | 375 | + <option name="x" value="1049" /> |
| 376 | + <option name="y" value="107" /> | ||
| 377 | + <option name="width" value="944" /> | ||
| 378 | + <option name="height" value="851" /> | ||
| 249 | </component> | 379 | </component> |
| 250 | <component name="ProjectLevelVcsManager" settingsEditedManually="false"> | 380 | <component name="ProjectLevelVcsManager" settingsEditedManually="false"> |
| 251 | <OptionsSetting value="true" id="Add" /> | 381 | <OptionsSetting value="true" id="Add" /> |
| @@ -268,9 +398,10 @@ | @@ -268,9 +398,10 @@ | ||
| 268 | <autoscrollToSource /> | 398 | <autoscrollToSource /> |
| 269 | <autoscrollFromSource /> | 399 | <autoscrollFromSource /> |
| 270 | <sortByType /> | 400 | <sortByType /> |
| 401 | + <manualOrder /> | ||
| 402 | + <foldersAlwaysOnTop value="true" /> | ||
| 271 | </navigator> | 403 | </navigator> |
| 272 | <panes> | 404 | <panes> |
| 273 | - <pane id="Scratches" /> | ||
| 274 | <pane id="Scope" /> | 405 | <pane id="Scope" /> |
| 275 | <pane id="ProjectPane"> | 406 | <pane id="ProjectPane"> |
| 276 | <subPane> | 407 | <subPane> |
| @@ -303,6 +434,36 @@ | @@ -303,6 +434,36 @@ | ||
| 303 | <option name="myItemId" value="src" /> | 434 | <option name="myItemId" value="src" /> |
| 304 | <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" /> | 435 | <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" /> |
| 305 | </PATH_ELEMENT> | 436 | </PATH_ELEMENT> |
| 437 | + <PATH_ELEMENT> | ||
| 438 | + <option name="myItemId" value="test" /> | ||
| 439 | + <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" /> | ||
| 440 | + </PATH_ELEMENT> | ||
| 441 | + </PATH> | ||
| 442 | + <PATH> | ||
| 443 | + <PATH_ELEMENT> | ||
| 444 | + <option name="myItemId" value="patent" /> | ||
| 445 | + <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewProjectNode" /> | ||
| 446 | + </PATH_ELEMENT> | ||
| 447 | + <PATH_ELEMENT> | ||
| 448 | + <option name="myItemId" value="canrd-patent" /> | ||
| 449 | + <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" /> | ||
| 450 | + </PATH_ELEMENT> | ||
| 451 | + <PATH_ELEMENT> | ||
| 452 | + <option name="myItemId" value="src" /> | ||
| 453 | + <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" /> | ||
| 454 | + </PATH_ELEMENT> | ||
| 455 | + <PATH_ELEMENT> | ||
| 456 | + <option name="myItemId" value="test" /> | ||
| 457 | + <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" /> | ||
| 458 | + </PATH_ELEMENT> | ||
| 459 | + <PATH_ELEMENT> | ||
| 460 | + <option name="myItemId" value="java" /> | ||
| 461 | + <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" /> | ||
| 462 | + </PATH_ELEMENT> | ||
| 463 | + <PATH_ELEMENT> | ||
| 464 | + <option name="myItemId" value="patent" /> | ||
| 465 | + <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" /> | ||
| 466 | + </PATH_ELEMENT> | ||
| 306 | </PATH> | 467 | </PATH> |
| 307 | <PATH> | 468 | <PATH> |
| 308 | <PATH_ELEMENT> | 469 | <PATH_ELEMENT> |
| @@ -343,12 +504,26 @@ | @@ -343,12 +504,26 @@ | ||
| 343 | <option name="myItemId" value="main" /> | 504 | <option name="myItemId" value="main" /> |
| 344 | <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" /> | 505 | <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" /> |
| 345 | </PATH_ELEMENT> | 506 | </PATH_ELEMENT> |
| 507 | + </PATH> | ||
| 508 | + <PATH> | ||
| 346 | <PATH_ELEMENT> | 509 | <PATH_ELEMENT> |
| 347 | - <option name="myItemId" value="webapp" /> | 510 | + <option name="myItemId" value="patent" /> |
| 511 | + <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewProjectNode" /> | ||
| 512 | + </PATH_ELEMENT> | ||
| 513 | + <PATH_ELEMENT> | ||
| 514 | + <option name="myItemId" value="canrd-patent" /> | ||
| 515 | + <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" /> | ||
| 516 | + </PATH_ELEMENT> | ||
| 517 | + <PATH_ELEMENT> | ||
| 518 | + <option name="myItemId" value="src" /> | ||
| 519 | + <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" /> | ||
| 520 | + </PATH_ELEMENT> | ||
| 521 | + <PATH_ELEMENT> | ||
| 522 | + <option name="myItemId" value="main" /> | ||
| 348 | <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" /> | 523 | <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" /> |
| 349 | </PATH_ELEMENT> | 524 | </PATH_ELEMENT> |
| 350 | <PATH_ELEMENT> | 525 | <PATH_ELEMENT> |
| 351 | - <option name="myItemId" value="css" /> | 526 | + <option name="myItemId" value="resources" /> |
| 352 | <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" /> | 527 | <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" /> |
| 353 | </PATH_ELEMENT> | 528 | </PATH_ELEMENT> |
| 354 | </PATH> | 529 | </PATH> |
| @@ -369,6 +544,14 @@ | @@ -369,6 +544,14 @@ | ||
| 369 | <option name="myItemId" value="main" /> | 544 | <option name="myItemId" value="main" /> |
| 370 | <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" /> | 545 | <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" /> |
| 371 | </PATH_ELEMENT> | 546 | </PATH_ELEMENT> |
| 547 | + <PATH_ELEMENT> | ||
| 548 | + <option name="myItemId" value="resources" /> | ||
| 549 | + <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" /> | ||
| 550 | + </PATH_ELEMENT> | ||
| 551 | + <PATH_ELEMENT> | ||
| 552 | + <option name="myItemId" value="mapper" /> | ||
| 553 | + <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" /> | ||
| 554 | + </PATH_ELEMENT> | ||
| 372 | </PATH> | 555 | </PATH> |
| 373 | <PATH> | 556 | <PATH> |
| 374 | <PATH_ELEMENT> | 557 | <PATH_ELEMENT> |
| @@ -388,7 +571,15 @@ | @@ -388,7 +571,15 @@ | ||
| 388 | <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" /> | 571 | <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" /> |
| 389 | </PATH_ELEMENT> | 572 | </PATH_ELEMENT> |
| 390 | <PATH_ELEMENT> | 573 | <PATH_ELEMENT> |
| 391 | - <option name="myItemId" value="resources.local" /> | 574 | + <option name="myItemId" value="java" /> |
| 575 | + <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" /> | ||
| 576 | + </PATH_ELEMENT> | ||
| 577 | + <PATH_ELEMENT> | ||
| 578 | + <option name="myItemId" value="patent" /> | ||
| 579 | + <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" /> | ||
| 580 | + </PATH_ELEMENT> | ||
| 581 | + <PATH_ELEMENT> | ||
| 582 | + <option name="myItemId" value="web" /> | ||
| 392 | <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" /> | 583 | <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" /> |
| 393 | </PATH_ELEMENT> | 584 | </PATH_ELEMENT> |
| 394 | </PATH> | 585 | </PATH> |
| @@ -410,7 +601,11 @@ | @@ -410,7 +601,11 @@ | ||
| 410 | <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" /> | 601 | <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" /> |
| 411 | </PATH_ELEMENT> | 602 | </PATH_ELEMENT> |
| 412 | <PATH_ELEMENT> | 603 | <PATH_ELEMENT> |
| 413 | - <option name="myItemId" value="resources.dev" /> | 604 | + <option name="myItemId" value="java" /> |
| 605 | + <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" /> | ||
| 606 | + </PATH_ELEMENT> | ||
| 607 | + <PATH_ELEMENT> | ||
| 608 | + <option name="myItemId" value="patent" /> | ||
| 414 | <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" /> | 609 | <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" /> |
| 415 | </PATH_ELEMENT> | 610 | </PATH_ELEMENT> |
| 416 | </PATH> | 611 | </PATH> |
| @@ -424,7 +619,23 @@ | @@ -424,7 +619,23 @@ | ||
| 424 | <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" /> | 619 | <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" /> |
| 425 | </PATH_ELEMENT> | 620 | </PATH_ELEMENT> |
| 426 | <PATH_ELEMENT> | 621 | <PATH_ELEMENT> |
| 427 | - <option name="myItemId" value="doc" /> | 622 | + <option name="myItemId" value="src" /> |
| 623 | + <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" /> | ||
| 624 | + </PATH_ELEMENT> | ||
| 625 | + <PATH_ELEMENT> | ||
| 626 | + <option name="myItemId" value="main" /> | ||
| 627 | + <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" /> | ||
| 628 | + </PATH_ELEMENT> | ||
| 629 | + <PATH_ELEMENT> | ||
| 630 | + <option name="myItemId" value="java" /> | ||
| 631 | + <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" /> | ||
| 632 | + </PATH_ELEMENT> | ||
| 633 | + <PATH_ELEMENT> | ||
| 634 | + <option name="myItemId" value="patent" /> | ||
| 635 | + <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" /> | ||
| 636 | + </PATH_ELEMENT> | ||
| 637 | + <PATH_ELEMENT> | ||
| 638 | + <option name="myItemId" value="dal" /> | ||
| 428 | <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" /> | 639 | <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" /> |
| 429 | </PATH_ELEMENT> | 640 | </PATH_ELEMENT> |
| 430 | </PATH> | 641 | </PATH> |
| @@ -438,29 +649,45 @@ | @@ -438,29 +649,45 @@ | ||
| 438 | <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" /> | 649 | <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" /> |
| 439 | </PATH_ELEMENT> | 650 | </PATH_ELEMENT> |
| 440 | <PATH_ELEMENT> | 651 | <PATH_ELEMENT> |
| 441 | - <option name="myItemId" value="doc" /> | 652 | + <option name="myItemId" value="src" /> |
| 653 | + <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" /> | ||
| 654 | + </PATH_ELEMENT> | ||
| 655 | + <PATH_ELEMENT> | ||
| 656 | + <option name="myItemId" value="main" /> | ||
| 442 | <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" /> | 657 | <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" /> |
| 443 | </PATH_ELEMENT> | 658 | </PATH_ELEMENT> |
| 444 | <PATH_ELEMENT> | 659 | <PATH_ELEMENT> |
| 445 | - <option name="myItemId" value="sql" /> | 660 | + <option name="myItemId" value="java" /> |
| 661 | + <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" /> | ||
| 662 | + </PATH_ELEMENT> | ||
| 663 | + <PATH_ELEMENT> | ||
| 664 | + <option name="myItemId" value="patent" /> | ||
| 665 | + <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" /> | ||
| 666 | + </PATH_ELEMENT> | ||
| 667 | + <PATH_ELEMENT> | ||
| 668 | + <option name="myItemId" value="dal" /> | ||
| 669 | + <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" /> | ||
| 670 | + </PATH_ELEMENT> | ||
| 671 | + <PATH_ELEMENT> | ||
| 672 | + <option name="myItemId" value="mapper" /> | ||
| 446 | <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" /> | 673 | <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" /> |
| 447 | </PATH_ELEMENT> | 674 | </PATH_ELEMENT> |
| 448 | </PATH> | 675 | </PATH> |
| 449 | </subPane> | 676 | </subPane> |
| 450 | </pane> | 677 | </pane> |
| 678 | + <pane id="Scratches" /> | ||
| 451 | <pane id="PackagesPane" /> | 679 | <pane id="PackagesPane" /> |
| 452 | </panes> | 680 | </panes> |
| 453 | </component> | 681 | </component> |
| 454 | <component name="PropertiesComponent"> | 682 | <component name="PropertiesComponent"> |
| 455 | <property name="settings.editor.selected.configurable" value="vcs.Git" /> | 683 | <property name="settings.editor.selected.configurable" value="vcs.Git" /> |
| 456 | <property name="settings.editor.splitter.proportion" value="0.2" /> | 684 | <property name="settings.editor.splitter.proportion" value="0.2" /> |
| 457 | - <property name="project.structure.last.edited" value="Project" /> | ||
| 458 | - <property name="project.structure.proportion" value="0.0" /> | ||
| 459 | - <property name="project.structure.side.proportion" value="0.0" /> | 685 | + <property name="project.structure.last.edited" value="Modules" /> |
| 686 | + <property name="project.structure.proportion" value="0.15" /> | ||
| 687 | + <property name="project.structure.side.proportion" value="0.2" /> | ||
| 460 | <property name="aspect.path.notification.shown" value="true" /> | 688 | <property name="aspect.path.notification.shown" value="true" /> |
| 461 | <property name="WebServerToolWindowFactoryState" value="false" /> | 689 | <property name="WebServerToolWindowFactoryState" value="false" /> |
| 462 | <property name="recentsLimit" value="5" /> | 690 | <property name="recentsLimit" value="5" /> |
| 463 | - <property name="restartRequiresConfirmation" value="true" /> | ||
| 464 | <property name="FullScreen" value="false" /> | 691 | <property name="FullScreen" value="false" /> |
| 465 | <property name="list.type.of.created.stylesheet" value="CSS" /> | 692 | <property name="list.type.of.created.stylesheet" value="CSS" /> |
| 466 | <property name="dynamic.classpath" value="false" /> | 693 | <property name="dynamic.classpath" value="false" /> |
| @@ -564,22 +791,21 @@ | @@ -564,22 +791,21 @@ | ||
| 564 | </configuration> | 791 | </configuration> |
| 565 | <configuration default="true" type="AndroidRunConfigurationType" factoryName="Android Application"> | 792 | <configuration default="true" type="AndroidRunConfigurationType" factoryName="Android Application"> |
| 566 | <module name="" /> | 793 | <module name="" /> |
| 567 | - <option name="ACTIVITY_CLASS" value="" /> | ||
| 568 | - <option name="MODE" value="default_activity" /> | ||
| 569 | <option name="DEPLOY" value="true" /> | 794 | <option name="DEPLOY" value="true" /> |
| 570 | <option name="ARTIFACT_NAME" value="" /> | 795 | <option name="ARTIFACT_NAME" value="" /> |
| 796 | + <option name="PM_INSTALL_OPTIONS" value="" /> | ||
| 797 | + <option name="ACTIVITY_EXTRA_FLAGS" value="" /> | ||
| 798 | + <option name="MODE" value="default_activity" /> | ||
| 571 | <option name="TARGET_SELECTION_MODE" value="EMULATOR" /> | 799 | <option name="TARGET_SELECTION_MODE" value="EMULATOR" /> |
| 572 | - <option name="USE_LAST_SELECTED_DEVICE" value="false" /> | ||
| 573 | <option name="PREFERRED_AVD" value="" /> | 800 | <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 | <option name="CLEAR_LOGCAT" value="false" /> | 801 | <option name="CLEAR_LOGCAT" value="false" /> |
| 581 | <option name="SHOW_LOGCAT_AUTOMATICALLY" value="true" /> | 802 | <option name="SHOW_LOGCAT_AUTOMATICALLY" value="true" /> |
| 582 | - <option name="FILTER_LOGCAT_AUTOMATICALLY" value="true" /> | 803 | + <option name="SKIP_NOOP_APK_INSTALLATIONS" value="true" /> |
| 804 | + <option name="FORCE_STOP_RUNNING_APP" value="true" /> | ||
| 805 | + <option name="USE_LAST_SELECTED_DEVICE" value="false" /> | ||
| 806 | + <option name="PREFERRED_AVD" value="" /> | ||
| 807 | + <option name="DEEP_LINK" value="" /> | ||
| 808 | + <option name="ACTIVITY_CLASS" value="" /> | ||
| 583 | <method /> | 809 | <method /> |
| 584 | </configuration> | 810 | </configuration> |
| 585 | <configuration default="true" type="AndroidTestRunConfigurationType" factoryName="Android Tests"> | 811 | <configuration default="true" type="AndroidTestRunConfigurationType" factoryName="Android Tests"> |
| @@ -589,18 +815,15 @@ | @@ -589,18 +815,15 @@ | ||
| 589 | <option name="METHOD_NAME" value="" /> | 815 | <option name="METHOD_NAME" value="" /> |
| 590 | <option name="CLASS_NAME" value="" /> | 816 | <option name="CLASS_NAME" value="" /> |
| 591 | <option name="PACKAGE_NAME" value="" /> | 817 | <option name="PACKAGE_NAME" value="" /> |
| 818 | + <option name="EXTRA_OPTIONS" value="" /> | ||
| 592 | <option name="TARGET_SELECTION_MODE" value="EMULATOR" /> | 819 | <option name="TARGET_SELECTION_MODE" value="EMULATOR" /> |
| 593 | - <option name="USE_LAST_SELECTED_DEVICE" value="false" /> | ||
| 594 | <option name="PREFERRED_AVD" value="" /> | 820 | <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 | <option name="CLEAR_LOGCAT" value="false" /> | 821 | <option name="CLEAR_LOGCAT" value="false" /> |
| 602 | <option name="SHOW_LOGCAT_AUTOMATICALLY" value="true" /> | 822 | <option name="SHOW_LOGCAT_AUTOMATICALLY" value="true" /> |
| 603 | - <option name="FILTER_LOGCAT_AUTOMATICALLY" value="true" /> | 823 | + <option name="SKIP_NOOP_APK_INSTALLATIONS" value="true" /> |
| 824 | + <option name="FORCE_STOP_RUNNING_APP" value="true" /> | ||
| 825 | + <option name="USE_LAST_SELECTED_DEVICE" value="false" /> | ||
| 826 | + <option name="PREFERRED_AVD" value="" /> | ||
| 604 | <method /> | 827 | <method /> |
| 605 | </configuration> | 828 | </configuration> |
| 606 | <configuration default="true" type="Applet" factoryName="Applet"> | 829 | <configuration default="true" type="Applet" factoryName="Applet"> |
| @@ -625,6 +848,65 @@ | @@ -625,6 +848,65 @@ | ||
| 625 | <envs /> | 848 | <envs /> |
| 626 | <method /> | 849 | <method /> |
| 627 | </configuration> | 850 | </configuration> |
| 851 | + <configuration default="true" type="ArquillianJUnit" factoryName=""> | ||
| 852 | + <extension name="coverage" enabled="false" merge="false" sample_coverage="true" runner="idea" /> | ||
| 853 | + <module name="" /> | ||
| 854 | + <option name="arquillianRunConfiguration"> | ||
| 855 | + <value> | ||
| 856 | + <option name="containerStateName" value="" /> | ||
| 857 | + </value> | ||
| 858 | + </option> | ||
| 859 | + <option name="ALTERNATIVE_JRE_PATH_ENABLED" value="false" /> | ||
| 860 | + <option name="ALTERNATIVE_JRE_PATH" /> | ||
| 861 | + <option name="PACKAGE_NAME" /> | ||
| 862 | + <option name="MAIN_CLASS_NAME" /> | ||
| 863 | + <option name="METHOD_NAME" /> | ||
| 864 | + <option name="TEST_OBJECT" value="class" /> | ||
| 865 | + <option name="VM_PARAMETERS" /> | ||
| 866 | + <option name="PARAMETERS" /> | ||
| 867 | + <option name="WORKING_DIRECTORY" /> | ||
| 868 | + <option name="ENV_VARIABLES" /> | ||
| 869 | + <option name="PASS_PARENT_ENVS" value="true" /> | ||
| 870 | + <option name="TEST_SEARCH_SCOPE"> | ||
| 871 | + <value defaultName="singleModule" /> | ||
| 872 | + </option> | ||
| 873 | + <envs /> | ||
| 874 | + <patterns /> | ||
| 875 | + <method /> | ||
| 876 | + </configuration> | ||
| 877 | + <configuration default="true" type="ArquillianTestNG" factoryName=""> | ||
| 878 | + <extension name="coverage" enabled="false" merge="false" sample_coverage="true" runner="idea" /> | ||
| 879 | + <module name="" /> | ||
| 880 | + <option name="arquillianRunConfiguration"> | ||
| 881 | + <value> | ||
| 882 | + <option name="containerStateName" value="" /> | ||
| 883 | + </value> | ||
| 884 | + </option> | ||
| 885 | + <option name="ALTERNATIVE_JRE_PATH_ENABLED" value="false" /> | ||
| 886 | + <option name="ALTERNATIVE_JRE_PATH" /> | ||
| 887 | + <option name="SUITE_NAME" /> | ||
| 888 | + <option name="PACKAGE_NAME" /> | ||
| 889 | + <option name="MAIN_CLASS_NAME" /> | ||
| 890 | + <option name="METHOD_NAME" /> | ||
| 891 | + <option name="GROUP_NAME" /> | ||
| 892 | + <option name="TEST_OBJECT" value="CLASS" /> | ||
| 893 | + <option name="VM_PARAMETERS" /> | ||
| 894 | + <option name="PARAMETERS" /> | ||
| 895 | + <option name="WORKING_DIRECTORY" /> | ||
| 896 | + <option name="OUTPUT_DIRECTORY" /> | ||
| 897 | + <option name="ANNOTATION_TYPE" /> | ||
| 898 | + <option name="ENV_VARIABLES" /> | ||
| 899 | + <option name="PASS_PARENT_ENVS" value="true" /> | ||
| 900 | + <option name="TEST_SEARCH_SCOPE"> | ||
| 901 | + <value defaultName="singleModule" /> | ||
| 902 | + </option> | ||
| 903 | + <option name="USE_DEFAULT_REPORTERS" value="false" /> | ||
| 904 | + <option name="PROPERTIES_FILE" /> | ||
| 905 | + <envs /> | ||
| 906 | + <properties /> | ||
| 907 | + <listeners /> | ||
| 908 | + <method /> | ||
| 909 | + </configuration> | ||
| 628 | <configuration default="true" type="CucumberJavaRunConfigurationType" factoryName="Cucumber java"> | 910 | <configuration default="true" type="CucumberJavaRunConfigurationType" factoryName="Cucumber java"> |
| 629 | <extension name="coverage" enabled="false" merge="false" sample_coverage="true" runner="idea" /> | 911 | <extension name="coverage" enabled="false" merge="false" sample_coverage="true" runner="idea" /> |
| 630 | <option name="myFilePath" /> | 912 | <option name="myFilePath" /> |
| @@ -710,13 +992,12 @@ | @@ -710,13 +992,12 @@ | ||
| 710 | <method /> | 992 | <method /> |
| 711 | </configuration> | 993 | </configuration> |
| 712 | <configuration default="true" type="GrailsRunConfigurationType" factoryName="Grails"> | 994 | <configuration default="true" type="GrailsRunConfigurationType" factoryName="Grails"> |
| 713 | - <module name="" /> | ||
| 714 | <setting name="vmparams" value="" /> | 995 | <setting name="vmparams" value="" /> |
| 715 | <setting name="cmdLine" value="run-app" /> | 996 | <setting name="cmdLine" value="run-app" /> |
| 716 | - <setting name="depsClasspath" value="false" /> | ||
| 717 | <setting name="passParentEnv" value="true" /> | 997 | <setting name="passParentEnv" value="true" /> |
| 718 | - <extension name="coverage" enabled="false" merge="false" sample_coverage="true" runner="idea" /> | ||
| 719 | <setting name="launchBrowser" value="false" /> | 998 | <setting name="launchBrowser" value="false" /> |
| 999 | + <setting name="depsClasspath" value="false" /> | ||
| 1000 | + <extension name="coverage" enabled="false" merge="false" sample_coverage="true" runner="idea" /> | ||
| 720 | <method /> | 1001 | <method /> |
| 721 | </configuration> | 1002 | </configuration> |
| 722 | <configuration default="true" type="JUnit" factoryName="JUnit"> | 1003 | <configuration default="true" type="JUnit" factoryName="JUnit"> |
| @@ -740,14 +1021,76 @@ | @@ -740,14 +1021,76 @@ | ||
| 740 | <patterns /> | 1021 | <patterns /> |
| 741 | <method /> | 1022 | <method /> |
| 742 | </configuration> | 1023 | </configuration> |
| 1024 | + <configuration default="true" type="JUnitTestDiscovery" factoryName="JUnit Test Discovery" changeList="All"> | ||
| 1025 | + <extension name="coverage" enabled="false" merge="false" sample_coverage="true" runner="idea" /> | ||
| 1026 | + <module name="" /> | ||
| 1027 | + <option name="ALTERNATIVE_JRE_PATH_ENABLED" value="false" /> | ||
| 1028 | + <option name="ALTERNATIVE_JRE_PATH" /> | ||
| 1029 | + <option name="PACKAGE_NAME" /> | ||
| 1030 | + <option name="MAIN_CLASS_NAME" /> | ||
| 1031 | + <option name="METHOD_NAME" /> | ||
| 1032 | + <option name="TEST_OBJECT" value="class" /> | ||
| 1033 | + <option name="VM_PARAMETERS" /> | ||
| 1034 | + <option name="PARAMETERS" /> | ||
| 1035 | + <option name="WORKING_DIRECTORY" /> | ||
| 1036 | + <option name="ENV_VARIABLES" /> | ||
| 1037 | + <option name="PASS_PARENT_ENVS" value="true" /> | ||
| 1038 | + <option name="TEST_SEARCH_SCOPE"> | ||
| 1039 | + <value defaultName="singleModule" /> | ||
| 1040 | + </option> | ||
| 1041 | + <envs /> | ||
| 1042 | + <patterns /> | ||
| 1043 | + <method /> | ||
| 1044 | + </configuration> | ||
| 743 | <configuration default="true" type="JarApplication" factoryName="JAR Application"> | 1045 | <configuration default="true" type="JarApplication" factoryName="JAR Application"> |
| 744 | <extension name="coverage" enabled="false" merge="false" sample_coverage="true" runner="idea" /> | 1046 | <extension name="coverage" enabled="false" merge="false" sample_coverage="true" runner="idea" /> |
| 745 | <envs /> | 1047 | <envs /> |
| 746 | <method /> | 1048 | <method /> |
| 747 | </configuration> | 1049 | </configuration> |
| 1050 | + <configuration default="true" type="Java Scratch" factoryName="Java Scratch"> | ||
| 1051 | + <extension name="coverage" enabled="false" merge="false" sample_coverage="true" runner="idea" /> | ||
| 1052 | + <option name="SCRATCH_FILE_ID" value="0" /> | ||
| 1053 | + <option name="MAIN_CLASS_NAME" /> | ||
| 1054 | + <option name="VM_PARAMETERS" /> | ||
| 1055 | + <option name="PROGRAM_PARAMETERS" /> | ||
| 1056 | + <option name="WORKING_DIRECTORY" /> | ||
| 1057 | + <option name="ALTERNATIVE_JRE_PATH_ENABLED" value="false" /> | ||
| 1058 | + <option name="ALTERNATIVE_JRE_PATH" /> | ||
| 1059 | + <option name="ENABLE_SWING_INSPECTOR" value="false" /> | ||
| 1060 | + <option name="ENV_VARIABLES" /> | ||
| 1061 | + <option name="PASS_PARENT_ENVS" value="true" /> | ||
| 1062 | + <module name="" /> | ||
| 1063 | + <envs /> | ||
| 1064 | + <method /> | ||
| 1065 | + </configuration> | ||
| 748 | <configuration default="true" type="JavascriptDebugType" factoryName="JavaScript Debug"> | 1066 | <configuration default="true" type="JavascriptDebugType" factoryName="JavaScript Debug"> |
| 749 | <method /> | 1067 | <method /> |
| 750 | </configuration> | 1068 | </configuration> |
| 1069 | + <configuration default="true" type="JetRunConfigurationType" factoryName="Kotlin"> | ||
| 1070 | + <extension name="coverage" enabled="false" merge="false" sample_coverage="true" runner="idea" /> | ||
| 1071 | + <option name="MAIN_CLASS_NAME" /> | ||
| 1072 | + <option name="VM_PARAMETERS" /> | ||
| 1073 | + <option name="PROGRAM_PARAMETERS" /> | ||
| 1074 | + <option name="WORKING_DIRECTORY" /> | ||
| 1075 | + <option name="ALTERNATIVE_JRE_PATH_ENABLED" value="false" /> | ||
| 1076 | + <option name="ALTERNATIVE_JRE_PATH" /> | ||
| 1077 | + <option name="PASS_PARENT_ENVS" value="true" /> | ||
| 1078 | + <module name="patent" /> | ||
| 1079 | + <envs /> | ||
| 1080 | + <method /> | ||
| 1081 | + </configuration> | ||
| 1082 | + <configuration default="true" type="KotlinStandaloneScriptRunConfigurationType" factoryName="Kotlin script"> | ||
| 1083 | + <extension name="coverage" enabled="false" merge="false" sample_coverage="true" runner="idea" /> | ||
| 1084 | + <option name="filePath" /> | ||
| 1085 | + <option name="vmParameters" /> | ||
| 1086 | + <option name="alternativeJrePath" /> | ||
| 1087 | + <option name="programParameters" /> | ||
| 1088 | + <option name="passParentEnvs" value="true" /> | ||
| 1089 | + <option name="workingDirectory" /> | ||
| 1090 | + <option name="isAlternativeJrePathEnabled" value="false" /> | ||
| 1091 | + <envs /> | ||
| 1092 | + <method /> | ||
| 1093 | + </configuration> | ||
| 751 | <configuration default="true" type="MavenRunConfiguration" factoryName="Maven"> | 1094 | <configuration default="true" type="MavenRunConfiguration" factoryName="Maven"> |
| 752 | <MavenSettings> | 1095 | <MavenSettings> |
| 753 | <option name="myGeneralSettings" /> | 1096 | <option name="myGeneralSettings" /> |
| @@ -812,7 +1155,36 @@ | @@ -812,7 +1155,36 @@ | ||
| 812 | <listeners /> | 1155 | <listeners /> |
| 813 | <method /> | 1156 | <method /> |
| 814 | </configuration> | 1157 | </configuration> |
| 1158 | + <configuration default="true" type="TestNGTestDiscovery" factoryName="TestNG Test Discovery" changeList="All"> | ||
| 1159 | + <extension name="coverage" enabled="false" merge="false" sample_coverage="true" runner="idea" /> | ||
| 1160 | + <module name="" /> | ||
| 1161 | + <option name="ALTERNATIVE_JRE_PATH_ENABLED" value="false" /> | ||
| 1162 | + <option name="ALTERNATIVE_JRE_PATH" /> | ||
| 1163 | + <option name="SUITE_NAME" /> | ||
| 1164 | + <option name="PACKAGE_NAME" /> | ||
| 1165 | + <option name="MAIN_CLASS_NAME" /> | ||
| 1166 | + <option name="METHOD_NAME" /> | ||
| 1167 | + <option name="GROUP_NAME" /> | ||
| 1168 | + <option name="TEST_OBJECT" value="CLASS" /> | ||
| 1169 | + <option name="VM_PARAMETERS" /> | ||
| 1170 | + <option name="PARAMETERS" /> | ||
| 1171 | + <option name="WORKING_DIRECTORY" /> | ||
| 1172 | + <option name="OUTPUT_DIRECTORY" /> | ||
| 1173 | + <option name="ANNOTATION_TYPE" /> | ||
| 1174 | + <option name="ENV_VARIABLES" /> | ||
| 1175 | + <option name="PASS_PARENT_ENVS" value="true" /> | ||
| 1176 | + <option name="TEST_SEARCH_SCOPE"> | ||
| 1177 | + <value defaultName="singleModule" /> | ||
| 1178 | + </option> | ||
| 1179 | + <option name="USE_DEFAULT_REPORTERS" value="false" /> | ||
| 1180 | + <option name="PROPERTIES_FILE" /> | ||
| 1181 | + <envs /> | ||
| 1182 | + <properties /> | ||
| 1183 | + <listeners /> | ||
| 1184 | + <method /> | ||
| 1185 | + </configuration> | ||
| 815 | <configuration default="true" type="js.build_tools.gulp" factoryName="Gulp.js"> | 1186 | <configuration default="true" type="js.build_tools.gulp" factoryName="Gulp.js"> |
| 1187 | + <node-interpreter>project</node-interpreter> | ||
| 816 | <node-options /> | 1188 | <node-options /> |
| 817 | <gulpfile /> | 1189 | <gulpfile /> |
| 818 | <tasks /> | 1190 | <tasks /> |
| @@ -821,13 +1193,21 @@ | @@ -821,13 +1193,21 @@ | ||
| 821 | <envs /> | 1193 | <envs /> |
| 822 | <method /> | 1194 | <method /> |
| 823 | </configuration> | 1195 | </configuration> |
| 1196 | + <configuration default="true" type="js.build_tools.npm" factoryName="npm"> | ||
| 1197 | + <command value="run-script" /> | ||
| 1198 | + <scripts /> | ||
| 1199 | + <node-interpreter value="project" /> | ||
| 1200 | + <envs /> | ||
| 1201 | + <method /> | ||
| 1202 | + </configuration> | ||
| 824 | <configuration default="true" type="osgi.bnd.run" factoryName="Run Launcher"> | 1203 | <configuration default="true" type="osgi.bnd.run" factoryName="Run Launcher"> |
| 825 | <method /> | 1204 | <method /> |
| 826 | </configuration> | 1205 | </configuration> |
| 827 | <configuration default="true" type="osgi.bnd.run" factoryName="Test Launcher (JUnit)"> | 1206 | <configuration default="true" type="osgi.bnd.run" factoryName="Test Launcher (JUnit)"> |
| 828 | <method /> | 1207 | <method /> |
| 829 | </configuration> | 1208 | </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=""> | 1209 | + <configuration default="false" name="patent" type="#com.intellij.j2ee.web.tomcat.TomcatRunConfigurationFactory" factoryName="Local" APPLICATION_SERVER_NAME="tomcat8" ALTERNATIVE_JRE_ENABLED="false"> |
| 1210 | + <option name="OPEN_IN_BROWSER_URL" value="http://localhost:8088/" /> | ||
| 831 | <option name="SHOW_DIALOG_ON_UPDATE" value="false" /> | 1211 | <option name="SHOW_DIALOG_ON_UPDATE" value="false" /> |
| 832 | <deployment> | 1212 | <deployment> |
| 833 | <artifact name="patent:war exploded"> | 1213 | <artifact name="patent:war exploded"> |
| @@ -838,6 +1218,7 @@ | @@ -838,6 +1218,7 @@ | ||
| 838 | </deployment> | 1218 | </deployment> |
| 839 | <server-settings> | 1219 | <server-settings> |
| 840 | <option name="BASE_DIRECTORY_NAME" value="Unnamed_patent" /> | 1220 | <option name="BASE_DIRECTORY_NAME" value="Unnamed_patent" /> |
| 1221 | + <option name="HTTP_PORT" value="8088" /> | ||
| 841 | </server-settings> | 1222 | </server-settings> |
| 842 | <predefined_log_file id="Tomcat" enabled="true" /> | 1223 | <predefined_log_file id="Tomcat" enabled="true" /> |
| 843 | <predefined_log_file id="Tomcat Catalina" enabled="true" /> | 1224 | <predefined_log_file id="Tomcat Catalina" enabled="true" /> |
| @@ -900,10 +1281,10 @@ | @@ -900,10 +1281,10 @@ | ||
| 900 | </method> | 1281 | </method> |
| 901 | </configuration> | 1282 | </configuration> |
| 902 | <list size="4"> | 1283 | <list size="4"> |
| 903 | - <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" /> | 1284 | + <item index="0" class="java.lang.String" itemvalue="Application.CaseTypeEnum" /> |
| 1285 | + <item index="1" class="java.lang.String" itemvalue="Application.TextUtils" /> | ||
| 1286 | + <item index="2" class="java.lang.String" itemvalue="Application.CasementService" /> | ||
| 1287 | + <item index="3" class="java.lang.String" itemvalue="Tomcat Server.patent" /> | ||
| 907 | </list> | 1288 | </list> |
| 908 | <recent_temporary> | 1289 | <recent_temporary> |
| 909 | <list size="3"> | 1290 | <list size="3"> |
| @@ -913,7 +1294,9 @@ | @@ -913,7 +1294,9 @@ | ||
| 913 | </list> | 1294 | </list> |
| 914 | </recent_temporary> | 1295 | </recent_temporary> |
| 915 | </component> | 1296 | </component> |
| 916 | - <component name="ShelveChangesManager" show_recycled="false" /> | 1297 | + <component name="ShelveChangesManager" show_recycled="false"> |
| 1298 | + <option name="remove_strategy" value="false" /> | ||
| 1299 | + </component> | ||
| 917 | <component name="SvnConfiguration"> | 1300 | <component name="SvnConfiguration"> |
| 918 | <configuration /> | 1301 | <configuration /> |
| 919 | </component> | 1302 | </component> |
| @@ -922,6 +1305,7 @@ | @@ -922,6 +1305,7 @@ | ||
| 922 | <changelist id="a8f74803-c7c3-405c-9584-6ffd161452f6" name="Default" comment="" /> | 1305 | <changelist id="a8f74803-c7c3-405c-9584-6ffd161452f6" name="Default" comment="" /> |
| 923 | <created>1468214759106</created> | 1306 | <created>1468214759106</created> |
| 924 | <option name="number" value="Default" /> | 1307 | <option name="number" value="Default" /> |
| 1308 | + <option name="presentableId" value="Default" /> | ||
| 925 | <updated>1468214759106</updated> | 1309 | <updated>1468214759106</updated> |
| 926 | <workItem from="1468214760432" duration="1049000" /> | 1310 | <workItem from="1468214760432" duration="1049000" /> |
| 927 | <workItem from="1468234772794" duration="330000" /> | 1311 | <workItem from="1468234772794" duration="330000" /> |
| @@ -938,70 +1322,74 @@ | @@ -938,70 +1322,74 @@ | ||
| 938 | <workItem from="1469243959439" duration="3683000" /> | 1322 | <workItem from="1469243959439" duration="3683000" /> |
| 939 | <workItem from="1469260205882" duration="12837000" /> | 1323 | <workItem from="1469260205882" duration="12837000" /> |
| 940 | <workItem from="1469585749367" duration="1353000" /> | 1324 | <workItem from="1469585749367" duration="1353000" /> |
| 1325 | + <workItem from="1469608329981" duration="17025000" /> | ||
| 941 | </task> | 1326 | </task> |
| 942 | <servers /> | 1327 | <servers /> |
| 943 | </component> | 1328 | </component> |
| 944 | <component name="TimeTrackingManager"> | 1329 | <component name="TimeTrackingManager"> |
| 945 | - <option name="totallyTimeSpent" value="95728000" /> | 1330 | + <option name="totallyTimeSpent" value="112753000" /> |
| 946 | </component> | 1331 | </component> |
| 947 | <component name="ToolWindowManager"> | 1332 | <component name="ToolWindowManager"> |
| 948 | - <frame x="1280" y="23" width="1920" height="1057" extended-state="6" /> | ||
| 949 | - <editor active="true" /> | 1333 | + <frame x="1049" y="107" width="944" height="851" extended-state="0" /> |
| 1334 | + <editor active="false" /> | ||
| 950 | <layout> | 1335 | <layout> |
| 951 | - <window_info id="Palette	" 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" /> | 1336 | + <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" /> |
| 1337 | + <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" /> | ||
| 1338 | + <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.49806523" order="7" side_tool="false" content_ui="tabs" /> | ||
| 1339 | + <window_info id="Palette	" 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" /> | ||
| 1340 | + <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" /> | ||
| 1341 | + <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" /> | ||
| 1342 | + <window_info id="Event Log" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="true" show_stripe_button="true" weight="1.0" sideWeight="0.25501114" order="7" side_tool="true" content_ui="tabs" /> | ||
| 1343 | + <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" /> | ||
| 1344 | + <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.38641426" sideWeight="0.5" order="3" side_tool="false" content_ui="tabs" /> | ||
| 1345 | + <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" /> | ||
| 1346 | + <window_info id="Run" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.5337143" sideWeight="0.49585405" order="2" side_tool="false" content_ui="tabs" /> | ||
| 1347 | + <window_info id="Spring" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.32939914" sideWeight="0.49806523" order="-1" side_tool="false" content_ui="tabs" /> | ||
| 1348 | + <window_info id="Terminal" active="true" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="true" show_stripe_button="true" weight="1.0" sideWeight="0.74498886" order="7" side_tool="false" content_ui="tabs" /> | ||
| 1349 | + <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" /> | ||
| 1350 | + <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" /> | ||
| 1351 | + <window_info id="Project" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="true" show_stripe_button="true" weight="0.40311804" sideWeight="0.5" order="0" side_tool="false" content_ui="combo" /> | ||
| 1352 | + <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" /> | ||
| 1353 | + <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" /> | ||
| 1354 | + <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" /> | ||
| 1355 | + <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" /> | ||
| 1356 | + <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" /> | ||
| 1357 | + <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" /> | ||
| 1358 | + <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" /> | ||
| 1359 | + <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.49806523" order="3" side_tool="false" content_ui="tabs" /> | ||
| 1360 | + <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" /> | ||
| 1361 | + <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" /> | ||
| 1362 | + <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" /> | ||
| 1363 | + <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" /> | ||
| 1364 | + <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" /> | ||
| 977 | </layout> | 1365 | </layout> |
| 978 | <layout-to-restore> | 1366 | <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	" 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" /> | 1367 | + <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" /> |
| 1368 | + <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" /> | ||
| 1369 | + <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" /> | ||
| 1370 | + <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" /> | ||
| 1371 | + <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" /> | ||
| 1372 | + <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" /> | ||
| 1373 | + <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" /> | ||
| 1374 | + <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" /> | ||
| 1375 | + <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" /> | ||
| 1376 | + <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" /> | ||
| 1377 | + <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" /> | ||
| 1378 | + <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" /> | ||
| 1379 | + <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" /> | ||
| 1380 | + <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" /> | ||
| 1381 | + <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" /> | ||
| 1382 | + <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" /> | ||
| 1383 | + <window_info id="Palette	" 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" /> | ||
| 1384 | + <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" /> | ||
| 1385 | + <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" /> | ||
| 1386 | + <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" /> | ||
| 1387 | + <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" /> | ||
| 1388 | + <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" /> | ||
| 1389 | + <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" /> | ||
| 1390 | + <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" /> | ||
| 1391 | + <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" /> | ||
| 1392 | + <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 | </layout-to-restore> | 1393 | </layout-to-restore> |
| 1006 | </component> | 1394 | </component> |
| 1007 | <component name="Vcs.Log.UiProperties"> | 1395 | <component name="Vcs.Log.UiProperties"> |
| @@ -1017,7 +1405,7 @@ | @@ -1017,7 +1405,7 @@ | ||
| 1017 | </component> | 1405 | </component> |
| 1018 | <component name="XDebuggerManager"> | 1406 | <component name="XDebuggerManager"> |
| 1019 | <breakpoint-manager> | 1407 | <breakpoint-manager> |
| 1020 | - <option name="time" value="32" /> | 1408 | + <option name="time" value="35" /> |
| 1021 | </breakpoint-manager> | 1409 | </breakpoint-manager> |
| 1022 | <watches-manager /> | 1410 | <watches-manager /> |
| 1023 | </component> | 1411 | </component> |
| @@ -1026,361 +1414,568 @@ | @@ -1026,361 +1414,568 @@ | ||
| 1026 | <option name="FILTER_TARGETS" value="false" /> | 1414 | <option name="FILTER_TARGETS" value="false" /> |
| 1027 | </component> | 1415 | </component> |
| 1028 | <component name="editorHistoryManager"> | 1416 | <component name="editorHistoryManager"> |
| 1029 | - <entry file="jar://$APPLICATION_HOME_DIR$/lib/idea.jar!/resources/html5-schema/html5/block.rnc"> | 1417 | + <entry file="file://$PROJECT_DIR$/src/main/webapp/css/user_side_bar.css"> |
| 1030 | <provider selected="true" editor-type-id="text-editor"> | 1418 | <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 /> | 1419 | + <state relative-caret-position="0"> |
| 1420 | + <caret line="0" column="0" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="0" /> | ||
| 1034 | </state> | 1421 | </state> |
| 1035 | </provider> | 1422 | </provider> |
| 1036 | </entry> | 1423 | </entry> |
| 1037 | - <entry file="file://$PROJECT_DIR$/src/main/webapp/css/pay.css"> | 1424 | + <entry file="file://$PROJECT_DIR$/src/main/webapp/include/user_side.jsp"> |
| 1038 | <provider selected="true" editor-type-id="text-editor"> | 1425 | <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" /> | 1426 | + <state relative-caret-position="0"> |
| 1427 | + <caret line="8" column="67" selection-start-line="8" selection-start-column="67" selection-end-line="8" selection-end-column="67" /> | ||
| 1041 | </state> | 1428 | </state> |
| 1042 | </provider> | 1429 | </provider> |
| 1043 | </entry> | 1430 | </entry> |
| 1044 | - <entry file="file://$PROJECT_DIR$/src/main/resources/mapper/OrderMapper.xml"> | 1431 | + <entry file="file://$PROJECT_DIR$/src/main/webapp/css/case-detail.css"> |
| 1045 | <provider selected="true" editor-type-id="text-editor"> | 1432 | <provider selected="true" editor-type-id="text-editor"> |
| 1046 | - <state vertical-scroll-proportion="0.0"> | ||
| 1047 | - <caret line="181" column="20" selection-start-line="181" selection-start-column="20" selection-end-line="181" selection-end-column="20" /> | 1433 | + <state relative-caret-position="0"> |
| 1434 | + <caret line="34" column="0" selection-start-line="34" selection-start-column="0" selection-end-line="34" selection-end-column="0" /> | ||
| 1048 | </state> | 1435 | </state> |
| 1049 | </provider> | 1436 | </provider> |
| 1050 | </entry> | 1437 | </entry> |
| 1051 | - <entry file="file://$PROJECT_DIR$/src/main/resources.local/logback.xml"> | 1438 | + <entry file="file://$PROJECT_DIR$/src/main/webapp/css/order_detail.css"> |
| 1052 | <provider selected="true" editor-type-id="text-editor"> | 1439 | <provider selected="true" editor-type-id="text-editor"> |
| 1053 | - <state vertical-scroll-proportion="-6.111111"> | ||
| 1054 | - <caret line="11" column="43" selection-start-line="11" selection-start-column="43" selection-end-line="11" selection-end-column="43" /> | ||
| 1055 | - <folding /> | 1440 | + <state relative-caret-position="0"> |
| 1441 | + <caret line="34" column="0" selection-start-line="34" selection-start-column="0" selection-end-line="34" selection-end-column="0" /> | ||
| 1056 | </state> | 1442 | </state> |
| 1057 | </provider> | 1443 | </provider> |
| 1058 | </entry> | 1444 | </entry> |
| 1059 | - <entry file="file://$PROJECT_DIR$/src/main/java/com/canrd/patent/dal/mapper/OrderMapper.java"> | 1445 | + <entry file="file://$PROJECT_DIR$/src/main/webapp/css/header.css"> |
| 1060 | <provider selected="true" editor-type-id="text-editor"> | 1446 | <provider selected="true" editor-type-id="text-editor"> |
| 1061 | - <state vertical-scroll-proportion="0.0"> | ||
| 1062 | - <caret line="62" column="22" selection-start-line="62" selection-start-column="22" selection-end-line="62" selection-end-column="22" /> | 1447 | + <state relative-caret-position="0"> |
| 1448 | + <caret line="1" column="0" selection-start-line="1" selection-start-column="0" selection-end-line="32" selection-end-column="1" /> | ||
| 1063 | </state> | 1449 | </state> |
| 1064 | </provider> | 1450 | </provider> |
| 1065 | </entry> | 1451 | </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"> | 1452 | + <entry file="file://$PROJECT_DIR$/src/main/webapp/case_detail.jsp"> |
| 1067 | <provider selected="true" editor-type-id="text-editor"> | 1453 | <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" /> | 1454 | + <state relative-caret-position="0"> |
| 1455 | + <caret line="19" column="31" selection-start-line="19" selection-start-column="31" selection-end-line="19" selection-end-column="31" /> | ||
| 1070 | </state> | 1456 | </state> |
| 1071 | </provider> | 1457 | </provider> |
| 1072 | </entry> | 1458 | </entry> |
| 1073 | - <entry file="file://$PROJECT_DIR$/src/main/webapp/error.jsp"> | 1459 | + <entry file="file://$PROJECT_DIR$/src/main/webapp/order_detail.jsp"> |
| 1074 | <provider selected="true" editor-type-id="text-editor"> | 1460 | <provider selected="true" editor-type-id="text-editor"> |
| 1075 | - <state vertical-scroll-proportion="0.0"> | ||
| 1076 | - <caret line="6" column="58" selection-start-line="6" selection-start-column="58" selection-end-line="6" selection-end-column="58" /> | 1461 | + <state relative-caret-position="0"> |
| 1462 | + <caret line="20" column="12" selection-start-line="20" selection-start-column="12" selection-end-line="20" selection-end-column="69" /> | ||
| 1077 | </state> | 1463 | </state> |
| 1078 | </provider> | 1464 | </provider> |
| 1079 | </entry> | 1465 | </entry> |
| 1080 | - <entry file="file://$PROJECT_DIR$/src/main/webapp/notice.jsp"> | 1466 | + <entry file="file://$PROJECT_DIR$/src/main/webapp/case_manage.jsp"> |
| 1081 | <provider selected="true" editor-type-id="text-editor"> | 1467 | <provider selected="true" editor-type-id="text-editor"> |
| 1082 | - <state vertical-scroll-proportion="0.0"> | ||
| 1083 | - <caret line="27" column="24" selection-start-line="27" selection-start-column="24" selection-end-line="27" selection-end-column="24" /> | 1468 | + <state relative-caret-position="0"> |
| 1469 | + <caret line="6" column="61" selection-start-line="6" selection-start-column="61" selection-end-line="6" selection-end-column="61" /> | ||
| 1084 | </state> | 1470 | </state> |
| 1085 | </provider> | 1471 | </provider> |
| 1086 | </entry> | 1472 | </entry> |
| 1087 | - <entry file="file://$PROJECT_DIR$/src/main/java/com/canrd/patent/web/OrderDataController.java"> | 1473 | + <entry file="file://$PROJECT_DIR$/src/main/webapp/css/case-manage.css"> |
| 1088 | <provider selected="true" editor-type-id="text-editor"> | 1474 | <provider selected="true" editor-type-id="text-editor"> |
| 1089 | - <state vertical-scroll-proportion="0.0"> | ||
| 1090 | - <caret line="8" column="32" selection-start-line="8" selection-start-column="13" selection-end-line="8" selection-end-column="32" /> | 1475 | + <state relative-caret-position="0"> |
| 1476 | + <caret line="40" column="0" selection-start-line="40" selection-start-column="0" selection-end-line="40" selection-end-column="0" /> | ||
| 1091 | </state> | 1477 | </state> |
| 1092 | </provider> | 1478 | </provider> |
| 1093 | </entry> | 1479 | </entry> |
| 1094 | - <entry file="file://$PROJECT_DIR$/src/test/resources/mbg/generatorConfig.xml"> | 1480 | + <entry file="file://$PROJECT_DIR$/src/main/webapp/pay.jsp"> |
| 1095 | <provider selected="true" editor-type-id="text-editor"> | 1481 | <provider selected="true" editor-type-id="text-editor"> |
| 1096 | - <state vertical-scroll-proportion="0.0"> | ||
| 1097 | - <caret line="51" column="204" selection-start-line="51" selection-start-column="13" selection-end-line="51" selection-end-column="204" /> | ||
| 1098 | - <folding /> | 1482 | + <state relative-caret-position="0"> |
| 1483 | + <caret line="120" column="71" selection-start-line="120" selection-start-column="71" selection-end-line="120" selection-end-column="71" /> | ||
| 1099 | </state> | 1484 | </state> |
| 1100 | </provider> | 1485 | </provider> |
| 1101 | </entry> | 1486 | </entry> |
| 1102 | - <entry file="file://$PROJECT_DIR$/src/main/java/com/canrd/patent/dal/model/Order.java"> | 1487 | + <entry file="file://$PROJECT_DIR$/src/main/webapp/pay_result.jsp"> |
| 1103 | <provider selected="true" editor-type-id="text-editor"> | 1488 | <provider selected="true" editor-type-id="text-editor"> |
| 1104 | - <state vertical-scroll-proportion="0.0"> | ||
| 1105 | - <caret line="4" column="13" selection-start-line="4" selection-start-column="13" selection-end-line="4" selection-end-column="13" /> | 1489 | + <state relative-caret-position="0"> |
| 1490 | + <caret line="29" column="7" selection-start-line="29" selection-start-column="7" selection-end-line="29" selection-end-column="64" /> | ||
| 1106 | </state> | 1491 | </state> |
| 1107 | </provider> | 1492 | </provider> |
| 1108 | </entry> | 1493 | </entry> |
| 1109 | - <entry file="file://$PROJECT_DIR$/src/main/java/com/canrd/patent/dal/mapper/CasementMapper.java"> | 1494 | + <entry file="file://$PROJECT_DIR$/src/main/webapp/css/patent-index.css"> |
| 1110 | <provider selected="true" editor-type-id="text-editor"> | 1495 | <provider selected="true" editor-type-id="text-editor"> |
| 1111 | - <state vertical-scroll-proportion="0.0"> | ||
| 1112 | - <caret line="7" column="17" selection-start-line="7" selection-start-column="17" selection-end-line="7" selection-end-column="17" /> | 1496 | + <state relative-caret-position="0"> |
| 1497 | + <caret line="116" column="2" selection-start-line="116" selection-start-column="1" selection-end-line="116" selection-end-column="2" /> | ||
| 1113 | </state> | 1498 | </state> |
| 1114 | </provider> | 1499 | </provider> |
| 1115 | </entry> | 1500 | </entry> |
| 1116 | - <entry file="file://$PROJECT_DIR$/src/main/java/com/canrd/patent/dal/enums/OrderStatusEnum.java"> | 1501 | + <entry file="file://$PROJECT_DIR$/src/main/webapp/img/2Dbarcode.png"> |
| 1502 | + <provider selected="true" editor-type-id="images"> | ||
| 1503 | + <state /> | ||
| 1504 | + </provider> | ||
| 1505 | + </entry> | ||
| 1506 | + <entry file="file://$PROJECT_DIR$/src/main/webapp/css/home.css"> | ||
| 1117 | <provider selected="true" editor-type-id="text-editor"> | 1507 | <provider selected="true" editor-type-id="text-editor"> |
| 1118 | - <state vertical-scroll-proportion="0.0"> | ||
| 1119 | - <caret line="7" column="4" selection-start-line="7" selection-start-column="4" selection-end-line="7" selection-end-column="4" /> | 1508 | + <state relative-caret-position="0"> |
| 1509 | + <caret line="29" column="0" selection-start-line="29" selection-start-column="0" selection-end-line="29" selection-end-column="0" /> | ||
| 1120 | </state> | 1510 | </state> |
| 1121 | </provider> | 1511 | </provider> |
| 1122 | </entry> | 1512 | </entry> |
| 1123 | - <entry file="file://$PROJECT_DIR$/src/main/java/com/canrd/patent/web/IndexController.java"> | 1513 | + <entry file="file://$PROJECT_DIR$/src/main/webapp/home_patent.jsp"> |
| 1124 | <provider selected="true" editor-type-id="text-editor"> | 1514 | <provider selected="true" editor-type-id="text-editor"> |
| 1125 | - <state vertical-scroll-proportion="0.0"> | ||
| 1126 | - <caret line="16" column="25" selection-start-line="16" selection-start-column="25" selection-end-line="16" selection-end-column="25" /> | 1515 | + <state relative-caret-position="0"> |
| 1516 | + <caret line="300" column="57" selection-start-line="300" selection-start-column="46" selection-end-line="300" selection-end-column="57" /> | ||
| 1127 | </state> | 1517 | </state> |
| 1128 | </provider> | 1518 | </provider> |
| 1129 | </entry> | 1519 | </entry> |
| 1130 | - <entry file="file://$PROJECT_DIR$/src/main/java/com/canrd/patent/web/CasementPageController.java"> | 1520 | + <entry file="file://$PROJECT_DIR$/src/main/webapp/originImg/hot.png"> |
| 1521 | + <provider selected="true" editor-type-id="images"> | ||
| 1522 | + <state /> | ||
| 1523 | + </provider> | ||
| 1524 | + </entry> | ||
| 1525 | + <entry file="file://$PROJECT_DIR$/src/main/webapp/originImg/2Dbarcode.png"> | ||
| 1526 | + <provider selected="true" editor-type-id="images"> | ||
| 1527 | + <state /> | ||
| 1528 | + </provider> | ||
| 1529 | + </entry> | ||
| 1530 | + <entry file="file://$PROJECT_DIR$/src/main/webapp/originImg/keludeyoushi.png"> | ||
| 1531 | + <provider selected="true" editor-type-id="images"> | ||
| 1532 | + <state /> | ||
| 1533 | + </provider> | ||
| 1534 | + </entry> | ||
| 1535 | + <entry file="file://$PROJECT_DIR$/src/main/webapp/originImg/refer-title.png"> | ||
| 1536 | + <provider selected="true" editor-type-id="images"> | ||
| 1537 | + <state /> | ||
| 1538 | + </provider> | ||
| 1539 | + </entry> | ||
| 1540 | + <entry file="file://$PROJECT_DIR$/src/main/resources.prod/props/jdbc.properties"> | ||
| 1131 | <provider selected="true" editor-type-id="text-editor"> | 1541 | <provider selected="true" editor-type-id="text-editor"> |
| 1132 | - <state vertical-scroll-proportion="0.0"> | ||
| 1133 | - <caret line="49" column="21" selection-start-line="49" selection-start-column="21" selection-end-line="49" selection-end-column="21" /> | 1542 | + <state relative-caret-position="45"> |
| 1543 | + <caret line="3" column="28" selection-start-line="3" selection-start-column="28" selection-end-line="3" selection-end-column="28" /> | ||
| 1544 | + <folding /> | ||
| 1134 | </state> | 1545 | </state> |
| 1135 | </provider> | 1546 | </provider> |
| 1136 | </entry> | 1547 | </entry> |
| 1137 | - <entry file="file://$PROJECT_DIR$/src/main/java/com/canrd/patent/service/CaseHandlingService.java"> | 1548 | + <entry file="file://$PROJECT_DIR$/src/main/resources.local/props/jdbc.properties"> |
| 1138 | <provider selected="true" editor-type-id="text-editor"> | 1549 | <provider selected="true" editor-type-id="text-editor"> |
| 1139 | - <state vertical-scroll-proportion="0.0"> | ||
| 1140 | - <caret line="44" column="52" selection-start-line="44" selection-start-column="52" selection-end-line="44" selection-end-column="52" /> | 1550 | + <state relative-caret-position="75"> |
| 1551 | + <caret line="5" column="23" selection-start-line="5" selection-start-column="23" selection-end-line="5" selection-end-column="23" /> | ||
| 1552 | + <folding /> | ||
| 1141 | </state> | 1553 | </state> |
| 1142 | </provider> | 1554 | </provider> |
| 1143 | </entry> | 1555 | </entry> |
| 1144 | - <entry file="file://$PROJECT_DIR$/src/main/java/com/canrd/patent/service/OrderService.java"> | 1556 | + <entry file="file://$PROJECT_DIR$/src/main/resources.local/props/fdfs.properties"> |
| 1145 | <provider selected="true" editor-type-id="text-editor"> | 1557 | <provider selected="true" editor-type-id="text-editor"> |
| 1146 | - <state vertical-scroll-proportion="-6.148148"> | ||
| 1147 | - <caret line="31" column="0" selection-start-line="31" selection-start-column="0" selection-end-line="31" selection-end-column="0" /> | 1558 | + <state relative-caret-position="240"> |
| 1559 | + <caret line="16" column="23" selection-start-line="16" selection-start-column="23" selection-end-line="16" selection-end-column="23" /> | ||
| 1560 | + <folding /> | ||
| 1148 | </state> | 1561 | </state> |
| 1149 | </provider> | 1562 | </provider> |
| 1150 | </entry> | 1563 | </entry> |
| 1151 | - <entry file="file://$PROJECT_DIR$/src/main/java/com/canrd/patent/dal/enums/ReduceTypeEnum.java"> | 1564 | + <entry file="file://$PROJECT_DIR$/doc/sql/Untitled.sql"> |
| 1152 | <provider selected="true" editor-type-id="text-editor"> | 1565 | <provider selected="true" editor-type-id="text-editor"> |
| 1153 | - <state vertical-scroll-proportion="0.0"> | ||
| 1154 | - <caret line="5" column="0" selection-start-line="5" selection-start-column="0" selection-end-line="5" selection-end-column="0" /> | 1566 | + <state relative-caret-position="15"> |
| 1567 | + <caret line="8" column="39" selection-start-line="8" selection-start-column="39" selection-end-line="8" selection-end-column="39" /> | ||
| 1568 | + <folding /> | ||
| 1155 | </state> | 1569 | </state> |
| 1156 | </provider> | 1570 | </provider> |
| 1157 | </entry> | 1571 | </entry> |
| 1158 | - <entry file="file://$PROJECT_DIR$/src/main/java/com/canrd/patent/dal/dto/CaseOutputDto.java"> | 1572 | + <entry file="file://$PROJECT_DIR$/doc/sql/ddl.sql"> |
| 1159 | <provider selected="true" editor-type-id="text-editor"> | 1573 | <provider selected="true" editor-type-id="text-editor"> |
| 1160 | - <state vertical-scroll-proportion="0.0"> | ||
| 1161 | - <caret line="11" column="32" selection-start-line="11" selection-start-column="19" selection-end-line="11" selection-end-column="32" /> | 1574 | + <state relative-caret-position="15"> |
| 1575 | + <caret line="1" column="0" selection-start-line="1" selection-start-column="0" selection-end-line="1" selection-end-column="0" /> | ||
| 1576 | + <folding /> | ||
| 1162 | </state> | 1577 | </state> |
| 1163 | </provider> | 1578 | </provider> |
| 1164 | </entry> | 1579 | </entry> |
| 1165 | - <entry file="file://$PROJECT_DIR$/src/main/java/com/canrd/patent/dal/dto/OrderListOutputDto.java"> | 1580 | + <entry file="file://$PROJECT_DIR$/src/test/java/com/canrd/patent/BaseTest.java"> |
| 1166 | <provider selected="true" editor-type-id="text-editor"> | 1581 | <provider selected="true" editor-type-id="text-editor"> |
| 1167 | - <state vertical-scroll-proportion="0.0"> | ||
| 1168 | - <caret line="17" column="16" selection-start-line="17" selection-start-column="16" selection-end-line="17" selection-end-column="16" /> | 1582 | + <state relative-caret-position="240"> |
| 1583 | + <caret line="16" column="0" selection-start-line="16" selection-start-column="0" selection-end-line="16" selection-end-column="0" /> | ||
| 1584 | + <folding> | ||
| 1585 | + <element signature="imports" expanded="false" /> | ||
| 1586 | + </folding> | ||
| 1169 | </state> | 1587 | </state> |
| 1170 | </provider> | 1588 | </provider> |
| 1171 | </entry> | 1589 | </entry> |
| 1172 | - <entry file="file://$PROJECT_DIR$/src/main/webapp/css/footer.css"> | 1590 | + <entry file="file://$PROJECT_DIR$/patent.iml"> |
| 1173 | <provider selected="true" editor-type-id="text-editor"> | 1591 | <provider selected="true" editor-type-id="text-editor"> |
| 1174 | - <state vertical-scroll-proportion="-1.1945702"> | 1592 | + <state relative-caret-position="-101"> |
| 1175 | <caret line="0" column="0" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="0" /> | 1593 | <caret line="0" column="0" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="0" /> |
| 1594 | + <folding /> | ||
| 1176 | </state> | 1595 | </state> |
| 1177 | </provider> | 1596 | </provider> |
| 1178 | </entry> | 1597 | </entry> |
| 1179 | - <entry file="file://$PROJECT_DIR$/src/main/webapp/include/header.jsp"> | 1598 | + <entry file="file://$PROJECT_DIR$/src/main/webapp/service.jsp"> |
| 1180 | <provider selected="true" editor-type-id="text-editor"> | 1599 | <provider selected="true" editor-type-id="text-editor"> |
| 1181 | - <state vertical-scroll-proportion="-5.0"> | ||
| 1182 | - <caret line="8" column="62" selection-start-line="8" selection-start-column="62" selection-end-line="8" selection-end-column="62" /> | 1600 | + <state relative-caret-position="0"> |
| 1601 | + <caret line="0" column="0" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="0" /> | ||
| 1602 | + <folding /> | ||
| 1183 | </state> | 1603 | </state> |
| 1184 | </provider> | 1604 | </provider> |
| 1185 | </entry> | 1605 | </entry> |
| 1186 | - <entry file="file://$PROJECT_DIR$/src/main/java/com/canrd/patent/dal/model/Casement.java"> | 1606 | + <entry file="file://$PROJECT_DIR$/src/main/webapp/index.jsp"> |
| 1187 | <provider selected="true" editor-type-id="text-editor"> | 1607 | <provider selected="true" editor-type-id="text-editor"> |
| 1188 | - <state vertical-scroll-proportion="0.0"> | ||
| 1189 | - <caret line="4" column="13" selection-start-line="4" selection-start-column="13" selection-end-line="4" selection-end-column="13" /> | 1608 | + <state relative-caret-position="-1650"> |
| 1609 | + <caret line="15" column="25" selection-start-line="15" selection-start-column="25" selection-end-line="15" selection-end-column="25" /> | ||
| 1610 | + <folding /> | ||
| 1190 | </state> | 1611 | </state> |
| 1191 | </provider> | 1612 | </provider> |
| 1192 | </entry> | 1613 | </entry> |
| 1193 | - <entry file="file://$PROJECT_DIR$/src/main/java/com/canrd/patent/dal/dto/OrderOutputDto.java"> | 1614 | + <entry file="file://$PROJECT_DIR$/src/main/java/com/canrd/patent/dal/query/CaseQuery.java"> |
| 1194 | <provider selected="true" editor-type-id="text-editor"> | 1615 | <provider selected="true" editor-type-id="text-editor"> |
| 1195 | - <state vertical-scroll-proportion="0.0"> | ||
| 1196 | - <caret line="8" column="41" selection-start-line="8" selection-start-column="41" selection-end-line="8" selection-end-column="41" /> | 1616 | + <state relative-caret-position="75"> |
| 1617 | + <caret line="5" column="13" selection-start-line="5" selection-start-column="13" selection-end-line="5" selection-end-column="13" /> | ||
| 1618 | + <folding /> | ||
| 1197 | </state> | 1619 | </state> |
| 1198 | </provider> | 1620 | </provider> |
| 1199 | </entry> | 1621 | </entry> |
| 1200 | - <entry file="file://$PROJECT_DIR$/src/main/java/com/canrd/patent/web/OrderPageController.java"> | 1622 | + <entry file="file://$PROJECT_DIR$/src/main/webapp/WEB-INF/springmvc-servlet.xml"> |
| 1201 | <provider selected="true" editor-type-id="text-editor"> | 1623 | <provider selected="true" editor-type-id="text-editor"> |
| 1202 | - <state vertical-scroll-proportion="0.0"> | ||
| 1203 | - <caret line="80" column="58" selection-start-line="80" selection-start-column="58" selection-end-line="80" selection-end-column="58" /> | 1624 | + <state relative-caret-position="240"> |
| 1625 | + <caret line="16" column="11" selection-start-line="16" selection-start-column="11" selection-end-line="16" selection-end-column="11" /> | ||
| 1626 | + <folding /> | ||
| 1204 | </state> | 1627 | </state> |
| 1205 | </provider> | 1628 | </provider> |
| 1206 | </entry> | 1629 | </entry> |
| 1207 | - <entry file="file://$PROJECT_DIR$/src/main/webapp/css/user_side_bar.css"> | 1630 | + <entry file="file://$PROJECT_DIR$/src/main/webapp/WEB-INF/web.xml"> |
| 1208 | <provider selected="true" editor-type-id="text-editor"> | 1631 | <provider selected="true" editor-type-id="text-editor"> |
| 1209 | - <state vertical-scroll-proportion="0.0"> | ||
| 1210 | - <caret line="0" column="0" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="0" /> | 1632 | + <state relative-caret-position="120"> |
| 1633 | + <caret line="8" column="77" selection-start-line="8" selection-start-column="56" selection-end-line="8" selection-end-column="77" /> | ||
| 1634 | + <folding /> | ||
| 1211 | </state> | 1635 | </state> |
| 1212 | </provider> | 1636 | </provider> |
| 1213 | </entry> | 1637 | </entry> |
| 1214 | - <entry file="file://$PROJECT_DIR$/src/main/webapp/include/user_side.jsp"> | 1638 | + <entry file="file://$PROJECT_DIR$/src/main/java/com/canrd/patent/dal/model/TestModel.java"> |
| 1215 | <provider selected="true" editor-type-id="text-editor"> | 1639 | <provider selected="true" editor-type-id="text-editor"> |
| 1216 | - <state vertical-scroll-proportion="-5.0"> | ||
| 1217 | - <caret line="8" column="67" selection-start-line="8" selection-start-column="67" selection-end-line="8" selection-end-column="67" /> | 1640 | + <state relative-caret-position="315"> |
| 1641 | + <caret line="33" column="1" selection-start-line="33" selection-start-column="1" selection-end-line="33" selection-end-column="1" /> | ||
| 1642 | + <folding /> | ||
| 1218 | </state> | 1643 | </state> |
| 1219 | </provider> | 1644 | </provider> |
| 1220 | </entry> | 1645 | </entry> |
| 1221 | - <entry file="file://$PROJECT_DIR$/src/main/webapp/css/case-detail.css"> | 1646 | + <entry file="file://$PROJECT_DIR$/src/main/resources/applicationContext.xml"> |
| 1222 | <provider selected="true" editor-type-id="text-editor"> | 1647 | <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" /> | 1648 | + <state relative-caret-position="165"> |
| 1649 | + <caret line="11" column="17" selection-start-line="11" selection-start-column="14" selection-end-line="11" selection-end-column="17" /> | ||
| 1650 | + <folding /> | ||
| 1225 | </state> | 1651 | </state> |
| 1226 | </provider> | 1652 | </provider> |
| 1227 | </entry> | 1653 | </entry> |
| 1228 | - <entry file="file://$PROJECT_DIR$/src/main/webapp/css/order_detail.css"> | 1654 | + <entry file="file://$PROJECT_DIR$/src/main/resources/spring/dao.xml"> |
| 1229 | <provider selected="true" editor-type-id="text-editor"> | 1655 | <provider selected="true" editor-type-id="text-editor"> |
| 1230 | - <state vertical-scroll-proportion="0.0"> | ||
| 1231 | - <caret line="34" column="0" selection-start-line="34" selection-start-column="0" selection-end-line="34" selection-end-column="0" /> | 1656 | + <state relative-caret-position="45"> |
| 1657 | + <caret line="29" column="66" selection-start-line="29" selection-start-column="66" selection-end-line="29" selection-end-column="66" /> | ||
| 1658 | + <folding> | ||
| 1659 | + <element signature="e#1395#1419#0" expanded="false" /> | ||
| 1660 | + </folding> | ||
| 1232 | </state> | 1661 | </state> |
| 1233 | </provider> | 1662 | </provider> |
| 1234 | </entry> | 1663 | </entry> |
| 1235 | - <entry file="file://$PROJECT_DIR$/src/main/webapp/css/header.css"> | 1664 | + <entry file="file://$PROJECT_DIR$/src/main/resources/spring/task.xml"> |
| 1236 | <provider selected="true" editor-type-id="text-editor"> | 1665 | <provider selected="true" editor-type-id="text-editor"> |
| 1237 | - <state vertical-scroll-proportion="0.0"> | ||
| 1238 | - <caret line="1" column="0" selection-start-line="1" selection-start-column="0" selection-end-line="32" selection-end-column="1" /> | 1666 | + <state relative-caret-position="499"> |
| 1667 | + <caret line="36" column="62" selection-start-line="36" selection-start-column="52" selection-end-line="36" selection-end-column="62" /> | ||
| 1668 | + <folding /> | ||
| 1239 | </state> | 1669 | </state> |
| 1240 | </provider> | 1670 | </provider> |
| 1241 | </entry> | 1671 | </entry> |
| 1242 | - <entry file="file://$PROJECT_DIR$/src/main/webapp/case_detail.jsp"> | 1672 | + <entry file="file://$PROJECT_DIR$/src/main/resources/spring/tool.xml"> |
| 1243 | <provider selected="true" editor-type-id="text-editor"> | 1673 | <provider selected="true" editor-type-id="text-editor"> |
| 1244 | - <state vertical-scroll-proportion="58.75"> | ||
| 1245 | - <caret line="19" column="31" selection-start-line="19" selection-start-column="31" selection-end-line="19" selection-end-column="31" /> | 1674 | + <state relative-caret-position="0"> |
| 1675 | + <caret line="0" column="0" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="0" /> | ||
| 1676 | + <folding /> | ||
| 1246 | </state> | 1677 | </state> |
| 1247 | </provider> | 1678 | </provider> |
| 1248 | </entry> | 1679 | </entry> |
| 1249 | - <entry file="file://$PROJECT_DIR$/src/main/webapp/order_detail.jsp"> | 1680 | + <entry file="file://$PROJECT_DIR$/src/main/java/com/canrd/patent/dal/model/UserModel.java"> |
| 1250 | <provider selected="true" editor-type-id="text-editor"> | 1681 | <provider selected="true" editor-type-id="text-editor"> |
| 1251 | - <state vertical-scroll-proportion="-12.5"> | ||
| 1252 | - <caret line="20" column="12" selection-start-line="20" selection-start-column="12" selection-end-line="20" selection-end-column="69" /> | 1682 | + <state relative-caret-position="285"> |
| 1683 | + <caret line="19" column="30" selection-start-line="19" selection-start-column="30" selection-end-line="19" selection-end-column="30" /> | ||
| 1684 | + <folding> | ||
| 1685 | + <element signature="e#450#451#0" expanded="true" /> | ||
| 1686 | + <element signature="e#596#597#0" expanded="true" /> | ||
| 1687 | + <element signature="e#621#622#0" expanded="true" /> | ||
| 1688 | + <element signature="e#654#655#0" expanded="true" /> | ||
| 1689 | + <element signature="e#682#683#0" expanded="true" /> | ||
| 1690 | + <element signature="e#713#714#0" expanded="true" /> | ||
| 1691 | + <element signature="e#740#741#0" expanded="true" /> | ||
| 1692 | + <element signature="e#780#781#0" expanded="true" /> | ||
| 1693 | + <element signature="e#812#813#0" expanded="true" /> | ||
| 1694 | + <element signature="e#847#848#0" expanded="true" /> | ||
| 1695 | + <element signature="e#878#879#0" expanded="true" /> | ||
| 1696 | + <element signature="e#926#927#0" expanded="true" /> | ||
| 1697 | + <element signature="e#966#967#0" expanded="true" /> | ||
| 1698 | + <element signature="e#1013#1014#0" expanded="true" /> | ||
| 1699 | + <element signature="e#1056#1057#0" expanded="true" /> | ||
| 1700 | + <element signature="e#1224#1225#0" expanded="true" /> | ||
| 1701 | + <element signature="e#1252#1253#0" expanded="true" /> | ||
| 1702 | + <element signature="e#1294#1295#0" expanded="true" /> | ||
| 1703 | + <element signature="e#1328#1329#0" expanded="true" /> | ||
| 1704 | + <element signature="e#1365#1366#0" expanded="true" /> | ||
| 1705 | + <element signature="e#1398#1399#0" expanded="true" /> | ||
| 1706 | + <element signature="e#1450#1451#0" expanded="true" /> | ||
| 1707 | + <element signature="e#1494#1495#0" expanded="true" /> | ||
| 1708 | + <element signature="e#1530#1531#0" expanded="true" /> | ||
| 1709 | + <element signature="e#1562#1563#0" expanded="true" /> | ||
| 1710 | + <element signature="e#1612#1613#0" expanded="true" /> | ||
| 1711 | + <element signature="e#1654#1655#0" expanded="true" /> | ||
| 1712 | + <element signature="e#1691#1692#0" expanded="true" /> | ||
| 1713 | + <element signature="e#1724#1725#0" expanded="true" /> | ||
| 1714 | + <element signature="e#1776#1777#0" expanded="true" /> | ||
| 1715 | + <element signature="e#1820#1821#0" expanded="true" /> | ||
| 1716 | + <element signature="e#1851#1852#0" expanded="true" /> | ||
| 1717 | + <element signature="e#1878#1879#0" expanded="true" /> | ||
| 1718 | + <element signature="e#1918#1919#0" expanded="true" /> | ||
| 1719 | + <element signature="e#1950#1951#0" expanded="true" /> | ||
| 1720 | + </folding> | ||
| 1253 | </state> | 1721 | </state> |
| 1254 | </provider> | 1722 | </provider> |
| 1255 | </entry> | 1723 | </entry> |
| 1256 | - <entry file="file://$PROJECT_DIR$/src/main/webapp/case_manage.jsp"> | 1724 | + <entry file="file://$PROJECT_DIR$/src/main/java/com/canrd/patent/dal/mapper/MybatisTestMapper.java"> |
| 1257 | <provider selected="true" editor-type-id="text-editor"> | 1725 | <provider selected="true" editor-type-id="text-editor"> |
| 1258 | - <state vertical-scroll-proportion="-3.75"> | ||
| 1259 | - <caret line="6" column="61" selection-start-line="6" selection-start-column="61" selection-end-line="6" selection-end-column="61" /> | 1726 | + <state relative-caret-position="870"> |
| 1727 | + <caret line="61" column="7" selection-start-line="61" selection-start-column="7" selection-end-line="61" selection-end-column="7" /> | ||
| 1728 | + <folding /> | ||
| 1260 | </state> | 1729 | </state> |
| 1261 | </provider> | 1730 | </provider> |
| 1262 | </entry> | 1731 | </entry> |
| 1263 | - <entry file="file://$PROJECT_DIR$/src/main/webapp/css/case-manage.css"> | 1732 | + <entry file="file://$PROJECT_DIR$/src/main/java/com/canrd/patent/service/TestService.java"> |
| 1264 | <provider selected="true" editor-type-id="text-editor"> | 1733 | <provider selected="true" editor-type-id="text-editor"> |
| 1265 | - <state vertical-scroll-proportion="0.0"> | ||
| 1266 | - <caret line="40" column="0" selection-start-line="40" selection-start-column="0" selection-end-line="40" selection-end-column="0" /> | 1734 | + <state relative-caret-position="120"> |
| 1735 | + <caret line="8" column="24" selection-start-line="8" selection-start-column="13" selection-end-line="8" selection-end-column="24" /> | ||
| 1736 | + <folding /> | ||
| 1267 | </state> | 1737 | </state> |
| 1268 | </provider> | 1738 | </provider> |
| 1269 | </entry> | 1739 | </entry> |
| 1270 | - <entry file="file://$PROJECT_DIR$/src/main/webapp/pay.jsp"> | 1740 | + <entry file="file://$PROJECT_DIR$/src/main/resources/mybatis-config.xml"> |
| 1271 | <provider selected="true" editor-type-id="text-editor"> | 1741 | <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" /> | 1742 | + <state relative-caret-position="60"> |
| 1743 | + <caret line="4" column="47" selection-start-line="4" selection-start-column="23" selection-end-line="4" selection-end-column="47" /> | ||
| 1744 | + <folding /> | ||
| 1274 | </state> | 1745 | </state> |
| 1275 | </provider> | 1746 | </provider> |
| 1276 | </entry> | 1747 | </entry> |
| 1277 | - <entry file="file://$PROJECT_DIR$/src/main/webapp/pay_result.jsp"> | 1748 | + <entry file="file://$PROJECT_DIR$/src/main/resources/mapper/CasementMapper.xml"> |
| 1278 | <provider selected="true" editor-type-id="text-editor"> | 1749 | <provider selected="true" editor-type-id="text-editor"> |
| 1279 | - <state vertical-scroll-proportion="0.8238636"> | ||
| 1280 | - <caret line="29" column="7" selection-start-line="29" selection-start-column="7" selection-end-line="29" selection-end-column="64" /> | 1750 | + <state relative-caret-position="0"> |
| 1751 | + <caret line="0" column="0" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="0" /> | ||
| 1752 | + <folding> | ||
| 1753 | + <marker date="1469608321062" expanded="true" signature="4936:5039" ph="select from casement" /> | ||
| 1754 | + <marker date="1469608321062" expanded="true" signature="5252:5309" ph="delete from " /> | ||
| 1755 | + <marker date="1469608321062" expanded="true" signature="5547:5567" ph="delete from " /> | ||
| 1756 | + <marker date="1469608321062" expanded="true" signature="8994:9023" ph="select count... casement" /> | ||
| 1757 | + <marker date="1469608321062" expanded="true" signature="10985:11656" ph="update casem... " /> | ||
| 1758 | + <marker date="1469608321062" expanded="true" signature="12001:13154" ph="update casem... " /> | ||
| 1759 | + <marker date="1469608321062" expanded="true" signature="13388:13978" ph="update casem... " /> | ||
| 1760 | + </folding> | ||
| 1281 | </state> | 1761 | </state> |
| 1282 | </provider> | 1762 | </provider> |
| 1283 | </entry> | 1763 | </entry> |
| 1284 | - <entry file="file://$PROJECT_DIR$/src/main/webapp/service.jsp"> | 1764 | + <entry file="file://$PROJECT_DIR$/src/main/resources/mapper/OrderMapper.xml"> |
| 1285 | <provider selected="true" editor-type-id="text-editor"> | 1765 | <provider selected="true" editor-type-id="text-editor"> |
| 1286 | - <state vertical-scroll-proportion="-1.1931819"> | 1766 | + <state relative-caret-position="-3150"> |
| 1287 | <caret line="0" column="0" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="0" /> | 1767 | <caret line="0" column="0" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="0" /> |
| 1768 | + <folding> | ||
| 1769 | + <marker date="1469608321062" expanded="true" signature="5063:5164" ph="select from orders" /> | ||
| 1770 | + <marker date="1469608321062" expanded="true" signature="5377:5432" ph="delete from " /> | ||
| 1771 | + <marker date="1469608321062" expanded="true" signature="5667:5685" ph="delete from " /> | ||
| 1772 | + <marker date="1469608321062" expanded="true" signature="9443:9470" ph="select count... orders" /> | ||
| 1773 | + <marker date="1469608321062" expanded="true" signature="11625:12383" ph="update order... " /> | ||
| 1774 | + <marker date="1469608321062" expanded="true" signature="12725:14043" ph="update order... " /> | ||
| 1775 | + <marker date="1469608321062" expanded="true" signature="14274:14937" ph="update order... " /> | ||
| 1776 | + </folding> | ||
| 1288 | </state> | 1777 | </state> |
| 1289 | </provider> | 1778 | </provider> |
| 1290 | </entry> | 1779 | </entry> |
| 1291 | - <entry file="file://$PROJECT_DIR$/src/main/webapp/css/patent-index.css"> | 1780 | + <entry file="file://$PROJECT_DIR$/src/main/resources/mapper/MybatisTestMapper.xml"> |
| 1292 | <provider selected="true" editor-type-id="text-editor"> | 1781 | <provider selected="true" editor-type-id="text-editor"> |
| 1293 | - <state vertical-scroll-proportion="-7.703704"> | ||
| 1294 | - <caret line="116" column="2" selection-start-line="116" selection-start-column="1" selection-end-line="116" selection-end-column="2" /> | 1782 | + <state relative-caret-position="499"> |
| 1783 | + <caret line="234" column="39" selection-start-line="234" selection-start-column="39" selection-end-line="234" selection-end-column="39" /> | ||
| 1784 | + <folding> | ||
| 1785 | + <marker date="1469608321062" expanded="true" signature="4146:4253" ph="select from mybatis_test" /> | ||
| 1786 | + <marker date="1469608321062" expanded="true" signature="4466:4527" ph="delete from " /> | ||
| 1787 | + <marker date="1469608321062" expanded="true" signature="4768:4792" ph="delete from " /> | ||
| 1788 | + <marker date="1469608321062" expanded="true" signature="6382:6415" ph="select count... mybatis_test" /> | ||
| 1789 | + <marker date="1469608321062" expanded="true" signature="7340:7491" ph="update mybat... " /> | ||
| 1790 | + <marker date="1469608321062" expanded="true" signature="7839:8081" ph="update mybat... " /> | ||
| 1791 | + <marker date="1469608321062" expanded="true" signature="8318:8451" ph="update mybat... " /> | ||
| 1792 | + </folding> | ||
| 1295 | </state> | 1793 | </state> |
| 1296 | </provider> | 1794 | </provider> |
| 1297 | </entry> | 1795 | </entry> |
| 1298 | - <entry file="file://$PROJECT_DIR$/src/main/webapp/img/2Dbarcode.png"> | ||
| 1299 | - <provider selected="true" editor-type-id="images"> | ||
| 1300 | - <state /> | ||
| 1301 | - </provider> | ||
| 1302 | - </entry> | ||
| 1303 | - <entry file="file://$PROJECT_DIR$/src/main/webapp/css/home.css"> | 1796 | + <entry file="file://$PROJECT_DIR$/src/test/java/com/canrd/patent/dal/mapper/TestMapperTest.java"> |
| 1304 | <provider selected="true" editor-type-id="text-editor"> | 1797 | <provider selected="true" editor-type-id="text-editor"> |
| 1305 | - <state vertical-scroll-proportion="0.0"> | ||
| 1306 | - <caret line="29" column="0" selection-start-line="29" selection-start-column="0" selection-end-line="29" selection-end-column="0" /> | 1798 | + <state relative-caret-position="105"> |
| 1799 | + <caret line="7" column="13" selection-start-line="7" selection-start-column="13" selection-end-line="7" selection-end-column="13" /> | ||
| 1800 | + <folding /> | ||
| 1307 | </state> | 1801 | </state> |
| 1308 | </provider> | 1802 | </provider> |
| 1309 | </entry> | 1803 | </entry> |
| 1310 | - <entry file="file://$PROJECT_DIR$/src/main/webapp/home_patent.jsp"> | 1804 | + <entry file="file://$PROJECT_DIR$/src/test/java/com/canrd/patent/common/Test.java"> |
| 1311 | <provider selected="true" editor-type-id="text-editor"> | 1805 | <provider selected="true" editor-type-id="text-editor"> |
| 1312 | - <state vertical-scroll-proportion="-32.375"> | ||
| 1313 | - <caret line="300" column="57" selection-start-line="300" selection-start-column="46" selection-end-line="300" selection-end-column="57" /> | 1806 | + <state relative-caret-position="75"> |
| 1807 | + <caret line="5" column="13" selection-start-line="5" selection-start-column="13" selection-end-line="5" selection-end-column="13" /> | ||
| 1808 | + <folding /> | ||
| 1314 | </state> | 1809 | </state> |
| 1315 | </provider> | 1810 | </provider> |
| 1316 | </entry> | 1811 | </entry> |
| 1317 | - <entry file="file://$PROJECT_DIR$/src/main/webapp/originImg/hot.png"> | ||
| 1318 | - <provider selected="true" editor-type-id="images"> | ||
| 1319 | - <state /> | ||
| 1320 | - </provider> | ||
| 1321 | - </entry> | ||
| 1322 | - <entry file="file://$PROJECT_DIR$/src/main/webapp/originImg/2Dbarcode.png"> | ||
| 1323 | - <provider selected="true" editor-type-id="images"> | ||
| 1324 | - <state /> | ||
| 1325 | - </provider> | ||
| 1326 | - </entry> | ||
| 1327 | - <entry file="file://$PROJECT_DIR$/src/main/webapp/originImg/keludeyoushi.png"> | ||
| 1328 | - <provider selected="true" editor-type-id="images"> | ||
| 1329 | - <state /> | ||
| 1330 | - </provider> | ||
| 1331 | - </entry> | ||
| 1332 | - <entry file="file://$PROJECT_DIR$/src/main/webapp/originImg/refer-title.png"> | ||
| 1333 | - <provider selected="true" editor-type-id="images"> | ||
| 1334 | - <state /> | ||
| 1335 | - </provider> | ||
| 1336 | - </entry> | ||
| 1337 | - <entry file="file://$PROJECT_DIR$/src/main/java/com/canrd/patent/web/HelloController.java"> | 1812 | + <entry file="file://$PROJECT_DIR$/src/main/java/com/canrd/patent/dal/mapper/TestMapper.java"> |
| 1338 | <provider selected="true" editor-type-id="text-editor"> | 1813 | <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" /> | ||
| 1341 | - <folding /> | 1814 | + <state relative-caret-position="195"> |
| 1815 | + <caret line="13" column="35" selection-start-line="13" selection-start-column="26" selection-end-line="13" selection-end-column="35" /> | ||
| 1816 | + <folding> | ||
| 1817 | + <element signature="imports" expanded="false" /> | ||
| 1818 | + </folding> | ||
| 1342 | </state> | 1819 | </state> |
| 1343 | </provider> | 1820 | </provider> |
| 1344 | </entry> | 1821 | </entry> |
| 1345 | - <entry file="file://$PROJECT_DIR$/doc/sql/ddl.sql"> | 1822 | + <entry file="file://$PROJECT_DIR$/src/main/java/com/canrd/patent/web/HelloController.java"> |
| 1346 | <provider selected="true" editor-type-id="text-editor"> | 1823 | <provider selected="true" editor-type-id="text-editor"> |
| 1347 | - <state vertical-scroll-proportion="-0.5555556"> | ||
| 1348 | - <caret line="1" column="0" selection-start-line="1" selection-start-column="0" selection-end-line="1" selection-end-column="0" /> | ||
| 1349 | - <folding /> | 1824 | + <state relative-caret-position="-15"> |
| 1825 | + <caret line="58" column="93" selection-start-line="58" selection-start-column="87" selection-end-line="58" selection-end-column="93" /> | ||
| 1826 | + <folding> | ||
| 1827 | + <element signature="imports" expanded="true" /> | ||
| 1828 | + <element signature="e#1779#1780#0" expanded="true" /> | ||
| 1829 | + <element signature="e#1814#1815#0" expanded="true" /> | ||
| 1830 | + </folding> | ||
| 1350 | </state> | 1831 | </state> |
| 1351 | </provider> | 1832 | </provider> |
| 1352 | </entry> | 1833 | </entry> |
| 1353 | - <entry file="file://$PROJECT_DIR$/doc/sql/Untitled.sql"> | 1834 | + <entry file="file://$PROJECT_DIR$/src/main/java/com/canrd/patent/web/UserController.java"> |
| 1354 | <provider selected="true" editor-type-id="text-editor"> | 1835 | <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" /> | ||
| 1357 | - <folding /> | 1836 | + <state relative-caret-position="348"> |
| 1837 | + <caret line="77" column="26" selection-start-line="77" selection-start-column="26" selection-end-line="77" selection-end-column="26" /> | ||
| 1838 | + <folding> | ||
| 1839 | + <element signature="imports" expanded="true" /> | ||
| 1840 | + <element signature="e#1724#1725#0" expanded="true" /> | ||
| 1841 | + <element signature="e#1759#1760#0" expanded="true" /> | ||
| 1842 | + </folding> | ||
| 1358 | </state> | 1843 | </state> |
| 1359 | </provider> | 1844 | </provider> |
| 1360 | </entry> | 1845 | </entry> |
| 1361 | - <entry file="file://$PROJECT_DIR$/src/main/resources.local/props/fdfs.properties"> | 1846 | + <entry file="file://$PROJECT_DIR$/src/main/java/com/canrd/patent/dal/mapper/UserMapper.java"> |
| 1362 | <provider selected="true" editor-type-id="text-editor"> | 1847 | <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" /> | ||
| 1365 | - <folding /> | 1848 | + <state relative-caret-position="195"> |
| 1849 | + <caret line="13" column="15" selection-start-line="13" selection-start-column="9" selection-end-line="13" selection-end-column="15" /> | ||
| 1850 | + <folding> | ||
| 1851 | + <element signature="imports" expanded="true" /> | ||
| 1852 | + </folding> | ||
| 1366 | </state> | 1853 | </state> |
| 1367 | </provider> | 1854 | </provider> |
| 1368 | </entry> | 1855 | </entry> |
| 1369 | - <entry file="file://$PROJECT_DIR$/src/main/resources.local/props/jdbc.properties"> | 1856 | + <entry file="file://$PROJECT_DIR$/src/main/resources/mapper/test.xml"> |
| 1370 | <provider selected="true" editor-type-id="text-editor"> | 1857 | <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" /> | ||
| 1373 | - <folding /> | 1858 | + <state relative-caret-position="75"> |
| 1859 | + <caret line="5" column="16" selection-start-line="5" selection-start-column="16" selection-end-line="5" selection-end-column="16" /> | ||
| 1860 | + <folding> | ||
| 1861 | + <marker date="1469608321062" expanded="true" signature="264:294" ph="SELECT id, n... test" /> | ||
| 1862 | + <marker date="1469608321062" expanded="true" signature="646:677" ph="delete from " /> | ||
| 1863 | + <marker date="1469608321062" expanded="true" signature="781:843" ph="update test " /> | ||
| 1864 | + </folding> | ||
| 1374 | </state> | 1865 | </state> |
| 1375 | </provider> | 1866 | </provider> |
| 1376 | </entry> | 1867 | </entry> |
| 1377 | - <entry file="file://$PROJECT_DIR$/src/main/webapp/index.jsp"> | 1868 | + <entry file="file://$PROJECT_DIR$/src/main/resources/mapper/user.xml"> |
| 1378 | <provider selected="true" editor-type-id="text-editor"> | 1869 | <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" /> | ||
| 1381 | - <folding /> | 1870 | + <state relative-caret-position="180"> |
| 1871 | + <caret line="12" column="32" selection-start-line="12" selection-start-column="32" selection-end-line="12" selection-end-column="32" /> | ||
| 1872 | + <folding> | ||
| 1873 | + <marker date="1469621367307" expanded="true" signature="264:290" ph="SELECT id, n... user" /> | ||
| 1874 | + <marker date="1469621367307" expanded="true" signature="656:687" ph="delete from " /> | ||
| 1875 | + <marker date="1469621367307" expanded="true" signature="789:851" ph="update user " /> | ||
| 1876 | + </folding> | ||
| 1382 | </state> | 1877 | </state> |
| 1383 | </provider> | 1878 | </provider> |
| 1384 | </entry> | 1879 | </entry> |
| 1385 | </component> | 1880 | </component> |
| 1881 | + <component name="masterDetails"> | ||
| 1882 | + <states> | ||
| 1883 | + <state key="ArtifactsStructureConfigurable.UI"> | ||
| 1884 | + <settings> | ||
| 1885 | + <artifact-editor /> | ||
| 1886 | + <last-edited>patent:war</last-edited> | ||
| 1887 | + <splitter-proportions> | ||
| 1888 | + <option name="proportions"> | ||
| 1889 | + <list> | ||
| 1890 | + <option value="0.2" /> | ||
| 1891 | + <option value="0.5" /> | ||
| 1892 | + </list> | ||
| 1893 | + </option> | ||
| 1894 | + </splitter-proportions> | ||
| 1895 | + </settings> | ||
| 1896 | + </state> | ||
| 1897 | + <state key="FacetStructureConfigurable.UI"> | ||
| 1898 | + <settings> | ||
| 1899 | + <last-edited>Spring</last-edited> | ||
| 1900 | + <splitter-proportions> | ||
| 1901 | + <option name="proportions"> | ||
| 1902 | + <list> | ||
| 1903 | + <option value="0.2" /> | ||
| 1904 | + </list> | ||
| 1905 | + </option> | ||
| 1906 | + </splitter-proportions> | ||
| 1907 | + </settings> | ||
| 1908 | + </state> | ||
| 1909 | + <state key="GlobalLibrariesConfigurable.UI"> | ||
| 1910 | + <settings> | ||
| 1911 | + <splitter-proportions> | ||
| 1912 | + <option name="proportions"> | ||
| 1913 | + <list> | ||
| 1914 | + <option value="0.2" /> | ||
| 1915 | + </list> | ||
| 1916 | + </option> | ||
| 1917 | + </splitter-proportions> | ||
| 1918 | + </settings> | ||
| 1919 | + </state> | ||
| 1920 | + <state key="JdkListConfigurable.UI"> | ||
| 1921 | + <settings> | ||
| 1922 | + <last-edited>1.8</last-edited> | ||
| 1923 | + <splitter-proportions> | ||
| 1924 | + <option name="proportions"> | ||
| 1925 | + <list> | ||
| 1926 | + <option value="0.2" /> | ||
| 1927 | + </list> | ||
| 1928 | + </option> | ||
| 1929 | + </splitter-proportions> | ||
| 1930 | + </settings> | ||
| 1931 | + </state> | ||
| 1932 | + <state key="ModuleStructureConfigurable.UI"> | ||
| 1933 | + <settings> | ||
| 1934 | + <last-edited>Spring|patent</last-edited> | ||
| 1935 | + <splitter-proportions> | ||
| 1936 | + <option name="proportions"> | ||
| 1937 | + <list> | ||
| 1938 | + <option value="0.2" /> | ||
| 1939 | + </list> | ||
| 1940 | + </option> | ||
| 1941 | + </splitter-proportions> | ||
| 1942 | + </settings> | ||
| 1943 | + </state> | ||
| 1944 | + <state key="ProjectJDKs.UI"> | ||
| 1945 | + <settings> | ||
| 1946 | + <last-edited>1.8</last-edited> | ||
| 1947 | + <splitter-proportions> | ||
| 1948 | + <option name="proportions"> | ||
| 1949 | + <list> | ||
| 1950 | + <option value="0.2" /> | ||
| 1951 | + </list> | ||
| 1952 | + </option> | ||
| 1953 | + </splitter-proportions> | ||
| 1954 | + </settings> | ||
| 1955 | + </state> | ||
| 1956 | + <state key="ProjectLibrariesConfigurable.UI"> | ||
| 1957 | + <settings> | ||
| 1958 | + <last-edited>Maven: aopalliance:aopalliance:1.0</last-edited> | ||
| 1959 | + <splitter-proportions> | ||
| 1960 | + <option name="proportions"> | ||
| 1961 | + <list> | ||
| 1962 | + <option value="0.2" /> | ||
| 1963 | + </list> | ||
| 1964 | + </option> | ||
| 1965 | + </splitter-proportions> | ||
| 1966 | + </settings> | ||
| 1967 | + </state> | ||
| 1968 | + <state key="ScopeChooserConfigurable.UI"> | ||
| 1969 | + <settings> | ||
| 1970 | + <splitter-proportions> | ||
| 1971 | + <option name="proportions"> | ||
| 1972 | + <list> | ||
| 1973 | + <option value="0.2" /> | ||
| 1974 | + </list> | ||
| 1975 | + </option> | ||
| 1976 | + </splitter-proportions> | ||
| 1977 | + </settings> | ||
| 1978 | + </state> | ||
| 1979 | + </states> | ||
| 1980 | + </component> | ||
| 1386 | </project> | 1981 | </project> |
| 1387 | \ No newline at end of file | 1982 | \ No newline at end of file |
authorized_keys
0 → 100644
patent.iml
| @@ -16,6 +16,17 @@ | @@ -16,6 +16,17 @@ | ||
| 16 | </sourceRoots> | 16 | </sourceRoots> |
| 17 | </configuration> | 17 | </configuration> |
| 18 | </facet> | 18 | </facet> |
| 19 | + <facet type="Spring" name="Spring"> | ||
| 20 | + <configuration> | ||
| 21 | + <fileset id="fileset" name="Spring Application Context" removed="false"> | ||
| 22 | + <file>file://$MODULE_DIR$/src/main/resources/spring/task.xml</file> | ||
| 23 | + <file>file://$MODULE_DIR$/src/main/resources/spring/dao.xml</file> | ||
| 24 | + <file>file://$MODULE_DIR$/src/main/resources/spring/tool.xml</file> | ||
| 25 | + <file>file://$MODULE_DIR$/src/main/webapp/WEB-INF/springmvc-servlet.xml</file> | ||
| 26 | + <file>file://$MODULE_DIR$/src/main/resources/applicationContext.xml</file> | ||
| 27 | + </fileset> | ||
| 28 | + </configuration> | ||
| 29 | + </facet> | ||
| 19 | </component> | 30 | </component> |
| 20 | <component name="NewModuleRootManager" LANGUAGE_LEVEL="JDK_1_8" inherit-compiler-output="false"> | 31 | <component name="NewModuleRootManager" LANGUAGE_LEVEL="JDK_1_8" inherit-compiler-output="false"> |
| 21 | <output url="file://$MODULE_DIR$/target/classes" /> | 32 | <output url="file://$MODULE_DIR$/target/classes" /> |
| @@ -30,13 +41,15 @@ | @@ -30,13 +41,15 @@ | ||
| 30 | </content> | 41 | </content> |
| 31 | <orderEntry type="inheritedJdk" /> | 42 | <orderEntry type="inheritedJdk" /> |
| 32 | <orderEntry type="sourceFolder" forTests="false" /> | 43 | <orderEntry type="sourceFolder" forTests="false" /> |
| 44 | + <orderEntry type="library" name="Maven: jstl:jstl:1.2" level="project" /> | ||
| 33 | <orderEntry type="library" name="Maven: org.springframework:spring-webmvc:4.2.3.RELEASE" level="project" /> | 45 | <orderEntry type="library" name="Maven: org.springframework:spring-webmvc:4.2.3.RELEASE" level="project" /> |
| 34 | <orderEntry type="library" name="Maven: org.springframework:spring-beans:4.2.3.RELEASE" level="project" /> | 46 | <orderEntry type="library" name="Maven: org.springframework:spring-beans:4.2.3.RELEASE" level="project" /> |
| 47 | + <orderEntry type="library" name="Maven: org.springframework:spring-core:4.2.3.RELEASE" level="project" /> | ||
| 35 | <orderEntry type="library" name="Maven: org.springframework:spring-context:4.2.3.RELEASE" level="project" /> | 48 | <orderEntry type="library" name="Maven: org.springframework:spring-context:4.2.3.RELEASE" level="project" /> |
| 36 | <orderEntry type="library" name="Maven: org.springframework:spring-aop:4.2.3.RELEASE" level="project" /> | 49 | <orderEntry type="library" name="Maven: org.springframework:spring-aop:4.2.3.RELEASE" level="project" /> |
| 37 | <orderEntry type="library" name="Maven: aopalliance:aopalliance:1.0" level="project" /> | 50 | <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 | <orderEntry type="library" name="Maven: org.springframework:spring-expression:4.2.3.RELEASE" level="project" /> | 51 | <orderEntry type="library" name="Maven: org.springframework:spring-expression:4.2.3.RELEASE" level="project" /> |
| 52 | + <orderEntry type="library" name="Maven: commons-logging:commons-logging:1.1.1" level="project" /> | ||
| 40 | <orderEntry type="library" name="Maven: org.springframework:spring-web:4.2.3.RELEASE" level="project" /> | 53 | <orderEntry type="library" name="Maven: org.springframework:spring-web:4.2.3.RELEASE" level="project" /> |
| 41 | <orderEntry type="library" name="Maven: org.springframework:spring-context-support:4.2.3.RELEASE" level="project" /> | 54 | <orderEntry type="library" name="Maven: org.springframework:spring-context-support:4.2.3.RELEASE" level="project" /> |
| 42 | <orderEntry type="library" name="Maven: org.springframework:spring-jdbc:4.2.3.RELEASE" level="project" /> | 55 | <orderEntry type="library" name="Maven: org.springframework:spring-jdbc:4.2.3.RELEASE" level="project" /> |
| @@ -47,12 +60,18 @@ | @@ -47,12 +60,18 @@ | ||
| 47 | <orderEntry type="library" name="Maven: us.codecraft:webmagic-core:0.5.2" level="project" /> | 60 | <orderEntry type="library" name="Maven: us.codecraft:webmagic-core:0.5.2" level="project" /> |
| 48 | <orderEntry type="library" name="Maven: org.apache.httpcomponents:httpclient:4.3.3" level="project" /> | 61 | <orderEntry type="library" name="Maven: org.apache.httpcomponents:httpclient:4.3.3" level="project" /> |
| 49 | <orderEntry type="library" name="Maven: org.apache.httpcomponents:httpcore:4.3.2" level="project" /> | 62 | <orderEntry type="library" name="Maven: org.apache.httpcomponents:httpcore:4.3.2" level="project" /> |
| 63 | + <orderEntry type="library" name="Maven: commons-codec:commons-codec:1.6" level="project" /> | ||
| 64 | + <orderEntry type="library" name="Maven: com.google.guava:guava:18.0" level="project" /> | ||
| 65 | + <orderEntry type="library" name="Maven: org.apache.commons:commons-lang3:3.4" level="project" /> | ||
| 50 | <orderEntry type="library" name="Maven: us.codecraft:xsoup:0.2.4" level="project" /> | 66 | <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" /> | 67 | + <orderEntry type="library" name="Maven: org.jsoup:jsoup:1.8.3" level="project" /> |
| 52 | <orderEntry type="library" name="Maven: org.assertj:assertj-core:1.5.0" level="project" /> | 68 | <orderEntry type="library" name="Maven: org.assertj:assertj-core:1.5.0" level="project" /> |
| 69 | + <orderEntry type="library" name="Maven: org.slf4j:slf4j-api:1.7.13" level="project" /> | ||
| 70 | + <orderEntry type="library" name="Maven: commons-collections:commons-collections:3.2.1" level="project" /> | ||
| 53 | <orderEntry type="library" name="Maven: commons-io:commons-io:1.3.2" level="project" /> | 71 | <orderEntry type="library" name="Maven: commons-io:commons-io:1.3.2" level="project" /> |
| 54 | <orderEntry type="library" name="Maven: com.jayway.jsonpath:json-path:0.8.1" level="project" /> | 72 | <orderEntry type="library" name="Maven: com.jayway.jsonpath:json-path:0.8.1" level="project" /> |
| 55 | <orderEntry type="library" name="Maven: net.minidev:json-smart:1.1.1" level="project" /> | 73 | <orderEntry type="library" name="Maven: net.minidev:json-smart:1.1.1" level="project" /> |
| 74 | + <orderEntry type="library" name="Maven: commons-lang:commons-lang:2.4" level="project" /> | ||
| 56 | <orderEntry type="library" name="Maven: com.alibaba:fastjson:1.2.7" level="project" /> | 75 | <orderEntry type="library" name="Maven: com.alibaba:fastjson:1.2.7" level="project" /> |
| 57 | <orderEntry type="library" name="Maven: org.seleniumhq.selenium:selenium-java:2.47.1" level="project" /> | 76 | <orderEntry type="library" name="Maven: org.seleniumhq.selenium:selenium-java:2.47.1" level="project" /> |
| 58 | <orderEntry type="library" name="Maven: org.seleniumhq.selenium:selenium-edge-driver:2.47.1" level="project" /> | 77 | <orderEntry type="library" name="Maven: org.seleniumhq.selenium:selenium-edge-driver:2.47.1" level="project" /> |
| @@ -61,23 +80,20 @@ | @@ -61,23 +80,20 @@ | ||
| 61 | <orderEntry type="library" name="Maven: com.google.code.gson:gson:2.3.1" level="project" /> | 80 | <orderEntry type="library" name="Maven: com.google.code.gson:gson:2.3.1" level="project" /> |
| 62 | <orderEntry type="library" name="Maven: org.seleniumhq.selenium:selenium-api:2.47.1" level="project" /> | 81 | <orderEntry type="library" name="Maven: org.seleniumhq.selenium:selenium-api:2.47.1" level="project" /> |
| 63 | <orderEntry type="library" name="Maven: org.apache.commons:commons-exec:1.3" level="project" /> | 82 | <orderEntry type="library" name="Maven: org.apache.commons:commons-exec:1.3" level="project" /> |
| 83 | + <orderEntry type="library" name="Maven: net.java.dev.jna:jna-platform:4.1.0" level="project" /> | ||
| 64 | <orderEntry type="library" name="Maven: org.seleniumhq.selenium:selenium-firefox-driver:2.47.1" level="project" /> | 84 | <orderEntry type="library" name="Maven: org.seleniumhq.selenium:selenium-firefox-driver:2.47.1" level="project" /> |
| 65 | <orderEntry type="library" name="Maven: org.seleniumhq.selenium:selenium-support:2.47.1" level="project" /> | 85 | <orderEntry type="library" name="Maven: org.seleniumhq.selenium:selenium-support:2.47.1" level="project" /> |
| 66 | <orderEntry type="library" name="Maven: org.webbitserver:webbit:0.4.14" level="project" /> | 86 | <orderEntry type="library" name="Maven: org.webbitserver:webbit:0.4.14" level="project" /> |
| 67 | <orderEntry type="library" name="Maven: io.netty:netty:3.9.8.Final" level="project" /> | 87 | <orderEntry type="library" name="Maven: io.netty:netty:3.9.8.Final" level="project" /> |
| 68 | <orderEntry type="library" name="Maven: org.seleniumhq.selenium:selenium-leg-rc:2.47.1" level="project" /> | 88 | <orderEntry type="library" name="Maven: org.seleniumhq.selenium:selenium-leg-rc:2.47.1" level="project" /> |
| 69 | <orderEntry type="library" name="Maven: org.quartz-scheduler:quartz:2.2.1" level="project" /> | 89 | <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 | <orderEntry type="library" name="Maven: net.java.dev.jna:jna:4.1.0" level="project" /> | 90 | <orderEntry type="library" name="Maven: net.java.dev.jna:jna:4.1.0" level="project" /> |
| 72 | <orderEntry type="library" name="Maven: com.fasterxml.jackson.core:jackson-databind:2.6.3" level="project" /> | 91 | <orderEntry type="library" name="Maven: com.fasterxml.jackson.core:jackson-databind:2.6.3" level="project" /> |
| 73 | <orderEntry type="library" name="Maven: com.fasterxml.jackson.core:jackson-annotations:2.6.0" level="project" /> | 92 | <orderEntry type="library" name="Maven: com.fasterxml.jackson.core:jackson-annotations:2.6.0" level="project" /> |
| 74 | <orderEntry type="library" name="Maven: com.fasterxml.jackson.core:jackson-core:2.6.3" level="project" /> | 93 | <orderEntry type="library" name="Maven: com.fasterxml.jackson.core:jackson-core:2.6.3" level="project" /> |
| 75 | <orderEntry type="library" name="Maven: org.apache.httpcomponents:fluent-hc:4.5.1" level="project" /> | 94 | <orderEntry type="library" name="Maven: org.apache.httpcomponents:fluent-hc:4.5.1" level="project" /> |
| 76 | <orderEntry type="library" name="Maven: org.apache.httpcomponents:httpmime:4.5.1" level="project" /> | 95 | <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 | <orderEntry type="library" name="Maven: joda-time:joda-time:2.9.1" level="project" /> | 96 | <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 | <orderEntry type="library" name="Maven: org.apache.commons:commons-math3:3.3" level="project" /> | 97 | <orderEntry type="library" name="Maven: org.apache.commons:commons-math3:3.3" level="project" /> |
| 82 | <orderEntry type="library" name="Maven: org.apache.commons:commons-pool2:2.3" level="project" /> | 98 | <orderEntry type="library" name="Maven: org.apache.commons:commons-pool2:2.3" level="project" /> |
| 83 | <orderEntry type="library" name="Maven: org.apache.tomcat:tomcat-jdbc:8.0.29" level="project" /> | 99 | <orderEntry type="library" name="Maven: org.apache.tomcat:tomcat-jdbc:8.0.29" level="project" /> |
| @@ -88,7 +104,6 @@ | @@ -88,7 +104,6 @@ | ||
| 88 | <orderEntry type="library" name="Maven: org.ow2.asm:asm:4.2" level="project" /> | 104 | <orderEntry type="library" name="Maven: org.ow2.asm:asm:4.2" level="project" /> |
| 89 | <orderEntry type="library" name="Maven: com.esotericsoftware:minlog:1.3.0" level="project" /> | 105 | <orderEntry type="library" name="Maven: com.esotericsoftware:minlog:1.3.0" level="project" /> |
| 90 | <orderEntry type="library" name="Maven: org.objenesis:objenesis:2.1" level="project" /> | 106 | <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 | <orderEntry type="library" name="Maven: org.slf4j:jcl-over-slf4j:1.7.13" level="project" /> | 107 | <orderEntry type="library" name="Maven: org.slf4j:jcl-over-slf4j:1.7.13" level="project" /> |
| 93 | <orderEntry type="library" name="Maven: org.slf4j:log4j-over-slf4j:1.7.13" level="project" /> | 108 | <orderEntry type="library" name="Maven: org.slf4j:log4j-over-slf4j:1.7.13" level="project" /> |
| 94 | <orderEntry type="library" name="Maven: ch.qos.logback:logback-core:1.1.3" level="project" /> | 109 | <orderEntry type="library" name="Maven: ch.qos.logback:logback-core:1.1.3" level="project" /> |
| @@ -103,16 +118,13 @@ | @@ -103,16 +118,13 @@ | ||
| 103 | <orderEntry type="library" name="Maven: org.postgresql:postgresql:9.4-1201-jdbc4" level="project" /> | 118 | <orderEntry type="library" name="Maven: org.postgresql:postgresql:9.4-1201-jdbc4" level="project" /> |
| 104 | <orderEntry type="library" name="Maven: mysql:mysql-connector-java:5.1.34" level="project" /> | 119 | <orderEntry type="library" name="Maven: mysql:mysql-connector-java:5.1.34" level="project" /> |
| 105 | <orderEntry type="library" name="Maven: org.apache.velocity:velocity:1.7" level="project" /> | 120 | <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 | <orderEntry type="library" name="Maven: commons-httpclient:commons-httpclient:3.0.1" level="project" /> | 121 | <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" /> | 122 | + <orderEntry type="library" scope="TEST" name="Maven: junit:junit:4.11" level="project" /> |
| 110 | <orderEntry type="library" name="Maven: dom4j:dom4j:1.6.1" level="project" /> | 123 | <orderEntry type="library" name="Maven: dom4j:dom4j:1.6.1" level="project" /> |
| 111 | <orderEntry type="library" name="Maven: xml-apis:xml-apis:1.0.b2" level="project" /> | 124 | <orderEntry type="library" name="Maven: xml-apis:xml-apis:1.0.b2" level="project" /> |
| 112 | <orderEntry type="library" name="Maven: jaxen:jaxen:1.1-beta" level="project" /> | 125 | <orderEntry type="library" name="Maven: jaxen:jaxen:1.1-beta" level="project" /> |
| 113 | <orderEntry type="library" name="Maven: sshxcute:sshxcute:1.0" level="project" /> | 126 | <orderEntry type="library" name="Maven: sshxcute:sshxcute:1.0" level="project" /> |
| 114 | <orderEntry type="library" scope="TEST" name="Maven: org.springframework:spring-test:4.2.3.RELEASE" level="project" /> | 127 | <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 | <orderEntry type="library" scope="TEST" name="Maven: org.hamcrest:hamcrest-core:1.3" level="project" /> | 128 | <orderEntry type="library" scope="TEST" name="Maven: org.hamcrest:hamcrest-core:1.3" level="project" /> |
| 117 | </component> | 129 | </component> |
| 118 | </module> | 130 | </module> |
| 119 | \ No newline at end of file | 131 | \ No newline at end of file |
src/main/java/com/canrd/patent/dal/mapper/UserMapper.java
0 → 100644
| 1 | +package com.canrd.patent.dal.mapper; | ||
| 2 | + | ||
| 3 | +import com.canrd.patent.dal.model.UserModel; | ||
| 4 | + | ||
| 5 | +import java.util.Set; | ||
| 6 | + | ||
| 7 | +/** | ||
| 8 | + * Created by litao on 16-7-27. | ||
| 9 | + */ | ||
| 10 | +public interface UserMapper { | ||
| 11 | + Set<UserModel> finds(); | ||
| 12 | + void add(UserModel userModel); | ||
| 13 | + void delete(int id); | ||
| 14 | + void update(UserModel userModel); | ||
| 15 | +} |
src/main/java/com/canrd/patent/dal/model/UserModel.java
0 → 100644
| 1 | +package com.canrd.patent.dal.model; | ||
| 2 | + | ||
| 3 | +/** | ||
| 4 | + * Created by litao on 16-7-27. | ||
| 5 | + */ | ||
| 6 | +public class UserModel { | ||
| 7 | + private int id; | ||
| 8 | + private String name; | ||
| 9 | + private String password; | ||
| 10 | + private String password_recover_key; | ||
| 11 | + private String email; | ||
| 12 | + private String role; | ||
| 13 | + private String createTime; | ||
| 14 | + private String updateTime; | ||
| 15 | + private String loginTime; | ||
| 16 | + | ||
| 17 | + public UserModel() { | ||
| 18 | + } | ||
| 19 | + | ||
| 20 | + public UserModel(int id) { | ||
| 21 | + this.id = id; | ||
| 22 | + } | ||
| 23 | + | ||
| 24 | + public UserModel(String name, String password) { | ||
| 25 | + this.name = name; | ||
| 26 | + this.password = password; | ||
| 27 | + } | ||
| 28 | + | ||
| 29 | + public int getId() { | ||
| 30 | + return id; | ||
| 31 | + } | ||
| 32 | + | ||
| 33 | + public void setId(int id) { | ||
| 34 | + this.id = id; | ||
| 35 | + } | ||
| 36 | + | ||
| 37 | + public String getName() { | ||
| 38 | + return name; | ||
| 39 | + } | ||
| 40 | + | ||
| 41 | + public void setName(String name) { | ||
| 42 | + this.name = name; | ||
| 43 | + } | ||
| 44 | + | ||
| 45 | + public String getPassword() { | ||
| 46 | + return password; | ||
| 47 | + } | ||
| 48 | + | ||
| 49 | + public void setPassword(String password) { | ||
| 50 | + this.password = password; | ||
| 51 | + } | ||
| 52 | + | ||
| 53 | + public String getPassword_recover_key() { | ||
| 54 | + return password_recover_key; | ||
| 55 | + } | ||
| 56 | + | ||
| 57 | + public void setPassword_recover_key(String password_recover_key) { | ||
| 58 | + this.password_recover_key = password_recover_key; | ||
| 59 | + } | ||
| 60 | + | ||
| 61 | + public String getEmail() { | ||
| 62 | + return email; | ||
| 63 | + } | ||
| 64 | + | ||
| 65 | + public void setEmail(String email) { | ||
| 66 | + this.email = email; | ||
| 67 | + } | ||
| 68 | + | ||
| 69 | + public String getCreateTime() { | ||
| 70 | + return createTime; | ||
| 71 | + } | ||
| 72 | + | ||
| 73 | + public void setCreateTime(String createTime) { | ||
| 74 | + this.createTime = createTime; | ||
| 75 | + } | ||
| 76 | + | ||
| 77 | + public String getLoginTime() { | ||
| 78 | + return loginTime; | ||
| 79 | + } | ||
| 80 | + | ||
| 81 | + public void setLoginTime(String loginTime) { | ||
| 82 | + this.loginTime = loginTime; | ||
| 83 | + } | ||
| 84 | + | ||
| 85 | + public String getUpdateTime() { | ||
| 86 | + return updateTime; | ||
| 87 | + } | ||
| 88 | + | ||
| 89 | + public void setUpdateTime(String updateTime) { | ||
| 90 | + this.updateTime = updateTime; | ||
| 91 | + } | ||
| 92 | + | ||
| 93 | + public String getRole() { | ||
| 94 | + return role; | ||
| 95 | + } | ||
| 96 | + | ||
| 97 | + public void setRole(String role) { | ||
| 98 | + this.role = role; | ||
| 99 | + } | ||
| 100 | +} |
src/main/java/com/canrd/patent/web/UserController.java
0 → 100644
| 1 | +package com.canrd.patent.web; | ||
| 2 | + | ||
| 3 | +import com.canrd.patent.dal.mapper.MybatisTestMapper; | ||
| 4 | +import com.canrd.patent.dal.mapper.UserMapper; | ||
| 5 | +import com.canrd.patent.dal.model.MybatisTest; | ||
| 6 | +import com.canrd.patent.dal.model.UserModel; | ||
| 7 | +import org.springframework.stereotype.Controller; | ||
| 8 | +import org.springframework.transaction.annotation.Transactional; | ||
| 9 | +import org.springframework.web.bind.annotation.RequestMapping; | ||
| 10 | +import org.springframework.web.bind.annotation.ResponseBody; | ||
| 11 | + | ||
| 12 | +import javax.annotation.Resource; | ||
| 13 | +import java.util.Set; | ||
| 14 | + | ||
| 15 | +/** | ||
| 16 | + * Created by litao on 16-7-27. | ||
| 17 | + */ | ||
| 18 | + | ||
| 19 | + | ||
| 20 | +/** | ||
| 21 | + * 调试的controller | ||
| 22 | + * Created by ouyangmao on 16/3/28. | ||
| 23 | + */ | ||
| 24 | +@Controller | ||
| 25 | +public class UserController { | ||
| 26 | + @Resource | ||
| 27 | + private UserMapper userMapper; | ||
| 28 | +// @Resource | ||
| 29 | +// MybatisTestMapper mybatisTestMapper; | ||
| 30 | + /*** | ||
| 31 | + * 返回json | ||
| 32 | + * @return | ||
| 33 | + */ | ||
| 34 | + @ResponseBody | ||
| 35 | + @RequestMapping(value="/helloUser") | ||
| 36 | + public Object helloJson(){ | ||
| 37 | + UserModel userModel = new UserModel(); | ||
| 38 | + userModel.setName("a"); | ||
| 39 | + userModel.setEmail("user@163.com"); | ||
| 40 | + return userModel; | ||
| 41 | + } | ||
| 42 | + | ||
| 43 | + /*** | ||
| 44 | + * 返回字符串 | ||
| 45 | + * @return | ||
| 46 | + */ | ||
| 47 | +/* @ResponseBody | ||
| 48 | + @RequestMapping(value="/helloforuser") | ||
| 49 | + public String hello(){ | ||
| 50 | + return "hello world"; | ||
| 51 | + }*/ | ||
| 52 | + /*** | ||
| 53 | + * 测试数据库连接 | ||
| 54 | + */ | ||
| 55 | + @ResponseBody | ||
| 56 | + @RequestMapping(value="/mybatis_handle_user") | ||
| 57 | + public String handl_find(){ | ||
| 58 | + | ||
| 59 | + Set<UserModel> userModelSet = userMapper.finds(); | ||
| 60 | + for(UserModel userModel:userModelSet){ | ||
| 61 | + System.out.println(userModel.getId()+","+userModel.getName()); | ||
| 62 | + } | ||
| 63 | + return "conn"; | ||
| 64 | + } | ||
| 65 | + | ||
| 66 | + /*** | ||
| 67 | + * 测试数据库连接 | ||
| 68 | + */ | ||
| 69 | + @ResponseBody | ||
| 70 | + @RequestMapping(value="/mybatis_handle_user_add") | ||
| 71 | + public String handl_add(){ | ||
| 72 | + return addService(); | ||
| 73 | + } | ||
| 74 | + | ||
| 75 | + @Transactional | ||
| 76 | + private String addService() { | ||
| 77 | + UserModel user = new UserModel(); | ||
| 78 | + user.setName("test"); | ||
| 79 | + user.setEmail("user@163.com"); | ||
| 80 | + userMapper.add(user); | ||
| 81 | + return "add success"; | ||
| 82 | + } | ||
| 83 | + | ||
| 84 | + /*** | ||
| 85 | + * 测试数据库连接 | ||
| 86 | + */ | ||
| 87 | + @ResponseBody | ||
| 88 | + @RequestMapping(value="/mybatis_handle_user_delete") | ||
| 89 | + public String handl_delete(){ | ||
| 90 | + userMapper.delete(2); | ||
| 91 | + return "delete success"; | ||
| 92 | + } | ||
| 93 | + | ||
| 94 | + /*** | ||
| 95 | + * 测试数据库连接 | ||
| 96 | + */ | ||
| 97 | + @ResponseBody | ||
| 98 | + @RequestMapping(value="/mybatis_handle_user_update") | ||
| 99 | + public String handl_update(){ | ||
| 100 | + UserModel user = new UserModel(); | ||
| 101 | + user.setName("xxx"); | ||
| 102 | + user.setId(1); | ||
| 103 | + userMapper.update(user); | ||
| 104 | + return "update success"; | ||
| 105 | + } | ||
| 106 | + | ||
| 107 | + /*** | ||
| 108 | + * 测试数据库连接 | ||
| 109 | + */ | ||
| 110 | +/* @ResponseBody | ||
| 111 | + @RequestMapping(value="/mybatis_auto_user") | ||
| 112 | + public String auto_find(){ | ||
| 113 | + MybatisTest mybatisTest = mybatisTestMapper.selectByPrimaryKey(1l); | ||
| 114 | + System.out.println(mybatisTest.getId()+","+mybatisTest.getName()+","+mybatisTest.getAge()); | ||
| 115 | + return "conn"; | ||
| 116 | + }*/ | ||
| 117 | +} | ||
| 118 | + |
src/main/resources.local/props/jdbc.properties
| 1 | # \u3010DEV\u3011 | 1 | # \u3010DEV\u3011 |
| 2 | jdbc.canrd.url = jdbc:mysql://127.0.0.1:3306/patent?characterEncoding=utf8 | 2 | jdbc.canrd.url = jdbc:mysql://127.0.0.1:3306/patent?characterEncoding=utf8 |
| 3 | jdbc.canrd.username = root | 3 | jdbc.canrd.username = root |
| 4 | -jdbc.canrd.password = miao.1201 | 4 | +jdbc.canrd.password = 123123 |
| 5 | jdbc.canrd.max.conn = 10 | 5 | jdbc.canrd.max.conn = 10 |
| 6 | jdbc.canrd.min.conn = 1 | 6 | jdbc.canrd.min.conn = 1 |
| 7 | jdbc.canrd.wait.millis = 10000 | 7 | jdbc.canrd.wait.millis = 10000 |
| 8 | \ No newline at end of file | 8 | \ No newline at end of file |
src/main/resources.prod/props/jdbc.properties
| 1 | # \u3010DEV\u3011 | 1 | # \u3010DEV\u3011 |
| 2 | jdbc.canrd.url = jdbc:mysql://127.0.0.1:3306/jfinalshop?characterEncoding=utf8 | 2 | jdbc.canrd.url = jdbc:mysql://127.0.0.1:3306/jfinalshop?characterEncoding=utf8 |
| 3 | jdbc.canrd.username = root | 3 | jdbc.canrd.username = root |
| 4 | -jdbc.canrd.password = miao.1201 | 4 | +jdbc.canrd.password = 123123 |
| 5 | jdbc.canrd.max.conn = 10 | 5 | jdbc.canrd.max.conn = 10 |
| 6 | jdbc.canrd.min.conn = 1 | 6 | jdbc.canrd.min.conn = 1 |
| 7 | jdbc.canrd.wait.millis = 10000 | 7 | jdbc.canrd.wait.millis = 10000 |
| 8 | \ No newline at end of file | 8 | \ No newline at end of file |
src/main/resources/mapper/user.xml
0 → 100644
| 1 | +<?xml version="1.0" encoding="UTF-8" ?> | ||
| 2 | +<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd"> | ||
| 3 | +<mapper namespace="com.canrd.patent.dal.mapper.UserMapper"> | ||
| 4 | + <select id="finds" resultType="UserModel"><![CDATA[ | ||
| 5 | +SELECT | ||
| 6 | + id, name | ||
| 7 | +FROM user | ||
| 8 | +]]></select> | ||
| 9 | + <insert id="add" parameterType="com.canrd.patent.dal.model.UserModel"> | ||
| 10 | + <selectKey keyProperty="id" order="AFTER" resultType="java.lang.Integer"> | ||
| 11 | + select LAST_INSERT_ID() | ||
| 12 | + </selectKey> | ||
| 13 | + insert into user(name,email) | ||
| 14 | + values(#{name},#{email}) | ||
| 15 | + </insert> | ||
| 16 | + | ||
| 17 | + <delete id="delete" parameterType="int"> | ||
| 18 | + delete from user where id=#{id} | ||
| 19 | + </delete> | ||
| 20 | + | ||
| 21 | + <update id="update" parameterType="com.canrd.patent.dal.model.UserModel"> | ||
| 22 | + update user set name=#{name},age=#{age} | ||
| 23 | + where id=#{id} | ||
| 24 | + </update> | ||
| 25 | +</mapper> | ||
| 0 | \ No newline at end of file | 26 | \ No newline at end of file |
target/classes/com/canrd/patent/dal/dto/HomePatentTypeOutputDto.class
No preview for this file type
target/classes/props/jdbc.properties
| 1 | # \u3010DEV\u3011 | 1 | # \u3010DEV\u3011 |
| 2 | jdbc.canrd.url = jdbc:mysql://127.0.0.1:3306/patent?characterEncoding=utf8 | 2 | jdbc.canrd.url = jdbc:mysql://127.0.0.1:3306/patent?characterEncoding=utf8 |
| 3 | jdbc.canrd.username = root | 3 | jdbc.canrd.username = root |
| 4 | -jdbc.canrd.password = miao.1201 | 4 | +jdbc.canrd.password = 123123 |
| 5 | jdbc.canrd.max.conn = 10 | 5 | jdbc.canrd.max.conn = 10 |
| 6 | jdbc.canrd.min.conn = 1 | 6 | jdbc.canrd.min.conn = 1 |
| 7 | jdbc.canrd.wait.millis = 10000 | 7 | jdbc.canrd.wait.millis = 10000 |
| 8 | \ No newline at end of file | 8 | \ No newline at end of file |
target/patent/WEB-INF/classes/com/canrd/patent/dal/dto/HomePatentTypeOutputDto.class
No preview for this file type
target/patent/WEB-INF/classes/props/jdbc.properties
| 1 | # \u3010DEV\u3011 | 1 | # \u3010DEV\u3011 |
| 2 | jdbc.canrd.url = jdbc:mysql://127.0.0.1:3306/patent?characterEncoding=utf8 | 2 | jdbc.canrd.url = jdbc:mysql://127.0.0.1:3306/patent?characterEncoding=utf8 |
| 3 | jdbc.canrd.username = root | 3 | jdbc.canrd.username = root |
| 4 | -jdbc.canrd.password = miao.1201 | 4 | +jdbc.canrd.password = 123123 |
| 5 | jdbc.canrd.max.conn = 10 | 5 | jdbc.canrd.max.conn = 10 |
| 6 | jdbc.canrd.min.conn = 1 | 6 | jdbc.canrd.min.conn = 1 |
| 7 | jdbc.canrd.wait.millis = 10000 | 7 | jdbc.canrd.wait.millis = 10000 |
| 8 | \ No newline at end of file | 8 | \ No newline at end of file |