--- oup/current/Tools/MetaEditor.pas	2007/06/20 10:57:51	229
+++ oup/current/Tools/MetaEditor.pas	2007/06/20 22:24:04	231
@@ -33,7 +33,7 @@ type
 
 implementation
 {$R *.dfm}
-uses _MetaManager, _FileTypes, Data;
+uses _MetaManager, _MetaTypes, ConnectionManager, Data;
 
 type
   PNodeData = ^TNodeData;
@@ -56,23 +56,16 @@ end;
 
 procedure TForm_Meta.NewCon(ID: Integer);
 var
-  a,b,c: Int64;
   i: Integer;
   data: TNodeData;
   node: PVirtualNode;
+  Meta: TMetaManager;
 begin
-{
   if ID >= 0 then
   begin
-    QueryPerformanceFrequency(c);
-    QueryPerformanceCounter(a);
-    if not Assigned(Meta) then
-      Meta := TMetaManager.Create(ID, Self);
-    QueryPerformanceCounter(b);
-    ShowMessage('Loading Done - ' + FloatToStr((b-a)/c) + 's');
-
     VST.Clear;
     VST.BeginUpdate;
+    Meta := ConManager.Connection[ID].MetaData;
     for i := 0 to Meta.FileCount - 1 do
     begin
       if Assigned(Meta.FileById[i]) then
@@ -85,7 +78,6 @@ begin
     end;
     VST.EndUpdate;
   end;
-}
 end;
 
 
@@ -97,20 +89,20 @@ var
   newnode: PVirtualNode;
   i: Integer;
   id: Integer;
+  Meta: TMetaManager;
 begin
-{
-  data := VST.GetNodeData(node);
-  for i := 0 to Meta.FileById[TFile(data.Field).FileID].ChildCount - 1 do
+  data := Sender.GetNodeData(node);
+  Meta := ConManager.Connection[ID].MetaData;
+  for i := 0 to TFile(data.Field).ChildCount - 1 do
   begin
-    id := Meta.FileById[TFile(data.Field).FileID].LinkByIndex[i].DestID;
+    id := TFile(data.Field).LinkByIndex[i].DestID;
     Meta.InitFile(id);
     newdata.Field := Meta.FileById[id];
-    newnode := AddVSTEntry(VST, Node, newdata);
+    newnode := AddVSTEntry(TCustomVirtualStringTree(Sender), Node, newdata);
     if Meta.FileById[id].ChildCount > 0 then
-      VST.HasChildren[newnode] := True;
+      Sender.HasChildren[newnode] := True;
   end;
-  ChildCount := Meta.FileById[TFile(data.Field).FileID].ChildCount;
-}
+  ChildCount := Sender.ChildCount[Node];
 end;
 
 
@@ -179,7 +171,7 @@ begin
         begin
           if Data.Field is TFile then
           begin
-            CellText := TFile(Data.Field).FileName;
+            CellText := TFile(Data.Field).FileInfo.Name;
             if CellText = '' then
               CellText := 'Unnamed';
           end;
@@ -187,12 +179,12 @@ begin
       1:
         begin
           if Data.Field is TFile then
-            CellText := TFile(Data.Field).FileExt;
+            CellText := TFile(Data.Field).FileInfo.Extension;
         end;
       2:
         begin
           if Data.Field is TFile then
-            CellText := IntToStr(TFile(Data.Field).FileID);
+            CellText := IntToStr(TFile(Data.Field).FileInfo.ID);
         end;
     end;
   end;
@@ -213,9 +205,9 @@ begin
         begin
           if Data.Field is TFile then
           begin
-            if Length(TFile(Data.Field).FileName) = 0 then
+            if Length(TFile(Data.Field).FileInfo.Name) = 0 then
               TargetCanvas.Font.Color := $C06060;
-            if TFile(Data.Field).FileSize = 0 then
+            if TFile(Data.Field).FileInfo.Size = 0 then
               TargetCanvas.Font.Color := $2020A0;
           end;
         end;