[openrtm-commit:03120] r789 - in trunk/rtmtools/jp.go.aist.rtm.toolscommon: . META-INF src/jp/go/aist/rtm/toolscommon/model src/jp/go/aist/rtm/toolscommon/model/component src/jp/go/aist/rtm/toolscommon/model/component/impl src/jp/go/aist/rtm/toolscommon/model/core/impl src/jp/go/aist/rtm/toolscommon/model/core/util src/jp/go/aist/rtm/toolscommon/model/manager/impl src/jp/go/aist/rtm/toolscommon/ui/propertysource src/jp/go/aist/rtm/toolscommon/util
openrtm ＠ openrtm.org
openrtm ＠ openrtm.org
2018年 1月 23日 (火) 22:38:58 JST
Author: ga
Date: 2018-01-23 22:38:57 +0900 (Tue, 23 Jan 2018)
New Revision: 789
Modified:
trunk/rtmtools/jp.go.aist.rtm.toolscommon/META-INF/MANIFEST.MF
trunk/rtmtools/jp.go.aist.rtm.toolscommon/plugin.xml
trunk/rtmtools/jp.go.aist.rtm.toolscommon/src/jp/go/aist/rtm/toolscommon/model/component.ecore
trunk/rtmtools/jp.go.aist.rtm.toolscommon/src/jp/go/aist/rtm/toolscommon/model/component/ComponentPackage.java
trunk/rtmtools/jp.go.aist.rtm.toolscommon/src/jp/go/aist/rtm/toolscommon/model/component/ConnectorProfile.java
trunk/rtmtools/jp.go.aist.rtm.toolscommon/src/jp/go/aist/rtm/toolscommon/model/component/impl/ComponentFactoryImpl.java
trunk/rtmtools/jp.go.aist.rtm.toolscommon/src/jp/go/aist/rtm/toolscommon/model/component/impl/ComponentImpl.java
trunk/rtmtools/jp.go.aist.rtm.toolscommon/src/jp/go/aist/rtm/toolscommon/model/component/impl/ComponentPackageImpl.java
trunk/rtmtools/jp.go.aist.rtm.toolscommon/src/jp/go/aist/rtm/toolscommon/model/component/impl/ComponentSpecificationImpl.java
trunk/rtmtools/jp.go.aist.rtm.toolscommon/src/jp/go/aist/rtm/toolscommon/model/component/impl/ConnectorProfileImpl.java
trunk/rtmtools/jp.go.aist.rtm.toolscommon/src/jp/go/aist/rtm/toolscommon/model/component/impl/CorbaComponentImpl.java
trunk/rtmtools/jp.go.aist.rtm.toolscommon/src/jp/go/aist/rtm/toolscommon/model/component/impl/CorbaConnectorProfileImpl.java
trunk/rtmtools/jp.go.aist.rtm.toolscommon/src/jp/go/aist/rtm/toolscommon/model/component/impl/CorbaStatusObserverImpl.java
trunk/rtmtools/jp.go.aist.rtm.toolscommon/src/jp/go/aist/rtm/toolscommon/model/component/impl/ExecutionContextImpl.java
trunk/rtmtools/jp.go.aist.rtm.toolscommon/src/jp/go/aist/rtm/toolscommon/model/component/impl/PortImpl.java
trunk/rtmtools/jp.go.aist.rtm.toolscommon/src/jp/go/aist/rtm/toolscommon/model/component/impl/SystemDiagramImpl.java
trunk/rtmtools/jp.go.aist.rtm.toolscommon/src/jp/go/aist/rtm/toolscommon/model/core/impl/CoreFactoryImpl.java
trunk/rtmtools/jp.go.aist.rtm.toolscommon/src/jp/go/aist/rtm/toolscommon/model/core/impl/CorePackageImpl.java
trunk/rtmtools/jp.go.aist.rtm.toolscommon/src/jp/go/aist/rtm/toolscommon/model/core/util/CoreSwitch.java
trunk/rtmtools/jp.go.aist.rtm.toolscommon/src/jp/go/aist/rtm/toolscommon/model/manager/impl/ManagerFactoryImpl.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/ui/propertysource/PortConnectorPropertySource.java
trunk/rtmtools/jp.go.aist.rtm.toolscommon/src/jp/go/aist/rtm/toolscommon/util/RtsProfileHandler.java
Log:
Add time stamp option selection pull-down to data port connection dialog. #4390
Modified: trunk/rtmtools/jp.go.aist.rtm.toolscommon/META-INF/MANIFEST.MF
===================================================================
--- trunk/rtmtools/jp.go.aist.rtm.toolscommon/META-INF/MANIFEST.MF 2017-12-16 06:51:01 UTC (rev 788)
+++ trunk/rtmtools/jp.go.aist.rtm.toolscommon/META-INF/MANIFEST.MF 2018-01-23 13:38:57 UTC (rev 789)
@@ -3,30 +3,49 @@
Created-By: 20.0-b12 (Sun Microsystems Inc.)
Bundle-ManifestVersion: 2
Bundle-Name: %pluginName
-Bundle-SymbolicName: jp.go.aist.rtm.toolscommon; singleton:=true
+Bundle-SymbolicName: jp.go.aist.rtm.toolscommon;singleton:=true
Bundle-Version: 1.1.0.rc4v20130124
-Bundle-ClassPath: .,lib/commons-lang-2.2.jar
+Bundle-ClassPath: .,
+ lib/commons-lang-2.2.jar
Bundle-Vendor: %providerName
Bundle-Localization: plugin
-Export-Package: OpenRTM,RTC,RTM,_SDOPackage,jp.go.aist.rtm.toolscommon
- ,jp.go.aist.rtm.toolscommon.adapterfactory,jp.go.aist.rtm.toolscommon
- .corba,jp.go.aist.rtm.toolscommon.extension,jp.go.aist.rtm.toolscommo
- n.factory,jp.go.aist.rtm.toolscommon.manager,jp.go.aist.rtm.toolscomm
- on.model.component,jp.go.aist.rtm.toolscommon.model.component.impl,jp
- .go.aist.rtm.toolscommon.model.component.util,jp.go.aist.rtm.toolscom
- mon.model.core,jp.go.aist.rtm.toolscommon.model.core.impl,jp.go.aist.
- rtm.toolscommon.model.core.util,jp.go.aist.rtm.toolscommon.model.mana
- ger,jp.go.aist.rtm.toolscommon.model.manager.impl,jp.go.aist.rtm.tool
- scommon.model.manager.util,jp.go.aist.rtm.toolscommon.synchronization
- framework,jp.go.aist.rtm.toolscommon.synchronizationframework.mapping
- ,jp.go.aist.rtm.toolscommon.ui.dialog,jp.go.aist.rtm.toolscommon.ui.p
- erspective,jp.go.aist.rtm.toolscommon.ui.propertysource,jp.go.aist.rt
- m.toolscommon.ui.views.propertysheetview,jp.go.aist.rtm.toolscommon.u
- i.workbenchadapter,jp.go.aist.rtm.toolscommon.util,jp.go.aist.rtm.too
- lscommon.validation,org.apache.commons.lang,org.apache.commons.lang.b
- uilder,org.apache.commons.lang.enums,org.apache.commons.lang.exceptio
- n,org.apache.commons.lang.math,org.apache.commons.lang.mutable,org.ap
- ache.commons.lang.text,org.apache.commons.lang.time
+Bundle-RequiredExecutionEnvironment: JavaSE-1.7
+Export-Package: OpenRTM,
+ RTC,
+ RTM,
+ _SDOPackage,
+ jp.go.aist.rtm.toolscommon,
+ jp.go.aist.rtm.toolscommon.adapterfactory,
+ jp.go.aist.rtm.toolscommon.corba,
+ jp.go.aist.rtm.toolscommon.extension,
+ jp.go.aist.rtm.toolscommon.factory,
+ jp.go.aist.rtm.toolscommon.manager,
+ jp.go.aist.rtm.toolscommon.model.component,
+ jp.go.aist.rtm.toolscommon.model.component.impl,
+ jp.go.aist.rtm.toolscommon.model.component.util,
+ jp.go.aist.rtm.toolscommon.model.core,
+ jp.go.aist.rtm.toolscommon.model.core.impl,
+ jp.go.aist.rtm.toolscommon.model.core.util,
+ jp.go.aist.rtm.toolscommon.model.manager,
+ jp.go.aist.rtm.toolscommon.model.manager.impl,
+ jp.go.aist.rtm.toolscommon.model.manager.util,
+ jp.go.aist.rtm.toolscommon.synchronizationframework,
+ jp.go.aist.rtm.toolscommon.synchronizationframework.mapping,
+ jp.go.aist.rtm.toolscommon.ui.dialog,
+ jp.go.aist.rtm.toolscommon.ui.perspective,
+ jp.go.aist.rtm.toolscommon.ui.propertysource,
+ jp.go.aist.rtm.toolscommon.ui.views.propertysheetview,
+ jp.go.aist.rtm.toolscommon.ui.workbenchadapter,
+ jp.go.aist.rtm.toolscommon.util,
+ jp.go.aist.rtm.toolscommon.validation,
+ org.apache.commons.lang,
+ org.apache.commons.lang.builder,
+ org.apache.commons.lang.enums,
+ org.apache.commons.lang.exception,
+ org.apache.commons.lang.math,
+ org.apache.commons.lang.mutable,
+ org.apache.commons.lang.text,
+ org.apache.commons.lang.time
Require-Bundle: org.eclipse.core.runtime,
org.eclipse.emf.ecore;visibility:=reexport,
org.eclipse.emf.ecore.xmi;visibility:=reexport,
Modified: trunk/rtmtools/jp.go.aist.rtm.toolscommon/plugin.xml
===================================================================
--- trunk/rtmtools/jp.go.aist.rtm.toolscommon/plugin.xml 2017-12-16 06:51:01 UTC (rev 788)
+++ trunk/rtmtools/jp.go.aist.rtm.toolscommon/plugin.xml 2018-01-23 13:38:57 UTC (rev 789)
@@ -17,6 +17,14 @@
<extension-point id="portconnectorfactory" name="PortConnectorFactory" schema="schema/portconnectorfactory.exsd"/>
<extension-point id="loadcomponent" name="LoadComponent" schema="schema/loadcomponent.exsd"/>
+ <extension point="org.eclipse.emf.ecore.generated_package">
+ <!-- @generated toolscommon -->
+ <package
+ uri="http:///jp/go/aist/rtm/toolscommon/model/manager.ecore"
+ class="jp.go.aist.rtm.toolscommon.model.manager.ManagerPackage"
+ genModel="src/jp/go/aist/rtm/toolscommon/model/toolscommon.genmodel"/>
+ </extension>
+
<extension point="org.eclipse.emf.ecore.generated_package">
<package uri = "http://rtm.aist.go.jp/toolscommon/model/core"
class = "jp.go.aist.rtm.toolscommon.model.core.CorePackage" />
@@ -25,6 +33,14 @@
<package uri = "http://rtm.aist.go.jp/toolscommon/model/manager"
class="jp.go.aist.rtm.toolscommon.model.manager.ManagerPackage"/>
</extension>
+
+ <extension point="org.eclipse.emf.ecore.generated_package">
+ <!-- @generated toolscommon -->
+ <package
+ uri="http:///jp/go/aist/rtm/toolscommon/model/component.ecore"
+ class="jp.go.aist.rtm.toolscommon.model.component.ComponentPackage"
+ genModel="src/jp/go/aist/rtm/toolscommon/model/toolscommon.genmodel"/>
+ </extension>
<extension point="jp.go.aist.rtm.toolscommon.wrapperfactory">
<mappingrule seq="200" mappingrule="jp.go.aist.rtm.toolscommon.model.component.impl.CorbaConnectorProfileImpl.MAPPING_RULE"/>
<mappingrule seq="300" mappingrule="jp.go.aist.rtm.toolscommon.model.component.impl.CorbaPortSynchronizerImpl.MAPPING_RULE"/>
Modified: trunk/rtmtools/jp.go.aist.rtm.toolscommon/src/jp/go/aist/rtm/toolscommon/model/component/ComponentPackage.java
===================================================================
--- trunk/rtmtools/jp.go.aist.rtm.toolscommon/src/jp/go/aist/rtm/toolscommon/model/component/ComponentPackage.java 2017-12-16 06:51:01 UTC (rev 788)
+++ trunk/rtmtools/jp.go.aist.rtm.toolscommon/src/jp/go/aist/rtm/toolscommon/model/component/ComponentPackage.java 2018-01-23 13:38:57 UTC (rev 789)
@@ -1809,6 +1809,15 @@
int CONNECTOR_PROFILE__INPORT_BUFFER_READ_TIMEOUT = CorePackage.WRAPPER_OBJECT_FEATURE_COUNT + 24;
/**
+ * The feature id for the '<em><b>Timestamp Policy</b></em>' attribute.
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @generated
+ * @ordered
+ */
+ int CONNECTOR_PROFILE__TIMESTAMP_POLICY = CorePackage.WRAPPER_OBJECT_FEATURE_COUNT + 25;
+
+ /**
* The number of structural features of the '<em>Connector Profile</em>' class.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
@@ -1815,7 +1824,7 @@
* @generated
* @ordered
*/
- int CONNECTOR_PROFILE_FEATURE_COUNT = CorePackage.WRAPPER_OBJECT_FEATURE_COUNT + 25;
+ int CONNECTOR_PROFILE_FEATURE_COUNT = CorePackage.WRAPPER_OBJECT_FEATURE_COUNT + 26;
/**
* The feature id for the '<em><b>Key</b></em>' attribute.
@@ -2477,6 +2486,15 @@
int CORBA_CONNECTOR_PROFILE__INPORT_BUFFER_READ_TIMEOUT = CONNECTOR_PROFILE__INPORT_BUFFER_READ_TIMEOUT;
/**
+ * The feature id for the '<em><b>Timestamp Policy</b></em>' attribute.
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @generated
+ * @ordered
+ */
+ int CORBA_CONNECTOR_PROFILE__TIMESTAMP_POLICY = CONNECTOR_PROFILE__TIMESTAMP_POLICY;
+
+ /**
* The feature id for the '<em><b>Rtc Connector Profile</b></em>' attribute.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
@@ -4099,6 +4117,17 @@
EAttribute getConnectorProfile_InportBufferReadTimeout();
/**
+ * Returns the meta object for the attribute '{@link jp.go.aist.rtm.toolscommon.model.component.ConnectorProfile#getTimestampPolicy <em>Timestamp Policy</em>}'.
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @return the meta object for the attribute '<em>Timestamp Policy</em>'.
+ * @see jp.go.aist.rtm.toolscommon.model.component.ConnectorProfile#getTimestampPolicy()
+ * @see #getConnectorProfile()
+ * @generated
+ */
+ EAttribute getConnectorProfile_TimestampPolicy();
+
+ /**
* Returns the meta object for class '{@link jp.go.aist.rtm.toolscommon.model.component.ConfigurationSet <em>Configuration Set</em>}'.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
@@ -5418,6 +5447,14 @@
EAttribute CONNECTOR_PROFILE__INPORT_BUFFER_READ_TIMEOUT = eINSTANCE.getConnectorProfile_InportBufferReadTimeout();
/**
+ * The meta object literal for the '<em><b>Timestamp Policy</b></em>' attribute feature.
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @generated
+ */
+ EAttribute CONNECTOR_PROFILE__TIMESTAMP_POLICY = eINSTANCE.getConnectorProfile_TimestampPolicy();
+
+ /**
* The meta object literal for the '{@link jp.go.aist.rtm.toolscommon.model.component.impl.ConfigurationSetImpl <em>Configuration Set</em>}' class.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
Modified: trunk/rtmtools/jp.go.aist.rtm.toolscommon/src/jp/go/aist/rtm/toolscommon/model/component/ConnectorProfile.java
===================================================================
--- trunk/rtmtools/jp.go.aist.rtm.toolscommon/src/jp/go/aist/rtm/toolscommon/model/component/ConnectorProfile.java 2017-12-16 06:51:01 UTC (rev 788)
+++ trunk/rtmtools/jp.go.aist.rtm.toolscommon/src/jp/go/aist/rtm/toolscommon/model/component/ConnectorProfile.java 2018-01-23 13:38:57 UTC (rev 789)
@@ -41,6 +41,7 @@
static final String PUSH_RATE = "dataport.push_rate";
static final String PUSH_POLICY = "dataport.publisher.push_policy";
static final String SKIP_COUNT = "dataport.publisher.skip_count";
+ static final String TIMESTAMP_POLICY = "dataport.timestamp_policy";
//
static final String OUTPORT_BUFF_LENGTH = "dataport.outport.buffer.length";
static final String OUTPORT_FULL_POLICY = "dataport.outport.buffer.write.full_policy";
@@ -606,7 +607,33 @@
void setInportBufferReadTimeout(Double value);
/**
+ * Returns the value of the '<em><b>Timestamp Policy</b></em>' attribute.
+ * <!-- begin-user-doc -->
+ * <p>
+ * If the meaning of the '<em>Timestamp Policy</em>' attribute isn't clear,
+ * there really should be more of a description here...
+ * </p>
+ * <!-- end-user-doc -->
+ * @return the value of the '<em>Timestamp Policy</em>' attribute.
+ * @see #setTimestampPolicy(String)
+ * @see jp.go.aist.rtm.toolscommon.model.component.ComponentPackage#getConnectorProfile_TimestampPolicy()
* @model
+ * @generated
+ */
+ String getTimestampPolicy();
+
+ /**
+ * Sets the value of the '{@link jp.go.aist.rtm.toolscommon.model.component.ConnectorProfile#getTimestampPolicy <em>Timestamp Policy</em>}' attribute.
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @param value the new value of the '<em>Timestamp Policy</em>' attribute.
+ * @see #getTimestampPolicy()
+ * @generated
+ */
+ void setTimestampPolicy(String value);
+
+ /**
+ * @model
* @return 接続情報の名称
*/
public String getName();
Modified: trunk/rtmtools/jp.go.aist.rtm.toolscommon/src/jp/go/aist/rtm/toolscommon/model/component/impl/ComponentFactoryImpl.java
===================================================================
--- trunk/rtmtools/jp.go.aist.rtm.toolscommon/src/jp/go/aist/rtm/toolscommon/model/component/impl/ComponentFactoryImpl.java 2017-12-16 06:51:01 UTC (rev 788)
+++ trunk/rtmtools/jp.go.aist.rtm.toolscommon/src/jp/go/aist/rtm/toolscommon/model/component/impl/ComponentFactoryImpl.java 2018-01-23 13:38:57 UTC (rev 789)
@@ -11,6 +11,7 @@
import java.util.Map;
import jp.go.aist.rtm.toolscommon.corba.CorbaUtil;
+import jp.go.aist.rtm.toolscommon.model.component.*;
import jp.go.aist.rtm.toolscommon.model.component.ComponentFactory;
import jp.go.aist.rtm.toolscommon.model.component.ComponentPackage;
import jp.go.aist.rtm.toolscommon.model.component.ComponentSpecification;
@@ -79,7 +80,7 @@
*/
public static ComponentFactory init() {
try {
- ComponentFactory theComponentFactory = (ComponentFactory)EPackage.Registry.INSTANCE.getEFactory("http:///jp/go/aist/rtm/toolscommon/model/component.ecore");
+ ComponentFactory theComponentFactory = (ComponentFactory)EPackage.Registry.INSTANCE.getEFactory(ComponentPackage.eNS_URI);
if (theComponentFactory != null) {
return theComponentFactory;
}
Modified: trunk/rtmtools/jp.go.aist.rtm.toolscommon/src/jp/go/aist/rtm/toolscommon/model/component/impl/ComponentImpl.java
===================================================================
--- trunk/rtmtools/jp.go.aist.rtm.toolscommon/src/jp/go/aist/rtm/toolscommon/model/component/impl/ComponentImpl.java 2017-12-16 06:51:01 UTC (rev 788)
+++ trunk/rtmtools/jp.go.aist.rtm.toolscommon/src/jp/go/aist/rtm/toolscommon/model/component/impl/ComponentImpl.java 2018-01-23 13:38:57 UTC (rev 789)
@@ -1228,7 +1228,7 @@
case ComponentPackage.COMPONENT__COMPONENT_ID:
return getComponentId();
case ComponentPackage.COMPONENT__REQUIRED:
- return isRequired() ? Boolean.TRUE : Boolean.FALSE;
+ return isRequired();
}
return super.eGet(featureID, resolve, coreType);
}
@@ -1302,7 +1302,7 @@
setComponentId((String)newValue);
return;
case ComponentPackage.COMPONENT__REQUIRED:
- setRequired(((Boolean)newValue).booleanValue());
+ setRequired((Boolean)newValue);
return;
}
super.eSet(featureID, newValue);
Modified: trunk/rtmtools/jp.go.aist.rtm.toolscommon/src/jp/go/aist/rtm/toolscommon/model/component/impl/ComponentPackageImpl.java
===================================================================
--- trunk/rtmtools/jp.go.aist.rtm.toolscommon/src/jp/go/aist/rtm/toolscommon/model/component/impl/ComponentPackageImpl.java 2017-12-16 06:51:01 UTC (rev 788)
+++ trunk/rtmtools/jp.go.aist.rtm.toolscommon/src/jp/go/aist/rtm/toolscommon/model/component/impl/ComponentPackageImpl.java 2018-01-23 13:38:57 UTC (rev 789)
@@ -376,20 +376,10 @@
private static boolean isInited = false;
/**
- * Creates, registers, and initializes the <b>Package</b> for this
- * model, and for any others upon which it depends. Simple
- * dependencies are satisfied by calling this method on all
- * dependent packages before doing anything else. This method drives
- * initialization for interdependent packages directly, in parallel
- * with this package, itself.
- * <p>Of this package and its interdependencies, all packages which
- * have not yet been registered by their URI values are first created
- * and registered. The packages are then initialized in two steps:
- * meta-model objects for all of the packages are created before any
- * are initialized, since one package's meta-model objects may refer to
- * those of another.
- * <p>Invocation of this method will not affect any packages that have
- * already been initialized.
+ * Creates, registers, and initializes the <b>Package</b> for this model, and for any others upon which it depends.
+ *
+ * <p>This method is used to initialize {@link ComponentPackage#eINSTANCE} when that field is accessed.
+ * Clients should not invoke it directly. Instead, they should simply access that field to obtain the package.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
* @see #eNS_URI
@@ -401,7 +391,7 @@
if (isInited) return (ComponentPackage)EPackage.Registry.INSTANCE.getEPackage(ComponentPackage.eNS_URI);
// Obtain or create and register package
- ComponentPackageImpl theComponentPackage = (ComponentPackageImpl)(EPackage.Registry.INSTANCE.getEPackage(eNS_URI) instanceof ComponentPackageImpl ? EPackage.Registry.INSTANCE.getEPackage(eNS_URI) : new ComponentPackageImpl());
+ ComponentPackageImpl theComponentPackage = (ComponentPackageImpl)(EPackage.Registry.INSTANCE.get(eNS_URI) instanceof ComponentPackageImpl ? EPackage.Registry.INSTANCE.get(eNS_URI) : new ComponentPackageImpl());
isInited = true;
@@ -422,6 +412,9 @@
// Mark meta-data to indicate it can't be changed
theComponentPackage.freeze();
+
+ // Update the registry and return the package
+ EPackage.Registry.INSTANCE.put(ComponentPackage.eNS_URI, theComponentPackage);
return theComponentPackage;
}
@@ -1357,6 +1350,15 @@
* <!-- end-user-doc -->
* @generated
*/
+ public EAttribute getConnectorProfile_TimestampPolicy() {
+ return (EAttribute)connectorProfileEClass.getEStructuralFeatures().get(25);
+ }
+
+ /**
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @generated
+ */
public EClass getConfigurationSet() {
return configurationSetEClass;
}
@@ -1881,6 +1883,7 @@
createEAttribute(connectorProfileEClass, CONNECTOR_PROFILE__INPORT_BUFFER_WRITE_TIMEOUT);
createEAttribute(connectorProfileEClass, CONNECTOR_PROFILE__INPORT_BUFFER_EMPTY_POLICY);
createEAttribute(connectorProfileEClass, CONNECTOR_PROFILE__INPORT_BUFFER_READ_TIMEOUT);
+ createEAttribute(connectorProfileEClass, CONNECTOR_PROFILE__TIMESTAMP_POLICY);
eIntegerObjectToPointMapEntryEClass = createEClass(EINTEGER_OBJECT_TO_POINT_MAP_ENTRY);
createEAttribute(eIntegerObjectToPointMapEntryEClass, EINTEGER_OBJECT_TO_POINT_MAP_ENTRY__KEY);
@@ -2229,6 +2232,7 @@
initEAttribute(getConnectorProfile_InportBufferWriteTimeout(), ecorePackage.getEDoubleObject(), "inportBufferWriteTimeout", null, 0, 1, ConnectorProfile.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
initEAttribute(getConnectorProfile_InportBufferEmptyPolicy(), ecorePackage.getEString(), "inportBufferEmptyPolicy", null, 0, 1, ConnectorProfile.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
initEAttribute(getConnectorProfile_InportBufferReadTimeout(), ecorePackage.getEDoubleObject(), "inportBufferReadTimeout", null, 0, 1, ConnectorProfile.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+ initEAttribute(getConnectorProfile_TimestampPolicy(), ecorePackage.getEString(), "timestampPolicy", null, 0, 1, ConnectorProfile.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
initEClass(eIntegerObjectToPointMapEntryEClass, Map.Entry.class, "EIntegerObjectToPointMapEntry", !IS_ABSTRACT, !IS_INTERFACE, !IS_GENERATED_INSTANCE_CLASS);
initEAttribute(getEIntegerObjectToPointMapEntry_Key(), ecorePackage.getEIntegerObject(), "key", null, 0, 1, Map.Entry.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
Modified: trunk/rtmtools/jp.go.aist.rtm.toolscommon/src/jp/go/aist/rtm/toolscommon/model/component/impl/ComponentSpecificationImpl.java
===================================================================
--- trunk/rtmtools/jp.go.aist.rtm.toolscommon/src/jp/go/aist/rtm/toolscommon/model/component/impl/ComponentSpecificationImpl.java 2017-12-16 06:51:01 UTC (rev 788)
+++ trunk/rtmtools/jp.go.aist.rtm.toolscommon/src/jp/go/aist/rtm/toolscommon/model/component/impl/ComponentSpecificationImpl.java 2018-01-23 13:38:57 UTC (rev 789)
@@ -213,7 +213,7 @@
case ComponentPackage.COMPONENT_SPECIFICATION__ALIAS_NAME:
return getAliasName();
case ComponentPackage.COMPONENT_SPECIFICATION__SPEC_UN_LOAD:
- return isSpecUnLoad() ? Boolean.TRUE : Boolean.FALSE;
+ return isSpecUnLoad();
case ComponentPackage.COMPONENT_SPECIFICATION__RTC_TYPE:
return getRtcType();
}
@@ -232,7 +232,7 @@
setAliasName((String)newValue);
return;
case ComponentPackage.COMPONENT_SPECIFICATION__SPEC_UN_LOAD:
- setSpecUnLoad(((Boolean)newValue).booleanValue());
+ setSpecUnLoad((Boolean)newValue);
return;
case ComponentPackage.COMPONENT_SPECIFICATION__RTC_TYPE:
setRtcType((String)newValue);
Modified: trunk/rtmtools/jp.go.aist.rtm.toolscommon/src/jp/go/aist/rtm/toolscommon/model/component/impl/ConnectorProfileImpl.java
===================================================================
--- trunk/rtmtools/jp.go.aist.rtm.toolscommon/src/jp/go/aist/rtm/toolscommon/model/component/impl/ConnectorProfileImpl.java 2017-12-16 06:51:01 UTC (rev 788)
+++ trunk/rtmtools/jp.go.aist.rtm.toolscommon/src/jp/go/aist/rtm/toolscommon/model/component/impl/ConnectorProfileImpl.java 2018-01-23 13:38:57 UTC (rev 789)
@@ -49,6 +49,7 @@
* <li>{@link jp.go.aist.rtm.toolscommon.model.component.impl.ConnectorProfileImpl#getInportBufferWriteTimeout <em>Inport Buffer Write Timeout</em>}</li>
* <li>{@link jp.go.aist.rtm.toolscommon.model.component.impl.ConnectorProfileImpl#getInportBufferEmptyPolicy <em>Inport Buffer Empty Policy</em>}</li>
* <li>{@link jp.go.aist.rtm.toolscommon.model.component.impl.ConnectorProfileImpl#getInportBufferReadTimeout <em>Inport Buffer Read Timeout</em>}</li>
+ * <li>{@link jp.go.aist.rtm.toolscommon.model.component.impl.ConnectorProfileImpl#getTimestampPolicy <em>Timestamp Policy</em>}</li>
* </ul>
* </p>
*
@@ -505,6 +506,26 @@
*/
protected Double inportBufferReadTimeout = INPORT_BUFFER_READ_TIMEOUT_EDEFAULT;
+ /**
+ * The default value of the '{@link #getTimestampPolicy() <em>Timestamp Policy</em>}' attribute.
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @see #getTimestampPolicy()
+ * @generated
+ * @ordered
+ */
+ protected static final String TIMESTAMP_POLICY_EDEFAULT = null;
+
+ /**
+ * The cached value of the '{@link #getTimestampPolicy() <em>Timestamp Policy</em>}' attribute.
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @see #getTimestampPolicy()
+ * @generated
+ * @ordered
+ */
+ protected String timestampPolicy = TIMESTAMP_POLICY_EDEFAULT;
+
IPropertyMap properties;
/**
@@ -1017,6 +1038,27 @@
/**
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
+ * @generated
+ */
+ public String getTimestampPolicy() {
+ return timestampPolicy;
+ }
+
+ /**
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @generated
+ */
+ public void setTimestampPolicy(String newTimestampPolicy) {
+ String oldTimestampPolicy = timestampPolicy;
+ timestampPolicy = newTimestampPolicy;
+ if (eNotificationRequired())
+ eNotify(new ENotificationImpl(this, Notification.SET, ComponentPackage.CONNECTOR_PROFILE__TIMESTAMP_POLICY, oldTimestampPolicy, timestampPolicy));
+ }
+
+ /**
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
* @generated NOT
*/
public String getProperty(String key) {
@@ -1072,9 +1114,9 @@
case ComponentPackage.CONNECTOR_PROFILE__SUBSCRIPTION_TYPE:
return getSubscriptionType();
case ComponentPackage.CONNECTOR_PROFILE__SUBSCRIPTION_TYPE_AVAILABLE:
- return isSubscriptionTypeAvailable() ? Boolean.TRUE : Boolean.FALSE;
+ return isSubscriptionTypeAvailable();
case ComponentPackage.CONNECTOR_PROFILE__PUSH_INTERVAL_AVAILABLE:
- return isPushIntervalAvailable() ? Boolean.TRUE : Boolean.FALSE;
+ return isPushIntervalAvailable();
case ComponentPackage.CONNECTOR_PROFILE__NAME:
return getName();
case ComponentPackage.CONNECTOR_PROFILE__CONNECTOR_ID:
@@ -1090,9 +1132,9 @@
case ComponentPackage.CONNECTOR_PROFILE__SKIP_COUNT:
return getSkipCount();
case ComponentPackage.CONNECTOR_PROFILE__PUSH_POLICY_AVAILABLE:
- return isPushPolicyAvailable() ? Boolean.TRUE : Boolean.FALSE;
+ return isPushPolicyAvailable();
case ComponentPackage.CONNECTOR_PROFILE__SKIP_COUNT_AVAILABLE:
- return isSkipCountAvailable() ? Boolean.TRUE : Boolean.FALSE;
+ return isSkipCountAvailable();
case ComponentPackage.CONNECTOR_PROFILE__SOURCE_STRING:
return getSourceString();
case ComponentPackage.CONNECTOR_PROFILE__TARGET_STRING:
@@ -1117,6 +1159,8 @@
return getInportBufferEmptyPolicy();
case ComponentPackage.CONNECTOR_PROFILE__INPORT_BUFFER_READ_TIMEOUT:
return getInportBufferReadTimeout();
+ case ComponentPackage.CONNECTOR_PROFILE__TIMESTAMP_POLICY:
+ return getTimestampPolicy();
}
return super.eGet(featureID, resolve, coreType);
}
@@ -1192,6 +1236,9 @@
case ComponentPackage.CONNECTOR_PROFILE__INPORT_BUFFER_READ_TIMEOUT:
setInportBufferReadTimeout((Double)newValue);
return;
+ case ComponentPackage.CONNECTOR_PROFILE__TIMESTAMP_POLICY:
+ setTimestampPolicy((String)newValue);
+ return;
}
super.eSet(featureID, newValue);
}
@@ -1267,6 +1314,9 @@
case ComponentPackage.CONNECTOR_PROFILE__INPORT_BUFFER_READ_TIMEOUT:
setInportBufferReadTimeout(INPORT_BUFFER_READ_TIMEOUT_EDEFAULT);
return;
+ case ComponentPackage.CONNECTOR_PROFILE__TIMESTAMP_POLICY:
+ setTimestampPolicy(TIMESTAMP_POLICY_EDEFAULT);
+ return;
}
super.eUnset(featureID);
}
@@ -1329,6 +1379,8 @@
return INPORT_BUFFER_EMPTY_POLICY_EDEFAULT == null ? inportBufferEmptyPolicy != null : !INPORT_BUFFER_EMPTY_POLICY_EDEFAULT.equals(inportBufferEmptyPolicy);
case ComponentPackage.CONNECTOR_PROFILE__INPORT_BUFFER_READ_TIMEOUT:
return INPORT_BUFFER_READ_TIMEOUT_EDEFAULT == null ? inportBufferReadTimeout != null : !INPORT_BUFFER_READ_TIMEOUT_EDEFAULT.equals(inportBufferReadTimeout);
+ case ComponentPackage.CONNECTOR_PROFILE__TIMESTAMP_POLICY:
+ return TIMESTAMP_POLICY_EDEFAULT == null ? timestampPolicy != null : !TIMESTAMP_POLICY_EDEFAULT.equals(timestampPolicy);
}
return super.eIsSet(featureID);
}
@@ -1384,6 +1436,8 @@
result.append(inportBufferEmptyPolicy);
result.append(", inportBufferReadTimeout: ");
result.append(inportBufferReadTimeout);
+ result.append(", timestampPolicy: ");
+ result.append(timestampPolicy);
result.append(')');
return result.toString();
}
Modified: trunk/rtmtools/jp.go.aist.rtm.toolscommon/src/jp/go/aist/rtm/toolscommon/model/component/impl/CorbaComponentImpl.java
===================================================================
--- trunk/rtmtools/jp.go.aist.rtm.toolscommon/src/jp/go/aist/rtm/toolscommon/model/component/impl/CorbaComponentImpl.java 2017-12-16 06:51:01 UTC (rev 788)
+++ trunk/rtmtools/jp.go.aist.rtm.toolscommon/src/jp/go/aist/rtm/toolscommon/model/component/impl/CorbaComponentImpl.java 2018-01-23 13:38:57 UTC (rev 789)
@@ -49,6 +49,7 @@
import org.eclipse.emf.common.util.EList;
import org.eclipse.emf.ecore.EClass;
import org.eclipse.emf.ecore.EStructuralFeature;
+import org.eclipse.emf.ecore.InternalEObject;
import org.eclipse.emf.ecore.impl.ENotificationImpl;
import org.eclipse.emf.ecore.util.EDataTypeEList;
import org.eclipse.emf.ecore.util.EDataTypeUniqueEList;
@@ -771,9 +772,9 @@
case ComponentPackage.CORBA_COMPONENT__CORBA_OBJECT:
return getCorbaObject();
case ComponentPackage.CORBA_COMPONENT__EXECUTION_CONTEXT_STATE:
- return new Integer(getExecutionContextState());
+ return getExecutionContextState();
case ComponentPackage.CORBA_COMPONENT__COMPONENT_STATE:
- return new Integer(getComponentState());
+ return getComponentState();
case ComponentPackage.CORBA_COMPONENT__RTC_COMPONENT_PROFILE:
return getRTCComponentProfile();
case ComponentPackage.CORBA_COMPONENT__RTC_EXECUTION_CONTEXTS:
@@ -811,10 +812,10 @@
setCorbaObject((org.omg.CORBA.Object)newValue);
return;
case ComponentPackage.CORBA_COMPONENT__EXECUTION_CONTEXT_STATE:
- setExecutionContextState(((Integer)newValue).intValue());
+ setExecutionContextState((Integer)newValue);
return;
case ComponentPackage.CORBA_COMPONENT__COMPONENT_STATE:
- setComponentState(((Integer)newValue).intValue());
+ setComponentState((Integer)newValue);
return;
case ComponentPackage.CORBA_COMPONENT__RTC_COMPONENT_PROFILE:
setRTCComponentProfile((ComponentProfile)newValue);
Modified: trunk/rtmtools/jp.go.aist.rtm.toolscommon/src/jp/go/aist/rtm/toolscommon/model/component/impl/CorbaConnectorProfileImpl.java
===================================================================
--- trunk/rtmtools/jp.go.aist.rtm.toolscommon/src/jp/go/aist/rtm/toolscommon/model/component/impl/CorbaConnectorProfileImpl.java 2017-12-16 06:51:01 UTC (rev 788)
+++ trunk/rtmtools/jp.go.aist.rtm.toolscommon/src/jp/go/aist/rtm/toolscommon/model/component/impl/CorbaConnectorProfileImpl.java 2018-01-23 13:38:57 UTC (rev 789)
@@ -243,6 +243,9 @@
addProperty(result, profile.getPushRate(), PROP.PUSH_RATE);
addProperty(result, profile.getPushPolicy(), PROP.PUSH_POLICY);
addProperty(result, profile.getSkipCount(), PROP.SKIP_COUNT);
+ if(profile.getTimestampPolicy()!=null && 0<profile.getTimestampPolicy().length()) {
+ addProperty(result, profile.getTimestampPolicy(), PROP.TIMESTAMP_POLICY);
+ }
//
addProperty(result, profile.getOutportBufferLength(),
PROP.OUTPORT_BUFF_LENGTH);
@@ -373,8 +376,18 @@
public void setSkipCount(Integer newSkipCount) {
setProperty(PROP.SKIP_COUNT, newSkipCount.toString());
}
+
+ @Override
+ public void setTimestampPolicy(String value) {
+ setProperty(PROP.TIMESTAMP_POLICY, value);
+ }
@Override
+ public String getTimestampPolicy() {
+ return getProperty(PROP.TIMESTAMP_POLICY);
+ }
+
+ @Override
public Integer getOutportBufferLength() {
String value = getProperty(PROP.OUTPORT_BUFF_LENGTH);
try {
Modified: trunk/rtmtools/jp.go.aist.rtm.toolscommon/src/jp/go/aist/rtm/toolscommon/model/component/impl/CorbaStatusObserverImpl.java
===================================================================
--- trunk/rtmtools/jp.go.aist.rtm.toolscommon/src/jp/go/aist/rtm/toolscommon/model/component/impl/CorbaStatusObserverImpl.java 2017-12-16 06:51:01 UTC (rev 788)
+++ trunk/rtmtools/jp.go.aist.rtm.toolscommon/src/jp/go/aist/rtm/toolscommon/model/component/impl/CorbaStatusObserverImpl.java 2018-01-23 13:38:57 UTC (rev 789)
@@ -141,9 +141,9 @@
serviceProfile.interface_type = OpenRTM.ComponentObserverHelper
.id();
//
- setProperty("observed_status", "ALL");
- setProperty("heartbeat.enable", hb.getPropEnable());
- setProperty("heartbeat.interval", hb.getPropInterval());
+// setProperty("observed_status", "ALL");
+// setProperty("heartbeat.enable", hb.getPropEnable());
+// setProperty("heartbeat.interval", hb.getPropInterval());
//
listener = new PropertyChangeListener() {
@Override
Modified: trunk/rtmtools/jp.go.aist.rtm.toolscommon/src/jp/go/aist/rtm/toolscommon/model/component/impl/ExecutionContextImpl.java
===================================================================
--- trunk/rtmtools/jp.go.aist.rtm.toolscommon/src/jp/go/aist/rtm/toolscommon/model/component/impl/ExecutionContextImpl.java 2017-12-16 06:51:01 UTC (rev 788)
+++ trunk/rtmtools/jp.go.aist.rtm.toolscommon/src/jp/go/aist/rtm/toolscommon/model/component/impl/ExecutionContextImpl.java 2018-01-23 13:38:57 UTC (rev 789)
@@ -397,11 +397,11 @@
public Object eGet(int featureID, boolean resolve, boolean coreType) {
switch (featureID) {
case ComponentPackage.EXECUTION_CONTEXT__KIND_L:
- return new Integer(getKindL());
+ return getKindL();
case ComponentPackage.EXECUTION_CONTEXT__RATE_L:
return getRateL();
case ComponentPackage.EXECUTION_CONTEXT__STATE_L:
- return new Integer(getStateL());
+ return getStateL();
case ComponentPackage.EXECUTION_CONTEXT__OWNER:
if (resolve) return getOwner();
return basicGetOwner();
@@ -421,13 +421,13 @@
public void eSet(int featureID, Object newValue) {
switch (featureID) {
case ComponentPackage.EXECUTION_CONTEXT__KIND_L:
- setKindL(((Integer)newValue).intValue());
+ setKindL((Integer)newValue);
return;
case ComponentPackage.EXECUTION_CONTEXT__RATE_L:
setRateL((Double)newValue);
return;
case ComponentPackage.EXECUTION_CONTEXT__STATE_L:
- setStateL(((Integer)newValue).intValue());
+ setStateL((Integer)newValue);
return;
case ComponentPackage.EXECUTION_CONTEXT__OWNER:
setOwner((Component)newValue);
Modified: trunk/rtmtools/jp.go.aist.rtm.toolscommon/src/jp/go/aist/rtm/toolscommon/model/component/impl/PortImpl.java
===================================================================
--- trunk/rtmtools/jp.go.aist.rtm.toolscommon/src/jp/go/aist/rtm/toolscommon/model/component/impl/PortImpl.java 2017-12-16 06:51:01 UTC (rev 788)
+++ trunk/rtmtools/jp.go.aist.rtm.toolscommon/src/jp/go/aist/rtm/toolscommon/model/component/impl/PortImpl.java 2018-01-23 13:38:57 UTC (rev 789)
@@ -649,13 +649,13 @@
case ComponentPackage.PORT__NAME_L:
return getNameL();
case ComponentPackage.PORT__ALLOW_ANY_DATA_TYPE:
- return isAllowAnyDataType() ? Boolean.TRUE : Boolean.FALSE;
+ return isAllowAnyDataType();
case ComponentPackage.PORT__ALLOW_ANY_INTERFACE_TYPE:
- return isAllowAnyInterfaceType() ? Boolean.TRUE : Boolean.FALSE;
+ return isAllowAnyInterfaceType();
case ComponentPackage.PORT__ALLOW_ANY_DATAFLOW_TYPE:
- return isAllowAnyDataflowType() ? Boolean.TRUE : Boolean.FALSE;
+ return isAllowAnyDataflowType();
case ComponentPackage.PORT__ALLOW_ANY_SUBSCRIPTION_TYPE:
- return isAllowAnySubscriptionType() ? Boolean.TRUE : Boolean.FALSE;
+ return isAllowAnySubscriptionType();
case ComponentPackage.PORT__CONNECTOR_PROFILES:
return getConnectorProfiles();
case ComponentPackage.PORT__INTERFACES:
Modified: trunk/rtmtools/jp.go.aist.rtm.toolscommon/src/jp/go/aist/rtm/toolscommon/model/component/impl/SystemDiagramImpl.java
===================================================================
--- trunk/rtmtools/jp.go.aist.rtm.toolscommon/src/jp/go/aist/rtm/toolscommon/model/component/impl/SystemDiagramImpl.java 2017-12-16 06:51:01 UTC (rev 788)
+++ trunk/rtmtools/jp.go.aist.rtm.toolscommon/src/jp/go/aist/rtm/toolscommon/model/component/impl/SystemDiagramImpl.java 2018-01-23 13:38:57 UTC (rev 789)
@@ -675,7 +675,7 @@
case ComponentPackage.SYSTEM_DIAGRAM__KIND:
return getKind();
case ComponentPackage.SYSTEM_DIAGRAM__CONNECTOR_PROCESSING:
- return isConnectorProcessing() ? Boolean.TRUE : Boolean.FALSE;
+ return isConnectorProcessing();
case ComponentPackage.SYSTEM_DIAGRAM__SYSTEM_ID:
return getSystemId();
case ComponentPackage.SYSTEM_DIAGRAM__CREATION_DATE:
@@ -709,7 +709,7 @@
setKind((SystemDiagramKind)newValue);
return;
case ComponentPackage.SYSTEM_DIAGRAM__CONNECTOR_PROCESSING:
- setConnectorProcessing(((Boolean)newValue).booleanValue());
+ setConnectorProcessing((Boolean)newValue);
return;
case ComponentPackage.SYSTEM_DIAGRAM__SYSTEM_ID:
setSystemId((String)newValue);
Modified: trunk/rtmtools/jp.go.aist.rtm.toolscommon/src/jp/go/aist/rtm/toolscommon/model/component.ecore
===================================================================
--- trunk/rtmtools/jp.go.aist.rtm.toolscommon/src/jp/go/aist/rtm/toolscommon/model/component.ecore 2017-12-16 06:51:01 UTC (rev 788)
+++ trunk/rtmtools/jp.go.aist.rtm.toolscommon/src/jp/go/aist/rtm/toolscommon/model/component.ecore 2018-01-23 13:38:57 UTC (rev 789)
@@ -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="component"
- nsURI="http:///jp/go/aist/rtm/toolscommon/model/component.ecore" nsPrefix="jp.go.aist.rtm.toolscommon.model.component">
+<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="component" nsURI="http:///jp/go/aist/rtm/toolscommon/model/component.ecore"
+ nsPrefix="jp.go.aist.rtm.toolscommon.model.component">
<eClassifiers xsi:type="ecore:EClass" name="SystemDiagram" eSuperTypes="core.ecore#//ModelElement #//IPropertyMap">
<eOperations name="setSynchronizeInterval">
<eParameters name="milliSecond" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//ELong"/>
@@ -256,6 +255,7 @@
eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/>
<eStructuralFeatures xsi:type="ecore:EAttribute" name="inportBufferReadTimeout"
eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EDoubleObject"/>
+ <eStructuralFeatures xsi:type="ecore:EAttribute" name="timestampPolicy" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/>
</eClassifiers>
<eClassifiers xsi:type="ecore:EClass" name="EIntegerObjectToPointMapEntry" instanceClassName="java.util.Map$Entry">
<eStructuralFeatures xsi:type="ecore:EAttribute" name="key" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EIntegerObject"/>
Modified: trunk/rtmtools/jp.go.aist.rtm.toolscommon/src/jp/go/aist/rtm/toolscommon/model/core/impl/CoreFactoryImpl.java
===================================================================
--- trunk/rtmtools/jp.go.aist.rtm.toolscommon/src/jp/go/aist/rtm/toolscommon/model/core/impl/CoreFactoryImpl.java 2017-12-16 06:51:01 UTC (rev 788)
+++ trunk/rtmtools/jp.go.aist.rtm.toolscommon/src/jp/go/aist/rtm/toolscommon/model/core/impl/CoreFactoryImpl.java 2018-01-23 13:38:57 UTC (rev 789)
@@ -40,7 +40,7 @@
*/
public static CoreFactory init() {
try {
- CoreFactory theCoreFactory = (CoreFactory)EPackage.Registry.INSTANCE.getEFactory("http://rtm.aist.go.jp/toolscommon/model/toolscommon");
+ CoreFactory theCoreFactory = (CoreFactory)EPackage.Registry.INSTANCE.getEFactory(CorePackage.eNS_URI);
if (theCoreFactory != null) {
return theCoreFactory;
}
Modified: trunk/rtmtools/jp.go.aist.rtm.toolscommon/src/jp/go/aist/rtm/toolscommon/model/core/impl/CorePackageImpl.java
===================================================================
--- trunk/rtmtools/jp.go.aist.rtm.toolscommon/src/jp/go/aist/rtm/toolscommon/model/core/impl/CorePackageImpl.java 2017-12-16 06:51:01 UTC (rev 788)
+++ trunk/rtmtools/jp.go.aist.rtm.toolscommon/src/jp/go/aist/rtm/toolscommon/model/core/impl/CorePackageImpl.java 2018-01-23 13:38:57 UTC (rev 789)
@@ -125,20 +125,10 @@
private static boolean isInited = false;
/**
- * Creates, registers, and initializes the <b>Package</b> for this
- * model, and for any others upon which it depends. Simple
- * dependencies are satisfied by calling this method on all
- * dependent packages before doing anything else. This method drives
- * initialization for interdependent packages directly, in parallel
- * with this package, itself.
- * <p>Of this package and its interdependencies, all packages which
- * have not yet been registered by their URI values are first created
- * and registered. The packages are then initialized in two steps:
- * meta-model objects for all of the packages are created before any
- * are initialized, since one package's meta-model objects may refer to
- * those of another.
- * <p>Invocation of this method will not affect any packages that have
- * already been initialized.
+ * Creates, registers, and initializes the <b>Package</b> for this model, and for any others upon which it depends.
+ *
+ * <p>This method is used to initialize {@link CorePackage#eINSTANCE} when that field is accessed.
+ * Clients should not invoke it directly. Instead, they should simply access that field to obtain the package.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
* @see #eNS_URI
@@ -150,7 +140,7 @@
if (isInited) return (CorePackage)EPackage.Registry.INSTANCE.getEPackage(CorePackage.eNS_URI);
// Obtain or create and register package
- CorePackageImpl theCorePackage = (CorePackageImpl)(EPackage.Registry.INSTANCE.getEPackage(eNS_URI) instanceof CorePackageImpl ? EPackage.Registry.INSTANCE.getEPackage(eNS_URI) : new CorePackageImpl());
+ CorePackageImpl theCorePackage = (CorePackageImpl)(EPackage.Registry.INSTANCE.get(eNS_URI) instanceof CorePackageImpl ? EPackage.Registry.INSTANCE.get(eNS_URI) : new CorePackageImpl());
isInited = true;
@@ -171,6 +161,9 @@
// Mark meta-data to indicate it can't be changed
theCorePackage.freeze();
+
+ // Update the registry and return the package
+ EPackage.Registry.INSTANCE.put(CorePackage.eNS_URI, theCorePackage);
return theCorePackage;
}
Modified: trunk/rtmtools/jp.go.aist.rtm.toolscommon/src/jp/go/aist/rtm/toolscommon/model/core/util/CoreSwitch.java
===================================================================
--- trunk/rtmtools/jp.go.aist.rtm.toolscommon/src/jp/go/aist/rtm/toolscommon/model/core/util/CoreSwitch.java 2017-12-16 06:51:01 UTC (rev 788)
+++ trunk/rtmtools/jp.go.aist.rtm.toolscommon/src/jp/go/aist/rtm/toolscommon/model/core/util/CoreSwitch.java 2018-01-23 13:38:57 UTC (rev 789)
@@ -107,6 +107,18 @@
if (result == null) result = defaultCase(theEObject);
return result;
}
+ case CorePackage.IADAPTABLE: {
+ IAdaptable iAdaptable = (IAdaptable)theEObject;
+ T result = caseIAdaptable(iAdaptable);
+ if (result == null) result = defaultCase(theEObject);
+ return result;
+ }
+ case CorePackage.LOCAL_OBJECT: {
+ LocalObject localObject = (LocalObject)theEObject;
+ T result = caseLocalObject(localObject);
+ if (result == null) result = defaultCase(theEObject);
+ return result;
+ }
case CorePackage.WRAPPER_OBJECT: {
WrapperObject wrapperObject = (WrapperObject)theEObject;
T result = caseWrapperObject(wrapperObject);
Modified: trunk/rtmtools/jp.go.aist.rtm.toolscommon/src/jp/go/aist/rtm/toolscommon/model/manager/impl/ManagerFactoryImpl.java
===================================================================
--- trunk/rtmtools/jp.go.aist.rtm.toolscommon/src/jp/go/aist/rtm/toolscommon/model/manager/impl/ManagerFactoryImpl.java 2017-12-16 06:51:01 UTC (rev 788)
+++ trunk/rtmtools/jp.go.aist.rtm.toolscommon/src/jp/go/aist/rtm/toolscommon/model/manager/impl/ManagerFactoryImpl.java 2018-01-23 13:38:57 UTC (rev 789)
@@ -35,7 +35,7 @@
*/
public static ManagerFactory init() {
try {
- ManagerFactory theManagerFactory = (ManagerFactory)EPackage.Registry.INSTANCE.getEFactory("http:///jp/go/aist/rtm/toolscommon/model/manager.ecore");
+ ManagerFactory theManagerFactory = (ManagerFactory)EPackage.Registry.INSTANCE.getEFactory(ManagerPackage.eNS_URI);
if (theManagerFactory != null) {
return theManagerFactory;
}
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-12-16 06:51:01 UTC (rev 788)
+++ trunk/rtmtools/jp.go.aist.rtm.toolscommon/src/jp/go/aist/rtm/toolscommon/model/manager/impl/ManagerPackageImpl.java 2018-01-23 13:38:57 UTC (rev 789)
@@ -85,20 +85,10 @@
private static boolean isInited = false;
/**
- * Creates, registers, and initializes the <b>Package</b> for this
- * model, and for any others upon which it depends. Simple
- * dependencies are satisfied by calling this method on all
- * dependent packages before doing anything else. This method drives
- * initialization for interdependent packages directly, in parallel
- * with this package, itself.
- * <p>Of this package and its interdependencies, all packages which
- * have not yet been registered by their URI values are first created
- * and registered. The packages are then initialized in two steps:
- * meta-model objects for all of the packages are created before any
- * are initialized, since one package's meta-model objects may refer to
- * those of another.
- * <p>Invocation of this method will not affect any packages that have
- * already been initialized.
+ * Creates, registers, and initializes the <b>Package</b> for this model, and for any others upon which it depends.
+ *
+ * <p>This method is used to initialize {@link ManagerPackage#eINSTANCE} when that field is accessed.
+ * Clients should not invoke it directly. Instead, they should simply access that field to obtain the package.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
* @see #eNS_URI
@@ -110,7 +100,7 @@
if (isInited) return (ManagerPackage)EPackage.Registry.INSTANCE.getEPackage(ManagerPackage.eNS_URI);
// Obtain or create and register package
- ManagerPackageImpl theManagerPackage = (ManagerPackageImpl)(EPackage.Registry.INSTANCE.getEPackage(eNS_URI) instanceof ManagerPackageImpl ? EPackage.Registry.INSTANCE.getEPackage(eNS_URI) : new ManagerPackageImpl());
+ ManagerPackageImpl theManagerPackage = (ManagerPackageImpl)(EPackage.Registry.INSTANCE.get(eNS_URI) instanceof ManagerPackageImpl ? EPackage.Registry.INSTANCE.get(eNS_URI) : new ManagerPackageImpl());
isInited = true;
@@ -131,6 +121,9 @@
// Mark meta-data to indicate it can't be changed
theManagerPackage.freeze();
+
+ // Update the registry and return the package
+ EPackage.Registry.INSTANCE.put(ManagerPackage.eNS_URI, theManagerPackage);
return theManagerPackage;
}
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-12-16 06:51:01 UTC (rev 788)
+++ trunk/rtmtools/jp.go.aist.rtm.toolscommon/src/jp/go/aist/rtm/toolscommon/model/manager/impl/RTCManagerImpl.java 2018-01-23 13:38:57 UTC (rev 789)
@@ -33,6 +33,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;
Modified: trunk/rtmtools/jp.go.aist.rtm.toolscommon/src/jp/go/aist/rtm/toolscommon/ui/propertysource/PortConnectorPropertySource.java
===================================================================
--- trunk/rtmtools/jp.go.aist.rtm.toolscommon/src/jp/go/aist/rtm/toolscommon/ui/propertysource/PortConnectorPropertySource.java 2017-12-16 06:51:01 UTC (rev 788)
+++ trunk/rtmtools/jp.go.aist.rtm.toolscommon/src/jp/go/aist/rtm/toolscommon/ui/propertysource/PortConnectorPropertySource.java 2018-01-23 13:38:57 UTC (rev 789)
@@ -35,6 +35,8 @@
static final String DISP_SKIP_COUNT = "Skip Count";
+ static final String DISP_TIMESTAMP_POLICY = "Timestamp Policy";
+
static final String DISP_OUTPORT_BUFF_LENGTH = "Outport Buffer length";
static final String DISP_OUTPORT_FULL_POLICY = "Outport Buffer full policy";
@@ -98,6 +100,9 @@
if (profile.isSkipCountAvailable()) {
descriptors.add(new TextPropertyDescriptor(PROP.SKIP_COUNT, DISP_SKIP_COUNT));
}
+ if (profile.getTimestampPolicy()!=null && 0<profile.getTimestampPolicy().length()) {
+ descriptors.add(new TextPropertyDescriptor(PROP.TIMESTAMP_POLICY, DISP_TIMESTAMP_POLICY));
+ }
//
if (profile.getOutportBufferFullPolicy() != null
|| profile.getOutportBufferEmptyPolicy() != null) {
@@ -143,6 +148,8 @@
result = profile.getPushPolicy();
} else if (PROP.SKIP_COUNT.equals(id)) {
result = profile.getSkipCount().toString();
+ } else if (PROP.TIMESTAMP_POLICY.equals(id)) {
+ result = profile.getTimestampPolicy().toString();
} else if (PROP.OUTPORT_BUFF_LENGTH.equals(id)) {
result = profile.getOutportBufferLength().toString();
Modified: trunk/rtmtools/jp.go.aist.rtm.toolscommon/src/jp/go/aist/rtm/toolscommon/util/RtsProfileHandler.java
===================================================================
--- trunk/rtmtools/jp.go.aist.rtm.toolscommon/src/jp/go/aist/rtm/toolscommon/util/RtsProfileHandler.java 2017-12-16 06:51:01 UTC (rev 788)
+++ trunk/rtmtools/jp.go.aist.rtm.toolscommon/src/jp/go/aist/rtm/toolscommon/util/RtsProfileHandler.java 2018-01-23 13:38:57 UTC (rev 789)
@@ -439,6 +439,10 @@
setProperty(PROP.SKIP_COUNT, eConnProf.getSkipCount().toString(),
connector.getProperties());
}
+ if (eConnProf.getTimestampPolicy() != null) {
+ setProperty(PROP.TIMESTAMP_POLICY, eConnProf.getTimestampPolicy(),
+ connector.getProperties());
+ }
//
if (eConnProf.getOutportBufferLength() != null) {
setProperty(PROP.OUTPORT_BUFF_LENGTH, eConnProf
@@ -1036,6 +1040,8 @@
} catch (Exception e) {
// void
}
+ } else if (PROP.TIMESTAMP_POLICY.equals(name)) {
+ conn.setTimestampPolicy(value);
}
//
else if (PROP.OUTPORT_BUFF_LENGTH.equals(name)) {
More information about the openrtm-commit
mailing list