[Eulergui-commits] SF.net SVN: eulergui:[1305] trunk/eulergui/src/main/java/eulergui/ drools_engine/ParserLink.java

[<iam...@us...>]

Revision: 1305
          http://eulergui.svn.sourceforge.net/eulergui/?rev=1305&view=rev
Author:   iamlolive
Date:     2010-03-15 11:10:44 +0000 (Mon, 15 Mar 2010)

Log Message:
-----------
parserLink now fills the parseResult of each N3Source it has handled. plus it returns a more sophisticated exception when parsing has failed. 

Modified Paths:
--------------
    trunk/eulergui/src/main/java/eulergui/drools_engine/ParserLink.java

Modified: trunk/eulergui/src/main/java/eulergui/drools_engine/ParserLink.java
===================================================================
--- trunk/eulergui/src/main/java/eulergui/drools_engine/ParserLink.java	2010-03-15 11:09:19 UTC (rev 1304)
+++ trunk/eulergui/src/main/java/eulergui/drools_engine/ParserLink.java	2010-03-15 11:10:44 UTC (rev 1305)
@@ -1,13 +1,6 @@
 package eulergui.drools_engine;
 
-import java.io.BufferedReader;
-import java.io.File;
-import java.io.FileNotFoundException;
-import java.io.FileReader;
-import java.io.InputStream;
-import java.io.InputStreamReader;
-import java.io.Reader;
-import java.io.StringReader;
+import java.io.*;
 import java.net.URI;
 import java.net.URL;
 import java.util.ArrayList;
@@ -19,6 +12,7 @@
 import java.util.Map;
 import java.util.Set;
 
+import n3_project.exceptions.parser.ParsingException;
 import n3_project.helpers.Triple;
 import net.sf.parser4j.parser.service.IParserListener;
 import net.sf.parser4j.parser.service.ParserException;
@@ -105,7 +99,7 @@
 	}
 	
 	/** PENDING: n3Source could be a non-N3 format */
-	public IN3Model parse( N3Source n3Source ) throws Exception {		
+	public IN3Model parse( N3Source n3Source ) throws ParserException, IOException {
 			makeN3Parser();
 			modelURI = n3Source.uri();
 			N3ParseResult n3ParseResult = null;
@@ -130,8 +124,9 @@
 			}
 			
 			if( n3ParseResult != null ) {
+                n3Source.setParseResult(n3ParseResult);
 				if( n3ParseResult.isInError() ) {
-					throw new ParserException( n3ParseResult.getErrorMessage() );
+					throw new ParsingException( n3Source );
 				}
 				model = n3ParseResult.getModel();
 			}
@@ -141,7 +136,7 @@
 	/** parse N3 Source, And Update Known URI Prefixes;
 	 * also wait For Download Thread if any */
 	public IN3Model parseAndUpdateSource( N3Source n3Source )
-			throws Exception {
+			throws ParserException, IOException {
 		long t0 = System.currentTimeMillis();
 		n3Source.waitForDownloadThread();
 		model = parse(n3Source);


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.