| |
@@ -1,7 +1,9 @@ |
| 1 |
1 |
|
<?xml version="1.0" encoding="UTF-8"?> |
| 2 |
2 |
|
<project version="4"> |
| 3 |
3 |
|
<component name="ChangeListManager"> |
| 4 |
|
- |
<list default="true" readonly="true" id="7eb57e59-81a0-4808-8811-f20bd689adf7" name="Default" comment="" /> |
| |
4 |
+ |
<list default="true" readonly="true" id="7eb57e59-81a0-4808-8811-f20bd689adf7" name="Default" comment=""> |
| |
5 |
+ |
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/ImageServlet.ipr" afterPath="$PROJECT_DIR$/ImageServlet.ipr" /> |
| |
6 |
+ |
</list> |
| 5 |
7 |
|
<ignored path=".idea/workspace.xml" /> |
| 6 |
8 |
|
<ignored path="ImageServlet.iws" /> |
| 7 |
9 |
|
<option name="TRACKING_ENABLED" value="true" /> |
| |
@@ -76,15 +78,14 @@ |
| 76 |
78 |
|
<component name="FavoritesManager"> |
| 77 |
79 |
|
<favorites_list name="ImageServlet" /> |
| 78 |
80 |
|
</component> |
| 79 |
|
- |
<component name="FileColors" enabled="true" enabledForTabs="true" /> |
| 80 |
81 |
|
<component name="FileEditorManager"> |
| 81 |
82 |
|
<splitter split-orientation="vertical" split-proportion="0.7798777"> |
| 82 |
83 |
|
<split-first> |
| 83 |
84 |
|
<leaf> |
| 84 |
|
- |
<file leaf-file-name="ImageServlet.java" pinned="false" current="true" current-in-tab="true"> |
| |
85 |
+ |
<file leaf-file-name="ImageServlet.java" pinned="false" current="false" current-in-tab="true"> |
| 85 |
86 |
|
<entry file="file://$PROJECT_DIR$/src/org/litesoft/servlet/imageservlet/ImageServlet.java"> |
| 86 |
87 |
|
<provider selected="true" editor-type-id="text-editor"> |
| 87 |
|
- |
<state line="7" column="62" selection-start="233" selection-end="233" vertical-scroll-proportion="0.08686131"> |
| |
88 |
+ |
<state line="7" column="62" selection-start="233" selection-end="233" vertical-scroll-proportion="0.024926687"> |
| 88 |
89 |
|
<folding /> |
| 89 |
90 |
|
</state> |
| 90 |
91 |
|
</provider> |
| |
@@ -94,22 +95,13 @@ |
| 94 |
95 |
|
</split-first> |
| 95 |
96 |
|
<split-second> |
| 96 |
97 |
|
<leaf> |
| 97 |
|
- |
<file leaf-file-name="web.xml" pinned="false" current="false" current-in-tab="true"> |
| |
98 |
+ |
<file leaf-file-name="web.xml" pinned="false" current="true" current-in-tab="true"> |
| 98 |
99 |
|
<entry file="file://$PROJECT_DIR$/web/WEB-INF/web.xml"> |
| 99 |
|
- |
<provider editor-type-id="com.intellij.javaee.module.view.web.viewlets.WebModuleAssemblyDescriptorProvider"> |
| 100 |
|
- |
<state /> |
| 101 |
|
- |
</provider> |
| 102 |
100 |
|
<provider selected="true" editor-type-id="text-editor"> |
| 103 |
|
- |
<state line="14" column="0" selection-start="540" selection-end="540" vertical-scroll-proportion="0.5114943"> |
| |
101 |
+ |
<state line="14" column="0" selection-start="540" selection-end="540" vertical-scroll-proportion="0.098265894"> |
| 104 |
102 |
|
<folding /> |
| 105 |
103 |
|
</state> |
| 106 |
104 |
|
</provider> |
| 107 |
|
- |
<provider editor-type-id="com.intellij.javaee.module.view.web.viewlets.WebModuleGeneralEditorProvider"> |
| 108 |
|
- |
<state /> |
| 109 |
|
- |
</provider> |
| 110 |
|
- |
<provider editor-type-id="com.intellij.javaee.module.view.web.viewlets.WebModuleAssemblyDescriptorReferencesProvider"> |
| 111 |
|
- |
<state /> |
| 112 |
|
- |
</provider> |
| 113 |
105 |
|
</entry> |
| 114 |
106 |
|
</file> |
| 115 |
107 |
|
</leaf> |
| |
@@ -146,7 +138,7 @@ |
| 146 |
138 |
|
<profile-state /> |
| 147 |
139 |
|
</entry> |
| 148 |
140 |
|
</component> |
| 149 |
|
- |
<component name="ProjectLevelVcsManager"> |
| |
141 |
+ |
<component name="ProjectLevelVcsManager" settingsEditedManually="false"> |
| 150 |
142 |
|
<OptionsSetting value="true" id="Add" /> |
| 151 |
143 |
|
<OptionsSetting value="true" id="Remove" /> |
| 152 |
144 |
|
<OptionsSetting value="true" id="Checkout" /> |
| |
@@ -216,24 +208,6 @@ |
| 216 |
208 |
|
<option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" /> |
| 217 |
209 |
|
</PATH_ELEMENT> |
| 218 |
210 |
|
<PATH_ELEMENT> |
| 219 |
|
- |
<option name="myItemId" value="web" /> |
| 220 |
|
- |
<option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" /> |
| 221 |
|
- |
</PATH_ELEMENT> |
| 222 |
|
- |
<PATH_ELEMENT> |
| 223 |
|
- |
<option name="myItemId" value="WEB-INF" /> |
| 224 |
|
- |
<option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" /> |
| 225 |
|
- |
</PATH_ELEMENT> |
| 226 |
|
- |
</PATH> |
| 227 |
|
- |
<PATH> |
| 228 |
|
- |
<PATH_ELEMENT> |
| 229 |
|
- |
<option name="myItemId" value="ImageServlet" /> |
| 230 |
|
- |
<option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewProjectNode" /> |
| 231 |
|
- |
</PATH_ELEMENT> |
| 232 |
|
- |
<PATH_ELEMENT> |
| 233 |
|
- |
<option name="myItemId" value="ImageServlet" /> |
| 234 |
|
- |
<option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" /> |
| 235 |
|
- |
</PATH_ELEMENT> |
| 236 |
|
- |
<PATH_ELEMENT> |
| 237 |
211 |
|
<option name="myItemId" value="src" /> |
| 238 |
212 |
|
<option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" /> |
| 239 |
213 |
|
</PATH_ELEMENT> |
| |
@@ -241,18 +215,6 @@ |
| 241 |
215 |
|
<option name="myItemId" value="org" /> |
| 242 |
216 |
|
<option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" /> |
| 243 |
217 |
|
</PATH_ELEMENT> |
| 244 |
|
- |
<PATH_ELEMENT> |
| 245 |
|
- |
<option name="myItemId" value="litesoft" /> |
| 246 |
|
- |
<option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" /> |
| 247 |
|
- |
</PATH_ELEMENT> |
| 248 |
|
- |
<PATH_ELEMENT> |
| 249 |
|
- |
<option name="myItemId" value="servlet" /> |
| 250 |
|
- |
<option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" /> |
| 251 |
|
- |
</PATH_ELEMENT> |
| 252 |
|
- |
<PATH_ELEMENT> |
| 253 |
|
- |
<option name="myItemId" value="imageservlet" /> |
| 254 |
|
- |
<option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" /> |
| 255 |
|
- |
</PATH_ELEMENT> |
| 256 |
218 |
|
</PATH> |
| 257 |
219 |
|
</subPane> |
| 258 |
220 |
|
</pane> |
| |
@@ -260,17 +222,17 @@ |
| 260 |
222 |
|
</panes> |
| 261 |
223 |
|
</component> |
| 262 |
224 |
|
<component name="PropertiesComponent"> |
| 263 |
|
- |
<property name="project.structure.last.edited" value="Modules" /> |
| 264 |
225 |
|
<property name="GoToFile.includeJavaFiles" value="false" /> |
| 265 |
|
- |
<property name="project.structure.proportion" value="0.15" /> |
| 266 |
|
- |
<property name="GoToClass.toSaveIncludeLibraries" value="false" /> |
| |
226 |
+ |
<property name="project.structure.last.edited" value="Modules" /> |
| 267 |
227 |
|
<property name="OverrideImplement.combined" value="true" /> |
| |
228 |
+ |
<property name="GoToClass.toSaveIncludeLibraries" value="false" /> |
| |
229 |
+ |
<property name="project.structure.proportion" value="0.15" /> |
| 268 |
230 |
|
<property name="WebServerToolWindowFactoryState" value="false" /> |
| 269 |
|
- |
<property name="MemberChooser.sorted" value="false" /> |
| 270 |
231 |
|
<property name="recentsLimit" value="5" /> |
| |
232 |
+ |
<property name="MemberChooser.sorted" value="false" /> |
| 271 |
233 |
|
<property name="MemberChooser.showClasses" value="true" /> |
| 272 |
|
- |
<property name="project.structure.side.proportion" value="0.2" /> |
| 273 |
234 |
|
<property name="GoToClass.includeLibraries" value="false" /> |
| |
235 |
+ |
<property name="project.structure.side.proportion" value="0.2" /> |
| 274 |
236 |
|
<property name="MemberChooser.copyJavadoc" value="false" /> |
| 275 |
237 |
|
</component> |
| 276 |
238 |
|
<component name="RecentsManager"> |
| |
@@ -278,7 +240,7 @@ |
| 278 |
240 |
|
<recent name="org.litesoft.servlet.imageservlet.ImageServlet" /> |
| 279 |
241 |
|
</key> |
| 280 |
242 |
|
</component> |
| 281 |
|
- |
<component name="RunManager" selected="Tomcat Server.ImageServlet"> |
| |
243 |
+ |
<component name="RunManager"> |
| 282 |
244 |
|
<configuration default="true" type="Remote" factoryName="Remote"> |
| 283 |
245 |
|
<option name="USE_SOCKET_TRANSPORT" value="true" /> |
| 284 |
246 |
|
<option name="SERVER_MODE" value="false" /> |
| |
@@ -311,7 +273,6 @@ |
| 311 |
273 |
|
</configuration> |
| 312 |
274 |
|
<configuration default="true" type="Application" factoryName="Application"> |
| 313 |
275 |
|
<extension name="coverage" enabled="false" merge="false" /> |
| 314 |
|
- |
<extension name="snapshooter" /> |
| 315 |
276 |
|
<option name="MAIN_CLASS_NAME" /> |
| 316 |
277 |
|
<option name="VM_PARAMETERS" /> |
| 317 |
278 |
|
<option name="PROGRAM_PARAMETERS" /> |
| |
@@ -332,7 +293,6 @@ |
| 332 |
293 |
|
</configuration> |
| 333 |
294 |
|
<configuration default="true" type="JUnit" factoryName="JUnit"> |
| 334 |
295 |
|
<extension name="coverage" enabled="false" merge="false" /> |
| 335 |
|
- |
<extension name="snapshooter" /> |
| 336 |
296 |
|
<module name="" /> |
| 337 |
297 |
|
<option name="ALTERNATIVE_JRE_PATH_ENABLED" value="false" /> |
| 338 |
298 |
|
<option name="ALTERNATIVE_JRE_PATH" /> |
| |
@@ -349,20 +309,7 @@ |
| 349 |
309 |
|
<value defaultName="moduleWithDependencies" /> |
| 350 |
310 |
|
</option> |
| 351 |
311 |
|
<envs /> |
| 352 |
|
- |
<method> |
| 353 |
|
- |
<option name="AntTarget" enabled="false" /> |
| 354 |
|
- |
<option name="BuildArtifacts" enabled="false" /> |
| 355 |
|
- |
<option name="Make" enabled="true" /> |
| 356 |
|
- |
<option name="Maven.BeforeRunTask" enabled="false" /> |
| 357 |
|
- |
</method> |
| 358 |
|
- |
</configuration> |
| 359 |
|
- |
<configuration default="true" type="#com.intellij.j2ee.web.tomcat.TomcatRunConfigurationFactory" factoryName="Local"> |
| 360 |
|
- |
<deployment /> |
| 361 |
|
- |
<server-settings> |
| 362 |
|
- |
<option name="DEPLOY_TOMCAT_MANAGER" value="false" /> |
| 363 |
|
- |
<option name="BASE_DIRECTORY_NAME" value="" /> |
| 364 |
|
- |
</server-settings> |
| 365 |
|
- |
<predefined_log_file id="TOMCAT_LOCALHOST_LOG_ID" enabled="true" /> |
| |
312 |
+ |
<patterns /> |
| 366 |
313 |
|
<method> |
| 367 |
314 |
|
<option name="AntTarget" enabled="false" /> |
| 368 |
315 |
|
<option name="BuildArtifacts" enabled="false" /> |
| |
@@ -426,9 +373,7 @@ |
| 426 |
373 |
|
</option> |
| 427 |
374 |
|
</method> |
| 428 |
375 |
|
</configuration> |
| 429 |
|
- |
<list size="1"> |
| 430 |
|
- |
<item index="0" class="java.lang.String" itemvalue="Tomcat Server.ImageServlet" /> |
| 431 |
|
- |
</list> |
| |
376 |
+ |
<list size="0" /> |
| 432 |
377 |
|
<configuration name="<template>" type="WebApp" default="true" selected="false"> |
| 433 |
378 |
|
<Host>localhost</Host> |
| 434 |
379 |
|
<Port>5050</Port> |
| |
@@ -439,7 +384,6 @@ |
| 439 |
384 |
|
<option name="USER" value="" /> |
| 440 |
385 |
|
<option name="PASSWORD" value="" /> |
| 441 |
386 |
|
<option name="LAST_MERGED_REVISION" /> |
| 442 |
|
- |
<option name="UPDATE_RUN_STATUS" value="false" /> |
| 443 |
387 |
|
<option name="MERGE_DRY_RUN" value="false" /> |
| 444 |
388 |
|
<option name="MERGE_DIFF_USE_ANCESTRY" value="true" /> |
| 445 |
389 |
|
<option name="UPDATE_LOCK_ON_DEMAND" value="false" /> |
| |
@@ -448,10 +392,29 @@ |
| 448 |
392 |
|
<option name="CHECK_NESTED_FOR_QUICK_MERGE" value="false" /> |
| 449 |
393 |
|
<option name="IGNORE_SPACES_IN_ANNOTATE" value="true" /> |
| 450 |
394 |
|
<option name="SHOW_MERGE_SOURCES_IN_ANNOTATE" value="true" /> |
| |
395 |
+ |
<option name="FORCE_UPDATE" value="false" /> |
| 451 |
396 |
|
<configuration useDefault="false">C:\Users\George\AppData\Roaming\Subversion</configuration> |
| 452 |
397 |
|
<myIsUseDefaultProxy>false</myIsUseDefaultProxy> |
| 453 |
398 |
|
<supportedVersion>125</supportedVersion> |
| 454 |
399 |
|
</component> |
| |
400 |
+ |
<component name="SvnFileUrlMappingImpl"> |
| |
401 |
+ |
<option name="myMappingRoots"> |
| |
402 |
+ |
<list> |
| |
403 |
+ |
<SvnCopyRootSimple> |
| |
404 |
+ |
<option name="myVcsRoot" value="C:\zDev\litesoft\Java\ImageServlet" /> |
| |
405 |
+ |
<option name="myCopyRoot" value="C:\zDev\litesoft\Java\ImageServlet" /> |
| |
406 |
+ |
</SvnCopyRootSimple> |
| |
407 |
+ |
</list> |
| |
408 |
+ |
</option> |
| |
409 |
+ |
<option name="myMoreRealMappingRoots"> |
| |
410 |
+ |
<list> |
| |
411 |
+ |
<SvnCopyRootSimple> |
| |
412 |
+ |
<option name="myVcsRoot" value="C:\zDev\litesoft\Java\ImageServlet" /> |
| |
413 |
+ |
<option name="myCopyRoot" value="C:\zDev\litesoft\Java\ImageServlet" /> |
| |
414 |
+ |
</SvnCopyRootSimple> |
| |
415 |
+ |
</list> |
| |
416 |
+ |
</option> |
| |
417 |
+ |
</component> |
| 455 |
418 |
|
<component name="TaskManager"> |
| 456 |
419 |
|
<task active="true" id="Default" summary="Default task"> |
| 457 |
420 |
|
<changelist id="7eb57e59-81a0-4808-8811-f20bd689adf7" name="Default" comment="" /> |
| |
@@ -461,26 +424,26 @@ |
| 461 |
424 |
|
<servers /> |
| 462 |
425 |
|
</component> |
| 463 |
426 |
|
<component name="ToolWindowManager"> |
| 464 |
|
- |
<frame x="1600" y="-301" width="1200" height="1920" extended-state="0" /> |
| 465 |
|
- |
<editor active="true" /> |
| |
427 |
+ |
<frame x="724" y="-1028" width="1288" height="1032" extended-state="6" /> |
| |
428 |
+ |
<editor active="false" /> |
| 466 |
429 |
|
<layout> |
| 467 |
430 |
|
<window_info id="Changes" 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" /> |
| 468 |
431 |
|
<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="0" side_tool="false" content_ui="tabs" /> |
| 469 |
|
- |
<window_info id="Ant Build" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.25" sideWeight="0.5" order="12" side_tool="false" content_ui="tabs" /> |
| 470 |
|
- |
<window_info id="Debug" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.28349084" sideWeight="0.5" order="7" side_tool="false" content_ui="tabs" /> |
| 471 |
|
- |
<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="1" side_tool="false" content_ui="tabs" /> |
| 472 |
|
- |
<window_info id="Messages" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.32962757" sideWeight="0.0" order="2" side_tool="false" content_ui="tabs" /> |
| 473 |
432 |
|
<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="10" side_tool="false" content_ui="tabs" /> |
| 474 |
|
- |
<window_info id="Web" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" sideWeight="0.5" order="15" side_tool="true" content_ui="tabs" /> |
| |
433 |
+ |
<window_info id="Ant Build" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.25" sideWeight="0.5" order="12" side_tool="false" content_ui="tabs" /> |
| 475 |
434 |
|
<window_info id="Structure" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="FLOATING" visible="false" weight="0.24957265" sideWeight="0.5" order="14" side_tool="true" content_ui="tabs" x="914" y="0" width="292" height="745" /> |
| |
435 |
+ |
<window_info id="Commander" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.4" sideWeight="0.5" order="1" side_tool="false" content_ui="tabs" /> |
| 476 |
436 |
|
<window_info id="Maven Projects" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" sideWeight="0.5" order="13" side_tool="false" content_ui="tabs" /> |
| 477 |
|
- |
<window_info id="Project" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="FLOATING" visible="true" weight="0.25" sideWeight="0.5" order="11" side_tool="false" content_ui="tabs" x="1206" y="-1" width="395" height="917" /> |
| 478 |
437 |
|
<window_info id="Dependency Viewer" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" sideWeight="0.5" order="3" side_tool="false" content_ui="tabs" /> |
| |
438 |
+ |
<window_info id="Project" active="true" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="FLOATING" visible="true" weight="0.25" sideWeight="0.5" order="11" side_tool="false" content_ui="tabs" x="1206" y="-1" width="395" height="917" /> |
| |
439 |
+ |
<window_info id="Debug" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.28349084" sideWeight="0.5" order="7" side_tool="false" content_ui="tabs" /> |
| 479 |
440 |
|
<window_info id="Run" 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" /> |
| |
441 |
+ |
<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="1" side_tool="false" content_ui="tabs" /> |
| 480 |
442 |
|
<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="8" side_tool="false" content_ui="tabs" /> |
| 481 |
443 |
|
<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="4" side_tool="false" content_ui="tabs" /> |
| 482 |
444 |
|
<window_info id="Find" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" sideWeight="0.5" order="5" side_tool="false" content_ui="tabs" /> |
| 483 |
|
- |
<window_info id="Commander" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.4" sideWeight="0.5" order="1" side_tool="false" content_ui="tabs" /> |
| |
445 |
+ |
<window_info id="Messages" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.32962757" sideWeight="0.0" order="2" side_tool="false" content_ui="tabs" /> |
| |
446 |
+ |
<window_info id="Web" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" sideWeight="0.5" order="15" side_tool="true" content_ui="tabs" /> |
| 484 |
447 |
|
<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="tabs" /> |
| 485 |
448 |
|
<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="9" side_tool="false" content_ui="tabs" /> |
| 486 |
449 |
|
</layout> |
| |
@@ -497,6 +460,8 @@ |
| 497 |
460 |
|
<option name="CHECK_LOCALLY_CHANGED_CONFLICTS_IN_BACKGROUND" value="false" /> |
| 498 |
461 |
|
<option name="ENABLE_BACKGROUND_PROCESSES" value="false" /> |
| 499 |
462 |
|
<option name="CHANGED_ON_SERVER_INTERVAL" value="60" /> |
| |
463 |
+ |
<option name="SHOW_ONLY_CHANGED_IN_SELECTION_DIFF" value="true" /> |
| |
464 |
+ |
<option name="CHECK_COMMIT_MESSAGE_SPELLING" value="true" /> |
| 500 |
465 |
|
<option name="FORCE_NON_EMPTY_COMMENT" value="false" /> |
| 501 |
466 |
|
<option name="LAST_COMMIT_MESSAGE" /> |
| 502 |
467 |
|
<option name="MAKE_NEW_CHANGELIST_ACTIVE" value="true" /> |
| |
@@ -530,32 +495,9 @@ |
| 530 |
495 |
|
<state line="188" column="25" selection-start="5237" selection-end="5237" vertical-scroll-proportion="0.3328467" /> |
| 531 |
496 |
|
</provider> |
| 532 |
497 |
|
</entry> |
| 533 |
|
- |
<entry file="jar://C:/Program Files/Java/jdk1.6.0_22/src.zip!/java/io/File.java"> |
| 534 |
|
- |
<provider selected="true" editor-type-id="text-editor"> |
| 535 |
|
- |
<state line="1151" column="19" selection-start="47455" selection-end="47455" vertical-scroll-proportion="0.3328467" /> |
| 536 |
|
- |
</provider> |
| 537 |
|
- |
</entry> |
| 538 |
|
- |
<entry file="file://$PROJECT_DIR$/web/WEB-INF/web.xml"> |
| 539 |
|
- |
<provider editor-type-id="com.intellij.javaee.module.view.web.viewlets.WebModuleAssemblyDescriptorProvider"> |
| 540 |
|
- |
<state /> |
| 541 |
|
- |
</provider> |
| 542 |
|
- |
<provider selected="true" editor-type-id="text-editor"> |
| 543 |
|
- |
<state line="14" column="0" selection-start="540" selection-end="540" vertical-scroll-proportion="0.5114943"> |
| 544 |
|
- |
<folding /> |
| 545 |
|
- |
</state> |
| 546 |
|
- |
</provider> |
| 547 |
|
- |
<provider editor-type-id="com.intellij.javaee.module.view.web.viewlets.WebModuleGeneralEditorProvider"> |
| 548 |
|
- |
<state /> |
| 549 |
|
- |
</provider> |
| 550 |
|
- |
<provider editor-type-id="com.intellij.javaee.module.view.web.viewlets.WebModuleAssemblyDescriptorReferencesProvider"> |
| 551 |
|
- |
<state /> |
| 552 |
|
- |
</provider> |
| 553 |
|
- |
</entry> |
| 554 |
498 |
|
<entry file="file://$PROJECT_DIR$/../core/Anywhere/src/org/litesoft/core/util/UtilsCommon.java"> |
| 555 |
499 |
|
<provider selected="true" editor-type-id="text-editor"> |
| 556 |
|
- |
<state line="1511" column="82" selection-start="45440" selection-end="45443" vertical-scroll-proportion="-17.68"> |
| 557 |
|
- |
<folding /> |
| 558 |
|
- |
</state> |
| |
500 |
+ |
<state line="1511" column="82" selection-start="45440" selection-end="45443" vertical-scroll-proportion="-17.68" /> |
| 559 |
501 |
|
</provider> |
| 560 |
502 |
|
</entry> |
| 561 |
503 |
|
<entry file="jar://$PROJECT_DIR$/../libs/servlet-api-2.5-sources.zip!/javax/servlet/GenericServlet.java"> |
| |
@@ -563,23 +505,16 @@ |
| 563 |
505 |
|
<state line="238" column="16" selection-start="6939" selection-end="6939" vertical-scroll-proportion="0.0" /> |
| 564 |
506 |
|
</provider> |
| 565 |
507 |
|
</entry> |
| 566 |
|
- |
<entry file="jar://C:/Program Files/Java/jdk1.6.0_22/src.zip!/java/util/HashMap.java"> |
| 567 |
|
- |
<provider selected="true" editor-type-id="text-editor"> |
| 568 |
|
- |
<state line="298" column="81" selection-start="11815" selection-end="11815" vertical-scroll-proportion="0.35056877"> |
| 569 |
|
- |
<folding /> |
| 570 |
|
- |
</state> |
| 571 |
|
- |
</provider> |
| 572 |
|
- |
</entry> |
| 573 |
|
- |
<entry file="jar://C:/Program Files/Java/jdk1.6.0_22/src.zip!/java/lang/String.java"> |
| |
508 |
+ |
<entry file="file://$PROJECT_DIR$/src/org/litesoft/servlet/imageservlet/ImageServlet.java"> |
| 574 |
509 |
|
<provider selected="true" editor-type-id="text-editor"> |
| 575 |
|
- |
<state line="650" column="0" selection-start="23481" selection-end="23481" vertical-scroll-proportion="0.3326316"> |
| |
510 |
+ |
<state line="7" column="62" selection-start="233" selection-end="233" vertical-scroll-proportion="0.024926687"> |
| 576 |
511 |
|
<folding /> |
| 577 |
512 |
|
</state> |
| 578 |
513 |
|
</provider> |
| 579 |
514 |
|
</entry> |
| 580 |
|
- |
<entry file="file://$PROJECT_DIR$/src/org/litesoft/servlet/imageservlet/ImageServlet.java"> |
| |
515 |
+ |
<entry file="file://$PROJECT_DIR$/web/WEB-INF/web.xml"> |
| 581 |
516 |
|
<provider selected="true" editor-type-id="text-editor"> |
| 582 |
|
- |
<state line="7" column="62" selection-start="233" selection-end="233" vertical-scroll-proportion="0.08686131"> |
| |
517 |
+ |
<state line="14" column="0" selection-start="540" selection-end="540" vertical-scroll-proportion="0.098265894"> |
| 583 |
518 |
|
<folding /> |
| 584 |
519 |
|
</state> |
| 585 |
520 |
|
</provider> |
View this file contents
View the full history
Commits for