Revision: 97
http://polepos.svn.sourceforge.net/polepos/?rev=97&view=rev
Author: patrickroemer
Date: 2010-05-03 12:07:18 +0000 (Mon, 03 May 2010)
Log Message:
-----------
only load default drivers if none are supplied externally
Modified Paths:
--------------
trunk/polepos/src/org/polepos/framework/Circuit.java
trunk/polepos/src/org/polepos/runner/db4o/AbstractDb4oVersionsRaceRunner.java
Modified: trunk/polepos/src/org/polepos/framework/Circuit.java
===================================================================
--- trunk/polepos/src/org/polepos/framework/Circuit.java 2010-05-02 14:30:32 UTC (rev 96)
+++ trunk/polepos/src/org/polepos/framework/Circuit.java 2010-05-03 12:07:18 UTC (rev 97)
@@ -101,7 +101,7 @@
/**
* @return the driver class needed to run on this Circuit
*/
- public abstract Class requiredDriver();
+ public abstract Class<? extends Driver> requiredDriver();
/**
* @return the methods that are intended to be run
Modified: trunk/polepos/src/org/polepos/runner/db4o/AbstractDb4oVersionsRaceRunner.java
===================================================================
--- trunk/polepos/src/org/polepos/runner/db4o/AbstractDb4oVersionsRaceRunner.java 2010-05-02 14:30:32 UTC (rev 96)
+++ trunk/polepos/src/org/polepos/runner/db4o/AbstractDb4oVersionsRaceRunner.java 2010-05-03 12:07:18 UTC (rev 97)
@@ -68,10 +68,11 @@
}
private Team db4oTeam(String jarName, int[] options, Driver[] drivers, ConfigurationSetting[] configurations) {
+ boolean loadDrivers = drivers == null || drivers.length == 0;
try {
Team team = null;
if(jarName == null){
- team = instantiateTeam((Class<? extends Team>)Class.forName(Db4oTeam.class.getName()));
+ team = instantiateTeam((Class<? extends Team>)Class.forName(Db4oTeam.class.getName()), loadDrivers);
}else{
String[] prefixes={"com.db4o.","org.polepos.teams.db4o."};
@@ -83,7 +84,7 @@
urls[urls.length - 1] = jarURL(workspace(), jarName);
ClassLoader loader=new VersionClassLoader(urls, prefixes, Team.class.getClassLoader());
- team = instantiateTeam((Class<? extends Team>)loader.loadClass(Db4oTeam.class.getName()));
+ team = instantiateTeam((Class<? extends Team>)loader.loadClass(Db4oTeam.class.getName()), loadDrivers);
}
team.configure(options, configurations);
if(jarName != null){
@@ -102,9 +103,9 @@
}
}
- private Team instantiateTeam(Class<? extends Team> clazz) throws Exception {
- Constructor<? extends Team> constr = clazz.getConstructor(new Class<?>[] {});
- return constr.newInstance(new Object[] {});
+ private Team instantiateTeam(Class<? extends Team> clazz, boolean loadDrivers) throws Exception {
+ Constructor<? extends Team> constr = clazz.getConstructor(new Class<?>[] { Boolean.TYPE });
+ return constr.newInstance(new Object[] { loadDrivers });
}
private URL jarURL(String workspace, String jarName) throws MalformedURLException{
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
