deac/osd-contiki
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

load configuration from the JAR

Browse source
This commit is contained in:
nvt-se 2009-08-11 14:42:58 +00:00
parent 7d25016895
commit c154985d7e
3 changed files with 13 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
tools/coffee-manager/se/sics/coffee/CoffeeConfiguration.java
View file

@ -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);

8
tools/coffee-manager/se/sics/coffee/CoffeeFile.java
View file

@ -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());
}

6
tools/coffee-manager/se/sics/coffee/CoffeeMicroLog.java
View file

@ -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);