[Uml-devel] kdesdk/umbrello/umbrello

[Brian Thomas]

CVS commit by thomas: 

bug fix: last fix NOT complete..I believe insertTextBlock fixed now. This patch also includes minor cleanups for noisely warnings that arent really needed


  M +3 -6      codedocument.cpp   1.12
  M +2 -0      hierarchicalcodeblock.cpp   1.11


--- kdesdk/umbrello/umbrello/codedocument.cpp  #1.11:1.12
@@ -31,5 +31,4 @@ CodeDocument::CodeDocument (CodeGenerato
 {
 
-kdWarning()<< " DOC LOADING FROM XMI" <<endl;
         initDoc( gen );
         loadFromXMI(elem);
@@ -49,5 +48,4 @@ CodeDocument::~CodeDocument ( ) {
 //              delete tb;
 
-        kdWarning()<<"DESTROYED CODE DOCUMENT name:"<<getFileName().latin1()<<" id:"<<this<<endl;
 }
 
@@ -302,4 +300,7 @@ bool CodeDocument::insertTextBlock(TextB
                                 return true; // found, and inserted, otherwise keep going
                 }
+                // ugh. where is the child block?
+                kdWarning()<<" Warning: couldnt insert text block (tag:"<<newBlock->getTag()<<"). Reference text block (tag:"<<existingBlock->getTag()<<") not found."<<endl;
+                return false;
         }
 
@@ -397,5 +398,4 @@ QString CodeDocument::toString ( ) {
 
 void CodeDocument::syncronize() {
-kdWarning()<<" Syncronize code doc:"<<this<<endl;
         updateContent();
 }
@@ -588,6 +588,4 @@ TextBlock * CodeDocument::findTextBlockB
 void CodeDocument::initDoc ( CodeGenerator * gen ) {
 
-kdWarning()<<"INIT CODE DOCUMENT"<<endl;
-
         m_parentgenerator = gen;
         m_writeOutCode = true;
@@ -608,5 +606,4 @@ kdWarning()<<"INIT CODE DOCUMENT"<<endl;
 //      m_dialog = new CodeDocumentDialog( );
 
-kdWarning()<<"INIT CODE DOCUMENT - FINISHED "<<endl;
 }
 

--- kdesdk/umbrello/umbrello/hierarchicalcodeblock.cpp  #1.10:1.11
@@ -173,4 +173,6 @@ bool HierarchicalCodeBlock::insertTextBl
                                 return true; // found, and inserted, otherwise keep going
                 }
+                kdWarning()<<" Warning: couldnt insert text block (tag:"<<newBlock->getTag()<<"). Reference text block (tag:"<<existingBlock->getTag()<<") not found."<<endl;
+                return false;
         }