[Kuml-cvs] CVS: kuml_old/kuml iokumlutility.cpp,1.1.1.1,1.2 kuml.cpp,1.2,1.3

[Gerard F. <ger...@us...>]

Update of /cvsroot/kuml/kuml_old/kuml
In directory usw-pr-cvs1:/tmp/cvs-serv2699/kuml

Modified Files:
	iokumlutility.cpp kuml.cpp 
Log Message:

2002-03-03  Gerard Flynn <ger...@li...>
	* iokumlutility.cpp fixed parsing problem in readStatement
	* kuml.cpp commented PopUp warnings for save/restore functions

VS: Committing in .
VS: 
VS: Modified Files:
VS: 	ChangeLog kuml/iokumlutility.cpp kuml/kuml.cpp kuml/resource.h 
VS: 	kuml/diagrams/diagram.cpp kuml/diagrams/diagramloader.cpp 
VS: ----------------------------------------------------------------------


Index: iokumlutility.cpp
===================================================================
RCS file: /cvsroot/kuml/kuml_old/kuml/iokumlutility.cpp,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -C2 -r1.1.1.1 -r1.2
*** iokumlutility.cpp	8 Oct 2000 04:21:47 -0000	1.1.1.1
--- iokumlutility.cpp	3 Mar 2002 22:03:41 -0000	1.2
***************
*** 46,52 ****
            restOfLine;
  
    firstToken = readToken();
!   if(firstToken == closeGroupChar)
      return CloseGroup;
  
    secondToken = readToken();
--- 46,56 ----
            restOfLine;
  
+   debug( "Call to IOKumlUtility::readStatement" );
+ 
    firstToken = readToken();
!   if(firstToken == closeGroupChar) {
!     debug( "IOKumlUtility::readStatement returning CloseGroup" );
      return CloseGroup;
+   }
  
    secondToken = readToken();
***************
*** 54,59 ****
--- 58,68 ----
    // Assignment recognized
    if(secondToken == "=") {
+     debug( "IOKumlUtility::readStatement handling Assignment" );
      assignmentName = firstToken;
      assignmentValue = readToken();
+     debug( "IOKumlUtility::readStatement handling Assignment, after readToken" );
+     debug( "assignmentValue :" );
+     debug( assignmentValue );
+ 
  
  #if !defined (KDE2)
***************
*** 65,78 ****
  #else // defined (KDE2)
      // Get the rest of the value (the end is marked with a semicolon)
!     while(assignmentValue.at(assignmentValue.length () -2) != ';')
        assignmentValue = assignmentValue + QString (" ") + readToken();
  
!     assignmentValue.truncate(assignmentValue.length () -2);   // remove the trailing semicolon
  #endif // defined (KDE2)
  
      return Assignment;
    }
    // Group item recognized
    else {
      groupType = firstToken;
      if(secondToken == openGroupChar)
--- 74,90 ----
  #else // defined (KDE2)
      // Get the rest of the value (the end is marked with a semicolon)
!     debug( QString( assignmentValue.at( assignmentValue.length() - 2 ) ) );
!     while( assignmentValue.at( assignmentValue.length () - 1 ) != ';' )
        assignmentValue = assignmentValue + QString (" ") + readToken();
  
!     assignmentValue.truncate( assignmentValue.length () - 1 );   // remove the trailing semicolon
  #endif // defined (KDE2)
  
+     debug( "IOKumlUtility::readStatement returning Assignement" );
      return Assignment;
    }
    // Group item recognized
    else {
+     debug( "IOKumlUtility::readStatement handling GroupItem" );
      groupType = firstToken;
      if(secondToken == openGroupChar)
***************
*** 83,88 ****
--- 95,102 ----
          groupName += QString(" ") + nextToken;
      }
+     debug( "IOKumlUtility::readStatement returning GroupItem" );
      return GroupItem;
    }
+   debug( "End IOKumlUtility::readStatement" );
  }
  ////////////////////////////////////////////////////////////////////////

Index: kuml.cpp
===================================================================
RCS file: /cvsroot/kuml/kuml_old/kuml/kuml.cpp,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -r1.2 -r1.3
*** kuml.cpp	2 Mar 2002 17:31:04 -0000	1.2
--- kuml.cpp	3 Mar 2002 22:03:41 -0000	1.3
***************
*** 704,712 ****
  {
  
  #if !defined (EXPERIMENTAL_PERSISTENCE_LAYER)  // Sorry Darius it was
                                                 // pissing me off - Geoff
          ///////////////// Darius: just temporarly //////////////////////////
!       QMessageBox::information(this, i18n("IO Error"), i18n("This function is under construction"));
!         return;
          ////////////////////////////////////////////////////////////////////
  #endif // !defined (EXPERIMENTAL_PERSISTENCE_LAYER)
--- 704,714 ----
  {
  
+   debug( "Call to KumlApp::slotProjectOpen" );
+ 
  #if !defined (EXPERIMENTAL_PERSISTENCE_LAYER)  // Sorry Darius it was
                                                 // pissing me off - Geoff
          ///////////////// Darius: just temporarly //////////////////////////
!   //      QMessageBox::information(this, i18n("IO Error"), i18n("This function is under construction"));
!   //        return;
          ////////////////////////////////////////////////////////////////////
  #endif // !defined (EXPERIMENTAL_PERSISTENCE_LAYER)
***************
*** 756,761 ****
  #if !defined (EXPERIMENTAL_PERSISTENCE_LAYER)
          ///////////////// Darius: just temporarly //////////////////////////
!       QMessageBox::information(this, i18n("IO Error"), i18n("This function is under construction"));
!         return;
          ////////////////////////////////////////////////////////////////////
  #endif // !defined (EXPERIMENTAL_PERSISTENCE_LAYER)
--- 758,763 ----
  #if !defined (EXPERIMENTAL_PERSISTENCE_LAYER)
          ///////////////// Darius: just temporarly //////////////////////////
!   //      QMessageBox::information(this, i18n("IO Error"), i18n("This function is under construction"));
!   //        return;
          ////////////////////////////////////////////////////////////////////
  #endif // !defined (EXPERIMENTAL_PERSISTENCE_LAYER)
***************
*** 823,828 ****
  #if !defined (EXPERIMENTAL_PERSISTENCE_LAYER)
          ///////////////// Darius: just temporarly //////////////////////////
!       QMessageBox::information(this, i18n("IO Error"), i18n("This function is under construction"));
!         return;
          ////////////////////////////////////////////////////////////////////
  #endif // !defined (EXPERIMENTAL_PERSISTENCE_LAYER)
--- 825,830 ----
  #if !defined (EXPERIMENTAL_PERSISTENCE_LAYER)
          ///////////////// Darius: just temporarly //////////////////////////
!   //      QMessageBox::information(this, i18n("IO Error"), i18n("This function is under construction"));
!   //        return;
          ////////////////////////////////////////////////////////////////////
  #endif // !defined (EXPERIMENTAL_PERSISTENCE_LAYER)