Strabon

changeset 1359:6f201ce361e2

removed some unused variables in StrabonEndpointWrapper
author Babis Nikolaou <charnik@di.uoa.gr>
date Sat Sep 13 19:14:25 2014 +0300 (2014-09-13)
parents 65db010f01ac
children 6cf1bdca6f2e 6d1c5a9a07d3
files endpoint/src/main/java/eu/earthobservatory/org/StrabonEndpoint/StrabonBeanWrapper.java runtime/src/main/java/eu/earthobservatory/runtime/generaldb/Strabon.java
line diff
     1.1 --- a/endpoint/src/main/java/eu/earthobservatory/org/StrabonEndpoint/StrabonBeanWrapper.java	Sat Sep 13 18:21:21 2014 +0300
     1.2 +++ b/endpoint/src/main/java/eu/earthobservatory/org/StrabonEndpoint/StrabonBeanWrapper.java	Sat Sep 13 19:14:25 2014 +0300
     1.3 @@ -13,10 +13,8 @@
     1.4  import java.io.OutputStream;
     1.5  import java.net.URL;
     1.6  import java.util.ArrayList;
     1.7 -import java.util.Arrays;
     1.8  import java.util.Iterator;
     1.9  import java.util.List;
    1.10 -import java.util.Properties;
    1.11  import java.util.regex.Matcher;
    1.12  import java.util.regex.Pattern;
    1.13  
    1.14 @@ -31,8 +29,6 @@
    1.15  import org.slf4j.Logger;
    1.16  import org.slf4j.LoggerFactory;
    1.17  
    1.18 -import com.sun.xml.bind.v2.runtime.unmarshaller.XsiNilLoader.Array;
    1.19 -
    1.20  import eu.earthobservatory.runtime.generaldb.InvalidDatasetFormatFault;
    1.21  import eu.earthobservatory.runtime.generaldb.Strabon;
    1.22  import eu.earthobservatory.utils.Format;
    1.23 @@ -241,8 +237,6 @@
    1.24  					gChartString += "data.addColumn('string',\'"+arr.get(0)+"');\n";
    1.25  					gChartString += "data.addColumn('number',\'"+arr.get(1)+"');\n";
    1.26  					
    1.27 -					int i=1;
    1.28 -					int index=0;
    1.29  					while(result.hasNext()){
    1.30  						BindingSet bindings = result.next();
    1.31  						arr.add(0, bindings.getValue(bindingNames.get(0)).stringValue());
    1.32 @@ -250,7 +244,6 @@
    1.33  						
    1.34  						gChartString += "data.addRow([\'"+withoutPrefix(arr.get(0))+"\', "+
    1.35  								arr.get(1).replace("\"", "").replace("^^","").replace("<http://www.w3.org/2001/XMLSchema#integer>","")+"]);\n";
    1.36 -								i++;	
    1.37  					}
    1.38  					gChartString += "var options = {'title':'','width':1000, 'height':1000, is3D: true};\n";
    1.39  					gChartString += "var chart = new google.visualization.PieChart(document.getElementById('chart_div'));\n";
    1.40 @@ -261,7 +254,6 @@
    1.41  					
    1.42  					String chartType;
    1.43  					int varNum = bindingNames.size();
    1.44 -					ArrayList<String> arr = new ArrayList<String>(varNum);
    1.45  
    1.46  					gChartString = "var data = google.visualization.arrayToDataTable([[";
    1.47  					for(int j=0; j<varNum; j++){
     2.1 --- a/runtime/src/main/java/eu/earthobservatory/runtime/generaldb/Strabon.java	Sat Sep 13 18:21:21 2014 +0300
     2.2 +++ b/runtime/src/main/java/eu/earthobservatory/runtime/generaldb/Strabon.java	Sat Sep 13 19:14:25 2014 +0300
     2.3 @@ -18,7 +18,6 @@
     2.4  import java.sql.SQLException;
     2.5  import java.util.ArrayList;
     2.6  
     2.7 -import org.geotools.factory.Hints;
     2.8  import org.openrdf.model.URI;
     2.9  import org.openrdf.model.ValueFactory;
    2.10  import org.openrdf.query.BindingSet;