[ohla-devel] SF.net SVN: ohla: [83] trunk
Status: Beta
Brought to you by:
mnewcomb
Menu
▾
▴
[ohla-devel] SF.net SVN: ohla: [83] trunk
|
From: <mne...@us...> - 2006-12-21 19:25:58
|
Revision: 83
http://svn.sourceforge.net/ohla/?rev=83&view=rev
Author: mnewcomb
Date: 2006-12-21 11:25:58 -0800 (Thu, 21 Dec 2006)
Log Message:
-----------
roll back again, changing course
Modified Paths:
--------------
trunk/build/intellij/OHLA.iws
trunk/rti/src/java/net/sf/ohla/rti1516/federation/FederationExecution.java
Added Paths:
-----------
trunk/rti/src/java/net/sf/ohla/rti1516/federation/ownership/
trunk/rti/src/java/net/sf/ohla/rti1516/federation/ownership/AttributeInstanceOwnership.java
trunk/rti/src/java/net/sf/ohla/rti1516/federation/ownership/ObjectInstanceOwnership.java
trunk/rti/src/java/net/sf/ohla/rti1516/federation/ownership/OwnershipManager.java
Removed Paths:
-------------
trunk/rti/src/java/net/sf/ohla/rti1516/federation/objects/
trunk/rti/src/java/net/sf/ohla/rti1516/federation/ownership/AttributeInstanceOwnership.java
trunk/rti/src/java/net/sf/ohla/rti1516/federation/ownership/ObjectInstanceOwnership.java
trunk/rti/src/java/net/sf/ohla/rti1516/federation/ownership/OwnershipManager.java
Modified: trunk/build/intellij/OHLA.iws
===================================================================
--- trunk/build/intellij/OHLA.iws 2006-12-21 19:19:58 UTC (rev 82)
+++ trunk/build/intellij/OHLA.iws 2006-12-21 19:25:58 UTC (rev 83)
@@ -85,21 +85,6 @@
<disable_hints />
</component>
<component name="DebuggerManager">
- <line_breakpoints>
- <breakpoint url="file://$PROJECT_DIR$/../../rti/src/java/net/sf/ohla/rti1516/federate/objects/ObjectInstance.java" line="163" class="net.sf.ohla.rti1516.federate.objects.ObjectInstance" package="net.sf.ohla.rti1516.federate.objects">
- <option name="ENABLED" value="true" />
- <option name="SUSPEND_POLICY" value="SuspendAll" />
- <option name="LOG_ENABLED" value="false" />
- <option name="LOG_EXPRESSION_ENABLED" value="false" />
- <option name="COUNT_FILTER_ENABLED" value="false" />
- <option name="COUNT_FILTER" value="0" />
- <option name="CONDITION_ENABLED" value="false" />
- <option name="CLASS_FILTERS_ENABLED" value="false" />
- <option name="INSTANCE_FILTERS_ENABLED" value="false" />
- <option name="CONDITION" value="" />
- <option name="LOG_MESSAGE" value="" />
- </breakpoint>
- </line_breakpoints>
<breakpoint_any>
<breakpoint>
<option name="NOTIFY_CAUGHT" value="true" />
@@ -183,7 +168,58 @@
<option name="myCurrentFavoritesList" value="OHLA" />
</component>
<component name="FileEditorManager">
- <leaf />
+ <leaf>
+ <file leaf-file-name="FederationExecution.java" pinned="false" current="false" current-in-tab="false">
+ <entry file="file://$PROJECT_DIR$/../../rti/src/java/net/sf/ohla/rti1516/federation/FederationExecution.java">
+ <provider selected="true" editor-type-id="text-editor">
+ <state line="403" column="0" selection-start="14488" selection-end="14488" vertical-scroll-proportion="0.021197008">
+ <folding />
+ </state>
+ </provider>
+ </entry>
+ </file>
+ <file leaf-file-name="ObjectInstance.java" pinned="false" current="false" current-in-tab="false">
+ <entry file="file://$PROJECT_DIR$/../../rti/src/java/net/sf/ohla/rti1516/federation/objects/ObjectInstance.java">
+ <provider selected="true" editor-type-id="text-editor">
+ <state line="47" column="13" selection-start="1932" selection-end="1932" vertical-scroll-proportion="0.021197008">
+ <folding>
+ <element signature="imports" expanded="true" />
+ <marker date="1166728743453" expanded="true" signature="13916:13936" placeholder="{...}" />
+ </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/federation/objects/ObjectManager.java">
+ <provider selected="true" editor-type-id="text-editor">
+ <state line="74" column="14" selection-start="2434" selection-end="2434" vertical-scroll-proportion="0.70746636">
+ <folding>
+ <marker date="1166728740359" expanded="true" signature="2068:2178" placeholder="{...}" />
+ </folding>
+ </state>
+ </provider>
+ </entry>
+ </file>
+ <file leaf-file-name="AttributeInstance.java" pinned="false" current="true" current-in-tab="true">
+ <entry file="file://$PROJECT_DIR$/../../rti/src/java/net/sf/ohla/rti1516/federation/objects/AttributeInstance.java">
+ <provider selected="true" editor-type-id="text-editor">
+ <state line="18" column="0" selection-start="655" selection-end="655" vertical-scroll-proportion="0.08323134">
+ <folding />
+ </state>
+ </provider>
+ </entry>
+ </file>
+ <file leaf-file-name="AttributeInstance.java" pinned="false" current="false" current-in-tab="false">
+ <entry file="file://$PROJECT_DIR$/../../rti/src/java/net/sf/ohla/rti1516/federate/objects/AttributeInstance.java">
+ <provider selected="true" editor-type-id="text-editor">
+ <state line="30" column="13" selection-start="1035" selection-end="1035" vertical-scroll-proportion="0.124847">
+ <folding />
+ </state>
+ </provider>
+ </entry>
+ </file>
+ </leaf>
</component>
<component name="FindManager">
<FindUsagesManager>
@@ -308,7 +344,7 @@
<option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewProjectNode" />
</PATH_ELEMENT>
<PATH_ELEMENT>
- <option name="myItemId" value="OHLA" />
+ <option name="myItemId" value="RTI" />
<option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewModuleNode" />
</PATH_ELEMENT>
</PATH>
@@ -318,13 +354,29 @@
<option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewProjectNode" />
</PATH_ELEMENT>
<PATH_ELEMENT>
- <option name="myItemId" value="OHLA" />
+ <option name="myItemId" value="RTI" />
<option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewModuleNode" />
</PATH_ELEMENT>
<PATH_ELEMENT>
- <option name="myItemId" value="PsiDirectory:D:\projects\ohla-0.4" />
+ <option name="myItemId" value="PsiDirectory:D:\projects\ohla-0.4-latest\rti" />
<option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
</PATH_ELEMENT>
+ <PATH_ELEMENT>
+ <option name="myItemId" value="PsiDirectory:D:\projects\ohla-0.4-latest\rti\src" />
+ <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
+ </PATH_ELEMENT>
+ <PATH_ELEMENT>
+ <option name="myItemId" value="PsiDirectory:D:\projects\ohla-0.4-latest\rti\src\java" />
+ <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
+ </PATH_ELEMENT>
+ <PATH_ELEMENT>
+ <option name="myItemId" value="PsiDirectory:D:\projects\ohla-0.4-latest\rti\src\java\net\sf\ohla" />
+ <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
+ </PATH_ELEMENT>
+ <PATH_ELEMENT>
+ <option name="myItemId" value="PsiDirectory:D:\projects\ohla-0.4-latest\rti\src\java\net\sf\ohla\rti1516" />
+ <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
+ </PATH_ELEMENT>
</PATH>
<PATH>
<PATH_ELEMENT>
@@ -332,17 +384,33 @@
<option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewProjectNode" />
</PATH_ELEMENT>
<PATH_ELEMENT>
- <option name="myItemId" value="OHLA" />
+ <option name="myItemId" value="RTI" />
<option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewModuleNode" />
</PATH_ELEMENT>
<PATH_ELEMENT>
- <option name="myItemId" value="PsiDirectory:D:\projects\ohla-0.4" />
+ <option name="myItemId" value="PsiDirectory:D:\projects\ohla-0.4-latest\rti" />
<option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
</PATH_ELEMENT>
<PATH_ELEMENT>
- <option name="myItemId" value="PsiDirectory:D:\projects\ohla-0.4\build" />
+ <option name="myItemId" value="PsiDirectory:D:\projects\ohla-0.4-latest\rti\src" />
<option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
</PATH_ELEMENT>
+ <PATH_ELEMENT>
+ <option name="myItemId" value="PsiDirectory:D:\projects\ohla-0.4-latest\rti\src\java" />
+ <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
+ </PATH_ELEMENT>
+ <PATH_ELEMENT>
+ <option name="myItemId" value="PsiDirectory:D:\projects\ohla-0.4-latest\rti\src\java\net\sf\ohla" />
+ <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
+ </PATH_ELEMENT>
+ <PATH_ELEMENT>
+ <option name="myItemId" value="PsiDirectory:D:\projects\ohla-0.4-latest\rti\src\java\net\sf\ohla\rti1516" />
+ <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
+ </PATH_ELEMENT>
+ <PATH_ELEMENT>
+ <option name="myItemId" value="PsiDirectory:D:\projects\ohla-0.4-latest\rti\src\java\net\sf\ohla\rti1516\federation" />
+ <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
+ </PATH_ELEMENT>
</PATH>
<PATH>
<PATH_ELEMENT>
@@ -350,22 +418,158 @@
<option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewProjectNode" />
</PATH_ELEMENT>
<PATH_ELEMENT>
- <option name="myItemId" value="OHLA" />
+ <option name="myItemId" value="RTI" />
<option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewModuleNode" />
</PATH_ELEMENT>
<PATH_ELEMENT>
- <option name="myItemId" value="PsiDirectory:D:\projects\ohla-0.4" />
+ <option name="myItemId" value="PsiDirectory:D:\projects\ohla-0.4-latest\rti" />
<option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
</PATH_ELEMENT>
<PATH_ELEMENT>
- <option name="myItemId" value="PsiDirectory:D:\projects\ohla-0.4\build" />
+ <option name="myItemId" value="PsiDirectory:D:\projects\ohla-0.4-latest\rti\src" />
<option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
</PATH_ELEMENT>
<PATH_ELEMENT>
- <option name="myItemId" value="PsiDirectory:D:\projects\ohla-0.4\build\intellij" />
+ <option name="myItemId" value="PsiDirectory:D:\projects\ohla-0.4-latest\rti\src\java" />
<option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
</PATH_ELEMENT>
+ <PATH_ELEMENT>
+ <option name="myItemId" value="PsiDirectory:D:\projects\ohla-0.4-latest\rti\src\java\net\sf\ohla" />
+ <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
+ </PATH_ELEMENT>
+ <PATH_ELEMENT>
+ <option name="myItemId" value="PsiDirectory:D:\projects\ohla-0.4-latest\rti\src\java\net\sf\ohla\rti1516" />
+ <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
+ </PATH_ELEMENT>
+ <PATH_ELEMENT>
+ <option name="myItemId" value="PsiDirectory:D:\projects\ohla-0.4-latest\rti\src\java\net\sf\ohla\rti1516\federation" />
+ <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
+ </PATH_ELEMENT>
+ <PATH_ELEMENT>
+ <option name="myItemId" value="PsiDirectory:D:\projects\ohla-0.4-latest\rti\src\java\net\sf\ohla\rti1516\federation\objects" />
+ <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
+ </PATH_ELEMENT>
</PATH>
+ <PATH>
+ <PATH_ELEMENT>
+ <option name="myItemId" value="OHLA.ipr" />
+ <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewProjectNode" />
+ </PATH_ELEMENT>
+ <PATH_ELEMENT>
+ <option name="myItemId" value="RTI" />
+ <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewModuleNode" />
+ </PATH_ELEMENT>
+ <PATH_ELEMENT>
+ <option name="myItemId" value="PsiDirectory:D:\projects\ohla-0.4-latest\rti" />
+ <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
+ </PATH_ELEMENT>
+ <PATH_ELEMENT>
+ <option name="myItemId" value="PsiDirectory:D:\projects\ohla-0.4-latest\rti\src" />
+ <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
+ </PATH_ELEMENT>
+ <PATH_ELEMENT>
+ <option name="myItemId" value="PsiDirectory:D:\projects\ohla-0.4-latest\rti\src\java" />
+ <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
+ </PATH_ELEMENT>
+ <PATH_ELEMENT>
+ <option name="myItemId" value="PsiDirectory:D:\projects\ohla-0.4-latest\rti\src\java\net\sf\ohla" />
+ <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
+ </PATH_ELEMENT>
+ <PATH_ELEMENT>
+ <option name="myItemId" value="PsiDirectory:D:\projects\ohla-0.4-latest\rti\src\java\net\sf\ohla\rti1516" />
+ <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
+ </PATH_ELEMENT>
+ <PATH_ELEMENT>
+ <option name="myItemId" value="PsiDirectory:D:\projects\ohla-0.4-latest\rti\src\java\net\sf\ohla\rti1516\federate" />
+ <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
+ </PATH_ELEMENT>
+ </PATH>
+ <PATH>
+ <PATH_ELEMENT>
+ <option name="myItemId" value="OHLA.ipr" />
+ <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewProjectNode" />
+ </PATH_ELEMENT>
+ <PATH_ELEMENT>
+ <option name="myItemId" value="RTI" />
+ <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewModuleNode" />
+ </PATH_ELEMENT>
+ <PATH_ELEMENT>
+ <option name="myItemId" value="PsiDirectory:D:\projects\ohla-0.4-latest\rti" />
+ <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
+ </PATH_ELEMENT>
+ <PATH_ELEMENT>
+ <option name="myItemId" value="PsiDirectory:D:\projects\ohla-0.4-latest\rti\src" />
+ <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
+ </PATH_ELEMENT>
+ <PATH_ELEMENT>
+ <option name="myItemId" value="PsiDirectory:D:\projects\ohla-0.4-latest\rti\src\java" />
+ <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
+ </PATH_ELEMENT>
+ <PATH_ELEMENT>
+ <option name="myItemId" value="PsiDirectory:D:\projects\ohla-0.4-latest\rti\src\java\net\sf\ohla" />
+ <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
+ </PATH_ELEMENT>
+ <PATH_ELEMENT>
+ <option name="myItemId" value="PsiDirectory:D:\projects\ohla-0.4-latest\rti\src\java\net\sf\ohla\rti1516" />
+ <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
+ </PATH_ELEMENT>
+ <PATH_ELEMENT>
+ <option name="myItemId" value="PsiDirectory:D:\projects\ohla-0.4-latest\rti\src\java\net\sf\ohla\rti1516\federate" />
+ <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-latest\rti\src\java\net\sf\ohla\rti1516\federate\objects" />
+ <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
+ </PATH_ELEMENT>
+ </PATH>
+ <PATH>
+ <PATH_ELEMENT>
+ <option name="myItemId" value="OHLA.ipr" />
+ <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewProjectNode" />
+ </PATH_ELEMENT>
+ <PATH_ELEMENT>
+ <option name="myItemId" value="RTI" />
+ <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewModuleNode" />
+ </PATH_ELEMENT>
+ <PATH_ELEMENT>
+ <option name="myItemId" value="PsiDirectory:D:\projects\ohla-0.4-latest\rti" />
+ <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
+ </PATH_ELEMENT>
+ <PATH_ELEMENT>
+ <option name="myItemId" value="PsiDirectory:D:\projects\ohla-0.4-latest\rti\src" />
+ <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
+ </PATH_ELEMENT>
+ <PATH_ELEMENT>
+ <option name="myItemId" value="PsiDirectory:D:\projects\ohla-0.4-latest\rti\src\java" />
+ <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
+ </PATH_ELEMENT>
+ <PATH_ELEMENT>
+ <option name="myItemId" value="PsiDirectory:D:\projects\ohla-0.4-latest\rti\src\java\net\sf\ohla" />
+ <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
+ </PATH_ELEMENT>
+ </PATH>
+ <PATH>
+ <PATH_ELEMENT>
+ <option name="myItemId" value="OHLA.ipr" />
+ <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewProjectNode" />
+ </PATH_ELEMENT>
+ <PATH_ELEMENT>
+ <option name="myItemId" value="RTI" />
+ <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewModuleNode" />
+ </PATH_ELEMENT>
+ <PATH_ELEMENT>
+ <option name="myItemId" value="PsiDirectory:D:\projects\ohla-0.4-latest\rti" />
+ <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
+ </PATH_ELEMENT>
+ <PATH_ELEMENT>
+ <option name="myItemId" value="PsiDirectory:D:\projects\ohla-0.4-latest\rti\src" />
+ <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
+ </PATH_ELEMENT>
+ <PATH_ELEMENT>
+ <option name="myItemId" value="PsiDirectory:D:\projects\ohla-0.4-latest\rti\src\java" />
+ <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
+ </PATH_ELEMENT>
+ </PATH>
</component>
<component name="ProjectReloadState">
<option name="STATE" value="0" />
@@ -378,7 +582,7 @@
<showLibraryContents />
<hideEmptyPackages ProjectPane="true" />
<abbreviatePackageNames />
- <showStructure PackagesPane="false" Favorites="false" ProjectPane="false" Scope="false" />
+ <showStructure PackagesPane="false" ProjectPane="false" Favorites="false" Scope="false" />
<autoscrollToSource />
<autoscrollFromSource />
<sortByType />
@@ -397,8 +601,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" />
@@ -407,8 +611,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" />
@@ -425,17 +629,12 @@
<component name="RestoreUpdateTree" />
<component name="RunManager">
<activeType name="Application" />
- <configuration selected="false" default="true" type="Applet" factoryName="Applet">
- <module name="" />
- <option name="MAIN_CLASS_NAME" />
- <option name="HTML_FILE_NAME" />
- <option name="HTML_USED" value="false" />
- <option name="WIDTH" value="400" />
- <option name="HEIGHT" value="300" />
- <option name="POLICY_FILE" value="$APPLICATION_HOME_DIR$/bin/appletviewer.policy" />
- <option name="VM_PARAMETERS" />
- <option name="ALTERNATIVE_JRE_PATH_ENABLED" value="false" />
- <option name="ALTERNATIVE_JRE_PATH" />
+ <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="JUnit" factoryName="JUnit">
<module name="" />
@@ -453,6 +652,18 @@
<value defaultName="wholeProject" />
</option>
</configuration>
+ <configuration selected="false" default="true" type="Applet" factoryName="Applet">
+ <module name="" />
+ <option name="MAIN_CLASS_NAME" />
+ <option name="HTML_FILE_NAME" />
+ <option name="HTML_USED" value="false" />
+ <option name="WIDTH" value="400" />
+ <option name="HEIGHT" value="300" />
+ <option name="POLICY_FILE" value="$APPLICATION_HOME_DIR$/bin/appletviewer.policy" />
+ <option name="VM_PARAMETERS" />
+ <option name="ALTERNATIVE_JRE_PATH_ENABLED" value="false" />
+ <option name="ALTERNATIVE_JRE_PATH" />
+ </configuration>
<configuration selected="false" default="true" type="TestNG" factoryName="TestNG">
<module name="" />
<option name="ALTERNATIVE_JRE_PATH_ENABLED" value="false" />
@@ -473,13 +684,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="Application" factoryName="Application">
<option name="MAIN_CLASS_NAME" />
<option name="VM_PARAMETERS" />
@@ -508,14 +712,14 @@
</option>
<option name="PROPERTIES_FILE" value="" />
<properties />
- <RunnerSettings RunnerId="Run" />
<RunnerSettings RunnerId="Debug">
<option name="DEBUG_PORT" value="2019" />
<option name="TRANSPORT" value="0" />
<option name="LOCAL" value="true" />
</RunnerSettings>
+ <RunnerSettings RunnerId="Run" />
+ <ConfigurationWrapper RunnerId="Debug" />
<ConfigurationWrapper RunnerId="Run" />
- <ConfigurationWrapper RunnerId="Debug" />
</configuration>
<configuration selected="true" default="false" name="HLA 1.3 Testsuite" type="TestNG" factoryName="TestNG">
<module name="RTI" />
@@ -545,14 +749,14 @@
<option name="ALTERNATIVE_JRE_PATH_ENABLED" value="false" />
<option name="ALTERNATIVE_JRE_PATH" value="" />
<module name="RTI" />
- <RunnerSettings RunnerId="Run" />
<RunnerSettings RunnerId="Debug">
<option name="DEBUG_PORT" value="2738" />
<option name="TRANSPORT" value="0" />
<option name="LOCAL" value="true" />
</RunnerSettings>
+ <RunnerSettings RunnerId="Run" />
+ <ConfigurationWrapper RunnerId="Debug" />
<ConfigurationWrapper RunnerId="Run" />
- <ConfigurationWrapper RunnerId="Debug" />
</configuration>
</component>
<component name="ScopeViewComponent">
@@ -624,12 +828,12 @@
</todo-panel>
</component>
<component name="ToolWindowManager">
- <frame x="-9" y="-2" width="1288" height="998" extended-state="0" />
- <editor active="false" />
+ <frame x="-4" y="-4" width="1288" height="998" extended-state="6" />
+ <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.21278317" order="0" />
+ <window_info id="Project" active="false" anchor="left" auto_hide="false" internal_type="docked" type="docked" visible="true" weight="0.3802589" 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" />
@@ -639,7 +843,7 @@
<window_info id="Dependency Viewer" active="false" anchor="bottom" auto_hide="false" internal_type="docked" type="docked" visible="false" weight="0.32988507" order="8" />
<window_info id="Metrics" active="false" anchor="bottom" auto_hide="false" internal_type="docked" type="docked" visible="false" weight="0.33" order="8" />
<window_info id="Favorites" active="false" anchor="right" auto_hide="false" internal_type="docked" type="docked" visible="false" weight="0.32928804" order="3" />
- <window_info id="Ant Build" active="false" anchor="right" auto_hide="false" internal_type="docked" type="docked" visible="true" weight="0.1553398" order="1" />
+ <window_info id="Ant Build" active="false" anchor="right" auto_hide="false" internal_type="docked" type="docked" visible="false" weight="0.1553398" order="1" />
<window_info id="Run" active="false" anchor="bottom" auto_hide="false" internal_type="docked" type="docked" visible="false" weight="0.27816093" order="2" />
<window_info id="Hierarchy" active="false" anchor="right" auto_hide="false" internal_type="docked" type="docked" visible="false" weight="0.25" order="2" />
<window_info id="File View" active="false" anchor="right" auto_hide="false" internal_type="docked" type="docked" visible="false" weight="0.33" order="3" />
@@ -682,7 +886,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="renamed some variables" />
+ <option name="LAST_COMMIT_MESSAGE" value="more refactoring in preparation of moving to centralized RTI" />
<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" />
@@ -696,7 +900,6 @@
<option name="UPDATE_GROUP_BY_PACKAGES" value="false" />
<option name="SHOW_FILE_HISTORY_AS_TREE" value="false" />
<option name="FILE_HISTORY_SPLITTER_PROPORTION" value="0.6" />
- <MESSAGE value="fixed incorrect compareTo methods and added @Override tags" />
<MESSAGE value="added target to create javadocs" />
<MESSAGE value="spec says that if no synchronization set is supplied OR it is empty, than all joined federates are part of the synchronization set" />
<MESSAGE value="adding documentation" />
@@ -705,6 +908,8 @@
<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" />
+ <MESSAGE value="refactoring in preparation of moving to centralized RTI" />
+ <MESSAGE value="more refactoring in preparation of moving to centralized RTI" />
</component>
<component name="VssConfiguration">
<option name="CLIENT_PATH" value="" />
@@ -785,111 +990,116 @@
<option name="myLastEditedConfigurable" />
</component>
<component name="editorHistoryManager">
- <entry file="file://$PROJECT_DIR$/../../rti/src/java/net/sf/ohla/rti1516/messages/FederateSaveInitiated.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="32" column="34" selection-start="955" selection-end="955" vertical-scroll-proportion="0.51224107">
+ <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$/../../rti/src/java/net/sf/ohla/rti1516/federate/filter/InterestManagementFilter.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="243" column="37" selection-start="8806" selection-end="8806" vertical-scroll-proportion="0.56092435">
+ <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$/../../rti/src/java/net/sf/ohla/rti1516/federate/callbacks/ReflectAttributeValues.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="48" column="15" selection-start="1750" selection-end="1750" vertical-scroll-proportion="0.5988258">
+ <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$/../../ieee-1516/src/java/hla/rti1516/jlc/NullFederateAmbassador.java">
+ <entry file="file://$PROJECT_DIR$/../../rti/src/java/net/sf/ohla/rti1516/federate/SubscriptionManager.java">
<provider selected="true" editor-type-id="text-editor">
- <state line="76" column="0" selection-start="2635" selection-end="2635" vertical-scroll-proportion="0.33291772">
+ <state line="230" column="21" selection-start="7508" selection-end="7508" vertical-scroll-proportion="0.21867007">
<folding />
</state>
</provider>
</entry>
- <entry file="file://$PROJECT_DIR$/../../ieee-1516/src/java/hla/rti1516/FederateAmbassador.java">
- <provider selected="true" editor-type-id="text-editor">
- <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/Federate.java">
<provider selected="true" editor-type-id="text-editor">
- <state line="498" column="42" selection-start="20308" selection-end="20308" vertical-scroll-proportion="0.3414322">
+ <state line="242" column="13" selection-start="11390" selection-end="11390" vertical-scroll-proportion="0.33333334">
<folding>
<element signature="imports" expanded="true" />
</folding>
</state>
</provider>
</entry>
- <entry file="file://$PROJECT_DIR$/../../hla-1.3/src/java/hla/rti/ReflectedAttributes.java">
+ <entry file="file://$PROJECT_DIR$/../../rti/src/java/net/sf/ohla/rti1516/fdd/FDD.java">
<provider selected="true" editor-type-id="text-editor">
- <state line="2" column="17" selection-start="35" selection-end="35" vertical-scroll-proportion="0.042659976">
+ <state line="679" column="49" selection-start="19954" selection-end="19954" vertical-scroll-proportion="0.10922787">
<folding />
</state>
</provider>
</entry>
- <entry file="file://$PROJECT_DIR$/../../hla-1.3/src/java/hla/rti/RTIambassador.java">
+ <entry file="file://$PROJECT_DIR$/../../rti/src/java/net/sf/ohla/rti1516/fdd/Attribute.java">
<provider selected="true" editor-type-id="text-editor">
- <state line="42" column="0" selection-start="1835" selection-end="1835" vertical-scroll-proportion="0.3412798">
+ <state line="37" column="37" selection-start="1109" selection-end="1109" vertical-scroll-proportion="-0.2881356">
<folding />
</state>
</provider>
</entry>
- <entry file="file://$PROJECT_DIR$/../../rti/src/java/net/sf/ohla/rti/OHLARTIambassador.java">
+ <entry file="file://$PROJECT_DIR$/../../rti/src/java/net/sf/ohla/rti1516/fdd/ObjectClass.java">
<provider selected="true" editor-type-id="text-editor">
- <state line="341" column="12" selection-start="11764" selection-end="11764" vertical-scroll-proportion="0.9066496">
+ <state line="36" column="13" selection-start="1089" selection-end="1089" vertical-scroll-proportion="-2.5932202">
<folding />
</state>
</provider>
</entry>
- <entry file="file://$PROJECT_DIR$/../../hla-1.3/src/java/hla/rti/FederateAmbassador.java">
+ <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="61" column="45" selection-start="1973" selection-end="1973" vertical-scroll-proportion="0.2685069">
+ <state line="76" column="0" selection-start="3199" selection-end="3199" vertical-scroll-proportion="-1.60454">
<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/objects/ObjectManager.java">
<provider selected="true" editor-type-id="text-editor">
- <state line="295" column="12" selection-start="10776" selection-end="10776" vertical-scroll-proportion="0.3412798">
- <folding />
+ <state line="0" column="0" selection-start="0" selection-end="0" vertical-scroll-proportion="-1.3990026">
+ <folding>
+ <element signature="imports" expanded="true" />
+ </folding>
</state>
</provider>
</entry>
- <entry file="file://$PROJECT_DIR$/../../rti/src/java/net/sf/ohla/rti1516/federate/FederateSave.java">
+ <entry file="file://$PROJECT_DIR$/../../rti/src/java/net/sf/ohla/rti1516/federation/FederationExecution.java">
<provider selected="true" editor-type-id="text-editor">
- <state line="48" column="3" selection-start="1321" selection-end="1321" vertical-scroll-proportion="0.45294857">
+ <state line="403" column="0" selection-start="14488" selection-end="14488" vertical-scroll-proportion="0.021197008">
<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/federation/objects/ObjectInstance.java">
<provider selected="true" editor-type-id="text-editor">
- <state line="966" column="14" selection-start="28910" selection-end="28910" vertical-scroll-proportion="0.58056265">
+ <state line="47" column="13" selection-start="1932" selection-end="1932" vertical-scroll-proportion="0.021197008">
<folding>
<element signature="imports" expanded="true" />
+ <marker date="1166728743453" expanded="true" signature="13916:13936" placeholder="{...}" />
</folding>
</state>
</provider>
</entry>
- <entry file="file://$PROJECT_DIR$/../../rti/src/java/net/sf/ohla/rti1516/federate/objects/ObjectInstance.java">
+ <entry file="file://$PROJECT_DIR$/../../rti/src/java/net/sf/ohla/rti1516/federation/objects/ObjectManager.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">
+ <state line="74" column="14" selection-start="2434" selection-end="2434" vertical-scroll-proportion="0.70746636">
+ <folding>
+ <marker date="1166728740359" expanded="true" signature="2068:2178" placeholder="{...}" />
+ </folding>
+ </state>
+ </provider>
+ </entry>
+ <entry file="file://$PROJECT_DIR$/../../rti/src/java/net/sf/ohla/rti1516/federate/objects/AttributeInstance.java">
+ <provider selected="true" editor-type-id="text-editor">
+ <state line="30" column="13" selection-start="1035" selection-end="1035" vertical-scroll-proportion="0.124847">
<folding />
</state>
</provider>
</entry>
- <entry file="file://$PROJECT_DIR$/../../rti/src/java/net/sf/ohla/rti1516/federate/SubscriptionManager.java">
+ <entry file="file://$PROJECT_DIR$/../../rti/src/java/net/sf/ohla/rti1516/federation/objects/AttributeInstance.java">
<provider selected="true" editor-type-id="text-editor">
- <state line="230" column="21" selection-start="7508" selection-end="7508" vertical-scroll-proportion="0.21867007">
+ <state line="18" column="0" selection-start="655" selection-end="655" vertical-scroll-proportion="0.08323134">
<folding />
</state>
</provider>
Modified: trunk/rti/src/java/net/sf/ohla/rti1516/federation/FederationExecution.java
===================================================================
--- trunk/rti/src/java/net/sf/ohla/rti1516/federation/FederationExecution.java 2006-12-21 19:19:58 UTC (rev 82)
+++ trunk/rti/src/java/net/sf/ohla/rti1516/federation/FederationExecution.java 2006-12-21 19:25:58 UTC (rev 83)
@@ -35,7 +35,7 @@
import net.sf.ohla.rti1516.federate.callbacks.FederationSynchronized;
import net.sf.ohla.rti1516.federate.callbacks.InitiateFederateSave;
import net.sf.ohla.rti1516.federate.callbacks.RemoveObjectInstance;
-import net.sf.ohla.rti1516.federation.objects.ObjectManager;
+import net.sf.ohla.rti1516.federation.ownership.OwnershipManager;
import net.sf.ohla.rti1516.federation.time.TimeKeeper;
import net.sf.ohla.rti1516.messages.AttributeOwnershipAcquisition;
import net.sf.ohla.rti1516.messages.AttributeOwnershipAcquisitionIfAvailable;
@@ -140,7 +140,7 @@
protected Map<RegionHandle, Map<DimensionHandle, RangeBounds>> regions =
new HashMap<RegionHandle, Map<DimensionHandle, RangeBounds>>();
- protected ObjectManager objectManager = new ObjectManager(this);
+ protected OwnershipManager ownershipManager = new OwnershipManager(this);
protected TimeKeeper timeKeeper;
@@ -401,7 +401,7 @@
session.write(new RequestResponse(
registerObjectInstance.getId(), objectInstanceRegistered));
- objectManager.registerObjectInstance(
+ ownershipManager.registerObjectInstance(
objectInstanceHandle, objectClass,
registerObjectInstance.getPublishedAttributeHandles(),
getFederateHandle(session));
@@ -530,7 +530,7 @@
subscribeObjectClassAttributes.getObjectClassHandle());
assert objectClass != null;
- objectManager.subscribeObjectClassAttributes(
+ ownershipManager.subscribeObjectClassAttributes(
objectClass, subscribeObjectClassAttributes.getAttributeHandles(),
subscribeObjectClassAttributes.getAttributesAndRegions(), session);
}
@@ -1060,7 +1060,7 @@
federationExecutionStateLock.readLock().lock();
try
{
- objectManager.unconditionalAttributeOwnershipDivestiture(
+ ownershipManager.unconditionalAttributeOwnershipDivestiture(
unconditionalAttributeOwnershipDivestiture.getObjectInstanceHandle(),
unconditionalAttributeOwnershipDivestiture.getAttributeHandles());
}
@@ -1077,7 +1077,7 @@
federationExecutionStateLock.readLock().lock();
try
{
- objectManager.negotiatedAttributeOwnershipDivestiture(
+ ownershipManager.negotiatedAttributeOwnershipDivestiture(
negotiatedAttributeOwnershipDivestiture.getObjectInstanceHandle(),
negotiatedAttributeOwnershipDivestiture.getAttributeHandles(),
negotiatedAttributeOwnershipDivestiture.getTag(), session);
@@ -1094,7 +1094,7 @@
federationExecutionStateLock.readLock().lock();
try
{
- objectManager.confirmDivestiture(
+ ownershipManager.confirmDivestiture(
confirmDivestiture.getObjectInstanceHandle(),
confirmDivestiture.getAttributeHandles());
}
@@ -1111,7 +1111,7 @@
federationExecutionStateLock.readLock().lock();
try
{
- objectManager.attributeOwnershipAcquisition(
+ ownershipManager.attributeOwnershipAcquisition(
attributeOwnershipAcquisition.getObjectInstanceHandle(),
attributeOwnershipAcquisition.getAttributeHandles(),
attributeOwnershipAcquisition.getTag(), getFederateHandle(session),
@@ -1130,7 +1130,7 @@
federationExecutionStateLock.readLock().lock();
try
{
- objectManager.attributeOwnershipAcquisitionIfAvailable(
+ ownershipManager.attributeOwnershipAcquisitionIfAvailable(
attributeOwnershipAcquisitionIfAvailable.getObjectInstanceHandle(),
attributeOwnershipAcquisitionIfAvailable.getAttributeHandles(),
getFederateHandle(session), session);
@@ -1149,7 +1149,7 @@
try
{
Map<AttributeHandle, FederateHandle> newOwners =
- objectManager.attributeOwnershipDivestitureIfWanted(
+ ownershipManager.attributeOwnershipDivestitureIfWanted(
attributeOwnershipDivestitureIfWanted.getObjectInstanceHandle(),
attributeOwnershipDivestitureIfWanted.getAttributeHandles());
@@ -1235,7 +1235,7 @@
federationExecutionStateLock.readLock().lock();
try
{
- objectManager.cancelNegotiatedAttributeOwnershipDivestiture(
+ ownershipManager.cancelNegotiatedAttributeOwnershipDivestiture(
cancelNegotiatedAttributeOwnershipDivestiture.getObjectInstanceHandle(),
cancelNegotiatedAttributeOwnershipDivestiture.getAttributeHandles(),
getFederateHandle(session));
@@ -1253,7 +1253,7 @@
federationExecutionStateLock.readLock().lock();
try
{
- objectManager.cancelAttributeOwnershipAcquisition(
+ ownershipManager.cancelAttributeOwnershipAcquisition(
cancelAttributeOwnershipAcquisition.getObjectInstanceHandle(),
cancelAttributeOwnershipAcquisition.getAttributeHandles(),
getFederateHandle(session), session);
@@ -1270,7 +1270,7 @@
federationExecutionStateLock.readLock().lock();
try
{
- objectManager.queryAttributeOwnership(
+ ownershipManager.queryAttributeOwnership(
queryAttributeOwnership.getObjectInstanceHandle(),
queryAttributeOwnership.getAttributeHandle(), session);
}
Copied: trunk/rti/src/java/net/sf/ohla/rti1516/federation/ownership (from rev 79, trunk/rti/src/java/net/sf/ohla/rti1516/federation/ownership)
Deleted: trunk/rti/src/java/net/sf/ohla/rti1516/federation/ownership/AttributeInstanceOwnership.java
===================================================================
--- trunk/rti/src/java/net/sf/ohla/rti1516/federation/ownership/AttributeInstanceOwnership.java 2006-12-16 03:12:41 UTC (rev 79)
+++ trunk/rti/src/java/net/sf/ohla/rti1516/federation/ownership/AttributeInstanceOwnership.java 2006-12-21 19:25:58 UTC (rev 83)
@@ -1,167 +0,0 @@
-/*
- * Copyright (c) 2006, Michael Newcomb
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package net.sf.ohla.rti1516.federation.ownership;
-
-import java.util.Iterator;
-import java.util.LinkedHashSet;
-
-import net.sf.ohla.rti1516.fdd.Attribute;
-
-import hla.rti1516.FederateHandle;
-
-public class AttributeInstanceOwnership
-{
- protected final Attribute attribute;
-
- protected FederateHandle owner;
-
- /**
- * Set if the owner of this attribute is willing to divest ownership.
- */
- protected boolean wantsToDivest;
-
- /**
- * The 'ownership' line. When federates request ownership of this attribute
- * they are placed into a line and given ownership based upon when they
- * entered the line.
- */
- protected LinkedHashSet<FederateHandle> requestingOwnership =
- new LinkedHashSet<FederateHandle>();
-
- public AttributeInstanceOwnership(Attribute attribute)
- {
- this.attribute = attribute;
- }
-
- public Attribute getAttribute()
- {
- return attribute;
- }
-
- public FederateHandle getOwner()
- {
- return owner;
- }
-
- public void setOwner(FederateHandle owner)
- {
- this.owner = owner;
- }
-
- public boolean wantsToDivest()
- {
- return wantsToDivest;
- }
-
- public FederateHandle unconditionalAttributeOwnershipDivestiture()
- {
- owner = null;
- wantsToDivest = false;
-
- // give ownership to the next in line
- //
- if (!requestingOwnership.isEmpty())
- {
- Iterator<FederateHandle> i = requestingOwnership.iterator();
- owner = i.next();
- i.remove();
- }
-
- return owner;
- }
-
- public boolean negotiatedAttributeOwnershipDivestiture(byte[] tag)
- {
- wantsToDivest = true;
-
- return !requestingOwnership.isEmpty();
- }
-
- public FederateHandle confirmDivestiture()
- {
- owner = null;
- wantsToDivest = false;
-
- // give ownership to the next in line
- //
- if (!requestingOwnership.isEmpty())
- {
- Iterator<FederateHandle> i = requestingOwnership.iterator();
- owner = i.next();
- i.remove();
- }
-
- return owner;
- }
-
- public FederateHandle attributeOwnershipAcquisition(FederateHandle acquiree)
- {
- if (!attributeOwnershipAcquisitionIfAvailable(acquiree))
- {
- // get in line
- //
- requestingOwnership.add(acquiree);
- }
-
- return owner;
- }
-
- public boolean attributeOwnershipAcquisitionIfAvailable(
- FederateHandle acquiree)
- {
- if (owner == null)
- {
- // acquire this attribute if it is unowned
- //
- owner = acquiree;
- wantsToDivest = false;
- }
- return owner == acquiree;
- }
-
- public FederateHandle attributeOwnershipDivestitureIfWanted()
- {
- boolean divested = !requestingOwnership.isEmpty();
-
- // give ownership to the next in line
- //
- if (divested)
- {
- Iterator<FederateHandle> i = requestingOwnership.iterator();
- owner = i.next();
- i.remove();
-
- wantsToDivest = false;
- }
-
- return divested ? owner : null;
- }
-
- public boolean cancelAttributeOwnershipAcquisition(FederateHandle acquiree)
- {
- return requestingOwnership.remove(acquiree);
- }
-
- public void cancelNegotiatedAttributeOwnershipDivestiture(
- FederateHandle owner)
- {
- if (owner.equals(this.owner))
- {
- wantsToDivest = false;
- }
- }
-}
Copied: trunk/rti/src/java/net/sf/ohla/rti1516/federation/ownership/AttributeInstanceOwnership.java (from rev 79, trunk/rti/src/java/net/sf/ohla/rti1516/federation/ownership/AttributeInstanceOwnership.java)
===================================================================
--- trunk/rti/src/java/net/sf/ohla/rti1516/federation/ownership/AttributeInstanceOwnership.java (rev 0)
+++ trunk/rti/src/java/net/sf/ohla/rti1516/federation/ownership/AttributeInstanceOwnership.java 2006-12-21 19:25:58 UTC (rev 83)
@@ -0,0 +1,167 @@
+/*
+ * Copyright (c) 2006, Michael Newcomb
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package net.sf.ohla.rti1516.federation.ownership;
+
+import java.util.Iterator;
+import java.util.LinkedHashSet;
+
+import net.sf.ohla.rti1516.fdd.Attribute;
+
+import hla.rti1516.FederateHandle;
+
+public class AttributeInstanceOwnership
+{
+ protected final Attribute attribute;
+
+ protected FederateHandle owner;
+
+ /**
+ * Set if the owner of this attribute is willing to divest ownership.
+ */
+ protected boolean wantsToDivest;
+
+ /**
+ * The 'ownership' line. When federates request ownership of this attribute
+ * they are placed into a line and given ownership based upon when they
+ * entered the line.
+ */
+ protected LinkedHashSet<FederateHandle> requestingOwnership =
+ new LinkedHashSet<FederateHandle>();
+
+ public AttributeInstanceOwnership(Attribute attribute)
+ {
+ this.attribute = attribute;
+ }
+
+ public Attribute getAttribute()
+ {
+ return attribute;
+ }
+
+ public FederateHandle getOwner()
+ {
+ return owner;
+ }
+
+ public void setOwner(FederateHandle owner)
+ {
+ this.owner = owner;
+ }
+
+ public boolean wantsToDivest()
+ {
+ return wantsToDivest;
+ }
+
+ public FederateHandle unconditionalAttributeOwnershipDivestiture()
+ {
+ owner = null;
+ wantsToDivest = false;
+
+ // give ownership to the next in line
+ //
+ if (!requestingOwnership.isEmpty())
+ {
+ Iterator<FederateHandle> i = requestingOwnership.iterator();
+ owner = i.next();
+ i.remove();
+ }
+
+ return owner;
+ }
+
+ public boolean negotiatedAttributeOwnershipDivestiture(byte[] tag)
+ {
+ wantsToDivest = true;
+
+ return !requestingOwnership.isEmpty();
+ }
+
+ public FederateHandle confirmDivestiture()
+ {
+ owner = null;
+ wantsToDivest = false;
+
+ // give ownership to the next in line
+ //
+ if (!requestingOwnership.isEmpty())
+ {
+ Iterator<FederateHandle> i = requestingOwnership.iterator();
+ owner = i.next();
+ i.remove();
+ }
+
+ return owner;
+ }
+
+ public FederateHandle attributeOwnershipAcquisition(FederateHandle acquiree)
+ {
+ if (!attributeOwnershipAcquisitionIfAvailable(acquiree))
+ {
+ // get in line
+ //
+ requestingOwnership.add(acquiree);
+ }
+
+ return owner;
+ }
+
+ public boolean attributeOwnershipAcquisitionIfAvailable(
+ FederateHandle acquiree)
+ {
+ if (owner == null)
+ {
+ // acquire this attribute if it is unowned
+ //
+ owner = acquiree;
+ wantsToDivest = false;
+ }
+ return owner == acquiree;
+ }
+
+ public FederateHandle attributeOwnershipDivestitureIfWanted()
+ {
+ boolean divested = !requestingOwnership.isEmpty();
+
+ // give ownership to the next in line
+ //
+ if (divested)
+ {
+ Iterator<FederateHandle> i = requestingOwnership.iterator();
+ owner = i.next();
+ i.remove();
+
+ wantsToDivest = false;
+ }
+
+ return divested ? owner : null;
+ }
+
+ public boolean cancelAttributeOwnershipAcquisition(FederateHandle acquiree)
+ {
+ return requestingOwnership.remove(acquiree);
+ }
+
+ public void cancelNegotiatedAttributeOwnershipDivestiture(
+ FederateHandle owner)
+ {
+ if (owner.equals(this.owner))
+ {
+ wantsToDivest = false;
+ }
+ }
+}
Deleted: trunk/rti/src/java/net/sf/ohla/rti1516/federation/ownership/ObjectInstanceOwnership.java
===================================================================
--- trunk/rti/src/java/net/sf/ohla/rti1516/federation/ownership/ObjectInstanceOwnership.java 2006-12-16 03:12:41 UTC (rev 79)
+++ trunk/rti/src/java/net/sf/ohla/rti1516/federation/ownership/ObjectInstanceOwnership.java 2006-12-21 19:25:58 UTC (rev 83)
@@ -1,450 +0,0 @@
-/*
- * Copyright (c) 2006, Michael Newcomb
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package net.sf.ohla.rti1516.federation.ownership;
-
-import java.util.HashMap;
-import java.util.Map;
-import java.util.Set;
-import java.util.concurrent.locks.Lock;
-import java.util.concurrent.locks.ReentrantLock;
-
-import net.sf.ohla.rti1516.fdd.ObjectClass;
-import net.sf.ohla.rti1516.fdd.Attribute;
-import net.sf.ohla.rti1516.federate.callbacks.AttributeOwnershipAcquisitionNotification;
-import net.sf.ohla.rti1516.federate.callbacks.AttributeOwnershipUnavailable;
-import net.sf.ohla.rti1516.federate.callbacks.ConfirmAttributeOwnershipAcquisitionCancellation;
-import net.sf.ohla.rti1516.federate.callbacks.RequestAttributeOwnershipRelease;
-import net.sf.ohla.rti1516.federate.callbacks.RequestDivestitureConfirmation;
-import net.sf.ohla.rti1516.federate.callbacks.AttributeIsNotOwned;
-import net.sf.ohla.rti1516.federate.callbacks.AttributeIsOwnedByRTI;
-import net.sf.ohla.rti1516.federate.callbacks.InformAttributeOwnership;
-import net.sf.ohla.rti1516.OHLAAttributeHandleSet;
-import net.sf.ohla.rti1516.federation.FederationExecution;
-
-import org.apache.mina.common.IoSession;
-
-import hla.rti1516.AttributeHandle;
-import hla.rti1516.AttributeHandleSet;
-import hla.rti1516.FederateHandle;
-import hla.rti1516.ObjectInstanceHandle;
-
-public class ObjectInstanceOwnership
-{
- protected ObjectInstanceHandle objectInstanceHandle;
- protected ObjectClass objectClass;
-
- protected Lock objectLock = new ReentrantLock(true);
-
- protected Map<AttributeHandle, AttributeInstanceOwnership> attributes =
- new HashMap<AttributeHandle, AttributeInstanceOwnership>();
-
- public ObjectInstanceOwnership(ObjectInstanceHandle objectInstanceHandle,
- ObjectClass objectClass,
- Set<AttributeHandle> publishedAttributeHandles,
- FederateHandle owner)
- {
- this.objectInstanceHandle = objectInstanceHandle;
- this.objectClass = objectClass;
-
- for (Attribute attribute : objectClass.getAttributes().values())
- {
- AttributeInstanceOwnership attributeInstanceOwnership =
- new AttributeInstanceOwnership(attribute);
- attributes.put(attribute.getAttributeHandle(),
- attributeInstanceOwnership);
-
- if (publishedAttributeHandles.contains(attribute.getAttributeHandle()))
- {
- attributeInstanceOwnership.setOwner(owner);
- }
- }
- }
-
- public ObjectInstanceHandle getObjectInstanceHandle()
- {
- return objectInstanceHandle;
- }
-
- public ObjectClass getObjectClass()
- {
- return objectClass;
- }
-
- public FederateHandle getOwner(AttributeHandle attributeHandle)
- {
- return attributes.get(attributeHandle).getOwner();
- }
-
- public void unconditionalAttributeOwnershipDivestiture(
- AttributeHandleSet attributeHandles,
- FederationExecution federationExecution)
- {
- objectLock.lock();
- try
- {
- Map<FederateHandle, AttributeHandleSet> newOwners =
- new HashMap<FederateHandle, AttributeHandleSet>();
- for (AttributeHandle attributeHandle : attributeHandles)
- {
- FederateHandle newOwner =
- attributes.get(
- attributeHandle).unconditionalAttributeOwnershipDivestiture();
- if (newOwner != null)
- {
- AttributeHandleSet acquiredAttributes = newOwners.get(newOwner);
- if (acquiredAttributes == null)
- {
- acquiredAttributes = new OHLAAttributeHandleSet();
- newOwners.put(newOwner, acquiredAttributes);
- }
- acquiredAttributes.add(attributeHandle);
- }
- }
-
- // notify the new owners
- //
- for (Map.Entry<FederateHandle, AttributeHandleSet> entry :
- newOwners.entrySet())
- {
- IoSession ownerSession =
- federationExecution.getFederateSession(entry.getKey());
- if (ownerSession != null)
- {
- ownerSession.write(new AttributeOwnershipAcquisitionNotification(
- objectInstanceHandle, entry.getValue()));
- }
- }
- }
- finally
- {
- objectLock.unlock();
- }
- }
-
- public void negotiatedAttributeOwnershipDivestiture(
- AttributeHandleSet attributeHandles, byte[] tag, IoSession session)
- {
- objectLock.lock();
- try
- {
- AttributeHandleSet divestableAttributeHandles =
- new OHLAAttributeHandleSet();
- for (AttributeHandle attributeHandle : attributeHandles)
- {
- if (attributes.get(
- attributeHandle).negotiatedAttributeOwnershipDivestiture(tag))
- {
- divestableAttributeHandles.add(attributeHandle);
- }
- }
-
- if (!divestableAttributeHandles.isEmpty())
- {
- session.write(new RequestDivestitureConfirmation(
- objectInstanceHandle, divestableAttributeHandles));
- }
- }
- finally
- {
- objectLock.unlock();
- }
- }
-
- public void confirmDivestiture(AttributeHandleSet attributeHandles,
- FederationExecution federationExecution)
- {
- objectLock.lock();
- try
- {
- Map<FederateHandle, AttributeHandleSet> newOwners =
- new HashMap<FederateHandle, AttributeHandleSet>();
- for (AttributeHandle attributeHandle : attributeHandles)
- {
- FederateHandle newOwner =
- attributes.get(attributeHandle).confirmDivestiture();
- if (newOwner != null)
- {
- AttributeHandleSet acquiredAttributes = newOwners.get(newOwner);
- if (acquiredAttributes == null)
- {
- acquiredAttributes = new OHLAAttributeHandleSet();
- newOwners.put(newOwner, acquiredAttributes);
- }
- acquiredAttributes.add(attributeHandle);
- System.out.printf("%s - %s\n", newOwner, acquiredAttributes);
- }
- }
-
- // notify the new owners
- //
- for (Map.Entry<...
[truncated message content] |