Strabon

changeset 243:5ab3b73914e9

we use Java generics
author Babis Nikolaou <charnik@di.uoa.gr>
date Mon Jun 04 16:05:10 2012 +0300 (2012-06-04)
parents 6174ff9d242a
children 2600f97e4d69
files endpoint/src/main/java/eu/earthobservatory/org/StrabonEndpoint/StrabonBeanWrapper.java
line diff
     1.1 --- a/endpoint/src/main/java/eu/earthobservatory/org/StrabonEndpoint/StrabonBeanWrapper.java	Sun Jun 03 18:00:58 2012 +0300
     1.2 +++ b/endpoint/src/main/java/eu/earthobservatory/org/StrabonEndpoint/StrabonBeanWrapper.java	Mon Jun 04 16:05:10 2012 +0300
     1.3 @@ -122,7 +122,7 @@
     1.4  //		init();
     1.5  //	}
     1.6  
     1.7 -	public StrabonBeanWrapper(String databaseName, String user, String password, int port, String serverName, boolean checkForLockTable, List<List> args) {
     1.8 +	public StrabonBeanWrapper(String databaseName, String user, String password, int port, String serverName, boolean checkForLockTable, List<List<String>> args) {
     1.9  		this.serverName = serverName;
    1.10  		this.port = port;
    1.11  		this.databaseName = databaseName;
    1.12 @@ -131,10 +131,10 @@
    1.13  		this.checkForLockTable = checkForLockTable;
    1.14  		this.entries = new ArrayList<StrabonBeanWrapper.Entry>(args.size());
    1.15  		
    1.16 -		Iterator<List> entryit = args.iterator();
    1.17 +		Iterator<List<String>> entryit = args.iterator();
    1.18  		
    1.19  		while (entryit.hasNext()) {
    1.20 -			List list = entryit.next();
    1.21 +			List<String> list = entryit.next();
    1.22  			Iterator<String> it = list.iterator();
    1.23  			
    1.24  			while (it.hasNext()) {
    1.25 @@ -158,7 +158,6 @@
    1.26  					items++;
    1.27  				}
    1.28  				
    1.29 -				
    1.30  				if (items == 4) {
    1.31  					Entry entry = new Entry(label, bean, statement, format);
    1.32  					this.entries.add(entry);
    1.33 @@ -177,7 +176,7 @@
    1.34  				logger.info(this.getDetails());
    1.35  				this.strabon = new Strabon(databaseName, user, password, port, serverName, checkForLockTable);
    1.36  			} catch (Exception e) {
    1.37 -				logger.error("Exception occured while creating Strabon.\n"+this.getDetails(), e.getStackTrace());
    1.38 +				logger.error("Exception occured while creating Strabon.\n"+this.getDetails(), e);
    1.39  				return false;
    1.40  			}
    1.41  		}