[openrtm-commit:00932] r374 - trunk/rtmtools/jp.go.aist.rtm.rtcbuilder/src/jp/go/aist/rtm/rtcbuilder/generator

[openrtm ＠ openrtm.org]

Author: sakamoto
Date: 2012-12-04 02:59:42 +0900 (Tue, 04 Dec 2012)
New Revision: 374

Modified:
   trunk/rtmtools/jp.go.aist.rtm.rtcbuilder/src/jp/go/aist/rtm/rtcbuilder/generator/IDLParamConverter.java
   trunk/rtmtools/jp.go.aist.rtm.rtcbuilder/src/jp/go/aist/rtm/rtcbuilder/generator/PreProcessor.java
Log:
Modified IDL include error message

Modified: trunk/rtmtools/jp.go.aist.rtm.rtcbuilder/src/jp/go/aist/rtm/rtcbuilder/generator/IDLParamConverter.java
===================================================================
--- trunk/rtmtools/jp.go.aist.rtm.rtcbuilder/src/jp/go/aist/rtm/rtcbuilder/generator/IDLParamConverter.java	2012-11-22 14:49:08 UTC (rev 373)
+++ trunk/rtmtools/jp.go.aist.rtm.rtcbuilder/src/jp/go/aist/rtm/rtcbuilder/generator/IDLParamConverter.java	2012-12-03 17:59:42 UTC (rev 374)
@@ -348,7 +348,6 @@
 			public void visit(module n, String argu) {
 				moduleName = new ArrayList<String>();
 				final String moduleNames = node2String(n.identifier);
-				System.out.println("Mt:" + moduleNames);
 				moduleName.add(moduleNames);
 				n.accept(new ExtractModule(results),null);
 			}
@@ -357,7 +356,6 @@
 			public void visit(struct_type n, String argu) {
 				String typeName = node2String(n.identifier);
 				results.add(typeName);
-				System.out.println("Tt:" + typeName);
 			}
 		}, null);
 
@@ -376,13 +374,11 @@
 				@Override
 				public void visit(struct_type n, Object argu) {
 					String typeName = node2String(n.identifier);
-					System.out.println("Ti:" + typeName);
 					results.add(getModuleNames() + "::" + typeName);
 				}
 				@Override
 				public void visit(module n, Object argu) {
 					String typeName = node2String(n.identifier);
-					System.out.println("Mi:" + typeName);
 					moduleName.add(typeName);
 					n.accept(new ExtractModule(results),null);
 				}

Modified: trunk/rtmtools/jp.go.aist.rtm.rtcbuilder/src/jp/go/aist/rtm/rtcbuilder/generator/PreProcessor.java
===================================================================
--- trunk/rtmtools/jp.go.aist.rtm.rtcbuilder/src/jp/go/aist/rtm/rtcbuilder/generator/PreProcessor.java	2012-11-22 14:49:08 UTC (rev 373)
+++ trunk/rtmtools/jp.go.aist.rtm.rtcbuilder/src/jp/go/aist/rtm/rtcbuilder/generator/PreProcessor.java	2012-12-03 17:59:42 UTC (rev 374)
@@ -117,6 +117,10 @@
 				throw new RuntimeException(IRTCBMessageConstants.ERROR_PREPROCESSOR + filePath);
 			}
 			String includeFilePath = new File(includeBaseDir, filePath).getAbsolutePath();
+			File target = new File(includeFilePath);
+			if(target.exists()==false) {
+				throw new RuntimeException("Include of IDL '" + filePath + "' cannot be solved");
+			}
 			result = FileUtil.readFile(includeFilePath);
 			if(includeFiles!=null) {
 				if( !includeFiles.contains(includeFilePath) ) {