IDE: clean up package dependencies dialog: show transitivities

git-svn-id: trunk@40766 -

ide/lazarus.lpi

@@ -741,6 +741,7 @@
         <Filename Value="../packager/cleanpkgdeps.pas"/>
         <IsPartOfProject Value="True"/>
         <ComponentName Value="CleanPkgDepsDlg"/>
+        <HasResources Value="True"/>
         <ResourceBaseClass Value="Form"/>
         <UnitName Value="CleanPkgDeps"/>
       </Unit98>
@@ -753,7 +754,7 @@
     </Target>
     <SearchPaths>
       <IncludeFiles Value="include"/>
-      <OtherUnitFiles Value="frames;../converter;../debugger;../debugger/frames;../packager;../designer;../packager/frames;../ide;../packager"/>
+      <OtherUnitFiles Value="frames;../converter;../debugger;../debugger/frames;../packager;../designer;../packager/frames;../ide"/>
       <UnitOutputDirectory Value="$(LazarusDir)/units/$(TargetCPU)-$(TargetOS)/$(LCLWidgetType)"/>
     </SearchPaths>
     <Other>

packager/cleanpkgdeps.lfm

@@ -7,12 +7,13 @@ object CleanPkgDepsDlg: TCleanPkgDepsDlg
   ClientHeight = 380
   ClientWidth = 522
   OnCreate = FormCreate
+  OnDestroy = FormDestroy
   Position = poScreenCenter
   LCLVersion = '1.1'
   object ButtonPanel1: TButtonPanel
     Left = 6
-    Height = 30
+    Height = 36
-    Top = 344
+    Top = 338
     Width = 510
     OKButton.Name = 'OKButton'
     OKButton.DefaultCaption = True
@@ -27,28 +28,28 @@ object CleanPkgDepsDlg: TCleanPkgDepsDlg
   end
   object TransitivityGroupBox: TGroupBox
     Left = 0
-    Height = 338
+    Height = 332
     Top = 0
     Width = 522
     Align = alClient
     Caption = 'TransitivityGroupBox'
-    ClientHeight = 316
+    ClientHeight = 315
-    ClientWidth = 514
+    ClientWidth = 518
     TabOrder = 1
     object TransitivityTreeView: TTreeView
       Left = 0
       Height = 300
-      Top = 16
+      Top = 15
-      Width = 514
+      Width = 518
       Align = alClient
       DefaultItemHeight = 18
       TabOrder = 0
     end
     object TransitivityLabel: TLabel
       Left = 0
-      Height = 16
+      Height = 15
       Top = 0
-      Width = 514
+      Width = 518
       Align = alTop
       Caption = 'TransitivityLabel'
       ParentColor = False

packager/cleanpkgdeps.pas

@@ -1,3 +1,25 @@
+{
+ ***************************************************************************
+ *                                                                         *
+ *   This source is free software; you can redistribute it and/or modify   *
+ *   it under the terms of the GNU General Public License as published by  *
+ *   the Free Software Foundation; either version 2 of the License, or     *
+ *   (at your option) any later version.                                   *
+ *                                                                         *
+ *   This code is distributed in the hope that it will be useful, but      *
+ *   WITHOUT ANY WARRANTY; without even the implied warranty of            *
+ *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU     *
+ *   General Public License for more details.                              *
+ *                                                                         *
+ *   A copy of the GNU General Public License is available on the World    *
+ *   Wide Web at <http://www.gnu.org/copyleft/gpl.html>. You can also      *
+ *   obtain it by writing to the Free Software Foundation,                 *
+ *   Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.        *
+ *                                                                         *
+ ***************************************************************************
+
+  Author: Mattias Gaertner
+}
 unit CleanPkgDeps;
 
 {$mode objfpc}{$H+}
@@ -5,12 +27,20 @@ unit CleanPkgDeps;
 interface
 
 uses
-  Classes, SysUtils, FileUtil, LvlGraphCtrl, Forms, Controls, Graphics, Dialogs,
+  Classes, SysUtils, FileUtil, AvgLvlTree, LazLogger, LvlGraphCtrl, Forms,
-  ButtonPanel, ComCtrls, ExtCtrls, StdCtrls, LazarusIDEStrConsts, Project,
+  Controls, Graphics, Dialogs, ButtonPanel, ComCtrls, ExtCtrls, StdCtrls,
-  PackageDefs;
+  LazarusIDEStrConsts, Project, PackageDefs, IDEImagesIntf;
 
+const
+  CPDProjectName = '-Project-';
 type
 
+  TCPDNodeInfo = class
+  public
+    Owner: string; // CPDProjectName or package name
+    Dependency: string; // required package name
+  end;
+
   { TCleanPkgDepsDlg }
 
   TCleanPkgDepsDlg = class(TForm)
@@ -18,15 +48,21 @@ type
     TransitivityGroupBox: TGroupBox;
     TransitivityLabel: TLabel;
     TransitivityTreeView: TTreeView;
+    procedure ButtonPanel1OKButtonClick(Sender: TObject);
     procedure FormCreate(Sender: TObject);
+    procedure FormDestroy(Sender: TObject);
   private
     FOwners: TFPList;
+    ImgIndexProject: integer;
+    ImgIndexPackage: integer;
     procedure SetOwners(AValue: TFPList);
+    procedure ClearTreeData;
     procedure UpdateTransitivityTree;
     procedure UpdateButtons;
     function IsTVNodeChecked(TVNode: TTreeNode): boolean;
-    procedure AddTransitivities(NodeCaption: string;
+    procedure AddTransitivities(NodeCaption: string; ImgIndex: integer;
       FirstDependency: TPkgDependency);
+    function FindAlternativeRoute(Dependency, StartDependency: TPkgDependency): TFPList;
   public
     property Owners: TFPList read FOwners write SetOwners;
   end;
@@ -79,10 +115,26 @@ end;
 
 procedure TCleanPkgDepsDlg.FormCreate(Sender: TObject);
 begin
+  ImgIndexProject          := IDEImages.LoadImage(16, 'item_project');
+  ImgIndexPackage          := IDEImages.LoadImage(16, 'item_package');
+
   Caption:='Clean up package dependencies';
   TransitivityGroupBox.Caption:='Transitivity';
   TransitivityLabel.Caption:='The following dependencies are not needed, because of the automatic transitivity between package dependencies.';
+  TransitivityTreeView.Images:=IDEImages.Images_16;
   ButtonPanel1.OKButton.Caption:='Delete dependencies';
+  ButtonPanel1.OKButton.OnClick:=@ButtonPanel1OKButtonClick;
+end;
+
+procedure TCleanPkgDepsDlg.FormDestroy(Sender: TObject);
+begin
+  ClearTreeData;
+end;
+
+procedure TCleanPkgDepsDlg.ButtonPanel1OKButtonClick(Sender: TObject);
+begin
+  ShowMessage('Not implemented yet');
+  ModalResult:=mrNone;
 end;
 
 procedure TCleanPkgDepsDlg.SetOwners(AValue: TFPList);
@@ -93,6 +145,20 @@ begin
   UpdateButtons;
 end;
 
+procedure TCleanPkgDepsDlg.ClearTreeData;
+var
+  i: Integer;
+  TVNode: TTreeNode;
+begin
+  for i:=0 to TransitivityTreeView.Items.Count-1 do begin
+    TVNode:=TransitivityTreeView.Items[i];
+    if TVNode.Data<>nil then begin
+      TObject(TVNode.Data).Free;
+      TVNode.Data:=nil;
+    end;
+  end;
+end;
+
 procedure TCleanPkgDepsDlg.UpdateTransitivityTree;
 var
   i: Integer;
@@ -101,15 +167,16 @@ var
   APackage: TLazPackage;
 begin
   TransitivityTreeView.BeginUpdate;
+  ClearTreeData;
   TransitivityTreeView.Items.Clear;
   for i:=0 to Owners.Count-1 do begin
     CurOwner:=TObject(Owners[i]);
     if CurOwner is TProject then begin
       AProject:=TProject(CurOwner);
-      AddTransitivities('-Project-',AProject.FirstRequiredDependency);
+      AddTransitivities(CPDProjectName,ImgIndexProject,AProject.FirstRequiredDependency);
     end else if CurOwner is TLazPackage then begin
       APackage:=TLazPackage(CurOwner);
-      AddTransitivities(APackage.IDAsString,APackage.FirstRequiredDependency);
+      AddTransitivities(APackage.IDAsString,ImgIndexPackage,APackage.FirstRequiredDependency);
     end;
   end;
   TransitivityTreeView.EndUpdate;
@@ -136,16 +203,93 @@ begin
 end;
 
 procedure TCleanPkgDepsDlg.AddTransitivities(NodeCaption: string;
-  FirstDependency: TPkgDependency);
+  ImgIndex: integer; FirstDependency: TPkgDependency);
 var
   Dependency: TPkgDependency;
+  AltRoute: TFPList;
+  MainTVNode: TTreeNode;
+  TVNode: TTreeNode;
+  Info: TCPDNodeInfo;
+  s: String;
+  i: Integer;
 begin
+  MainTVNode:=nil;
   Dependency:=FirstDependency;
   while Dependency<>nil do begin
-
+    AltRoute:=FindAlternativeRoute(Dependency,FirstDependency);
+    if AltRoute<>nil then begin
+      if MainTVNode=nil then begin
+        MainTVNode:=TransitivityTreeView.Items.Add(nil,NodeCaption);
+        MainTVNode.ImageIndex:=ImgIndex;
+      end;
+      s:=Dependency.AsString+' = ';
+      for i:=0 to AltRoute.Count-1 do begin
+        if i>0 then
+          s+='-';
+        s+=TLazPackage(AltRoute[i]).Name;
+      end;
+      TVNode:=TransitivityTreeView.Items.AddChild(MainTVNode,s);
+      TVNode.ImageIndex:=ImgIndexPackage;
+      Info:=TCPDNodeInfo.Create;
+      TVNode.Data:=Info;
+      Info.Owner:=NodeCaption;
+      Info.Dependency:=Dependency.RequiredPackage.Name;
+      MainTVNode.Expand(true);
+      AltRoute.Free;
+    end;
     Dependency:=Dependency.NextRequiresDependency;
   end;
 end;
 
+function TCleanPkgDepsDlg.FindAlternativeRoute(Dependency,
+  StartDependency: TPkgDependency): TFPList;
+var
+  Visited: TAvgLvlTree;
+
+  function Search(Pkg: TLazPackage; Level: integer; var AltRoute: TFPList): boolean;
+  var
+    CurDependency: TPkgDependency;
+  begin
+    Result:=false;
+    if Pkg=nil then exit;
+    if Pkg=Dependency.Owner then exit; // cycle detected
+    if (Level>0) and (Pkg=Dependency.RequiredPackage) then begin
+      // alternative route found
+      AltRoute:=TFPList.Create;
+      AltRoute.Add(Pkg);
+      exit(true);
+    end;
+
+    if Visited.Find(Pkg)<>nil then exit;
+    Visited.Add(Pkg);
+    CurDependency:=Pkg.FirstRequiredDependency;
+    while CurDependency<>nil do begin
+      if Search(CurDependency.RequiredPackage,Level+1,AltRoute) then begin
+        AltRoute.Insert(0,Pkg);
+        exit(true);
+      end;
+      CurDependency:=CurDependency.NextRequiresDependency;
+    end;
+  end;
+
+var
+  CurDependency: TPkgDependency;
+begin
+  Result:=nil;
+  if Dependency=nil then exit;
+  if Dependency.RequiredPackage=nil then exit;
+  Visited:=TAvgLvlTree.Create;
+  try
+    CurDependency:=StartDependency;
+    while CurDependency<>nil do begin
+      if CurDependency<>Dependency then
+        if Search(CurDependency.RequiredPackage,0,Result) then exit;
+      CurDependency:=CurDependency.NextRequiresDependency;
+    end;
+  finally
+    Visited.Free;
+  end;
+end;
+
 end.