kelude / canrd-patent · Commits

Commit 3c747f51106caafca66ea4e4ba8fd801d1bbde1e

Authored by litao
1 parent c5a704ba

test

Inline Side-by-side
Showing 1 changed file with 6 additions and 42 deletions
.idea/workspace.xml
  View file @3c747f5
@@ -2,17 +2,7 @@ @@ -2,17 +2,7 @@
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="NEW" beforePath="" afterPath="$PROJECT_DIR$/src/main/webapp/customer_contact.jsp" />  
6 - <change type="MODIFICATION" beforePath="$PROJECT_DIR$/target/classes/com/canrd/patent/dal/dto/HomePatentTypeOutputDto.class" afterPath="$PROJECT_DIR$/target/classes/com/canrd/patent/dal/dto/HomePatentTypeOutputDto.class" />  
7 - <change type="MODIFICATION" beforePath="$PROJECT_DIR$/target/patent.war" afterPath="$PROJECT_DIR$/target/patent.war" />  
8 - <change type="MODIFICATION" beforePath="$PROJECT_DIR$/target/patent/WEB-INF/classes/com/canrd/patent/dal/dto/HomePatentTypeOutputDto.class" afterPath="$PROJECT_DIR$/target/patent/WEB-INF/classes/com/canrd/patent/dal/dto/HomePatentTypeOutputDto.class" />  
9 - <change type="MODIFICATION" beforePath="$PROJECT_DIR$/.idea/artifacts/patent_war_exploded.xml" afterPath="$PROJECT_DIR$/.idea/artifacts/patent_war_exploded.xml" />  
10 - <change type="MODIFICATION" beforePath="$PROJECT_DIR$/.idea/compiler.xml" afterPath="$PROJECT_DIR$/.idea/compiler.xml" />  
11 <change type="MODIFICATION" beforePath="$PROJECT_DIR$/.idea/workspace.xml" afterPath="$PROJECT_DIR$/.idea/workspace.xml" /> 5 <change type="MODIFICATION" beforePath="$PROJECT_DIR$/.idea/workspace.xml" afterPath="$PROJECT_DIR$/.idea/workspace.xml" />
12 - <change type="MODIFICATION" beforePath="$PROJECT_DIR$/patent.iml" afterPath="$PROJECT_DIR$/patent.iml" />  
13 - <change type="MODIFICATION" beforePath="$PROJECT_DIR$/src/main/resources.local/props/jdbc.properties" afterPath="$PROJECT_DIR$/src/main/resources.local/props/jdbc.properties" />  
14 - <change type="MODIFICATION" beforePath="$PROJECT_DIR$/target/classes/props/jdbc.properties" afterPath="$PROJECT_DIR$/target/classes/props/jdbc.properties" />  
15 - <change type="MODIFICATION" beforePath="$PROJECT_DIR$/target/patent/WEB-INF/classes/props/jdbc.properties" afterPath="$PROJECT_DIR$/target/patent/WEB-INF/classes/props/jdbc.properties" />  
16 </list> 6 </list>
17 <ignored path="patent.iws" /> 7 <ignored path="patent.iws" />
18 <ignored path=".idea/workspace.xml" /> 8 <ignored path=".idea/workspace.xml" />
@@ -58,8 +48,8 @@ @@ -58,8 +48,8 @@
58 <file leaf-file-name="customer_contact.jsp" pinned="false" current-in-tab="true"> 48 <file leaf-file-name="customer_contact.jsp" pinned="false" current-in-tab="true">
59 <entry file="file://$PROJECT_DIR$/src/main/webapp/customer_contact.jsp"> 49 <entry file="file://$PROJECT_DIR$/src/main/webapp/customer_contact.jsp">
60 <provider selected="true" editor-type-id="text-editor"> 50 <provider selected="true" editor-type-id="text-editor">
61 - <state relative-caret-position="248">  
62 - <caret line="36" column="10" selection-start-line="36" selection-start-column="10" selection-end-line="36" selection-end-column="10" /> 51 + <state relative-caret-position="203">
  52 + <caret line="33" column="13" selection-start-line="33" selection-start-column="13" selection-end-line="33" selection-end-column="13" />
63 <folding /> 53 <folding />
64 </state> 54 </state>
65 </provider> 55 </provider>
@@ -335,32 +325,6 @@ @@ -335,32 +325,6 @@
335 <option name="myItemId" value="main" /> 325 <option name="myItemId" value="main" />
336 <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" /> 326 <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
337 </PATH_ELEMENT> 327 </PATH_ELEMENT>
338 - <PATH_ELEMENT>  
339 - <option name="myItemId" value="webapp" />  
340 - <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />  
341 - </PATH_ELEMENT>  
342 - <PATH_ELEMENT>  
343 - <option name="myItemId" value="css" />  
344 - <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />  
345 - </PATH_ELEMENT>  
346 - </PATH>  
347 - <PATH>  
348 - <PATH_ELEMENT>  
349 - <option name="myItemId" value="patent" />  
350 - <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewProjectNode" />  
351 - </PATH_ELEMENT>  
352 - <PATH_ELEMENT>  
353 - <option name="myItemId" value="canrd-patent" />  
354 - <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />  
355 - </PATH_ELEMENT>  
356 - <PATH_ELEMENT>  
357 - <option name="myItemId" value="src" />  
358 - <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />  
359 - </PATH_ELEMENT>  
360 - <PATH_ELEMENT>  
361 - <option name="myItemId" value="main" />  
362 - <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />  
363 - </PATH_ELEMENT>  
364 </PATH> 328 </PATH>
365 <PATH> 329 <PATH>
366 <PATH_ELEMENT> 330 <PATH_ELEMENT>
@@ -1225,12 +1189,12 @@ @@ -1225,12 +1189,12 @@
1225 <workItem from="1469243959439" duration="3683000" /> 1189 <workItem from="1469243959439" duration="3683000" />
1226 <workItem from="1469260205882" duration="12837000" /> 1190 <workItem from="1469260205882" duration="12837000" />
1227 <workItem from="1469585749367" duration="1353000" /> 1191 <workItem from="1469585749367" duration="1353000" />
1228 - <workItem from="1471243326631" duration="16302000" /> 1192 + <workItem from="1471243326631" duration="16861000" />
1229 </task> 1193 </task>
1230 <servers /> 1194 <servers />
1231 </component> 1195 </component>
1232 <component name="TimeTrackingManager"> 1196 <component name="TimeTrackingManager">
1233 - <option name="totallyTimeSpent" value="112030000" /> 1197 + <option name="totallyTimeSpent" value="112589000" />
1234 </component> 1198 </component>
1235 <component name="ToolWindowManager"> 1199 <component name="ToolWindowManager">
1236 <frame x="65" y="24" width="1855" height="1056" extended-state="6" /> 1200 <frame x="65" y="24" width="1855" height="1056" extended-state="6" />
@@ -1664,8 +1628,8 @@ @@ -1664,8 +1628,8 @@
1664 </entry> 1628 </entry>
1665 <entry file="file://$PROJECT_DIR$/src/main/webapp/customer_contact.jsp"> 1629 <entry file="file://$PROJECT_DIR$/src/main/webapp/customer_contact.jsp">
1666 <provider selected="true" editor-type-id="text-editor"> 1630 <provider selected="true" editor-type-id="text-editor">
1667 - <state relative-caret-position="248">  
1668 - <caret line="36" column="10" selection-start-line="36" selection-start-column="10" selection-end-line="36" selection-end-column="10" /> 1631 + <state relative-caret-position="203">
  1632 + <caret line="33" column="13" selection-start-line="33" selection-start-column="13" selection-end-line="33" selection-end-column="13" />
1669 <folding /> 1633 <folding />
1670 </state> 1634 </state>
1671 </provider> 1635 </provider>