[openrtm-commit:02544] r713 - in trunk/rtmtools/jp.go.aist.rtm.toolscommon/src/jp/go/aist/rtm/toolscommon/model: . manager manager/impl
openrtm ＠ openrtm.org
openrtm ＠ openrtm.org
2017年 3月 31日 (金) 12:47:35 JST
Author: ga
Date: 2017-03-31 12:47:35 +0900 (Fri, 31 Mar 2017)
New Revision: 713
Modified:
trunk/rtmtools/jp.go.aist.rtm.toolscommon/src/jp/go/aist/rtm/toolscommon/model/core.ecore
trunk/rtmtools/jp.go.aist.rtm.toolscommon/src/jp/go/aist/rtm/toolscommon/model/manager.ecore
trunk/rtmtools/jp.go.aist.rtm.toolscommon/src/jp/go/aist/rtm/toolscommon/model/manager/ManagerPackage.java
trunk/rtmtools/jp.go.aist.rtm.toolscommon/src/jp/go/aist/rtm/toolscommon/model/manager/RTCManager.java
trunk/rtmtools/jp.go.aist.rtm.toolscommon/src/jp/go/aist/rtm/toolscommon/model/manager/impl/ManagerPackageImpl.java
trunk/rtmtools/jp.go.aist.rtm.toolscommon/src/jp/go/aist/rtm/toolscommon/model/manager/impl/RTCManagerImpl.java
trunk/rtmtools/jp.go.aist.rtm.toolscommon/src/jp/go/aist/rtm/toolscommon/model/toolscommon.genmodel
Log:
Modified Manager View #2297
Modified: trunk/rtmtools/jp.go.aist.rtm.toolscommon/src/jp/go/aist/rtm/toolscommon/model/core.ecore
===================================================================
--- trunk/rtmtools/jp.go.aist.rtm.toolscommon/src/jp/go/aist/rtm/toolscommon/model/core.ecore 2017-03-31 03:24:38 UTC (rev 712)
+++ trunk/rtmtools/jp.go.aist.rtm.toolscommon/src/jp/go/aist/rtm/toolscommon/model/core.ecore 2017-03-31 03:47:35 UTC (rev 713)
@@ -1,8 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
-<ecore:EPackage xmi:version="2.0"
- xmlns:xmi="http://www.omg.org/XMI" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xmlns:ecore="http://www.eclipse.org/emf/2002/Ecore" name="core"
- nsURI="http://rtm.aist.go.jp/toolscommon/model/toolscommon" nsPrefix="jp.go.aist.rtm.toolscommon.model.core">
+<ecore:EPackage xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xmlns:ecore="http://www.eclipse.org/emf/2002/Ecore" name="core" nsURI="http://rtm.aist.go.jp/toolscommon/model/toolscommon"
+ nsPrefix="jp.go.aist.rtm.toolscommon.model.core">
<eClassifiers xsi:type="ecore:EClass" name="CorbaWrapperObject" abstract="true"
eSuperTypes="#//WrapperObject">
<eStructuralFeatures xsi:type="ecore:EAttribute" name="corbaObject" eType="#//Object"/>
Modified: trunk/rtmtools/jp.go.aist.rtm.toolscommon/src/jp/go/aist/rtm/toolscommon/model/manager/ManagerPackage.java
===================================================================
--- trunk/rtmtools/jp.go.aist.rtm.toolscommon/src/jp/go/aist/rtm/toolscommon/model/manager/ManagerPackage.java 2017-03-31 03:24:38 UTC (rev 712)
+++ trunk/rtmtools/jp.go.aist.rtm.toolscommon/src/jp/go/aist/rtm/toolscommon/model/manager/ManagerPackage.java 2017-03-31 03:47:35 UTC (rev 713)
@@ -12,6 +12,7 @@
import org.eclipse.emf.ecore.EClass;
import org.eclipse.emf.ecore.EDataType;
import org.eclipse.emf.ecore.EPackage;
+import org.eclipse.emf.ecore.EReference;
/**
* <!-- begin-user-doc -->
@@ -153,13 +154,49 @@
int RTC_MANAGER__FACTORY_MODULE_PROFILES = CorePackage.CORBA_WRAPPER_OBJECT_FEATURE_COUNT + 6;
/**
+ * The feature id for the '<em><b>Master</b></em>' attribute.
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @generated
+ * @ordered
+ */
+ int RTC_MANAGER__MASTER = CorePackage.CORBA_WRAPPER_OBJECT_FEATURE_COUNT + 7;
+
+ /**
+ * The feature id for the '<em><b>Master Managers</b></em>' reference list.
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @generated
+ * @ordered
+ */
+ int RTC_MANAGER__MASTER_MANAGERS = CorePackage.CORBA_WRAPPER_OBJECT_FEATURE_COUNT + 8;
+
+ /**
+ * The feature id for the '<em><b>Slave Managers</b></em>' reference list.
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @generated
+ * @ordered
+ */
+ int RTC_MANAGER__SLAVE_MANAGERS = CorePackage.CORBA_WRAPPER_OBJECT_FEATURE_COUNT + 9;
+
+ /**
+ * The feature id for the '<em><b>Configuratoins</b></em>' reference list.
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @generated
+ * @ordered
+ */
+ int RTC_MANAGER__CONFIGURATOINS = CorePackage.CORBA_WRAPPER_OBJECT_FEATURE_COUNT + 10;
+
+ /**
* The number of structural features of the '<em>RTC Manager</em>' class.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
* @generated
* @ordered
*/
- int RTC_MANAGER_FEATURE_COUNT = CorePackage.CORBA_WRAPPER_OBJECT_FEATURE_COUNT + 7;
+ int RTC_MANAGER_FEATURE_COUNT = CorePackage.CORBA_WRAPPER_OBJECT_FEATURE_COUNT + 11;
/**
* The meta object id for the '<em>RTM Manager Profile</em>' data type.
@@ -270,6 +307,50 @@
EAttribute getRTCManager_FactoryModuleProfiles();
/**
+ * Returns the meta object for the attribute '{@link jp.go.aist.rtm.toolscommon.model.manager.RTCManager#isMaster <em>Master</em>}'.
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @return the meta object for the attribute '<em>Master</em>'.
+ * @see jp.go.aist.rtm.toolscommon.model.manager.RTCManager#isMaster()
+ * @see #getRTCManager()
+ * @generated
+ */
+ EAttribute getRTCManager_Master();
+
+ /**
+ * Returns the meta object for the reference list '{@link jp.go.aist.rtm.toolscommon.model.manager.RTCManager#getMasterManagers <em>Master Managers</em>}'.
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @return the meta object for the reference list '<em>Master Managers</em>'.
+ * @see jp.go.aist.rtm.toolscommon.model.manager.RTCManager#getMasterManagers()
+ * @see #getRTCManager()
+ * @generated
+ */
+ EReference getRTCManager_MasterManagers();
+
+ /**
+ * Returns the meta object for the reference list '{@link jp.go.aist.rtm.toolscommon.model.manager.RTCManager#getSlaveManagers <em>Slave Managers</em>}'.
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @return the meta object for the reference list '<em>Slave Managers</em>'.
+ * @see jp.go.aist.rtm.toolscommon.model.manager.RTCManager#getSlaveManagers()
+ * @see #getRTCManager()
+ * @generated
+ */
+ EReference getRTCManager_SlaveManagers();
+
+ /**
+ * Returns the meta object for the reference list '{@link jp.go.aist.rtm.toolscommon.model.manager.RTCManager#getConfiguratoins <em>Configuratoins</em>}'.
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @return the meta object for the reference list '<em>Configuratoins</em>'.
+ * @see jp.go.aist.rtm.toolscommon.model.manager.RTCManager#getConfiguratoins()
+ * @see #getRTCManager()
+ * @generated
+ */
+ EReference getRTCManager_Configuratoins();
+
+ /**
* Returns the meta object for data type '{@link RTM.ManagerProfile <em>RTM Manager Profile</em>}'.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
@@ -380,6 +461,38 @@
EAttribute RTC_MANAGER__FACTORY_MODULE_PROFILES = eINSTANCE.getRTCManager_FactoryModuleProfiles();
/**
+ * The meta object literal for the '<em><b>Master</b></em>' attribute feature.
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @generated
+ */
+ EAttribute RTC_MANAGER__MASTER = eINSTANCE.getRTCManager_Master();
+
+ /**
+ * The meta object literal for the '<em><b>Master Managers</b></em>' reference list feature.
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @generated
+ */
+ EReference RTC_MANAGER__MASTER_MANAGERS = eINSTANCE.getRTCManager_MasterManagers();
+
+ /**
+ * The meta object literal for the '<em><b>Slave Managers</b></em>' reference list feature.
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @generated
+ */
+ EReference RTC_MANAGER__SLAVE_MANAGERS = eINSTANCE.getRTCManager_SlaveManagers();
+
+ /**
+ * The meta object literal for the '<em><b>Configuratoins</b></em>' reference list feature.
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @generated
+ */
+ EReference RTC_MANAGER__CONFIGURATOINS = eINSTANCE.getRTCManager_Configuratoins();
+
+ /**
* The meta object literal for the '<em>RTM Manager Profile</em>' data type.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
Modified: trunk/rtmtools/jp.go.aist.rtm.toolscommon/src/jp/go/aist/rtm/toolscommon/model/manager/RTCManager.java
===================================================================
--- trunk/rtmtools/jp.go.aist.rtm.toolscommon/src/jp/go/aist/rtm/toolscommon/model/manager/RTCManager.java 2017-03-31 03:24:38 UTC (rev 712)
+++ trunk/rtmtools/jp.go.aist.rtm.toolscommon/src/jp/go/aist/rtm/toolscommon/model/manager/RTCManager.java 2017-03-31 03:47:35 UTC (rev 713)
@@ -9,6 +9,7 @@
import RTC.ComponentProfile;
import RTC.RTObject;
import jp.go.aist.rtm.toolscommon.model.component.Component;
+import jp.go.aist.rtm.toolscommon.model.component.NameValue;
import jp.go.aist.rtm.toolscommon.model.core.CorbaWrapperObject;
import org.eclipse.emf.common.util.EList;
@@ -31,6 +32,10 @@
* <li>{@link jp.go.aist.rtm.toolscommon.model.manager.RTCManager#getLoadableModuleProfiles <em>Loadable Module Profiles</em>}</li>
* <li>{@link jp.go.aist.rtm.toolscommon.model.manager.RTCManager#getLoadedModuleProfiles <em>Loaded Module Profiles</em>}</li>
* <li>{@link jp.go.aist.rtm.toolscommon.model.manager.RTCManager#getFactoryModuleProfiles <em>Factory Module Profiles</em>}</li>
+ * <li>{@link jp.go.aist.rtm.toolscommon.model.manager.RTCManager#isMaster <em>Master</em>}</li>
+ * <li>{@link jp.go.aist.rtm.toolscommon.model.manager.RTCManager#getMasterManagers <em>Master Managers</em>}</li>
+ * <li>{@link jp.go.aist.rtm.toolscommon.model.manager.RTCManager#getSlaveManagers <em>Slave Managers</em>}</li>
+ * <li>{@link jp.go.aist.rtm.toolscommon.model.manager.RTCManager#getConfiguratoins <em>Configuratoins</em>}</li>
* </ul>
* </p>
*
@@ -171,7 +176,81 @@
EList<ModuleProfile> getFactoryModuleProfiles();
/**
+ * Returns the value of the '<em><b>Master</b></em>' attribute.
* <!-- begin-user-doc -->
+ * <p>
+ * If the meaning of the '<em>Master</em>' attribute isn't clear,
+ * there really should be more of a description here...
+ * </p>
+ * <!-- end-user-doc -->
+ * @return the value of the '<em>Master</em>' attribute.
+ * @see #setMaster(boolean)
+ * @see jp.go.aist.rtm.toolscommon.model.manager.ManagerPackage#getRTCManager_Master()
+ * @model
+ * @generated
+ */
+ boolean isMaster();
+
+ /**
+ * Sets the value of the '{@link jp.go.aist.rtm.toolscommon.model.manager.RTCManager#isMaster <em>Master</em>}' attribute.
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @param value the new value of the '<em>Master</em>' attribute.
+ * @see #isMaster()
+ * @generated
+ */
+ void setMaster(boolean value);
+
+ /**
+ * Returns the value of the '<em><b>Master Managers</b></em>' reference list.
+ * The list contents are of type {@link jp.go.aist.rtm.toolscommon.model.manager.RTCManager}.
+ * <!-- begin-user-doc -->
+ * <p>
+ * If the meaning of the '<em>Master Managers</em>' reference list isn't clear,
+ * there really should be more of a description here...
+ * </p>
+ * <!-- end-user-doc -->
+ * @return the value of the '<em>Master Managers</em>' reference list.
+ * @see jp.go.aist.rtm.toolscommon.model.manager.ManagerPackage#getRTCManager_MasterManagers()
+ * @model
+ * @generated
+ */
+ EList<RTCManager> getMasterManagers();
+
+ /**
+ * Returns the value of the '<em><b>Slave Managers</b></em>' reference list.
+ * The list contents are of type {@link jp.go.aist.rtm.toolscommon.model.manager.RTCManager}.
+ * <!-- begin-user-doc -->
+ * <p>
+ * If the meaning of the '<em>Slave Managers</em>' reference list isn't clear,
+ * there really should be more of a description here...
+ * </p>
+ * <!-- end-user-doc -->
+ * @return the value of the '<em>Slave Managers</em>' reference list.
+ * @see jp.go.aist.rtm.toolscommon.model.manager.ManagerPackage#getRTCManager_SlaveManagers()
+ * @model
+ * @generated
+ */
+ EList<RTCManager> getSlaveManagers();
+
+ /**
+ * Returns the value of the '<em><b>Configuratoins</b></em>' reference list.
+ * The list contents are of type {@link jp.go.aist.rtm.toolscommon.model.component.NameValue}.
+ * <!-- begin-user-doc -->
+ * <p>
+ * If the meaning of the '<em>Configuratoins</em>' reference list isn't clear,
+ * there really should be more of a description here...
+ * </p>
+ * <!-- end-user-doc -->
+ * @return the value of the '<em>Configuratoins</em>' reference list.
+ * @see jp.go.aist.rtm.toolscommon.model.manager.ManagerPackage#getRTCManager_Configuratoins()
+ * @model
+ * @generated
+ */
+ EList<NameValue> getConfiguratoins();
+
+ /**
+ * <!-- begin-user-doc -->
* RTコンポーネントを新規に作成する
* <!-- end-user-doc -->
* @model
@@ -270,6 +349,14 @@
/**
* <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @model
+ * @generated
+ */
+ int restartR();
+
+ /**
+ * <!-- begin-user-doc -->
* 管理下のRTCの一覧を返す(IDL)
* <!-- end-user-doc -->
* @model kind="operation"
@@ -337,6 +424,86 @@
/**
* <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @model kind="operation"
+ * @generated
+ */
+ boolean isMasterR();
+
+ /**
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @model kind="operation"
+ * @generated
+ */
+ EList<RTCManager> getMasterManagersR();
+
+ /**
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @model
+ * @generated
+ */
+ int addMasterManagerR(RTCManager mgr);
+
+ /**
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @model
+ * @generated
+ */
+ int removeMasterManagerR(RTCManager mgr);
+
+ /**
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @model kind="operation"
+ * @generated
+ */
+ EList<RTCManager> getSlaveManagersR();
+
+ /**
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @model
+ * @generated
+ */
+ int addSlaveManagerR(RTCManager mgr);
+
+ /**
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @model
+ * @generated
+ */
+ int removeSlaveManagerR(RTCManager mgr);
+
+ /**
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @model kind="operation"
+ * @generated
+ */
+ EList<String> getSlaveManagerNames();
+
+ /**
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @model kind="operation"
+ * @generated
+ */
+ EList<NameValue> getConfigurationR();
+
+ /**
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @model
+ * @generated
+ */
+ int setConfigurationR(String name, String value);
+
+ /**
+ * <!-- begin-user-doc -->
* ManagerProfileを返す
* <!-- end-user-doc -->
* @model kind="operation" dataType="jp.go.aist.rtm.toolscommon.model.manager.RTMManagerProfile"
Modified: trunk/rtmtools/jp.go.aist.rtm.toolscommon/src/jp/go/aist/rtm/toolscommon/model/manager/impl/ManagerPackageImpl.java
===================================================================
--- trunk/rtmtools/jp.go.aist.rtm.toolscommon/src/jp/go/aist/rtm/toolscommon/model/manager/impl/ManagerPackageImpl.java 2017-03-31 03:24:38 UTC (rev 712)
+++ trunk/rtmtools/jp.go.aist.rtm.toolscommon/src/jp/go/aist/rtm/toolscommon/model/manager/impl/ManagerPackageImpl.java 2017-03-31 03:47:35 UTC (rev 713)
@@ -27,6 +27,7 @@
import org.eclipse.emf.ecore.EOperation;
import org.eclipse.emf.ecore.EPackage;
+import org.eclipse.emf.ecore.EReference;
import org.eclipse.emf.ecore.impl.EPackageImpl;
/**
@@ -210,6 +211,42 @@
* <!-- end-user-doc -->
* @generated
*/
+ public EAttribute getRTCManager_Master() {
+ return (EAttribute)rtcManagerEClass.getEStructuralFeatures().get(7);
+ }
+
+ /**
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @generated
+ */
+ public EReference getRTCManager_MasterManagers() {
+ return (EReference)rtcManagerEClass.getEStructuralFeatures().get(8);
+ }
+
+ /**
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @generated
+ */
+ public EReference getRTCManager_SlaveManagers() {
+ return (EReference)rtcManagerEClass.getEStructuralFeatures().get(9);
+ }
+
+ /**
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @generated
+ */
+ public EReference getRTCManager_Configuratoins() {
+ return (EReference)rtcManagerEClass.getEStructuralFeatures().get(10);
+ }
+
+ /**
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @generated
+ */
public EDataType getRTMManagerProfile() {
return rtmManagerProfileEDataType;
}
@@ -259,6 +296,10 @@
createEAttribute(rtcManagerEClass, RTC_MANAGER__LOADABLE_MODULE_PROFILES);
createEAttribute(rtcManagerEClass, RTC_MANAGER__LOADED_MODULE_PROFILES);
createEAttribute(rtcManagerEClass, RTC_MANAGER__FACTORY_MODULE_PROFILES);
+ createEAttribute(rtcManagerEClass, RTC_MANAGER__MASTER);
+ createEReference(rtcManagerEClass, RTC_MANAGER__MASTER_MANAGERS);
+ createEReference(rtcManagerEClass, RTC_MANAGER__SLAVE_MANAGERS);
+ createEReference(rtcManagerEClass, RTC_MANAGER__CONFIGURATOINS);
// Create data types
rtmManagerProfileEDataType = createEDataType(RTM_MANAGER_PROFILE);
@@ -308,6 +349,10 @@
initEAttribute(getRTCManager_LoadableModuleProfiles(), this.getRTMModuleProfile(), "loadableModuleProfiles", null, 0, -1, RTCManager.class, IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
initEAttribute(getRTCManager_LoadedModuleProfiles(), this.getRTMModuleProfile(), "loadedModuleProfiles", null, 0, -1, RTCManager.class, IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
initEAttribute(getRTCManager_FactoryModuleProfiles(), this.getRTMModuleProfile(), "factoryModuleProfiles", null, 0, -1, RTCManager.class, IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+ initEAttribute(getRTCManager_Master(), ecorePackage.getEBoolean(), "master", null, 0, 1, RTCManager.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+ initEReference(getRTCManager_MasterManagers(), this.getRTCManager(), null, "masterManagers", null, 0, -1, RTCManager.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+ initEReference(getRTCManager_SlaveManagers(), this.getRTCManager(), null, "slaveManagers", null, 0, -1, RTCManager.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+ initEReference(getRTCManager_Configuratoins(), theComponentPackage.getNameValue(), null, "configuratoins", null, 0, -1, RTCManager.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
addEOperation(rtcManagerEClass, this.getRTMManagerProfile(), "getProfileR", 0, 1, IS_UNIQUE, IS_ORDERED);
@@ -338,6 +383,8 @@
addEOperation(rtcManagerEClass, ecorePackage.getEInt(), "shutdownR", 0, 1, IS_UNIQUE, IS_ORDERED);
+ addEOperation(rtcManagerEClass, ecorePackage.getEInt(), "restartR", 0, 1, IS_UNIQUE, IS_ORDERED);
+
addEOperation(rtcManagerEClass, ecorePackage.getEString(), "getComponentInstanceNamesR", 0, -1, IS_UNIQUE, IS_ORDERED);
addEOperation(rtcManagerEClass, ecorePackage.getEString(), "getLoadableModuleFileNamesR", 0, -1, IS_UNIQUE, IS_ORDERED);
@@ -354,6 +401,32 @@
addEOperation(rtcManagerEClass, ecorePackage.getEString(), "getFactoryTypeNames", 0, -1, IS_UNIQUE, IS_ORDERED);
+ addEOperation(rtcManagerEClass, ecorePackage.getEBoolean(), "isMasterR", 0, 1, IS_UNIQUE, IS_ORDERED);
+
+ addEOperation(rtcManagerEClass, this.getRTCManager(), "getMasterManagersR", 0, -1, IS_UNIQUE, IS_ORDERED);
+
+ op = addEOperation(rtcManagerEClass, ecorePackage.getEInt(), "addMasterManagerR", 0, 1, IS_UNIQUE, IS_ORDERED);
+ addEParameter(op, this.getRTCManager(), "mgr", 0, 1, IS_UNIQUE, IS_ORDERED);
+
+ op = addEOperation(rtcManagerEClass, ecorePackage.getEInt(), "removeMasterManagerR", 0, 1, IS_UNIQUE, IS_ORDERED);
+ addEParameter(op, this.getRTCManager(), "mgr", 0, 1, IS_UNIQUE, IS_ORDERED);
+
+ addEOperation(rtcManagerEClass, this.getRTCManager(), "getSlaveManagersR", 0, -1, IS_UNIQUE, IS_ORDERED);
+
+ op = addEOperation(rtcManagerEClass, ecorePackage.getEInt(), "addSlaveManagerR", 0, 1, IS_UNIQUE, IS_ORDERED);
+ addEParameter(op, this.getRTCManager(), "mgr", 0, 1, IS_UNIQUE, IS_ORDERED);
+
+ op = addEOperation(rtcManagerEClass, ecorePackage.getEInt(), "removeSlaveManagerR", 0, 1, IS_UNIQUE, IS_ORDERED);
+ addEParameter(op, this.getRTCManager(), "mgr", 0, 1, IS_UNIQUE, IS_ORDERED);
+
+ addEOperation(rtcManagerEClass, ecorePackage.getEString(), "getSlaveManagerNames", 0, -1, IS_UNIQUE, IS_ORDERED);
+
+ addEOperation(rtcManagerEClass, theComponentPackage.getNameValue(), "getConfigurationR", 0, -1, IS_UNIQUE, IS_ORDERED);
+
+ op = addEOperation(rtcManagerEClass, ecorePackage.getEInt(), "setConfigurationR", 0, 1, IS_UNIQUE, IS_ORDERED);
+ addEParameter(op, ecorePackage.getEString(), "name", 0, 1, IS_UNIQUE, IS_ORDERED);
+ addEParameter(op, ecorePackage.getEString(), "value", 0, 1, IS_UNIQUE, IS_ORDERED);
+
// Initialize data types
initEDataType(rtmManagerProfileEDataType, ManagerProfile.class, "RTMManagerProfile", IS_SERIALIZABLE, !IS_GENERATED_INSTANCE_CLASS);
initEDataType(rtmModuleProfileEDataType, ModuleProfile.class, "RTMModuleProfile", IS_SERIALIZABLE, !IS_GENERATED_INSTANCE_CLASS);
Modified: trunk/rtmtools/jp.go.aist.rtm.toolscommon/src/jp/go/aist/rtm/toolscommon/model/manager/impl/RTCManagerImpl.java
===================================================================
--- trunk/rtmtools/jp.go.aist.rtm.toolscommon/src/jp/go/aist/rtm/toolscommon/model/manager/impl/RTCManagerImpl.java 2017-03-31 03:24:38 UTC (rev 712)
+++ trunk/rtmtools/jp.go.aist.rtm.toolscommon/src/jp/go/aist/rtm/toolscommon/model/manager/impl/RTCManagerImpl.java 2017-03-31 03:47:35 UTC (rev 713)
@@ -6,12 +6,17 @@
*/
package jp.go.aist.rtm.toolscommon.model.manager.impl;
+import java.util.ArrayList;
import java.util.Collection;
+import java.util.List;
import jp.go.aist.rtm.toolscommon.model.component.Component;
+import jp.go.aist.rtm.toolscommon.model.component.ComponentFactory;
+import jp.go.aist.rtm.toolscommon.model.component.NameValue;
import jp.go.aist.rtm.toolscommon.model.component.impl.CorbaComponentImpl;
import jp.go.aist.rtm.toolscommon.model.core.CorePackage;
import jp.go.aist.rtm.toolscommon.model.core.impl.CorbaWrapperObjectImpl;
+import jp.go.aist.rtm.toolscommon.model.manager.ManagerFactory;
import jp.go.aist.rtm.toolscommon.model.manager.ManagerPackage;
import jp.go.aist.rtm.toolscommon.model.manager.RTCManager;
import jp.go.aist.rtm.toolscommon.synchronizationframework.LocalObject;
@@ -30,6 +35,7 @@
import org.eclipse.emf.ecore.EReference;
import org.eclipse.emf.ecore.impl.ENotificationImpl;
import org.eclipse.emf.ecore.util.EDataTypeUniqueEList;
+import org.eclipse.emf.ecore.util.EObjectResolvingEList;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@@ -52,6 +58,10 @@
* <li>{@link jp.go.aist.rtm.toolscommon.model.manager.impl.RTCManagerImpl#getLoadableModuleProfiles <em>Loadable Module Profiles</em>}</li>
* <li>{@link jp.go.aist.rtm.toolscommon.model.manager.impl.RTCManagerImpl#getLoadedModuleProfiles <em>Loaded Module Profiles</em>}</li>
* <li>{@link jp.go.aist.rtm.toolscommon.model.manager.impl.RTCManagerImpl#getFactoryModuleProfiles <em>Factory Module Profiles</em>}</li>
+ * <li>{@link jp.go.aist.rtm.toolscommon.model.manager.impl.RTCManagerImpl#isMaster <em>Master</em>}</li>
+ * <li>{@link jp.go.aist.rtm.toolscommon.model.manager.impl.RTCManagerImpl#getMasterManagers <em>Master Managers</em>}</li>
+ * <li>{@link jp.go.aist.rtm.toolscommon.model.manager.impl.RTCManagerImpl#getSlaveManagers <em>Slave Managers</em>}</li>
+ * <li>{@link jp.go.aist.rtm.toolscommon.model.manager.impl.RTCManagerImpl#getConfiguratoins <em>Configuratoins</em>}</li>
* </ul>
* </p>
*
@@ -164,8 +174,58 @@
protected EList<ModuleProfile> factoryModuleProfiles;
/**
+ * The default value of the '{@link #isMaster() <em>Master</em>}' attribute.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
+ * @see #isMaster()
+ * @generated
+ * @ordered
+ */
+ protected static final boolean MASTER_EDEFAULT = false;
+
+ /**
+ * The cached value of the '{@link #isMaster() <em>Master</em>}' attribute.
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @see #isMaster()
+ * @generated
+ * @ordered
+ */
+ protected boolean master = MASTER_EDEFAULT;
+
+ /**
+ * The cached value of the '{@link #getMasterManagers() <em>Master Managers</em>}' reference list.
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @see #getMasterManagers()
+ * @generated
+ * @ordered
+ */
+ protected EList<RTCManager> masterManagers;
+
+ /**
+ * The cached value of the '{@link #getSlaveManagers() <em>Slave Managers</em>}' reference list.
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @see #getSlaveManagers()
+ * @generated
+ * @ordered
+ */
+ protected EList<RTCManager> slaveManagers;
+
+ /**
+ * The cached value of the '{@link #getConfiguratoins() <em>Configuratoins</em>}' reference list.
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @see #getConfiguratoins()
+ * @generated
+ * @ordered
+ */
+ protected EList<NameValue> configuratoins;
+
+ /**
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
* @generated NOT
*/
public RTCManagerImpl() {
@@ -187,6 +247,7 @@
* <!-- end-user-doc -->
* @generated
*/
+ @Override
public ManagerProfile getManagerProfile() {
return managerProfile;
}
@@ -196,6 +257,7 @@
* <!-- end-user-doc -->
* @generated
*/
+ @Override
public void setManagerProfile(ManagerProfile newManagerProfile) {
ManagerProfile oldManagerProfile = managerProfile;
managerProfile = newManagerProfile;
@@ -208,11 +270,12 @@
* <!-- end-user-doc -->
* @generated NOT
*/
+ @Override
public String getInstanceNameL() {
String name = null;
if (this.managerProfile != null) {
- name = SDOUtil.getStringValue(this.managerProfile.properties,
- "instance_name");
+ name = SDOUtil.findValueAsString("instance_name",
+ this.managerProfile.properties);
}
return name;
}
@@ -222,6 +285,7 @@
* <!-- end-user-doc -->
* @generated
*/
+ @Override
public String getPathId() {
return pathId;
}
@@ -231,6 +295,7 @@
* <!-- end-user-doc -->
* @generated
*/
+ @Override
public void setPathId(String newPathId) {
String oldPathId = pathId;
pathId = newPathId;
@@ -243,6 +308,7 @@
* <!-- end-user-doc -->
* @generated NOT
*/
+ @Override
public EList<ComponentProfile> getComponentProfiles() {
if (componentProfiles == null) {
getComponentProfilesR();
@@ -255,6 +321,7 @@
* <!-- end-user-doc -->
* @generated NOT
*/
+ @Override
public EList<ModuleProfile> getLoadableModuleProfiles() {
if (loadableModuleProfiles == null) {
getLoadableModuleProfilesR();
@@ -267,6 +334,7 @@
* <!-- end-user-doc -->
* @generated NOT
*/
+ @Override
public EList<ModuleProfile> getLoadedModuleProfiles() {
if (loadedModuleProfiles == null) {
getLoadedModuleProfilesR();
@@ -279,6 +347,7 @@
* <!-- end-user-doc -->
* @generated NOT
*/
+ @Override
public EList<ModuleProfile> getFactoryModuleProfiles() {
if (factoryModuleProfiles == null) {
getFactoryModuleProfilesR();
@@ -289,8 +358,69 @@
/**
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
+ * @generated
+ */
+ public boolean isMaster() {
+ return master;
+ }
+
+ /**
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @generated
+ */
+ public void setMaster(boolean newMaster) {
+ boolean oldMaster = master;
+ master = newMaster;
+ if (eNotificationRequired())
+ eNotify(new ENotificationImpl(this, Notification.SET, ManagerPackage.RTC_MANAGER__MASTER, oldMaster, master));
+ }
+
+ /**
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
* @generated NOT
*/
+ @Override
+ public EList<RTCManager> getMasterManagers() {
+ if (masterManagers == null) {
+ getMasterManagersR();
+ }
+ return masterManagers;
+ }
+
+ /**
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @generated NOT
+ */
+ @Override
+ public EList<RTCManager> getSlaveManagers() {
+ if (slaveManagers == null) {
+ getSlaveManagersR();
+ }
+ return slaveManagers;
+ }
+
+ /**
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @generated NOT
+ */
+ @Override
+ public EList<NameValue> getConfiguratoins() {
+ if (configuratoins == null) {
+ getConfigurationR();
+ }
+ return configuratoins;
+ }
+
+ /**
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @generated NOT
+ */
+ @Override
public Component createComponentR(String compName) {
RTC.RTObject remote = this.getCorbaObjectInterface().create_component(
compName);
@@ -314,6 +444,7 @@
* <!-- end-user-doc -->
* @generated NOT
*/
+ @Override
public int deleteComponentR(String instanceName) {
RTC.ReturnCode_t rc = this.getCorbaObjectInterface().delete_component(
instanceName);
@@ -331,6 +462,7 @@
* <!-- end-user-doc -->
* @generated NOT
*/
+ @Override
public EList<RTObject> getComponentsR() {
BasicEList<RTObject> result = new BasicEList<RTObject>();
RTObject[] rtobjs = this.getCorbaObjectInterface().get_components();
@@ -345,6 +477,7 @@
* <!-- end-user-doc -->
* @generated NOT
*/
+ @Override
public EList<RTC.ComponentProfile> getComponentProfilesR() {
if (componentProfiles == null) {
componentProfiles = new EDataTypeUniqueEList<ComponentProfile>(
@@ -366,6 +499,7 @@
* <!-- end-user-doc -->
* @generated NOT
*/
+ @Override
public int loadModuleR(String pathname, String initfunc) {
RTC.ReturnCode_t rc = this.getCorbaObjectInterface().load_module(
pathname, initfunc);
@@ -384,6 +518,7 @@
* <!-- end-user-doc -->
* @generated NOT
*/
+ @Override
public int unloadModuleR(String pathname) {
RTC.ReturnCode_t rc = this.getCorbaObjectInterface().unload_module(
pathname);
@@ -402,6 +537,7 @@
* <!-- end-user-doc -->
* @generated NOT
*/
+ @Override
public EList<ModuleProfile> getLoadableModuleProfilesR() {
if (loadableModuleProfiles == null) {
loadableModuleProfiles = new EDataTypeUniqueEList<ModuleProfile>(
@@ -423,6 +559,7 @@
* <!-- end-user-doc -->
* @generated NOT
*/
+ @Override
public EList<ModuleProfile> getLoadedModuleProfilesR() {
if (loadedModuleProfiles == null) {
loadedModuleProfiles = new EDataTypeUniqueEList<ModuleProfile>(
@@ -431,6 +568,8 @@
} else {
loadedModuleProfiles.clear();
}
+
+
ModuleProfile[] profs = this.getCorbaObjectInterface()
.get_loaded_modules();
for (int i = 0; i < profs.length; i++) {
@@ -444,6 +583,7 @@
* <!-- end-user-doc -->
* @generated NOT
*/
+ @Override
public EList<ModuleProfile> getFactoryModuleProfilesR() {
if (factoryModuleProfiles == null) {
factoryModuleProfiles = new EDataTypeUniqueEList<ModuleProfile>(
@@ -452,19 +592,20 @@
} else {
factoryModuleProfiles.clear();
}
-// ModuleProfile[] profs = this.getCorbaObjectInterface()
-// .get_factory_profiles();
-// for (int i = 0; i < profs.length; i++) {
-// factoryModuleProfiles.add(profs[i]);
-// }
- // TODO ミドルウェアでファクトリ取得が修正されるまで、loadable moduleから取得する
- for (ModuleProfile prof : getLoadableModuleProfiles()) {
- String file = SDOUtil.getStringValue(prof.properties, "implementation_id");
- if (file != null) {
- factoryModuleProfiles.add(prof);
- }
+ ModuleProfile[] profs = this.getCorbaObjectInterface()
+ .get_factory_profiles();
+ for (int i = 0; i < profs.length; i++) {
+ this.factoryModuleProfiles.add(profs[i]);
}
- return factoryModuleProfiles;
+ // ミドルウェアでファクトリ取得が修正されるまで、loadable moduleから取得する
+ // for (ModuleProfile prof : getLoadableModuleProfiles()) {
+ // String file = SDOUtil.findValueAsString("implementation_id",
+ // prof.properties);
+ // if (file != null) {
+ // factoryModuleProfiles.add(prof);
+ // }
+ // }
+ return this.factoryModuleProfiles;
}
/**
@@ -472,6 +613,7 @@
* <!-- end-user-doc -->
* @generated NOT
*/
+ @Override
public int forkR() {
RTC.ReturnCode_t rc = this.getCorbaObjectInterface().fork();
return rc.value();
@@ -482,6 +624,7 @@
* <!-- end-user-doc -->
* @generated NOT
*/
+ @Override
public int shutdownR() {
RTC.ReturnCode_t rc = this.getCorbaObjectInterface().shutdown();
return rc.value();
@@ -492,6 +635,18 @@
* <!-- end-user-doc -->
* @generated NOT
*/
+ @Override
+ public int restartR() {
+ RTC.ReturnCode_t rc = this.getCorbaObjectInterface().restart();
+ return rc.value();
+ }
+
+ /**
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @generated NOT
+ */
+ @Override
public EList<String> getComponentInstanceNamesR() {
// キャッシュ更新
getComponentProfilesR();
@@ -503,6 +658,7 @@
* <!-- end-user-doc -->
* @generated NOT
*/
+ @Override
public EList<String> getLoadableModuleFileNamesR() {
// キャッシュ更新
getLoadableModuleProfilesR();
@@ -514,6 +670,7 @@
* <!-- end-user-doc -->
* @generated NOT
*/
+ @Override
public EList<String> getLoadedModuleFileNamesR() {
// キャッシュ更新
getLoadedModuleProfilesR();
@@ -525,6 +682,7 @@
* <!-- end-user-doc -->
* @generated NOT
*/
+ @Override
public EList<String> getFactoryProfileTypeNamesR() {
// キャッシュ更新
getFactoryModuleProfilesR();
@@ -536,10 +694,10 @@
* <!-- end-user-doc -->
* @generated NOT
*/
+ @Override
public EList<String> getComponentInstanceNames() {
BasicEList<String> result = new BasicEList<String>();
- for (Object o : getComponentProfiles()) {
- RTC.ComponentProfile prof = (RTC.ComponentProfile) o;
+ for (RTC.ComponentProfile prof : getComponentProfiles()) {
result.add(prof.instance_name);
}
return result;
@@ -550,12 +708,12 @@
* <!-- end-user-doc -->
* @generated NOT
*/
+ @Override
public EList<String> getLoadableModuleFileNames() {
- BasicEList<String> result = new BasicEList<String>();
- for (Object o : getLoadableModuleProfiles()) {
- ModuleProfile prof = (ModuleProfile) o;
- String file = SDOUtil.getStringValue(prof.properties,
- "module_file_path");
+ BasicEList<String> result = new BasicEList<String>();
+ for (ModuleProfile prof : getLoadableModuleProfiles()) {
+ String file = SDOUtil.findValueAsString("module_file_path",
+ prof.properties);
if (file != null) {
result.add(file);
}
@@ -568,11 +726,12 @@
* <!-- end-user-doc -->
* @generated NOT
*/
+ @Override
public EList<String> getLoadedModuleFileNames() {
BasicEList<String> result = new BasicEList<String>();
- for (Object o : getLoadedModuleProfiles()) {
- ModuleProfile prof = (ModuleProfile) o;
- String file = SDOUtil.getStringValue(prof.properties, "file_path");
+ for (ModuleProfile prof : getLoadedModuleProfiles()) {
+ String file = SDOUtil.findValueAsString("file_path",
+ prof.properties);
if (file != null) {
result.add(file);
}
@@ -585,11 +744,12 @@
* <!-- end-user-doc -->
* @generated NOT
*/
+ @Override
public EList<String> getFactoryTypeNames() {
BasicEList<String> result = new BasicEList<String>();
- for (Object o : getFactoryModuleProfiles()) {
- ModuleProfile prof = (ModuleProfile) o;
- String type = SDOUtil.getStringValue(prof.properties, "implementation_id");
+ for (ModuleProfile prof : getFactoryModuleProfiles()) {
+ String type = SDOUtil.findValueAsString("implementation_id",
+ prof.properties);
if (type != null) {
result.add(type);
}
@@ -600,6 +760,192 @@
/**
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
+ * @generated NOT
+ */
+ @Override
+ public boolean isMasterR() {
+ boolean ret = this.getCorbaObjectInterface().is_master();
+ return ret;
+ }
+
+ /**
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @generated NOT
+ */
+ @Override
+ public EList<RTCManager> getMasterManagersR() {
+ if (masterManagers == null) {
+ masterManagers = new EDataTypeUniqueEList<RTCManager>(
+ RTCManager.class, this,
+ ManagerPackage.RTC_MANAGER__MASTER_MANAGERS);
+ } else {
+ masterManagers.clear();
+ }
+ for (RTM.Manager m : this.getCorbaObjectInterface()
+ .get_master_managers()) {
+ RTCManager mgr = ManagerFactory.eINSTANCE.createRTCManager();
+ mgr.setCorbaObject(m);
+ this.masterManagers.add(mgr);
+ }
+ return this.masterManagers;
+ }
+
+ /**
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @generated NOT
+ */
+ @Override
+ public int addMasterManagerR(RTCManager mgr) {
+ RTC.ReturnCode_t ret = RTC.ReturnCode_t.RTC_ERROR;
+ if (mgr == null) {
+ return ret.value();
+ }
+ RTM.Manager m = ManagerHelper.narrow(mgr.getCorbaObject());
+ ret = this.getCorbaObjectInterface().add_master_manager(m);
+ // Master Managerリストを同期
+ this.getMasterManagersR();
+ return ret.value();
+ }
+
+ /**
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @generated NOT
+ */
+ @Override
+ public int removeMasterManagerR(RTCManager mgr) {
+ RTC.ReturnCode_t ret = RTC.ReturnCode_t.RTC_ERROR;
+ if (mgr == null) {
+ return ret.value();
+ }
+ RTM.Manager m = ManagerHelper.narrow(mgr.getCorbaObject());
+ ret = this.getCorbaObjectInterface().remove_master_manager(m);
+ // Master Managerリストを同期
+ this.getMasterManagersR();
+ return ret.value();
+ }
+
+ /**
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @generated NOT
+ */
+ @Override
+ public EList<RTCManager> getSlaveManagersR() {
+ if (slaveManagers == null) {
+ slaveManagers = new EDataTypeUniqueEList<RTCManager>(
+ RTCManager.class, this,
+ ManagerPackage.RTC_MANAGER__SLAVE_MANAGERS);
+ } else {
+ slaveManagers.clear();
+ }
+ for (RTM.Manager m : this.getCorbaObjectInterface()
+ .get_slave_managers()) {
+ RTCManager mgr = ManagerFactory.eINSTANCE.createRTCManager();
+ mgr.setCorbaObject(m);
+ this.slaveManagers.add(mgr);
+ }
+ return this.slaveManagers;
+ }
+
+ /**
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @generated NOT
+ */
+ @Override
+ public int addSlaveManagerR(RTCManager mgr) {
+ RTC.ReturnCode_t ret = RTC.ReturnCode_t.RTC_ERROR;
+ if (mgr == null) {
+ return ret.value();
+ }
+ RTM.Manager m = ManagerHelper.narrow(mgr.getCorbaObject());
+ ret = this.getCorbaObjectInterface().add_slave_manager(m);
+ // Slave Managerリストを同期
+ this.getSlaveManagersR();
+ return ret.value();
+ }
+
+ /**
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @generated NOT
+ */
+ @Override
+ public int removeSlaveManagerR(RTCManager mgr) {
+ RTC.ReturnCode_t ret = RTC.ReturnCode_t.RTC_ERROR;
+ if (mgr == null) {
+ return ret.value();
+ }
+ RTM.Manager m = ManagerHelper.narrow(mgr.getCorbaObject());
+ ret = this.getCorbaObjectInterface().remove_slave_manager(m);
+ // Slave Managerリストを同期
+ this.getSlaveManagersR();
+ return ret.value();
+ }
+
+ /**
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @generated NOT
+ */
+ @Override
+ public EList<String> getSlaveManagerNames() {
+ this.getSlaveManagersR();
+ BasicEList<String> result = new BasicEList<String>();
+ for (RTCManager m : getSlaveManagers()) {
+ String name = SDOUtil.findValueAsString("manager.name",
+ m.getProfileR().properties);
+ if (name != null) {
+ result.add(name);
+ }
+ }
+ return result;
+ }
+
+ /**
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @generated NOT
+ */
+ @Override
+ public EList<NameValue> getConfigurationR() {
+ if (configuratoins == null) {
+ configuratoins = new EDataTypeUniqueEList<NameValue>(
+ NameValue.class, this,
+ ManagerPackage.RTC_MANAGER__CONFIGURATOINS);
+ } else {
+ configuratoins.clear();
+ }
+ for (_SDOPackage.NameValue n : this.getCorbaObjectInterface()
+ .get_configuration()) {
+ NameValue nv = ComponentFactory.eINSTANCE.createNameValue();
+ nv.setName(n.name);
+ nv.setValue(n.value.toString());
+ this.configuratoins.add(nv);
+ }
+ return this.configuratoins;
+ }
+
+ /**
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @generated NOT
+ */
+ @Override
+ public int setConfigurationR(String name, String value) {
+ RTC.ReturnCode_t ret = this.getCorbaObjectInterface()
+ .set_configuration(name, value);
+ // Configurationリストを同期
+ this.getConfigurationR();
+ return ret.value();
+ }
+
+ /**
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
* @generated
*/
@Override
@@ -619,6 +965,14 @@
return getLoadedModuleProfiles();
case ManagerPackage.RTC_MANAGER__FACTORY_MODULE_PROFILES:
return getFactoryModuleProfiles();
+ case ManagerPackage.RTC_MANAGER__MASTER:
+ return isMaster();
+ case ManagerPackage.RTC_MANAGER__MASTER_MANAGERS:
+ return getMasterManagers();
+ case ManagerPackage.RTC_MANAGER__SLAVE_MANAGERS:
+ return getSlaveManagers();
+ case ManagerPackage.RTC_MANAGER__CONFIGURATOINS:
+ return getConfiguratoins();
}
return super.eGet(featureID, resolve, coreType);
}
@@ -654,6 +1008,21 @@
getFactoryModuleProfiles().clear();
getFactoryModuleProfiles().addAll((Collection<? extends ModuleProfile>)newValue);
return;
+ case ManagerPackage.RTC_MANAGER__MASTER:
+ setMaster((Boolean)newValue);
+ return;
+ case ManagerPackage.RTC_MANAGER__MASTER_MANAGERS:
+ getMasterManagers().clear();
+ getMasterManagers().addAll((Collection<? extends RTCManager>)newValue);
+ return;
+ case ManagerPackage.RTC_MANAGER__SLAVE_MANAGERS:
+ getSlaveManagers().clear();
+ getSlaveManagers().addAll((Collection<? extends RTCManager>)newValue);
+ return;
+ case ManagerPackage.RTC_MANAGER__CONFIGURATOINS:
+ getConfiguratoins().clear();
+ getConfiguratoins().addAll((Collection<? extends NameValue>)newValue);
+ return;
}
super.eSet(featureID, newValue);
}
@@ -684,6 +1053,18 @@
case ManagerPackage.RTC_MANAGER__FACTORY_MODULE_PROFILES:
getFactoryModuleProfiles().clear();
return;
+ case ManagerPackage.RTC_MANAGER__MASTER:
+ setMaster(MASTER_EDEFAULT);
+ return;
+ case ManagerPackage.RTC_MANAGER__MASTER_MANAGERS:
+ getMasterManagers().clear();
+ return;
+ case ManagerPackage.RTC_MANAGER__SLAVE_MANAGERS:
+ getSlaveManagers().clear();
+ return;
+ case ManagerPackage.RTC_MANAGER__CONFIGURATOINS:
+ getConfiguratoins().clear();
+ return;
}
super.eUnset(featureID);
}
@@ -710,6 +1091,14 @@
return loadedModuleProfiles != null && !loadedModuleProfiles.isEmpty();
case ManagerPackage.RTC_MANAGER__FACTORY_MODULE_PROFILES:
return factoryModuleProfiles != null && !factoryModuleProfiles.isEmpty();
+ case ManagerPackage.RTC_MANAGER__MASTER:
+ return master != MASTER_EDEFAULT;
+ case ManagerPackage.RTC_MANAGER__MASTER_MANAGERS:
+ return masterManagers != null && !masterManagers.isEmpty();
+ case ManagerPackage.RTC_MANAGER__SLAVE_MANAGERS:
+ return slaveManagers != null && !slaveManagers.isEmpty();
+ case ManagerPackage.RTC_MANAGER__CONFIGURATOINS:
+ return configuratoins != null && !configuratoins.isEmpty();
}
return super.eIsSet(featureID);
}
@@ -738,6 +1127,8 @@
result.append(loadedModuleProfiles);
result.append(", factoryModuleProfiles: ");
result.append(factoryModuleProfiles);
+ result.append(", master: ");
+ result.append(master);
result.append(')');
return result.toString();
}
@@ -747,13 +1138,14 @@
* <!-- end-user-doc -->
* @generated NOT
*/
+ @Override
public ManagerProfile getProfileR() {
this.managerProfile = this.getCorbaObjectInterface().get_profile();
return this.managerProfile;
}
-// @Override
+ @Override
public RTM.Manager getCorbaObjectInterface() {
return ManagerHelper.narrow(super.getCorbaObject());
}
@@ -798,8 +1190,7 @@
result = ((RTCManager) localObject).getProfileR();
return result;
}
- }
- };
+ } };
// new AttributeMapping(ManagerPackage.eINSTANCE
// .getRTCManager_LoadableModuleList(), true) {
@@ -897,15 +1288,12 @@
@Override
public void synchronizeManually() {
- if (System.currentTimeMillis() - lastExecutedTime < SYNC_MANUAL_INTERVAL) {
-// System.out.println("already sync");
+ if (System.currentTimeMillis() - this.lastExecutedTime < SYNC_MANUAL_INTERVAL) {
return;
}
-
synchronizeLocalAttribute(null);
synchronizeLocalReference();
-
- lastExecutedTime = System.currentTimeMillis();
+ this.lastExecutedTime = System.currentTimeMillis();
}
} // RTCManagerImpl
Modified: trunk/rtmtools/jp.go.aist.rtm.toolscommon/src/jp/go/aist/rtm/toolscommon/model/manager.ecore
===================================================================
--- trunk/rtmtools/jp.go.aist.rtm.toolscommon/src/jp/go/aist/rtm/toolscommon/model/manager.ecore 2017-03-31 03:24:38 UTC (rev 712)
+++ trunk/rtmtools/jp.go.aist.rtm.toolscommon/src/jp/go/aist/rtm/toolscommon/model/manager.ecore 2017-03-31 03:47:35 UTC (rev 713)
@@ -1,8 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
-<ecore:EPackage xmi:version="2.0"
- xmlns:xmi="http://www.omg.org/XMI" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xmlns:ecore="http://www.eclipse.org/emf/2002/Ecore" name="manager"
- nsURI="http:///jp/go/aist/rtm/toolscommon/model/manager.ecore" nsPrefix="jp.go.aist.rtm.toolscommon.model.manager">
+<ecore:EPackage xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xmlns:ecore="http://www.eclipse.org/emf/2002/Ecore" name="manager" nsURI="http:///jp/go/aist/rtm/toolscommon/model/manager.ecore"
+ nsPrefix="jp.go.aist.rtm.toolscommon.model.manager">
<eClassifiers xsi:type="ecore:EClass" name="RTCManager" eSuperTypes="core.ecore#//CorbaWrapperObject">
<eOperations name="getProfileR" eType="#//RTMManagerProfile"/>
<eOperations name="createComponentR" eType="ecore:EClass component.ecore#//Component">
@@ -25,6 +24,7 @@
<eOperations name="getFactoryModuleProfilesR" upperBound="-1" eType="#//RTMModuleProfile"/>
<eOperations name="forkR" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EInt"/>
<eOperations name="shutdownR" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EInt"/>
+ <eOperations name="restartR" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EInt"/>
<eOperations name="getComponentInstanceNamesR" upperBound="-1" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/>
<eOperations name="getLoadableModuleFileNamesR" upperBound="-1" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/>
<eOperations name="getLoadedModuleFileNamesR" upperBound="-1" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/>
@@ -33,6 +33,27 @@
<eOperations name="getLoadableModuleFileNames" upperBound="-1" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/>
<eOperations name="getLoadedModuleFileNames" upperBound="-1" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/>
<eOperations name="getFactoryTypeNames" upperBound="-1" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/>
+ <eOperations name="isMasterR" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EBoolean"/>
+ <eOperations name="getMasterManagersR" upperBound="-1" eType="#//RTCManager"/>
+ <eOperations name="addMasterManagerR" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EInt">
+ <eParameters name="mgr" eType="#//RTCManager"/>
+ </eOperations>
+ <eOperations name="removeMasterManagerR" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EInt">
+ <eParameters name="mgr" eType="#//RTCManager"/>
+ </eOperations>
+ <eOperations name="getSlaveManagersR" upperBound="-1" eType="#//RTCManager"/>
+ <eOperations name="addSlaveManagerR" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EInt">
+ <eParameters name="mgr" eType="#//RTCManager"/>
+ </eOperations>
+ <eOperations name="removeSlaveManagerR" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EInt">
+ <eParameters name="mgr" eType="#//RTCManager"/>
+ </eOperations>
+ <eOperations name="getSlaveManagerNames" upperBound="-1" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/>
+ <eOperations name="getConfigurationR" upperBound="-1" eType="ecore:EClass component.ecore#//NameValue"/>
+ <eOperations name="setConfigurationR" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EInt">
+ <eParameters name="name" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/>
+ <eParameters name="value" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/>
+ </eOperations>
<eStructuralFeatures xsi:type="ecore:EAttribute" name="managerProfile" eType="#//RTMManagerProfile"
transient="true"/>
<eStructuralFeatures xsi:type="ecore:EAttribute" name="instanceNameL" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"
@@ -46,6 +67,13 @@
eType="#//RTMModuleProfile" transient="true"/>
<eStructuralFeatures xsi:type="ecore:EAttribute" name="factoryModuleProfiles"
upperBound="-1" eType="#//RTMModuleProfile" transient="true"/>
+ <eStructuralFeatures xsi:type="ecore:EAttribute" name="master" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EBoolean"/>
+ <eStructuralFeatures xsi:type="ecore:EReference" name="masterManagers" upperBound="-1"
+ eType="#//RTCManager"/>
+ <eStructuralFeatures xsi:type="ecore:EReference" name="slaveManagers" upperBound="-1"
+ eType="#//RTCManager"/>
+ <eStructuralFeatures xsi:type="ecore:EReference" name="configuratoins" upperBound="-1"
+ eType="ecore:EClass component.ecore#//NameValue"/>
</eClassifiers>
<eClassifiers xsi:type="ecore:EDataType" name="RTMManagerProfile" instanceClassName="RTM.ManagerProfile"/>
<eClassifiers xsi:type="ecore:EDataType" name="RTMModuleProfile" instanceClassName="RTM.ModuleProfile"/>
Modified: trunk/rtmtools/jp.go.aist.rtm.toolscommon/src/jp/go/aist/rtm/toolscommon/model/toolscommon.genmodel
===================================================================
--- trunk/rtmtools/jp.go.aist.rtm.toolscommon/src/jp/go/aist/rtm/toolscommon/model/toolscommon.genmodel 2017-03-31 03:24:38 UTC (rev 712)
+++ trunk/rtmtools/jp.go.aist.rtm.toolscommon/src/jp/go/aist/rtm/toolscommon/model/toolscommon.genmodel 2017-03-31 03:47:35 UTC (rev 713)
@@ -1,9 +1,8 @@
<?xml version="1.0" encoding="UTF-8"?>
-<genmodel:GenModel xmi:version="2.0"
- xmlns:xmi="http://www.omg.org/XMI" xmlns:ecore="http://www.eclipse.org/emf/2002/Ecore"
- xmlns:genmodel="http://www.eclipse.org/emf/2002/GenModel" modelDirectory="/jp.go.aist.rtm.toolscommon/src"
- modelPluginID="jp.go.aist.rtm.toolscommon" modelName="ToolsCommon" importerID="org.eclipse.emf.importer.ecore"
- complianceLevel="5.0" runtimeVersion="2.4" language="">
+<genmodel:GenModel xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:ecore="http://www.eclipse.org/emf/2002/Ecore"
+ xmlns:genmodel="http://www.eclipse.org/emf/2002/GenModel" modelDirectory="/jp.go.aist.rtm.toolscommon/src" modelPluginID="jp.go.aist.rtm.toolscommon"
+ modelName="ToolsCommon" importerID="org.eclipse.emf.importer.ecore" complianceLevel="7.0"
+ runtimeVersion="2.4" language="">
<genAnnotations source="http://www.eclipse.org/emf/2002/GenModel/exporter/org.eclipse.xsd.ecore.exporter">
<genAnnotations source="selectedPackages">
<details key="http://rtm.aist.go.jp/toolscommon/model/toolscommon" value="core.xsd"/>
@@ -24,6 +23,10 @@
<genFeatures createChild="false" ecoreFeature="ecore:EAttribute manager.ecore#//RTCManager/loadableModuleProfiles"/>
<genFeatures createChild="false" ecoreFeature="ecore:EAttribute manager.ecore#//RTCManager/loadedModuleProfiles"/>
<genFeatures createChild="false" ecoreFeature="ecore:EAttribute manager.ecore#//RTCManager/factoryModuleProfiles"/>
+ <genFeatures createChild="false" ecoreFeature="ecore:EAttribute manager.ecore#//RTCManager/master"/>
+ <genFeatures notify="false" createChild="false" propertySortChoices="true" ecoreFeature="ecore:EReference manager.ecore#//RTCManager/masterManagers"/>
+ <genFeatures notify="false" createChild="false" propertySortChoices="true" ecoreFeature="ecore:EReference manager.ecore#//RTCManager/slaveManagers"/>
+ <genFeatures notify="false" createChild="false" propertySortChoices="true" ecoreFeature="ecore:EReference manager.ecore#//RTCManager/configuratoins"/>
<genOperations ecoreOperation="manager.ecore#//RTCManager/getProfileR"/>
<genOperations ecoreOperation="manager.ecore#//RTCManager/createComponentR">
<genParameters ecoreParameter="manager.ecore#//RTCManager/createComponentR/compName"/>
@@ -45,6 +48,7 @@
<genOperations ecoreOperation="manager.ecore#//RTCManager/getFactoryModuleProfilesR"/>
<genOperations ecoreOperation="manager.ecore#//RTCManager/forkR"/>
<genOperations ecoreOperation="manager.ecore#//RTCManager/shutdownR"/>
+ <genOperations ecoreOperation="manager.ecore#//RTCManager/restartR"/>
<genOperations ecoreOperation="manager.ecore#//RTCManager/getComponentInstanceNamesR"/>
<genOperations ecoreOperation="manager.ecore#//RTCManager/getLoadableModuleFileNamesR"/>
<genOperations ecoreOperation="manager.ecore#//RTCManager/getLoadedModuleFileNamesR"/>
@@ -53,6 +57,26 @@
<genOperations ecoreOperation="manager.ecore#//RTCManager/getLoadableModuleFileNames"/>
<genOperations ecoreOperation="manager.ecore#//RTCManager/getLoadedModuleFileNames"/>
<genOperations ecoreOperation="manager.ecore#//RTCManager/getFactoryTypeNames"/>
+ <genOperations ecoreOperation="manager.ecore#//RTCManager/isMasterR"/>
+ <genOperations ecoreOperation="manager.ecore#//RTCManager/getMasterManagersR"/>
+ <genOperations ecoreOperation="manager.ecore#//RTCManager/addMasterManagerR">
+ <genParameters ecoreParameter="manager.ecore#//RTCManager/addMasterManagerR/mgr"/>
+ </genOperations>
+ <genOperations ecoreOperation="manager.ecore#//RTCManager/removeMasterManagerR">
+ <genParameters ecoreParameter="manager.ecore#//RTCManager/removeMasterManagerR/mgr"/>
+ </genOperations>
+ <genOperations ecoreOperation="manager.ecore#//RTCManager/getSlaveManagersR"/>
+ <genOperations ecoreOperation="manager.ecore#//RTCManager/addSlaveManagerR">
+ <genParameters ecoreParameter="manager.ecore#//RTCManager/addSlaveManagerR/mgr"/>
+ </genOperations>
+ <genOperations ecoreOperation="manager.ecore#//RTCManager/removeSlaveManagerR">
+ <genParameters ecoreParameter="manager.ecore#//RTCManager/removeSlaveManagerR/mgr"/>
+ </genOperations>
+ <genOperations ecoreOperation="manager.ecore#//RTCManager/getConfigurationR"/>
+ <genOperations ecoreOperation="manager.ecore#//RTCManager/setConfigurationR">
+ <genParameters ecoreParameter="manager.ecore#//RTCManager/setConfigurationR/name"/>
+ <genParameters ecoreParameter="manager.ecore#//RTCManager/setConfigurationR/value"/>
+ </genOperations>
</genClasses>
</genPackages>
<genPackages prefix="Core" basePackage="jp.go.aist.rtm.toolscommon.model" disposableProviderFactory="true"
@@ -89,15 +113,18 @@
<genDataTypes ecoreDataType="component.ecore#//SDOConfiguration"/>
<genDataTypes ecoreDataType="component.ecore#//SDOConfigurationSet"/>
<genDataTypes ecoreDataType="component.ecore#//SDOOrganization"/>
+ <genDataTypes ecoreDataType="component.ecore#//SDOServiceProfile"/>
<genDataTypes ecoreDataType="component.ecore#//RTCRTObject"/>
<genDataTypes ecoreDataType="component.ecore#//RTCComponentProfile"/>
<genDataTypes ecoreDataType="component.ecore#//RTCConnectorProfile"/>
<genDataTypes ecoreDataType="component.ecore#//RTCPortProfile"/>
<genDataTypes ecoreDataType="component.ecore#//RTCExecutionContext"/>
<genDataTypes ecoreDataType="component.ecore#//RTCExecutionContextProfile"/>
+ <genDataTypes ecoreDataType="component.ecore#//RTCFsmStructure"/>
<genDataTypes ecoreDataType="component.ecore#//PropertyChangeListener"/>
<genDataTypes ecoreDataType="component.ecore#//PortInterfaceProfile"/>
<genDataTypes ecoreDataType="component.ecore#//List"/>
+ <genDataTypes ecoreDataType="component.ecore#//Servant"/>
<genClasses ecoreClass="component.ecore#//SystemDiagram">
<genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference component.ecore#//SystemDiagram/components"/>
<genFeatures createChild="false" ecoreFeature="ecore:EAttribute component.ecore#//SystemDiagram/kind"/>
@@ -126,6 +153,9 @@
<genFeatures property="Readonly" notify="false" createChild="false" ecoreFeature="ecore:EReference component.ecore#//Component/serviceports"/>
<genFeatures notify="false" createChild="false" propertySortChoices="true" ecoreFeature="ecore:EReference component.ecore#//Component/components"/>
<genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference component.ecore#//Component/executionContexts"/>
+ <genFeatures notify="false" createChild="false" propertySortChoices="true" ecoreFeature="ecore:EReference component.ecore#//Component/participationContexts"/>
+ <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference component.ecore#//Component/executionContextHandler"/>
+ <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference component.ecore#//Component/participationContextHandler"/>
<genFeatures notify="false" createChild="false" propertySortChoices="true" ecoreFeature="ecore:EReference component.ecore#//Component/childSystemDiagram"/>
<genFeatures createChild="false" ecoreFeature="ecore:EAttribute component.ecore#//Component/instanceNameL"/>
<genFeatures createChild="false" ecoreFeature="ecore:EAttribute component.ecore#//Component/venderL"/>
@@ -141,10 +171,14 @@
<genOperations ecoreOperation="component.ecore#//Component/getAllComponents"/>
<genOperations ecoreOperation="component.ecore#//Component/isCompositeComponent"/>
<genOperations ecoreOperation="component.ecore#//Component/isGroupingCompositeComponent"/>
+ <genOperations ecoreOperation="component.ecore#//Component/hasComponentAction"/>
<genOperations ecoreOperation="component.ecore#//Component/inOnlineSystemDiagram"/>
<genOperations ecoreOperation="component.ecore#//Component/setComponentsR">
<genParameters ecoreParameter="component.ecore#//Component/setComponentsR/componentList"/>
</genOperations>
+ <genOperations ecoreOperation="component.ecore#//Component/addComponentsR">
+ <genParameters ecoreParameter="component.ecore#//Component/addComponentsR/componentList"/>
+ </genOperations>
<genOperations ecoreOperation="component.ecore#//Component/removeComponentR">
<genParameters ecoreParameter="component.ecore#//Component/removeComponentR/component"/>
</genOperations>
@@ -160,32 +194,55 @@
<genParameters ecoreParameter="component.ecore#//Component/updateConfigurationSetListR/activeConfigurationSet"/>
<genParameters ecoreParameter="component.ecore#//Component/updateConfigurationSetListR/originallist"/>
</genOperations>
- <genOperations ecoreOperation="component.ecore#//Component/addComponentsR">
- <genParameters ecoreParameter="component.ecore#//Component/addComponentsR/componentList"/>
- </genOperations>
<genOperations ecoreOperation="component.ecore#//Component/getPath"/>
- <genOperations ecoreOperation="component.ecore#//Component/setExecutionContext">
- <genParameters ecoreParameter="component.ecore#//Component/setExecutionContext/id"/>
- <genParameters ecoreParameter="component.ecore#//Component/setExecutionContext/ec"/>
- </genOperations>
- <genOperations ecoreOperation="component.ecore#//Component/getExecutionContext">
- <genParameters ecoreParameter="component.ecore#//Component/getExecutionContext/id"/>
- </genOperations>
- <genOperations ecoreOperation="component.ecore#//Component/getExecutionContextId">
- <genParameters ecoreParameter="component.ecore#//Component/getExecutionContextId/ec"/>
- </genOperations>
</genClasses>
<genClasses ecoreClass="component.ecore#//ComponentSpecification">
<genFeatures createChild="false" ecoreFeature="ecore:EAttribute component.ecore#//ComponentSpecification/aliasName"/>
<genFeatures createChild="false" ecoreFeature="ecore:EAttribute component.ecore#//ComponentSpecification/specUnLoad"/>
+ <genFeatures createChild="false" ecoreFeature="ecore:EAttribute component.ecore#//ComponentSpecification/rtcType"/>
</genClasses>
<genClasses ecoreClass="component.ecore#//ExecutionContext">
<genFeatures createChild="false" ecoreFeature="ecore:EAttribute component.ecore#//ExecutionContext/kindL"/>
<genFeatures createChild="false" ecoreFeature="ecore:EAttribute component.ecore#//ExecutionContext/rateL"/>
<genFeatures createChild="false" ecoreFeature="ecore:EAttribute component.ecore#//ExecutionContext/stateL"/>
+ <genFeatures notify="false" createChild="false" propertySortChoices="true" ecoreFeature="ecore:EReference component.ecore#//ExecutionContext/owner"/>
+ <genFeatures notify="false" createChild="false" propertySortChoices="true" ecoreFeature="ecore:EReference component.ecore#//ExecutionContext/participants"/>
<genOperations ecoreOperation="component.ecore#//ExecutionContext/getKindName"/>
<genOperations ecoreOperation="component.ecore#//ExecutionContext/getStateName"/>
+ <genOperations ecoreOperation="component.ecore#//ExecutionContext/setRateR">
+ <genParameters ecoreParameter="component.ecore#//ExecutionContext/setRateR/rate"/>
+ </genOperations>
+ <genOperations ecoreOperation="component.ecore#//ExecutionContext/addComponentR">
+ <genParameters ecoreParameter="component.ecore#//ExecutionContext/addComponentR/comp"/>
+ </genOperations>
+ <genOperations ecoreOperation="component.ecore#//ExecutionContext/removeComponentR">
+ <genParameters ecoreParameter="component.ecore#//ExecutionContext/removeComponentR/comp"/>
+ </genOperations>
</genClasses>
+ <genClasses ecoreClass="component.ecore#//ContextHandler">
+ <genOperations ecoreOperation="component.ecore#//ContextHandler/setContext">
+ <genParameters ecoreParameter="component.ecore#//ContextHandler/setContext/id"/>
+ <genParameters ecoreParameter="component.ecore#//ContextHandler/setContext/ec"/>
+ </genOperations>
+ <genOperations ecoreOperation="component.ecore#//ContextHandler/getContext">
+ <genParameters ecoreParameter="component.ecore#//ContextHandler/getContext/id"/>
+ </genOperations>
+ <genOperations ecoreOperation="component.ecore#//ContextHandler/getId">
+ <genParameters ecoreParameter="component.ecore#//ContextHandler/getId/ec"/>
+ </genOperations>
+ <genOperations ecoreOperation="component.ecore#//ContextHandler/removeContext">
+ <genParameters ecoreParameter="component.ecore#//ContextHandler/removeContext/id"/>
+ </genOperations>
+ <genOperations ecoreOperation="component.ecore#//ContextHandler/removeId">
+ <genParameters ecoreParameter="component.ecore#//ContextHandler/removeId/ec"/>
+ </genOperations>
+ <genOperations ecoreOperation="component.ecore#//ContextHandler/sync"/>
+ <genOperations ecoreOperation="component.ecore#//ContextHandler/values"/>
+ <genOperations ecoreOperation="component.ecore#//ContextHandler/keys"/>
+ <genOperations ecoreOperation="component.ecore#//ContextHandler/clear"/>
+ <genOperations ecoreOperation="component.ecore#//ContextHandler/getType"/>
+ <genOperations ecoreOperation="component.ecore#//ContextHandler/getOwnerContexts"/>
+ </genClasses>
<genClasses ecoreClass="component.ecore#//ConfigurationSet">
<genFeatures createChild="false" ecoreFeature="ecore:EAttribute component.ecore#//ConfigurationSet/id"/>
<genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference component.ecore#//ConfigurationSet/configurationData"/>
@@ -226,6 +283,12 @@
<genClasses ecoreClass="component.ecore#//ServicePort"/>
<genClasses ecoreClass="component.ecore#//PortSynchronizer">
<genFeatures createChild="false" ecoreFeature="ecore:EAttribute component.ecore#//PortSynchronizer/originalPortString"/>
+ <genOperations ecoreOperation="component.ecore#//PortSynchronizer/disconnect">
+ <genParameters ecoreParameter="component.ecore#//PortSynchronizer/disconnect/conn_id"/>
+ </genOperations>
+ <genOperations ecoreOperation="component.ecore#//PortSynchronizer/disconnect.1">
+ <genParameters ecoreParameter="component.ecore#//PortSynchronizer/disconnect.1/conn_prof"/>
+ </genOperations>
<genOperations ecoreOperation="component.ecore#//PortSynchronizer/disconnectAll"/>
</genClasses>
<genClasses ecoreClass="component.ecore#//PortConnector">
@@ -246,21 +309,54 @@
<genFeatures createChild="false" ecoreFeature="ecore:EAttribute component.ecore#//ConnectorProfile/dataType"/>
<genFeatures createChild="false" ecoreFeature="ecore:EAttribute component.ecore#//ConnectorProfile/interfaceType"/>
<genFeatures createChild="false" ecoreFeature="ecore:EAttribute component.ecore#//ConnectorProfile/pushRate"/>
+ <genFeatures createChild="false" ecoreFeature="ecore:EAttribute component.ecore#//ConnectorProfile/pushPolicy"/>
+ <genFeatures createChild="false" ecoreFeature="ecore:EAttribute component.ecore#//ConnectorProfile/skipCount"/>
+ <genFeatures property="Readonly" createChild="false" ecoreFeature="ecore:EAttribute component.ecore#//ConnectorProfile/pushPolicyAvailable"/>
+ <genFeatures property="Readonly" createChild="false" ecoreFeature="ecore:EAttribute component.ecore#//ConnectorProfile/skipCountAvailable"/>
<genFeatures createChild="false" ecoreFeature="ecore:EAttribute component.ecore#//ConnectorProfile/sourceString"/>
<genFeatures createChild="false" ecoreFeature="ecore:EAttribute component.ecore#//ConnectorProfile/targetString"/>
+ <genFeatures createChild="false" ecoreFeature="ecore:EAttribute component.ecore#//ConnectorProfile/outportBufferLength"/>
+ <genFeatures createChild="false" ecoreFeature="ecore:EAttribute component.ecore#//ConnectorProfile/outportBufferFullPolicy"/>
+ <genFeatures createChild="false" ecoreFeature="ecore:EAttribute component.ecore#//ConnectorProfile/outportBufferWriteTimeout"/>
+ <genFeatures createChild="false" ecoreFeature="ecore:EAttribute component.ecore#//ConnectorProfile/outportBufferEmptyPolicy"/>
+ <genFeatures createChild="false" ecoreFeature="ecore:EAttribute component.ecore#//ConnectorProfile/outportBufferReadTimeout"/>
+ <genFeatures createChild="false" ecoreFeature="ecore:EAttribute component.ecore#//ConnectorProfile/inportBufferLength"/>
+ <genFeatures createChild="false" ecoreFeature="ecore:EAttribute component.ecore#//ConnectorProfile/inportBufferFullPolicy"/>
+ <genFeatures createChild="false" ecoreFeature="ecore:EAttribute component.ecore#//ConnectorProfile/inportBufferWriteTimeout"/>
+ <genFeatures createChild="false" ecoreFeature="ecore:EAttribute component.ecore#//ConnectorProfile/inportBufferEmptyPolicy"/>
+ <genFeatures createChild="false" ecoreFeature="ecore:EAttribute component.ecore#//ConnectorProfile/inportBufferReadTimeout"/>
</genClasses>
<genClasses ecoreClass="component.ecore#//EIntegerObjectToPointMapEntry">
<genFeatures createChild="false" ecoreFeature="ecore:EAttribute component.ecore#//EIntegerObjectToPointMapEntry/key"/>
<genFeatures createChild="false" ecoreFeature="ecore:EAttribute component.ecore#//EIntegerObjectToPointMapEntry/value"/>
</genClasses>
+ <genClasses image="false" ecoreClass="component.ecore#//IPropertyMap">
+ <genOperations ecoreOperation="component.ecore#//IPropertyMap/getProperty">
+ <genParameters ecoreParameter="component.ecore#//IPropertyMap/getProperty/key"/>
+ </genOperations>
+ <genOperations ecoreOperation="component.ecore#//IPropertyMap/setProperty">
+ <genParameters ecoreParameter="component.ecore#//IPropertyMap/setProperty/key"/>
+ <genParameters ecoreParameter="component.ecore#//IPropertyMap/setProperty/value"/>
+ </genOperations>
+ <genOperations ecoreOperation="component.ecore#//IPropertyMap/removeProperty">
+ <genParameters ecoreParameter="component.ecore#//IPropertyMap/removeProperty/key"/>
+ </genOperations>
+ <genOperations ecoreOperation="component.ecore#//IPropertyMap/getPropertyKeys"/>
+ <genOperations ecoreOperation="component.ecore#//IPropertyMap/getPropertyMap"/>
+ </genClasses>
<genClasses ecoreClass="component.ecore#//CorbaComponent">
<genFeatures createChild="false" ecoreFeature="ecore:EAttribute component.ecore#//CorbaComponent/executionContextState"/>
<genFeatures createChild="false" ecoreFeature="ecore:EAttribute component.ecore#//CorbaComponent/componentState"/>
+ <genFeatures createChild="false" ecoreFeature="ecore:EAttribute component.ecore#//CorbaComponent/rTCComponentProfile"/>
+ <genFeatures createChild="false" ecoreFeature="ecore:EAttribute component.ecore#//CorbaComponent/rTCExecutionContexts"/>
+ <genFeatures createChild="false" ecoreFeature="ecore:EAttribute component.ecore#//CorbaComponent/rTCParticipationContexts"/>
<genFeatures createChild="false" ecoreFeature="ecore:EAttribute component.ecore#//CorbaComponent/sDOConfiguration"/>
- <genFeatures createChild="false" ecoreFeature="ecore:EAttribute component.ecore#//CorbaComponent/rTCComponentProfile"/>
- <genFeatures createChild="false" ecoreFeature="ecore:EAttribute component.ecore#//CorbaComponent/rTCExecutionContext"/>
<genFeatures createChild="false" ecoreFeature="ecore:EAttribute component.ecore#//CorbaComponent/sDOOrganization"/>
+ <genFeatures createChild="false" ecoreFeature="ecore:EAttribute component.ecore#//CorbaComponent/rTCRTObjects"/>
+ <genFeatures createChild="false" ecoreFeature="ecore:EAttribute component.ecore#//CorbaComponent/rTCFsmStructure"/>
<genFeatures createChild="false" ecoreFeature="ecore:EAttribute component.ecore#//CorbaComponent/ior"/>
+ <genFeatures notify="false" createChild="false" propertySortChoices="true" ecoreFeature="ecore:EReference component.ecore#//CorbaComponent/statusObserver"/>
+ <genFeatures notify="false" createChild="false" propertySortChoices="true" ecoreFeature="ecore:EReference component.ecore#//CorbaComponent/logObserver"/>
<genOperations ecoreOperation="component.ecore#//CorbaComponent/startR"/>
<genOperations ecoreOperation="component.ecore#//CorbaComponent/stopR"/>
<genOperations ecoreOperation="component.ecore#//CorbaComponent/activateR"/>
@@ -269,6 +365,8 @@
<genOperations ecoreOperation="component.ecore#//CorbaComponent/finalizeR"/>
<genOperations ecoreOperation="component.ecore#//CorbaComponent/exitR"/>
<genOperations ecoreOperation="component.ecore#//CorbaComponent/getCorbaObjectInterface"/>
+ <genOperations ecoreOperation="component.ecore#//CorbaComponent/supportedCorbaObserver"/>
+ <genOperations ecoreOperation="component.ecore#//CorbaComponent/supportedFsmService"/>
</genClasses>
<genClasses ecoreClass="component.ecore#//CorbaPortSynchronizer">
<genFeatures createChild="false" ecoreFeature="ecore:EAttribute component.ecore#//CorbaPortSynchronizer/rTCPortProfile"/>
@@ -281,6 +379,46 @@
</genClasses>
<genClasses ecoreClass="component.ecore#//CorbaExecutionContext">
<genFeatures createChild="false" propertyDescription="" ecoreFeature="ecore:EAttribute component.ecore#//CorbaExecutionContext/rtcExecutionContextProfile"/>
+ <genOperations ecoreOperation="component.ecore#//CorbaExecutionContext/startR"/>
+ <genOperations ecoreOperation="component.ecore#//CorbaExecutionContext/stopR"/>
+ <genOperations ecoreOperation="component.ecore#//CorbaExecutionContext/activateR">
+ <genParameters ecoreParameter="component.ecore#//CorbaExecutionContext/activateR/comp"/>
+ </genOperations>
+ <genOperations ecoreOperation="component.ecore#//CorbaExecutionContext/deactivateR">
+ <genParameters ecoreParameter="component.ecore#//CorbaExecutionContext/deactivateR/comp"/>
+ </genOperations>
+ <genOperations ecoreOperation="component.ecore#//CorbaExecutionContext/resetR">
+ <genParameters ecoreParameter="component.ecore#//CorbaExecutionContext/resetR/comp"/>
+ </genOperations>
+ <genOperations ecoreOperation="component.ecore#//CorbaExecutionContext/getComponentStateR">
+ <genParameters ecoreParameter="component.ecore#//CorbaExecutionContext/getComponentStateR/comp"/>
+ </genOperations>
+ <genOperations ecoreOperation="component.ecore#//CorbaExecutionContext/getComponentState">
+ <genParameters ecoreParameter="component.ecore#//CorbaExecutionContext/getComponentState/comp"/>
+ </genOperations>
+ <genOperations ecoreOperation="component.ecore#//CorbaExecutionContext/setComponentState">
+ <genParameters ecoreParameter="component.ecore#//CorbaExecutionContext/setComponentState/comp"/>
+ <genParameters ecoreParameter="component.ecore#//CorbaExecutionContext/setComponentState/state"/>
+ </genOperations>
+ <genOperations ecoreOperation="component.ecore#//CorbaExecutionContext/getComponentStateName">
+ <genParameters ecoreParameter="component.ecore#//CorbaExecutionContext/getComponentStateName/comp"/>
+ </genOperations>
</genClasses>
+ <genClasses ecoreClass="component.ecore#//CorbaContextHandler"/>
+ <genClasses ecoreClass="component.ecore#//CorbaObserver">
+ <genFeatures property="Readonly" createChild="false" ecoreFeature="ecore:EAttribute component.ecore#//CorbaObserver/serviceProfile"/>
+ <genFeatures property="Readonly" createChild="false" ecoreFeature="ecore:EAttribute component.ecore#//CorbaObserver/servant"/>
+ <genOperations ecoreOperation="component.ecore#//CorbaObserver/activate"/>
+ <genOperations ecoreOperation="component.ecore#//CorbaObserver/deactivate"/>
+ <genOperations ecoreOperation="component.ecore#//CorbaObserver/attachComponent">
+ <genParameters ecoreParameter="component.ecore#//CorbaObserver/attachComponent/component"/>
+ </genOperations>
+ <genOperations ecoreOperation="component.ecore#//CorbaObserver/detachComponent"/>
+ <genOperations ecoreOperation="component.ecore#//CorbaObserver/finish"/>
+ </genClasses>
+ <genClasses ecoreClass="component.ecore#//CorbaStatusObserver">
+ <genOperations ecoreOperation="component.ecore#//CorbaStatusObserver/isTimeOut"/>
+ </genClasses>
+ <genClasses ecoreClass="component.ecore#//CorbaLogObserver"/>
</genPackages>
</genmodel:GenModel>
openrtm-commit メーリングリストの案内