[openrtm-commit:00010] r167 - branches/RELENG_1_0/rtmtools/jp.go.aist.rtm.rtcbuilder/src/jp/go/aist/rtm/rtcbuilder/ui/editors

[openrtm at openrtm.org]

Author: ta
Date: 2011-04-12 13:08:48 +0900 (Tue, 12 Apr 2011)
New Revision: 167

Modified:
   branches/RELENG_1_0/rtmtools/jp.go.aist.rtm.rtcbuilder/src/jp/go/aist/rtm/rtcbuilder/ui/editors/BasicEditorFormPage.java
Log:
RTCB updates.

- fix overwrite output project.

Modified: branches/RELENG_1_0/rtmtools/jp.go.aist.rtm.rtcbuilder/src/jp/go/aist/rtm/rtcbuilder/ui/editors/BasicEditorFormPage.java
===================================================================
--- branches/RELENG_1_0/rtmtools/jp.go.aist.rtm.rtcbuilder/src/jp/go/aist/rtm/rtcbuilder/ui/editors/BasicEditorFormPage.java	2011-04-12 04:03:19 UTC (rev 166)
+++ branches/RELENG_1_0/rtmtools/jp.go.aist.rtm.rtcbuilder/src/jp/go/aist/rtm/rtcbuilder/ui/editors/BasicEditorFormPage.java	2011-04-12 04:08:48 UTC (rev 167)
@@ -572,15 +572,19 @@
 		        if (selectedFileName != null) {
 		        	if(extension == null) {
 			        	try {
-				        	if( getFileExtension(selectedFileName).equals(IRtcBuilderConstants.YAML_EXTENSION) ) {
-				        		ProfileHandler handler = new ProfileHandler();
-								editor.setGeneratorParam(handler.readYaml(selectedFileName));
-								String xmlFile = handler.convert2XML(editor.getGeneratorParam());
+							String origProject = editor.getRtcParam()
+									.getOutputProject();
+							ProfileHandler handler = new ProfileHandler();
+							if (getFileExtension(selectedFileName).equals(IRtcBuilderConstants.YAML_EXTENSION)) {
+								GeneratorParam genParam = handler.readYaml(selectedFileName);
+								String xmlFile = handler.convert2XML(genParam);
+								editor.setGeneratorParam(genParam);
 								editor.getRtcParam().setRtcXml(xmlFile);
-				        	} else {
-				        		ProfileHandler handler = new ProfileHandler();
-				        		editor.setGeneratorParam(handler.restorefromXMLFile(selectedFileName));
-				        	}
+							} else {
+								GeneratorParam genParam = handler.restorefromXMLFile(selectedFileName);
+								editor.setGeneratorParam(genParam);
+							}
+							editor.getRtcParam().setOutputProject(origProject);
 						} catch (Exception e1) {
 							MessageDialog.openError(getSite().getShell(), "Error", IMessageConstants.BASIC_IMPORT_ERROR);
 							return;