Added local file settings sources, refined MealyEQOracleChain interface

Author: misberner

core/src/main/java/de/learnlib/settings/sources/LearnLibLocalPropertiesAutomataLibSettingsSource.java

@@ -0,0 +1,33 @@
+/* Copyright (C) 2015 TU Dortmund
+ * This file is part of LearnLib, http://www.learnlib.de/.
+ * 
+ * LearnLib is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License version 3.0 as published by the Free Software Foundation.
+ * 
+ * LearnLib is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * Lesser General Public License for more details.
+ * 
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with LearnLib; if not, see
+ * http://www.gnu.de/documents/lgpl.en.html.
+ */
+package de.learnlib.settings.sources;
+
+import net.automatalib.AutomataLibSettingsSource;
+import net.automatalib.commons.util.settings.LocalFileSource;
+
+public class LearnLibLocalPropertiesAutomataLibSettingsSource extends LocalFileSource
+		implements AutomataLibSettingsSource {
+
+	public LearnLibLocalPropertiesAutomataLibSettingsSource() {
+		super("learnlib.properties");
+	}
+	
+	@Override
+	public int getPriority() {
+		return super.getPriority() - 10; // bump prio down a bit
+	}
+}

core/src/main/java/de/learnlib/settings/sources/LearnLibLocalPropertiesSource.java

@@ -0,0 +1,26 @@
+/* Copyright (C) 2015 TU Dortmund
+ * This file is part of LearnLib, http://www.learnlib.de/.
+ * 
+ * LearnLib is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License version 3.0 as published by the Free Software Foundation.
+ * 
+ * LearnLib is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * Lesser General Public License for more details.
+ * 
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with LearnLib; if not, see
+ * http://www.gnu.de/documents/lgpl.en.html.
+ */
+package de.learnlib.settings.sources;
+
+import net.automatalib.commons.util.settings.LocalFileSource;
+import de.learnlib.settings.LearnLibSettingsSource;
+
+public class LearnLibLocalPropertiesSource extends LocalFileSource implements LearnLibSettingsSource {
+	public LearnLibLocalPropertiesSource() {
+		super("learnlib.properties");
+	}
+}

core/src/main/resources/META-INF/services/de.learnlib.settings.LearnLibSettingsSource

@@ -1,2 +1,3 @@
 de.learnlib.settings.sources.LearnLibPropertiesSource
 de.learnlib.settings.sources.LearnLibSystemPropertiesSource
+de.learnlib.settings.sources.LearnLibLocalPropertiesSource

core/src/main/resources/META-INF/services/net.automatalib.AutomataLibSettingsSource

@@ -1 +1,2 @@
 de.learnlib.settings.sources.LearnLibPropertiesAutomataLibSettingsSource
+de.learnlib.settings.sources.LearnLibLocalPropertiesAutomataLibSettingsSource

eqtests/basic-eqtests/src/main/java/de/learnlib/eqtests/basic/EQOracleChain.java

@@ -42,7 +42,8 @@ public DFAEQOracleChain(
 		}
 	}
 
-	public static class MealyEQOracleChain<I,O> extends EQOracleChain<MealyMachine<?,I,?,O>,I,Word<O>> {
+	public static class MealyEQOracleChain<I,O> extends EQOracleChain<MealyMachine<?,I,?,O>,I,Word<O>>
+			implements MealyEquivalenceOracle<I, O> {
 		@SafeVarargs
 		public MealyEQOracleChain(
 				EquivalenceOracle<? super MealyMachine<?, I, ?, O>, I, Word<O>>... oracles) {