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 80268f9c9406294ff9cc66d75ccef25ed8976d04..460c785ae14c08a9756bfdaf31a8485451fcabeb 100644 (file)
--- 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 630cafcc458f739f8b4a951266acb025265b56b2..bc2bcb0c09572243276e22ea8cf9046d165e14a1 100644 (file)
--- 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();
        }