[openrtm-commit:01189] r498 - in branches/work_ForRTMSafety/rtmtools: jp.go.aist.rtm.cuirtcbuilder jp.go.aist.rtm.cuirtcbuilder/src/jp/go/aist/rtm/cuirtcbuilder jp.go.aist.rtm.rtcbuilder/META-INF jp.go.aist.rtm.rtcbuilder/src/jp/go/aist/rtm/rtcbuilder

[openrtm ＠ openrtm.org]

Author: win-ei
Date: 2014-01-27 16:16:28 +0900 (Mon, 27 Jan 2014)
New Revision: 498

Modified:
   branches/work_ForRTMSafety/rtmtools/jp.go.aist.rtm.cuirtcbuilder/.classpath
   branches/work_ForRTMSafety/rtmtools/jp.go.aist.rtm.cuirtcbuilder/src/jp/go/aist/rtm/cuirtcbuilder/CuiRtcBuilder.java
   branches/work_ForRTMSafety/rtmtools/jp.go.aist.rtm.rtcbuilder/META-INF/MANIFEST.MF
   branches/work_ForRTMSafety/rtmtools/jp.go.aist.rtm.rtcbuilder/src/jp/go/aist/rtm/rtcbuilder/Generator.java
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.cuirtcbuilder/.classpath
===================================================================
--- branches/work_ForRTMSafety/rtmtools/jp.go.aist.rtm.cuirtcbuilder/.classpath	2014-01-25 12:47:19 UTC (rev 497)
+++ branches/work_ForRTMSafety/rtmtools/jp.go.aist.rtm.cuirtcbuilder/.classpath	2014-01-27 07:16:28 UTC (rev 498)
@@ -6,5 +6,6 @@
 	<classpathentry combineaccessrules="false" kind="src" path="/jp.go.aist.rtm.rtcbuilder"/>
 	<classpathentry combineaccessrules="false" kind="src" path="/jp.go.aist.rtm.rtcbuilder.java"/>
 	<classpathentry combineaccessrules="false" kind="src" path="/jp.go.aist.rtm.rtcbuilder.python"/>
+	<classpathentry combineaccessrules="false" kind="src" path="/jp.go.aist.rtm.toolscommon"/>
 	<classpathentry kind="output" path="bin"/>
 </classpath>

Modified: branches/work_ForRTMSafety/rtmtools/jp.go.aist.rtm.cuirtcbuilder/src/jp/go/aist/rtm/cuirtcbuilder/CuiRtcBuilder.java
===================================================================
--- branches/work_ForRTMSafety/rtmtools/jp.go.aist.rtm.cuirtcbuilder/src/jp/go/aist/rtm/cuirtcbuilder/CuiRtcBuilder.java	2014-01-25 12:47:19 UTC (rev 497)
+++ branches/work_ForRTMSafety/rtmtools/jp.go.aist.rtm.cuirtcbuilder/src/jp/go/aist/rtm/cuirtcbuilder/CuiRtcBuilder.java	2014-01-27 07:16:28 UTC (rev 498)
@@ -15,7 +15,8 @@
 
 import jp.go.aist.rtm.rtcbuilder.Generator;
 import jp.go.aist.rtm.rtcbuilder.IRtcBuilderConstants;
-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.IDLParamConverter;
 import jp.go.aist.rtm.rtcbuilder.generator.ProfileHandler;
 import jp.go.aist.rtm.rtcbuilder.generator.param.DataTypeParam;

Modified: branches/work_ForRTMSafety/rtmtools/jp.go.aist.rtm.rtcbuilder/META-INF/MANIFEST.MF
===================================================================
--- branches/work_ForRTMSafety/rtmtools/jp.go.aist.rtm.rtcbuilder/META-INF/MANIFEST.MF	2014-01-25 12:47:19 UTC (rev 497)
+++ branches/work_ForRTMSafety/rtmtools/jp.go.aist.rtm.rtcbuilder/META-INF/MANIFEST.MF	2014-01-27 07:16:28 UTC (rev 498)
@@ -21,14 +21,22 @@
  er.ui.editors,jp.go.aist.rtm.rtcbuilder.ui.parts,jp.go.aist.rtm.rtcbu
  ilder.ui.preference,jp.go.aist.rtm.rtcbuilder.ui.wizard,jp.go.aist.rt
  m.rtcbuilder.util
-Require-Bundle: org.eclipse.ui,org.eclipse.core.runtime,org.eclipse.em
- f.ecore;visibility:=reexport,org.eclipse.compare,org.eclipse.jface.te
- xt,org.eclipse.ui.forms,org.eclipse.core.resources,org.eclipse.gef,or
- g.eclipse.ui.ide,org.eclipse.jdt.ui,jp.go.aist.rtm.toolscommon.profil
- es
+Require-Bundle: org.eclipse.ui,
+ org.eclipse.core.runtime,
+ org.eclipse.emf.ecore;visibility:=reexport,
+ org.eclipse.compare,
+ org.eclipse.jface.text,
+ org.eclipse.ui.forms,
+ org.eclipse.core.resources,
+ org.eclipse.gef,
+ org.eclipse.ui.ide,
+ org.eclipse.jdt.ui,
+ jp.go.aist.rtm.toolscommon.profiles,
+ jp.go.aist.rtm.toolscommon;bundle-version="1.1.0"
 Bundle-ActivationPolicy: lazy
 Bundle-Activator: jp.go.aist.rtm.rtcbuilder.RtcBuilderPlugin
 Eclipse-BuddyPolicy: registered
 Built-By: n-ando
 Built-Date: 2013/01/25 00:47:05
+Import-Package: jp.go.aist.rtm.toolscommon.util
 

Modified: branches/work_ForRTMSafety/rtmtools/jp.go.aist.rtm.rtcbuilder/src/jp/go/aist/rtm/rtcbuilder/Generator.java
===================================================================
--- branches/work_ForRTMSafety/rtmtools/jp.go.aist.rtm.rtcbuilder/src/jp/go/aist/rtm/rtcbuilder/Generator.java	2014-01-25 12:47:19 UTC (rev 497)
+++ branches/work_ForRTMSafety/rtmtools/jp.go.aist.rtm.rtcbuilder/src/jp/go/aist/rtm/rtcbuilder/Generator.java	2014-01-27 07:16:28 UTC (rev 498)
@@ -15,7 +15,8 @@
 import jp.go.aist.rtm.rtcbuilder.corba.idl.parser.IDLParser;
 import jp.go.aist.rtm.rtcbuilder.corba.idl.parser.ParseException;
 import jp.go.aist.rtm.rtcbuilder.corba.idl.parser.syntaxtree.specification;
-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.IDLParamConverter;
 import jp.go.aist.rtm.rtcbuilder.generator.PreProcessor;
 import jp.go.aist.rtm.rtcbuilder.generator.param.ConfigSetParam;