[ohla-devel] SF.net SVN: ohla: [17] trunk
Status: Beta
Brought to you by:
mnewcomb
Menu
▾
▴
[ohla-devel] SF.net SVN: ohla: [17] trunk
|
From: <mne...@us...> - 2006-11-11 03:56:50
|
Revision: 17
http://svn.sourceforge.net/ohla/?rev=17&view=rev
Author: mnewcomb
Date: 2006-11-10 19:56:13 -0800 (Fri, 10 Nov 2006)
Log Message:
-----------
created a FederateAmbassadorInterceptor to handle all callbacks on behalf of the Federate
Modified Paths:
--------------
trunk/build/intellij/OHLA.iws
trunk/rti/src/java/net/sf/ohla/rti1516/federate/Federate.java
trunk/rti/src/java/net/sf/ohla/rti1516/federate/FederateSave.java
trunk/rti/src/java/net/sf/ohla/rti1516/federate/callbacks/AnnounceSynchronizationPoint.java
trunk/rti/src/java/net/sf/ohla/rti1516/federate/callbacks/AttributeIsNotOwned.java
trunk/rti/src/java/net/sf/ohla/rti1516/federate/callbacks/AttributeIsOwnedByRTI.java
trunk/rti/src/java/net/sf/ohla/rti1516/federate/callbacks/AttributeOwnershipAcquisitionNotification.java
trunk/rti/src/java/net/sf/ohla/rti1516/federate/callbacks/AttributeOwnershipUnavailable.java
trunk/rti/src/java/net/sf/ohla/rti1516/federate/callbacks/AttributesInScope.java
trunk/rti/src/java/net/sf/ohla/rti1516/federate/callbacks/AttributesOutOfScope.java
trunk/rti/src/java/net/sf/ohla/rti1516/federate/callbacks/Callback.java
trunk/rti/src/java/net/sf/ohla/rti1516/federate/callbacks/CallbackManager.java
trunk/rti/src/java/net/sf/ohla/rti1516/federate/callbacks/ConfirmAttributeOwnershipAcquisitionCancellation.java
trunk/rti/src/java/net/sf/ohla/rti1516/federate/callbacks/DiscoverObjectInstance.java
trunk/rti/src/java/net/sf/ohla/rti1516/federate/callbacks/FederationNotRestored.java
trunk/rti/src/java/net/sf/ohla/rti1516/federate/callbacks/FederationNotSaved.java
trunk/rti/src/java/net/sf/ohla/rti1516/federate/callbacks/FederationRestoreBegun.java
trunk/rti/src/java/net/sf/ohla/rti1516/federate/callbacks/FederationRestoreStatusResponse.java
trunk/rti/src/java/net/sf/ohla/rti1516/federate/callbacks/FederationRestored.java
trunk/rti/src/java/net/sf/ohla/rti1516/federate/callbacks/FederationSaveStatusResponse.java
trunk/rti/src/java/net/sf/ohla/rti1516/federate/callbacks/FederationSaved.java
trunk/rti/src/java/net/sf/ohla/rti1516/federate/callbacks/FederationSynchronized.java
trunk/rti/src/java/net/sf/ohla/rti1516/federate/callbacks/InformAttributeOwnership.java
trunk/rti/src/java/net/sf/ohla/rti1516/federate/callbacks/InitiateFederateRestore.java
trunk/rti/src/java/net/sf/ohla/rti1516/federate/callbacks/InitiateFederateSave.java
trunk/rti/src/java/net/sf/ohla/rti1516/federate/callbacks/ObjectInstanceNameReservationFailed.java
trunk/rti/src/java/net/sf/ohla/rti1516/federate/callbacks/ObjectInstanceNameReservationSucceeded.java
trunk/rti/src/java/net/sf/ohla/rti1516/federate/callbacks/ProvideAttributeValueUpdate.java
trunk/rti/src/java/net/sf/ohla/rti1516/federate/callbacks/ReceiveInteraction.java
trunk/rti/src/java/net/sf/ohla/rti1516/federate/callbacks/ReflectAttributeValues.java
trunk/rti/src/java/net/sf/ohla/rti1516/federate/callbacks/RemoveObjectInstance.java
trunk/rti/src/java/net/sf/ohla/rti1516/federate/callbacks/RequestAttributeOwnershipAssumption.java
trunk/rti/src/java/net/sf/ohla/rti1516/federate/callbacks/RequestAttributeOwnershipRelease.java
trunk/rti/src/java/net/sf/ohla/rti1516/federate/callbacks/RequestDivestitureConfirmation.java
trunk/rti/src/java/net/sf/ohla/rti1516/federate/callbacks/RequestFederationRestoreFailed.java
trunk/rti/src/java/net/sf/ohla/rti1516/federate/callbacks/RequestFederationRestoreSucceeded.java
trunk/rti/src/java/net/sf/ohla/rti1516/federate/callbacks/RequestRetraction.java
trunk/rti/src/java/net/sf/ohla/rti1516/federate/callbacks/StartRegistrationForObjectClass.java
trunk/rti/src/java/net/sf/ohla/rti1516/federate/callbacks/StopRegistrationForObjectClass.java
trunk/rti/src/java/net/sf/ohla/rti1516/federate/callbacks/SynchronizationPointRegistrationFailed.java
trunk/rti/src/java/net/sf/ohla/rti1516/federate/callbacks/SynchronizationPointRegistrationSucceeded.java
trunk/rti/src/java/net/sf/ohla/rti1516/federate/callbacks/TimeAdvanceGrant.java
trunk/rti/src/java/net/sf/ohla/rti1516/federate/callbacks/TimeConstrainedEnabled.java
trunk/rti/src/java/net/sf/ohla/rti1516/federate/callbacks/TimeRegulationEnabled.java
trunk/rti/src/java/net/sf/ohla/rti1516/federate/callbacks/TurnInteractionsOff.java
trunk/rti/src/java/net/sf/ohla/rti1516/federate/callbacks/TurnInteractionsOn.java
trunk/rti/src/java/net/sf/ohla/rti1516/federate/callbacks/TurnUpdatesOffForObjectInstance.java
trunk/rti/src/java/net/sf/ohla/rti1516/federate/callbacks/TurnUpdatesOnForObjectInstance.java
trunk/rti/src/java/net/sf/ohla/rti1516/federate/objects/ObjectManager.java
Modified: trunk/build/intellij/OHLA.iws
===================================================================
--- trunk/build/intellij/OHLA.iws 2006-11-11 03:49:36 UTC (rev 16)
+++ trunk/build/intellij/OHLA.iws 2006-11-11 03:56:13 UTC (rev 17)
@@ -183,91 +183,7 @@
<option name="myCurrentFavoritesList" value="OHLA" />
</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">
- <provider selected="true" editor-type-id="text-editor">
- <state line="3383" column="9" selection-start="98187" selection-end="98187" vertical-scroll-proportion="0.33248082">
- <folding>
- <element signature="imports" expanded="true" />
- </folding>
- </state>
- </provider>
- </entry>
- </file>
- <file leaf-file-name="ObjectManager.java" pinned="false" current="false" current-in-tab="false">
- <entry file="file://$PROJECT_DIR$/../../rti/src/java/net/sf/ohla/rti1516/federate/objects/ObjectManager.java">
- <provider selected="true" editor-type-id="text-editor">
- <state line="922" column="14" selection-start="27191" selection-end="27191" vertical-scroll-proportion="-0.3196931">
- <folding />
- </state>
- </provider>
- </entry>
- </file>
- <file leaf-file-name="FederationSynchronized.java" pinned="false" current="false" current-in-tab="false">
- <entry file="file://$PROJECT_DIR$/../../rti/src/java/net/sf/ohla/rti1516/federate/callbacks/FederationSynchronized.java">
- <provider selected="true" editor-type-id="text-editor">
- <state line="35" column="13" selection-start="1002" selection-end="1002" vertical-scroll-proportion="0.40526977">
- <folding />
- </state>
- </provider>
- </entry>
- </file>
- <file leaf-file-name="FederationManagementTestNG.java" pinned="false" current="false" current-in-tab="false">
- <entry file="file://$PROJECT_DIR$/../../testsuite/src/java/net/sf/ohla/rti1516/FederationManagementTestNG.java">
- <provider selected="true" editor-type-id="text-editor">
- <state line="71" column="32" selection-start="2190" selection-end="2190" vertical-scroll-proportion="0.76086956">
- <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">
- <provider selected="true" editor-type-id="text-editor">
- <state line="47" column="0" selection-start="911" selection-end="1528" vertical-scroll-proportion="0.93601006">
- <folding />
- </state>
- </provider>
- </entry>
- </file>
- <file leaf-file-name="FederateAmbassador.java" pinned="false" current="false" current-in-tab="false">
- <entry file="file://$PROJECT_DIR$/../../ieee-1516/src/java/hla/rti1516/FederateAmbassador.java">
- <provider selected="true" editor-type-id="text-editor">
- <state line="27" column="7" selection-start="1154" selection-end="1154" vertical-scroll-proportion="0.33248082">
- <folding />
- </state>
- </provider>
- </entry>
- </file>
- <file leaf-file-name="AnnounceSynchronizationPoint.java" pinned="false" current="false" current-in-tab="false">
- <entry file="file://$PROJECT_DIR$/../../rti/src/java/net/sf/ohla/rti1516/federate/callbacks/AnnounceSynchronizationPoint.java">
- <provider selected="true" editor-type-id="text-editor">
- <state line="37" column="28" selection-start="1085" selection-end="1085" vertical-scroll-proportion="0.44792974">
- <folding />
- </state>
- </provider>
- </entry>
- </file>
- <file leaf-file-name="TestConstants.java" pinned="false" current="false" current-in-tab="false">
- <entry file="file://$PROJECT_DIR$/../../testsuite/src/java/net/sf/ohla/rti1516/TestConstants.java">
- <provider selected="true" editor-type-id="text-editor">
- <state line="41" column="72" selection-start="1500" selection-end="1500" vertical-scroll-proportion="0.5759097">
- <folding />
- </state>
- </provider>
- </entry>
- </file>
- <file leaf-file-name="FederateSynchronizationPoint.java" pinned="false" current="false" current-in-tab="false">
- <entry file="file://$PROJECT_DIR$/../../rti/src/java/net/sf/ohla/rti1516/federate/FederateSynchronizationPoint.java">
- <provider selected="true" editor-type-id="text-editor">
- <state line="87" column="30" selection-start="2220" selection-end="2220" vertical-scroll-proportion="0.93601006">
- <folding />
- </state>
- </provider>
- </entry>
- </file>
- </leaf>
+ <leaf />
</component>
<component name="FindManager">
<FindUsagesManager>
@@ -385,73 +301,7 @@
<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>
- <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_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>
</component>
<component name="ProjectReloadState">
<option name="STATE" value="0" />
@@ -464,7 +314,7 @@
<showLibraryContents />
<hideEmptyPackages ProjectPane="true" />
<abbreviatePackageNames />
- <showStructure PackagesPane="false" ProjectPane="false" Favorites="false" Scope="false" />
+ <showStructure PackagesPane="false" Favorites="false" ProjectPane="false" Scope="false" />
<autoscrollToSource />
<autoscrollFromSource />
<sortByType />
@@ -483,8 +333,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" />
@@ -493,8 +343,8 @@
<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" />
@@ -531,13 +381,6 @@
<option name="PROPERTIES_FILE" />
<properties />
</configuration>
- <configuration selected="false" 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 selected="false" default="true" type="Applet" factoryName="Applet">
<module name="" />
<option name="MAIN_CLASS_NAME" />
@@ -550,6 +393,13 @@
<option name="ALTERNATIVE_JRE_PATH_ENABLED" value="false" />
<option name="ALTERNATIVE_JRE_PATH" />
</configuration>
+ <configuration selected="false" 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 selected="false" default="true" type="Application" factoryName="Application">
<option name="MAIN_CLASS_NAME" />
<option name="VM_PARAMETERS" />
@@ -722,11 +572,11 @@
</component>
<component name="ToolWindowManager">
<frame x="-4" y="-4" width="1288" height="998" extended-state="6" />
- <editor active="false" />
+ <editor active="true" />
<layout>
<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="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.29773462" order="0" />
+ <window_info id="Project" active="false" anchor="left" auto_hide="false" internal_type="docked" type="docked" visible="true" weight="0.33333334" 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="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" />
@@ -779,7 +629,7 @@
<option name="CHECK_CODE_SMELLS_BEFORE_PROJECT_COMMIT" value="true" />
<option name="PUT_FOCUS_INTO_COMMENT" value="false" />
<option name="FORCE_NON_EMPTY_COMMENT" value="false" />
- <option name="LAST_COMMIT_MESSAGE" value="corrected some variable names" />
+ <option name="LAST_COMMIT_MESSAGE" value="renamed some variables" />
<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" />
@@ -799,6 +649,9 @@
<MESSAGE value="adding documentation" />
<MESSAGE value="[ 1594262 ] Allow to restart RTI faster" />
<MESSAGE value="corrected some variable names" />
+ <MESSAGE value="- added synchronization point tests to HLA 1.3 testsuite - removed some unused constants from TestConstants" />
+ <MESSAGE value="more synchronization point test cases" />
+ <MESSAGE value="renamed some variables" />
</component>
<component name="VssConfiguration">
<option name="CLIENT_PATH" value="" />
@@ -879,109 +732,111 @@
<option name="myLastEditedConfigurable" />
</component>
<component name="editorHistoryManager">
- <entry file="file://$PROJECT_DIR$/../../rti/src/java/net/sf/ohla/rti1516/federate/callbacks/DiscoverObjectInstance.java">
+ <entry file="file://$PROJECT_DIR$/../../rti/src/java/net/sf/ohla/rti1516/messages/FederateSaveInitiated.java">
<provider selected="true" editor-type-id="text-editor">
- <state line="48" column="20" selection-start="1454" selection-end="1454" vertical-scroll-proportion="0.6612296">
+ <state line="32" column="34" selection-start="955" selection-end="955" vertical-scroll-proportion="0.51224107">
<folding />
</state>
</provider>
</entry>
- <entry file="file://$PROJECT_DIR$/../../rti/src/java/net/sf/ohla/rti1516/federate/objects/ObjectManager.java">
+ <entry file="file://$PROJECT_DIR$/../../rti/src/java/net/sf/ohla/rti1516/federate/filter/InterestManagementFilter.java">
<provider selected="true" editor-type-id="text-editor">
- <state line="922" column="14" selection-start="27191" selection-end="27191" vertical-scroll-proportion="-0.3196931">
+ <state line="243" column="37" selection-start="8806" selection-end="8806" vertical-scroll-proportion="0.56092435">
<folding />
</state>
</provider>
</entry>
- <entry file="file://$PROJECT_DIR$/../../testsuite/src/java/net/sf/ohla/rti1516/DeclarationManagementTestNG.java">
+ <entry file="file://$PROJECT_DIR$/../../rti/src/java/net/sf/ohla/rti1516/federate/callbacks/ReflectAttributeValues.java">
<provider selected="true" editor-type-id="text-editor">
- <state line="31" column="13" selection-start="1121" selection-end="1121" vertical-scroll-proportion="-0.36956522">
+ <state line="48" column="15" selection-start="1750" selection-end="1750" vertical-scroll-proportion="0.5988258">
<folding />
</state>
</provider>
</entry>
- <entry file="file://$PROJECT_DIR$/../../testsuite/src/java/net/sf/ohla/rti1516/TestConstants.java">
+ <entry file="file://$PROJECT_DIR$/../../ieee-1516/src/java/hla/rti1516/jlc/NullFederateAmbassador.java">
<provider selected="true" editor-type-id="text-editor">
- <state line="41" column="72" selection-start="1500" selection-end="1500" vertical-scroll-proportion="0.5759097">
+ <state line="76" column="0" selection-start="2635" selection-end="2635" vertical-scroll-proportion="0.33291772">
<folding />
</state>
</provider>
</entry>
- <entry file="file://$PROJECT_DIR$/../../rti/src/java/net/sf/ohla/rti1516/RTI.java">
+ <entry file="file://$PROJECT_DIR$/../../ieee-1516/src/java/hla/rti1516/FederateAmbassador.java">
<provider selected="true" editor-type-id="text-editor">
- <state line="59" column="35" selection-start="2126" selection-end="2126" vertical-scroll-proportion="0.13682865">
+ <state line="40" column="60" selection-start="1623" selection-end="1623" vertical-scroll-proportion="0.33291772">
<folding />
</state>
</provider>
</entry>
- <entry file="file://$PROJECT_DIR$/../../rti/src/java/net/sf/ohla/rti1516/federate/callbacks/AnnounceSynchronizationPoint.java">
- <provider selected="true" editor-type-id="text-editor">
- <state line="37" column="28" selection-start="1085" selection-end="1085" vertical-scroll-proportion="0.44792974">
- <folding />
- </state>
- </provider>
- </entry>
<entry file="file://$PROJECT_DIR$/../../rti/src/java/net/sf/ohla/rti1516/federate/Federate.java">
<provider selected="true" editor-type-id="text-editor">
- <state line="3383" column="9" selection-start="98187" selection-end="98187" vertical-scroll-proportion="0.33248082">
+ <state line="498" column="42" selection-start="20308" selection-end="20308" vertical-scroll-proportion="0.3414322">
<folding>
<element signature="imports" expanded="true" />
</folding>
</state>
</provider>
</entry>
- <entry file="file://$PROJECT_DIR$/../../rti/src/java/net/sf/ohla/rti1516/federate/FederateSynchronizationPoint.java">
+ <entry file="file://$PROJECT_DIR$/../../hla-1.3/src/java/hla/rti/ReflectedAttributes.java">
<provider selected="true" editor-type-id="text-editor">
- <state line="87" column="30" selection-start="2220" selection-end="2220" vertical-scroll-proportion="0.93601006">
+ <state line="2" column="17" selection-start="35" selection-end="35" vertical-scroll-proportion="0.042659976">
<folding />
</state>
</provider>
</entry>
- <entry file="file://$PROJECT_DIR$/../../ieee-1516/src/java/hla/rti1516/FederateAmbassador.java">
+ <entry file="file://$PROJECT_DIR$/../../hla-1.3/src/java/hla/rti/RTIambassador.java">
<provider selected="true" editor-type-id="text-editor">
- <state line="27" column="7" selection-start="1154" selection-end="1154" vertical-scroll-proportion="0.33248082">
+ <state line="42" column="0" selection-start="1835" selection-end="1835" vertical-scroll-proportion="0.3412798">
<folding />
</state>
</provider>
</entry>
- <entry file="file://$PROJECT_DIR$/../../ieee-1516/src/java/hla/rti1516/jlc/NullFederateAmbassador.java">
+ <entry file="file://$PROJECT_DIR$/../../rti/src/java/net/sf/ohla/rti/OHLARTIambassador.java">
<provider selected="true" editor-type-id="text-editor">
- <state line="55" column="0" selection-start="2163" selection-end="2163" vertical-scroll-proportion="0.19565217">
+ <state line="341" column="12" selection-start="11764" selection-end="11764" vertical-scroll-proportion="0.9066496">
<folding />
</state>
</provider>
</entry>
- <entry file="file://$PROJECT_DIR$/../../rti/src/java/net/sf/ohla/rti1516/federate/callbacks/FederationSynchronized.java">
+ <entry file="file://$PROJECT_DIR$/../../hla-1.3/src/java/hla/rti/FederateAmbassador.java">
<provider selected="true" editor-type-id="text-editor">
- <state line="35" column="13" selection-start="1002" selection-end="1002" vertical-scroll-proportion="0.40526977">
+ <state line="61" column="45" selection-start="1973" selection-end="1973" vertical-scroll-proportion="0.2685069">
<folding />
</state>
</provider>
</entry>
- <entry file="file://$PROJECT_DIR$/../../testsuite/src/java/net/sf/ohla/rti1516/BaseTestNG.java">
+ <entry file="file://$PROJECT_DIR$/../../testsuite/src/java/net/sf/ohla/rti1516/ObjectManagementTestNG.java">
<provider selected="true" editor-type-id="text-editor">
- <state line="32" column="22" selection-start="996" selection-end="996" vertical-scroll-proportion="0.14930992">
+ <state line="295" column="12" selection-start="10776" selection-end="10776" vertical-scroll-proportion="0.3412798">
<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/FederateSave.java">
<provider selected="true" editor-type-id="text-editor">
- <state line="88" column="0" selection-start="3103" selection-end="3103" vertical-scroll-proportion="0.27728984">
+ <state line="48" column="3" selection-start="1321" selection-end="1321" vertical-scroll-proportion="0.45294857">
<folding />
</state>
</provider>
</entry>
- <entry file="file://$PROJECT_DIR$/../../testsuite/src/java/net/sf/ohla/rti1516/FederationManagementTestNG.java">
+ <entry file="file://$PROJECT_DIR$/../../rti/src/java/net/sf/ohla/rti1516/federate/objects/ObjectManager.java">
<provider selected="true" editor-type-id="text-editor">
- <state line="71" column="32" selection-start="2190" selection-end="2190" vertical-scroll-proportion="0.76086956">
+ <state line="966" column="14" selection-start="28910" selection-end="28910" vertical-scroll-proportion="0.58056265">
+ <folding>
+ <element signature="imports" expanded="true" />
+ </folding>
+ </state>
+ </provider>
+ </entry>
+ <entry file="file://$PROJECT_DIR$/../../rti/src/java/net/sf/ohla/rti1516/federate/objects/ObjectInstance.java">
+ <provider selected="true" editor-type-id="text-editor">
+ <state line="77" column="13" selection-start="3213" selection-end="3213" vertical-scroll-proportion="0.13043478">
<folding />
</state>
</provider>
</entry>
- <entry file="file://$PROJECT_DIR$/../../resources/testsuite/ieee-1516-testng.xml">
+ <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="47" column="0" selection-start="911" selection-end="1528" vertical-scroll-proportion="0.93601006">
+ <state line="230" column="21" selection-start="7508" selection-end="7508" vertical-scroll-proportion="0.21867007">
<folding />
</state>
</provider>
Modified: trunk/rti/src/java/net/sf/ohla/rti1516/federate/Federate.java
===================================================================
--- trunk/rti/src/java/net/sf/ohla/rti1516/federate/Federate.java 2006-11-11 03:49:36 UTC (rev 16)
+++ trunk/rti/src/java/net/sf/ohla/rti1516/federate/Federate.java 2006-11-11 03:56:13 UTC (rev 17)
@@ -26,7 +26,6 @@
import java.util.Map;
import java.util.PriorityQueue;
import java.util.Queue;
-import java.util.Set;
import java.util.concurrent.Callable;
import java.util.concurrent.ExecutionException;
import java.util.concurrent.Future;
@@ -53,6 +52,7 @@
import net.sf.ohla.rti1516.fdd.FDD;
import net.sf.ohla.rti1516.federate.callbacks.Callback;
import net.sf.ohla.rti1516.federate.callbacks.CallbackManager;
+import net.sf.ohla.rti1516.federate.callbacks.DiscoverObjectInstance;
import net.sf.ohla.rti1516.federate.callbacks.InitiateFederateRestore;
import net.sf.ohla.rti1516.federate.callbacks.InitiateFederateSave;
import net.sf.ohla.rti1516.federate.callbacks.ObjectInstanceNameReservationFailed;
@@ -113,6 +113,7 @@
import hla.rti1516.AsynchronousDeliveryAlreadyDisabled;
import hla.rti1516.AsynchronousDeliveryAlreadyEnabled;
+import hla.rti1516.AttributeAcquisitionWasNotCanceled;
import hla.rti1516.AttributeAcquisitionWasNotRequested;
import hla.rti1516.AttributeAlreadyBeingAcquired;
import hla.rti1516.AttributeAlreadyBeingDivested;
@@ -127,6 +128,8 @@
import hla.rti1516.AttributeNotDefined;
import hla.rti1516.AttributeNotOwned;
import hla.rti1516.AttributeNotPublished;
+import hla.rti1516.AttributeNotRecognized;
+import hla.rti1516.AttributeNotSubscribed;
import hla.rti1516.AttributeRegionAssociation;
import hla.rti1516.AttributeRelevanceAdvisorySwitchIsOff;
import hla.rti1516.AttributeRelevanceAdvisorySwitchIsOn;
@@ -134,6 +137,8 @@
import hla.rti1516.AttributeScopeAdvisorySwitchIsOn;
import hla.rti1516.AttributeSetRegionSetPairList;
import hla.rti1516.AttributeSetRegionSetPairListFactory;
+import hla.rti1516.CouldNotDiscover;
+import hla.rti1516.CouldNotInitiateRestore;
import hla.rti1516.DeletePrivilegeNotHeld;
import hla.rti1516.DimensionHandle;
import hla.rti1516.DimensionHandleFactory;
@@ -143,9 +148,12 @@
import hla.rti1516.FederateAmbassador;
import hla.rti1516.FederateHandle;
import hla.rti1516.FederateHandleFactory;
+import hla.rti1516.FederateHandleRestoreStatusPair;
+import hla.rti1516.FederateHandleSaveStatusPair;
import hla.rti1516.FederateHandleSet;
import hla.rti1516.FederateHandleSetFactory;
import hla.rti1516.FederateHasNotBegunSave;
+import hla.rti1516.FederateInternalError;
import hla.rti1516.FederateOwnsAttributes;
import hla.rti1516.FederateServiceInvocationsAreBeingReportedViaMOM;
import hla.rti1516.FederateUnableToUseTime;
@@ -156,7 +164,10 @@
import hla.rti1516.InteractionClassHandleFactory;
import hla.rti1516.InteractionClassNotDefined;
import hla.rti1516.InteractionClassNotPublished;
+import hla.rti1516.InteractionClassNotRecognized;
+import hla.rti1516.InteractionClassNotSubscribed;
import hla.rti1516.InteractionParameterNotDefined;
+import hla.rti1516.InteractionParameterNotRecognized;
import hla.rti1516.InteractionRelevanceAdvisorySwitchIsOff;
import hla.rti1516.InteractionRelevanceAdvisorySwitchIsOn;
import hla.rti1516.InvalidAttributeHandle;
@@ -175,6 +186,7 @@
import hla.rti1516.InvalidRegionContext;
import hla.rti1516.InvalidTransportationName;
import hla.rti1516.InvalidTransportationType;
+import hla.rti1516.JoinedFederateIsNotInTimeAdvancingState;
import hla.rti1516.LogicalTime;
import hla.rti1516.LogicalTimeAlreadyPassed;
import hla.rti1516.LogicalTimeInterval;
@@ -183,10 +195,13 @@
import hla.rti1516.MessageRetractionReturn;
import hla.rti1516.MobileFederateServices;
import hla.rti1516.NameNotFound;
+import hla.rti1516.NoRequestToEnableTimeConstrainedWasPending;
+import hla.rti1516.NoRequestToEnableTimeRegulationWasPending;
import hla.rti1516.ObjectClassHandle;
import hla.rti1516.ObjectClassHandleFactory;
import hla.rti1516.ObjectClassNotDefined;
import hla.rti1516.ObjectClassNotPublished;
+import hla.rti1516.ObjectClassNotRecognized;
import hla.rti1516.ObjectClassRelevanceAdvisorySwitchIsOff;
import hla.rti1516.ObjectClassRelevanceAdvisorySwitchIsOn;
import hla.rti1516.ObjectInstanceHandle;
@@ -213,11 +228,14 @@
import hla.rti1516.RequestForTimeConstrainedPending;
import hla.rti1516.RequestForTimeRegulationPending;
import hla.rti1516.ResignAction;
+import hla.rti1516.RestoreFailureReason;
import hla.rti1516.RestoreInProgress;
import hla.rti1516.RestoreNotRequested;
+import hla.rti1516.SaveFailureReason;
import hla.rti1516.SaveInProgress;
import hla.rti1516.SaveNotInitiated;
import hla.rti1516.ServiceGroup;
+import hla.rti1516.SpecifiedSaveLabelDoesNotExist;
import hla.rti1516.SynchronizationPointFailureReason;
import hla.rti1516.SynchronizationPointLabelNotAnnounced;
import hla.rti1516.TimeConstrainedAlreadyEnabled;
@@ -226,7 +244,9 @@
import hla.rti1516.TimeRegulationAlreadyEnabled;
import hla.rti1516.TimeRegulationIsNotEnabled;
import hla.rti1516.TransportationType;
-import hla.rti1516.FederateInternalError;
+import hla.rti1516.UnableToPerformSave;
+import hla.rti1516.UnknownName;
+import hla.rti1516.jlc.NullFederateAmbassador;
public class Federate
{
@@ -245,6 +265,9 @@
protected final FederateAmbassador federateAmbassador;
protected final MobileFederateServices mobileFederateServices;
+ protected final FederateAmbassador federateAmbassadorInterceptor =
+ new FederateAmbassadorInterceptor();
+
protected FederateHandle federateHandle;
protected String federationName;
@@ -475,7 +498,7 @@
public FederateAmbassador getFederateAmbassador()
{
- return federateAmbassador;
+ return federateAmbassadorInterceptor;
}
public FDD getFDD()
@@ -523,8 +546,27 @@
boolean processed = true;
if (message instanceof Callback)
{
- if (message instanceof InitiateFederateSave)
+ if (message instanceof ReflectAttributeValues)
{
+ ReflectAttributeValues reflectAttributeValues =
+ (ReflectAttributeValues) message;
+
+ objectManager.objectReflected(
+ reflectAttributeValues.getObjectInstanceHandle(),
+ reflectAttributeValues.getObjectClassHandle());
+ }
+ else if (message instanceof DiscoverObjectInstance)
+ {
+ DiscoverObjectInstance discoverObjectInstance =
+ (DiscoverObjectInstance) message;
+
+ String name = objectManager.createObjectInstanceName(
+ discoverObjectInstance.getObjectInstanceHandle(),
+ discoverObjectInstance.getObjectClassHandle());
+ discoverObjectInstance.setName(name);
+ }
+ else if (message instanceof InitiateFederateSave)
+ {
InitiateFederateSave initiateFederateSave =
(InitiateFederateSave) message;
@@ -3381,120 +3423,6 @@
}
}
- public void announceSynchronizationPoint(String label, byte[] tag)
- {
- FederateSynchronizationPoint federateSynchronizationPoint;
-
- synchronizationPointLock.lock();
- try
- {
- federateSynchronizationPoint = synchronizationPoints.get(label);
- if (federateSynchronizationPoint == null)
- {
- federateSynchronizationPoint =
- new FederateSynchronizationPoint(label, tag);
- synchronizationPoints.put(label, federateSynchronizationPoint);
- }
- }
- finally
- {
- synchronizationPointLock.unlock();
- }
-
- federateSynchronizationPoint.announceSynchronizationPoint();
-
- try
- {
- federateAmbassador.announceSynchronizationPoint(label, tag);
- }
- catch (FederateInternalError fie)
- {
- log.warn(String.format(
- "federate could not process announcement of synchronization point: %s",
- label), fie);
- }
- }
-
- public void federationSynchronized(String label)
- {
- FederateSynchronizationPoint federateSynchronizationPoint;
-
- synchronizationPointLock.lock();
- try
- {
- // remove the synchronization point
- //
- federateSynchronizationPoint = synchronizationPoints.remove(label);
- }
- finally
- {
- synchronizationPointLock.unlock();
- }
-
- assert federateSynchronizationPoint != null;
-
- federateSynchronizationPoint.federationSynchronized();
-
- try
- {
- federateAmbassador.federationSynchronized(label);
- }
- catch (FederateInternalError fie)
- {
- log.warn(String.format(
- "federate could not process federation synchronization: %s",
- label), fie);
- }
- }
-
- public void discoverObjectInstance(
- ObjectInstanceHandle objectInstanceHandle,
- ObjectClassHandle objectClassHandle)
- {
- objectManager.discoverObjectInstance(
- objectInstanceHandle, objectClassHandle);
- }
-
- public void reflectAttributeValues(
- ObjectInstanceHandle objectInstanceHandle,
- ObjectClassHandle objectClassHandle,
- AttributeHandleValueMap attributeValues, byte[] tag,
- OrderType sentOrderType, TransportationType transportationType,
- LogicalTime updateTime, OrderType receivedOrderType,
- MessageRetractionHandle messageRetractionHandle,
- RegionHandleSet sentRegionHandles)
- {
- objectManager.reflectAttributeValues(
- objectInstanceHandle, objectClassHandle, attributeValues, tag,
- sentOrderType, transportationType, updateTime, receivedOrderType,
- messageRetractionHandle, sentRegionHandles);
- }
-
- public void receiveInteraction(
- InteractionClassHandle interactionClassHandle,
- ParameterHandleValueMap parameterValues, byte[] tag,
- OrderType sentOrderType, TransportationType transportationType,
- LogicalTime sendTime, OrderType receivedOrderType,
- MessageRetractionHandle messageRetractionHandle,
- RegionHandleSet sentRegionHandles)
- {
- objectManager.receiveInteraction(
- interactionClassHandle, parameterValues, tag, sentOrderType,
- transportationType, sendTime, receivedOrderType,
- messageRetractionHandle, sentRegionHandles);
- }
-
- public void removeObjectInstance(
- ObjectInstanceHandle objectInstanceHandle, byte[] tag,
- OrderType sentOrderType, LogicalTime deleteTime,
- OrderType receivedOrderType,
- MessageRetractionHandle messageRetractionHandle)
- {
- objectManager.removeObjectInstance(
- objectInstanceHandle, tag, sentOrderType, deleteTime,
- receivedOrderType, messageRetractionHandle);
- }
-
protected void checkIfAlreadyExecutionMember()
throws FederateAlreadyExecutionMember
{
@@ -3551,56 +3479,6 @@
return future;
}
- public void initiateFederateSave(String label, LogicalTime saveTime,
- Set<FederateHandle> participants)
- {
- federateStateLock.writeLock().lock();
- try
- {
- if (saveTime == null)
- {
- federateAmbassador.initiateFederateSave(label);
- }
- else
- {
- federateAmbassador.initiateFederateSave(label, saveTime);
- }
-
- FederateSaveInitiated federateSaveInitiated =
- new FederateSaveInitiated(participants);
-
- rtiSession.write(federateSaveInitiated);
- sendToPeers(federateSaveInitiated);
- }
- catch (Throwable t)
- {
- FederateSaveInitiatedFailed federateSaveInitiatedFailed =
- new FederateSaveInitiatedFailed(t, participants);
-
- rtiSession.write(federateSaveInitiatedFailed);
- sendToPeers(federateSaveInitiatedFailed);
- }
- finally
- {
- federateState = FederateState.SAVE_IN_PROGRESS;
-
- // hold any pending callbacks so only callbacks that can occur during
- // a save will get through
- //
- callbackManager.holdCallbacks();
-
- federateStateLock.writeLock().unlock();
- }
- }
-
- public void attributeOwnershipAcquisitionNotification(
- ObjectInstanceHandle objectInstanceHandle,
- AttributeHandleSet attributeHandles, byte[] tag)
- {
- objectManager.attributeOwnershipAcquisitionNotification(
- objectInstanceHandle, attributeHandles, tag);
- }
-
protected class TimestampedFutureTask
extends FutureTask<Object>
implements Comparable
@@ -3846,4 +3724,623 @@
return (FederateHandle) session.getAttribute(PEER_FEDERATE_HANDLE);
}
}
+
+ protected class FederateAmbassadorInterceptor
+ extends NullFederateAmbassador
+ {
+ public void synchronizationPointRegistrationSucceeded(String label)
+ throws FederateInternalError
+ {
+ federateAmbassador.synchronizationPointRegistrationSucceeded(label);
+ }
+
+ public void synchronizationPointRegistrationFailed(String label,
+ SynchronizationPointFailureReason reason)
+ throws FederateInternalError
+ {
+ federateAmbassador.synchronizationPointRegistrationFailed(label, reason);
+ }
+
+ public void announceSynchronizationPoint(String label, byte[] tag)
+ throws FederateInternalError
+ {
+ FederateSynchronizationPoint federateSynchronizationPoint;
+
+ synchronizationPointLock.lock();
+ try
+ {
+ federateSynchronizationPoint = synchronizationPoints.get(label);
+ if (federateSynchronizationPoint == null)
+ {
+ federateSynchronizationPoint =
+ new FederateSynchronizationPoint(label, tag);
+ synchronizationPoints.put(label, federateSynchronizationPoint);
+ }
+ }
+ finally
+ {
+ synchronizationPointLock.unlock();
+ }
+
+ federateSynchronizationPoint.announceSynchronizationPoint();
+
+ federateAmbassador.announceSynchronizationPoint(label, tag);
+ }
+
+ public void federationSynchronized(String label)
+ throws FederateInternalError
+ {
+ FederateSynchronizationPoint federateSynchronizationPoint;
+
+ synchronizationPointLock.lock();
+ try
+ {
+ // remove the synchronization point
+ //
+ federateSynchronizationPoint = synchronizationPoints.remove(label);
+ }
+ finally
+ {
+ synchronizationPointLock.unlock();
+ }
+
+ assert federateSynchronizationPoint != null;
+
+ federateSynchronizationPoint.federationSynchronized();
+
+ federateAmbassador.federationSynchronized(label);
+ }
+
+ public void initiateFederateSave(String label)
+ throws UnableToPerformSave, FederateInternalError
+ {
+ federateStateLock.writeLock().lock();
+ try
+ {
+ federateAmbassador.initiateFederateSave(label);
+
+ FederateSaveInitiated federateSaveInitiated =
+ new FederateSaveInitiated(federateSave.getParticipants());
+
+ rtiSession.write(federateSaveInitiated);
+ sendToPeers(federateSaveInitiated);
+ }
+ catch (Throwable t)
+ {
+ FederateSaveInitiatedFailed federateSaveInitiatedFailed =
+ new FederateSaveInitiatedFailed(t, federateSave.getParticipants());
+
+ rtiSession.write(federateSaveInitiatedFailed);
+ sendToPeers(federateSaveInitiatedFailed);
+ }
+ finally
+ {
+ federateState = FederateState.SAVE_IN_PROGRESS;
+
+ // hold any pending callbacks so only callbacks that can occur during
+ // a save will get through
+ //
+ callbackManager.holdCallbacks();
+
+ federateStateLock.writeLock().unlock();
+ }
+ }
+
+ public void initiateFederateSave(String label, LogicalTime saveTime)
+ throws InvalidLogicalTime, UnableToPerformSave, FederateInternalError
+ {
+ federateStateLock.writeLock().lock();
+ try
+ {
+ federateAmbassador.initiateFederateSave(label, saveTime);
+
+ FederateSaveInitiated federateSaveInitiated =
+ new FederateSaveInitiated(federateSave.getParticipants());
+
+ rtiSession.write(federateSaveInitiated);
+ sendToPeers(federateSaveInitiated);
+ }
+ catch (Throwable t)
+ {
+ FederateSaveInitiatedFailed federateSaveInitiatedFailed =
+ new FederateSaveInitiatedFailed(t, federateSave.getParticipants());
+
+ rtiSession.write(federateSaveInitiatedFailed);
+ sendToPeers(federateSaveInitiatedFailed);
+ }
+ finally
+ {
+ federateState = FederateState.SAVE_IN_PROGRESS;
+
+ // hold any pending callbacks so only callbacks that can occur during
+ // a save will get through
+ //
+ callbackManager.holdCallbacks();
+
+ federateStateLock.writeLock().unlock();
+ }
+ federateAmbassador.initiateFederateSave(label, time);
+ }
+
+ public void federationSaved()
+ throws FederateInternalError
+ {
+ federateAmbassador.federationSaved();
+ }
+
+ public void federationNotSaved(SaveFailureReason reason)
+ throws FederateInternalError
+ {
+ federateAmbassador.federationNotSaved(reason);
+ }
+
+ public void federationSaveStatusResponse(
+ FederateHandleSaveStatusPair[] response)
+ throws FederateInternalError
+ {
+ federateAmbassador.federationSaveStatusResponse(response);
+ }
+
+ public void requestFederationRestoreSucceeded(String label)
+ throws FederateInternalError
+ {
+ federateAmbassador.requestFederationRestoreSucceeded(label);
+ }
+
+ public void requestFederationRestoreFailed(String label)
+ throws FederateInternalError
+ {
+ federateAmbassador.requestFederationRestoreFailed(label);
+ }
+
+ public void federationRestoreBegun()
+ throws FederateInternalError
+ {
+ federateAmbassador.federationRestoreBegun();
+ }
+
+ public void initiateFederateRestore(String label,
+ FederateHandle federateHandle)
+ throws SpecifiedSaveLabelDoesNotExist, CouldNotInitiateRestore,
+ FederateInternalError
+ {
+ federateAmbassador.initiateFederateRestore(label, federateHandle);
+ }
+
+ public void federationRestored()
+ throws FederateInternalError
+ {
+ federateAmbassador.federationRestored();
+ }
+
+ public void federationNotRestored(RestoreFailureReason reason)
+ throws FederateInternalError
+ {
+ federateAmbassador.federationNotRestored(reason);
+ }
+
+ public void federationRestoreStatusResponse(
+ FederateHandleRestoreStatusPair[] response)
+ throws FederateInternalError
+ {
+ federateAmbassador.federationRestoreStatusResponse(response);
+ }
+
+ public void startRegistrationForObjectClass(
+ ObjectClassHandle objectClassHandle)
+ throws ObjectClassNotPublished, FederateInternalError
+ {
+ federateAmbassador.startRegistrationForObjectClass(objectClassHandle);
+ }
+
+ public void stopRegistrationForObjectClass(
+ ObjectClassHandle objectClassHandle)
+ throws ObjectClassNotPublished, FederateInternalError
+ {
+ federateAmbassador.stopRegistrationForObjectClass(objectClassHandle);
+ }
+
+ public void turnInteractionsOn(InteractionClassHandle interactionClassHandle)
+ throws InteractionClassNotPublished, FederateInternalError
+ {
+ federateAmbassador.turnInteractionsOn(interactionClassHandle);
+ }
+
+ public void turnInteractionsOff(
+ InteractionClassHandle interactionClassHandle)
+ throws InteractionClassNotPublished, FederateInternalError
+ {
+ federateAmbassador.turnInteractionsOff(interactionClassHandle);
+ }
+
+ public void objectInstanceNameReservationSucceeded(String name)
+ throws UnknownName, FederateInternalError
+ {
+ federateAmbassador.objectInstanceNameReservationSucceeded(name);
+ }
+
+ public void objectInstanceNameReservationFailed(String name)
+ throws UnknownName, FederateInternalError
+ {
+ federateAmbassador.objectInstanceNameReservationFailed(name);
+ }
+
+ public void discoverObjectInstance(
+ ObjectInstanceHandle objectInstanceHandle,
+ ObjectClassHandle objectClassHandle, String name)
+ throws CouldNotDiscover, ObjectClassNotRecognized, FederateInternalError
+ {
+ objectManager.discoverObjectInstance(
+ objectInstanceHandle, objectClassHandle, name, federateAmbassador);
+ }
+
+ public void reflectAttributeValues(
+ ObjectInstanceHandle objectInstanceHandle,
+ AttributeHandleValueMap attributeValues, byte[] tag,
+ OrderType sentOrderType, TransportationType transportationType)
+ throws ObjectInstanceNotKnown, AttributeNotRecognized,
+ AttributeNotSubscribed, FederateInternalError
+ {
+ objectManager.reflectAttributeValues(
+ objectInstanceHandle, attributeValues, tag, sentOrderType,
+ transportationType, null, null, null, null, federateAmbassador);
+ }
+
+ public void reflectAttributeValues(
+ ObjectInstanceHandle objectInstanceHandle,
+ AttributeHandleValueMap attributeValues, byte[] tag,
+ OrderType sentOrderType, TransportationType transportationType,
+ RegionHandleSet regionHandles)
+ throws ObjectInstanceNotKnown, AttributeNotRecognized,
+ AttributeNotSubscribed, FederateInternalError
+ {
+ objectManager.reflectAttributeValues(
+ objectInstanceHandle, attributeValues, tag, sentOrderType,
+ transportationType, null, null, null, regionHandles,
+ federateAmbassador);
+ }
+
+ public void reflectAttributeValues(
+ ObjectInstanceHandle objectInstanceHandle,
+ AttributeHandleValueMap attributeValues, byte[] tag,
+ OrderType sentOrderType, TransportationType transportationType,
+ LogicalTime updateTime, OrderType receivedOrderType)
+ throws ObjectInstanceNotKnown, AttributeNotRecognized,
+ AttributeNotSubscribed, FederateInternalError
+ {
+ objectManager.reflectAttributeValues(
+ objectInstanceHandle, attributeValues, tag, sentOrderType,
+ transportationType, updateTime, receivedOrderType, null, null,
+ federateAmbassador);
+ }
+
+ public void reflectAttributeValues(
+ ObjectInstanceHandle objectInstanceHandle,
+ AttributeHandleValueMap attributeValues, byte[] tag,
+ OrderType sentOrderType, TransportationType transportationType,
+ LogicalTime updateTime, OrderType receivedOrderType,
+ RegionHandleSet regionHandles)
+ throws ObjectInstanceNotKnown, AttributeNotRecognized,
+ AttributeNotSubscribed, FederateInternalError
+ {
+ objectManager.reflectAttributeValues(
+ objectInstanceHandle, attributeValues, tag, sentOrderType,
+ transportationType, updateTime, receivedOrderType, null, regionHandles,
+ federateAmbassador);
+ }
+
+ public void reflectAttributeValues(
+ ObjectInstanceHandle objectInstanceHandle,
+ AttributeHandleValueMap attributeValues, byte[] tag, OrderType sentOrderType,
+ TransportationType transportationType, LogicalTime updateTime,
+ OrderType receivedOrderType,
+ MessageRetractionHandle messageRetractionHandle)
+ throws ObjectInstanceNotKnown, AttributeNotRecognized,
+ AttributeNotSubscribed, InvalidLogicalTime, FederateInternalError
+ {
+ objectManager.reflectAttributeValues(
+ objectInstanceHandle, attributeValues, tag, sentOrderType,
+ transportationType, updateTime, receivedOrderType,
+ messageRetractionHandle, null, federateAmbassador);
+ }
+
+ public void reflectAttributeValues(
+ ObjectInstanceHandle objectInstanceHandle,
+ AttributeHandleValueMap attributeValues, byte[] tag, OrderType sentOrderType,
+ TransportationType transportationType, LogicalTime updateTime,
+ OrderType receivedOrderType,
+ MessageRetractionHandle messageRetractionHandle,
+ RegionHandleSet regionHandles)
+ throws ObjectInstanceNotKnown, AttributeNotRecognized,
+ AttributeNotSubscribed, InvalidLogicalTime, FederateInternalError
+ {
+ objectManager.reflectAttributeValues(
+ objectInstanceHandle, attributeValues, tag, sentOrderType,
+ transportationType, updateTime, receivedOrderType,
+ messageRetractionHandle, regionHandles, federateAmbassador);
+ }
+
+ public void receiveInteraction(
+ InteractionClassHandle interactionClassHandle,
+ ParameterHandleValueMap parameterValues, byte[] tag,
+ OrderType sentOrderType, TransportationType transportationType)
+ throws InteractionClassNotRecognized, InteractionParameterNotRecognized,
+ InteractionClassNotSubscribed, FederateInternalError
+ {
+ objectManager.receiveInteraction(
+ interactionClassHandle, parameterValues, tag, sentOrderType,
+ transportationType, null, null, null, null, federateAmbassador);
+ }
+
+ public void receiveInteraction(
+ InteractionClassHandle interactionClassHandle,
+ ParameterHandleValueMap parameterValues, byte[] tag,
+ OrderType sentOrderType, TransportationType transportationType,
+ RegionHandleSet regionHandles)
+ throws InteractionClassNotRecognized, InteractionParameterNotRecognized,
+ InteractionClassNotSubscribed, FederateInternalError
+ {
+ objectManager.receiveInteraction(
+ interactionClassHandle, parameterValues, tag, sentOrderType,
+ transportationType, null, null, null, regionHandles,
+ federateAmbassador);
+ }
+
+ public void receiveInteraction(
+ InteractionClassHandle interactionClassHandle,
+ ParameterHandleValueMap parameterValues, byte[] tag,
+ OrderType sentOrderType, TransportationType transportationType,
+ LogicalTime sentTime, OrderType receivedOrderType)
+ throws InteractionClassNotRecognized, InteractionParameterNotRecognized,
+ InteractionClassNotSubscribed, FederateInternalError
+ {
+ objectManager.receiveInteraction(
+ interactionClassHandle, parameterValues, tag, sentOrderType,
+ transportationType, sentTime, receivedOrderType, null, null,
+ federateAmbassador);
+ }
+
+ public void receiveInteraction(
+ InteractionClassHandle interactionClassHandle,
+ ParameterHandleValueMap parameterValues, byte[] tag,
+ OrderType sentOrderType, TransportationType transportationType,
+ LogicalTime sentTime, OrderType receivedOrderType,
+ RegionHandleSet regionHandles)
+ throws InteractionClassNotRecognized, InteractionParameterNotRecognized,
+ InteractionClassNotSubscribed, FederateInternalError
+ {
+ objectManager.receiveInteraction(
+ interactionClassHandle, parameterValues, tag, sentOrderType,
+ transportationType, sentTime, receivedOrderType, null, regionHandles,
+ federateAmbassador);
+ }
+
+ public void receiveInteraction(
+ InteractionClassHandle interactionClassHandle,
+ ParameterHandleValueMap parameterValues, byte[] tag,
+ OrderType sentOrderType, TransportationType transportationType,
+ LogicalTime sentTime, OrderType receivedOrderType,
+ MessageRetractionHandle messageRetractionHandle)
+ throws InteractionClassNotRecognized, InteractionParameterNotRecognized,
+ InteractionClassNotSubscribed, InvalidLogicalTime,
+ FederateInternalError
+ {
+ objectManager.receiveInteraction(
+ interactionClassHandle, parameterValues, tag, sentOrderType,
+ transportationType, sentTime, receivedOrderType,
+ messageRetractionHandle, null, federateAmbassador);
+ }
+
+ public void receiveInteraction(
+ InteractionClassHandle interactionClassHandle,
+ ParameterHandleValueMap parameterValues, byte[] tag,
+ OrderType sentOrderType, TransportationType transportationType,
+ LogicalTime sentTime, OrderType receivedOrderType,
+ MessageRetractionHandle messageRetractionHandle,
+ RegionHandleSet regionHandles)
+ throws InteractionClassNotRecognized, InteractionParameterNotRecognized,
+ InteractionClassNotSubscribed, InvalidLogicalTime,
+ FederateInternalError
+ {
+ objectManager.receiveInteraction(
+ interactionClassHandle, parameterValues, tag, sentOrderType,
+ transportationType, sentTime, receivedOrderType,
+ messageRetractionHandle, regionHandles, federateAmbassador);
+ }
+
+ public void removeObjectInstance(ObjectInstanceHandle objectInstanceHandle,
+ byte[] tag, OrderType sentOrderType)
+ throws ObjectInstanceNotKnown, FederateInternalError
+ {
+ objectManager.removeObjectInstance(
+ objectInstanceHandle, tag, sentOrderType, null, null, null,
+ federateAmbassador);
+ }
+
+ public void removeObjectInstance(ObjectInstanceHandle objectInstanceHandle,
+ byte[] tag, OrderType sentOrderType,
+ LogicalTime deleteTime,
+ OrderType receivedOrderType)
+ throws ObjectInstanceNotKnown, FederateInternalError
+ {
+ objectManager.removeObjectInstance(
+ objectInstanceHandle, tag, sentOrderType, deleteTime, receivedOrderType,
+ null, federateAmbassador);
+ }
+
+ public void removeObjectInstance(ObjectInstanceHandle objectInstanceHandle,
+ byte[] tag, OrderType sentOrderType,
+ LogicalTime deleteTime,
+ OrderType receivedOrderType,
+ MessageRetractionHandle messageRetractionHandle)
+ throws ObjectInstanceNotKnown, InvalidLogicalTime, FederateInternalError
+ {
+ objectManager.removeObjectInstance(
+ objectInstanceHandle, tag, sentOrderType, deleteTime, receivedOrderType,
+ messageRetractionHandle, federateAmbassador);
+ }
+
+ public void attributesInScope(ObjectInstanceHandle objectInstanceHandle,
+ AttributeHandleSet attributeHandles)
+ throws ObjectInstanceNotKnown, AttributeNotRecognized,
+ AttributeNotSubscribed, FederateInternalError
+ {
+ federateAmbassador.attributesInScope(
+ objectInstanceHandle, attributeHandles);
+ }
+
+ public void attributesOutOfScope(ObjectInstanceHandle objectInstanceHandle,
+ AttributeHandleSet attributeHandles)
+ throws ObjectInstanceNotKnown, AttributeNotRecognized,
+ AttributeNotSubscribed, FederateInternalError
+ {
+ federateAmbassador.attributesOutOfScope(
+ objectInstanceHandle, attributeHandles);
+ }
+
+ public void provideAttributeValueUpdate(
+ ObjectInstanceHandle objectInstanceHandle,
+ AttributeHandleSet attributeHandles, byte[] tag)
+ throws ObjectInstanceNotKnown, AttributeNotRecognized, AttributeNotOwned,
+ FederateInternalError
+ {
+ federateAmbassador.provideAttributeValueUpdate(
+ objectInstanceHandle, attributeHandles, tag);
+ }
+
+ public void turnUpdatesOnForObjectInstance(
+ ObjectInstanceHandle objectInstanceHandle,
+ AttributeHandleSet attributeHandles)
+ throws ObjectInstanceNotKnown, AttributeNotRecognized, AttributeNotOwned,
+ FederateInternalError
+ {
+ federateAmbassador.turnUpdatesOnForObjectInstance(
+ objectInstanceHandle, attributeHandles);
+ }
+
+ public void turnUpdatesOffForObjectInstance(
+ ObjectInstanceHandle objectInstanceHandle,
+ AttributeHandleSet attributeHandles)
+ throws ObjectInstanceNotKnown, AttributeNotRecognized, AttributeNotOwned,
+ FederateInternalError
+ {
+ federateAmbassador.turnUpdatesOffForObjectInstance(
+ objectInstanceHandle, attributeHandles);
+ }
+
+ public void requestAttributeOwnershipAssumption(
+ ObjectInstanceHandle objectInstanceHandle,
+ AttributeHandleSet attributeHandles, byte[] tag)
+ throws ObjectIn...
[truncated message content] |