From 8b82ee4ca67641fe491037d7e8b17e732026d849 Mon Sep 17 00:00:00 2001
From: Nikolaus Huber <nikolaus.huber@uni-wuerzburg.de>
Date: Tue, 28 May 2013 10:35:34 +0000
Subject: [PATCH] properties file now read from arguments list
git-svn-id: https://se1.informatik.uni-wuerzburg.de/usvn/svn/code/code/DMM/trunk@11756 9e42b895-fcda-4063-8a3b-11be15eb1bbd
---
.../AdaptationControl.launch | 1 +
.../ipd/descartes/adaptation/AdaptationControl.java | 11 ++++++++---
2 files changed, 9 insertions(+), 3 deletions(-)
diff --git a/edu.kit.ipd.descartes.adaptation/AdaptationControl.launch b/edu.kit.ipd.descartes.adaptation/AdaptationControl.launch
index 33996e29..d16e1300 100644
--- a/edu.kit.ipd.descartes.adaptation/AdaptationControl.launch
+++ b/edu.kit.ipd.descartes.adaptation/AdaptationControl.launch
@@ -10,5 +10,6 @@
<listEntry value="org.eclipse.debug.ui.launchGroup.run"/>
</listAttribute>
<stringAttribute key="org.eclipse.jdt.launching.MAIN_TYPE" value="edu.kit.ipd.descartes.adaptation.AdaptationControl"/>
+<stringAttribute key="org.eclipse.jdt.launching.PROGRAM_ARGUMENTS" value="default.properties"/>
<stringAttribute key="org.eclipse.jdt.launching.PROJECT_ATTR" value="edu.kit.ipd.descartes.adaptation"/>
</launchConfiguration>
diff --git a/edu.kit.ipd.descartes.adaptation/src/edu/kit/ipd/descartes/adaptation/AdaptationControl.java b/edu.kit.ipd.descartes.adaptation/src/edu/kit/ipd/descartes/adaptation/AdaptationControl.java
index 7e9792bd..27667da1 100644
--- a/edu.kit.ipd.descartes.adaptation/src/edu/kit/ipd/descartes/adaptation/AdaptationControl.java
+++ b/edu.kit.ipd.descartes.adaptation/src/edu/kit/ipd/descartes/adaptation/AdaptationControl.java
@@ -85,10 +85,12 @@ public class AdaptationControl {
public static void main(String[] args) throws IOException {
BasicConfigurator.configure();
Logger.getRootLogger().setLevel(Level.DEBUG);
+
+ String propertiesfile = args[0];
AdaptationControl adaptationController = new AdaptationControl();
// Initialize controller (load models, create Action handler, etc.)
- adaptationController.init();
+ adaptationController.init(propertiesfile);
Event triggeringEvent = adaptationController.createTriggeringEvent();
// trigger adaptation process
@@ -133,10 +135,13 @@ public class AdaptationControl {
}
- public void init() {
+ public void init(String propertiesFile) {
try {
// load properties file
- loadProperties(DEFAULT_PROP_FILE_PATH);
+ if (propertiesFile == null || propertiesFile.equals(""))
+ loadProperties(DEFAULT_PROP_FILE_PATH);
+ else
+ loadProperties(propertiesFile);
// load required models
adaptationProcess = adaptationProcessModelLoader.load(URI.createFileURI(adaptationProcessXmiFilePath));
--
GitLab