[openrtm-commit:01193] r502 - in branches/work_ForRTMSafety/rtmtools: jp.go.aist.rtm.rtcbuilder.python/META-INF jp.go.aist.rtm.rtcbuilder.python/src/jp/go/aist/rtm/rtcbuilder/python/manager jp.go.aist.rtm.rtcbuilder.safety/META-INF

[openrtm ＠ openrtm.org]

Author: win-ei
Date: 2014-01-27 16:19:23 +0900 (Mon, 27 Jan 2014)
New Revision: 502

Modified:
   branches/work_ForRTMSafety/rtmtools/jp.go.aist.rtm.rtcbuilder.python/META-INF/MANIFEST.MF
   branches/work_ForRTMSafety/rtmtools/jp.go.aist.rtm.rtcbuilder.python/src/jp/go/aist/rtm/rtcbuilder/python/manager/PythonCMakeGenerateManager.java
   branches/work_ForRTMSafety/rtmtools/jp.go.aist.rtm.rtcbuilder.python/src/jp/go/aist/rtm/rtcbuilder/python/manager/PythonGenerateManager.java
   branches/work_ForRTMSafety/rtmtools/jp.go.aist.rtm.rtcbuilder.safety/META-INF/MANIFEST.MF
Log:
Added TemplateUtil.java and GeneratedResult.java to jp/go/aist/rtm/toolscommon/uti.  Made a change accompanying it.

Modified: branches/work_ForRTMSafety/rtmtools/jp.go.aist.rtm.rtcbuilder.python/META-INF/MANIFEST.MF
===================================================================
--- branches/work_ForRTMSafety/rtmtools/jp.go.aist.rtm.rtcbuilder.python/META-INF/MANIFEST.MF	2014-01-27 07:18:29 UTC (rev 501)
+++ branches/work_ForRTMSafety/rtmtools/jp.go.aist.rtm.rtcbuilder.python/META-INF/MANIFEST.MF	2014-01-27 07:19:23 UTC (rev 502)
@@ -19,4 +19,5 @@
 Eclipse-BuddyPolicy: registered
 Built-By: n-ando
 Built-Date: 2013/01/25 00:47:18
+Import-Package: jp.go.aist.rtm.toolscommon.util
 

Modified: branches/work_ForRTMSafety/rtmtools/jp.go.aist.rtm.rtcbuilder.python/src/jp/go/aist/rtm/rtcbuilder/python/manager/PythonCMakeGenerateManager.java
===================================================================
--- branches/work_ForRTMSafety/rtmtools/jp.go.aist.rtm.rtcbuilder.python/src/jp/go/aist/rtm/rtcbuilder/python/manager/PythonCMakeGenerateManager.java	2014-01-27 07:18:29 UTC (rev 501)
+++ branches/work_ForRTMSafety/rtmtools/jp.go.aist.rtm.rtcbuilder.python/src/jp/go/aist/rtm/rtcbuilder/python/manager/PythonCMakeGenerateManager.java	2014-01-27 07:19:23 UTC (rev 502)
@@ -4,10 +4,12 @@
 import java.util.List;
 import java.util.Map;
 
-import jp.go.aist.rtm.rtcbuilder.generator.GeneratedResult;
+//import jp.go.aist.rtm.rtcbuilder.generator.GeneratedResult;
+import jp.go.aist.rtm.toolscommon.util.GeneratedResult;
 import jp.go.aist.rtm.rtcbuilder.generator.param.RtcParam;
 import jp.go.aist.rtm.rtcbuilder.manager.CMakeGenerateManager;
-import jp.go.aist.rtm.rtcbuilder.template.TemplateUtil;
+//import jp.go.aist.rtm.rtcbuilder.template.TemplateUtil;
+import jp.go.aist.rtm.toolscommon.util.TemplateUtil;
 
 import static jp.go.aist.rtm.rtcbuilder.IRtcBuilderConstants.*;
 import static jp.go.aist.rtm.rtcbuilder.util.RTCUtil.form;

Modified: branches/work_ForRTMSafety/rtmtools/jp.go.aist.rtm.rtcbuilder.python/src/jp/go/aist/rtm/rtcbuilder/python/manager/PythonGenerateManager.java
===================================================================
--- branches/work_ForRTMSafety/rtmtools/jp.go.aist.rtm.rtcbuilder.python/src/jp/go/aist/rtm/rtcbuilder/python/manager/PythonGenerateManager.java	2014-01-27 07:18:29 UTC (rev 501)
+++ branches/work_ForRTMSafety/rtmtools/jp.go.aist.rtm.rtcbuilder.python/src/jp/go/aist/rtm/rtcbuilder/python/manager/PythonGenerateManager.java	2014-01-27 07:19:23 UTC (rev 502)
@@ -6,14 +6,16 @@
 import java.util.List;
 import java.util.Map;
 
-import jp.go.aist.rtm.rtcbuilder.generator.GeneratedResult;
+//import jp.go.aist.rtm.rtcbuilder.generator.GeneratedResult;
+import jp.go.aist.rtm.toolscommon.util.GeneratedResult;
 import jp.go.aist.rtm.rtcbuilder.generator.param.RtcParam;
 import jp.go.aist.rtm.rtcbuilder.generator.param.idl.IdlFileParam;
 import jp.go.aist.rtm.rtcbuilder.generator.param.idl.ServiceClassParam;
 import jp.go.aist.rtm.rtcbuilder.manager.GenerateManager;
 import jp.go.aist.rtm.rtcbuilder.python.ui.Perspective.PythonProperty;
 import jp.go.aist.rtm.rtcbuilder.template.TemplateHelper;
-import jp.go.aist.rtm.rtcbuilder.template.TemplateUtil;
+//import jp.go.aist.rtm.rtcbuilder.template.TemplateUtil;
+import jp.go.aist.rtm.toolscommon.util.TemplateUtil;
 import jp.go.aist.rtm.rtcbuilder.ui.Perspective.LanguageProperty;
 
 import static jp.go.aist.rtm.rtcbuilder.IRtcBuilderConstants.*;

Modified: branches/work_ForRTMSafety/rtmtools/jp.go.aist.rtm.rtcbuilder.safety/META-INF/MANIFEST.MF
===================================================================
--- branches/work_ForRTMSafety/rtmtools/jp.go.aist.rtm.rtcbuilder.safety/META-INF/MANIFEST.MF	2014-01-27 07:18:29 UTC (rev 501)
+++ branches/work_ForRTMSafety/rtmtools/jp.go.aist.rtm.rtcbuilder.safety/META-INF/MANIFEST.MF	2014-01-27 07:19:23 UTC (rev 502)
@@ -7,8 +7,10 @@
 Bundle-Version: 1.1.0.rc4v20130124
 Bundle-Activator: jp.go.aist.rtm.rtcbuilder.safety.RtcBuilderSafetyPlugin
 Bundle-Localization: plugin
-Require-Bundle: jp.go.aist.rtm.rtcbuilder,org.eclipse.ui,org.eclipse.c
- ore.runtime
+Require-Bundle: jp.go.aist.rtm.rtcbuilder,
+ org.eclipse.ui,
+ org.eclipse.core.runtime,
+ jp.go.aist.rtm.toolscommon;bundle-version="1.1.0"
 Bundle-ActivationPolicy: lazy
 Bundle-Vendor: %providerName
 Export-Package: jp.go.aist.rtm.rtcbuilder.safety,jp.go.aist.rtm.rtcbuild
@@ -19,4 +21,5 @@
 Eclipse-RegisterBuddy: jp.go.aist.rtm.rtcbuilder
 Built-By: n-ando
 Built-Date: 2013/01/25 00:47:16
+Import-Package: jp.go.aist.rtm.toolscommon.util