diff --git a/designer/jitforms.pp b/designer/jitforms.pp index d831151701..0bde2fc0bb 100644 --- a/designer/jitforms.pp +++ b/designer/jitforms.pp @@ -227,18 +227,18 @@ var begin Result:=-1; // create new class and an instance -//writeln('[TJITForms.DoCreateJITForm] Creating new JIT class '''+NewClassName+''' ...'); + //writeln('[TJITForms.DoCreateJITForm] Creating new JIT class '''+NewClassName+''' ...'); Pointer(FCurReadClass):=CreateVMTCopy(TJITForm,'TJITForm'); -//writeln('[TJITForms.DoCreateJITForm] Creating an instance of JIT class '''+NewClassName+''' ...'); + //writeln('[TJITForms.DoCreateJITForm] Creating an instance of JIT class '''+NewClassName+''' ...'); Instance:=TComponent(FCurReadClass.NewInstance); -//writeln('[TJITForms.DoCreateJITForm] Initializing new instance ...'); + //writeln('[TJITForms.DoCreateJITForm] Initializing new instance ...'); TComponent(FCurReadForm):=Instance; try Instance.Create(nil); if NewFormName<>'' then Instance.Name:=NewFormName; DoRenameClass(FCurReadClass,NewClassName); -//writeln('[TJITForms.DoCreateJITForm] Initialization was successful! FormName="',NewFormName,'"'); + //writeln('[TJITForms.DoCreateJITForm] Initialization was successful! FormName="',NewFormName,'"'); except TComponent(FCurReadForm):=nil; writeln('[TJITForms.DoCreateJITForm] Error while creating instance'); @@ -250,9 +250,13 @@ end; function TJITForms.AddNewJITForm:integer; var NewFormName,NewClassName:shortstring; begin + {$IFDEF IDE_VERBOSE} Writeln('[TJITForms] AddNewJITForm'); + {$ENDIF} GetUnusedNames(NewFormName,NewClassName); + {$IFDEF IDE_VERBOSE} Writeln('NewFormName is ',NewFormname,', NewClassName is ',NewClassName); + {$ENDIF} Result:=DoCreateJITForm(NewFormName,NewClassName); end; @@ -288,21 +292,27 @@ begin NewClassName:=GetClassNameFromStream(BinStream); if NewClassName='' then begin -// Application.MessageBox('No classname in form stream found.','',mb_OK); + // Application.MessageBox('No classname in form stream found.','',mb_OK); MessageDlg('No classname in form stream found.',mterror,[mbOK],0); exit; end; -writeln('[TJITForms.AddJITFormFromStream] 1'); + {$IFDEF IDE_VERBOSE} + writeln('[TJITForms.AddJITFormFromStream] 1'); + {$ENDIF} try Result:=DoCreateJITForm('',NewClassName); -writeln('[TJITForms.AddJITFormFromStream] 2'); + {$IFDEF IDE_VERBOSE} + writeln('[TJITForms.AddJITFormFromStream] 2'); + {$ENDIF} Reader:=TReader.Create(BinStream,4096); MyFindGlobalComponentProc:=@OnFindGlobalComponent; FindGlobalComponent:=@MyFindGlobalComponent; -writeln('[TJITForms.AddJITFormFromStream] 3'); + {$IFDEF IDE_VERBOSE} + writeln('[TJITForms.AddJITFormFromStream] 3'); + {$ENDIF} try // connect TReader events Reader.OnError:=@ReaderError; @@ -313,10 +323,14 @@ writeln('[TJITForms.AddJITFormFromStream] 3'); Reader.OnCreateComponent:=@ReaderCreateComponent; Reader.OnFindComponentClass:=@ReaderFindComponentClass; -writeln('[TJITForms.AddJITFormFromStream] 4'); + {$IFDEF IDE_VERBOSE} + writeln('[TJITForms.AddJITFormFromStream] 4'); + {$ENDIF} Reader.ReadRootComponent(FCurReadForm); -writeln('[TJITForms.AddJITFormFromStream] 5'); + {$IFDEF IDE_VERBOSE} + writeln('[TJITForms.AddJITFormFromStream] 5'); + {$ENDIF} // MG: workaround til visible=true is default for a:=0 to FCurReadForm.ComponentCount-1 do begin if FCurReadForm.Components[a] is TControl then @@ -324,7 +338,9 @@ writeln('[TJITForms.AddJITFormFromStream] 5'); end; // MG: end of workaround -writeln('[TJITForms.AddJITFormFromStream] 6'); + {$IFDEF IDE_VERBOSE} + writeln('[TJITForms.AddJITFormFromStream] 6'); + {$ENDIF} FCurReadForm.Show; finally FindGlobalComponent:=nil; @@ -458,7 +474,7 @@ procedure TJITForms.FreevmtCopy(vmtCopy:Pointer); var MethodTable : PMethodNameTable; ClassNamePtr: Pointer; begin -//writeln('[TJITForms.FreevmtCopy] ClassName='''+TClass(vmtCopy).ClassName+''''); + //writeln('[TJITForms.FreevmtCopy] ClassName='''+TClass(vmtCopy).ClassName+''''); if vmtCopy=nil then exit; // free copy of methodtable MethodTable:=PMethodNameTable((Pointer(vmtCopy)+vmtMethodTable)^); @@ -475,7 +491,7 @@ procedure TJITForms.DoAddNewMethod(JITClass:TClass; var OldMethodTable,NewMethodTable: PMethodNameTable; NewMethodTableSize:integer; begin -//writeln('[TJITForms.AddNewMethod] '''+JITClass.ClassName+'.'+AName+''''); + //writeln('[TJITForms.AddNewMethod] '''+JITClass.ClassName+'.'+AName+''''); OldMethodTable:=PMethodNameTable((Pointer(JITClass)+vmtMethodTable)^); if Assigned(OldMethodTable) then begin NewMethodTableSize:=SizeOf(DWord)+ @@ -515,7 +531,9 @@ var OldMethodTable, NewMethodTable: PMethodNameTable; NewMethodTableSize:integer; a:cardinal; begin -writeln('[TJITForms.RemoveMethod] '''+JITClass.ClassName+'.'+AName+''''); + {$IFDEF IDE_VERBOSE} + writeln('[TJITForms.DoRemoveMethod] '''+JITClass.ClassName+'.'+AName+''''); + {$ENDIF} AName:=uppercase(AName); OldMethodTable:=PMethodNameTable((Pointer(JITClass)+vmtMethodTable)^); OldCode:=nil; @@ -553,8 +571,10 @@ procedure TJITForms.DoRenameMethod(JITClass:TClass; var MethodTable: PMethodNameTable; a:integer; begin -writeln('[TJITForms.RenameMethod] ClassName='''+JITClass.ClassName+'''' + {$IFDEF IDE_VERBOSE} + writeln('[TJITForms.DoRenameMethod] ClassName='''+JITClass.ClassName+'''' +' OldName='''+OldName+''' NewName='''+OldName+''''); + {$ENDIF} OldName:=uppercase(OldName); MethodTable:=PMethodNameTable((Pointer(JITClass)+vmtMethodTable)^); if Assigned(MethodTable) then begin @@ -567,8 +587,10 @@ end; procedure TJITForms.DoRenameClass(JITClass:TClass; NewName:ShortString); begin -writeln('[TJITForms.RenameClass] OldName='''+JITClass.ClassName - +''' NewName='''+NewName+''' '); + {$IFDEF IDE_VERBOSE} + writeln('[TJITForms.DoRenameClass] OldName='''+JITClass.ClassName + +''' NewName='''+NewName+''' '); + {$ENDIF} PShortString((Pointer(JITClass)+vmtClassName)^)^:=NewName; end; diff --git a/ide/include/ide.inc b/ide/include/ide.inc index bf9589987f..ca0f3b8a5d 100644 --- a/ide/include/ide.inc +++ b/ide/include/ide.inc @@ -19,6 +19,8 @@ *************************************************************************** } +{ $DEFINE IDE_VERBOSE} + { $DEFINE IDE_MEM_CHECK} { $DEFINE IDE_DEBUG} diff --git a/ide/main.pp b/ide/main.pp index 64e30feec5..0d418c4982 100644 --- a/ide/main.pp +++ b/ide/main.pp @@ -3457,7 +3457,9 @@ var ActiveSrcEdit:TSourceEditor; TestFilename: string; ResourceCode, LFMCode: TCodeBuffer; begin + {$IFDEF IDE_VERBOSE} writeln('TMainIDE.DoSaveEditorUnit A PageIndex=',PageIndex,' SaveAs=',sfSaveAs in Flags,' SaveToTestDir=',sfSaveToTestDir in Flags); + {$ENDIF} {$IFDEF IDE_MEM_CHECK}CheckHeap(IntToStr(GetMem_Cnt));{$ENDIF} Result:=mrCancel; if not (ToolStatus in [itNone,itDebugger]) then begin @@ -3550,8 +3552,10 @@ begin ActiveSrcEdit.Modified:=false; end; SourceNoteBook.UpdateStatusBar; - + + {$IFDEF IDE_VERBOSE} writeln('TMainIDE.DoSaveEditorUnit END'); + {$ENDIF} Result:=mrOk; end; @@ -3634,8 +3638,10 @@ var NewUnitInfo:TUnitInfo; NewBuf: TCodeBuffer; begin + {$IFDEF IDE_VERBOSE} writeln(''); writeln('*** TMainIDE.DoOpenEditorFile START "',AFilename,'"'); + {$ENDIF} {$IFDEF IDE_MEM_CHECK}CheckHeap(IntToStr(GetMem_Cnt));{$ENDIF} Result:=mrCancel; if ExtractFilenameOnly(AFilename)='' then exit; @@ -3739,7 +3745,9 @@ begin // build a nice pagename for the sourcenotebook Result:=mrOk; + {$IFDEF IDE_VERBOSE} writeln('[TMainIDE.DoOpenMainUnit] END'); + {$ENDIF} end; function TMainIDE.DoViewUnitsAndForms(OnlyForms: boolean): TModalResult; @@ -4108,7 +4116,9 @@ end; function TMainIDE.DoCloseProject:TModalResult; begin -writeln('TMainIDE.DoCloseProject A'); + {$IFDEF IDE_VERBOSE} + writeln('TMainIDE.DoCloseProject A'); + {$ENDIF} // close all loaded files {$IFDEF IDE_MEM_CHECK}CheckHeap(IntToStr(GetMem_Cnt));{$ENDIF} while SourceNotebook.NoteBook<>nil do begin @@ -4120,7 +4130,9 @@ writeln('TMainIDE.DoCloseProject A'); FreeThenNil(Project1); {$IFDEF IDE_MEM_CHECK}CheckHeap(IntToStr(GetMem_Cnt));{$ENDIF} Result:=mrOk; -writeln('TMainIDE.DoCloseProject end ',CodeToolBoss.ConsistencyCheck); + {$IFDEF IDE_VERBOSE} + writeln('TMainIDE.DoCloseProject end ',CodeToolBoss.ConsistencyCheck); + {$ENDIF} end; function TMainIDE.DoOpenProjectFile(AFileName:string):TModalResult; @@ -4128,7 +4140,9 @@ var Ext,AText,ACaption: string; LowestEditorIndex,LowestUnitIndex,LastEditorIndex,i: integer; NewBuf: TCodeBuffer; begin -writeln('TMainIDE.DoOpenProjectFile A "'+AFileName+'"'); + {$IFDEF IDE_VERBOSE} + writeln('TMainIDE.DoOpenProjectFile A "'+AFileName+'"'); + {$ENDIF} {$IFDEF IDE_MEM_CHECK}CheckHeap(IntToStr(GetMem_Cnt));{$ENDIF} Result:=mrCancel; if ExtractFileNameOnly(AFileName)='' then exit; @@ -4175,7 +4189,9 @@ writeln('TMainIDE.DoOpenProjectFile A "'+AFileName+'"'); if Result=mrAbort then exit; // create a new project -writeln('TMainIDE.DoOpenProjectFile B'); + {$IFDEF IDE_VERBOSE} + writeln('TMainIDE.DoOpenProjectFile B'); + {$ENDIF} {$IFDEF IDE_MEM_CHECK}CheckHeap(IntToStr(GetMem_Cnt));{$ENDIF} Project1:=TProject.Create(ptProgram); Project1.OnFileBackup:=@DoBackupFile; @@ -4192,9 +4208,9 @@ writeln('TMainIDE.DoOpenProjectFile B'); if Result=mrAbort then exit; Project1.MainUnitInfo.Source:=NewBuf; end; -{$IFDEF IDE_DEBUG} -writeln('TMainIDE.DoOpenProjectFile C'); -{$ENDIF} + {$IFDEF IDE_DEBUG} + writeln('TMainIDE.DoOpenProjectFile C'); + {$ENDIF} {$IFDEF IDE_MEM_CHECK}CheckHeap(IntToStr(GetMem_Cnt));{$ENDIF} // restore files @@ -4246,9 +4262,9 @@ writeln('TMainIDE.DoOpenProjectFile C'); end; until LowestEditorIndex<0; Result:=mrCancel; -{$IFDEF IDE_DEBUG} -writeln('TMainIDE.DoOpenProjectFile D'); -{$ENDIF} + {$IFDEF IDE_DEBUG} + writeln('TMainIDE.DoOpenProjectFile D'); + {$ENDIF} // set active editor source editor if (SourceNoteBook.NoteBook<>nil) and (Project1.ActiveEditorIndexAtStart>=0) @@ -4270,7 +4286,9 @@ writeln('TMainIDE.DoOpenProjectFile D'); Project1.Modified:=false; Result:=mrOk; -writeln('TMainIDE.DoOpenProjectFile end CodeToolBoss.ConsistencyCheck=',CodeToolBoss.ConsistencyCheck); + {$IFDEF IDE_VERBOSE} + writeln('TMainIDE.DoOpenProjectFile end CodeToolBoss.ConsistencyCheck=',CodeToolBoss.ConsistencyCheck); + {$ENDIF} {$IFDEF IDE_MEM_CHECK}CheckHeap(IntToStr(GetMem_Cnt));{$ENDIF} end; @@ -4279,7 +4297,9 @@ function TMainIDE.DoCreateProjectForProgram( var NewProjectType:TProjectType; MainUnitInfo: TUnitInfo; begin -writeln('[TMainIDE.DoCreateProjectForProgram] A ',ProgramBuf.Filename); + {$IFDEF IDE_VERBOSE} + writeln('[TMainIDE.DoCreateProjectForProgram] A ',ProgramBuf.Filename); + {$ENDIF} Result:=mrCancel; if SomethingOfProjectIsModified then begin @@ -4332,7 +4352,9 @@ writeln('[TMainIDE.DoCreateProjectForProgram] A ',ProgramBuf.Filename); Result:=DoOpenMainUnit(false); if Result=mrAbort then exit; -writeln('[TMainIDE.DoCreateProjectForProgram] END'); + {$IFDEF IDE_VERBOSE} + writeln('[TMainIDE.DoCreateProjectForProgram] END'); + {$ENDIF} Result:=mrOk; end; @@ -6440,6 +6462,9 @@ end. { ============================================================================= $Log$ + Revision 1.311 2002/06/12 14:27:15 lazarus + MG: reduced IDE output + Revision 1.310 2002/06/12 14:14:50 lazarus MG: fixed working directory of running programms