[GME-commit] GMESRC/Paradigms/MetaGME/MetaInterpreter2004 BON2Component.cpp,1.29,1.30

[gme-commit at list.isis.vanderbilt.edu]

Update of /project/gme-repository/GMESRC/Paradigms/MetaGME/MetaInterpreter2004
In directory escher:/tmp/cvs-serv14021

Modified Files:
	BON2Component.cpp 
Log Message:
Rich error messages.


CVS User: Zoltan Molnar, ISIS (zolmol)

Index: BON2Component.cpp
===================================================================
RCS file: /project/gme-repository/GMESRC/Paradigms/MetaGME/MetaInterpreter2004/BON2Component.cpp,v
retrieving revision 1.29
retrieving revision 1.30
diff -C2 -d -r1.29 -r1.30
*** BON2Component.cpp	27 Jun 2005 15:54:00 -0000	1.29
--- BON2Component.cpp	28 Jun 2005 18:16:31 -0000	1.30
***************
*** 356,365 ****
  	initMembers( project);
  
! 	if ( !Sheet::makeValidParadigmName( m_projectName, std::string()))
  	{
! 		project->consoleMsg("[MetaInterpreter] Invalid characters in paradigm name (Rootfolder name). Please remove spaces and the special characters, except '.' and '_'. ", MSG_ERROR);
  		if( !global_vars.silent_mode)
! 			if( AfxMessageBox("Invalid characters in paradigm name. Continue?", MB_YESNO | MB_ICONWARNING) != IDYES)
  				return;
  	}
  	if ( Dumper::selectOutputFiles( project, m_projectName, m_dir) > 1)
--- 356,373 ----
  	initMembers( project);
  
! 	std::string temp;
! 	if ( !Sheet::makeValidParadigmName( m_projectName, temp))
  	{
! 		project->consoleMsg("[MetaInterpreter] Invalid or empty paradigm name (Rootfolder name). Please remove spaces and the special characters, except '.' and '_'. Using: \"" + temp + "\".", MSG_ERROR);
  		if( !global_vars.silent_mode)
! 		{
! 			CString msg = "Invalid or empty paradigm name: \"";
! 			msg += (m_projectName + "\". Continue using: \"" + temp + "\"?").c_str();
! 			if( AfxMessageBox( (LPCTSTR)msg, MB_YESNO | MB_ICONWARNING) != IDYES)
! 			{
! 				project->consoleMsg("[MetaInterpreter] Intepretation stopped by the user.", MSG_NORMAL);
  				return;
+ 			}
+ 		}
  	}
  	if ( Dumper::selectOutputFiles( project, m_projectName, m_dir) > 1)