[openrtm-commit:01194] r503 - in branches/work_ForRTMSafety/rtmtools: jp.go.aist.rtm.rtcbuilder.safety/bin/jp/go/aist/rtm/rtcbuilder/safety/template/safety jp.go.aist.rtm.rtcbuilder.safety/src/jp/go/aist/rtm/rtcbuilder/safety/manager jp.go.aist.rtm.rtcbuilder.safety/src/jp/go/aist/rtm/rtcbuilder/safety/ui/Perspective jp.go.aist.rtm.systemeditor jp.go.aist.rtm.systemeditor/META-INF
openrtm ＠ openrtm.org
openrtm ＠ openrtm.org
2014年 1月 27日 (月) 16:20:00 JST
Author: win-ei
Date: 2014-01-27 16:20:00 +0900 (Mon, 27 Jan 2014)
New Revision: 503
Modified:
branches/work_ForRTMSafety/rtmtools/jp.go.aist.rtm.rtcbuilder.safety/bin/jp/go/aist/rtm/rtcbuilder/safety/template/safety/Safety_RTC.c.vsl
branches/work_ForRTMSafety/rtmtools/jp.go.aist.rtm.rtcbuilder.safety/src/jp/go/aist/rtm/rtcbuilder/safety/manager/SafetyCMakeGenerateManager.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.rtcbuilder.safety/src/jp/go/aist/rtm/rtcbuilder/safety/ui/Perspective/SafetyProperty.java
branches/work_ForRTMSafety/rtmtools/jp.go.aist.rtm.systemeditor/.classpath
branches/work_ForRTMSafety/rtmtools/jp.go.aist.rtm.systemeditor/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.safety/bin/jp/go/aist/rtm/rtcbuilder/safety/template/safety/Safety_RTC.c.vsl
===================================================================
--- branches/work_ForRTMSafety/rtmtools/jp.go.aist.rtm.rtcbuilder.safety/bin/jp/go/aist/rtm/rtcbuilder/safety/template/safety/Safety_RTC.c.vsl 2014-01-27 07:19:23 UTC (rev 502)
+++ branches/work_ForRTMSafety/rtmtools/jp.go.aist.rtm.rtcbuilder.safety/bin/jp/go/aist/rtm/rtcbuilder/safety/template/safety/Safety_RTC.c.vsl 2014-01-27 07:20:00 UTC (rev 503)
@@ -37,15 +37,15 @@
if( retVal == RTC_OK )
{
pself->onInitialize = ${rtcParam.name}_on_initialize;
-#if(${rtcParam.IsNotImplemented(1)})//#end pself->onFinalize = ${rtcParam.name}_on_finalize;
-#if(${rtcParam.IsNotImplemented(2)})//#end pself->onStartup = ${rtcParam.name}_on_startup;
-#if(${rtcParam.IsNotImplemented(3)})//#end pself->onShutdown = ${rtcParam.name}_on_shutdown;
-#if(${rtcParam.IsNotImplemented(4)})//#end pself->onActivated = ${rtcParam.name}_on_activated;
-#if(${rtcParam.IsNotImplemented(5)})//#end pself->onDeactivated = ${rtcParam.name}_on_deactivated;
-#if(${rtcParam.IsNotImplemented(6)})//#end pself->onAborting = ${rtcParam.name}_on_aborting;
-#if(${rtcParam.IsNotImplemented(7)})//#end pself->onError = ${rtcParam.name}_on_error;
-#if(${rtcParam.IsNotImplemented(8)})//#end pself->onReset = ${rtcParam.name}_on_reset;
-#if(${rtcParam.IsNotImplemented(9)})//#end pself->onExecute = ${rtcParam.name}_on_execute;
+#if(${rtcParam.IsNotImplemented(1)})//#end pself->onFinalize = ${rtcParam.name}_on_finalize;
+#if(${rtcParam.IsNotImplemented(2)})//#end pself->onStartup = ${rtcParam.name}_on_startup;
+#if(${rtcParam.IsNotImplemented(3)})//#end pself->onShutdown = ${rtcParam.name}_on_shutdown;
+#if(${rtcParam.IsNotImplemented(4)})//#end pself->onActivated = ${rtcParam.name}_on_activated;
+#if(${rtcParam.IsNotImplemented(5)})//#end pself->onDeactivated = ${rtcParam.name}_on_deactivated;
+#if(${rtcParam.IsNotImplemented(6)})//#end pself->onAborting = ${rtcParam.name}_on_aborting;
+#if(${rtcParam.IsNotImplemented(7)})//#end pself->onError = ${rtcParam.name}_on_error;
+#if(${rtcParam.IsNotImplemented(8)})//#end pself->onReset = ${rtcParam.name}_on_reset;
+#if(${rtcParam.IsNotImplemented(9)})//#end pself->onExecute = ${rtcParam.name}_on_execute;
}
return retVal;
Modified: branches/work_ForRTMSafety/rtmtools/jp.go.aist.rtm.rtcbuilder.safety/src/jp/go/aist/rtm/rtcbuilder/safety/manager/SafetyCMakeGenerateManager.java
===================================================================
--- branches/work_ForRTMSafety/rtmtools/jp.go.aist.rtm.rtcbuilder.safety/src/jp/go/aist/rtm/rtcbuilder/safety/manager/SafetyCMakeGenerateManager.java 2014-01-27 07:19:23 UTC (rev 502)
+++ branches/work_ForRTMSafety/rtmtools/jp.go.aist.rtm.rtcbuilder.safety/src/jp/go/aist/rtm/rtcbuilder/safety/manager/SafetyCMakeGenerateManager.java 2014-01-27 07:20:00 UTC (rev 503)
@@ -5,10 +5,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.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 2014-01-27 07:19:23 UTC (rev 502)
+++ branches/work_ForRTMSafety/rtmtools/jp.go.aist.rtm.rtcbuilder.safety/src/jp/go/aist/rtm/rtcbuilder/safety/manager/SafetyGenerateManager.java 2014-01-27 07:20:00 UTC (rev 503)
@@ -8,14 +8,16 @@
import java.util.Map;
import jp.go.aist.rtm.rtcbuilder.IRTCBMessageConstants;
-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.safety.ui.Perspective.SafetyProperty;
import jp.go.aist.rtm.rtcbuilder.manager.GenerateManager;
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.*;
@@ -177,6 +179,7 @@
}
public GeneratedResult generateRTCHeader(Map<String, Object> contextMap) {
+ System.out.println("generateRTCHeader entry");
RtcParam rtcParam = (RtcParam) contextMap.get("rtcParam");
//String outfile = "include/" + rtcParam.getName() + "/" + rtcParam.getName() + ".h";
String outfile = rtcParam.getName() + ".h";
@@ -235,6 +238,7 @@
Map<String, Object> contextMap) {
try {
String template = TEMPLATE_PATH + "/" + infile;
+ System.out.println("template:"+template);
ClassLoader cl = Thread.currentThread().getContextClassLoader();
InputStream ins = cl.getResourceAsStream(template);
GeneratedResult gr = TemplateUtil.createGeneratedResult(ins,
@@ -244,6 +248,7 @@
}
return gr;
} catch (Exception e) {
+ System.out.println("Exception");
throw new RuntimeException(form(MSG_ERROR_GENERATE_FILE,
new String[] { "RTMSafety", outfile }), e);
}
Modified: branches/work_ForRTMSafety/rtmtools/jp.go.aist.rtm.rtcbuilder.safety/src/jp/go/aist/rtm/rtcbuilder/safety/ui/Perspective/SafetyProperty.java
===================================================================
--- branches/work_ForRTMSafety/rtmtools/jp.go.aist.rtm.rtcbuilder.safety/src/jp/go/aist/rtm/rtcbuilder/safety/ui/Perspective/SafetyProperty.java 2014-01-27 07:19:23 UTC (rev 502)
+++ branches/work_ForRTMSafety/rtmtools/jp.go.aist.rtm.rtcbuilder.safety/src/jp/go/aist/rtm/rtcbuilder/safety/ui/Perspective/SafetyProperty.java 2014-01-27 07:20:00 UTC (rev 503)
@@ -12,23 +12,19 @@
private String PluginId = "org.eclipse.cdt.ui.CPerspective";
public String getPerspectiveId() {
- System.out.println("getPerspectiveId entry");
return PerspectiveId;
}
public String getPerspectiveName() {
- System.out.println("getPerspectiveName entry");
return PerspectiveName;
}
public String getPluginId() {
- System.out.println("getPluginId entry");
return PluginId;
}
@Override
public List<String> getNatures() {
- System.out.println("getNatures entry");
List<String> natures = new ArrayList<String>();
natures.add("org.eclipse.cdt.core.cnature");
natures.add("org.eclipse.cdt.make.core.makeNature");
Modified: branches/work_ForRTMSafety/rtmtools/jp.go.aist.rtm.systemeditor/.classpath
===================================================================
--- branches/work_ForRTMSafety/rtmtools/jp.go.aist.rtm.systemeditor/.classpath 2014-01-27 07:19:23 UTC (rev 502)
+++ branches/work_ForRTMSafety/rtmtools/jp.go.aist.rtm.systemeditor/.classpath 2014-01-27 07:20:00 UTC (rev 503)
@@ -3,7 +3,11 @@
<classpathentry kind="src" path="src"/>
<classpathentry kind="src" path="test"/>
<classpathentry exported="true" kind="lib" path="lib/velocity-1.6.3-dep.jar"/>
- <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
+ <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER">
+ <accessrules>
+ <accessrule kind="accessible" pattern="jp/go/aist/rtm/rtcbuilder/**"/>
+ </accessrules>
+ </classpathentry>
<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
<classpathentry kind="lib" path="lib/commons-lang-2.2.jar"/>
<classpathentry kind="con" path="org.eclipse.jdt.junit.JUNIT_CONTAINER/3"/>
Modified: branches/work_ForRTMSafety/rtmtools/jp.go.aist.rtm.systemeditor/META-INF/MANIFEST.MF
===================================================================
--- branches/work_ForRTMSafety/rtmtools/jp.go.aist.rtm.systemeditor/META-INF/MANIFEST.MF 2014-01-27 07:19:23 UTC (rev 502)
+++ branches/work_ForRTMSafety/rtmtools/jp.go.aist.rtm.systemeditor/META-INF/MANIFEST.MF 2014-01-27 07:20:00 UTC (rev 503)
@@ -30,4 +30,6 @@
Eclipse-BuddyPolicy: registered
Built-By: n-ando
Built-Date: 2013/01/25 00:47:28
+Import-Package: jp.go.aist.rtm.rtcbuilder.generator,
+ jp.go.aist.rtm.rtcbuilder.template
More information about the openrtm-commit
mailing list