[ohla-devel] SF.net SVN: ohla: [120] trunk
Status: Beta
Brought to you by:
mnewcomb
From: <mne...@us...> - 2007-02-13 03:51:12
|
Revision: 120 http://svn.sourceforge.net/ohla/?rev=120&view=rev Author: mnewcomb Date: 2007-02-12 19:51:11 -0800 (Mon, 12 Feb 2007) Log Message: ----------- - refactoring Modified Paths: -------------- trunk/build/build.xml trunk/build/intellij/OHLA.iws trunk/rti/src/java/net/sf/ohla/rti1516/federate/FederateRestore.java trunk/rti/src/java/net/sf/ohla/rti1516/federate/FederateSave.java trunk/rti/src/java/net/sf/ohla/rti1516/federate/LocalFederate.java trunk/rti/src/java/net/sf/ohla/rti1516/federate/LocalMessageRetractionManager.java trunk/rti/src/java/net/sf/ohla/rti1516/federate/LocalRegionManager.java trunk/rti/src/java/net/sf/ohla/rti1516/federate/LocalSynchronizationPoint.java trunk/rti/src/java/net/sf/ohla/rti1516/federate/LocalTimeManager.java trunk/rti/src/java/net/sf/ohla/rti1516/federate/SubscriptionManager.java Removed Paths: ------------- trunk/rti/src/java/net/sf/ohla/rti1516/federate/FederateRestoreState.java trunk/rti/src/java/net/sf/ohla/rti1516/federate/FederateSaveState.java Modified: trunk/build/build.xml =================================================================== --- trunk/build/build.xml 2007-02-13 03:29:52 UTC (rev 119) +++ trunk/build/build.xml 2007-02-13 03:51:11 UTC (rev 120) @@ -322,17 +322,8 @@ <jvmarg value="-ea"/> - <jvmarg value="-Dohla.rti.host=localhost"/> - <jvmarg value="-Dohla.rti.port=5000"/> - - <!--<jvmarg value="-Dohla.federate.Test Federate.host=localhost"/>--> - <!--<jvmarg value="-Dohla.federate.Test Federate.port=5001"/>--> -<!----> - <!--<jvmarg value="-Dohla.federate.Test Federate2.host=localhost"/>--> - <!--<jvmarg value="-Dohla.federate.Test Federate2.port=5002"/>--> -<!----> - <!--<jvmarg value="-Dohla.federate.Test Federate3.host=localhost"/>--> - <!--<jvmarg value="-Dohla.federate.Test Federate3.port=5003"/>--> + <sysproperty key="ohla.rti.host" value="localhost"/> + <sysproperty key="ohla.rti.port" value="5000"/> </testng> </target> @@ -356,17 +347,17 @@ <jvmarg value="-ea"/> - <jvmarg value="-Dohla.rti.host=localhost"/> - <jvmarg value="-Dohla.rti.port=5000"/> + <sysproperty key="ohla.rti.host" value="localhost"/> + <sysproperty key="ohla.rti.port" value="5000"/> <sysproperty key="ohla.federate.rti.logicalTimeFactory" value="net.sf.ohla.rti.Integer64TimeFactory"/> <sysproperty key="ohla.federate.rti.logicalTimeIntervalFactory" value="net.sf.ohla.rti.Integer64TimeIntervalFactory"/> <sysproperty key="ohla.federate.rti1516.logicalTimeFactory" - value="net.sf.ohla.rti1516.Integer64TimeFactory"/> + value="net.sf.ohla.rti1516.impl.Integer64TimeFactory"/> <sysproperty key="ohla.federate.rti1516.logicalTimeIntervalFactory" - value="net.sf.ohla.rti1516.Integer64TimeIntervalFactory"/> + value="net.sf.ohla.rti1516.impl.Integer64TimeIntervalFactory"/> </testng> </target> Modified: trunk/build/intellij/OHLA.iws =================================================================== --- trunk/build/intellij/OHLA.iws 2007-02-13 03:29:52 UTC (rev 119) +++ trunk/build/intellij/OHLA.iws 2007-02-13 03:51:11 UTC (rev 120) @@ -20,15 +20,24 @@ </component> <component name="ChangeListManager"> <list default="true" name="Default" comment=""> - <change type="MODIFICATION" beforePath="$PROJECT_DIR$/../../resources/logback-test.xml" afterPath="$PROJECT_DIR$/../../resources/logback-test.xml" /> - <change type="MODIFICATION" beforePath="$PROJECT_DIR$/../../resources/testsuite/ieee-1516-testng.xml" afterPath="$PROJECT_DIR$/../../resources/testsuite/ieee-1516-testng.xml" /> - <change type="MODIFICATION" beforePath="$PROJECT_DIR$/../../rti/src/java/net/sf/ohla/rti1516/federate/Federate.java" afterPath="$PROJECT_DIR$/../../rti/src/java/net/sf/ohla/rti1516/federate/Federate.java" /> - <change type="MODIFICATION" beforePath="$PROJECT_DIR$/../../rti/src/java/net/sf/ohla/rti1516/federation/FederationExecution.java" afterPath="$PROJECT_DIR$/../../rti/src/java/net/sf/ohla/rti1516/federation/FederationExecution.java" /> - <change type="MODIFICATION" beforePath="$PROJECT_DIR$/../../rti/src/java/net/sf/ohla/rti1516/messages/callbacks/TimeAdvanceGrant.java" afterPath="$PROJECT_DIR$/../../rti/src/java/net/sf/ohla/rti1516/messages/callbacks/TimeAdvanceGrant.java" /> - <change type="MODIFICATION" beforePath="$PROJECT_DIR$/../../testsuite/src/java/net/sf/ohla/rti1516/TimeManagementTestNG.java" afterPath="$PROJECT_DIR$/../../testsuite/src/java/net/sf/ohla/rti1516/TimeManagementTestNG.java" /> + <change type="DELETED" beforePath="D:\projects\ohla-0.4\rti\src\java\net\sf\ohla\rti1516\federate\FederateRestoreState.java" afterPath="" /> + <change type="MODIFICATION" beforePath="$PROJECT_DIR$/../../rti/src/java/net/sf/ohla/rti1516/federate/LocalMessageRetractionManager.java" afterPath="$PROJECT_DIR$/../../rti/src/java/net/sf/ohla/rti1516/federate/LocalMessageRetractionManager.java" /> + <change type="DELETED" beforePath="D:\projects\ohla-0.4\rti\src\java\net\sf\ohla\rti1516\local\objects\AttributeInstance.java" afterPath="" /> + <change type="MODIFICATION" beforePath="$PROJECT_DIR$/../../rti/src/java/net/sf/ohla/rti1516/federate/LocalFederate.java" afterPath="$PROJECT_DIR$/../../rti/src/java/net/sf/ohla/rti1516/federate/LocalFederate.java" /> + <change type="MODIFICATION" beforePath="$PROJECT_DIR$/../../rti/src/java/net/sf/ohla/rti1516/federate/FederateRestore.java" afterPath="$PROJECT_DIR$/../../rti/src/java/net/sf/ohla/rti1516/federate/FederateRestore.java" /> + <change type="DELETED" beforePath="D:\projects\ohla-0.4\rti\src\java\net\sf\ohla\rti1516\local\objects\ObjectManager.java" afterPath="" /> + <change type="MODIFICATION" beforePath="$PROJECT_DIR$/../../rti/src/java/net/sf/ohla/rti1516/federate/FederateSave.java" afterPath="$PROJECT_DIR$/../../rti/src/java/net/sf/ohla/rti1516/federate/FederateSave.java" /> + <change type="DELETED" beforePath="D:\projects\ohla-0.4\rti\src\java\net\sf\ohla\rti1516\federate\FederateSaveState.java" afterPath="" /> + <change type="DELETED" beforePath="D:\projects\ohla-0.4\rti\src\java\net\sf\ohla\rti1516\local\objects\ObjectInstance.java" afterPath="" /> + <change type="MODIFICATION" beforePath="$PROJECT_DIR$/../build.xml" afterPath="$PROJECT_DIR$/../build.xml" /> + <change type="MODIFICATION" beforePath="$PROJECT_DIR$/../../rti/src/java/net/sf/ohla/rti1516/federate/SubscriptionManager.java" afterPath="$PROJECT_DIR$/../../rti/src/java/net/sf/ohla/rti1516/federate/SubscriptionManager.java" /> <change type="MODIFICATION" beforePath="$PROJECT_DIR$/OHLA.iws" afterPath="$PROJECT_DIR$/OHLA.iws" /> + <change type="MODIFICATION" beforePath="$PROJECT_DIR$/../../rti/src/java/net/sf/ohla/rti1516/federate/LocalTimeManager.java" afterPath="$PROJECT_DIR$/../../rti/src/java/net/sf/ohla/rti1516/federate/LocalTimeManager.java" /> + <change type="MODIFICATION" beforePath="$PROJECT_DIR$/../../rti/src/java/net/sf/ohla/rti1516/federate/LocalRegionManager.java" afterPath="$PROJECT_DIR$/../../rti/src/java/net/sf/ohla/rti1516/federate/LocalRegionManager.java" /> + <change type="MODIFICATION" beforePath="$PROJECT_DIR$/../../rti/src/java/net/sf/ohla/rti1516/federate/LocalSynchronizationPoint.java" afterPath="$PROJECT_DIR$/../../rti/src/java/net/sf/ohla/rti1516/federate/LocalSynchronizationPoint.java" /> </list> <list name="Failed commit: Default" comment="- removed log4j" /> + <list name="Failed commit: Default (2)" comment="- refactoring" /> </component> <component name="ChangeListSynchronizer" /> <component name="ChangesViewManager" flattened_view="true" /> @@ -223,98 +232,82 @@ </component> <component name="FileEditorManager"> <leaf> - <file leaf-file-name="Federate.java" pinned="false" current="false" current-in-tab="false"> - <entry file="file://$PROJECT_DIR$/../../rti/src/java/net/sf/ohla/rti1516/federate/Federate.java"> + <file leaf-file-name="FederateRestore.java" pinned="false" current="false" current-in-tab="false"> + <entry file="file://$PROJECT_DIR$/../../rti/src/java/net/sf/ohla/rti1516/federate/FederateRestore.java"> <provider selected="true" editor-type-id="text-editor"> - <state line="428" column="14" selection-start="16700" selection-end="16700" vertical-scroll-proportion="0.33252132"> - <folding> - <element signature="imports" expanded="true" /> - </folding> - </state> - </provider> - </entry> - </file> - <file leaf-file-name="ObjectManagementTestNG.java" pinned="false" current="false" current-in-tab="false"> - <entry file="file://$PROJECT_DIR$/../../testsuite/src/java/net/sf/ohla/rti1516/ObjectManagementTestNG.java"> - <provider selected="true" editor-type-id="text-editor"> - <state line="15" column="0" selection-start="605" selection-end="605" vertical-scroll-proportion="0.020706456"> + <state line="18" column="13" selection-start="658" selection-end="658" vertical-scroll-proportion="0.12431444"> <folding /> </state> </provider> </entry> </file> - <file leaf-file-name="TimeAdvanceGrant.java" pinned="false" current="false" current-in-tab="false"> - <entry file="file://$PROJECT_DIR$/../../rti/src/java/net/sf/ohla/rti1516/messages/callbacks/TimeAdvanceGrant.java"> + <file leaf-file-name="FederateSave.java" pinned="false" current="false" current-in-tab="false"> + <entry file="file://$PROJECT_DIR$/../../rti/src/java/net/sf/ohla/rti1516/federate/FederateSave.java"> <provider selected="true" editor-type-id="text-editor"> - <state line="35" column="3" selection-start="1062" selection-end="1062" vertical-scroll-proportion="0.35200974"> + <state line="16" column="13" selection-start="619" selection-end="619" vertical-scroll-proportion="0.06390978"> <folding /> </state> </provider> </entry> </file> - <file leaf-file-name="TimeManager.java" pinned="false" current="false" current-in-tab="false"> - <entry file="file://$PROJECT_DIR$/../../rti/src/java/net/sf/ohla/rti1516/federate/time/TimeManager.java"> + <file leaf-file-name="LocalFederate.java" pinned="false" current="true" current-in-tab="true"> + <entry file="file://$PROJECT_DIR$/../../rti/src/java/net/sf/ohla/rti1516/federate/LocalFederate.java"> <provider selected="true" editor-type-id="text-editor"> - <state line="675" column="14" selection-start="18064" selection-end="18064" vertical-scroll-proportion="0.39464068"> - <folding /> + <state line="1040" column="50" selection-start="33230" selection-end="33230" vertical-scroll-proportion="0.7612782"> + <folding> + <element signature="imports" expanded="true" /> + </folding> </state> </provider> </entry> </file> - <file leaf-file-name="OHLARTIambassador.java" pinned="false" current="false" current-in-tab="false"> - <entry file="file://$PROJECT_DIR$/../../rti/src/java/net/sf/ohla/rti1516/OHLARTIambassador.java"> + <file leaf-file-name="LocalMessageRetractionManager.java" pinned="false" current="false" current-in-tab="false"> + <entry file="file://$PROJECT_DIR$/../../rti/src/java/net/sf/ohla/rti1516/federate/LocalMessageRetractionManager.java"> <provider selected="true" editor-type-id="text-editor"> - <state line="2938" column="0" selection-start="79846" selection-end="79846" vertical-scroll-proportion="0.020706456"> + <state line="0" column="36" selection-start="28" selection-end="36" vertical-scroll-proportion="0.0"> <folding /> </state> </provider> </entry> </file> - <file leaf-file-name="TestObjectModel.xml" pinned="false" current="false" current-in-tab="false"> - <entry file="file://$PROJECT_DIR$/../../resources/testsuite/TestObjectModel.xml"> + <file leaf-file-name="LocalRegionManager.java" pinned="false" current="false" current-in-tab="false"> + <entry file="file://$PROJECT_DIR$/../../rti/src/java/net/sf/ohla/rti1516/federate/LocalRegionManager.java"> <provider selected="true" editor-type-id="text-editor"> - <state line="0" column="0" selection-start="0" selection-end="0" vertical-scroll-proportion="0.0"> + <state line="0" column="36" selection-start="36" selection-end="36" vertical-scroll-proportion="0.0"> <folding /> </state> </provider> </entry> </file> - <file leaf-file-name="TimeManagementTestNG.java" pinned="false" current="false" current-in-tab="false"> - <entry file="file://$PROJECT_DIR$/../../testsuite/src/java/net/sf/ohla/rti1516/TimeManagementTestNG.java"> + <file leaf-file-name="LocalSynchronizationPoint.java" pinned="false" current="false" current-in-tab="false"> + <entry file="file://$PROJECT_DIR$/../../rti/src/java/net/sf/ohla/rti1516/federate/LocalSynchronizationPoint.java"> <provider selected="true" editor-type-id="text-editor"> - <state line="0" column="0" selection-start="0" selection-end="0" vertical-scroll-proportion="0.0"> + <state line="16" column="36" selection-start="642" selection-end="642" vertical-scroll-proportion="0.06390978"> <folding /> </state> </provider> </entry> </file> - <file leaf-file-name="ieee-1516-testng.xml" pinned="false" current="true" current-in-tab="true"> - <entry file="file://$PROJECT_DIR$/../../resources/testsuite/ieee-1516-testng.xml"> + <file leaf-file-name="LocalTimeManager.java" pinned="false" current="false" current-in-tab="false"> + <entry file="file://$PROJECT_DIR$/../../rti/src/java/net/sf/ohla/rti1516/federate/LocalTimeManager.java"> <provider selected="true" editor-type-id="text-editor"> - <state line="22" column="9" selection-start="909" selection-end="909" vertical-scroll-proportion="0.041412912"> - <folding /> + <state line="21" column="35" selection-start="788" selection-end="788" vertical-scroll-proportion="0.2236842"> + <folding> + <element signature="imports" expanded="true" /> + </folding> </state> </provider> </entry> </file> - <file leaf-file-name="logback-test.xml" pinned="false" current="false" current-in-tab="false"> - <entry file="file://$PROJECT_DIR$/../../resources/logback-test.xml"> + <file leaf-file-name="SubscriptionManager.java" pinned="false" current="false" current-in-tab="false"> + <entry file="file://$PROJECT_DIR$/../../rti/src/java/net/sf/ohla/rti1516/federate/SubscriptionManager.java"> <provider selected="true" editor-type-id="text-editor"> - <state line="24" column="46" selection-start="945" selection-end="945" vertical-scroll-proportion="0.35200974"> + <state line="16" column="36" selection-start="642" selection-end="642" vertical-scroll-proportion="0.06390978"> <folding /> </state> </provider> </entry> </file> - <file leaf-file-name="build.xml" pinned="false" current="false" current-in-tab="false"> - <entry file="file://$PROJECT_DIR$/../build.xml"> - <provider selected="true" editor-type-id="text-editor"> - <state line="44" column="0" selection-start="1897" selection-end="1897" vertical-scroll-proportion="0.020706456"> - <folding /> - </state> - </provider> - </entry> - </file> </leaf> </component> <component name="FindManager"> @@ -403,10 +396,6 @@ <option name="myItemId" value="OHLA.ipr" /> <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewProjectNode" /> </PATH_ELEMENT> - <PATH_ELEMENT> - <option name="myItemId" value="Testsuite" /> - <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewModuleNode" /> - </PATH_ELEMENT> </PATH> <PATH> <PATH_ELEMENT> @@ -414,62 +403,6 @@ <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewProjectNode" /> </PATH_ELEMENT> <PATH_ELEMENT> - <option name="myItemId" value="Testsuite" /> - <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewModuleNode" /> - </PATH_ELEMENT> - <PATH_ELEMENT> - <option name="myItemId" value="PsiDirectory:D:\projects\ohla-0.4\testsuite" /> - <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" /> - </PATH_ELEMENT> - <PATH_ELEMENT> - <option name="myItemId" value="PsiDirectory:D:\projects\ohla-0.4\testsuite\src" /> - <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" /> - </PATH_ELEMENT> - <PATH_ELEMENT> - <option name="myItemId" value="PsiDirectory:D:\projects\ohla-0.4\testsuite\src\java" /> - <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" /> - </PATH_ELEMENT> - <PATH_ELEMENT> - <option name="myItemId" value="PsiDirectory:D:\projects\ohla-0.4\testsuite\src\java\net\sf\ohla" /> - <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" /> - </PATH_ELEMENT> - <PATH_ELEMENT> - <option name="myItemId" value="PsiDirectory:D:\projects\ohla-0.4\testsuite\src\java\net\sf\ohla\rti1516" /> - <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" /> - </PATH_ELEMENT> - </PATH> - <PATH> - <PATH_ELEMENT> - <option name="myItemId" value="OHLA.ipr" /> - <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewProjectNode" /> - </PATH_ELEMENT> - <PATH_ELEMENT> - <option name="myItemId" value="Testsuite" /> - <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewModuleNode" /> - </PATH_ELEMENT> - <PATH_ELEMENT> - <option name="myItemId" value="PsiDirectory:D:\projects\ohla-0.4\testsuite" /> - <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" /> - </PATH_ELEMENT> - <PATH_ELEMENT> - <option name="myItemId" value="PsiDirectory:D:\projects\ohla-0.4\testsuite\src" /> - <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" /> - </PATH_ELEMENT> - <PATH_ELEMENT> - <option name="myItemId" value="PsiDirectory:D:\projects\ohla-0.4\testsuite\src\java" /> - <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" /> - </PATH_ELEMENT> - <PATH_ELEMENT> - <option name="myItemId" value="PsiDirectory:D:\projects\ohla-0.4\testsuite\src\java\net\sf\ohla" /> - <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" /> - </PATH_ELEMENT> - </PATH> - <PATH> - <PATH_ELEMENT> - <option name="myItemId" value="OHLA.ipr" /> - <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewProjectNode" /> - </PATH_ELEMENT> - <PATH_ELEMENT> <option name="myItemId" value="RTI" /> <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewModuleNode" /> </PATH_ELEMENT> @@ -529,14 +462,6 @@ <option name="myItemId" value="PsiDirectory:D:\projects\ohla-0.4\rti\src\java\net\sf\ohla" /> <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" /> </PATH_ELEMENT> - <PATH_ELEMENT> - <option name="myItemId" value="PsiDirectory:D:\projects\ohla-0.4\rti\src\java\net\sf\ohla\rti1516" /> - <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" /> - </PATH_ELEMENT> - <PATH_ELEMENT> - <option name="myItemId" value="PsiDirectory:D:\projects\ohla-0.4\rti\src\java\net\sf\ohla\rti1516\handles" /> - <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" /> - </PATH_ELEMENT> </PATH> <PATH> <PATH_ELEMENT> @@ -559,286 +484,14 @@ <option name="myItemId" value="PsiDirectory:D:\projects\ohla-0.4\rti\src\java" /> <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" /> </PATH_ELEMENT> - <PATH_ELEMENT> - <option name="myItemId" value="PsiDirectory:D:\projects\ohla-0.4\rti\src\java\net\sf\ohla" /> - <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" /> - </PATH_ELEMENT> - <PATH_ELEMENT> - <option name="myItemId" value="PsiDirectory:D:\projects\ohla-0.4\rti\src\java\net\sf\ohla\rti1516" /> - <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" /> - </PATH_ELEMENT> - <PATH_ELEMENT> - <option name="myItemId" value="PsiDirectory:D:\projects\ohla-0.4\rti\src\java\net\sf\ohla\rti1516\federation" /> - <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" /> - </PATH_ELEMENT> </PATH> - <PATH> - <PATH_ELEMENT> - <option name="myItemId" value="OHLA.ipr" /> - <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewProjectNode" /> - </PATH_ELEMENT> - <PATH_ELEMENT> - <option name="myItemId" value="RTI" /> - <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewModuleNode" /> - </PATH_ELEMENT> - <PATH_ELEMENT> - <option name="myItemId" value="PsiDirectory:D:\projects\ohla-0.4\rti" /> - <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" /> - </PATH_ELEMENT> - <PATH_ELEMENT> - <option name="myItemId" value="PsiDirectory:D:\projects\ohla-0.4\rti\src" /> - <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" /> - </PATH_ELEMENT> - <PATH_ELEMENT> - <option name="myItemId" value="PsiDirectory:D:\projects\ohla-0.4\rti\src\java" /> - <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" /> - </PATH_ELEMENT> - <PATH_ELEMENT> - <option name="myItemId" value="PsiDirectory:D:\projects\ohla-0.4\rti\src\java\net\sf\ohla" /> - <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" /> - </PATH_ELEMENT> - <PATH_ELEMENT> - <option name="myItemId" value="PsiDirectory:D:\projects\ohla-0.4\rti\src\java\net\sf\ohla\rti1516" /> - <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" /> - </PATH_ELEMENT> - <PATH_ELEMENT> - <option name="myItemId" value="PsiDirectory:D:\projects\ohla-0.4\rti\src\java\net\sf\ohla\rti1516\federation" /> - <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" /> - </PATH_ELEMENT> - <PATH_ELEMENT> - <option name="myItemId" value="PsiDirectory:D:\projects\ohla-0.4\rti\src\java\net\sf\ohla\rti1516\federation\time" /> - <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" /> - </PATH_ELEMENT> - </PATH> - <PATH> - <PATH_ELEMENT> - <option name="myItemId" value="OHLA.ipr" /> - <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewProjectNode" /> - </PATH_ELEMENT> - <PATH_ELEMENT> - <option name="myItemId" value="RTI" /> - <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewModuleNode" /> - </PATH_ELEMENT> - <PATH_ELEMENT> - <option name="myItemId" value="PsiDirectory:D:\projects\ohla-0.4\rti" /> - <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" /> - </PATH_ELEMENT> - <PATH_ELEMENT> - <option name="myItemId" value="PsiDirectory:D:\projects\ohla-0.4\rti\src" /> - <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" /> - </PATH_ELEMENT> - <PATH_ELEMENT> - <option name="myItemId" value="PsiDirectory:D:\projects\ohla-0.4\rti\src\java" /> - <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" /> - </PATH_ELEMENT> - <PATH_ELEMENT> - <option name="myItemId" value="PsiDirectory:D:\projects\ohla-0.4\rti\src\java\net\sf\ohla" /> - <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" /> - </PATH_ELEMENT> - </PATH> - <PATH> - <PATH_ELEMENT> - <option name="myItemId" value="OHLA.ipr" /> - <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewProjectNode" /> - </PATH_ELEMENT> - <PATH_ELEMENT> - <option name="myItemId" value="RTI" /> - <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewModuleNode" /> - </PATH_ELEMENT> - <PATH_ELEMENT> - <option name="myItemId" value="PsiDirectory:D:\projects\ohla-0.4\rti" /> - <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" /> - </PATH_ELEMENT> - <PATH_ELEMENT> - <option name="myItemId" value="PsiDirectory:D:\projects\ohla-0.4\rti\src" /> - <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" /> - </PATH_ELEMENT> - <PATH_ELEMENT> - <option name="myItemId" value="PsiDirectory:D:\projects\ohla-0.4\rti\src\java" /> - <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" /> - </PATH_ELEMENT> - <PATH_ELEMENT> - <option name="myItemId" value="PsiDirectory:D:\projects\ohla-0.4\rti\src\java\hla\rti1516\jlc\omt" /> - <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" /> - </PATH_ELEMENT> - </PATH> - <PATH> - <PATH_ELEMENT> - <option name="myItemId" value="OHLA.ipr" /> - <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewProjectNode" /> - </PATH_ELEMENT> - <PATH_ELEMENT> - <option name="myItemId" value="OHLA" /> - <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewModuleNode" /> - </PATH_ELEMENT> - </PATH> - <PATH> - <PATH_ELEMENT> - <option name="myItemId" value="OHLA.ipr" /> - <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewProjectNode" /> - </PATH_ELEMENT> - <PATH_ELEMENT> - <option name="myItemId" value="OHLA" /> - <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewModuleNode" /> - </PATH_ELEMENT> - <PATH_ELEMENT> - <option name="myItemId" value="PsiDirectory:D:\projects\ohla-0.4" /> - <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" /> - </PATH_ELEMENT> - </PATH> - <PATH> - <PATH_ELEMENT> - <option name="myItemId" value="OHLA.ipr" /> - <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewProjectNode" /> - </PATH_ELEMENT> - <PATH_ELEMENT> - <option name="myItemId" value="OHLA" /> - <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewModuleNode" /> - </PATH_ELEMENT> - <PATH_ELEMENT> - <option name="myItemId" value="PsiDirectory:D:\projects\ohla-0.4" /> - <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" /> - </PATH_ELEMENT> - <PATH_ELEMENT> - <option name="myItemId" value="PsiDirectory:D:\projects\ohla-0.4\thirdparty" /> - <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" /> - </PATH_ELEMENT> - </PATH> - <PATH> - <PATH_ELEMENT> - <option name="myItemId" value="OHLA.ipr" /> - <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewProjectNode" /> - </PATH_ELEMENT> - <PATH_ELEMENT> - <option name="myItemId" value="OHLA" /> - <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewModuleNode" /> - </PATH_ELEMENT> - <PATH_ELEMENT> - <option name="myItemId" value="PsiDirectory:D:\projects\ohla-0.4" /> - <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" /> - </PATH_ELEMENT> - <PATH_ELEMENT> - <option name="myItemId" value="PsiDirectory:D:\projects\ohla-0.4\thirdparty" /> - <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" /> - </PATH_ELEMENT> - <PATH_ELEMENT> - <option name="myItemId" value="PsiDirectory:D:\projects\ohla-0.4\thirdparty\slf4j" /> - <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" /> - </PATH_ELEMENT> - </PATH> - <PATH> - <PATH_ELEMENT> - <option name="myItemId" value="OHLA.ipr" /> - <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewProjectNode" /> - </PATH_ELEMENT> - <PATH_ELEMENT> - <option name="myItemId" value="OHLA" /> - <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewModuleNode" /> - </PATH_ELEMENT> - <PATH_ELEMENT> - <option name="myItemId" value="PsiDirectory:D:\projects\ohla-0.4" /> - <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" /> - </PATH_ELEMENT> - <PATH_ELEMENT> - <option name="myItemId" value="PsiDirectory:D:\projects\ohla-0.4\thirdparty" /> - <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" /> - </PATH_ELEMENT> - <PATH_ELEMENT> - <option name="myItemId" value="PsiDirectory:D:\projects\ohla-0.4\thirdparty\slf4j" /> - <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" /> - </PATH_ELEMENT> - <PATH_ELEMENT> - <option name="myItemId" value="PsiDirectory:D:\projects\ohla-0.4\thirdparty\slf4j\lib" /> - <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" /> - </PATH_ELEMENT> - </PATH> - <PATH> - <PATH_ELEMENT> - <option name="myItemId" value="OHLA.ipr" /> - <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewProjectNode" /> - </PATH_ELEMENT> - <PATH_ELEMENT> - <option name="myItemId" value="OHLA" /> - <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewModuleNode" /> - </PATH_ELEMENT> - <PATH_ELEMENT> - <option name="myItemId" value="PsiDirectory:D:\projects\ohla-0.4" /> - <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" /> - </PATH_ELEMENT> - <PATH_ELEMENT> - <option name="myItemId" value="PsiDirectory:D:\projects\ohla-0.4\thirdparty" /> - <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" /> - </PATH_ELEMENT> - <PATH_ELEMENT> - <option name="myItemId" value="PsiDirectory:D:\projects\ohla-0.4\thirdparty\logback" /> - <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" /> - </PATH_ELEMENT> - </PATH> - <PATH> - <PATH_ELEMENT> - <option name="myItemId" value="OHLA.ipr" /> - <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewProjectNode" /> - </PATH_ELEMENT> - <PATH_ELEMENT> - <option name="myItemId" value="OHLA" /> - <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewModuleNode" /> - </PATH_ELEMENT> - <PATH_ELEMENT> - <option name="myItemId" value="PsiDirectory:D:\projects\ohla-0.4" /> - <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" /> - </PATH_ELEMENT> - <PATH_ELEMENT> - <option name="myItemId" value="PsiDirectory:D:\projects\ohla-0.4\thirdparty" /> - <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" /> - </PATH_ELEMENT> - <PATH_ELEMENT> - <option name="myItemId" value="PsiDirectory:D:\projects\ohla-0.4\thirdparty\logback" /> - <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" /> - </PATH_ELEMENT> - <PATH_ELEMENT> - <option name="myItemId" value="PsiDirectory:D:\projects\ohla-0.4\thirdparty\logback\lib" /> - <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" /> - </PATH_ELEMENT> - </PATH> - <PATH> - <PATH_ELEMENT> - <option name="myItemId" value="OHLA.ipr" /> - <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewProjectNode" /> - </PATH_ELEMENT> - <PATH_ELEMENT> - <option name="myItemId" value="OHLA" /> - <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewModuleNode" /> - </PATH_ELEMENT> - <PATH_ELEMENT> - <option name="myItemId" value="PsiDirectory:D:\projects\ohla-0.4" /> - <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" /> - </PATH_ELEMENT> - <PATH_ELEMENT> - <option name="myItemId" value="PsiDirectory:D:\projects\ohla-0.4\thirdparty" /> - <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" /> - </PATH_ELEMENT> - <PATH_ELEMENT> - <option name="myItemId" value="PsiDirectory:D:\projects\ohla-0.4\thirdparty\apache" /> - <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" /> - </PATH_ELEMENT> - <PATH_ELEMENT> - <option name="myItemId" value="PsiDirectory:D:\projects\ohla-0.4\thirdparty\apache\mina" /> - <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" /> - </PATH_ELEMENT> - </PATH> - <PATH> - <PATH_ELEMENT> - <option name="myItemId" value="OHLA.ipr" /> - <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewProjectNode" /> - </PATH_ELEMENT> - </PATH> </subPane> </component> <component name="ProjectReloadState"> <option name="STATE" value="0" /> </component> <component name="ProjectView"> - <navigator currentView="Scope" currentSubView="Project" proportions="0.16666667" version="1" splitterProportion="0.5"> + <navigator currentView="ProjectPane" proportions="0.16666667" version="1" splitterProportion="0.5"> <flattenPackages ProjectPane="false" /> <showMembers /> <showModules /> @@ -864,8 +517,8 @@ <property name="cvs_file_history_flatOrder1" value="1" /> <property name="cvs_file_history_flatWidth1" value="299" /> <property name="cvs_file_history_treeWidth1" value="299" /> - <property name="cvs_file_history_treeOrder2" value="2" /> <property name="cvs_file_history_treeWidth3" value="298" /> + <property name="cvs_file_history_treeOrder2" value="2" /> <property name="GoToClass.includeLibraries" value="false" /> <property name="cvs_file_history_flatOrder2" value="2" /> <property name="MemberChooser.showClasses" value="true" /> @@ -874,30 +527,23 @@ <property name="cvs_file_history_treeWidth2" value="299" /> <property name="cvs_file_history_flatOrder3" value="3" /> <property name="GoToClass.toSaveIncludeLibraries" value="false" /> - <property name="RunManagerConfig.showSettingsBeforeRunnig" value="true" /> <property name="cvs_file_history_treeOrder0" value="0" /> + <property name="RunManagerConfig.showSettingsBeforeRunnig" value="true" /> </component> <component name="ReadonlyStatusHandler"> <option name="SHOW_DIALOG" value="true" /> </component> <component name="RecentsManager"> <key name="MoveClassesOrPackagesDialog.RECENTS_KEY"> - <recent name="net.sf.ohla.rti1516.messages" /> - <recent name="net.sf.ohla" /> - <recent name="net.sf.ohla.rti" /> <recent name="net.sf.ohla.rti1516" /> - <recent name="net.sf.ohla.rti.ieee1516.impl.jlc" /> + <recent name="net.sf.ohla.rti1516.impl" /> + <recent name="net.sf.ohla.rti1516.federate" /> + <recent name="net.sf.ohla.rti1516.federation" /> + <recent name="net.sf.ohla.rti1516.messages" /> </key> </component> <component name="RestoreUpdateTree" /> <component name="RunManager" selected="Application.RTI"> - <configuration default="true" type="Remote" factoryName="Remote"> - <option name="USE_SOCKET_TRANSPORT" value="true" /> - <option name="SERVER_MODE" value="false" /> - <option name="SHMEM_ADDRESS" value="javadebug" /> - <option name="HOST" value="localhost" /> - <option name="PORT" value="5005" /> - </configuration> <configuration default="true" type="Applet" factoryName="Applet"> <module name="" /> <option name="MAIN_CLASS_NAME" /> @@ -910,6 +556,13 @@ <option name="ALTERNATIVE_JRE_PATH_ENABLED" value="false" /> <option name="ALTERNATIVE_JRE_PATH" /> </configuration> + <configuration default="true" type="Remote" factoryName="Remote"> + <option name="USE_SOCKET_TRANSPORT" value="true" /> + <option name="SERVER_MODE" value="false" /> + <option name="SHMEM_ADDRESS" value="javadebug" /> + <option name="HOST" value="localhost" /> + <option name="PORT" value="5005" /> + </configuration> <configuration default="true" type="Application" factoryName="Application" enabled="false" merge="false"> <option name="MAIN_CLASS_NAME" /> <option name="VM_PARAMETERS" /> @@ -1039,144 +692,12 @@ <option name="myItemId" value="" /> <option name="myItemType" value="" /> </PATH_ELEMENT> - <PATH_ELEMENT USER_OBJECT="Testsuite"> - <option name="myItemId" value="" /> - <option name="myItemType" value="" /> - </PATH_ELEMENT> - <PATH_ELEMENT USER_OBJECT="testsuite/src/java/net/sf/ohla"> - <option name="myItemId" value="" /> - <option name="myItemType" value="" /> - </PATH_ELEMENT> - <PATH_ELEMENT USER_OBJECT="rti1516"> - <option name="myItemId" value="" /> - <option name="myItemType" value="" /> - </PATH_ELEMENT> </PATH> <PATH> <PATH_ELEMENT USER_OBJECT="Root"> <option name="myItemId" value="" /> <option name="myItemType" value="" /> </PATH_ELEMENT> - <PATH_ELEMENT USER_OBJECT="Testsuite"> - <option name="myItemId" value="" /> - <option name="myItemType" value="" /> - </PATH_ELEMENT> - <PATH_ELEMENT USER_OBJECT="testsuite/src/java/net/sf/ohla"> - <option name="myItemId" value="" /> - <option name="myItemType" value="" /> - </PATH_ELEMENT> - </PATH> - <PATH> - <PATH_ELEMENT USER_OBJECT="Root"> - <option name="myItemId" value="" /> - <option name="myItemType" value="" /> - </PATH_ELEMENT> - <PATH_ELEMENT USER_OBJECT="RTI"> - <option name="myItemId" value="" /> - <option name="myItemType" value="" /> - </PATH_ELEMENT> - <PATH_ELEMENT USER_OBJECT="rti/src/java"> - <option name="myItemId" value="" /> - <option name="myItemType" value="" /> - </PATH_ELEMENT> - <PATH_ELEMENT USER_OBJECT="net/sf/ohla"> - <option name="myItemId" value="" /> - <option name="myItemType" value="" /> - </PATH_ELEMENT> - <PATH_ELEMENT USER_OBJECT="rti1516"> - <option name="myItemId" value="" /> - <option name="myItemType" value="" /> - </PATH_ELEMENT> - </PATH> - <PATH> - <PATH_ELEMENT USER_OBJECT="Root"> - <option name="myItemId" value="" /> - <option name="myItemType" value="" /> - </PATH_ELEMENT> - <PATH_ELEMENT USER_OBJECT="RTI"> - <option name="myItemId" value="" /> - <option name="myItemType" value="" /> - </PATH_ELEMENT> - <PATH_ELEMENT USER_OBJECT="rti/src/java"> - <option name="myItemId" value="" /> - <option name="myItemType" value="" /> - </PATH_ELEMENT> - <PATH_ELEMENT USER_OBJECT="net/sf/ohla"> - <option name="myItemId" value="" /> - <option name="myItemType" value="" /> - </PATH_ELEMENT> - <PATH_ELEMENT USER_OBJECT="rti1516"> - <option name="myItemId" value="" /> - <option name="myItemType" value="" /> - </PATH_ELEMENT> - <PATH_ELEMENT USER_OBJECT="federation"> - <option name="myItemId" value="" /> - <option name="myItemType" value="" /> - </PATH_ELEMENT> - </PATH> - <PATH> - <PATH_ELEMENT USER_OBJECT="Root"> - <option name="myItemId" value="" /> - <option name="myItemType" value="" /> - </PATH_ELEMENT> - <PATH_ELEMENT USER_OBJECT="RTI"> - <option name="myItemId" value="" /> - <option name="myItemType" value="" /> - </PATH_ELEMENT> - <PATH_ELEMENT USER_OBJECT="rti/src/java"> - <option name="myItemId" value="" /> - <option name="myItemType" value="" /> - </PATH_ELEMENT> - <PATH_ELEMENT USER_OBJECT="net/sf/ohla"> - <option name="myItemId" value="" /> - <option name="myItemType" value="" /> - </PATH_ELEMENT> - <PATH_ELEMENT USER_OBJECT="rti1516"> - <option name="myItemId" value="" /> - <option name="myItemType" value="" /> - </PATH_ELEMENT> - <PATH_ELEMENT USER_OBJECT="federate"> - <option name="myItemId" value="" /> - <option name="myItemType" value="" /> - </PATH_ELEMENT> - </PATH> - <PATH> - <PATH_ELEMENT USER_OBJECT="Root"> - <option name="myItemId" value="" /> - <option name="myItemType" value="" /> - </PATH_ELEMENT> - <PATH_ELEMENT USER_OBJECT="RTI"> - <option name="myItemId" value="" /> - <option name="myItemType" value="" /> - </PATH_ELEMENT> - <PATH_ELEMENT USER_OBJECT="rti/src/java"> - <option name="myItemId" value="" /> - <option name="myItemType" value="" /> - </PATH_ELEMENT> - <PATH_ELEMENT USER_OBJECT="net/sf/ohla"> - <option name="myItemId" value="" /> - <option name="myItemType" value="" /> - </PATH_ELEMENT> - </PATH> - <PATH> - <PATH_ELEMENT USER_OBJECT="Root"> - <option name="myItemId" value="" /> - <option name="myItemType" value="" /> - </PATH_ELEMENT> - <PATH_ELEMENT USER_OBJECT="RTI"> - <option name="myItemId" value="" /> - <option name="myItemType" value="" /> - </PATH_ELEMENT> - <PATH_ELEMENT USER_OBJECT="rti/src/java"> - <option name="myItemId" value="" /> - <option name="myItemType" value="" /> - </PATH_ELEMENT> - </PATH> - <PATH> - <PATH_ELEMENT USER_OBJECT="Root"> - <option name="myItemId" value="" /> - <option name="myItemType" value="" /> - </PATH_ELEMENT> <PATH_ELEMENT USER_OBJECT="OHLA"> <option name="myItemId" value="" /> <option name="myItemType" value="" /> @@ -1226,12 +747,6 @@ <option name="myItemType" value="" /> </PATH_ELEMENT> </PATH> - <PATH> - <PATH_ELEMENT USER_OBJECT="Root"> - <option name="myItemId" value="" /> - <option name="myItemType" value="" /> - </PATH_ELEMENT> - </PATH> </subPane> </component> <component name="SelectInManager" /> @@ -1300,23 +815,23 @@ </todo-panel> </component> <component name="ToolWindowManager"> - <frame x="-4" y="-4" width="1288" height="998" extended-state="6" /> + <frame x="-4" y="-4" width="1032" height="742" extended-state="6" /> <editor active="false" /> <layout> <window_info id="UI Designer" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" order="3" /> <window_info id="CVS" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" order="8" /> <window_info id="IDEtalk" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" order="3" /> - <window_info id="TODO" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.32791588" order="7" /> - <window_info id="Project" active="true" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="true" weight="0.30738038" order="0" /> - <window_info id="Find" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.34367815" order="1" /> + <window_info id="TODO" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.32736155" order="7" /> + <window_info id="Project" active="true" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="true" weight="0.3623337" order="0" /> + <window_info id="Find" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.45276874" order="1" /> <window_info id="Structure" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.25" order="1" /> - <window_info id="Messages" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.32413793" order="8" /> + <window_info id="Messages" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.32247558" order="8" /> <window_info id="Inspection" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.4" order="6" /> <window_info id="Module Dependencies" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" order="3" /> <window_info id="Dependency Viewer" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.32988507" order="8" /> <window_info id="Palette" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" order="3" /> <window_info id="Ant Build" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.15490673" order="1" /> - <window_info id="Changes" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" order="8" /> + <window_info id="Changes" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.32899022" order="8" /> <window_info id="Run" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.27816093" order="2" /> <window_info id="Hierarchy" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.25" order="2" /> <window_info id="File View" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" order="3" /> @@ -1356,12 +871,12 @@ </component> <component name="VcsManagerConfiguration"> <option name="OFFER_MOVE_TO_ANOTHER_CHANGELIST_ON_PARTIAL_COMMIT" value="true" /> - <option name="CHECK_CODE_SMELLS_BEFORE_PROJECT_COMMIT" value="true" /> + <option name="CHECK_CODE_SMELLS_BEFORE_PROJECT_COMMIT" value="false" /> <option name="PERFORM_UPDATE_IN_BACKGROUND" value="false" /> <option name="PERFORM_COMMIT_IN_BACKGROUND" value="false" /> <option name="PUT_FOCUS_INTO_COMMENT" value="false" /> <option name="FORCE_NON_EMPTY_COMMENT" value="false" /> - <option name="LAST_COMMIT_MESSAGE" value="- all but 1 time management test passes" /> + <option name="LAST_COMMIT_MESSAGE" value="- refactoring" /> <option name="SAVE_LAST_COMMIT_MESSAGE" value="true" /> <option name="CHECKIN_DIALOG_SPLITTER_PROPORTION" value="0.8" /> <option name="OPTIMIZE_IMPORTS_BEFORE_PROJECT_COMMIT" value="false" /> @@ -1374,16 +889,16 @@ <option name="UPDATE_GROUP_BY_PACKAGES" value="false" /> <option name="SHOW_FILE_HISTORY_AS_TREE" value="false" /> <option name="FILE_HISTORY_SPLITTER_PROPORTION" value="0.6" /> - <MESSAGE value="- fix for removed statics from RTI.java" /> - <MESSAGE value="removed duplicate text from thrown exceptions" /> - <MESSAGE value="- almost complete refactor to centralized RTI" /> - <MESSAGE value="- starting tests for centralized RTI" /> <MESSAGE value="- added a default socket acceptor" /> <MESSAGE value="- check sent region handles for null or isEmpty" /> <MESSAGE value="- Federation Management, Support Services, Declaration Management, and Object Management unit test cases passing" /> <MESSAGE value="- removed uncessary delay" /> <MESSAGE value="- removed log4j" /> <MESSAGE value="- all but 1 time management test passes" /> + <MESSAGE value="- all tests passing" /> + <MESSAGE value="- added HLA 1.3 LogicalTime factory properties" /> + <MESSAGE value="- removed extra lock on the Time lock" /> + <MESSAGE value="- refactoring" /> </component> <component name="VssConfiguration"> <option name="CLIENT_PATH" value="" /> @@ -1466,113 +981,101 @@ <option name="myLastEditedConfigurable" /> </component> <component name="editorHistoryManager"> - <entry file="file://$PROJECT_DIR$/../../testsuite/src/java/net/sf/ohla/rti1516/OwnershipManagementTestNG.java"> + <entry file="file://$PROJECT_DIR$/../../rti/src/java/net/sf/ohla/rti1516/federation/FederationExecution.java"> <provider selected="true" editor-type-id="text-editor"> - <state line="550" column="0" selection-start="19642" selection-end="19642" vertical-scroll-proportion="0.020706456"> + <state line="265" column="38" selection-start="9856" selection-end="9856" vertical-scroll-proportion="0.029929578"> <folding /> </state> </provider> </entry> - <entry file="file://$PROJECT_DIR$/../../testsuite/src/java/net/sf/ohla/rti1516/SupportServicesTestNG.java"> + <entry file="file://$PROJECT_DIR$/../../rti/src/java/net/sf/ohla/rti1516/federation/Federate.java"> <provider selected="true" editor-type-id="text-editor"> - <state line="43" column="13" selection-start="1566" selection-end="1566" vertical-scroll-proportion="0.020706456"> + <state line="150" column="0" selection-start="4647" selection-end="4647" vertical-scroll-proportion="0.029929578"> <folding /> </state> </provider> </entry> - <entry file="file://$PROJECT_DIR$/../../rti/src/java/net/sf/ohla/rti1516/federation/FederationExecution.java"> + <entry file="file://$PROJECT_DIR$/../build.xml"> <provider selected="true" editor-type-id="text-editor"> - <state line="152" column="0" selection-start="7195" selection-end="7239" vertical-scroll-proportion="0.020706456"> + <state line="326" column="0" selection-start="11921" selection-end="11921" vertical-scroll-proportion="0.029929578"> <folding /> </state> </provider> </entry> - <entry file="file://$PROJECT_DIR$/../../rti/src/java/net/sf/ohla/rti1516/RTI.java"> + <entry file="file://$PROJECT_DIR$/../../testsuite/src/java/net/sf/ohla/rti1516/BaseTestNG.java"> <provider selected="true" editor-type-id="text-editor"> - <state line="109" column="28" selection-start="3668" selection-end="3668" vertical-scroll-proportion="0.020706456"> + <state line="18" column="0" selection-start="636" selection-end="636" vertical-scroll-proportion="0.02915952"> <folding /> </state> </provider> </entry> - <entry file="file://$PROJECT_DIR$/../../rti/src/java/net/sf/ohla/rti1516/OHLARTIambassador.java"> + <entry file="file://$PROJECT_DIR$/../../rti/src/java/net/sf/ohla/rti1516/federate/objects/AttributeInstance.java"> <provider selected="true" editor-type-id="text-editor"> - <state line="2938" column="0" selection-start="79846" selection-end="79846" vertical-scroll-proportion="0.020706456"> + <state line="30" column="13" selection-start="1035" selection-end="1035" vertical-scroll-proportion="0.18545455"> <folding /> </state> </provider> </entry> - <entry file="file://$PROJECT_DIR$/../build.xml"> + <entry file="file://$PROJECT_DIR$/../../rti/src/java/net/sf/ohla/rti1516/federate/FederateSave.java"> <provider selected="true" editor-type-id="text-editor"> - <state line="44" column="0" selection-start="1897" selection-end="1897" vertical-scroll-proportion="0.020706456"> + <state line="16" column="13" selection-start="619" selection-end="619" vertical-scroll-proportion="0.06390978"> <folding /> </state> </provider> </entry> - <entry file="file://$PROJECT_DIR$/../../resources/logback-test.xml"> + <entry file="file://$PROJECT_DIR$/../../rti/src/java/net/sf/ohla/rti1516/federate/LocalMessageRetractionManager.java"> <provider selected="true" editor-type-id="text-editor"> - <state line="24" column="46" selection-start="945" selection-end="945" vertical-scroll-proportion="0.35200974"> + <state line="0" column="36" selection-start="28" selection-end="36" vertical-scroll-proportion="0.0"> <folding /> </state> </provider> </entry> - <entry file="file://$PROJECT_DIR$/../../rti/src/java/net/sf/ohla/rti1516/federate/time/TimeManager.java"> + <entry file="file://$PROJECT_DIR$/../../rti/src/java/net/sf/ohla/rti1516/federate/LocalRegionManager.java"> <provider selected="true" editor-type-id="text-editor"> - <state line="675" column="14" selection-start="18064" selection-end="18064" vertical-scroll-proportion="0.39464068"> + <state line="0" column="36" selection-start="36" selection-end="36" vertical-scroll-proportion="0.0"> <folding /> </state> </provider> </entry> - <entry file="file://$PROJECT_DIR$/../../rti/src/java/net/sf/ohla/rti1516/federation/Federate.java"> + <entry file="file://$PROJECT_DIR$/../../rti/src/java/net/sf/ohla/rti1516/federate/LocalSynchronizationPoint.java"> <provider selected="true" editor-type-id="text-editor"> - <state line="78" column="0" selection-start="3168" selection-end="3201" vertical-scroll-proportion="0.020706456"> + <state line="16" column="36" selection-start="642" selection-end="642" vertical-scroll-proportion="0.06390978"> <folding /> </state> </provider> </entry> - <entry file="file://$PROJECT_DIR$/../../rti/src/java/net/sf/ohla/rti1516/messages/callbacks/TimeAdvanceGrant.java"> + <entry file="file://$PROJECT_DIR$/../../rti/src/java/net/sf/ohla/rti1516/federate/SubscriptionManager.java"> <provider selected="true" editor-type-id="text-editor"> - <state line="35" column="3" selection-start="1062" selection-end="1062" vertical-scroll-proportion="0.35200974"> + <state line="16" column="36" selection-start="642" selection-end="642" vertical-scroll-proportion="0.06390978"> <folding /> </state> </provider> </entry> - <entry file="file://$PROJECT_DIR$/../../rti/src/java/net/sf/ohla/rti1516/federate/Federate.java"> + <entry file="file://$PROJECT_DIR$/../../rti/src/java/net/sf/ohla/rti1516/federate/LocalTimeManager.java"> <provider selected="true" editor-type-id="text-editor"> - <state line="428" column="14" selection-start="16700" selection-end="16700" vertical-scroll-proportion="0.33252132"> + <state line="21" column="35" selection-start="788" selection-end="788" vertical-scroll-proportion="0.2236842"> <folding> <element signature="imports" expanded="true" /> </folding> </state> </provider> </entry> - <entry file="file://$PROJECT_DIR$/../../testsuite/src/java/net/sf/ohla/rti1516/ObjectManagementTestNG.java"> + <entry file="file://$PROJECT_DIR$/../../rti/src/java/net/sf/ohla/rti1516/federate/FederateRestore.java"> <provider selected="true" editor-type-id="text-editor"> - <state line="15" column="0" selection-start="605" selection-end="605" vertical-scroll-proportion="0.020706456"> + <state line="18" column="13" selection-start="658" selection-end="658" vertical-scroll-proportion="0.12431444"> <folding /> </state> </provider> </entry> - <entry file="file://$PROJECT_DIR$/../../resources/testsuite/TestObjectModel.xml"> + <entry file="file://$PROJECT_DIR$/../../rti/src/java/net/sf/ohla/rti1516/federate/LocalFederate.java"> <provider selected="true" editor-type-id="text-editor"> - <state line="0" column="0" selection-start="0" selection-end="0" vertical-scroll-proportion="0.0"> - <folding /> + <state line="1040" column="50" selection-start="33230" selection-end="33230" vertical-scroll-proportion="0.7612782"> + <folding> + <element signature="imports" expanded="true" /> + </folding> </state> </provider> </entry> - <entry file="file://$PROJECT_DIR$/../../testsuite/src/java/net/sf/ohla/rti1516/TimeManagementTestNG.java"> - <provider selected="true" editor-type-id="text-editor"> - <state line="0" column="0" selection-start="0" selection-end="0" vertical-scroll-proportion="0.0"> - <folding /> - </state> - </provider> - </entry> - <entry file="file://$PROJECT_DIR$/../../resources/testsuite/ieee-1516-testng.xml"> - <provider selected="true" editor-type-id="text-editor"> - <state line="22" column="9" selection-start="909" selection-end="909" vertical-scroll-proportion="0.041412912"> - <folding /> - </state> - </provider> - </entry> </component> <component name="o... [truncated message content] |