[GME-commit] GMESRC/GME/Mga MgaTerritory.h, 1.4, 1.5 MgaProject.cpp, 1.70, 1.71 MgaFCO.cpp, 1.40, 1.41

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

Update of /project/gme-repository/GMESRC/GME/Mga
In directory escher:/tmp/cvs-serv4468

Modified Files:
	MgaTerritory.h MgaProject.cpp MgaFCO.cpp 
Log Message:
Rolling back changes done a day before, regarding JIRA-154. Not yet complete. :(

MgaProject.cpp 1.71 should be the same as 1.69
MgaFco.cpp     1.41   as   1.39
MgaTerritory.h 1.5    as   1.3




CVS User: Zoltan Molnar, ISIS (zolmol)

Index: MgaTerritory.h
===================================================================
RCS file: /project/gme-repository/GMESRC/GME/Mga/MgaTerritory.h,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** MgaTerritory.h	16 Jun 2007 22:45:12 -0000	1.4
--- MgaTerritory.h	18 Jun 2007 01:48:45 -0000	1.5
***************
*** 36,41 ****
  		MARKSIG('9'); 
  		if(coreterr) Destroy();	
- 		coreterr   = 0;
- 		mgaproject = 0;
  	}
  
--- 36,39 ----

Index: MgaFCO.cpp
===================================================================
RCS file: /project/gme-repository/GMESRC/GME/Mga/MgaFCO.cpp,v
retrieving revision 1.40
retrieving revision 1.41
diff -C2 -d -r1.40 -r1.41
*** MgaFCO.cpp	16 Jun 2007 22:45:12 -0000	1.40
--- MgaFCO.cpp	18 Jun 2007 01:48:45 -0000	1.41
***************
*** 42,47 ****
  		MARKSIG('9');
  		ASSERT(pubfcos.begin() == pubfcos.end());
- 		if( mgaproject) 
- 			mgaproject->Release(); // have been hold since FinalConstruct // zolmol
  }
  
--- 42,45 ----

Index: MgaProject.cpp
===================================================================
RCS file: /project/gme-repository/GMESRC/GME/Mga/MgaProject.cpp,v
retrieving revision 1.70
retrieving revision 1.71
diff -C2 -d -r1.70 -r1.71
*** MgaProject.cpp	16 Jun 2007 22:45:12 -0000	1.70
--- MgaProject.cpp	18 Jun 2007 01:48:45 -0000	1.71
***************
*** 56,68 ****
  			Close();
  		}
- 		objstocheck.clear();           // zolmol
- 		while( !changedobjs.empty())
- 			changedobjs.pop();
- 		while( !notifyobjs.empty())
- 			notifyobjs.pop();
- 		while( !temporalobjs.empty())
- 			temporalobjs.pop();
- 
- 		deferredchecks.clear();        // end zolmol
  }
  
--- 56,59 ----
***************
*** 389,394 ****
  		opened = UNCHANGED;
  		guidstat = CLEAN;
! 		CComPtr<IMgaTerritory> lm;
! 		COMTHROW(CreateTerritory(NULL, &lm));
  		COMTHROW(BeginTransaction(lm, TRANSACTION_READ_ONLY));
  
--- 380,385 ----
  		opened = UNCHANGED;
  		guidstat = CLEAN;
! 	    CComPtr<IMgaTerritory> lm;
! 	    COMTHROW(CreateTerritory(NULL, &lm));
  		COMTHROW(BeginTransaction(lm, TRANSACTION_READ_ONLY));
  
***************
*** 397,401 ****
  			CoreObj  dataroot;
  			COMTHROW(dataproject->get_RootObject(&dataroot.ComPtr()));
! 			s=dataroot[ATTRID_PARADIGM];
  			mgaversion = dataroot[ATTRID_MGAVERSION];
  			if( mgaversion <= 1L) // Core layer changed the project by adding ATTRID_GUID1..4 for CCoreBinFile
--- 388,392 ----
  			CoreObj  dataroot;
  			COMTHROW(dataproject->get_RootObject(&dataroot.ComPtr()));
! 		    s=dataroot[ATTRID_PARADIGM];
  			mgaversion = dataroot[ATTRID_MGAVERSION];
  			if( mgaversion <= 1L) // Core layer changed the project by adding ATTRID_GUID1..4 for CCoreBinFile
***************
*** 411,415 ****
  			throw e;
  		}
! 		
  		if(s.Length()) {
  			if (ver.Length()) {
--- 402,406 ----
  			throw e;
  		}
! 
  		if(s.Length()) {
  			if (ver.Length()) {
***************
*** 580,584 ****
  	}
  	if(baseterr) COMTHROW(AbortTransaction());
! 
  	COMTRY {
  		{
--- 571,575 ----
  	}
  	if(baseterr) COMTHROW(AbortTransaction());
! 	
  	COMTRY {
  		{
***************
*** 609,615 ****
  		RemoveClients();   //
  
! 		ASSERT( m_dwRef == 2); // zolmol
! 		if(rot) COMTHROW(RevokeActiveObject(rot,NULL));
! 		ASSERT( m_dwRef == 1); // zolmol
  		if(dataproject) COMTHROW(dataproject->CloseProject(abort));
  
--- 600,604 ----
  		RemoveClients();   //
  
! 	 	if(rot) COMTHROW(RevokeActiveObject(rot,NULL));
  		if(dataproject) COMTHROW(dataproject->CloseProject(abort));
  
***************
*** 938,941 ****
--- 927,931 ----
  STDMETHODIMP CMgaProject::get_Comment(BSTR *pVal)
  {
+ 
  	COMTRY {
  		CoreObj self;
***************
*** 1053,1058 ****
  		CComPtr< CMgaTerritory > ster;
  		CreateComObject(ster);
! 		ster->coreterr = tt; // zolmol
! 		ster->mgaproject = this;;
  		allterrs.push_front(ster);
  		ster->handler=sink;
--- 1043,1048 ----
  		CComPtr< CMgaTerritory > ster;
  		CreateComObject(ster);
! 		ster->coreterr = tt.Detach();
! 		ster->mgaproject = this;; 
  		allterrs.push_front(ster);
  		ster->handler=sink;