[ohla-commits] SF.net SVN: ohla:[280] trunk
Status: Beta
Brought to you by:
mnewcomb
Menu
▾
▴
[ohla-commits] SF.net SVN: ohla:[280] trunk
|
From: <mne...@us...> - 2011-05-16 01:50:41
|
Revision: 280
http://ohla.svn.sourceforge.net/ohla/?rev=280&view=rev
Author: mnewcomb
Date: 2011-05-16 01:50:32 +0000 (Mon, 16 May 2011)
Log Message:
-----------
- re-implemented NextMessageRequest methods
Modified Paths:
--------------
trunk/build/intellij/OHLA.iws
trunk/rti/src/java/net/sf/ohla/rti/RTIChannelPipelineFactory.java
trunk/rti/src/java/net/sf/ohla/rti/federate/Federate.java
trunk/rti/src/java/net/sf/ohla/rti/federate/FederateTimeManager.java
trunk/rti/src/java/net/sf/ohla/rti/federation/FederateProxy.java
trunk/rti/src/java/net/sf/ohla/rti/federation/FederationExecution.java
trunk/rti/src/java/net/sf/ohla/rti/federation/FederationExecutionTimeManager.java
trunk/rti/src/java/net/sf/ohla/rti/messages/MessageDecoder.java
trunk/rti/src/java/net/sf/ohla/rti/messages/MessageType.java
Added Paths:
-----------
trunk/rti/src/java/net/sf/ohla/rti/messages/GetLITS.java
trunk/rti/src/java/net/sf/ohla/rti/messages/GetLITSResponse.java
trunk/testsuite/src/java/net/sf/ohla/rti/testsuite/hla/rti1516e/time/NextMessageRequestTestNG.java
Removed Paths:
-------------
trunk/rti/src/java/net/sf/ohla/rti/messages/NextMessageRequestAvailableTimeAdvanceGrant.java
trunk/rti/src/java/net/sf/ohla/rti/messages/NextMessageRequestTimeAdvanceGrant.java
trunk/rti/src/java/net/sf/ohla/rti/messages/UpdateLITS.java
Modified: trunk/build/intellij/OHLA.iws
===================================================================
--- trunk/build/intellij/OHLA.iws 2011-05-09 01:04:02 UTC (rev 279)
+++ trunk/build/intellij/OHLA.iws 2011-05-16 01:50:32 UTC (rev 280)
@@ -30,9 +30,21 @@
</component>
<component name="ChangeListManager">
<list default="true" readonly="true" id="c306879c-2744-4d82-a20f-7284eb5ea0e6" name="Default" comment="">
+ <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/../../rti/src/java/net/sf/ohla/rti/messages/GetLITS.java" />
+ <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/../../rti/src/java/net/sf/ohla/rti/messages/GetLITSResponse.java" />
+ <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/../../testsuite/src/java/net/sf/ohla/rti/testsuite/hla/rti1516e/time/NextMessageRequestTestNG.java" />
+ <change type="DELETED" beforePath="C:\projects\ohla-0.5\rti\src\java\net\sf\ohla\rti\messages\NextMessageRequestAvailableTimeAdvanceGrant.java" afterPath="" />
+ <change type="DELETED" beforePath="C:\projects\ohla-0.5\rti\src\java\net\sf\ohla\rti\messages\NextMessageRequestTimeAdvanceGrant.java" afterPath="" />
+ <change type="DELETED" beforePath="C:\projects\ohla-0.5\rti\src\java\net\sf\ohla\rti\messages\UpdateLITS.java" afterPath="" />
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/OHLA.iws" afterPath="$PROJECT_DIR$/OHLA.iws" />
- <change type="MODIFICATION" beforePath="$PROJECT_DIR$/../../testsuite/src/java/net/sf/ohla/rti/testsuite/hla/rti1516e/time/BaseTimeManagementTestNG.java" afterPath="$PROJECT_DIR$/../../testsuite/src/java/net/sf/ohla/rti/testsuite/hla/rti1516e/time/BaseTimeManagementTestNG.java" />
- <change type="MODIFICATION" beforePath="$PROJECT_DIR$/../../testsuite/src/java/net/sf/ohla/rti/testsuite/hla/rti1516e/time/ManagedTimeAdvancementTestNG.java" afterPath="$PROJECT_DIR$/../../testsuite/src/java/net/sf/ohla/rti/testsuite/hla/rti1516e/time/ManagedTimeAdvancementTestNG.java" />
+ <change type="MODIFICATION" beforePath="$PROJECT_DIR$/../../rti/src/java/net/sf/ohla/rti/RTIChannelPipelineFactory.java" afterPath="$PROJECT_DIR$/../../rti/src/java/net/sf/ohla/rti/RTIChannelPipelineFactory.java" />
+ <change type="MODIFICATION" beforePath="$PROJECT_DIR$/../../rti/src/java/net/sf/ohla/rti/federate/Federate.java" afterPath="$PROJECT_DIR$/../../rti/src/java/net/sf/ohla/rti/federate/Federate.java" />
+ <change type="MODIFICATION" beforePath="$PROJECT_DIR$/../../rti/src/java/net/sf/ohla/rti/federate/FederateTimeManager.java" afterPath="$PROJECT_DIR$/../../rti/src/java/net/sf/ohla/rti/federate/FederateTimeManager.java" />
+ <change type="MODIFICATION" beforePath="$PROJECT_DIR$/../../rti/src/java/net/sf/ohla/rti/federation/FederateProxy.java" afterPath="$PROJECT_DIR$/../../rti/src/java/net/sf/ohla/rti/federation/FederateProxy.java" />
+ <change type="MODIFICATION" beforePath="$PROJECT_DIR$/../../rti/src/java/net/sf/ohla/rti/federation/FederationExecution.java" afterPath="$PROJECT_DIR$/../../rti/src/java/net/sf/ohla/rti/federation/FederationExecution.java" />
+ <change type="MODIFICATION" beforePath="$PROJECT_DIR$/../../rti/src/java/net/sf/ohla/rti/federation/FederationExecutionTimeManager.java" afterPath="$PROJECT_DIR$/../../rti/src/java/net/sf/ohla/rti/federation/FederationExecutionTimeManager.java" />
+ <change type="MODIFICATION" beforePath="$PROJECT_DIR$/../../rti/src/java/net/sf/ohla/rti/messages/MessageDecoder.java" afterPath="$PROJECT_DIR$/../../rti/src/java/net/sf/ohla/rti/messages/MessageDecoder.java" />
+ <change type="MODIFICATION" beforePath="$PROJECT_DIR$/../../rti/src/java/net/sf/ohla/rti/messages/MessageType.java" afterPath="$PROJECT_DIR$/../../rti/src/java/net/sf/ohla/rti/messages/MessageType.java" />
</list>
<list id="b279f3ba-c417-49c1-bcc1-a24f5fc97d41" name="Failed commit: Default" comment="- removed log4j" />
<list id="261d7dd6-cad7-41bb-912f-d59a03f7b57d" name="Failed commit: Default (2)" comment="- refactoring" />
@@ -155,7 +167,18 @@
<file leaf-file-name="FederationExecutionTimeManager.java" pinned="false" current="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/../../rti/src/java/net/sf/ohla/rti/federation/FederationExecutionTimeManager.java">
<provider selected="true" editor-type-id="text-editor">
- <state line="580" column="15" selection-start="16019" selection-end="16019" vertical-scroll-proportion="0.0">
+ <state line="668" column="30" selection-start="19338" selection-end="19338" vertical-scroll-proportion="0.0">
+ <folding>
+ <element signature="imports" expanded="true" />
+ </folding>
+ </state>
+ </provider>
+ </entry>
+ </file>
+ <file leaf-file-name="ieee-1516e-testng.xml" pinned="false" current="true" current-in-tab="true">
+ <entry file="file://$PROJECT_DIR$/../../testsuite/resources/ieee-1516e-testng.xml">
+ <provider selected="true" editor-type-id="text-editor">
+ <state line="0" column="0" selection-start="0" selection-end="0" vertical-scroll-proportion="-3.04717">
<folding />
</state>
</provider>
@@ -164,35 +187,39 @@
<file leaf-file-name="FederateProxy.java" pinned="false" current="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/../../rti/src/java/net/sf/ohla/rti/federation/FederateProxy.java">
<provider selected="true" editor-type-id="text-editor">
- <state line="824" column="43" selection-start="25695" selection-end="25708" vertical-scroll-proportion="0.0">
+ <state line="247" column="14" selection-start="8471" selection-end="8471" vertical-scroll-proportion="0.0">
<folding />
</state>
</provider>
</entry>
</file>
- <file leaf-file-name="ManagedTimeAdvancementTestNG.java" pinned="false" current="true" current-in-tab="true">
- <entry file="file://$PROJECT_DIR$/../../testsuite/src/java/net/sf/ohla/rti/testsuite/hla/rti1516e/time/ManagedTimeAdvancementTestNG.java">
+ <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/rti/federate/Federate.java">
<provider selected="true" editor-type-id="text-editor">
- <state line="140" column="0" selection-start="4549" selection-end="4549" vertical-scroll-proportion="0.3">
- <folding />
+ <state line="457" column="37" selection-start="19312" selection-end="19312" vertical-scroll-proportion="0.0">
+ <folding>
+ <element signature="imports" expanded="true" />
+ </folding>
</state>
</provider>
</entry>
</file>
- <file leaf-file-name="BaseTimeManagementTestNG.java" pinned="false" current="false" current-in-tab="false">
- <entry file="file://$PROJECT_DIR$/../../testsuite/src/java/net/sf/ohla/rti/testsuite/hla/rti1516e/time/BaseTimeManagementTestNG.java">
+ <file leaf-file-name="GetLITSResponse.java" pinned="false" current="false" current-in-tab="false">
+ <entry file="file://$PROJECT_DIR$/../../rti/src/java/net/sf/ohla/rti/messages/GetLITSResponse.java">
<provider selected="true" editor-type-id="text-editor">
- <state line="57" column="39" selection-start="2253" selection-end="2253" vertical-scroll-proportion="0.0">
+ <state line="30" column="9" selection-start="903" selection-end="903" vertical-scroll-proportion="0.0">
<folding />
</state>
</provider>
</entry>
</file>
- <file leaf-file-name="FreeTimeAdvanceTestNG.java" pinned="false" current="false" current-in-tab="false">
- <entry file="file://$PROJECT_DIR$/../../testsuite/src/java/net/sf/ohla/rti/testsuite/hla/rti1516e/time/FreeTimeAdvanceTestNG.java">
+ <file leaf-file-name="FederateTimeManager.java" pinned="false" current="false" current-in-tab="false">
+ <entry file="file://$PROJECT_DIR$/../../rti/src/java/net/sf/ohla/rti/federate/FederateTimeManager.java">
<provider selected="true" editor-type-id="text-editor">
- <state line="23" column="13" selection-start="780" selection-end="780" vertical-scroll-proportion="0.0">
- <folding />
+ <state line="102" column="21" selection-start="3669" selection-end="3669" vertical-scroll-proportion="0.0">
+ <folding>
+ <element signature="imports" expanded="true" />
+ </folding>
</state>
</provider>
</entry>
@@ -216,22 +243,22 @@
<component name="IdeDocumentHistory">
<option name="changedFiles">
<list>
- <option value="$PROJECT_DIR$/../../testsuite/src/java/net/sf/ohla/rti/testsuite/hla/rti1516e/time/TimeAdvanceRequestExceptionsTestNG.java" />
- <option value="$PROJECT_DIR$/../../testsuite/src/java/net/sf/ohla/rti/testsuite/hla/rti1516e/time/EnableTimeRegulationExceptionsTestNG.java" />
- <option value="$PROJECT_DIR$/../../testsuite/src/java/net/sf/ohla/rti/testsuite/hla/rti1516e/time/TimeConstrainedTestNG.java" />
- <option value="$PROJECT_DIR$/../../rti/src/java/net/sf/ohla/rti/hla/rti1516e/IEEE1516eRTIambassador.java" />
- <option value="$PROJECT_DIR$/../../testsuite/src/java/net/sf/ohla/rti/testsuite/hla/rti1516e/TestConstants.java" />
- <option value="$PROJECT_DIR$/../../testsuite/src/java/net/sf/ohla/rti/testsuite/hla/rti1516/TestConstants.java" />
- <option value="$PROJECT_DIR$/../../testsuite/src/java/net/sf/ohla/rti/testsuite/hla/rti/TestConstants.java" />
- <option value="$PROJECT_DIR$/../../testsuite/src/java/net/sf/ohla/rti/testsuite/hla/rti1516e/time/TimeAdvancementTestNG.java" />
- <option value="$PROJECT_DIR$/../../testsuite/src/java/net/sf/ohla/rti/testsuite/hla/rti1516e/time/TimeRegulationTestNG.java" />
- <option value="$PROJECT_DIR$/../../testsuite/src/java/net/sf/ohla/rti/testsuite/hla/rti1516e/time/InteractionTimeManagementTestNG.java" />
- <option value="$PROJECT_DIR$/../../testsuite/src/java/net/sf/ohla/rti/testsuite/hla/rti1516e/time/ObjectTimeManagementTestNG.java" />
<option value="$PROJECT_DIR$/../../testsuite/src/java/net/sf/ohla/rti/testsuite/hla/rti1516e/BaseFederateAmbassador.java" />
<option value="$PROJECT_DIR$/../../testsuite/src/java/net/sf/ohla/rti/testsuite/hla/rti1516e/time/TimeManagementFederateAmbassador.java" />
<option value="$PROJECT_DIR$/../../testsuite/src/java/net/sf/ohla/rti/testsuite/hla/rti1516e/time/BaseTimeManagementTestNG.java" />
- <option value="$PROJECT_DIR$/../../testsuite/src/java/net/sf/ohla/rti/testsuite/hla/rti1516e/time/ManagedTimeAdvancementTestNG.java" />
<option value="$PROJECT_DIR$/../../testsuite/resources/ieee-1516e-testng.xml" />
+ <option value="$PROJECT_DIR$/../../testsuite/src/java/net/sf/ohla/rti/testsuite/hla/rti1516e/time/ManagedTimeAdvancementTestNG.java" />
+ <option value="$PROJECT_DIR$/../../testsuite/src/java/net/sf/ohla/rti/testsuite/hla/rti1516e/time/NextMessageRequestTestNG.java" />
+ <option value="$PROJECT_DIR$/../../rti/src/java/net/sf/ohla/rti/RTIChannelPipelineFactory.java" />
+ <option value="$PROJECT_DIR$/../../rti/src/java/net/sf/ohla/rti/messages/GetLITSResponse.java" />
+ <option value="$PROJECT_DIR$/../../rti/src/java/net/sf/ohla/rti/messages/GetLITS.java" />
+ <option value="$PROJECT_DIR$/../../rti/src/java/net/sf/ohla/rti/federation/FederationExecution.java" />
+ <option value="$PROJECT_DIR$/../../rti/src/java/net/sf/ohla/rti/messages/MessageType.java" />
+ <option value="$PROJECT_DIR$/../../rti/src/java/net/sf/ohla/rti/messages/MessageDecoder.java" />
+ <option value="$PROJECT_DIR$/../../rti/src/java/net/sf/ohla/rti/federate/FederateTimeManager.java" />
+ <option value="$PROJECT_DIR$/../../rti/src/java/net/sf/ohla/rti/federate/Federate.java" />
+ <option value="$PROJECT_DIR$/../../rti/src/java/net/sf/ohla/rti/federation/FederateProxy.java" />
+ <option value="$PROJECT_DIR$/../../rti/src/java/net/sf/ohla/rti/federation/FederationExecutionTimeManager.java" />
</list>
</option>
</component>
@@ -348,60 +375,7 @@
<sortByType />
</navigator>
<panes>
- <pane id="Scope">
- <subPane subId="Project Files">
- <PATH>
- <PATH_ELEMENT USER_OBJECT="Root">
- <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">
- <option name="myItemId" value="" />
- <option name="myItemType" value="" />
- </PATH_ELEMENT>
- </PATH>
- </subPane>
- </pane>
- <pane id="PackagesPane">
- <subPane>
- <PATH>
- <PATH_ELEMENT>
- <option name="myItemId" value="OHLA" />
- <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PackageViewProjectNode" />
- </PATH_ELEMENT>
- <PATH_ELEMENT>
- <option name="myItemId" value="Testsuite" />
- <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PackageViewModuleNode" />
- </PATH_ELEMENT>
- </PATH>
- <PATH>
- <PATH_ELEMENT>
- <option name="myItemId" value="OHLA" />
- <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PackageViewProjectNode" />
- </PATH_ELEMENT>
- <PATH_ELEMENT>
- <option name="myItemId" value="RTI" />
- <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PackageViewModuleNode" />
- </PATH_ELEMENT>
- </PATH>
- <PATH>
- <PATH_ELEMENT>
- <option name="myItemId" value="OHLA" />
- <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PackageViewProjectNode" />
- </PATH_ELEMENT>
- </PATH>
- </subPane>
- </pane>
+ <pane id="Favorites" />
<pane id="ProjectPane">
<subPane>
<PATH>
@@ -433,18 +407,6 @@
<option name="myItemId" value="testsuite" />
<option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
</PATH_ELEMENT>
- <PATH_ELEMENT>
- <option name="myItemId" value="src" />
- <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
- </PATH_ELEMENT>
- <PATH_ELEMENT>
- <option name="myItemId" value="java" />
- <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
- </PATH_ELEMENT>
- <PATH_ELEMENT>
- <option name="myItemId" value="testsuite" />
- <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
- </PATH_ELEMENT>
</PATH>
<PATH>
<PATH_ELEMENT>
@@ -460,115 +422,66 @@
<option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
</PATH_ELEMENT>
<PATH_ELEMENT>
- <option name="myItemId" value="src" />
+ <option name="myItemId" value="resources" />
<option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
</PATH_ELEMENT>
- <PATH_ELEMENT>
- <option name="myItemId" value="java" />
- <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
- </PATH_ELEMENT>
- <PATH_ELEMENT>
- <option name="myItemId" value="testsuite" />
- <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
- </PATH_ELEMENT>
- <PATH_ELEMENT>
- <option name="myItemId" value="hla" />
- <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
- </PATH_ELEMENT>
- <PATH_ELEMENT>
- <option name="myItemId" value="rti1516e" />
- <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
- </PATH_ELEMENT>
</PATH>
+ </subPane>
+ </pane>
+ <pane id="PackagesPane">
+ <subPane>
<PATH>
<PATH_ELEMENT>
<option name="myItemId" value="OHLA" />
- <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewProjectNode" />
+ <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PackageViewProjectNode" />
</PATH_ELEMENT>
<PATH_ELEMENT>
- <option name="myItemId" value="ohla-0.5" />
- <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
+ <option name="myItemId" value="Testsuite" />
+ <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PackageViewModuleNode" />
</PATH_ELEMENT>
- <PATH_ELEMENT>
- <option name="myItemId" value="testsuite" />
- <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
- </PATH_ELEMENT>
- <PATH_ELEMENT>
- <option name="myItemId" value="src" />
- <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
- </PATH_ELEMENT>
- <PATH_ELEMENT>
- <option name="myItemId" value="java" />
- <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
- </PATH_ELEMENT>
- <PATH_ELEMENT>
- <option name="myItemId" value="testsuite" />
- <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
- </PATH_ELEMENT>
- <PATH_ELEMENT>
- <option name="myItemId" value="hla" />
- <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
- </PATH_ELEMENT>
- <PATH_ELEMENT>
- <option name="myItemId" value="rti1516e" />
- <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
- </PATH_ELEMENT>
- <PATH_ELEMENT>
- <option name="myItemId" value="time" />
- <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
- </PATH_ELEMENT>
</PATH>
<PATH>
<PATH_ELEMENT>
<option name="myItemId" value="OHLA" />
- <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewProjectNode" />
+ <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PackageViewProjectNode" />
</PATH_ELEMENT>
<PATH_ELEMENT>
- <option name="myItemId" value="ohla-0.5" />
- <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
+ <option name="myItemId" value="RTI" />
+ <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PackageViewModuleNode" />
</PATH_ELEMENT>
- <PATH_ELEMENT>
- <option name="myItemId" value="testsuite" />
- <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
- </PATH_ELEMENT>
- <PATH_ELEMENT>
- <option name="myItemId" value="src" />
- <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
- </PATH_ELEMENT>
- <PATH_ELEMENT>
- <option name="myItemId" value="java" />
- <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
- </PATH_ELEMENT>
- <PATH_ELEMENT>
- <option name="myItemId" value="testsuite" />
- <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
- </PATH_ELEMENT>
- <PATH_ELEMENT>
- <option name="myItemId" value="hla" />
- <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
- </PATH_ELEMENT>
</PATH>
<PATH>
<PATH_ELEMENT>
<option name="myItemId" value="OHLA" />
- <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewProjectNode" />
+ <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PackageViewProjectNode" />
</PATH_ELEMENT>
- <PATH_ELEMENT>
- <option name="myItemId" value="ohla-0.5" />
- <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
+ </PATH>
+ </subPane>
+ </pane>
+ <pane id="Scope">
+ <subPane subId="Project Files">
+ <PATH>
+ <PATH_ELEMENT USER_OBJECT="Root">
+ <option name="myItemId" value="" />
+ <option name="myItemType" value="" />
</PATH_ELEMENT>
- <PATH_ELEMENT>
- <option name="myItemId" value="testsuite" />
- <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
+ </PATH>
+ <PATH>
+ <PATH_ELEMENT USER_OBJECT="Root">
+ <option name="myItemId" value="" />
+ <option name="myItemType" value="" />
</PATH_ELEMENT>
- <PATH_ELEMENT>
- <option name="myItemId" value="resources" />
- <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
+ <PATH_ELEMENT USER_OBJECT="RTI">
+ <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>
</subPane>
</pane>
- <pane id="Favorites" />
</panes>
</component>
<component name="PropertiesComponent">
@@ -1228,14 +1141,15 @@
<window_info id="Changes" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.32827586" sideWeight="0.5" order="12" side_tool="false" content_ui="tabs" />
<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="10" side_tool="false" content_ui="tabs" />
<window_info id="Ant Build" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.15362526" sideWeight="0.6275862" order="3" side_tool="false" content_ui="tabs" />
- <window_info id="Debug" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.49931034" sideWeight="0.5" order="4" side_tool="false" content_ui="tabs" />
+ <window_info id="Find" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.51862067" sideWeight="0.5" order="1" side_tool="false" content_ui="tabs" />
+ <window_info id="Debug" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="true" weight="0.49931034" sideWeight="0.5" order="4" side_tool="false" content_ui="tabs" />
<window_info id="Version Control" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.32965517" sideWeight="0.5" order="13" side_tool="false" content_ui="tabs" />
<window_info id="Messages" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.32965517" sideWeight="0.0" order="14" side_tool="false" content_ui="tabs" />
<window_info id="TODO" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.32689655" sideWeight="0.5" order="8" side_tool="false" content_ui="tabs" />
<window_info id="Structure" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.25" sideWeight="0.5" order="1" side_tool="false" content_ui="tabs" />
<window_info id="Maven Projects" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.32950467" sideWeight="0.5006896" order="4" side_tool="false" content_ui="tabs" />
<window_info id="Commander" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.39913854" sideWeight="0.5" order="0" side_tool="false" content_ui="tabs" />
- <window_info id="Project" active="true" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="true" weight="0.32232592" sideWeight="0.5006896" order="0" side_tool="false" content_ui="tabs" />
+ <window_info id="Project" active="true" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="true" weight="0.32950467" sideWeight="0.5006896" order="0" side_tool="false" content_ui="tabs" />
<window_info id="Dependency Viewer" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.32988507" sideWeight="0.5" order="15" side_tool="false" content_ui="tabs" />
<window_info id="Run" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.3737931" sideWeight="0.5" order="2" side_tool="false" content_ui="tabs" />
<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="3" side_tool="false" content_ui="tabs" />
@@ -1250,7 +1164,6 @@
<window_info id="Data Sources" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" sideWeight="0.5" order="5" side_tool="false" content_ui="tabs" />
<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" />
<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" />
- <window_info id="Find" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.6413793" sideWeight="0.5" order="1" side_tool="false" content_ui="tabs" />
<window_info id="Favorites" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.32928804" sideWeight="0.5" order="8" side_tool="false" content_ui="tabs" />
<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="2" side_tool="false" content_ui="tabs" />
<window_info id="Metrics" 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" />
@@ -1298,7 +1211,7 @@
<option name="SHOW_ONLY_CHANGED_IN_SELECTION_DIFF" value="true" />
<option name="CHECK_COMMIT_MESSAGE_SPELLING" value="true" />
<option name="FORCE_NON_EMPTY_COMMENT" value="false" />
- <option name="LAST_COMMIT_MESSAGE" value="- most IEEE 1516e Time Management tests complete" />
+ <option name="LAST_COMMIT_MESSAGE" value="- re-implemented NextMessageRequest methods" />
<option name="MAKE_NEW_CHANGELIST_ACTIVE" value="true" />
<option name="OPTIMIZE_IMPORTS_BEFORE_PROJECT_COMMIT" value="false" />
<option name="CHECK_FILES_UP_TO_DATE_BEFORE_COMMIT" value="false" />
@@ -1311,8 +1224,6 @@
<option name="UPDATE_GROUP_BY_CHANGELIST" value="false" />
<option name="SHOW_FILE_HISTORY_AS_TREE" value="false" />
<option name="FILE_HISTORY_SPLITTER_PROPORTION" value="0.6" />
- <MESSAGE value="- LogicalTime tweaking" />
- <MESSAGE value="- HLA 1.3 Federation Management testsuite passing" />
<MESSAGE value="- initial HLA 1.3 Support testsuite" />
<MESSAGE value="- HLA 1.3 Support testsuite passing" />
<MESSAGE value="- HLA 1.3 Declaration testsuite passing" />
@@ -1336,6 +1247,8 @@
<MESSAGE value="- initial IEEE 1516e Time Management tests" />
<MESSAGE value="- more IEEE 1516e Time Management tests" />
<MESSAGE value="- most IEEE 1516e Time Management tests complete" />
+ <MESSAGE value="- more IEEE 1516e Time Management tests complete" />
+ <MESSAGE value="- re-implemented NextMessageRequest methods" />
</component>
<component name="VssConfiguration">
<option name="CLIENT_PATH" value="" />
@@ -1432,86 +1345,120 @@
<option name="myLastEditedConfigurable" />
</component>
<component name="editorHistoryManager">
- <entry file="file://$PROJECT_DIR$/../../rti/src/java/net/sf/ohla/rti/messages/AbstractRequest.java">
+ <entry file="file://$PROJECT_DIR$/../../rti/src/java/net/sf/ohla/rti/messages/FederateMessage.java">
<provider selected="true" editor-type-id="text-editor">
- <state line="82" column="0" selection-start="1898" selection-end="1898" vertical-scroll-proportion="0.0" />
+ <state line="23" column="0" selection-start="737" selection-end="737" vertical-scroll-proportion="0.0">
+ <folding />
+ </state>
</provider>
</entry>
- <entry file="file://$PROJECT_DIR$/../../rti/src/java/net/sf/ohla/rti/hla/rti1516e/IEEE1516eRTIambassador.java">
+ <entry file="file://$PROJECT_DIR$/../../rti/src/java/net/sf/ohla/rti/messages/GetLITS.java">
<provider selected="true" editor-type-id="text-editor">
- <state line="590" column="0" selection-start="22608" selection-end="22608" vertical-scroll-proportion="0.0" />
+ <state line="26" column="13" selection-start="856" selection-end="856" vertical-scroll-proportion="0.0">
+ <folding />
+ </state>
</provider>
</entry>
- <entry file="file://$PROJECT_DIR$/../../testsuite/src/java/net/sf/ohla/rti/testsuite/hla/rti1516e/time/InteractionTimeManagementTestNG.java">
+ <entry file="file://$PROJECT_DIR$/../../rti/src/java/net/sf/ohla/rti/federation/FederationExecution.java">
<provider selected="true" editor-type-id="text-editor">
- <state line="42" column="14" selection-start="1385" selection-end="1385" vertical-scroll-proportion="0.0" />
+ <state line="1458" column="0" selection-start="49653" selection-end="49653" vertical-scroll-proportion="0.0">
+ <folding />
+ </state>
</provider>
</entry>
- <entry file="file://$PROJECT_DIR$/../../testsuite/src/java/net/sf/ohla/rti/testsuite/hla/rti1516e/time/ObjectTimeManagementTestNG.java">
+ <entry file="file://$PROJECT_DIR$/../../rti/src/java/net/sf/ohla/rti/messages/MessageType.java">
<provider selected="true" editor-type-id="text-editor">
- <state line="121" column="75" selection-start="5211" selection-end="5211" vertical-scroll-proportion="0.0" />
+ <state line="129" column="0" selection-start="3277" selection-end="3277" vertical-scroll-proportion="0.0">
+ <folding />
+ </state>
</provider>
</entry>
- <entry file="file://$PROJECT_DIR$/../../ieee-1516e/src/java/hla/rti1516e/RTIambassador.java">
+ <entry file="file://$PROJECT_DIR$/../../rti/src/java/net/sf/ohla/rti/messages/MessageDecoder.java">
<provider selected="true" editor-type-id="text-editor">
- <state line="1821" column="63" selection-start="51167" selection-end="51198" vertical-scroll-proportion="0.0" />
+ <state line="380" column="0" selection-start="14927" selection-end="14927" vertical-scroll-proportion="0.0">
+ <folding />
+ </state>
</provider>
</entry>
- <entry file="file://$PROJECT_DIR$/../../testsuite/src/java/net/sf/ohla/rti/testsuite/hla/rti1516e/object/ObjectUpdateTestNG.java">
+ <entry file="file://$PROJECT_DIR$/../../rti/src/java/net/sf/ohla/rti/messages/AbstractMessage.java">
<provider selected="true" editor-type-id="text-editor">
- <state line="151" column="0" selection-start="7362" selection-end="7362" vertical-scroll-proportion="0.0" />
+ <state line="64" column="23" selection-start="1864" selection-end="1864" vertical-scroll-proportion="0.0">
+ <folding />
+ </state>
</provider>
</entry>
- <entry file="file://$PROJECT_DIR$/../../testsuite/src/java/net/sf/ohla/rti/testsuite/hla/rti1516e/BaseFederateAmbassador.java">
+ <entry file="file://$PROJECT_DIR$/../../rti/src/java/net/sf/ohla/rti/messages/Message.java">
<provider selected="true" editor-type-id="text-editor">
- <state line="101" column="0" selection-start="2977" selection-end="2977" vertical-scroll-proportion="0.0" />
+ <state line="24" column="0" selection-start="745" selection-end="745" vertical-scroll-proportion="0.0">
+ <folding />
+ </state>
</provider>
</entry>
- <entry file="file://$PROJECT_DIR$/../../testsuite/src/java/net/sf/ohla/rti/testsuite/hla/rti1516e/object/TestObjectInstance.java">
+ <entry file="file://$PROJECT_DIR$/../../rti/src/java/net/sf/ohla/rti/messages/MessageEncoder.java">
<provider selected="true" editor-type-id="text-editor">
- <state line="70" column="33" selection-start="2133" selection-end="2133" vertical-scroll-proportion="0.0" />
+ <state line="24" column="13" selection-start="903" selection-end="903" vertical-scroll-proportion="0.0">
+ <folding />
+ </state>
</provider>
</entry>
- <entry file="file://$PROJECT_DIR$/../../testsuite/src/java/net/sf/ohla/rti/testsuite/hla/rti1516e/time/TimeRegulationTestNG.java">
+ <entry file="file://$PROJECT_DIR$/../../rti/src/java/net/sf/ohla/rti/federate/FederateTimeManager.java">
<provider selected="true" editor-type-id="text-editor">
- <state line="26" column="25" selection-start="938" selection-end="938" vertical-scroll-proportion="0.0" />
+ <state line="102" column="21" selection-start="3669" selection-end="3669" vertical-scroll-proportion="0.0">
+ <folding>
+ <element signature="imports" expanded="true" />
+ </folding>
+ </state>
</provider>
</entry>
- <entry file="file://$PROJECT_DIR$/../../rti/src/java/net/sf/ohla/rti/federation/FederationExecutionTimeManager.java">
+ <entry file="file://$PROJECT_DIR$/../../rti/src/java/net/sf/ohla/rti/Protocol.java">
<provider selected="true" editor-type-id="text-editor">
- <state line="580" column="15" selection-start="16019" selection-end="16019" vertical-scroll-proportion="0.0" />
+ <state line="596" column="21" selection-start="12874" selection-end="12874" vertical-scroll-proportion="0.0">
+ <folding />
+ </state>
</provider>
</entry>
- <entry file="file://$PROJECT_DIR$/../../rti/src/java/net/sf/ohla/rti/federation/FederateProxy.java">
+ <entry file="file://$PROJECT_DIR$/../../rti/src/java/net/sf/ohla/rti/messages/GetLITSResponse.java">
<provider selected="true" editor-type-id="text-editor">
- <state line="824" column="43" selection-start="25695" selection-end="25708" vertical-scroll-proportion="0.0" />
+ <state line="30" column="9" selection-start="903" selection-end="903" vertical-scroll-proportion="0.0">
+ <folding />
+ </state>
</provider>
</entry>
- <entry file="file://$PROJECT_DIR$/../../testsuite/src/java/net/sf/ohla/rti/testsuite/hla/rti1516e/time/TimeManagementFederateAmbassador.java">
+ <entry file="file://$PROJECT_DIR$/../../rti/src/java/net/sf/ohla/rti/federate/Federate.java">
<provider selected="true" editor-type-id="text-editor">
- <state line="136" column="14" selection-start="3552" selection-end="3552" vertical-scroll-proportion="0.0" />
+ <state line="457" column="37" selection-start="19312" selection-end="19312" vertical-scroll-proportion="0.0">
+ <folding>
+ <element signature="imports" expanded="true" />
+ </folding>
+ </state>
</provider>
</entry>
- <entry file="file://$PROJECT_DIR$/../../testsuite/src/java/net/sf/ohla/rti/testsuite/hla/rti1516e/time/BaseTimeManagementTestNG.java">
+ <entry file="file://$PROJECT_DIR$/../../rti/src/java/net/sf/ohla/rti/messages/AbstractRequest.java">
<provider selected="true" editor-type-id="text-editor">
- <state line="57" column="39" selection-start="2253" selection-end="2253" vertical-scroll-proportion="0.0" />
+ <state line="74" column="11" selection-start="1795" selection-end="1795" vertical-scroll-proportion="0.0">
+ <folding />
+ </state>
</provider>
</entry>
- <entry file="file://$PROJECT_DIR$/../../testsuite/src/java/net/sf/ohla/rti/testsuite/hla/rti1516e/time/FreeTimeAdvanceTestNG.java">
+ <entry file="file://$PROJECT_DIR$/../../rti/src/java/net/sf/ohla/rti/federation/FederateProxy.java">
<provider selected="true" editor-type-id="text-editor">
- <state line="23" column="13" selection-start="780" selection-end="780" vertical-scroll-proportion="0.0" />
+ <state line="247" column="14" selection-start="8471" selection-end="8471" vertical-scroll-proportion="0.0">
+ <folding />
+ </state>
</provider>
</entry>
- <entry file="file://$PROJECT_DIR$/../../testsuite/resources/ieee-1516e-testng.xml">
+ <entry file="file://$PROJECT_DIR$/../../rti/src/java/net/sf/ohla/rti/federation/FederationExecutionTimeManager.java">
<provider selected="true" editor-type-id="text-editor">
- <state line="74" column="0" selection-start="4179" selection-end="4179" vertical-scroll-proportion="0.775">
- <folding />
+ <state line="668" column="30" selection-start="19338" selection-end="19338" vertical-scroll-proportion="0.0">
+ <folding>
+ <element signature="imports" expanded="true" />
+ </folding>
</state>
</provider>
</entry>
- <entry file="file://$PROJECT_DIR$/../../testsuite/src/java/net/sf/ohla/rti/testsuite/hla/rti1516e/time/ManagedTimeAdvancementTestNG.java">
+ <entry file="file://$PROJECT_DIR$/../../testsuite/resources/ieee-1516e-testng.xml">
<provider selected="true" editor-type-id="text-editor">
- <state line="140" column="0" selection-start="4549" selection-end="4549" vertical-scroll-proportion="0.3">
+ <state line="0" column="0" selection-start="0" selection-end="0" vertical-scroll-proportion="-3.04717">
<folding />
</state>
</provider>
Modified: trunk/rti/src/java/net/sf/ohla/rti/RTIChannelPipelineFactory.java
===================================================================
--- trunk/rti/src/java/net/sf/ohla/rti/RTIChannelPipelineFactory.java 2011-05-09 01:04:02 UTC (rev 279)
+++ trunk/rti/src/java/net/sf/ohla/rti/RTIChannelPipelineFactory.java 2011-05-16 01:50:32 UTC (rev 280)
@@ -18,6 +18,7 @@
import net.sf.ohla.rti.messages.MessageDecoder;
import net.sf.ohla.rti.messages.MessageEncoder;
+import net.sf.ohla.rti.messages.RequestResponseHandler;
import org.jboss.netty.channel.ChannelPipeline;
import org.jboss.netty.channel.ChannelPipelineFactory;
@@ -40,6 +41,7 @@
pipeline.addLast(MessageEncoder.NAME, new MessageEncoder());
pipeline.addLast(MessageDecoder.NAME, new MessageDecoder());
+ pipeline.addLast(RequestResponseHandler.NAME, new RequestResponseHandler());
pipeline.addLast(RTIChannelUpstreamHandler.NAME, rtiChannelUpstreamHandler);
return pipeline;
Modified: trunk/rti/src/java/net/sf/ohla/rti/federate/Federate.java
===================================================================
--- trunk/rti/src/java/net/sf/ohla/rti/federate/Federate.java 2011-05-09 01:04:02 UTC (rev 279)
+++ trunk/rti/src/java/net/sf/ohla/rti/federate/Federate.java 2011-05-16 01:50:32 UTC (rev 280)
@@ -65,6 +65,8 @@
import net.sf.ohla.rti.messages.GetFederateHandleResponse;
import net.sf.ohla.rti.messages.GetFederateName;
import net.sf.ohla.rti.messages.GetFederateNameResponse;
+import net.sf.ohla.rti.messages.GetLITS;
+import net.sf.ohla.rti.messages.GetLITSResponse;
import net.sf.ohla.rti.messages.JoinFederationExecution;
import net.sf.ohla.rti.messages.JoinFederationExecutionResponse;
import net.sf.ohla.rti.messages.MessageDecoder;
@@ -446,6 +448,22 @@
}
@SuppressWarnings("unchecked")
+ public void getLITS(GetLITS getLITS)
+ {
+ timeManager.getTimeLock().writeLock().lock();
+ try
+ {
+ LogicalTime lits = getNextMessageTime();
+ lits = lits == null || lits.compareTo(getLITS.getPotentialGALT()) > 0 ? null : lits;
+ rtiChannel.write(new GetLITSResponse(getLITS.getId(), lits));
+ }
+ finally
+ {
+ timeManager.getTimeLock().writeLock().unlock();
+ }
+ }
+
+ @SuppressWarnings("unchecked")
public void processFutureTasks(LogicalTime maxFutureTaskTimestamp)
{
futureTasksLock.lock();
Modified: trunk/rti/src/java/net/sf/ohla/rti/federate/FederateTimeManager.java
===================================================================
--- trunk/rti/src/java/net/sf/ohla/rti/federate/FederateTimeManager.java 2011-05-09 01:04:02 UTC (rev 279)
+++ trunk/rti/src/java/net/sf/ohla/rti/federate/FederateTimeManager.java 2011-05-16 01:50:32 UTC (rev 280)
@@ -31,11 +31,8 @@
import net.sf.ohla.rti.messages.ModifyLookahead;
import net.sf.ohla.rti.messages.NextMessageRequest;
import net.sf.ohla.rti.messages.NextMessageRequestAvailable;
-import net.sf.ohla.rti.messages.NextMessageRequestAvailableTimeAdvanceGrant;
-import net.sf.ohla.rti.messages.NextMessageRequestTimeAdvanceGrant;
import net.sf.ohla.rti.messages.TimeAdvanceRequest;
import net.sf.ohla.rti.messages.TimeAdvanceRequestAvailable;
-import net.sf.ohla.rti.messages.UpdateLITS;
import hla.rti1516e.FederateAmbassador;
import hla.rti1516e.LogicalTime;
@@ -346,6 +343,14 @@
checkIfRequestForTimeRegulationPending();
checkIfRequestForTimeConstrainedPending();
+ LogicalTime nextMessageTime = federate.getNextMessageTime();
+ if (nextMessageTime != null && galtDefined() && nextMessageTime.compareTo(galt) < 0)
+ {
+ // adjust the time of the request to the next message time
+
+ time = nextMessageTime;
+ }
+
federate.getRTIChannel().write(new NextMessageRequest(time));
if (isTimeRegulating())
@@ -392,7 +397,15 @@
checkIfInTimeAdvancingState();
checkIfRequestForTimeConstrainedPending();
checkIfRequestForTimeRegulationPending();
+ LogicalTime nextMessageTime = federate.getNextMessageTime();
+ if (nextMessageTime != null && galtDefined() && nextMessageTime.compareTo(galt) <= 0)
+ {
+ // adjust the time of the request to the next message time
+
+ time = nextMessageTime;
+ }
+
federate.getRTIChannel().write(new NextMessageRequestAvailable(time));
if (isTimeRegulating())
@@ -517,20 +530,17 @@
timeQueryReturn = new TimeQueryReturn(galt != null, galt);
}
- else
+ else if (galt == null || nextMessageTime.compareTo(galt) < 0)
{
- if (galt == null || nextMessageTime.compareTo(galt) < 0)
- {
- // GALT is undefined (no more time regulating federates) but there is
- // still a TSO message in the queue or the next TSO message is < GALT
+ // GALT is undefined (no more time regulating federates) but there is still a TSO message in the queue or the
+ // next TSO message is < GALT
- timeQueryReturn = new TimeQueryReturn(true, nextMessageTime);
- }
- else
- {
- timeQueryReturn = new TimeQueryReturn(true, galt);
- }
+ timeQueryReturn = new TimeQueryReturn(true, nextMessageTime);
}
+ else
+ {
+ timeQueryReturn = new TimeQueryReturn(true, galt);
+ }
}
finally
{
@@ -633,17 +643,6 @@
temporalState = TemporalState.TIME_GRANTED;
advanceRequestType = TimeAdvanceType.NONE;
- if (isTimeConstrained())
- {
- LogicalTime lits = federate.getNextMessageTime();
- if (lits != null)
- {
- // notify the RTI of the new LITS
-
- federate.getRTIChannel().write(new UpdateLITS(lits));
- }
- }
-
federateAmbassador.timeAdvanceGrant(time);
}
finally
@@ -663,30 +662,14 @@
this.galt = galt;
LogicalTime maxFutureTaskTimestamp;
-
if (isTimeAdvancing())
{
- switch (advanceRequestType)
- {
- case NEXT_MESSAGE_REQUEST:
- {
- maxFutureTaskTimestamp = handleNextMessageRequestGALTAdvanced(galt);
- break;
- }
- case NEXT_MESSAGE_REQUEST_AVAILABLE:
- {
- maxFutureTaskTimestamp = handleNextMessageRequestAvailableGALTAdvanced(galt);
- break;
- }
- default:
- maxFutureTaskTimestamp = galt.compareTo(advanceRequestTime) > 0 ? advanceRequestTime : galt;
- }
+ maxFutureTaskTimestamp = galt.compareTo(advanceRequestTime) > 0 ? advanceRequestTime : galt;
}
else
{
maxFutureTaskTimestamp = galt.compareTo(federateTime) > 0 ? federateTime : galt;
}
-
federate.processFutureTasks(maxFutureTaskTimestamp);
}
finally
@@ -810,94 +793,6 @@
}
@SuppressWarnings("unchecked")
- private LogicalTime handleNextMessageRequestGALTAdvanced(LogicalTime galt)
- {
- LogicalTime maxFutureTaskTimestamp;
-
- LogicalTime nextMessageTime = federate.getNextMessageTime();
- if (nextMessageTime == null || nextMessageTime.compareTo(galt) >= 0)
- {
- // there are no pending TSO messages or they are >= GALT
-
- if (advanceRequestTime.compareTo(galt) < 0)
- {
- // GALT has advanced past the requested time
-
- maxFutureTaskTimestamp = advanceRequestTime;
-
- federate.getRTIChannel().write(new NextMessageRequestTimeAdvanceGrant(advanceRequestTime));
- }
- else
- {
- maxFutureTaskTimestamp = galt;
- }
- }
- else if (advanceRequestTime.compareTo(nextMessageTime) < 0)
- {
- // the requested time is < the pending TSO message which is < GALT
-
- maxFutureTaskTimestamp = advanceRequestTime;
-
- federate.getRTIChannel().write(new NextMessageRequestTimeAdvanceGrant(advanceRequestTime));
- }
- else
- {
- // the pending TSO message is < GALT which is <= the requested time
-
- advanceRequestTime = nextMessageTime;
- maxFutureTaskTimestamp = nextMessageTime;
-
- federate.getRTIChannel().write(new NextMessageRequestTimeAdvanceGrant(nextMessageTime));
- }
-
- return maxFutureTaskTimestamp;
- }
-
- @SuppressWarnings("unchecked")
- private LogicalTime handleNextMessageRequestAvailableGALTAdvanced(LogicalTime galt)
- {
- LogicalTime maxFutureTaskTimestamp;
-
- LogicalTime nextMessageTime = federate.getNextMessageTime();
- if (nextMessageTime == null || nextMessageTime.compareTo(galt) > 0)
- {
- // there are no pending TSO messages or they are > GALT
-
- if (advanceRequestTime.compareTo(galt) <= 0)
- {
- // GALT has advanced past the requested time
-
- maxFutureTaskTimestamp = advanceRequestTime;
-
- federate.getRTIChannel().write(new NextMessageRequestAvailableTimeAdvanceGrant(advanceRequestTime));
- }
- else
- {
- maxFutureTaskTimestamp = galt;
- }
- }
- else if (advanceRequestTime.compareTo(nextMessageTime) < 0)
- {
- // the requested time is < the pending TSO message which is <= GALT
-
- maxFutureTaskTimestamp = advanceRequestTime;
-
- federate.getRTIChannel().write(new NextMessageRequestTimeAdvanceGrant(advanceRequestTime));
- }
- else
- {
- // the pending TSO message is <= GALT which is <= the requested time
-
- advanceRequestTime = nextMessageTime;
- maxFutureTaskTimestamp = nextMessageTime;
-
- federate.getRTIChannel().write(new NextMessageRequestTimeAdvanceGrant(nextMessageTime));
- }
-
- return maxFutureTaskTimestamp;
- }
-
- @SuppressWarnings("unchecked")
private void checkIfInvalidTimestamp(LogicalTime time)
throws InvalidLogicalTime
{
Modified: trunk/rti/src/java/net/sf/ohla/rti/federation/FederateProxy.java
===================================================================
--- trunk/rti/src/java/net/sf/ohla/rti/federation/FederateProxy.java 2011-05-09 01:04:02 UTC (rev 279)
+++ trunk/rti/src/java/net/sf/ohla/rti/federation/FederateProxy.java 2011-05-16 01:50:32 UTC (rev 280)
@@ -81,7 +81,6 @@
import hla.rti1516e.LogicalTimeInterval;
import hla.rti1516e.ObjectClassHandle;
import hla.rti1516e.ObjectInstanceHandle;
-import hla.rti1516e.OrderType;
import hla.rti1516e.ResignAction;
import hla.rti1516e.RestoreStatus;
import hla.rti1516e.SaveStatus;
@@ -132,7 +131,6 @@
private TimeAdvanceType advanceRequestType = TimeAdvanceType.NONE;
private LogicalTime galt;
- private LogicalTime lits;
/**
* Least Outgoing Time Stamp.
@@ -246,6 +244,29 @@
return lots;
}
+ @SuppressWarnings("unchecked")
+ public void adjustNextMessageRequestAdvanceRequestTime(LogicalTime time)
+ {
+ assert timeRegulationEnabled;
+ assert advanceRequestType == TimeAdvanceType.NEXT_MESSAGE_REQUEST ||
+ advanceRequestType == TimeAdvanceType.NEXT_MESSAGE_REQUEST_AVAILABLE;
+
+ advanceRequestTime = time;
+
+ try
+ {
+ lots = advanceRequestTime.add(lookahead.isZero() ? epsilon : lookahead);
+ }
+ catch (IllegalTimeArithmetic ita)
+ {
+ log.error(LogMessages.UNABLE_TO_REQUEST_TIME_ADVANCE, ita);
+ }
+ catch (InvalidLogicalTimeInterval ilti)
+ {
+ log.error(LogMessages.UNABLE_TO_REQUEST_TIME_ADVANCE, ilti);
+ }
+ }
+
public void resignFederationExecution(ResignAction resignAction)
{
federateChannel.getPipeline().remove(FederateProxyChannelHandler.NAME);
@@ -370,11 +391,6 @@
if (reflectAttributeValues != null)
{
- if (reflectAttributeValues.getSentOrderType() == OrderType.TIMESTAMP)
- {
- updateLITS(reflectAttributeValues.getTime());
- }
-
federateChannel.write(reflectAttributeValues);
}
}
@@ -396,11 +412,6 @@
if (receiveInteraction != null)
{
- if (receiveInteraction.getSentOrderType() == OrderType.TIMESTAMP)
- {
- updateLITS(receiveInteraction.getTime());
- }
-
federateChannel.write(receiveInteraction);
}
}
@@ -544,7 +555,8 @@
try
{
subscriptionManager.subscribeObjectClassAttributes(
- federationExecution.getFDD().getObjectClassSafely(subscribeObjectClassAttributesWithRegions.getObjectClassHandle()),
+ federationExecution.getFDD().getObjectClassSafely(
+ subscribeObjectClassAttributesWithRegions.getObjectClassHandle()),
subscribeObjectClassAttributesWithRegions.getAttributesAndRegions(),
subscribeObjectClassAttributesWithRegions.isPassive());
}
@@ -647,6 +659,11 @@
lots = federateTime.add(lookahead);
}
+ public boolean isTimeRegulationEnabled()
+ {
+ return timeRegulationEnabled;
+ }
+
public void timeRegulationEnabled()
{
timeRegulationEnabled = true;
@@ -666,6 +683,11 @@
log.debug(LogMessages.TIME_REGULATION_DISABLED);
}
+ public boolean isTimeConstrainedEnabled()
+ {
+ return timeConstrainedEnabled;
+ }
+
@SuppressWarnings("unchecked")
public void enableTimeConstrained()
{
@@ -690,7 +712,6 @@
public void disableTimeConstrained()
{
timeConstrainedEnabled = false;
- lits = null;
log.debug(LogMessages.TIME_CONSTRAINED_DISABLED);
}
@@ -755,76 +776,25 @@
{
log.debug(LogMessages.NEXT_MESSAGE_REQUEST, time);
+ advanceRequestTime = time;
advanceRequestType = TimeAdvanceType.NEXT_MESSAGE_REQUEST;
- if (!timeConstrainedEnabled || galt == null)
+ if (timeRegulationEnabled)
{
- assert lits == null;
+ lots = advanceRequestTime.add(lookahead.isZero() ? epsilon : lookahead);
- if (timeRegulationEnabled)
- {
- lots = time.add(lookahead.isZero() ? epsilon : lookahead);
-
- log.debug(LogMessages.LOTS_ADVANCED, lots);
- }
-
- // immediately grant the request
-
- federateTime = time;
-
- federateChannel.write(new TimeAdvanceGrant(federateTime));
+ log.debug(LogMessages.LOTS_ADVANCED, lots);
}
- else if (time.compareTo(galt) < 0)
- {
- // the specified time is < GALT
- // use LITS if it is defined and < the specified time
- //
- time = lits == null || time.compareTo(lits) < 0 ? time : lits;
-
- if (timeRegulationEnabled)
- {
- lots = time.add(lookahead.isZero() ? epsilon : lookahead);
-
- log.debug(LogMessages.LOTS_ADVANCED, lots);
- }
-
- // immediately grant the request
-
- federateTime = time;
-
- federateChannel.write(new TimeAdvanceGrant(federateTime));
- }
- else if (lits != null && lits.compareTo(galt) < 0)
+ if (!timeConstrainedEnabled || galt == null || advanceRequestTime.compareTo(galt) < 0)
{
- // LITS < GALT
-
- if (timeRegulationEnabled)
- {
- lots = lits.add(lookahead.isZero() ? epsilon : lookahead);
-
- log.debug(LogMessages.LOTS_ADVANCED, lots);
- }
-
// immediately grant the request
- federateTime = lits;
+ federateTime = advanceRequestTime;
+ advanceRequestTime = null;
federateChannel.write(new TimeAdvanceGrant(federateTime));
}
- else
- {
- advanceRequestTime = time;
-
- if (timeRegulationEnabled)
- {
- // LOTS can only advance as GALT advances
-
- lots = galt.add(lookahead.isZero() ? epsilon : lookahead);
-
- log.debug(LogMessages.LOTS_ADVANCED, lots);
- }
- }
}
@SuppressWarnings("unchecked")
@@ -833,76 +803,25 @@
{
log.debug(LogMessages.NEXT_MESSAGE_REQUEST_AVAILABLE, time);
+ advanceRequestTime = time;
advanceRequestType = TimeAdvanceType.NEXT_MESSAGE_REQUEST_AVAILABLE;
- if (!timeConstrainedEnabled || galt == null)
+ if (timeRegulationEnabled)
{
- assert lits == null;
+ lots = advanceRequestTime.add(lookahead);
- if (timeRegulationEnabled)
- {
- lots = time.add(lookahead);
-
- log.debug(LogMessages.LOTS_ADVANCED, lots);
- }
-
- // immediately grant the request
-
- federateTime = time;
-
- federateChannel.write(new TimeAdvanceGrant(federateTime));
+ log.debug(LogMessages.LOTS_ADVANCED, lots);
}
- else if (time.compareTo(galt) <= 0)
- {
- // the specified time is < GALT
- // use LITS if it is defined and < the specified time
- //
- time = lits == null || time.compareTo(lits) < 0 ? time : lits;
-
- if (timeRegulationEnabled)
- {
- lots = time.add(lookahead);
-
- log.debug(LogMessages.LOTS_ADVANCED, lots);
- }
-
- // immediately grant the request
-
- federateTime = time;
-
- federateChannel.write(new TimeAdvanceGrant(federateTime));
- }
- else if (lits != null && lits.compareTo(galt) <= 0)
+ if (!timeConstrainedEnabled || galt == null || advanceRequestTime.compareTo(galt) <= 0)
{
- // LITS < GALT
-
- if (timeRegulationEnabled)
- {
- lots = lits.add(lookahead);
-
- log.debug(LogMessages.LOTS_ADVANCED, lots);
- }
-
// immediately grant the request
- federateTime = lits;
+ federateTime = advanceRequestTime;
+ advanceRequestTime = null;
federateChannel.write(new TimeAdvanceGrant(federateTime));
}
- else
- {
- advanceRequestTime = time;
-
- if (timeRegulationEnabled)
- {
- // LOTS can only advance as GALT advances
-
- lots = galt.add(lookahead);
-
- log.debug(LogMessages.LOTS_ADVANCED, lots);
- }
- }
}
@SuppressWarnings("unchecked")
@@ -964,7 +883,6 @@
federateTime = advanceRequestTime;
advanceRequestTime = null;
- lits = null;
federateChannel.write(new TimeAdvanceGrant(federateTime));
}
@@ -977,7 +895,6 @@
federateTime = advanceRequestTime;
advanceRequestTime = null;
- lits = null;
federateChannel.write(new TimeAdvanceGrant(federateTime));
}
@@ -987,59 +904,24 @@
{
if (advanceRequestTime.compareTo(galt) < 0)
{
- if (lits == null || advanceRequestTime.compareTo(lits) < 0)
- {
- federateTime = advanceRequestTime;
- }
- else
- {
- federateTime = lits;
- }
+ federateTime = advanceRequestTime;
advanceRequestTime = null;
- lits = null;
federateChannel.write(new TimeAdvanceGrant(federateTime));
}
- else if (lits != null && lits.compareTo(galt) < 0)
- {
- federateTime = lits;
- lits = null;
-
- advanceRequestTime = null;
- lits = null;
-
- federateChannel.write(new TimeAdvanceGrant(federateTime));
- }
break;
}
case NEXT_MESSAGE_REQUEST_AVAILABLE:
{
if (advanc...
[truncated message content] |