[openrtm-commit:00628] r253 - trunk/rtmtools/jp.go.aist.rtm.toolscommon/src/jp/go/aist/rtm/toolscommon/model/component/impl

[openrtm ＠ openrtm.org]

Author: sakamoto
Date: 2012-02-02 11:53:39 +0900 (Thu, 02 Feb 2012)
New Revision: 253

Modified:
   trunk/rtmtools/jp.go.aist.rtm.toolscommon/src/jp/go/aist/rtm/toolscommon/model/component/impl/CorbaExecutionContextImpl.java
   trunk/rtmtools/jp.go.aist.rtm.toolscommon/src/jp/go/aist/rtm/toolscommon/model/component/impl/CorbaObserverImpl.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/SystemDiagramImpl.java
Log:
Modified CompositeRTC connection display #2207

Modified: trunk/rtmtools/jp.go.aist.rtm.toolscommon/src/jp/go/aist/rtm/toolscommon/model/component/impl/CorbaExecutionContextImpl.java
===================================================================
--- trunk/rtmtools/jp.go.aist.rtm.toolscommon/src/jp/go/aist/rtm/toolscommon/model/component/impl/CorbaExecutionContextImpl.java	2012-01-31 01:46:44 UTC (rev 252)
+++ trunk/rtmtools/jp.go.aist.rtm.toolscommon/src/jp/go/aist/rtm/toolscommon/model/component/impl/CorbaExecutionContextImpl.java	2012-02-02 02:53:39 UTC (rev 253)
@@ -182,8 +182,13 @@
 		rtcExecutionContextProfile = newRtcExecutionContextProfile;
 		if (eNotificationRequired())
 			eNotify(new ENotificationImpl(this, Notification.SET, ComponentPackage.CORBA_EXECUTION_CONTEXT__RTC_EXECUTION_CONTEXT_PROFILE, oldRtcExecutionContextProfile, rtcExecutionContextProfile));
-		setRateL(rtcExecutionContextProfile.rate);
-		setKindL(rtcExecutionContextProfile.kind.value());
+		if (rtcExecutionContextProfile == null) {
+			setRateL(RATE_L_EDEFAULT);
+			setKindL(KIND_L_EDEFAULT);
+		} else {
+			setRateL(rtcExecutionContextProfile.rate);
+			setKindL(rtcExecutionContextProfile.kind.value());
+		}
 	}
 
 	@Override

Modified: trunk/rtmtools/jp.go.aist.rtm.toolscommon/src/jp/go/aist/rtm/toolscommon/model/component/impl/CorbaObserverImpl.java
===================================================================
--- trunk/rtmtools/jp.go.aist.rtm.toolscommon/src/jp/go/aist/rtm/toolscommon/model/component/impl/CorbaObserverImpl.java	2012-01-31 01:46:44 UTC (rev 252)
+++ trunk/rtmtools/jp.go.aist.rtm.toolscommon/src/jp/go/aist/rtm/toolscommon/model/component/impl/CorbaObserverImpl.java	2012-02-02 02:53:39 UTC (rev 253)
@@ -244,10 +244,12 @@
 			serviceProfile.id = UUID.randomUUID().toString();
 			result = config.add_service_profile(serviceProfile);
 			//
-			log.info("add_service_profile:    id=" + serviceProfile.id
-					+ " type=" + serviceProfile.interface_type + " ior="
-					+ serviceProfile.service + " obs="
-					+ this.getClass().getName());
+			if( result ) {
+				log.info("add_service_profile:    id=" + serviceProfile.id
+						+ " type=" + serviceProfile.interface_type + " ior="
+						+ serviceProfile.service + " obs="
+						+ this.getClass().getName());
+			}
 		} catch (Exception e) {
 			result = false;
 		}

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	2012-01-31 01:46:44 UTC (rev 252)
+++ trunk/rtmtools/jp.go.aist.rtm.toolscommon/src/jp/go/aist/rtm/toolscommon/model/component/impl/CorbaStatusObserverImpl.java	2012-02-02 02:53:39 UTC (rev 253)
@@ -212,8 +212,9 @@
 			return;
 		}
 
+		String profId = (serviceProfile == null) ? "" : serviceProfile.id;
 		log.info("update_status(" + TYPE_NAMES[status_kind.value()] + ", "
-				+ hint + ")");
+				+ hint + "): id=" + profId);
 
 		if (CorbaObserverStore.eINSTANCE.isEmptyComponentReference(rtc)) {
 			return;

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	2012-01-31 01:46:44 UTC (rev 252)
+++ trunk/rtmtools/jp.go.aist.rtm.toolscommon/src/jp/go/aist/rtm/toolscommon/model/component/impl/SystemDiagramImpl.java	2012-02-02 02:53:39 UTC (rev 253)
@@ -881,31 +881,29 @@
 
 	void synchronizeLocal() {
 		// // リモートと同期を取る
-		if (getParentSystemDiagram() == null) {
-			for (Component component : getUnmodifiedComponents()) {
-				if (component instanceof CorbaComponentImpl) {
-					CorbaComponentImpl corbaComp = (CorbaComponentImpl) component;
-					CorbaStatusObserver obs = corbaComp.getStatusObserver();
-					if (obs != null) {
-						// 状態通知オブザーバが登録されている場合の同期
-						if (obs.isTimeOut()) {
-							// H.Bがタイムアウトしていたらダイアグラムから削除
-							if (!SynchronizationSupport.ping(corbaComp
-									.getCorbaObjectInterface())) {
-								removeComponent(corbaComp);
-							}
-							continue;
+		for (Component component : getUnmodifiedComponents()) {
+			if (component instanceof CorbaComponentImpl) {
+				CorbaComponentImpl corbaComp = (CorbaComponentImpl) component;
+				CorbaStatusObserver obs = corbaComp.getStatusObserver();
+				if (obs != null) {
+					// 状態通知オブザーバが登録されている場合の同期
+					if (obs.isTimeOut()) {
+						// H.Bがタイムアウトしていたらダイアグラムから削除
+						if (!SynchronizationSupport.ping(corbaComp
+								.getCorbaObjectInterface())) {
+							removeComponent(corbaComp);
 						}
+						continue;
 					}
 				}
-				//
-				SynchronizationSupport support = component
-						.getSynchronizationSupport();
-				if (support == null) {
-					continue;
-				}
-				support.synchronizeLocal();
 			}
+			//
+			SynchronizationSupport support = component
+					.getSynchronizationSupport();
+			if (support == null) {
+				continue;
+			}
+			support.synchronizeLocal();
 		}
 		//
 		try {