Index: DCWoRMS/trunk/src/simulator/ConfigurationOptions.java
===================================================================
--- DCWoRMS/trunk/src/simulator/ConfigurationOptions.java	(revision 477)
+++ DCWoRMS/trunk/src/simulator/ConfigurationOptions.java	(revision 490)
@@ -8,5 +8,4 @@
 import java.util.PropertyResourceBundle;
 import java.util.ResourceBundle;
-import java.util.logging.FileHandler;
 
 /**
@@ -53,5 +52,4 @@
 	public static final String READ_SCENARIO_INPUT_FOLDER = READ_SCENARIO_MODIFIER
 			+ ".inputfolder";
-	public static final String READ_SCENARIO_INPUT_TAR = READ_SCENARIO_MODIFIER+ ".tar";
 	
 	/** The name of the workload file */
@@ -59,16 +57,9 @@
 			+ ".workloadfilename";
 
-	/** Shall a detailed history be printed */
-	public static final String PRINT_HISTORY_MODIFIER = "printhistory";
-
 	/** The default name of a workload file */
 	public static final String DEFAULT_WORKLOAD_FILE_NAME = "workload.swf";
 
 	public static final String CREATE_XML_SUPPLEMENT_FILES = "createXMLSupplement";
-	
-	public static final String PROVIDER_LIST_FILE = "in/provider.list";
-	
-	/** Network topology file path */
-	public static final String NETWORK_TOPOLOGY_FILE_MODIFIER = "networktopologyfilename";
+
 	
 	public static final String CREATEDIAGRAMS = "creatediagrams";
@@ -79,10 +70,8 @@
 	public static final String CREATEDIAGRAMS_TASKS = CREATEDIAGRAMS + ".tasks";
 	public static final String CREATEDIAGRAMS_TASKSWAITINGTIME = CREATEDIAGRAMS + ".taskswaitingtime";
-	public static final String CREATEDIAGRAMS_RESERVATIONS = CREATEDIAGRAMS + ".reservations";
 	
 	public static final String CREATESTATISTICS = "createstatistics";
 	public static final String ACCUMULATED_RESOURCES_STATISTICS = CREATESTATISTICS + ".accumulatedresources";
 	public static final String EXTENDED_TASKS_STATISTICS = CREATESTATISTICS + ".extendedtasks";
-	public static final String GRIDLET_HISTORY_STATISTICS = CREATESTATISTICS + ".gridlethistory";
 	public static final String JOBS_STATISTICS = CREATESTATISTICS + ".jobs";
 	public static final String SIMULATION_STATISTICS = CREATESTATISTICS + ".simulation";
@@ -111,5 +100,4 @@
 	/* =============================================================================================== */
 	
-	public String providerListFile = null;
 
 
@@ -152,8 +140,4 @@
 	public String inputWorkloadFileName = DEFAULT_WORKLOAD_FILE_NAME;
 
-	/**
-	 * a txt file name with topology description
-	 */
-	public String networkTopologyFileName = null;
 	
 	/**
@@ -171,9 +155,4 @@
 	public boolean overwriteFiles = false;
 
-	/**
-	 * true if the history files are to be generated (makes the simulation
-	 * slower)
-	 */
-	public boolean printHistory = false;
 	
 	/**
@@ -183,20 +162,19 @@
 
 	public boolean creatediagrams_processors = true;
-	public boolean creatediagrams_reservations = true;
 	public boolean creatediagrams_resources = true;
 	public boolean creatediagrams_energyusage = true;
 	public boolean creatediagrams_tasks = true;
 	public boolean creatediagrams_taskswaitingtime = true;
-	public double     creatediagrams_resources_scale = 1;
+	public double  creatediagrams_resources_scale = 1;
 	
 	public boolean createaccumulatedresourcesstatistics = true;
 	public boolean createextendedtasksstatistics = true;
-	public boolean creategridlethistorystatistics = true;
 	public boolean createjobsstatistics = true;
 	public boolean createsimulationstatistics = true;
 	public boolean formatstatisticsoutput = false;
 	
-	public static final String ENV_DESC_MODIFIER = "envdesc";
-	public String envDescFileName = null;
+	public String[] resForEnergyChart;
+	public String[] resForUtilizationChart;
+	
 	/**
 	 * An empty constructor.
@@ -231,10 +209,5 @@
 		
 		co.resdescFileName = bundle.getString(RESOURCE_DESC_MODIFIER);
-		
-		try {
-			co.envDescFileName = bundle.getString(ENV_DESC_MODIFIER);
-		} catch(MissingResourceException e){
-			co.envDescFileName = null;
-		}
+
 		
 		try {
@@ -264,12 +237,4 @@
 		}
 
-
-		try {
-			co.networkTopologyFileName = bundle
-					.getString(NETWORK_TOPOLOGY_FILE_MODIFIER);
-		} catch(MissingResourceException e){
-			co.networkTopologyFileName = null;
-		}
-		
 		if (co.createScenario == false) {
 			// read scenario
@@ -279,11 +244,4 @@
 			} catch (MissingResourceException e) {
 				co.inputFolder = null;
-			}
-			
-			try {
-				co.inputTar = getSeparatorTerminatedPath(bundle
-					.getString(READ_SCENARIO_INPUT_TAR));
-			} catch (MissingResourceException e) {
-				co.inputTar = null;
 			}
 			
@@ -307,12 +265,5 @@
 			co.createXMLSupplement = false;
 		}
-		
-		try {
-			co.printHistory = Boolean.valueOf(
-					bundle.getString(PRINT_HISTORY_MODIFIER)).booleanValue();
-		} catch(MissingResourceException e){
-			co.printHistory = false;
-		}
-		
+
 		// create diagrams
 		
@@ -330,13 +281,10 @@
 			co.creatediagrams_processors = createDiagrams;
 		}
-		try {
-			co.creatediagrams_reservations = Boolean.valueOf(
-					bundle.getString(CREATEDIAGRAMS_RESERVATIONS)).booleanValue() && createDiagrams;
-		} catch(MissingResourceException e){
-			co.creatediagrams_reservations = createDiagrams;
-		}
-		try {
-			co.creatediagrams_resources = Boolean.valueOf(
-					bundle.getString(CREATEDIAGRAMS_UTILIZATION)).booleanValue() && createDiagrams;
+
+		try {
+			co.resForUtilizationChart = bundle.getString(CREATEDIAGRAMS_UTILIZATION).split(";");
+			if(co.resForUtilizationChart.length > 0){
+				co.creatediagrams_resources = true && createDiagrams;
+			}
 		} catch(MissingResourceException e){
 			co.creatediagrams_resources = createDiagrams;
@@ -349,6 +297,8 @@
 		}
 		try {
-			co.creatediagrams_energyusage = Boolean.valueOf(
-					bundle.getString(CREATEDIAGRAMS_ENERGYUSAGE)).booleanValue() && createDiagrams;
+			co.resForEnergyChart = bundle.getString(CREATEDIAGRAMS_ENERGYUSAGE).split(";");
+			if(co.resForEnergyChart.length > 0){
+				co.creatediagrams_energyusage = true && createDiagrams;
+			}
 		} catch(MissingResourceException e){
 			co.creatediagrams_energyusage = createDiagrams;
@@ -367,5 +317,4 @@
 		}
 		
-		
 		try {
 			co.statsOutputSubfolderNameCreate = bundle.getString(STATS_OUTPUT_SUBFOLDER_NAME);
@@ -388,10 +337,5 @@
 			co.createextendedtasksstatistics = true;
 		}
-		try {
-			co.creategridlethistorystatistics = Boolean.valueOf(
-					bundle.getString(GRIDLET_HISTORY_STATISTICS)).booleanValue();
-		} catch(MissingResourceException e){
-			co.creategridlethistorystatistics = true;
-		}
+
 		try {
 			co.createjobsstatistics = Boolean.valueOf(
@@ -419,63 +363,4 @@
 		}
 		return co;
-	}
-
-	/**
-	 * Creates a new configuration object in the CREATE_SCENARIO mode.
-	 * 
-	 * @param gridSchedulingPluginName
-	 * @param forecastFinishTimePluginName
-	 * @param localAllocPolicyPluginName
-	 * @param resdescFileName
-	 * @param taskParamFileName
-	 * @param outputFolder
-	 * @param outputWorkloadFileName
-	 * @param overwriteFiles
-	 * @param printHistory
-	 */
-	public ConfigurationOptions(String gridSchedulingPluginName,
-			String exectimeestimationplugin,
-			String localAllocPolicyPluginName, String resdescFileName,
-			String taskParamFileName, String outputFolder,
-			String outputWorkloadFileName, boolean overwriteFiles,
-			boolean printHistory) {
-		super();
-		this.resdescFileName = resdescFileName;
-		this.workloadDescFileName = taskParamFileName;
-		this.outputFolder = getSeparatorTerminatedPath(outputFolder);
-		this.outputWorkloadFileName = outputWorkloadFileName;
-		this.overwriteFiles = overwriteFiles;
-		this.printHistory = printHistory;
-
-		// the create mode
-		this.createScenario = true;
-	}
-
-	/**
-	 * Creates a new configuration object in the READ_SCENARIO mode.
-	 * 
-	 * @param gridSchedulingPluginName
-	 * @param forecastFinishTimePluginName
-	 * @param localAllocPolicyPluginName
-	 * @param resdescFileName
-	 * @param inputFolder
-	 * @param inputWorkloadFileName
-	 * @param overwriteFiles
-	 * @param printHistory
-	 */
-	public ConfigurationOptions(String gridSchedulingPluginName,
-			String exectimeestimationplugin,
-			String localAllocPolicyPluginName, String resdescFileName,
-			String inputFolder, String inputWorkloadFileName,
-			boolean overwriteFiles, boolean printHistory) {
-		super();
-		this.resdescFileName = resdescFileName;
-		this.inputFolder = getSeparatorTerminatedPath(inputFolder);
-		this.inputWorkloadFileName = inputWorkloadFileName;
-		this.overwriteFiles = overwriteFiles;
-		this.printHistory = printHistory;
-		//FileHandler.loadDataset(new File("iris.data"), 4, ",");
-		// the read mode
-		this.createScenario = false;
 	}
 
