[openrtm-commit:01195] r504 - in branches/work_ForRTMSafety/rtmtools: jp.go.aist.rtm.systemeditor/src/jp/go/aist/rtm/systemeditor/template jp.go.aist.rtm.systemeditor/src/jp/go/aist/rtm/systemeditor/ui/editor jp.go.aist.rtm.toolscommon jp.go.aist.rtm.toolscommon/META-INF

[openrtm ＠ openrtm.org]

Author: win-ei
Date: 2014-01-27 16:20:53 +0900 (Mon, 27 Jan 2014)
New Revision: 504

Modified:
   branches/work_ForRTMSafety/rtmtools/jp.go.aist.rtm.systemeditor/src/jp/go/aist/rtm/systemeditor/template/TemplateUtil.java
   branches/work_ForRTMSafety/rtmtools/jp.go.aist.rtm.systemeditor/src/jp/go/aist/rtm/systemeditor/ui/editor/AbstractSystemDiagramEditor.java
   branches/work_ForRTMSafety/rtmtools/jp.go.aist.rtm.toolscommon/.classpath
   branches/work_ForRTMSafety/rtmtools/jp.go.aist.rtm.toolscommon/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.systemeditor/src/jp/go/aist/rtm/systemeditor/template/TemplateUtil.java
===================================================================
--- branches/work_ForRTMSafety/rtmtools/jp.go.aist.rtm.systemeditor/src/jp/go/aist/rtm/systemeditor/template/TemplateUtil.java	2014-01-27 07:20:00 UTC (rev 503)
+++ branches/work_ForRTMSafety/rtmtools/jp.go.aist.rtm.systemeditor/src/jp/go/aist/rtm/systemeditor/template/TemplateUtil.java	2014-01-27 07:20:53 UTC (rev 504)
@@ -1,5 +1,13 @@
 package jp.go.aist.rtm.systemeditor.template;
 
+
+import org.apache.velocity.app.VelocityEngine;
+import org.apache.velocity.runtime.RuntimeConstants;
+//import org.apache.log4j.Category;
+//import org.apache.log4j.BasicConfigurator;
+
+
+
 import java.io.ByteArrayOutputStream;
 import java.io.IOException;
 import java.io.InputStream;
@@ -87,20 +95,24 @@
 	 * @return
 	 */
 	public static VelocityEngine getEngine() {
+		System.out.println("getEngine entry");
 		VelocityEngine result = new VelocityEngine();
 		result.setProperty(VelocityEngine.RESOURCE_LOADER, "class");
 		result.setProperty(VelocityEngine.VM_LIBRARY, "");
 		result.setProperty("class.resource.loader.description",
 				"Velocity Classpath Resource Loader");
-		result
-				.setProperty("class.resource.loader.class",
+		result.setProperty("class.resource.loader.class",
 						"org.apache.velocity.runtime.resource.loader.ClasspathResourceLoader");
+		//result.setProperty( VelocityEngine.RUNTIME_LOG_LOGSYSTEM, this);
+		//result.setProperty( RuntimeConstants.RUNTIME_LOG_LOGSYSTEM_CLASS, "org.apache.velocity.runtime.log.SimpleLog4JLogSystem" );
 		try {
+			System.out.println("init");
 			result.init();
 		} catch (Exception e) {
+			System.out.println("Exception");
 			throw new RuntimeException(e); // system error
 		}
-
+		System.out.println("getEngine return");
 		return result;
 	}
 

Modified: branches/work_ForRTMSafety/rtmtools/jp.go.aist.rtm.systemeditor/src/jp/go/aist/rtm/systemeditor/ui/editor/AbstractSystemDiagramEditor.java
===================================================================
--- branches/work_ForRTMSafety/rtmtools/jp.go.aist.rtm.systemeditor/src/jp/go/aist/rtm/systemeditor/ui/editor/AbstractSystemDiagramEditor.java	2014-01-27 07:20:00 UTC (rev 503)
+++ branches/work_ForRTMSafety/rtmtools/jp.go.aist.rtm.systemeditor/src/jp/go/aist/rtm/systemeditor/ui/editor/AbstractSystemDiagramEditor.java	2014-01-27 07:20:53 UTC (rev 504)
@@ -32,7 +32,9 @@
 import jp.go.aist.rtm.systemeditor.extension.SaveProfileExtension;
 import jp.go.aist.rtm.systemeditor.factory.ProfileSaver;
 import jp.go.aist.rtm.systemeditor.nl.Messages;
-import jp.go.aist.rtm.systemeditor.template.TemplateUtil;
+//import jp.go.aist.rtm.systemeditor.template.TemplateUtil;
+import jp.go.aist.rtm.toolscommon.util.TemplateUtil;
+//import jp.go.aist.rtm.rtcbuilder.template.TemplateUtil;
 import jp.go.aist.rtm.systemeditor.ui.action.OpenCompositeComponentAction;
 import jp.go.aist.rtm.systemeditor.ui.dialog.ProfileInformationDialog;
 import jp.go.aist.rtm.systemeditor.ui.editor.action.ChangeComponentDirectionAction;
@@ -111,8 +113,11 @@
 
 import com.sun.org.apache.xerces.internal.jaxp.datatype.XMLGregorianCalendarImpl;
 
-import jp.go.aist.rtm.systemeditor.generator.GeneratedResult;
+//import jp.go.aist.rtm.toolscommon.util.TemplateUtil;
+import jp.go.aist.rtm.toolscommon.util.GeneratedResult;
+//import jp.go.aist.rtm.rtcbuilder.generator.GeneratedResult;
 
+
 public abstract class AbstractSystemDiagramEditor extends GraphicalEditor {
 
 	static final String DIALOG_TITLE_CONFIRM = Messages
@@ -1158,7 +1163,8 @@
 			connsMap.put(conn.getTargetDataPort().getPortName().replace(".", "_"),conn.getSourceDataPort().getPortName().replace(".", "_"));
 		}
 		contextMap.put("connectPorts", connsMap);
-		GeneratedResult gr = TemplateUtil.createGeneratedResult(ins, contextMap, dataPortContct);
+		System.out.println("generateDataPortConctTbl 050");
+		GeneratedResult gr = jp.go.aist.rtm.toolscommon.util.TemplateUtil.createGeneratedResult(ins, contextMap, dataPortContct);
 		if (ins != null) 
 		{
 			ins.close();

Modified: branches/work_ForRTMSafety/rtmtools/jp.go.aist.rtm.toolscommon/.classpath
===================================================================
--- branches/work_ForRTMSafety/rtmtools/jp.go.aist.rtm.toolscommon/.classpath	2014-01-27 07:20:00 UTC (rev 503)
+++ branches/work_ForRTMSafety/rtmtools/jp.go.aist.rtm.toolscommon/.classpath	2014-01-27 07:20:53 UTC (rev 504)
@@ -1,9 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <classpath>
+	<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.pde.core.requiredPlugins"/>
-	<classpathentry kind="src" path="src"/>
-	<classpathentry kind="src" path="test"/>
 	<classpathentry exported="true" kind="lib" path="lib/commons-lang-2.2.jar" sourcepath="C:/RTSystemEditor/workspace/commons-lang-2.4-src.zip"/>
 	<classpathentry kind="con" path="org.eclipse.jdt.junit.JUNIT_CONTAINER/4"/>
 	<classpathentry kind="output" path="bin"/>

Modified: branches/work_ForRTMSafety/rtmtools/jp.go.aist.rtm.toolscommon/META-INF/MANIFEST.MF
===================================================================
--- branches/work_ForRTMSafety/rtmtools/jp.go.aist.rtm.toolscommon/META-INF/MANIFEST.MF	2014-01-27 07:20:00 UTC (rev 503)
+++ branches/work_ForRTMSafety/rtmtools/jp.go.aist.rtm.toolscommon/META-INF/MANIFEST.MF	2014-01-27 07:20:53 UTC (rev 504)
@@ -5,7 +5,9 @@
 Bundle-Name: %pluginName
 Bundle-SymbolicName: jp.go.aist.rtm.toolscommon; singleton:=true
 Bundle-Version: 1.1.0.rc4v20130124
-Bundle-ClassPath: .,lib/commons-lang-2.2.jar
+Bundle-ClassPath: .,
+ lib/commons-lang-2.2.jar,
+ lib/velocity-1.6.3-dep.jar
 Bundle-Vendor: %providerName
 Bundle-Localization: plugin
 Export-Package: OpenRTM,RTC,RTM,_SDOPackage,jp.go.aist.rtm.toolscommon