[GME-commit] GMESRC/GME/XmlBackEnd CoreXmlFile.cpp,1.12,1.13

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

Update of /project/gme-repository/GMESRC/GME/XmlBackEnd
In directory escher:/tmp/cvs-serv21135

Modified Files:
	CoreXmlFile.cpp 
Log Message:
Fix for JIRA entry: http://escher.isis.vanderbilt.edu/JIRA/browse/GME-136
When SourceSafe project creation either fails or exception occur or user 
won't log in a message box notifies users, that project will be a without source control.


CVS User: Zoltan Molnar, ISIS (zolmol)

Index: CoreXmlFile.cpp
===================================================================
RCS file: /project/gme-repository/GMESRC/GME/XmlBackEnd/CoreXmlFile.cpp,v
retrieving revision 1.12
retrieving revision 1.13
diff -C2 -d -r1.12 -r1.13
*** CoreXmlFile.cpp	5 Jun 2007 21:43:11 -0000	1.12
--- CoreXmlFile.cpp	6 Jun 2007 00:03:43 -0000	1.13
***************
*** 943,946 ****
--- 943,947 ----
          if( m_vssDatabaseStr.size() > 0 )
              createSourceSafeDatabase();
+         else AfxMessageBox( "Project has not been created under a source control system");
      }
      
***************
*** 2493,2497 ****
      m_sourceControl = SC_NONE;
  
!     // create source control project if specified one
      if( m_vssDatabaseStr.size() > 0 )
      {
--- 2494,2500 ----
      m_sourceControl = SC_NONE;
  
!     std::string  msg;
! 
! 	// create source control project if specified one
      if( m_vssDatabaseStr.size() > 0 )
      {
***************
*** 2525,2529 ****
              {
                  // error during the sourcesafe project creation
! 
              }
          }
--- 2528,2532 ----
              {
                  // error during the sourcesafe project creation
!                 msg = "Exception during SourceSafe project creation.";
              }
          }
***************
*** 2531,2540 ****
          {
              // not logged into sourcesafe
          }
!     }
  
      if( m_sourceControl == SC_NONE )
      {
          // TODO: error message
      }
  
--- 2534,2545 ----
          {
              // not logged into sourcesafe
+             msg = "Not logged in.";
          }
!     } else msg = "No SourceSafe Database specification found.";
  
      if( m_sourceControl == SC_NONE )
      {
          // TODO: error message
+         AfxMessageBox( ("The project is not under any source control system!\nReason: " + msg).c_str());
      }
  
***************
*** 2570,2574 ****
          {
              char buf[200];
!             sprintf( buf, "Could not connet to SurceSafe database. Error code: %x (%d). You may lose synchronization with source control. You won't be able to modify read only files.", hr, hr );
              AfxMessageBox( buf, MB_ICONEXCLAMATION );
              m_sourceControl = SC_NONE;
--- 2575,2579 ----
          {
              char buf[200];
!             sprintf( buf, "Could not connect to SourceSafe database. Error code: %x (%d). You may lose synchronization with source control. You won't be able to modify read only files.", hr, hr );
              AfxMessageBox( buf, MB_ICONEXCLAMATION );
              m_sourceControl = SC_NONE;
***************
*** 2577,2581 ****
      else
      {
!         AfxMessageBox( "You did not logged in the SourSafe database. You may lose synchronization with source control. You won't be able to modify read only files.", MB_ICONEXCLAMATION );
          m_sourceControl = SC_NONE;
      }
--- 2582,2586 ----
      else
      {
!         AfxMessageBox( "You did not log in the SourceSafe database. You may lose synchronization with source control. You won't be able to modify read only files.", MB_ICONEXCLAMATION );
          m_sourceControl = SC_NONE;
      }