Changeset 55 for branches/DelphiToC/UProject.pas

Timestamp:

Aug 10, 2010, 1:48:38 PM (14 years ago)

Author:

george

Message:

Fix: View proper source file after click to error message.
Made partial changes to support unit interface and implementation sections.

File:

• branches/DelphiToC/UProject.pas (modified) (7 diffs)

branches/DelphiToC/UProject.pas

@@ -6 +6 @@
 
 uses
-  Classes, SysUtils, Contnrs;
+  Classes, SysUtils, Contnrs, Dialogs;
 
 type
@@ -13 +13 @@
 
   TProjectNode = class
+    Parent: TProjectNode;
     Name: string;
     procedure Load; virtual;
     procedure Save; virtual;
+    function GetDir(IncludeRoot: Boolean = False): string; virtual;
+  end;
+
+  { TProjectFile }
+
+  TProjectFile = class(TProjectNode)
+    Source: TStringList;
+    ProducedCode: TStringList;
+    constructor Create;
+    destructor Destroy; override;
+    procedure Load; override;
+    procedure Save; override;
   end;
 
@@ -26 +39 @@
     procedure Load; override;
     procedure Save; override;
-  end;
-
-  { TProjectFile }
-
-  TProjectFile = class(TProjectNode)
-    Source: TStringList;
-    ProducedCode: TStringList;
-    FileName: string;
-    constructor Create;
-    destructor Destroy; override;
-    procedure Load; override;
-    procedure Save; override;
+    function SearchFile(FileName: string): TProjectFile;
   end;
 
   TProject = class(TProjectGroup)
+    RootDir: string;
+    function GetDir(IncludeRoot: Boolean = False): string; override;
   end;
 
@@ -76 +80 @@
 end;
 
+function TProjectGroup.SearchFile(FileName: string): TProjectFile;
+var
+  NamePart: string;
+  I: Integer;
+begin
+  if Pos('/', FileName) > 0 then
+    NamePart := Copy(FileName, 1, Pos('/', FileName))
+    else NamePart := FileName;
+  I := 0;
+  while (I < Items.Count) and (TProjectNode(Items[I]).Name <> NamePart) do Inc(I);
+  if I < Items.Count then begin
+    if TProjectNode(Items[I]) is TProjectFile then Result := TProjectFile(Items[I])
+    else begin
+      Delete(FileName, 1, Length(FileName) + 1);
+      TProjectGroup(Items[I]).SearchFile(FileName);
+    end;
+  end else Result := nil;
+end;
+
 { TProjectFile }
 
@@ -94 +117 @@
 begin
   inherited Load;
-  Source.LoadFromFile(FileName);
+  Source.LoadFromFile(Parent.GetDir(True) + Name);
 end;
 
@@ -100 +123 @@
 begin
   inherited Save;
-  Source.SaveToFile(FileName);
+  Source.SaveToFile(Parent.GetDir(True) + Name);
 end;
 
@@ -115 +138 @@
 end;
 
+function TProjectNode.GetDir(IncludeRoot: Boolean = False): string;
+begin
+  if Assigned(Parent) then Result := Parent.GetDir(IncludeRoot) + Name + '/'
+  else Result := Name + '/';
+end;
+
+{ TProject }
+
+function TProject.GetDir(IncludeRoot: Boolean): string;
+begin
+  if IncludeRoot then Result := RootDir else Result := '';
+end;
+
 end.