Subversion Repository Public Repository

litesoft

Diff Revisions 339 vs 340 for /trunk/GWT_Sandbox/CS_IDEA/CS_IDEA.iws

Diff revisions: vs.
  @@ -66,7 +66,7 @@
66 66 <file leaf-file-name="CSapp.java" pinned="false" current="false" current-in-tab="true">
67 67 <entry file="file://$PROJECT_DIR$/src/org/litesoft/sandbox/csapp/client/CSapp.java">
68 68 <provider selected="true" editor-type-id="text-editor">
69 - <state line="37" column="106" selection-start="1239" selection-end="1239" vertical-scroll-proportion="0.53222835">
69 + <state line="65" column="84" selection-start="1872" selection-end="1872" vertical-scroll-proportion="0.9060773">
70 70 <folding />
71 71 </state>
72 72 </provider>
  @@ -76,10 +76,10 @@
76 76 </split-first>
77 77 <split-second>
78 78 <leaf>
79 - <file leaf-file-name="CSapp.html" pinned="false" current="true" current-in-tab="true">
80 - <entry file="file://$PROJECT_DIR$/war/CSapp.html">
79 + <file leaf-file-name="index.html" pinned="false" current="false" current-in-tab="true">
80 + <entry file="file://$PROJECT_DIR$/war/v1/index.html">
81 81 <provider selected="true" editor-type-id="text-editor">
82 - <state line="9" column="104" selection-start="228" selection-end="228" vertical-scroll-proportion="0.24132492">
82 + <state line="9" column="67" selection-start="219" selection-end="219" vertical-scroll-proportion="0.24132492">
83 83 <folding />
84 84 </state>
85 85 </provider>
  @@ -96,7 +96,7 @@
96 96 <file leaf-file-name="CSappService.java" pinned="false" current="false" current-in-tab="true">
97 97 <entry file="file://$PROJECT_DIR$/src/org/litesoft/sandbox/csapp/client/CSappService.java">
98 98 <provider selected="true" editor-type-id="text-editor">
99 - <state line="6" column="29" selection-start="231" selection-end="231" vertical-scroll-proportion="0.043927647">
99 + <state line="10" column="4" selection-start="336" selection-end="336" vertical-scroll-proportion="0.2015504">
100 100 <folding />
101 101 </state>
102 102 </provider>
  @@ -135,13 +135,13 @@
135 135 </leaf>
136 136 </split-first>
137 137 <split-second>
138 - <splitter split-orientation="vertical" split-proportion="0.3118393">
138 + <splitter split-orientation="vertical" split-proportion="0.36575052">
139 139 <split-first>
140 140 <leaf>
141 141 <file leaf-file-name="CSapp.gwt.xml" pinned="false" current="false" current-in-tab="true">
142 142 <entry file="file://$PROJECT_DIR$/src/org/litesoft/sandbox/csapp/CSapp.gwt.xml">
143 143 <provider selected="true" editor-type-id="text-editor">
144 - <state line="1" column="24" selection-start="191" selection-end="196" vertical-scroll-proportion="0.06719368">
144 + <state line="1" column="21" selection-start="193" selection-end="193" vertical-scroll-proportion="0.05592105">
145 145 <folding />
146 146 </state>
147 147 </provider>
  @@ -150,34 +150,26 @@
150 150 </leaf>
151 151 </split-first>
152 152 <split-second>
153 - <splitter split-orientation="vertical" split-proportion="0.7077535">
154 - <split-first>
155 - <leaf>
156 - <file leaf-file-name="web.xml" pinned="false" current="false" current-in-tab="true">
157 - <entry file="file://$PROJECT_DIR$/war/WEB-INF/web.xml">
158 - <provider selected="true" editor-type-id="text-editor">
159 - <state line="12" column="21" selection-start="633" selection-end="633" vertical-scroll-proportion="0.47887325">
160 - <folding />
161 - </state>
162 - </provider>
163 - </entry>
164 - </file>
165 - </leaf>
166 - </split-first>
167 - <split-second>
168 - <leaf>
169 - <file leaf-file-name="CSapp.css" pinned="false" current="false" current-in-tab="true">
170 - <entry file="file://$PROJECT_DIR$/war/CSapp.css">
171 - <provider selected="true" editor-type-id="text-editor">
172 - <state line="0" column="0" selection-start="0" selection-end="0" vertical-scroll-proportion="0.0">
173 - <folding />
174 - </state>
175 - </provider>
176 - </entry>
177 - </file>
178 - </leaf>
179 - </split-second>
180 - </splitter>
153 + <leaf>
154 + <file leaf-file-name="web.xml" pinned="false" current="true" current-in-tab="true">
155 + <entry file="file://$PROJECT_DIR$/war/WEB-INF/web.xml">
156 + <provider editor-type-id="com.intellij.javaee.module.view.web.viewlets.WebModuleAssemblyDescriptorReferencesProvider">
157 + <state />
158 + </provider>
159 + <provider selected="true" editor-type-id="text-editor">
160 + <state line="16" column="24" selection-start="786" selection-end="786" vertical-scroll-proportion="0.49544626">
161 + <folding />
162 + </state>
163 + </provider>
164 + <provider editor-type-id="com.intellij.javaee.module.view.web.viewlets.WebModuleAssemblyDescriptorProvider">
165 + <state />
166 + </provider>
167 + <provider editor-type-id="com.intellij.javaee.module.view.web.viewlets.WebModuleGeneralEditorProvider">
168 + <state />
169 + </provider>
170 + </entry>
171 + </file>
172 + </leaf>
181 173 </split-second>
182 174 </splitter>
183 175 </split-second>
  @@ -207,9 +199,10 @@
207 199 <option value="$PROJECT_DIR$/src/org/litesoft/sandbox/csapp/client/CSappService.java" />
208 200 <option value="$PROJECT_DIR$/build.xml" />
209 201 <option value="$PROJECT_DIR$/src/org/litesoft/sandbox/csapp/CSapp.gwt.xml" />
210 - <option value="$PROJECT_DIR$/war/WEB-INF/web.xml" />
211 202 <option value="$PROJECT_DIR$/war/CSapp.html" />
212 203 <option value="$PROJECT_DIR$/war/CSapp.html" />
204 + <option value="$PROJECT_DIR$/war/v1/index.html" />
205 + <option value="$PROJECT_DIR$/war/WEB-INF/web.xml" />
213 206 </list>
214 207 </option>
215 208 </component>
  @@ -244,8 +237,6 @@
244 237 </navigator>
245 238 <panes>
246 239 <pane id="Scope" />
247 - <pane id="PackagesPane" />
248 - <pane id="Favorites" />
249 240 <pane id="ProjectPane">
250 241 <subPane>
251 242 <PATH>
  @@ -277,6 +268,10 @@
277 268 <option name="myItemId" value="war" />
278 269 <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
279 270 </PATH_ELEMENT>
271 + <PATH_ELEMENT>
272 + <option name="myItemId" value="WEB-INF" />
273 + <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
274 + </PATH_ELEMENT>
280 275 </PATH>
281 276 <PATH>
282 277 <PATH_ELEMENT>
  @@ -292,7 +287,7 @@
292 287 <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
293 288 </PATH_ELEMENT>
294 289 <PATH_ELEMENT>
295 - <option name="myItemId" value="WEB-INF" />
290 + <option name="myItemId" value="v1" />
296 291 <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
297 292 </PATH_ELEMENT>
298 293 </PATH>
  @@ -396,13 +391,15 @@
396 391 </PATH>
397 392 </subPane>
398 393 </pane>
394 + <pane id="Favorites" />
395 + <pane id="PackagesPane" />
399 396 </panes>
400 397 </component>
401 398 <component name="PropertiesComponent">
402 399 <property name="GenerateAntBuildDialog.generateIdeaHomeProperty" value="false" />
403 400 <property name="GoToFile.includeJavaFiles" value="false" />
404 - <property name="project.structure.last.edited" value="Facets" />
405 - <property name="project.structure.proportion" value="0.0" />
401 + <property name="project.structure.last.edited" value="Artifacts" />
402 + <property name="project.structure.proportion" value="0.15" />
406 403 <property name="MemberChooser.sorted" value="false" />
407 404 <property name="recentsLimit" value="5" />
408 405 <property name="GenerateAntBuildDialog.generateSingleFile" value="true" />
  @@ -415,8 +412,8 @@
415 412 <property name="GoToClass.toSaveIncludeLibraries" value="false" />
416 413 <property name="WebServerToolWindowFactoryState" value="false" />
417 414 <property name="MemberChooser.showClasses" value="true" />
418 - <property name="GoToClass.includeLibraries" value="false" />
419 415 <property name="GenerateAntBuildDialog.backupFiles" value="false" />
416 + <property name="GoToClass.includeLibraries" value="false" />
420 417 <property name="dynamic.classpath" value="false" />
421 418 </component>
422 419 <component name="RunManager" selected="GWT Configuration.CSapp">
  @@ -470,6 +467,26 @@
470 467 <option name="PhingTarget" enabled="false" />
471 468 </method>
472 469 </configuration>
470 + <configuration default="true" type="JavascriptDebugSession" factoryName="Local">
471 + <JSDebuggerConfigurationSettings>
472 + <option name="engineId" value="embedded" />
473 + <option name="fileUrl" />
474 + </JSDebuggerConfigurationSettings>
475 + <method>
476 + <option name="AntTarget" enabled="false" />
477 + <option name="BuildArtifacts" enabled="false" />
478 + <option name="PhingTarget" enabled="false" />
479 + </method>
480 + </configuration>
481 + <configuration default="true" type="GWT.ConfigurationType" factoryName="GWT Configuration">
482 + <module name="" />
483 + <method>
484 + <option name="AntTarget" enabled="false" />
485 + <option name="BuildArtifacts" enabled="false" />
486 + <option name="Make" enabled="true" />
487 + <option name="PhingTarget" enabled="false" />
488 + </method>
489 + </configuration>
473 490 <configuration default="true" type="JUnit" factoryName="JUnit">
474 491 <extension name="coverage" enabled="false" merge="false" />
475 492 <module name="" />
  @@ -496,29 +513,10 @@
496 513 <option name="PhingTarget" enabled="false" />
497 514 </method>
498 515 </configuration>
499 - <configuration default="true" type="GWT.ConfigurationType" factoryName="GWT Configuration">
500 - <module name="" />
501 - <method>
502 - <option name="AntTarget" enabled="false" />
503 - <option name="BuildArtifacts" enabled="false" />
504 - <option name="Make" enabled="true" />
505 - <option name="PhingTarget" enabled="false" />
506 - </method>
507 - </configuration>
508 - <configuration default="true" type="JavascriptDebugSession" factoryName="Local">
509 - <JSDebuggerConfigurationSettings>
510 - <option name="engineId" value="embedded" />
511 - <option name="fileUrl" />
512 - </JSDebuggerConfigurationSettings>
513 - <method>
514 - <option name="AntTarget" enabled="false" />
515 - <option name="BuildArtifacts" enabled="false" />
516 - <option name="PhingTarget" enabled="false" />
517 - </method>
518 - </configuration>
519 516 <configuration default="false" name="CSapp" type="GWT.ConfigurationType" factoryName="GWT Configuration">
520 517 <module name="CS_IDEA" />
521 - <option name="RUN_PAGE" value="CSapp.html" />
518 + <option name="RUN_PAGE" value="v1/index.html" />
519 + <option name="GWT_MODULE" value="org.litesoft.sandbox.csapp.CSapp" />
522 520 <RunnerSettings RunnerId="Run" />
523 521 <ConfigurationWrapper RunnerId="Run" />
524 522 <method />
  @@ -634,13 +632,6 @@
634 632 <state line="155" column="63" selection-start="5378" selection-end="5378" vertical-scroll-proportion="0.76048464" />
635 633 </provider>
636 634 </entry>
637 - <entry file="file://$PROJECT_DIR$/src/org/litesoft/sandbox/csapp/client/CSappService.java">
638 - <provider selected="true" editor-type-id="text-editor">
639 - <state line="6" column="29" selection-start="231" selection-end="231" vertical-scroll-proportion="0.043927647">
640 - <folding />
641 - </state>
642 - </provider>
643 - </entry>
644 635 <entry file="file://$PROJECT_DIR$/src/org/litesoft/sandbox/csapp/client/CSappServiceAsync.java">
645 636 <provider selected="true" editor-type-id="text-editor">
646 637 <state line="4" column="34" selection-start="132" selection-end="132" vertical-scroll-proportion="0.1118421">
  @@ -655,54 +646,63 @@
655 646 </state>
656 647 </provider>
657 648 </entry>
658 - <entry file="file://$PROJECT_DIR$/war/CSapp.css">
649 + <entry file="file://$PROJECT_DIR$/src/org/litesoft/sandbox/csapp/client/CSappService.java">
659 650 <provider selected="true" editor-type-id="text-editor">
660 - <state line="0" column="0" selection-start="0" selection-end="0" vertical-scroll-proportion="0.0" />
651 + <state line="10" column="4" selection-start="336" selection-end="336" vertical-scroll-proportion="0.2015504">
652 + <folding />
653 + </state>
661 654 </provider>
662 655 </entry>
663 656 <entry file="file://$PROJECT_DIR$/src/org/litesoft/sandbox/csapp/CSapp.gwt.xml">
664 657 <provider selected="true" editor-type-id="text-editor">
665 - <state line="1" column="24" selection-start="191" selection-end="196" vertical-scroll-proportion="0.06719368">
658 + <state line="1" column="21" selection-start="193" selection-end="193" vertical-scroll-proportion="0.05592105">
666 659 <folding />
667 660 </state>
668 661 </provider>
669 662 </entry>
670 - <entry file="file://$PROJECT_DIR$/war/WEB-INF/web.xml">
671 - <provider editor-type-id="com.intellij.javaee.module.view.web.viewlets.WebModuleAssemblyDescriptorReferencesProvider">
672 - <state />
673 - </provider>
663 + <entry file="file://$PROJECT_DIR$/war/v1/index.html">
674 664 <provider selected="true" editor-type-id="text-editor">
675 - <state line="12" column="21" selection-start="633" selection-end="633" vertical-scroll-proportion="0.47887325">
665 + <state line="9" column="67" selection-start="219" selection-end="219" vertical-scroll-proportion="0.24132492">
676 666 <folding />
677 667 </state>
678 668 </provider>
679 - <provider editor-type-id="com.intellij.javaee.module.view.web.viewlets.WebModuleAssemblyDescriptorProvider">
680 - <state />
681 - </provider>
682 - <provider editor-type-id="com.intellij.javaee.module.view.web.viewlets.WebModuleGeneralEditorProvider">
683 - <state />
684 - </provider>
685 669 </entry>
686 670 <entry file="file://$PROJECT_DIR$/src/org/litesoft/sandbox/csapp/client/CSapp.java">
687 671 <provider selected="true" editor-type-id="text-editor">
688 - <state line="37" column="106" selection-start="1239" selection-end="1239" vertical-scroll-proportion="0.53222835">
672 + <state line="65" column="84" selection-start="1872" selection-end="1872" vertical-scroll-proportion="0.9060773">
689 673 <folding />
690 674 </state>
691 675 </provider>
692 676 </entry>
693 - <entry file="file://$PROJECT_DIR$/war/CSapp.html">
677 + <entry file="file://$PROJECT_DIR$/war/WEB-INF/web.xml">
678 + <provider editor-type-id="com.intellij.javaee.module.view.web.viewlets.WebModuleAssemblyDescriptorReferencesProvider">
679 + <state />
680 + </provider>
694 681 <provider selected="true" editor-type-id="text-editor">
695 - <state line="9" column="104" selection-start="228" selection-end="228" vertical-scroll-proportion="0.24132492">
682 + <state line="16" column="24" selection-start="786" selection-end="786" vertical-scroll-proportion="0.49544626">
696 683 <folding />
697 684 </state>
698 685 </provider>
686 + <provider editor-type-id="com.intellij.javaee.module.view.web.viewlets.WebModuleAssemblyDescriptorProvider">
687 + <state />
688 + </provider>
689 + <provider editor-type-id="com.intellij.javaee.module.view.web.viewlets.WebModuleGeneralEditorProvider">
690 + <state />
691 + </provider>
699 692 </entry>
700 693 </component>
701 694 <component name="masterDetails">
702 695 <states>
703 696 <state key="ArtifactsStructureConfigurable.UI">
704 697 <settings>
705 - <artifact-editor />
698 + <artifact-editor>
699 + <show-content>
700 + <type id="javaee-facet-resources" />
701 + <type id="jpa-descriptors" />
702 + <type id="library" />
703 + <type id="artifact" />
704 + </show-content>
705 + </artifact-editor>
706 706 <last-edited>CS_IDEA:Web exploded</last-edited>
707 707 <splitter-proportions>
708 708 <option name="proportions">
  @@ -752,12 +752,11 @@
752 752 </state>
753 753 <state key="ModuleStructureConfigurable.UI">
754 754 <settings>
755 - <last-edited>CS_IDEA</last-edited>
755 + <last-edited>GWT|CS_IDEA</last-edited>
756 756 <splitter-proportions>
757 757 <option name="proportions">
758 758 <list>
759 759 <option value="0.2" />
760 - <option value="0.5" />
761 760 </list>
762 761 </option>
763 762 </splitter-proportions>