[openrtm-commit:01139] r449 - in branches/work_ForRTMSafety/rtmtools: jp.go.aist.rtm.rtcbuilder.safety/src/jp/go/aist/rtm/rtcbuilder/safety jp.go.aist.rtm.rtcbuilder.safety/src/jp/go/aist/rtm/rtcbuilder/safety/manager jp.go.aist.rtm.toolscommon.profiles/src/jp/go/aist/rtm/toolscommon/profiles/util jp.go.aist.rtm.toolscommon.profiles/src/org/openrtp/namespaces/rtc/version01

[openrtm ＠ openrtm.org]

Author: win-ei
Date: 2014-01-04 20:57:11 +0900 (Sat, 04 Jan 2014)
New Revision: 449

Modified:
   branches/work_ForRTMSafety/rtmtools/jp.go.aist.rtm.rtcbuilder.safety/src/jp/go/aist/rtm/rtcbuilder/safety/IRtcBuilderConstantsSafety.java
   branches/work_ForRTMSafety/rtmtools/jp.go.aist.rtm.rtcbuilder.safety/src/jp/go/aist/rtm/rtcbuilder/safety/manager/SafetyGenerateManager.java
   branches/work_ForRTMSafety/rtmtools/jp.go.aist.rtm.toolscommon.profiles/src/jp/go/aist/rtm/toolscommon/profiles/util/YamlSubHandlerVer01.java
   branches/work_ForRTMSafety/rtmtools/jp.go.aist.rtm.toolscommon.profiles/src/org/openrtp/namespaces/rtc/version01/Language.java
Log:
'Daily

Modified: branches/work_ForRTMSafety/rtmtools/jp.go.aist.rtm.rtcbuilder.safety/src/jp/go/aist/rtm/rtcbuilder/safety/IRtcBuilderConstantsSafety.java
===================================================================
--- branches/work_ForRTMSafety/rtmtools/jp.go.aist.rtm.rtcbuilder.safety/src/jp/go/aist/rtm/rtcbuilder/safety/IRtcBuilderConstantsSafety.java	2013-12-03 07:16:55 UTC (rev 448)
+++ branches/work_ForRTMSafety/rtmtools/jp.go.aist.rtm.rtcbuilder.safety/src/jp/go/aist/rtm/rtcbuilder/safety/IRtcBuilderConstantsSafety.java	2014-01-04 11:57:11 UTC (rev 449)
@@ -2,8 +2,8 @@
 
 public interface IRtcBuilderConstantsSafety {
 
-	public static final String LANG_SAFETY = "Safety";
-	public static final String LANG_SAFETY_ARG = "Safety";
+	public static final String LANG_SAFETY = "RTMSafety";
+	public static final String LANG_SAFETY_ARG = "RTMSafety";
 	//
 	public static final String DOC_DESC_PREFIX_SAFETY = "     * ";
 	public static final String DOC_UNIT_PREFIX_SAFETY = "     *         "; 

Modified: branches/work_ForRTMSafety/rtmtools/jp.go.aist.rtm.rtcbuilder.safety/src/jp/go/aist/rtm/rtcbuilder/safety/manager/SafetyGenerateManager.java
===================================================================
--- branches/work_ForRTMSafety/rtmtools/jp.go.aist.rtm.rtcbuilder.safety/src/jp/go/aist/rtm/rtcbuilder/safety/manager/SafetyGenerateManager.java	2013-12-03 07:16:55 UTC (rev 448)
+++ branches/work_ForRTMSafety/rtmtools/jp.go.aist.rtm.rtcbuilder.safety/src/jp/go/aist/rtm/rtcbuilder/safety/manager/SafetyGenerateManager.java	2014-01-04 11:57:11 UTC (rev 449)
@@ -229,7 +229,7 @@
 			return gr;
 		} catch (Exception e) {
 			throw new RuntimeException(form(MSG_ERROR_GENERATE_FILE,
-					new String[] { "Safety", outfile }), e);
+					new String[] { "RTMSafety", outfile }), e);
 		}
 	}
 

Modified: branches/work_ForRTMSafety/rtmtools/jp.go.aist.rtm.toolscommon.profiles/src/jp/go/aist/rtm/toolscommon/profiles/util/YamlSubHandlerVer01.java
===================================================================
--- branches/work_ForRTMSafety/rtmtools/jp.go.aist.rtm.toolscommon.profiles/src/jp/go/aist/rtm/toolscommon/profiles/util/YamlSubHandlerVer01.java	2013-12-03 07:16:55 UTC (rev 448)
+++ branches/work_ForRTMSafety/rtmtools/jp.go.aist.rtm.toolscommon.profiles/src/jp/go/aist/rtm/toolscommon/profiles/util/YamlSubHandlerVer01.java	2014-01-04 11:57:11 UTC (rev 449)
@@ -274,7 +274,7 @@
 					if( langInfoY.get("Ruby") != null ) {
 						language.setKind("Ruby");
 					}
-					if( langInfoY.get("Safety") != null ) {
+					if( langInfoY.get("RTMSafety") != null ) {
 						language.setKind("safety");
 					}
 					profile.setLanguage(language);

Modified: branches/work_ForRTMSafety/rtmtools/jp.go.aist.rtm.toolscommon.profiles/src/org/openrtp/namespaces/rtc/version01/Language.java
===================================================================
--- branches/work_ForRTMSafety/rtmtools/jp.go.aist.rtm.toolscommon.profiles/src/org/openrtp/namespaces/rtc/version01/Language.java	2013-12-03 07:16:55 UTC (rev 448)
+++ branches/work_ForRTMSafety/rtmtools/jp.go.aist.rtm.toolscommon.profiles/src/org/openrtp/namespaces/rtc/version01/Language.java	2014-01-04 11:57:11 UTC (rev 449)
@@ -58,7 +58,7 @@
     protected String csharp;
     @XmlElement(name = "Ruby")
     protected String ruby;
-    @XmlElement(name = "Safety")
+    @XmlElement(name = "RTMSafety")
     protected String safety;
 
     /**