From 17dc87efc5c849866243efbbf5ab9c1f8e6a1a53 Mon Sep 17 00:00:00 2001
From: jingjingbic <jingjingbic@gmail.com>
Date: Thu, 12 Sep 2024 12:07:32 -0700
Subject: [PATCH] Change version in pom.xml from 2.8.4-snapshot to 2.8.4.

---
 pom.xml                                               |  4 ++--
 .../org/cytoscape/io/internal/cxio/Cx2Importer.java   | 11 +++++++++--
 2 files changed, 11 insertions(+), 4 deletions(-)

diff --git a/pom.xml b/pom.xml
index b04f0b8..b68b50e 100644
--- a/pom.xml
+++ b/pom.xml
@@ -24,7 +24,7 @@
 
 	<groupId>org.cytoscape</groupId>
 	<artifactId>cx-support</artifactId>
-	<version>2.8.4-SNAPSHOT</version>
+	<version>2.8.4</version>
 	<name>CX Support</name>
 	<description>CX JSON Reader and Writer for Cytoscape</description>
 	<packaging>bundle</packaging>
@@ -202,7 +202,7 @@
 		<dependency>
 			<groupId>org.ndexbio</groupId>
 			<artifactId>ndex-object-model</artifactId>
-			<version>2.5.7-SNAPSHOT</version>
+			<version>2.5.7</version>
 		</dependency>
 	
 		<!-- Testing -->
diff --git a/src/main/java/org/cytoscape/io/internal/cxio/Cx2Importer.java b/src/main/java/org/cytoscape/io/internal/cxio/Cx2Importer.java
index ddba16a..e5b21ac 100644
--- a/src/main/java/org/cytoscape/io/internal/cxio/Cx2Importer.java
+++ b/src/main/java/org/cytoscape/io/internal/cxio/Cx2Importer.java
@@ -869,9 +869,16 @@ private void addDiscreteMapping(Class<?> typeClass, VisualLexicon lexicon, Mappi
         for ( Map<String,Object> mappingEntry: def.getMapppingList()) {
 			ATTRIBUTE_DATA_TYPE elmtDType = dtype.isSingleValueType()? dtype: dtype.elementType();
 			Object v = AttributeDeclaredAspect.processAttributeValue (elmtDType, mappingEntry.get("v") );
-			String cyValue = CX2ToCXVisualPropertyConverter.getInstance().
+			try {
+				String cyValue = CX2ToCXVisualPropertyConverter.getInstance().
+			
 					getCx1EdgeOrNodePropertyValue(cx2VpName, mappingEntry.get("vp"));
-			dmf.putMapValue(v, vp.parseSerializableString(cyValue));
+				dmf.putMapValue(v, vp.parseSerializableString(cyValue));
+			} catch (IllegalArgumentException e) {
+				throw new NdexException("Failed to parse value for mapping " + colName + 
+						" on " + cx2VpName + " : " + e.getMessage());
+			}
+        
 		}
         style.addVisualMappingFunction(dmf);
 	}