From: lingutln <lingutln@localhost>
Date: Tue, 20 Dec 2011 22:58:34 +0000 (+0000)
Subject: svn path=/; revision=231
X-Git-Url: http://gitweb.planteome.org/?a=commitdiff_plain;h=344337eadd8836f71f1f62633a220882fa191492;p=old-jaiswallab-svn%2F.git

svn path=/; revision=231
---

diff --git a/Annotation/src/ie/dcu/apps/ist/views/SegmentationView.java b/Annotation/src/ie/dcu/apps/ist/views/SegmentationView.java
index 80268f9..460c785 100644
--- a/Annotation/src/ie/dcu/apps/ist/views/SegmentationView.java
+++ b/Annotation/src/ie/dcu/apps/ist/views/SegmentationView.java
@@ -16,7 +16,9 @@ import java.net.*;
 import java.util.Properties;
 import java.util.logging.*;
 import java.io.*;
+
 import org.json.*;
+import org.apache.commons.lang3.StringEscapeUtils;
 
 import org.eclipse.core.runtime.IProgressMonitor;
 import org.eclipse.jface.action.*;
@@ -644,7 +646,6 @@ public class SegmentationView extends Composite {
 		return view.isAnnotatingForeground();
 	}
 
-
 	private String getText(Tool a) {
 		return props.getProperty(getKey(a, "text"));
 	}
@@ -693,7 +694,6 @@ public class SegmentationView extends Composite {
 		}
 	}
 	
-	
 	private void execute(Tool a, Event e) {
 		switch (a) {
 		case Foreground:
@@ -819,11 +819,13 @@ public class SegmentationView extends Composite {
 		        	if(array.getJSONObject(i).getString("match_type").trim().equals("synonym"))
 		        	{
 		        		listElement = (array.getJSONObject(i).getString("match")+" {"+array.getJSONObject(i).getString("is_synonym_of")+"}");
+		        		listElement = StringEscapeUtils.unescapeHtml4(listElement);
 		        		comboLabel.add(listElement,i);
 		        	}
 		        	else if(array.getJSONObject(i).getString("match_type").equals("term"))
 		        	{
 		        		listElement = array.getJSONObject(i).getString("match");
+		        		listElement = StringEscapeUtils.unescapeHtml4(listElement);
 		        		comboLabel.add(listElement,i);
 		        	}
 		        }
diff --git a/Annotation/src/ie/dcu/segment/painters/ForegroundOnlyPainter.java b/Annotation/src/ie/dcu/segment/painters/ForegroundOnlyPainter.java
index 630cafc..bc2bcb0 100644
--- a/Annotation/src/ie/dcu/segment/painters/ForegroundOnlyPainter.java
+++ b/Annotation/src/ie/dcu/segment/painters/ForegroundOnlyPainter.java
@@ -16,8 +16,7 @@ public class ForegroundOnlyPainter implements SegmentationPainter {
 	
 	private ImageData maskData;
 	private Image maskImage;
-
-
+	
 	public String getName() {
 		return "Foreground Only";
 	}
@@ -40,7 +39,7 @@ public class ForegroundOnlyPainter implements SegmentationPainter {
 		// Paint mask
 		createVisibleMask(ctx.getMask());
 		gc.drawImage(maskImage, 0, 0);
-		
+				
 		// Commit changes
 		im.endPaint();
 	}