| |
@@ -13,7 +13,6 @@ |
| 13 |
13 |
|
<component name="ChangesViewManager" flattened_view="true" show_ignored="false" /> |
| 14 |
14 |
|
<component name="CreatePatchCommitExecutor"> |
| 15 |
15 |
|
<option name="PATCH_PATH" value="" /> |
| 16 |
|
- |
<option name="REVERSE_PATCH" value="false" /> |
| 17 |
16 |
|
</component> |
| 18 |
17 |
|
<component name="DaemonCodeAnalyzer"> |
| 19 |
18 |
|
<disable_hints /> |
| |
@@ -104,7 +103,7 @@ |
| 104 |
103 |
|
<file leaf-file-name="WizardProgressIndicator.java" pinned="false" current="false" current-in-tab="true"> |
| 105 |
104 |
|
<entry file="file://$PROJECT_DIR$/src/com/temp/foundation/widgets/WizardProgressIndicator.java"> |
| 106 |
105 |
|
<provider selected="true" editor-type-id="text-editor"> |
| 107 |
|
- |
<state line="169" column="0" selection-start="6866" selection-end="7111" vertical-scroll-proportion="4.3384614"> |
| |
106 |
+ |
<state line="177" column="0" selection-start="7278" selection-end="7523" vertical-scroll-proportion="0.020310633"> |
| 108 |
107 |
|
<folding /> |
| 109 |
108 |
|
</state> |
| 110 |
109 |
|
</provider> |
| |
@@ -319,9 +318,8 @@ |
| 319 |
318 |
|
<sortByType /> |
| 320 |
319 |
|
</navigator> |
| 321 |
320 |
|
<panes> |
| 322 |
|
- |
<pane id="PackagesPane" /> |
| 323 |
|
- |
<pane id="Favorites" /> |
| 324 |
321 |
|
<pane id="Scope" /> |
| |
322 |
+ |
<pane id="PackagesPane" /> |
| 325 |
323 |
|
<pane id="ProjectPane"> |
| 326 |
324 |
|
<subPane> |
| 327 |
325 |
|
<PATH> |
| |
@@ -730,45 +728,20 @@ |
| 730 |
728 |
|
<option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" /> |
| 731 |
729 |
|
</PATH_ELEMENT> |
| 732 |
730 |
|
</PATH> |
| 733 |
|
- |
<PATH> |
| 734 |
|
- |
<PATH_ELEMENT> |
| 735 |
|
- |
<option name="myItemId" value="FormEngine" /> |
| 736 |
|
- |
<option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewProjectNode" /> |
| 737 |
|
- |
</PATH_ELEMENT> |
| 738 |
|
- |
<PATH_ELEMENT> |
| 739 |
|
- |
<option name="myItemId" value="FormEngine" /> |
| 740 |
|
- |
<option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" /> |
| 741 |
|
- |
</PATH_ELEMENT> |
| 742 |
|
- |
<PATH_ELEMENT> |
| 743 |
|
- |
<option name="myItemId" value="src" /> |
| 744 |
|
- |
<option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" /> |
| 745 |
|
- |
</PATH_ELEMENT> |
| 746 |
|
- |
<PATH_ELEMENT> |
| 747 |
|
- |
<option name="myItemId" value="com" /> |
| 748 |
|
- |
<option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" /> |
| 749 |
|
- |
</PATH_ELEMENT> |
| 750 |
|
- |
<PATH_ELEMENT> |
| 751 |
|
- |
<option name="myItemId" value="temp" /> |
| 752 |
|
- |
<option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" /> |
| 753 |
|
- |
</PATH_ELEMENT> |
| 754 |
|
- |
<PATH_ELEMENT> |
| 755 |
|
- |
<option name="myItemId" value="foundation" /> |
| 756 |
|
- |
<option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" /> |
| 757 |
|
- |
</PATH_ELEMENT> |
| 758 |
|
- |
</PATH> |
| 759 |
731 |
|
</subPane> |
| 760 |
732 |
|
</pane> |
| |
733 |
+ |
<pane id="Favorites" /> |
| 761 |
734 |
|
</panes> |
| 762 |
735 |
|
</component> |
| 763 |
736 |
|
<component name="PropertiesComponent"> |
| 764 |
737 |
|
<property name="GenerateAntBuildDialog.generateIdeaHomeProperty" value="false" /> |
| 765 |
738 |
|
<property name="project.structure.last.edited" value="Modules" /> |
| 766 |
|
- |
<property name="project.structure.proportion" value="0.15" /> |
| 767 |
739 |
|
<property name="OverrideImplement.combined" value="true" /> |
| |
740 |
+ |
<property name="project.structure.proportion" value="0.15" /> |
| 768 |
741 |
|
<property name="options.splitter.main.proportions" value="0.3" /> |
| 769 |
|
- |
<property name="MemberChooser.sorted" value="false" /> |
| 770 |
|
- |
<property name="recentsLimit" value="5" /> |
| 771 |
742 |
|
<property name="GenerateAntBuildDialog.generateSingleFile" value="true" /> |
| |
743 |
+ |
<property name="recentsLimit" value="5" /> |
| |
744 |
+ |
<property name="MemberChooser.sorted" value="false" /> |
| 772 |
745 |
|
<property name="GenerateAntBuildDialog.inclineRuntiemClasspath" value="false" /> |
| 773 |
746 |
|
<property name="GWT.GenerateCompileReport.Module" value="com.temp.Foundation" /> |
| 774 |
747 |
|
<property name="GenerateAntBuildDialog.outputFileNameProperty" value="formengine" /> |
| |
@@ -853,6 +826,14 @@ |
| 853 |
826 |
|
<option name="Make" enabled="true" /> |
| 854 |
827 |
|
</method> |
| 855 |
828 |
|
</configuration> |
| |
829 |
+ |
<configuration default="true" type="GWT.ConfigurationType" factoryName="GWT Configuration"> |
| |
830 |
+ |
<module name="" /> |
| |
831 |
+ |
<method> |
| |
832 |
+ |
<option name="AntTarget" enabled="false" /> |
| |
833 |
+ |
<option name="BuildArtifacts" enabled="false" /> |
| |
834 |
+ |
<option name="Make" enabled="true" /> |
| |
835 |
+ |
</method> |
| |
836 |
+ |
</configuration> |
| 856 |
837 |
|
<configuration default="true" type="JUnit" factoryName="JUnit"> |
| 857 |
838 |
|
<extension name="coverage" enabled="false" merge="false" runner="idea" /> |
| 858 |
839 |
|
<module name="" /> |
| |
@@ -878,14 +859,6 @@ |
| 878 |
859 |
|
<option name="Make" enabled="true" /> |
| 879 |
860 |
|
</method> |
| 880 |
861 |
|
</configuration> |
| 881 |
|
- |
<configuration default="true" type="GWT.ConfigurationType" factoryName="GWT Configuration"> |
| 882 |
|
- |
<module name="" /> |
| 883 |
|
- |
<method> |
| 884 |
|
- |
<option name="AntTarget" enabled="false" /> |
| 885 |
|
- |
<option name="BuildArtifacts" enabled="false" /> |
| 886 |
|
- |
<option name="Make" enabled="true" /> |
| 887 |
|
- |
</method> |
| 888 |
|
- |
</configuration> |
| 889 |
862 |
|
<list size="1"> |
| 890 |
863 |
|
<item index="0" class="java.lang.String" itemvalue="Application.SampleApp - DevMode" /> |
| 891 |
864 |
|
</list> |
| |
@@ -925,29 +898,29 @@ |
| 925 |
898 |
|
<servers /> |
| 926 |
899 |
|
</component> |
| 927 |
900 |
|
<component name="ToolWindowManager"> |
| 928 |
|
- |
<frame x="0" y="22" width="1095" height="874" extended-state="0" /> |
| |
901 |
+ |
<frame x="2800" y="-357" width="1202" height="1920" extended-state="0" /> |
| 929 |
902 |
|
<editor active="true" /> |
| 930 |
903 |
|
<layout> |
| 931 |
|
- |
<window_info id="Messages" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.32957748" sideWeight="0.5" order="7" side_tool="false" content_ui="tabs" /> |
| |
904 |
+ |
<window_info id="Data Sources" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" sideWeight="0.5" order="18" side_tool="false" content_ui="tabs" /> |
| 932 |
905 |
|
<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="2" side_tool="false" content_ui="tabs" /> |
| 933 |
906 |
|
<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" /> |
| 934 |
907 |
|
<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="12" side_tool="false" content_ui="tabs" /> |
| 935 |
908 |
|
<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="13" side_tool="false" content_ui="tabs" /> |
| 936 |
909 |
|
<window_info id="Structure" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="FLOATING" visible="false" weight="0.24929972" sideWeight="0.5" order="16" side_tool="false" content_ui="tabs" x="923" y="22" width="339" height="838" /> |
| 937 |
|
- |
<window_info id="Commander" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.4" sideWeight="0.5" order="14" side_tool="false" content_ui="tabs" /> |
| 938 |
|
- |
<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" /> |
| 939 |
910 |
|
<window_info id="Project" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="FLOATING" visible="true" weight="0.24928367" sideWeight="0.91402113" order="11" side_tool="false" content_ui="tabs" x="1101" y="22" width="339" height="874" /> |
| 940 |
911 |
|
<window_info id="Debug" active="false" anchor="bottom" auto_hide="false" internal_type="SLIDING" type="FLOATING" visible="false" weight="0.4" sideWeight="0.5" order="8" side_tool="false" content_ui="tabs" x="0" y="441" width="1440" height="455" /> |
| |
912 |
+ |
<window_info id="Favorites" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" sideWeight="0.5" order="19" side_tool="true" content_ui="tabs" /> |
| |
913 |
+ |
<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="0" side_tool="true" content_ui="tabs" /> |
| 941 |
914 |
|
<window_info id="Run" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.32788733" sideWeight="0.5" order="7" side_tool="false" content_ui="tabs" /> |
| 942 |
915 |
|
<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="4" side_tool="false" content_ui="tabs" /> |
| 943 |
916 |
|
<window_info id="Documentation" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="FLOATING" visible="true" weight="0.33" sideWeight="0.5" order="3" side_tool="false" content_ui="tabs" x="2900" y="-257" width="1000" height="1720" /> |
| 944 |
917 |
|
<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="9" side_tool="false" content_ui="tabs" /> |
| 945 |
|
- |
<window_info id="Data Sources" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" sideWeight="0.5" order="18" side_tool="false" content_ui="tabs" /> |
| 946 |
918 |
|
<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="5" side_tool="false" content_ui="tabs" /> |
| 947 |
919 |
|
<window_info id="Find" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.32980132" sideWeight="0.5" order="6" side_tool="false" content_ui="tabs" /> |
| 948 |
|
- |
<window_info id="Favorites" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" sideWeight="0.5" order="19" side_tool="true" content_ui="tabs" /> |
| 949 |
|
- |
<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="0" side_tool="true" content_ui="tabs" /> |
| |
920 |
+ |
<window_info id="Messages" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.32957748" sideWeight="0.5" order="7" side_tool="false" content_ui="tabs" /> |
| 950 |
921 |
|
<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="17" side_tool="true" content_ui="tabs" /> |
| |
922 |
+ |
<window_info id="Commander" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.4" sideWeight="0.5" order="14" side_tool="false" content_ui="tabs" /> |
| |
923 |
+ |
<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" /> |
| 951 |
924 |
|
<window_info id="Hierarchy" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="FLOATING" visible="true" weight="0.25" sideWeight="0.5" order="15" side_tool="false" content_ui="combo" x="964" y="848" width="635" height="296" /> |
| 952 |
925 |
|
<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="10" side_tool="false" content_ui="tabs" /> |
| 953 |
926 |
|
</layout> |
| |
@@ -979,6 +952,12 @@ |
| 979 |
952 |
|
<option name="SHOW_ONLY_CHANGED_IN_SELECTION_DIFF" value="true" /> |
| 980 |
953 |
|
<option name="CHECK_COMMIT_MESSAGE_SPELLING" value="true" /> |
| 981 |
954 |
|
<option name="DEFAULT_PATCH_EXTENSION" value="patch" /> |
| |
955 |
+ |
<option name="SHORT_DIFF_HORISONTALLY" value="true" /> |
| |
956 |
+ |
<option name="SHORT_DIFF_EXTRA_LINES" value="2" /> |
| |
957 |
+ |
<option name="SOFT_WRAPS_IN_SHORT_DIFF" value="true" /> |
| |
958 |
+ |
<option name="INCLUDE_TEXT_INTO_PATCH" value="false" /> |
| |
959 |
+ |
<option name="INCLUDE_TEXT_INTO_SHELF" value="false" /> |
| |
960 |
+ |
<option name="CREATE_PATCH_EXPAND_DETAILS_DEFAULT" value="true" /> |
| 982 |
961 |
|
<option name="FORCE_NON_EMPTY_COMMENT" value="false" /> |
| 983 |
962 |
|
<option name="LAST_COMMIT_MESSAGE" /> |
| 984 |
963 |
|
<option name="MAKE_NEW_CHANGELIST_ACTIVE" value="true" /> |
| |
@@ -1105,13 +1084,6 @@ |
| 1105 |
1084 |
|
<folding /> |
| 1106 |
1085 |
|
</state> |
| 1107 |
1086 |
|
</provider> |
| 1108 |
|
- |
</entry> |
| 1109 |
|
- |
<entry file="file://$PROJECT_DIR$/src/com/temp/foundation/widgets/WizardProgressIndicator.java"> |
| 1110 |
|
- |
<provider selected="true" editor-type-id="text-editor"> |
| 1111 |
|
- |
<state line="169" column="0" selection-start="6866" selection-end="7111" vertical-scroll-proportion="4.3384614"> |
| 1112 |
|
- |
<folding /> |
| 1113 |
|
- |
</state> |
| 1114 |
|
- |
</provider> |
| 1115 |
1087 |
|
</entry> |
| 1116 |
1088 |
|
<entry file="file://$PROJECT_DIR$/war/SampleApplication.css"> |
| 1117 |
1089 |
|
<provider selected="true" editor-type-id="text-editor"> |
View this file contents
View the full history
Commits for