[GME-commit] GMESRC/Paradigms/MetaGME/MetaInterpreter2004 BON2Component.cpp,1.30,1.31 LogStream.cpp,1.3,1.4 MetaGME2004.vcproj,1.3,1.4

gme-commit at list.isis.vanderbilt.edu gme-commit at list.isis.vanderbilt.edu
Fri Sep 22 23:27:15 CDT 2006


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

Modified Files:
	BON2Component.cpp LogStream.cpp MetaGME2004.vcproj 
Log Message:
MetaInt made namespacish.


CVS User: Zoltan Molnar, ISIS (zolmol)

Index: LogStream.cpp
===================================================================
RCS file: /project/gme-repository/GMESRC/Paradigms/MetaGME/MetaInterpreter2004/LogStream.cpp,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** LogStream.cpp	31 Dec 2004 19:51:20 -0000	1.3
--- LogStream.cpp	22 Sep 2006 22:27:13 -0000	1.4
***************
*** 72,77 ****
  	if( r.find('\n') != std::string::npos)
  	{
! 		if( !global_vars.silent_mode)
! 			stream.m_proj->consoleMsg( stream.m_buff, stream.m_msgtype);
  
  		stream.m_buff = "";
--- 72,79 ----
  	if( r.find('\n') != std::string::npos)
  	{
! 		if( !global_vars.silent_mode) {
! 			try { stream.m_proj->consoleMsg( stream.m_buff, stream.m_msgtype); }
! 			catch( ... ) { } // will throw if invoked without the Gui up&running
! 		}
  
  		stream.m_buff = "";

Index: BON2Component.cpp
===================================================================
RCS file: /project/gme-repository/GMESRC/Paradigms/MetaGME/MetaInterpreter2004/BON2Component.cpp,v
retrieving revision 1.30
retrieving revision 1.31
diff -C2 -d -r1.30 -r1.31
*** BON2Component.cpp	28 Jun 2005 18:16:31 -0000	1.30
--- BON2Component.cpp	22 Sep 2006 22:27:13 -0000	1.31
***************
*** 351,355 ****
  	// ======================
  	// Insert application specific code here
- 
  	global_vars.silent_mode = (lParam == GME_SILENT_MODE);
  	//global_vars.silent_mode = true;
--- 351,354 ----
***************
*** 359,365 ****
  	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();
--- 358,364 ----
  	if ( !Sheet::makeValidParadigmName( m_projectName, temp))
  	{
  		if( !global_vars.silent_mode)
  		{
+ 			project->consoleMsg("[MetaInterpreter] Invalid or empty paradigm name (Rootfolder name). Please remove spaces and the special characters, except '.' and '_'. Using: \"" + temp + "\".", MSG_ERROR);
  			CString msg = "Invalid or empty paradigm name: \"";
  			msg += (m_projectName + "\". Continue using: \"" + temp + "\"?").c_str();
***************
*** 373,377 ****
  	if ( Dumper::selectOutputFiles( project, m_projectName, m_dir) > 1)
  	{
! 		project->consoleMsg("[MetaInterpreter] Output file name selection cancelled by the user or other file operation failed.", MSG_NORMAL);
  		return;
  	}
--- 372,376 ----
  	if ( Dumper::selectOutputFiles( project, m_projectName, m_dir) > 1)
  	{
! 		if( !global_vars.silent_mode) project->consoleMsg("[MetaInterpreter] Output file name selection cancelled by the user or other file operation failed.", MSG_NORMAL);
  		return;
  	}

Index: MetaGME2004.vcproj
===================================================================
RCS file: /project/gme-repository/GMESRC/Paradigms/MetaGME/MetaInterpreter2004/MetaGME2004.vcproj,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** MetaGME2004.vcproj	12 May 2005 01:21:39 -0000	1.3
--- MetaGME2004.vcproj	22 Sep 2006 22:27:13 -0000	1.4
***************
*** 1470,1715 ****
  					</FileConfiguration>
  				</File>
! 			</Filter>
! 			<Filter
! 				Name="GUI"
! 				Filter="">
! 				<File
! 					RelativePath="Asp\AspectPage.cpp">
! 					<FileConfiguration
! 						Name="ReleaseNoUserInput|Win32">
! 						<Tool
! 							Name="VCCLCompilerTool"
! 							Optimization="1"
! 							AdditionalIncludeDirectories=""
! 							PreprocessorDefinitions=""/>
! 					</FileConfiguration>
! 					<FileConfiguration
! 						Name="Debug|Win32">
! 						<Tool
! 							Name="VCCLCompilerTool"
! 							Optimization="0"
! 							AdditionalIncludeDirectories=""
! 							PreprocessorDefinitions=""
! 							BasicRuntimeChecks="3"
! 							BrowseInformation="1"/>
! 					</FileConfiguration>
! 					<FileConfiguration
! 						Name="Release|Win32">
! 						<Tool
! 							Name="VCCLCompilerTool"
! 							Optimization="1"
! 							AdditionalIncludeDirectories=""
! 							PreprocessorDefinitions=""/>
! 					</FileConfiguration>
! 				</File>
! 				<File
! 					RelativePath="Asp\AspectSpecDlg.cpp">
! 					<FileConfiguration
! 						Name="ReleaseNoUserInput|Win32">
! 						<Tool
! 							Name="VCCLCompilerTool"
! 							Optimization="1"
! 							AdditionalIncludeDirectories=""
! 							PreprocessorDefinitions=""/>
! 					</FileConfiguration>
! 					<FileConfiguration
! 						Name="Debug|Win32">
! 						<Tool
! 							Name="VCCLCompilerTool"
! 							Optimization="0"
! 							AdditionalIncludeDirectories=""
! 							PreprocessorDefinitions=""
! 							BasicRuntimeChecks="3"
! 							BrowseInformation="1"/>
! 					</FileConfiguration>
! 					<FileConfiguration
! 						Name="Release|Win32">
! 						<Tool
! 							Name="VCCLCompilerTool"
! 							Optimization="1"
! 							AdditionalIncludeDirectories=""
! 							PreprocessorDefinitions=""/>
! 					</FileConfiguration>
! 				</File>
! 				<File
! 					RelativePath="Asp\AspectSpecTbl.cpp">
! 					<FileConfiguration
! 						Name="ReleaseNoUserInput|Win32">
! 						<Tool
! 							Name="VCCLCompilerTool"
! 							Optimization="1"
! 							AdditionalIncludeDirectories=""
! 							PreprocessorDefinitions=""/>
! 					</FileConfiguration>
! 					<FileConfiguration
! 						Name="Debug|Win32">
! 						<Tool
! 							Name="VCCLCompilerTool"
! 							Optimization="0"
! 							AdditionalIncludeDirectories=""
! 							PreprocessorDefinitions=""
! 							BasicRuntimeChecks="3"
! 							BrowseInformation="1"/>
! 					</FileConfiguration>
! 					<FileConfiguration
! 						Name="Release|Win32">
! 						<Tool
! 							Name="VCCLCompilerTool"
! 							Optimization="1"
! 							AdditionalIncludeDirectories=""
! 							PreprocessorDefinitions=""/>
! 					</FileConfiguration>
! 				</File>
! 				<File
! 					RelativePath=".\Asp\EventsDial.cpp">
! 				</File>
! 				<File
! 					RelativePath="Asp\GlobalAspOrder.cpp">
! 					<FileConfiguration
! 						Name="ReleaseNoUserInput|Win32">
! 						<Tool
! 							Name="VCCLCompilerTool"
! 							Optimization="1"
! 							AdditionalIncludeDirectories=""
! 							PreprocessorDefinitions=""/>
! 					</FileConfiguration>
! 					<FileConfiguration
! 						Name="Debug|Win32">
! 						<Tool
! 							Name="VCCLCompilerTool"
! 							Optimization="0"
! 							AdditionalIncludeDirectories=""
! 							PreprocessorDefinitions=""
! 							BasicRuntimeChecks="3"
! 							BrowseInformation="1"/>
! 					</FileConfiguration>
! 					<FileConfiguration
! 						Name="Release|Win32">
! 						<Tool
! 							Name="VCCLCompilerTool"
! 							Optimization="1"
! 							AdditionalIncludeDirectories=""
! 							PreprocessorDefinitions=""/>
! 					</FileConfiguration>
! 				</File>
! 				<File
! 					RelativePath="Asp\InPlaceEdit.cpp">
! 					<FileConfiguration
! 						Name="ReleaseNoUserInput|Win32">
! 						<Tool
! 							Name="VCCLCompilerTool"
! 							Optimization="1"
! 							AdditionalIncludeDirectories=""
! 							PreprocessorDefinitions=""/>
! 					</FileConfiguration>
! 					<FileConfiguration
! 						Name="Debug|Win32">
! 						<Tool
! 							Name="VCCLCompilerTool"
! 							Optimization="0"
! 							AdditionalIncludeDirectories=""
! 							PreprocessorDefinitions=""
! 							BasicRuntimeChecks="3"
! 							BrowseInformation="1"/>
! 					</FileConfiguration>
! 					<FileConfiguration
! 						Name="Release|Win32">
! 						<Tool
! 							Name="VCCLCompilerTool"
! 							Optimization="1"
! 							AdditionalIncludeDirectories=""
! 							PreprocessorDefinitions=""/>
! 					</FileConfiguration>
! 				</File>
! 				<File
! 					RelativePath="Asp\InPlaceList.cpp">
! 					<FileConfiguration
! 						Name="ReleaseNoUserInput|Win32">
! 						<Tool
! 							Name="VCCLCompilerTool"
! 							Optimization="1"
! 							AdditionalIncludeDirectories=""
! 							PreprocessorDefinitions=""/>
! 					</FileConfiguration>
! 					<FileConfiguration
! 						Name="Debug|Win32">
! 						<Tool
! 							Name="VCCLCompilerTool"
! 							Optimization="0"
! 							AdditionalIncludeDirectories=""
! 							PreprocessorDefinitions=""
! 							BasicRuntimeChecks="3"
! 							BrowseInformation="1"/>
! 					</FileConfiguration>
! 					<FileConfiguration
! 						Name="Release|Win32">
! 						<Tool
! 							Name="VCCLCompilerTool"
! 							Optimization="1"
! 							AdditionalIncludeDirectories=""
! 							PreprocessorDefinitions=""/>
! 					</FileConfiguration>
! 				</File>
! 				<File
! 					RelativePath="Asp\NameSpecDlg.cpp">
! 					<FileConfiguration
! 						Name="ReleaseNoUserInput|Win32">
! 						<Tool
! 							Name="VCCLCompilerTool"
! 							Optimization="1"
! 							AdditionalIncludeDirectories=""
! 							PreprocessorDefinitions=""/>
! 					</FileConfiguration>
! 					<FileConfiguration
! 						Name="Debug|Win32">
! 						<Tool
! 							Name="VCCLCompilerTool"
! 							Optimization="0"
! 							AdditionalIncludeDirectories=""
! 							PreprocessorDefinitions=""
! 							BasicRuntimeChecks="3"
! 							BrowseInformation="1"/>
! 					</FileConfiguration>
! 					<FileConfiguration
! 						Name="Release|Win32">
! 						<Tool
! 							Name="VCCLCompilerTool"
! 							Optimization="1"
! 							AdditionalIncludeDirectories=""
! 							PreprocessorDefinitions=""/>
! 					</FileConfiguration>
! 				</File>
! 				<File
! 					RelativePath="Asp\NameSpecTbl.cpp">
! 					<FileConfiguration
! 						Name="ReleaseNoUserInput|Win32">
! 						<Tool
! 							Name="VCCLCompilerTool"
! 							Optimization="1"
! 							AdditionalIncludeDirectories=""
! 							PreprocessorDefinitions=""/>
! 					</FileConfiguration>
! 					<FileConfiguration
! 						Name="Debug|Win32">
! 						<Tool
! 							Name="VCCLCompilerTool"
! 							Optimization="0"
! 							AdditionalIncludeDirectories=""
! 							PreprocessorDefinitions=""
! 							BasicRuntimeChecks="3"
! 							BrowseInformation="1"/>
! 					</FileConfiguration>
! 					<FileConfiguration
! 						Name="Release|Win32">
! 						<Tool
! 							Name="VCCLCompilerTool"
! 							Optimization="1"
! 							AdditionalIncludeDirectories=""
! 							PreprocessorDefinitions=""/>
! 					</FileConfiguration>
! 				</File>
! 				<File
! 					RelativePath=".\Asp\Options.cpp">
! 				</File>
  			</Filter>
  		</Filter>
--- 1470,1715 ----
  					</FileConfiguration>
  				</File>
! 				<Filter
! 					Name="GUI"
! 					Filter="">
! 					<File
! 						RelativePath="Asp\AspectPage.cpp">
! 						<FileConfiguration
! 							Name="ReleaseNoUserInput|Win32">
! 							<Tool
! 								Name="VCCLCompilerTool"
! 								Optimization="1"
! 								AdditionalIncludeDirectories=""
! 								PreprocessorDefinitions=""/>
! 						</FileConfiguration>
! 						<FileConfiguration
! 							Name="Debug|Win32">
! 							<Tool
! 								Name="VCCLCompilerTool"
! 								Optimization="0"
! 								AdditionalIncludeDirectories=""
! 								PreprocessorDefinitions=""
! 								BasicRuntimeChecks="3"
! 								BrowseInformation="1"/>
! 						</FileConfiguration>
! 						<FileConfiguration
! 							Name="Release|Win32">
! 							<Tool
! 								Name="VCCLCompilerTool"
! 								Optimization="1"
! 								AdditionalIncludeDirectories=""
! 								PreprocessorDefinitions=""/>
! 						</FileConfiguration>
! 					</File>
! 					<File
! 						RelativePath="Asp\AspectSpecDlg.cpp">
! 						<FileConfiguration
! 							Name="ReleaseNoUserInput|Win32">
! 							<Tool
! 								Name="VCCLCompilerTool"
! 								Optimization="1"
! 								AdditionalIncludeDirectories=""
! 								PreprocessorDefinitions=""/>
! 						</FileConfiguration>
! 						<FileConfiguration
! 							Name="Debug|Win32">
! 							<Tool
! 								Name="VCCLCompilerTool"
! 								Optimization="0"
! 								AdditionalIncludeDirectories=""
! 								PreprocessorDefinitions=""
! 								BasicRuntimeChecks="3"
! 								BrowseInformation="1"/>
! 						</FileConfiguration>
! 						<FileConfiguration
! 							Name="Release|Win32">
! 							<Tool
! 								Name="VCCLCompilerTool"
! 								Optimization="1"
! 								AdditionalIncludeDirectories=""
! 								PreprocessorDefinitions=""/>
! 						</FileConfiguration>
! 					</File>
! 					<File
! 						RelativePath="Asp\AspectSpecTbl.cpp">
! 						<FileConfiguration
! 							Name="ReleaseNoUserInput|Win32">
! 							<Tool
! 								Name="VCCLCompilerTool"
! 								Optimization="1"
! 								AdditionalIncludeDirectories=""
! 								PreprocessorDefinitions=""/>
! 						</FileConfiguration>
! 						<FileConfiguration
! 							Name="Debug|Win32">
! 							<Tool
! 								Name="VCCLCompilerTool"
! 								Optimization="0"
! 								AdditionalIncludeDirectories=""
! 								PreprocessorDefinitions=""
! 								BasicRuntimeChecks="3"
! 								BrowseInformation="1"/>
! 						</FileConfiguration>
! 						<FileConfiguration
! 							Name="Release|Win32">
! 							<Tool
! 								Name="VCCLCompilerTool"
! 								Optimization="1"
! 								AdditionalIncludeDirectories=""
! 								PreprocessorDefinitions=""/>
! 						</FileConfiguration>
! 					</File>
! 					<File
! 						RelativePath=".\Asp\EventsDial.cpp">
! 					</File>
! 					<File
! 						RelativePath="Asp\GlobalAspOrder.cpp">
! 						<FileConfiguration
! 							Name="ReleaseNoUserInput|Win32">
! 							<Tool
! 								Name="VCCLCompilerTool"
! 								Optimization="1"
! 								AdditionalIncludeDirectories=""
! 								PreprocessorDefinitions=""/>
! 						</FileConfiguration>
! 						<FileConfiguration
! 							Name="Debug|Win32">
! 							<Tool
! 								Name="VCCLCompilerTool"
! 								Optimization="0"
! 								AdditionalIncludeDirectories=""
! 								PreprocessorDefinitions=""
! 								BasicRuntimeChecks="3"
! 								BrowseInformation="1"/>
! 						</FileConfiguration>
! 						<FileConfiguration
! 							Name="Release|Win32">
! 							<Tool
! 								Name="VCCLCompilerTool"
! 								Optimization="1"
! 								AdditionalIncludeDirectories=""
! 								PreprocessorDefinitions=""/>
! 						</FileConfiguration>
! 					</File>
! 					<File
! 						RelativePath="Asp\InPlaceEdit.cpp">
! 						<FileConfiguration
! 							Name="ReleaseNoUserInput|Win32">
! 							<Tool
! 								Name="VCCLCompilerTool"
! 								Optimization="1"
! 								AdditionalIncludeDirectories=""
! 								PreprocessorDefinitions=""/>
! 						</FileConfiguration>
! 						<FileConfiguration
! 							Name="Debug|Win32">
! 							<Tool
! 								Name="VCCLCompilerTool"
! 								Optimization="0"
! 								AdditionalIncludeDirectories=""
! 								PreprocessorDefinitions=""
! 								BasicRuntimeChecks="3"
! 								BrowseInformation="1"/>
! 						</FileConfiguration>
! 						<FileConfiguration
! 							Name="Release|Win32">
! 							<Tool
! 								Name="VCCLCompilerTool"
! 								Optimization="1"
! 								AdditionalIncludeDirectories=""
! 								PreprocessorDefinitions=""/>
! 						</FileConfiguration>
! 					</File>
! 					<File
! 						RelativePath="Asp\InPlaceList.cpp">
! 						<FileConfiguration
! 							Name="ReleaseNoUserInput|Win32">
! 							<Tool
! 								Name="VCCLCompilerTool"
! 								Optimization="1"
! 								AdditionalIncludeDirectories=""
! 								PreprocessorDefinitions=""/>
! 						</FileConfiguration>
! 						<FileConfiguration
! 							Name="Debug|Win32">
! 							<Tool
! 								Name="VCCLCompilerTool"
! 								Optimization="0"
! 								AdditionalIncludeDirectories=""
! 								PreprocessorDefinitions=""
! 								BasicRuntimeChecks="3"
! 								BrowseInformation="1"/>
! 						</FileConfiguration>
! 						<FileConfiguration
! 							Name="Release|Win32">
! 							<Tool
! 								Name="VCCLCompilerTool"
! 								Optimization="1"
! 								AdditionalIncludeDirectories=""
! 								PreprocessorDefinitions=""/>
! 						</FileConfiguration>
! 					</File>
! 					<File
! 						RelativePath="Asp\NameSpecDlg.cpp">
! 						<FileConfiguration
! 							Name="ReleaseNoUserInput|Win32">
! 							<Tool
! 								Name="VCCLCompilerTool"
! 								Optimization="1"
! 								AdditionalIncludeDirectories=""
! 								PreprocessorDefinitions=""/>
! 						</FileConfiguration>
! 						<FileConfiguration
! 							Name="Debug|Win32">
! 							<Tool
! 								Name="VCCLCompilerTool"
! 								Optimization="0"
! 								AdditionalIncludeDirectories=""
! 								PreprocessorDefinitions=""
! 								BasicRuntimeChecks="3"
! 								BrowseInformation="1"/>
! 						</FileConfiguration>
! 						<FileConfiguration
! 							Name="Release|Win32">
! 							<Tool
! 								Name="VCCLCompilerTool"
! 								Optimization="1"
! 								AdditionalIncludeDirectories=""
! 								PreprocessorDefinitions=""/>
! 						</FileConfiguration>
! 					</File>
! 					<File
! 						RelativePath="Asp\NameSpecTbl.cpp">
! 						<FileConfiguration
! 							Name="ReleaseNoUserInput|Win32">
! 							<Tool
! 								Name="VCCLCompilerTool"
! 								Optimization="1"
! 								AdditionalIncludeDirectories=""
! 								PreprocessorDefinitions=""/>
! 						</FileConfiguration>
! 						<FileConfiguration
! 							Name="Debug|Win32">
! 							<Tool
! 								Name="VCCLCompilerTool"
! 								Optimization="0"
! 								AdditionalIncludeDirectories=""
! 								PreprocessorDefinitions=""
! 								BasicRuntimeChecks="3"
! 								BrowseInformation="1"/>
! 						</FileConfiguration>
! 						<FileConfiguration
! 							Name="Release|Win32">
! 							<Tool
! 								Name="VCCLCompilerTool"
! 								Optimization="1"
! 								AdditionalIncludeDirectories=""
! 								PreprocessorDefinitions=""/>
! 						</FileConfiguration>
! 					</File>
! 					<File
! 						RelativePath=".\Asp\Options.cpp">
! 					</File>
! 				</Filter>
  			</Filter>
  		</Filter>



More information about the GME-commit mailing list