From 7daf375812ce3e9ee44b1d09d2c64f0d3ebbaa7c Mon Sep 17 00:00:00 2001
From: Ingo Weinhold <ingo_weinhold@gmx.de>
Date: Sun, 12 May 2013 14:35:01 +0200
Subject: [PATCH] Terminal: HyperLink: Remove base address, add text property

* The base address is no longer used (it was in a an earlier, never
  committed version), so we can as remove it.
* Introduce a text property.
---
 src/apps/terminal/HyperLink.cpp      | 14 +++++++++++---
 src/apps/terminal/HyperLink.h        |  9 +++++----
 src/apps/terminal/TermViewStates.cpp |  3 +--
 3 files changed, 17 insertions(+), 9 deletions(-)

diff --git a/src/apps/terminal/HyperLink.cpp b/src/apps/terminal/HyperLink.cpp
index 97e294f7eb..e3eab2843a 100644
--- a/src/apps/terminal/HyperLink.cpp
+++ b/src/apps/terminal/HyperLink.cpp
@@ -20,11 +20,19 @@ HyperLink::HyperLink()
 }
 
 
-HyperLink::HyperLink(const BString& address, Type type,
-	const BString& baseAddress)
+HyperLink::HyperLink(const BString& address, Type type)
 	:
+	fText(address),
+	fAddress(address),
+	fType(type)
+{
+}
+
+
+HyperLink::HyperLink(const BString& text, const BString& address, Type type)
+	:
+	fText(text),
 	fAddress(address),
-	fBaseAddress(baseAddress.IsEmpty() ? address : baseAddress),
 	fType(type)
 {
 }
diff --git a/src/apps/terminal/HyperLink.h b/src/apps/terminal/HyperLink.h
index 735c84c50f..ba7d58a13e 100644
--- a/src/apps/terminal/HyperLink.h
+++ b/src/apps/terminal/HyperLink.h
@@ -20,20 +20,21 @@ public:
 
 public:
 								HyperLink();
-								HyperLink(const BString& address, Type type,
-									const BString& baseAddress = BString());
+								HyperLink(const BString& address, Type type);
+								HyperLink(const BString& text,
+									const BString& address, Type type);
 
 			bool				IsValid() const	{ return !fAddress.IsEmpty(); }
 
+			const BString&		Text() const		{ return fText; }
 			const BString&		Address() const		{ return fAddress; }
-			const BString&		BaseAddress() const	{ return fBaseAddress; }
 			Type				GetType() const		{ return fType; }
 
 			status_t			Open();
 
 private:
+			BString				fText;
 			BString				fAddress;
-			BString				fBaseAddress;
 			Type				fType;
 };
 
diff --git a/src/apps/terminal/TermViewStates.cpp b/src/apps/terminal/TermViewStates.cpp
index 9591983adf..eb190edb27 100644
--- a/src/apps/terminal/TermViewStates.cpp
+++ b/src/apps/terminal/TermViewStates.cpp
@@ -836,8 +836,7 @@ TermView::HyperLinkState::_GetHyperLinkAt(BPoint where, bool pathPrefixOnly,
 			_link = HyperLink(text,
 				i == 0
 					? HyperLink::TYPE_PATH_WITH_LINE
-					: HyperLink::TYPE_PATH_WITH_LINE_AND_COLUMN,
-				path);
+					: HyperLink::TYPE_PATH_WITH_LINE_AND_COLUMN);
 			return true;
 		}
 	}