[NuGet] Simplify logic for license files

It is not possible to have more than one license file defined for
a NuGet package and it is not possible to use one in an expression.
This means the markup builder does not need to handle this and
simplifies the logic here.

Author: mrward

main/src/addins/MonoDevelop.PackageManagement/MonoDevelop.PackageManagement.Gui/LicenseAcceptanceDialog.cs

@@ -196,7 +196,7 @@ static void AddLicenseWarningLabel (WarningText warning, VBox parentVBox)
 		static void AddFileLicenseLinkLabel (LicenseFileText licenseFileText, VBox parentVBox)
 		{
 			var licenseLabel = new LinkLabel (GettextCatalog.GetString ("View License"));
-			licenseLabel.Uri = licenseFileText.CreateLicenseFileUri (1);
+			licenseLabel.Uri = licenseFileText.CreateLicenseFileUri ();
 			licenseLabel.Tag = licenseFileText;
 			licenseLabel.NavigateToUrl += (sender, e) => ShowFileDialog ((LinkLabel)sender);
 			parentVBox.PackStart (licenseLabel);

main/src/addins/MonoDevelop.PackageManagement/MonoDevelop.PackageManagement.Gui/LicenseFileDialog.cs

@@ -26,7 +26,7 @@
 
 using System;
 using System.Collections.Generic;
-using System.ComponentModel;
+using System.ComponentModel;
 using NuGet.PackageManagement.UI;
 using Xwt;
 using Xwt.Formats;
@@ -79,42 +79,5 @@ protected override void Dispose (bool disposing)
 				licenseFileText.PropertyChanged -= LicenseFileTextPropertyChanged;
 			}
 		}
-
-		public static bool ShowDialog (Uri uri, IReadOnlyList<IText> licenseLinks, Dialog parent)
-		{
-			if (!uri.IsFile)
-				return false;
-
-			if (uri.Fragment?.Length > 0) {
-				if (int.TryParse (uri.Fragment.Substring (1), out int fileNumber)) {
-					ShowLicenseFile (fileNumber, licenseLinks, parent);
-					return true;
-				}
-			}
-			return false;
-		}
-
-		static void ShowLicenseFile (int fileNumber, IReadOnlyList<IText> licenseLinks, Dialog parent)
-		{
-			LicenseFileText licenseFileText = GetLicenseFile (fileNumber, licenseLinks);
-			if (licenseFileText != null) {
-				var dialog = new LicenseFileDialog (licenseFileText);
-				dialog.Run (parent);
-			}
-		}
-
-		static LicenseFileText GetLicenseFile (int fileNumber, IReadOnlyList<IText> licenseLinks)
-		{
-			int currentFileNumber = 0;
-			foreach (IText text in licenseLinks) {
-				if (text is LicenseFileText licenseFileText) {
-					currentFileNumber++;
-					if (currentFileNumber == fileNumber) {
-						return licenseFileText;
-					}
-				}
-			}
-			return null;
-		}
 	}
 }

main/src/addins/MonoDevelop.PackageManagement/MonoDevelop.PackageManagement.Gui/LicenseFileTextExtensions.cs

@@ -31,9 +31,9 @@ namespace MonoDevelop.PackageManagement
 {
 	static class LicenseFileTextExtensions
 	{
-		public static Uri CreateLicenseFileUri  (this LicenseFileText licenseFileText, int licenseCount)
+		public static Uri CreateLicenseFileUri  (this LicenseFileText licenseFileText)
 		{
-			return new Uri ($"file:///{licenseFileText.Text}#{licenseCount}");
+			return new Uri ($"file:///{licenseFileText.Text}");
 		}
 	}
 }

main/src/addins/MonoDevelop.PackageManagement/MonoDevelop.PackageManagement.Gui/LicenseLinkMarkupBuilder.cs

@@ -41,13 +41,12 @@ public string GetMarkup (IReadOnlyList<IText> textLinks)
 		{
 			var markupBuilder = StringBuilderCache.Allocate ();
 
-			int fileLicenseCount = 0; // Should be one but handle multiple.
 			foreach (IText textLink in textLinks) {
 				if (textLink is LicenseText licenseText) {
 					markupBuilder.Append (GetUriMarkup (licenseText.Link, licenseText.Text));
 				} else if (textLink is LicenseFileText licenseFileText) {
-					fileLicenseCount++;
-					markupBuilder.Append (GetUriMarkup (licenseFileText.CreateLicenseFileUri (fileLicenseCount), licenseFileText.Text));
+					// Should not happen. Building an expression should not contain a license file.
+					LoggingService.LogError ("Unexpected LicenseFileText when building markup {0}", licenseFileText.Text);
 				} else if (textLink is WarningText warning) {
 					warnings ??= new List<WarningText> ();
 					warnings.Add (warning);

main/src/addins/MonoDevelop.PackageManagement/MonoDevelop.PackageManagement.Gui/ManagePackagesDialog.cs

@@ -99,7 +99,6 @@ public ManagePackagesDialog (
 
 			closeButton.Clicked += CloseButtonClicked;
 			packageLicenseLink.NavigateToUrl += PackageLicenseNavigateToUrl;
-			packageLicenseMetadataLabel.LinkClicked += PackageLicenseLinkClicked;
 			this.showPrereleaseCheckBox.Clicked += ShowPrereleaseCheckBoxClicked;
 			this.packageSourceComboBox.SelectionChanged += PackageSourceChanged;
 			this.addPackagesButton.Clicked += AddPackagesButtonClicked;
@@ -119,7 +118,6 @@ protected override void Dispose (bool disposing)
 		{
 			closeButton.Clicked -= CloseButtonClicked;
 			packageLicenseLink.NavigateToUrl -= PackageLicenseNavigateToUrl;
-			packageLicenseMetadataLabel.LinkClicked -= PackageLicenseLinkClicked;
 			currentPackageVersionLabel.BoundsChanged -= PackageVersionLabelBoundsChanged;
 
 			imageLoader.Loaded -= ImageLoaded;
@@ -1170,6 +1168,7 @@ void ProjectCheckBoxCellViewToggled (object sender, WidgetEventArgs e)
 
 		void ShowLicense (ManagePackagesSearchResultViewModel packageViewModel)
 		{
+			packageLicenseLink.Tag = null;
 			if (packageViewModel.HasLicenseMetadata) {
 				ShowLicenseMetadata (packageViewModel);
 			} else {
@@ -1181,26 +1180,14 @@ void ShowLicense (ManagePackagesSearchResultViewModel packageViewModel)
 
 		void PackageLicenseNavigateToUrl (object sender, NavigateToUrlEventArgs e)
 		{
-			if (ShowLicenseFile (e.Uri)) {
+			var licenseFileText = packageLicenseLink.Tag as LicenseFileText;
+			if (licenseFileText != null) {
 				e.SetHandled ();
+				var dialog = new LicenseFileDialog (licenseFileText);
+				dialog.Run (this);
 			}
 		}
 
-		void PackageLicenseLinkClicked (object sender, LinkEventArgs e)
-		{
-			if (ShowLicenseFile (e.Target)) {
-				e.SetHandled ();
-			}
-		}
-
-		bool ShowLicenseFile (Uri uri)
-		{
-			return LicenseFileDialog.ShowDialog (
-				uri,
-				viewModel.SelectedPackage.GetLicenseLinks (),
-				this);
-		}
-
 		void ShowLicenseMetadata (ManagePackagesSearchResultViewModel packageViewModel)
 		{
 			var textLinks = packageViewModel.GetLicenseLinks ();
@@ -1225,7 +1212,8 @@ void ShowLicenseMetadata (ManagePackagesSearchResultViewModel packageViewModel)
 					return;
 				} else if (textLink is LicenseFileText licenseFileText) {
 					packageLicenseLink.Text = GettextCatalog.GetString ("View License");
-					packageLicenseLink.Uri = licenseFileText.CreateLicenseFileUri (1);
+					packageLicenseLink.Uri = licenseFileText.CreateLicenseFileUri ();
+					packageLicenseLink.Tag = licenseFileText;
 					return;
 				} else {
 					// Warning or plain text - handled below.