Subversion Repository Public Repository

litesoft

Diff Revisions 84 vs 88 for /trunk/Java/LiteSoft.iws

Diff revisions: vs.
  @@ -16,8 +16,11 @@
16 16 </component>
17 17 <component name="ChangeListManager">
18 18 <list default="true" readonly="true" id="89bacc56-3e15-46a9-a2be-2546bd65c8a0" name="Default" comment="">
19 + <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/core/Server/src/org/litesoft/ui" />
20 + <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/core/Server/src/org/litesoft/ui/DirectoryChooserDialog.java" />
21 + <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/core/Server/src/org/litesoft/ui/DirectoryChooserTree.java" />
22 + <change type="MODIFICATION" beforePath="$PROJECT_DIR$/LiteSoft.ipr" afterPath="$PROJECT_DIR$/LiteSoft.ipr" />
19 23 <change type="MODIFICATION" beforePath="$PROJECT_DIR$/LiteSoft.iws" afterPath="$PROJECT_DIR$/LiteSoft.iws" />
20 - <change type="MODIFICATION" beforePath="$PROJECT_DIR$/core/Server/src/org/litesoft/util/AbstractFileAR.java" afterPath="$PROJECT_DIR$/core/Server/src/org/litesoft/util/AbstractFileAR.java" />
21 24 </list>
22 25 <option name="TRACKING_ENABLED" value="true" />
23 26 <option name="SHOW_DIALOG" value="false" />
  @@ -169,7 +172,6 @@
169 172 </PATH>
170 173 </subPane>
171 174 </component>
172 - <component name="FileColors" enabled="true" enabledForTabs="true" />
173 175 <component name="FileEditorManager">
174 176 <splitter split-orientation="vertical" split-proportion="0.3851688">
175 177 <split-first>
  @@ -183,19 +185,19 @@
183 185 </provider>
184 186 </entry>
185 187 </file>
186 - <file leaf-file-name="UtilsCommon.java" pinned="false" current="false" current-in-tab="false">
188 + <file leaf-file-name="UtilsCommon.java" pinned="false" current="false" current-in-tab="true">
187 189 <entry file="file://$PROJECT_DIR$/core/Anywhere/src/org/litesoft/core/util/UtilsCommon.java">
188 190 <provider selected="true" editor-type-id="text-editor">
189 - <state line="701" column="39" selection-start="20647" selection-end="20647" vertical-scroll-proportion="0.0">
191 + <state line="117" column="0" selection-start="3562" selection-end="3975" vertical-scroll-proportion="0.02607362">
190 192 <folding />
191 193 </state>
192 194 </provider>
193 195 </entry>
194 196 </file>
195 - <file leaf-file-name="FileReplacer.java" pinned="false" current="true" current-in-tab="true">
197 + <file leaf-file-name="FileReplacer.java" pinned="false" current="false" current-in-tab="false">
196 198 <entry file="file://$PROJECT_DIR$/core/Server/src/org/litesoft/util/FileReplacer.java">
197 199 <provider selected="true" editor-type-id="text-editor">
198 - <state line="34" column="114" selection-start="917" selection-end="917" vertical-scroll-proportion="0.6606607">
200 + <state line="56" column="87" selection-start="1585" selection-end="1585" vertical-scroll-proportion="0.0">
199 201 <folding />
200 202 </state>
201 203 </provider>
  @@ -214,10 +216,10 @@
214 216 </split-first>
215 217 <split-second>
216 218 <leaf>
217 - <file leaf-file-name="AbstractFileAR.java" pinned="false" current="false" current-in-tab="true">
219 + <file leaf-file-name="AbstractFileAR.java" pinned="false" current="true" current-in-tab="true">
218 220 <entry file="file://$PROJECT_DIR$/core/Server/src/org/litesoft/util/AbstractFileAR.java">
219 221 <provider selected="true" editor-type-id="text-editor">
220 - <state line="26" column="0" selection-start="1157" selection-end="1157" vertical-scroll-proportion="0.29577464">
222 + <state line="26" column="0" selection-start="1157" selection-end="1157" vertical-scroll-proportion="0.01596244">
221 223 <folding />
222 224 </state>
223 225 </provider>
  @@ -232,6 +234,10 @@
232 234 <setting name="OPEN_NEW_TAB" value="false" />
233 235 </FindUsagesManager>
234 236 </component>
237 + <component name="Git.Settings">
238 + <option name="CHECKOUT_INCLUDE_TAGS" value="false" />
239 + <option name="UPDATE_CHANGES_POLICY" value="STASH" />
240 + </component>
235 241 <component name="IdeDocumentHistory">
236 242 <option name="changedFiles">
237 243 <list>
  @@ -631,7 +637,6 @@
631 637 </configuration>
632 638 <configuration default="true" type="Application" factoryName="Application">
633 639 <extension name="coverage" enabled="false" merge="false" runner="emma" />
634 - <extension name="snapshooter" />
635 640 <option name="MAIN_CLASS_NAME" />
636 641 <option name="VM_PARAMETERS" />
637 642 <option name="PROGRAM_PARAMETERS" />
  @@ -652,7 +657,6 @@
652 657 </configuration>
653 658 <configuration default="true" type="JUnit" factoryName="JUnit">
654 659 <extension name="coverage" enabled="false" merge="false" runner="emma" />
655 - <extension name="snapshooter" />
656 660 <module name="" />
657 661 <option name="ALTERNATIVE_JRE_PATH_ENABLED" value="false" />
658 662 <option name="ALTERNATIVE_JRE_PATH" />
  @@ -669,6 +673,7 @@
669 673 <value defaultName="wholeProject" />
670 674 </option>
671 675 <envs />
676 + <patterns />
672 677 <method>
673 678 <option name="AntTarget" enabled="false" />
674 679 <option name="BuildArtifacts" enabled="false" />
  @@ -678,7 +683,6 @@
678 683 </configuration>
679 684 <configuration default="false" name="TextFileProcessor" type="Application" factoryName="Application">
680 685 <extension name="coverage" enabled="false" merge="false" sample_coverage="true" runner="emma" />
681 - <extension name="snapshooter" />
682 686 <option name="MAIN_CLASS_NAME" value="org.litesoft.util.TextFileProcessor" />
683 687 <option name="VM_PARAMETERS" value="" />
684 688 <option name="PROGRAM_PARAMETERS" value="quotes2.txt ready.txt rejects.txt" />
  @@ -707,7 +711,6 @@
707 711 <option name="ENABLED" value="true" />
708 712 </pattern>
709 713 </extension>
710 - <extension name="snapshooter" />
711 714 <option name="MAIN_CLASS_NAME" value="org.litesoft.util.FileReplacer" />
712 715 <option name="VM_PARAMETERS" value="-DCleanDestDirs" />
713 716 <option name="PROGRAM_PARAMETERS" value="Windermere/apps GAS-WS/Windermere-apps ZZZZ-Removed \\*.java \\*.jar \\*.zip \\*.ipr \\*.iml \\*.iws \\*.bat \\*.xsd \\*.properties \\*.html \\*.sh \\*.txt \\*.xml \\*.gif \\*.css \\*.jsp \\*.dtd \\*.vsd \\*.MF \\*.sql " />
  @@ -736,7 +739,6 @@
736 739 <option name="ENABLED" value="true" />
737 740 </pattern>
738 741 </extension>
739 - <extension name="snapshooter" />
740 742 <option name="MAIN_CLASS_NAME" value="org.litesoft.util.FileReplacer" />
741 743 <option name="VM_PARAMETERS" value="" />
742 744 <option name="PROGRAM_PARAMETERS" value="GAS-WS/Windermere-apps Windermere/apps ZZZZ-Removed \\*.java \\*.jar \\*.zip \\*.ipr \\*.iml \\*.iws \\*.bat \\*.xsd \\*.properties \\*.html \\*.sh \\*.txt \\*.xml \\*.gif \\*.css \\*.jsp \\*.dtd \\*.vsd \\*.MF \\*.sql" />
  @@ -818,7 +820,7 @@
818 820 <option name="CHECK_NESTED_FOR_QUICK_MERGE" value="false" />
819 821 <option name="IGNORE_SPACES_IN_ANNOTATE" value="true" />
820 822 <option name="SHOW_MERGE_SOURCES_IN_ANNOTATE" value="true" />
821 - <configuration useDefault="true">C:\Documents and Settings\George\Application Data\Subversion</configuration>
823 + <configuration useDefault="true">C:\Users\George\AppData\Roaming\Subversion</configuration>
822 824 <myIsUseDefaultProxy>false</myIsUseDefaultProxy>
823 825 <supportedVersion>125</supportedVersion>
824 826 </component>
  @@ -905,34 +907,34 @@
905 907 </todo-panel>
906 908 </component>
907 909 <component name="ToolWindowManager">
908 - <frame x="1916" y="-364" width="1208" height="1928" extended-state="6" />
910 + <frame x="2799" y="-299" width="1200" height="1920" extended-state="0" />
909 911 <editor active="true" />
910 912 <layout>
911 913 <window_info id="Changes" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.32962757" sideWeight="0.5" order="13" side_tool="false" content_ui="tabs" />
912 914 <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="2" side_tool="false" content_ui="tabs" />
913 - <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="19" side_tool="false" content_ui="tabs" />
914 - <window_info id="Debug" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.2567792" sideWeight="0.5" order="4" side_tool="false" content_ui="tabs" />
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="15" side_tool="false" content_ui="tabs" />
916 - <window_info id="Messages" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.32795998" sideWeight="0.5" order="11" side_tool="false" content_ui="tabs" />
917 915 <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="8" side_tool="false" content_ui="tabs" />
918 - <window_info id="Structure" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="FLOATING" visible="false" weight="0.24984616" sideWeight="0.5" order="17" side_tool="false" content_ui="tabs" x="1116" y="3" width="401" height="926" />
919 - <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="22" side_tool="false" content_ui="tabs" />
920 - <window_info id="Project" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="FLOATING" visible="false" weight="0.32984614" sideWeight="0.5" order="16" side_tool="false" content_ui="tabs" x="1518" y="2" width="400" height="1025" />
916 + <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="19" side_tool="false" content_ui="tabs" />
917 + <window_info id="Structure" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="FLOATING" visible="true" weight="0.24984616" sideWeight="0.5" order="17" side_tool="false" content_ui="tabs" x="935" y="3" width="401" height="926" />
921 918 <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="12" side_tool="false" content_ui="tabs" />
919 + <window_info id="Project" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="FLOATING" visible="false" weight="0.32984614" sideWeight="0.5" order="16" side_tool="false" content_ui="tabs" x="1518" y="2" width="400" height="1025" />
920 + <window_info id="Debug" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.2567792" sideWeight="0.5" order="4" side_tool="false" content_ui="tabs" />
922 921 <window_info id="Run" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.32927504" sideWeight="0.5" order="2" side_tool="false" content_ui="tabs" />
923 - <window_info id="Hierarchy" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="FLOATING" visible="false" weight="0.2497876" sideWeight="0.66777223" order="0" side_tool="false" content_ui="tabs" x="567" y="2" width="541" height="1064" />
922 + <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="15" side_tool="false" content_ui="tabs" />
924 923 <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="1" side_tool="false" content_ui="tabs" />
925 924 <window_info id="Dataflow to this" 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" />
926 925 <window_info id="IDEtalk Messages" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" sideWeight="0.5" order="14" side_tool="false" content_ui="tabs" />
927 926 <window_info id="IDEtalk" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" sideWeight="0.5" order="20" side_tool="false" content_ui="tabs" />
928 927 <window_info id="File View" 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" />
928 + <window_info id="Hierarchy" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="FLOATING" visible="false" weight="0.2497876" sideWeight="0.66777223" order="0" side_tool="false" content_ui="tabs" x="567" y="2" width="541" height="1064" />
929 929 <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="5" side_tool="false" content_ui="tabs" />
930 930 <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="21" side_tool="false" content_ui="tabs" />
931 931 <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" />
932 932 <window_info id="Find" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.32761484" sideWeight="0.5" order="1" side_tool="false" content_ui="tabs" />
933 + <window_info id="Messages" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.32795998" sideWeight="0.5" order="11" side_tool="false" content_ui="tabs" />
933 934 <window_info id="Web" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.25" sideWeight="0.5" order="0" side_tool="false" content_ui="tabs" />
934 935 <window_info id="EJB" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.25" sideWeight="0.5" order="3" side_tool="false" content_ui="tabs" />
935 936 <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="18" side_tool="false" content_ui="tabs" />
937 + <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="22" side_tool="false" content_ui="tabs" />
936 938 <window_info id="Module Dependencies" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" sideWeight="0.5" order="1" side_tool="false" content_ui="tabs" />
937 939 <window_info id="CVS" 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" />
938 940 <window_info id="Web Preview" 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" />
  @@ -958,6 +960,7 @@
958 960 <option name="CHECK_LOCALLY_CHANGED_CONFLICTS_IN_BACKGROUND" value="false" />
959 961 <option name="ENABLE_BACKGROUND_PROCESSES" value="false" />
960 962 <option name="CHANGED_ON_SERVER_INTERVAL" value="60" />
963 + <option name="SHOW_ONLY_CHANGED_IN_SELECTION_DIFF" value="true" />
961 964 <option name="FORCE_NON_EMPTY_COMMENT" value="false" />
962 965 <option name="LAST_COMMIT_MESSAGE" />
963 966 <option name="MAKE_NEW_CHANGELIST_ACTIVE" value="true" />
  @@ -1094,63 +1097,38 @@
1094 1097 </entry>
1095 1098 <entry file="file://$PROJECT_DIR$/core/Anywhere/src/org/litesoft/core/util/UtilsCommon.java">
1096 1099 <provider selected="true" editor-type-id="text-editor">
1097 - <state line="701" column="39" selection-start="20647" selection-end="20647" vertical-scroll-proportion="0.0">
1100 + <state line="117" column="0" selection-start="3562" selection-end="3975" vertical-scroll-proportion="0.02607362">
1098 1101 <folding />
1099 1102 </state>
1100 1103 </provider>
1101 1104 </entry>
1102 - <entry file="file://$PROJECT_DIR$/core/Server/src/org/litesoft/util/FileUtils.java">
1105 + <entry file="file://$PROJECT_DIR$/core/Server/src/org/litesoft/util/FileReplacer.java">
1103 1106 <provider selected="true" editor-type-id="text-editor">
1104 - <state line="124" column="0" selection-start="3834" selection-end="3834" vertical-scroll-proportion="0.0">
1105 - <folding />
1106 - </state>
1107 + <state line="56" column="87" selection-start="1585" selection-end="1585" vertical-scroll-proportion="0.0" />
1107 1108 </provider>
1108 1109 </entry>
1109 - <entry file="file://$PROJECT_DIR$/core/Server/src/org/litesoft/util/AbstractFileAR.java">
1110 + <entry file="file://$PROJECT_DIR$/core/Server/src/org/litesoft/util/FileUtils.java">
1110 1111 <provider selected="true" editor-type-id="text-editor">
1111 - <state line="26" column="0" selection-start="1157" selection-end="1157" vertical-scroll-proportion="0.29577464">
1112 - <folding />
1113 - </state>
1112 + <state line="124" column="0" selection-start="3834" selection-end="3834" vertical-scroll-proportion="0.0" />
1114 1113 </provider>
1115 1114 </entry>
1116 - <entry file="file://$PROJECT_DIR$/core/Server/src/org/litesoft/util/FileReplacer.java">
1115 + <entry file="file://$PROJECT_DIR$/core/Server/src/org/litesoft/util/AbstractFileAR.java">
1117 1116 <provider selected="true" editor-type-id="text-editor">
1118 - <state line="34" column="114" selection-start="917" selection-end="917" vertical-scroll-proportion="0.6606607">
1119 - <folding />
1120 - </state>
1117 + <state line="26" column="0" selection-start="1157" selection-end="1157" vertical-scroll-proportion="0.01596244" />
1121 1118 </provider>
1122 1119 </entry>
1123 1120 </component>
1124 1121 <component name="masterDetails">
1125 1122 <states>
1126 - <state key="ArtifactsStructureConfigurable.UI">
1127 - <UIState>
1128 - <splitter-proportions>
1129 - <SplitterProportionsDataImpl>
1130 - <option name="proportions">
1131 - <list>
1132 - <option value="0.2" />
1133 - </list>
1134 - </option>
1135 - </SplitterProportionsDataImpl>
1136 - </splitter-proportions>
1137 - <settings />
1138 - </UIState>
1139 - </state>
1140 1123 <state key="Copyright.UI">
1141 - <UIState>
1142 - <splitter-proportions>
1143 - <SplitterProportionsDataImpl />
1144 - </splitter-proportions>
1145 - </UIState>
1124 + <settings>
1125 + <splitter-proportions />
1126 + </settings>
1146 1127 </state>
1147 1128 <state key="ScopeChooserConfigurable.UI">
1148 - <UIState>
1149 - <splitter-proportions>
1150 - <SplitterProportionsDataImpl />
1151 - </splitter-proportions>
1152 - <settings />
1153 - </UIState>
1129 + <settings>
1130 + <splitter-proportions />
1131 + </settings>
1154 1132 </state>
1155 1133 </states>
1156 1134 </component>