reduce json size

JPMoresmau · Mar 8, 2012 · 19867d6 · 19867d6
1 parent d98edfd
commit 19867d6
Show file tree

Hide file tree

Showing 2 changed files with 14 additions and 11 deletions.
diff --git a/...sf.eclipsefp.haskell.buildwrapper/src/net/sf/eclipsefp/haskell/buildwrapper/BWFacade.java b/...sf.eclipsefp.haskell.buildwrapper/src/net/sf/eclipsefp/haskell/buildwrapper/BWFacade.java
@@ -181,9 +181,11 @@ public boolean build1(IFile file){
 		LinkedList<String> command=new LinkedList<String>();
 		command.add("build1");
 		command.add("--file="+path);
+		//long t0=System.currentTimeMillis();
 		//command.add("--buildflags="+escapeFlags(i.getFlags()));
 		JSONArray arr=run(command,ARRAY);
-
+		//long t1=System.currentTimeMillis();
+		//BuildWrapperPlugin.logInfo("build:"+(t1-t0)+"ms");
 		if (arr!=null && arr.length()>1){
 			Set<IResource> ress=new HashSet<IResource>();
 			ress.add(file);

diff --git a/...ipsefp.haskell.buildwrapper/src/net/sf/eclipsefp/haskell/buildwrapper/types/Location.java b/...ipsefp.haskell.buildwrapper/src/net/sf/eclipsefp/haskell/buildwrapper/types/Location.java
@@ -31,21 +31,22 @@ public Location(JSONObject json) throws JSONException {
 	}
 
 	public Location(IFile f, JSONArray json) throws JSONException {
-		startLine=json.getInt(0);
-		startColumn=json.getInt(1)-1; // we're zero based, Haskell code 1 based
-		endLine=json.getInt(2);
-		endColumn=json.getInt(3)-1;// we're zero based, Haskell code 1 based
-		if (endColumn==-1 && endLine>startLine){
-			endLine--;
-		}
-		this.fileName = f.getLocation().toOSString();
+		this(f.getLocation().toOSString(),json);
 	}
 
 	public Location(String fn, JSONArray json) throws JSONException {
 		startLine=json.getInt(0);
 		startColumn=json.getInt(1)-1; // we're zero based, Haskell code 1 based
-		endLine=json.getInt(2);
-		endColumn=json.getInt(3)-1;// we're zero based, Haskell code 1 based
+		if (json.length()>3){
+			endLine=json.getInt(2);
+			endColumn=json.getInt(3)-1;// we're zero based, Haskell code 1 based
+		} else if (json.length()>2){
+			endLine=startLine;
+			endColumn=json.getInt(2)-1;// we're zero based, Haskell code 1 based
+		} else {
+			endLine=startLine;
+			endColumn=startColumn+1;
+		}
 		if (endColumn==-1 && endLine>startLine){
 			endLine--;
 		}