[openrtm-commit:01198] r507 - in branches/work_ForRTMSafety/rtmtools: jp.go.aist.rtm.rtcbuilder/src/jp/go/aist/rtm/rtcbuilder/template jp.go.aist.rtm.rtcbuilder/src/jp/go/aist/rtm/rtcbuilder/ui/editors 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
openrtm ＠ openrtm.org
openrtm ＠ openrtm.org
2014年 1月 27日 (月) 18:46:57 JST
Author: win-ei
Date: 2014-01-27 18:46:57 +0900 (Mon, 27 Jan 2014)
New Revision: 507
Modified:
branches/work_ForRTMSafety/rtmtools/jp.go.aist.rtm.rtcbuilder.safety/src/jp/go/aist/rtm/rtcbuilder/safety/RtcBuilderSafetyPlugin.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/src/jp/go/aist/rtm/rtcbuilder/template/TemplateUtil.java
branches/work_ForRTMSafety/rtmtools/jp.go.aist.rtm.rtcbuilder/src/jp/go/aist/rtm/rtcbuilder/ui/editors/AbstractEditorFormPage.java
Log:
Deleted some processings for debugging.
Modified: branches/work_ForRTMSafety/rtmtools/jp.go.aist.rtm.rtcbuilder/src/jp/go/aist/rtm/rtcbuilder/template/TemplateUtil.java
===================================================================
--- branches/work_ForRTMSafety/rtmtools/jp.go.aist.rtm.rtcbuilder/src/jp/go/aist/rtm/rtcbuilder/template/TemplateUtil.java 2014-01-27 07:22:45 UTC (rev 506)
+++ branches/work_ForRTMSafety/rtmtools/jp.go.aist.rtm.rtcbuilder/src/jp/go/aist/rtm/rtcbuilder/template/TemplateUtil.java 2014-01-27 09:46:57 UTC (rev 507)
@@ -91,7 +91,6 @@
* @return
*/
public static VelocityEngine getEngine() {
- System.out.println("getEngine entery");
VelocityEngine result = new VelocityEngine();
result.setProperty(VelocityEngine.RESOURCE_LOADER, "class");
result.setProperty(VelocityEngine.VM_LIBRARY, "");
@@ -99,23 +98,15 @@
"Velocity Classpath Resource Loader");
result.setProperty("class.resource.loader.class",
"org.apache.velocity.runtime.resource.loader.ClasspathResourceLoader");
- System.out.println("current dir :"+new java.io.File(".").getAbsolutePath());
- System.out.println("user.dir :"+System.getProperty("user.dir"));
- //result.setProperty( RuntimeConstants.RUNTIME_LOG_LOGSYSTEM_CLASS, "org.apache.velocity.runtime.log.SimpleLog4JLogSystem" );
- //result.setProperty("runtime.log.logsystem.log4j.category", CATEGORY_NAME);
- //result.setProperty(VelocityEngine.RUNTIME_LOG_LOGSYSTEM, new org.springframework.security.saml.util.SLF4JLogChute());
try {
- System.out.println("getEngine result.init()");
result.init();
} catch (Exception e) {
- System.out.println("getEngine Exception");
throw new RuntimeException(e); // system error
}
- System.out.println("getEngine return");
return result;
}
@@ -163,13 +154,10 @@
for (Iterator iter = contextMap.entrySet().iterator(); iter.hasNext();) {
Map.Entry element = (Map.Entry) iter.next();
vc.put((String) element.getKey(), element.getValue());
- System.out.println(" "+element.getKey()+":"+element.getValue());
}
StringWriter result = new StringWriter();
try {
- System.out.println("generate 060 file.resource.loader.path:"+ve.getProperty("file.resource.loader.path"));
- System.out.println("generate 061 FILE.resource.loader.path:"+ve.getProperty("FILE.resource.loader.path"));
ve.evaluate(vc, result, "", new InputStreamReader(in, "UTF-8"));
result.close();
Modified: branches/work_ForRTMSafety/rtmtools/jp.go.aist.rtm.rtcbuilder/src/jp/go/aist/rtm/rtcbuilder/ui/editors/AbstractEditorFormPage.java
===================================================================
--- branches/work_ForRTMSafety/rtmtools/jp.go.aist.rtm.rtcbuilder/src/jp/go/aist/rtm/rtcbuilder/ui/editors/AbstractEditorFormPage.java 2014-01-27 07:22:45 UTC (rev 506)
+++ branches/work_ForRTMSafety/rtmtools/jp.go.aist.rtm.rtcbuilder/src/jp/go/aist/rtm/rtcbuilder/ui/editors/AbstractEditorFormPage.java 2014-01-27 09:46:57 UTC (rev 507)
@@ -463,24 +463,11 @@
}
protected String[] extractDataTypes() {
- System.out.println("AbstractEditorFormPage.extractDataTypes() entry");
String FS = System.getProperty("file.separator");
- System.out.print("AbstractEditorFormPage.extractDataTypes() 010 ");
System.out.println(FS);
List<String> sources = new ArrayList<String>(DataTypePreferenceManager
.getInstance().getIdlFileDirectories());
- System.out.print("AbstractEditorFormPage.extractDataTypes() 020");
- //<+zxc
- for(String str: sources)
- {
- System.out.print(str);
- System.out.print(" ");
- }
- System.out.println(" ");
- //zxc+>
String defaultPath = System.getenv("RTM_ROOT");
- System.out.print("AbstractEditorFormPage.extractDataTypes() 030 ");
- System.out.println(defaultPath);
int baseindex = -1;
if (defaultPath != null) {
baseindex = 0;
@@ -490,15 +477,8 @@
sources.add(0, defaultPath + "rtm" + FS + "idl");
}
List<DataTypeParam> sourceContents = new ArrayList<DataTypeParam>();
- System.out.println("AbstractEditorFormPage.extractDataTypes() 040 ");
- System.out.print(" ");
for (int intidx = 0; intidx < sources.size(); intidx++) {
String source = sources.get(intidx);
- System.out.print("[");
- System.out.print(intidx);
- System.out.print("]");
- System.out.print(source);
- System.out.print(" ");
try {
File idlDir = new File(source);
String[] list = idlDir.list();
@@ -516,8 +496,6 @@
return a.compareTo(b);
}
});
- System.out.println(" ");
- System.out.print(" ");
for (String idlName : idlNames) {
String idlContent = FileUtil
.readFile(source + FS + idlName);
@@ -525,19 +503,15 @@
param.setContent(idlContent);
param.setFullPath(source + FS + idlName);
sourceContents.add(param);
- System.out.print(param);
- System.out.print(" ");
if( baseindex<intidx) {
param.setAddition(true);
}
}
- System.out.println(" ");
} catch (IOException e) {
e.printStackTrace();
} catch (java.lang.SecurityException e) {
e.printStackTrace();
}
- System.out.println(" ");
}
String[] defaultTypeList = new String[0];
List<String> dataTypes = new ArrayList<String>();
@@ -551,7 +525,6 @@
editor.getGeneratorParam().getDataTypeParams().addAll(sourceContents);
//
- System.out.println("AbstractEditorFormPage.extractDataTypes() return");
return defaultTypeList;
}
Modified: branches/work_ForRTMSafety/rtmtools/jp.go.aist.rtm.rtcbuilder.safety/src/jp/go/aist/rtm/rtcbuilder/safety/RtcBuilderSafetyPlugin.java
===================================================================
--- branches/work_ForRTMSafety/rtmtools/jp.go.aist.rtm.rtcbuilder.safety/src/jp/go/aist/rtm/rtcbuilder/safety/RtcBuilderSafetyPlugin.java 2014-01-27 07:22:45 UTC (rev 506)
+++ branches/work_ForRTMSafety/rtmtools/jp.go.aist.rtm.rtcbuilder.safety/src/jp/go/aist/rtm/rtcbuilder/safety/RtcBuilderSafetyPlugin.java 2014-01-27 09:46:57 UTC (rev 507)
@@ -22,10 +22,8 @@
* The constructor
*/
public RtcBuilderSafetyPlugin() {
- System.out.println("RtcBuilderSafetyPlugin entry");
plugin = this;
getLogger();
- System.out.println("RtcBuilderSafetyPlugin return");
}
/*
@@ -33,13 +31,9 @@
* @see org.eclipse.ui.plugin.AbstractUIPlugin#start(org.osgi.framework.BundleContext)
*/
public void start(BundleContext context) throws Exception {
- System.out.println("start entry");
RtcBuilderPlugin.addLogger(getLogger());
//
- System.out.println("start 050");
- System.out.println(">>"+context);
super.start(context);
- System.out.println("start return");
}
/*
@@ -47,12 +41,10 @@
* @see org.eclipse.ui.plugin.AbstractUIPlugin#stop(org.osgi.framework.BundleContext)
*/
public void stop(BundleContext context) throws Exception {
- System.out.println("stop entry");
RtcBuilderPlugin.removeLogger(getLogger());
//
plugin = null;
super.stop(context);
- System.out.println("stop return");
}
/**
@@ -61,18 +53,15 @@
* @return the shared instance
*/
public static RtcBuilderSafetyPlugin getDefault() {
- System.out.println("getDefault entry");
return plugin;
}
static Logger log;
public static Logger getLogger() {
- System.out.println("getLogger entry");
if (log == null) {
log = Logger.getLogger(PLUGIN_ID);
}
- System.out.println("getLogger retrun");
return log;
}
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:22:45 UTC (rev 506)
+++ branches/work_ForRTMSafety/rtmtools/jp.go.aist.rtm.rtcbuilder.safety/src/jp/go/aist/rtm/rtcbuilder/safety/manager/SafetyGenerateManager.java 2014-01-27 09:46:57 UTC (rev 507)
@@ -179,7 +179,6 @@
}
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";
@@ -238,7 +237,6 @@
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,
@@ -248,7 +246,6 @@
}
return gr;
} catch (Exception e) {
- System.out.println("Exception");
throw new RuntimeException(form(MSG_ERROR_GENERATE_FILE,
new String[] { "RTMSafety", outfile }), e);
}
More information about the openrtm-commit
mailing list