[openrtm-commit:00056] r172 - in trunk/rtmtools: jp.go.aist.rtm.systemeditor/META-INF jp.go.aist.rtm.systemeditor/src/jp/go/aist/rtm/systemeditor/ui/editor/command jp.go.aist.rtm.toolscommon/META-INF jp.go.aist.rtm.toolscommon/src/jp/go/aist/rtm/toolscommon/model/component/impl

[openrtm ＠ openrtm.org]

Author: ta
Date: 2011-05-17 18:30:24 +0900 (Tue, 17 May 2011)
New Revision: 172

Modified:
   trunk/rtmtools/jp.go.aist.rtm.systemeditor/META-INF/MANIFEST.MF
   trunk/rtmtools/jp.go.aist.rtm.systemeditor/src/jp/go/aist/rtm/systemeditor/ui/editor/command/DirectEditNameCommand.java
   trunk/rtmtools/jp.go.aist.rtm.toolscommon/META-INF/MANIFEST.MF
   trunk/rtmtools/jp.go.aist.rtm.toolscommon/src/jp/go/aist/rtm/toolscommon/model/component/impl/CorbaExecutionContextImpl.java
Log:
RTSE updates.

- fix direct edit instance name for composite rtc.
- fix rtc state name on ecview.

Modified: trunk/rtmtools/jp.go.aist.rtm.systemeditor/META-INF/MANIFEST.MF
===================================================================
--- trunk/rtmtools/jp.go.aist.rtm.systemeditor/META-INF/MANIFEST.MF	2011-05-17 09:00:58 UTC (rev 171)
+++ trunk/rtmtools/jp.go.aist.rtm.systemeditor/META-INF/MANIFEST.MF	2011-05-17 09:30:24 UTC (rev 172)
@@ -2,7 +2,7 @@
 Bundle-ManifestVersion: 2
 Bundle-Name: %pluginName
 Bundle-SymbolicName: jp.go.aist.rtm.systemeditor;singleton:=true
-Bundle-Version: 1.1.0.v20110509
+Bundle-Version: 1.1.0.v20110517
 Bundle-Activator: jp.go.aist.rtm.systemeditor.RTSystemEditorPlugin
 Bundle-Localization: plugin
 Require-Bundle: 

Modified: trunk/rtmtools/jp.go.aist.rtm.systemeditor/src/jp/go/aist/rtm/systemeditor/ui/editor/command/DirectEditNameCommand.java
===================================================================
--- trunk/rtmtools/jp.go.aist.rtm.systemeditor/src/jp/go/aist/rtm/systemeditor/ui/editor/command/DirectEditNameCommand.java	2011-05-17 09:00:58 UTC (rev 171)
+++ trunk/rtmtools/jp.go.aist.rtm.systemeditor/src/jp/go/aist/rtm/systemeditor/ui/editor/command/DirectEditNameCommand.java	2011-05-17 09:30:24 UTC (rev 172)
@@ -13,7 +13,6 @@
 public class DirectEditNameCommand extends Command {
 
 	Object model;
-
 	String text, oldText;
 
 	@Override
@@ -22,10 +21,12 @@
 			Component c = (Component) model;
 			oldText = c.getInstanceNameL();
 			c.setInstanceNameL(text);
-			// 設定されたインスタンス名を元にポート名を正規化
-			trimPortNames(c);
-			// ポート名の変更をコネクタプロファイルへ反映
-			trimConnectorProfiles(c);
+			if (!c.isCompositeComponent()) {
+				// 設定されたインスタンス名を元にポート名を正規化
+				trimPortNames(c);
+				// ポート名の変更をコネクタプロファイルへ反映
+				trimConnectorProfiles(c);
+			}
 		}
 	}
 
@@ -34,10 +35,12 @@
 		if (model instanceof Component) {
 			Component c = (Component) model;
 			c.setInstanceNameL(oldText);
-			// 設定されたインスタンス名を元にポート名を正規化
-			trimPortNames(c);
-			// ポート名の変更をコネクタプロファイルへ反映
-			trimConnectorProfiles(c);
+			if (!c.isCompositeComponent()) {
+				// 設定されたインスタンス名を元にポート名を正規化
+				trimPortNames(c);
+				// ポート名の変更をコネクタプロファイルへ反映
+				trimConnectorProfiles(c);
+			}
 		}
 		oldText = null;
 	}

Modified: trunk/rtmtools/jp.go.aist.rtm.toolscommon/META-INF/MANIFEST.MF
===================================================================
--- trunk/rtmtools/jp.go.aist.rtm.toolscommon/META-INF/MANIFEST.MF	2011-05-17 09:00:58 UTC (rev 171)
+++ trunk/rtmtools/jp.go.aist.rtm.toolscommon/META-INF/MANIFEST.MF	2011-05-17 09:30:24 UTC (rev 172)
@@ -2,7 +2,7 @@
 Bundle-ManifestVersion: 2
 Bundle-Name: %pluginName
 Bundle-SymbolicName: jp.go.aist.rtm.toolscommon; singleton:=true
-Bundle-Version: 1.1.0.v20110428
+Bundle-Version: 1.1.0.v20110517
 Bundle-ClassPath: .,
  lib/commons-lang-2.2.jar
 Bundle-Vendor: %providerName

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	2011-05-17 09:00:58 UTC (rev 171)
+++ trunk/rtmtools/jp.go.aist.rtm.toolscommon/src/jp/go/aist/rtm/toolscommon/model/component/impl/CorbaExecutionContextImpl.java	2011-05-17 09:30:24 UTC (rev 172)
@@ -310,9 +310,9 @@
 	public String getComponentStateName(Component comp) {
 		int state = getComponentState(comp);
 		if (state == RTC.LifeCycleState.ACTIVE_STATE.value()) {
-			return "ACTIVATE";
+			return "ACTIVE";
 		} else if (state == RTC.LifeCycleState.INACTIVE_STATE.value()) {
-			return "INACTIVATE";
+			return "INACTIVE";
 		} else if (state == RTC.LifeCycleState.ERROR_STATE.value()) {
 			return "ERROR";
 		}