From: Marko Luukkainen <marko.luukkainen@semantum.fi>
Date: Fri, 12 Mar 2021 16:11:08 +0000 (+0200)
Subject: Fix poor syntax in search result HMTL generation.
X-Git-Url: https://gerrit.simantics.org/r/gitweb?a=commitdiff_plain;h=refs%2Fchanges%2F78%2F4678%2F1;p=simantics%2Fplatform.git

Fix poor syntax in search result HMTL generation.

`)`was in wrong place.

gitlab #680

Change-Id: If62e3a4e146b05f26b912db0b245a1bb3cc77193
---

diff --git a/bundles/org.simantics.workbench.search/src/org/simantics/workbench/search/NameAndTypeRow.java b/bundles/org.simantics.workbench.search/src/org/simantics/workbench/search/NameAndTypeRow.java
index 87a47c33b..45fe313fe 100644
--- a/bundles/org.simantics.workbench.search/src/org/simantics/workbench/search/NameAndTypeRow.java
+++ b/bundles/org.simantics.workbench.search/src/org/simantics/workbench/search/NameAndTypeRow.java
@@ -53,15 +53,15 @@ public class NameAndTypeRow implements SearchResultRow {
     	switch (column) {
     	
 		case 0:
-			return "<a class=\"small\" href=\"resource:"+ resource.getResource() +"\"" + (resource.getUri() == null ? "" : " title=\""+URIStringUtils.unescape( resource.getUri() )+"\">")+StringUtil.escape(resource.getName())+"</a>";
+			return "<a class=\"small\" href=\"resource:"+ resource.getResource() +"\"" + (resource.getUri() == null ? "" : " title=\""+URIStringUtils.unescape( resource.getUri() ))+"\">"+StringUtil.escape(resource.getName())+"</a>";
 		case 1:
 			String s = "";
 			for (NamedResource type : principalTypes)
-			 s+="<a class=\"small\" href=\"resource:"+ type.getResource() +"\"" + (type.getUri() == null ? "" : " title=\""+URIStringUtils.unescape( type.getUri() )+"\">")+StringUtil.escape(type.getName())+"</a>";
+			 s+="<a class=\"small\" href=\"resource:"+ type.getResource() +"\"" + (type.getUri() == null ? "" : " title=\""+URIStringUtils.unescape( type.getUri() ))+"\">"+StringUtil.escape(type.getName())+"</a>";
 			return s;
 		case 2:
 			if (parent != null)
-				return "<a class=\"small\" href=\"resource:"+ parent.getResource() +"\"" + (parent.getUri() == null ? "" : " title=\""+URIStringUtils.unescape( parent.getUri() )+"\">")+StringUtil.escape(parent.getName())+"</a>";
+				return "<a class=\"small\" href=\"resource:"+ parent.getResource() +"\"" + (parent.getUri() == null ? "" : " title=\""+URIStringUtils.unescape( parent.getUri() ))+"\">"+StringUtil.escape(parent.getName())+"</a>";
 			return "";
 		default:
 			return "";
diff --git a/bundles/org.simantics.workbench.search/src/org/simantics/workbench/search/NameRow.java b/bundles/org.simantics.workbench.search/src/org/simantics/workbench/search/NameRow.java
index 157d27aa8..c2fbb9d58 100644
--- a/bundles/org.simantics.workbench.search/src/org/simantics/workbench/search/NameRow.java
+++ b/bundles/org.simantics.workbench.search/src/org/simantics/workbench/search/NameRow.java
@@ -39,10 +39,10 @@ public class NameRow implements SearchResultRow {
     public String getContent(int column) {
     	switch (column) {
 		case 0:
-			return "<a class=\"small\" href=\"resource:"+ resource.getResource() +"\"" + (resource.getUri() == null ? "" : " title=\""+URIStringUtils.unescape( resource.getUri() )+"\">")+StringUtil.escape(resource.getName())+"</a>";
+			return "<a class=\"small\" href=\"resource:"+ resource.getResource() +"\"" + (resource.getUri() == null ? "" : " title=\""+URIStringUtils.unescape( resource.getUri() ))+"\">"+StringUtil.escape(resource.getName())+"</a>";
 		case 1:
 			if (parent != null)
-				return "<a class=\"small\" href=\"resource:"+ parent.getResource() +"\"" + (parent.getUri() == null ? "" : " title=\""+URIStringUtils.unescape( parent.getUri() )+"\">")+StringUtil.escape(parent.getName())+"</a>";
+				return "<a class=\"small\" href=\"resource:"+ parent.getResource() +"\"" + (parent.getUri() == null ? "" : " title=\""+URIStringUtils.unescape( parent.getUri() ))+"\">"+StringUtil.escape(parent.getName())+"</a>";
 			return "";
 		default:
 			return "";