[openrtm-commit:01202] r511 - in branches/work_ForRTMSafety/rtmtools: jp.go.aist.rtm.repositoryView/src/jp/go/aist/rtm/repositoryView/repository jp.go.aist.rtm.repositoryView/src/jp/go/aist/rtm/repositoryView/ui/action jp.go.aist.rtm.systemeditor/src/jp/go/aist/rtm/systemeditor/template
openrtm ＠ openrtm.org
openrtm ＠ openrtm.org
2014年 1月 30日 (木) 10:51:41 JST
Author: win-ei
Date: 2014-01-30 10:51:40 +0900 (Thu, 30 Jan 2014)
New Revision: 511
Modified:
branches/work_ForRTMSafety/rtmtools/jp.go.aist.rtm.repositoryView/src/jp/go/aist/rtm/repositoryView/repository/RTRepositoryAccesser.java
branches/work_ForRTMSafety/rtmtools/jp.go.aist.rtm.repositoryView/src/jp/go/aist/rtm/repositoryView/ui/action/ViewActionLoadDirecroty.java
branches/work_ForRTMSafety/rtmtools/jp.go.aist.rtm.repositoryView/src/jp/go/aist/rtm/repositoryView/ui/action/ViewActionLoadFile.java
branches/work_ForRTMSafety/rtmtools/jp.go.aist.rtm.systemeditor/src/jp/go/aist/rtm/systemeditor/template/TemplateUtil.java
Log:
Deleted processings for debugging.
Modified: branches/work_ForRTMSafety/rtmtools/jp.go.aist.rtm.repositoryView/src/jp/go/aist/rtm/repositoryView/repository/RTRepositoryAccesser.java
===================================================================
--- branches/work_ForRTMSafety/rtmtools/jp.go.aist.rtm.repositoryView/src/jp/go/aist/rtm/repositoryView/repository/RTRepositoryAccesser.java 2014-01-30 00:56:22 UTC (rev 510)
+++ branches/work_ForRTMSafety/rtmtools/jp.go.aist.rtm.repositoryView/src/jp/go/aist/rtm/repositoryView/repository/RTRepositoryAccesser.java 2014-01-30 01:51:40 UTC (rev 511)
@@ -154,22 +154,17 @@
* @throws Exception
*/
public ComponentSpecification getComponentProfile(ComponentSpecification component) throws Exception {
- System.out.println("RTRepositoryAccesser.getComponentProfile() entry");
RTRepositoryClientFactory factory = RTRepositoryClientFactory.getInstance();
- System.out.println("RTRepositoryAccesser.getComponentProfile() 010 "+component.getPathId());
RTRepositoryClient client = factory.create(component.getPathId());
ItemCategory itemCategory = ItemCategory.RTC;
String targetXML = client.downloadProfile(component.getComponentId(), itemCategory);
- System.out.println("RTRepositoryAccesser.getComponentProfile() 020 targetXML="+component.getPathId());
RtcProfileHandler handler = new RtcProfileHandler();
ComponentSpecification specification = handler.createComponentFromXML(targetXML);
specification.setAliasName(component.getAliasName());
specification.setComponentId(component.getComponentId());
specification.setPathId(component.getPathId());
- System.out.println("RTRepositoryAccesser.getComponentProfile() 060"+specification.getRtcType());
- System.out.println("RTRepositoryAccesser.getComponentProfile() return");
return specification;
}
Modified: branches/work_ForRTMSafety/rtmtools/jp.go.aist.rtm.repositoryView/src/jp/go/aist/rtm/repositoryView/ui/action/ViewActionLoadDirecroty.java
===================================================================
--- branches/work_ForRTMSafety/rtmtools/jp.go.aist.rtm.repositoryView/src/jp/go/aist/rtm/repositoryView/ui/action/ViewActionLoadDirecroty.java 2014-01-30 00:56:22 UTC (rev 510)
+++ branches/work_ForRTMSafety/rtmtools/jp.go.aist.rtm.repositoryView/src/jp/go/aist/rtm/repositoryView/ui/action/ViewActionLoadDirecroty.java 2014-01-30 01:51:40 UTC (rev 511)
@@ -38,7 +38,6 @@
@SuppressWarnings("unchecked")
public void run(IAction action) {
- System.out.println("ViewActionLoadDirecroty.run() entry");
DirectoryDialog directoryDialog = new DirectoryDialog(view.getSite().getShell(),SWT.NULL);
directoryDialog.setText(Messages.getString("ViewActionLoadDirecroty.0")); //$NON-NLS-1$
@@ -88,7 +87,6 @@
RepositoryViewFactory.buildTree(itemFirst, module, RepositoryViewLeafItem.RTC_LEAF);
}
viewer.refresh();
- System.out.println("ViewActionLoadDirecroty.run() return");
}
public void selectionChanged(IAction action, ISelection selection) {
Modified: branches/work_ForRTMSafety/rtmtools/jp.go.aist.rtm.repositoryView/src/jp/go/aist/rtm/repositoryView/ui/action/ViewActionLoadFile.java
===================================================================
--- branches/work_ForRTMSafety/rtmtools/jp.go.aist.rtm.repositoryView/src/jp/go/aist/rtm/repositoryView/ui/action/ViewActionLoadFile.java 2014-01-30 00:56:22 UTC (rev 510)
+++ branches/work_ForRTMSafety/rtmtools/jp.go.aist.rtm.repositoryView/src/jp/go/aist/rtm/repositoryView/ui/action/ViewActionLoadFile.java 2014-01-30 01:51:40 UTC (rev 511)
@@ -38,7 +38,6 @@
@SuppressWarnings("unchecked")
public void run(IAction action) {
- System.out.println("ViewActionLoadFile.run() entry");
//対象ファイルの選択
FileDialog fileDialog = new FileDialog(view.getSite().getShell(), SWT.OPEN);
@@ -46,7 +45,6 @@
fileDialog.setFilterExtensions(new String[]{"*.xml"}); //$NON-NLS-1$
String targetFileName = fileDialog.open();
if( targetFileName==null ) return;
- System.out.println("ViewActionLoadFile.run() 005 targetFileName="+targetFileName);
ComponentSpecification module = null;
RtcProfileHandler handler = new RtcProfileHandler();
@@ -84,7 +82,6 @@
}
RepositoryViewFactory.buildTree(itemFirst, module, RepositoryViewLeafItem.RTC_LEAF);
viewer.refresh();
- System.out.println("ViewActionLoadFile.run() return");
}
public void selectionChanged(IAction action, ISelection selection) {
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-30 00:56:22 UTC (rev 510)
+++ branches/work_ForRTMSafety/rtmtools/jp.go.aist.rtm.systemeditor/src/jp/go/aist/rtm/systemeditor/template/TemplateUtil.java 2014-01-30 01:51:40 UTC (rev 511)
@@ -3,8 +3,6 @@
import org.apache.velocity.app.VelocityEngine;
import org.apache.velocity.runtime.RuntimeConstants;
-//import org.apache.log4j.Category;
-//import org.apache.log4j.BasicConfigurator;
@@ -66,7 +64,6 @@
*/
public static GeneratedResult createGeneratedResult(InputStream in,
String contextRootName, Object contextRoot, String fileName) {
- System.out.println("createGeneratedResult 1");
Map<String, Object> map = new HashMap<String, Object>();
map.put(contextRootName, contextRoot);
@@ -85,7 +82,6 @@
@SuppressWarnings("unchecked")
public static GeneratedResult createGeneratedResult(InputStream in,
Map contextMap, String fileName) {
- System.out.println("createGeneratedResult");
return new GeneratedResult(fileName, generate(in, contextMap));
}
@@ -95,7 +91,6 @@
* @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, "");
@@ -103,16 +98,11 @@
"Velocity Classpath Resource Loader");
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;
}
@@ -154,31 +144,22 @@
*/
@SuppressWarnings("unchecked")
public static String generate(InputStream in, Map contextMap) {
- System.out.println("Template.generate entry");
VelocityEngine ve = TemplateUtil.getEngine();
- System.out.println("Template.generate 010");
ve.setProperty(VelocityEngine.RUNTIME_LOG_LOGSYSTEM_CLASS, "org.apache.velocity.runtime.log.NullLogSystem");
- System.out.println("Template.generate 020");
VelocityContext vc = TemplateUtil.getDefaultVelocityContext();
- System.out.println("Template.generate 030");
for (Iterator iter = contextMap.entrySet().iterator(); iter.hasNext();) {
Map.Entry element = (Map.Entry) iter.next();
- System.out.println(element.getKey()+" "+ element.getValue());
vc.put((String) element.getKey(), element.getValue());
}
- System.out.println("Template.generate 040");
StringWriter result = new StringWriter();
- System.out.println("Template.generate 050");
try {
ve.evaluate(vc, result, "", new InputStreamReader(in, "UTF-8"));
result.close();
} catch (Exception e) {
- System.out.println("Template.generate Exception");
throw new RuntimeException(e); // system error
}
- System.out.println("Template.generate return 1");
return result.toString().replace("\r\n", System.getProperty( "line.separator" ));
}
More information about the openrtm-commit
mailing list