[jbosstools-commits] JBoss Tools SVN: r23498 - trunk/common/plugins/org.jboss.tools.common.model/src/org/jboss/tools/common/model/loaders/impl.

[jbosstools-commits at lists.jboss.org]

Author: scabanovich
Date: 2010-07-16 09:41:48 -0400 (Fri, 16 Jul 2010)
New Revision: 23498

Modified:
   trunk/common/plugins/org.jboss.tools.common.model/src/org/jboss/tools/common/model/loaders/impl/EncodedProperties.java
   trunk/common/plugins/org.jboss.tools.common.model/src/org/jboss/tools/common/model/loaders/impl/PropertiesLoader.java
Log:
https://jira.jboss.org/browse/JBIDE-6555

Modified: trunk/common/plugins/org.jboss.tools.common.model/src/org/jboss/tools/common/model/loaders/impl/EncodedProperties.java
===================================================================
--- trunk/common/plugins/org.jboss.tools.common.model/src/org/jboss/tools/common/model/loaders/impl/EncodedProperties.java	2010-07-16 13:38:46 UTC (rev 23497)
+++ trunk/common/plugins/org.jboss.tools.common.model/src/org/jboss/tools/common/model/loaders/impl/EncodedProperties.java	2010-07-16 13:41:48 UTC (rev 23498)
@@ -100,9 +100,13 @@
                 }
                 valueStart++;
             }
+        try {
             String key = loadConvert(lr.lineBuf, 0, keyLen, convtBuf);
             String value = loadConvert(lr.lineBuf, valueStart, limit - valueStart, convtBuf);
 	    put(key, value);
+        } catch (IllegalArgumentException e) {
+        	//TODO create object for error marker
+        }
 	}
     }
 
@@ -272,6 +276,7 @@
 			     value = (value << 4) + 10 + aChar - 'A';
 			     break;
 			  default:
+				  //TODO create object for error marker
                               throw new IllegalArgumentException(
                                            "Malformed \\uxxxx encoding."); //$NON-NLS-1$
                         }

Modified: trunk/common/plugins/org.jboss.tools.common.model/src/org/jboss/tools/common/model/loaders/impl/PropertiesLoader.java
===================================================================
--- trunk/common/plugins/org.jboss.tools.common.model/src/org/jboss/tools/common/model/loaders/impl/PropertiesLoader.java	2010-07-16 13:38:46 UTC (rev 23497)
+++ trunk/common/plugins/org.jboss.tools.common.model/src/org/jboss/tools/common/model/loaders/impl/PropertiesLoader.java	2010-07-16 13:41:48 UTC (rev 23498)
@@ -269,6 +269,8 @@
     		p.load(sr);
     	} catch (IOException e) {
     		//ignore
+    	} catch (IllegalArgumentException e1) {
+    		return null;
     	}
     	return p.getProperty("a");
     }