From c154985d7ee301e544510ae0133800dd739d2812 Mon Sep 17 00:00:00 2001
From: nvt-se <nvt-se>
Date: Tue, 11 Aug 2009 14:42:58 +0000
Subject: [PATCH] load configuration from the JAR

---
 .../se/sics/coffee/CoffeeConfiguration.java            | 10 ++++++----
 tools/coffee-manager/se/sics/coffee/CoffeeFile.java    |  8 ++++----
 .../coffee-manager/se/sics/coffee/CoffeeMicroLog.java  |  6 +++---
 3 files changed, 13 insertions(+), 11 deletions(-)

diff --git a/tools/coffee-manager/se/sics/coffee/CoffeeConfiguration.java b/tools/coffee-manager/se/sics/coffee/CoffeeConfiguration.java
index a312d744d..02c25c7b1 100644
--- a/tools/coffee-manager/se/sics/coffee/CoffeeConfiguration.java
+++ b/tools/coffee-manager/se/sics/coffee/CoffeeConfiguration.java
@@ -28,7 +28,7 @@
  *
  * This file is part of the Contiki operating system.
  *
- * $Id: CoffeeConfiguration.java,v 1.2 2009/08/10 12:51:52 nvt-se Exp $
+ * $Id: CoffeeConfiguration.java,v 1.3 2009/08/11 14:42:58 nvt-se Exp $
  *
  * @author Nicolas Tsiftes
  *
@@ -59,10 +59,12 @@ public class CoffeeConfiguration {
 					    "default_log_size", "page_type_size"};
 		String property;
 		Properties prop = new Properties();
-		FileInputStream fstream =
-			new FileInputStream(filename);
+		InputStream stream = CoffeeConfiguration.class.getResourceAsStream("/" + filename);
+		if (stream == null) {
+			throw new CoffeeException("failed to load the configuration file " + filename);
+		}
 
-		prop.load(fstream);
+		prop.load(stream);
 		for (int i = 0; i < validParameters.length; i++) {
 			if (prop.getProperty(validParameters[i]) == null) {
 				throw new CoffeeException("missing the parameter \"" + validParameters[i] + "\" in the configuration file " + filename);
diff --git a/tools/coffee-manager/se/sics/coffee/CoffeeFile.java b/tools/coffee-manager/se/sics/coffee/CoffeeFile.java
index 87ccbe907..07e02bc89 100644
--- a/tools/coffee-manager/se/sics/coffee/CoffeeFile.java
+++ b/tools/coffee-manager/se/sics/coffee/CoffeeFile.java
@@ -28,7 +28,7 @@
  *
  * This file is part of the Contiki operating system.
  *
- * $Id: CoffeeFile.java,v 1.4 2009/08/10 12:56:13 nvt-se Exp $
+ * $Id: CoffeeFile.java,v 1.5 2009/08/11 14:42:58 nvt-se Exp $
  *
  * @author Nicolas Tsiftes
  *
@@ -103,10 +103,10 @@ public class CoffeeFile {
 
 		FileOutputStream fOut = new FileOutputStream(filename);
 
-		if(microLog != null) {
-			for(i = 0; i < microLog.getLogRecords(); i++) {
+		if (microLog != null) {
+			for (i = 0; i < microLog.getLogRecords(); i++) {
 				bytes = microLog.getRegion(i);
-				if(bytes == null) {
+				if (bytes == null) {
 					bytes = new byte[microLog.getLogRecordSize()];
 					coffeeFS.getImage().read(bytes, bytes.length, i * microLog.getLogRecordSize());
 				}
diff --git a/tools/coffee-manager/se/sics/coffee/CoffeeMicroLog.java b/tools/coffee-manager/se/sics/coffee/CoffeeMicroLog.java
index a76345187..39aef6cc2 100644
--- a/tools/coffee-manager/se/sics/coffee/CoffeeMicroLog.java
+++ b/tools/coffee-manager/se/sics/coffee/CoffeeMicroLog.java
@@ -28,7 +28,7 @@
  *
  * This file is part of the Contiki operating system.
  *
- * $Id: CoffeeMicroLog.java,v 1.1 2009/08/10 12:51:52 nvt-se Exp $
+ * $Id: CoffeeMicroLog.java,v 1.2 2009/08/11 14:42:58 nvt-se Exp $
  *
  * @author Nicolas Tsiftes
  *
@@ -81,8 +81,8 @@ public class CoffeeMicroLog extends CoffeeFile {
 		int headerSize = header.rawLength();
 		int indexSize = logRecords * 2;
 
-		for(int i = logRecords - 1; i >= 0; i--) {
-			if(index[i] - 1 == region) {
+		for (int i = logRecords - 1; i >= 0; i--) {
+			if (index[i] - 1 == region) {
 				byte[] bytes = new byte[logRecordSize];
 				coffeeFS.getImage().read(bytes, bytes.length, 
 					recordStart + i * logRecordSize);