Linked up MATLAB root path property to be set from UI preferences.

3 files changed, 17 insertions, 12 deletions

diff --git a/plugins/org.eclipse.epsilon.emc.simulink.dictionary.dt/src/org/eclipse/epsilon/emc/simuink/dictionary/dt/SimulinkDictionaryModelInEclipse.java b/plugins/org.eclipse.epsilon.emc.simulink.dictionary.dt/src/org/eclipse/epsilon/emc/simuink/dictionary/dt/SimulinkDictionaryModelInEclipse.java
index e02736540..859af8f39 100644
--- a/plugins/org.eclipse.epsilon.emc.simulink.dictionary.dt/src/org/eclipse/epsilon/emc/simuink/dictionary/dt/SimulinkDictionaryModelInEclipse.java
+++ b/plugins/org.eclipse.epsilon.emc.simulink.dictionary.dt/src/org/eclipse/epsilon/emc/simuink/dictionary/dt/SimulinkDictionaryModelInEclipse.java
@@ -11,13 +11,15 @@ package org.eclipse.epsilon.emc.simuink.dictionary.dt;
 
 import org.eclipse.epsilon.common.dt.EpsilonCommonsPlugin;
 import org.eclipse.epsilon.emc.simulink.dictionary.model.SimulinkDictionaryModel;
-import org.eclipse.epsilon.emc.simulink.model.AbstractSimulinkModel;
+import org.eclipse.jface.preference.IPreferenceStore;
 
 public class SimulinkDictionaryModelInEclipse extends SimulinkDictionaryModel {
 	
 	public SimulinkDictionaryModelInEclipse() {
-		this.engineJarPath = EpsilonCommonsPlugin.getDefault().getPreferenceStore().getString(AbstractSimulinkModel.PROPERTY_ENGINE_JAR_PATH);
-		this.libraryPath = EpsilonCommonsPlugin.getDefault().getPreferenceStore().getString(AbstractSimulinkModel.PROPERTY_LIBRARY_PATH);
+		IPreferenceStore prefs = EpsilonCommonsPlugin.getDefault().getPreferenceStore();
+		this.matlabPath = prefs.getString(PROPERTY_MATLAB_PATH);
+		this.libraryPath = prefs.getString(PROPERTY_LIBRARY_PATH);
+		this.engineJarPath = prefs.getString(PROPERTY_ENGINE_JAR_PATH);
 	}
 	
 }
\ No newline at end of file
diff --git a/plugins/org.eclipse.epsilon.emc.simulink.dt/src/org/eclipse/epsilon/emc/simulink/dt/SimulinkModelInEclipse.java b/plugins/org.eclipse.epsilon.emc.simulink.dt/src/org/eclipse/epsilon/emc/simulink/dt/SimulinkModelInEclipse.java
index 61efcfa11..a5dcb61fa 100644
--- a/plugins/org.eclipse.epsilon.emc.simulink.dt/src/org/eclipse/epsilon/emc/simulink/dt/SimulinkModelInEclipse.java
+++ b/plugins/org.eclipse.epsilon.emc.simulink.dt/src/org/eclipse/epsilon/emc/simulink/dt/SimulinkModelInEclipse.java
@@ -10,14 +10,16 @@
 package org.eclipse.epsilon.emc.simulink.dt;
 
 import org.eclipse.epsilon.common.dt.EpsilonCommonsPlugin;
-import org.eclipse.epsilon.emc.simulink.model.AbstractSimulinkModel;
 import org.eclipse.epsilon.emc.simulink.model.SimulinkModel;
+import org.eclipse.jface.preference.IPreferenceStore;
 
 public class SimulinkModelInEclipse extends SimulinkModel {
 	
 	public SimulinkModelInEclipse() {
-		this.engineJarPath = EpsilonCommonsPlugin.getDefault().getPreferenceStore().getString(AbstractSimulinkModel.PROPERTY_ENGINE_JAR_PATH);
-		this.libraryPath = EpsilonCommonsPlugin.getDefault().getPreferenceStore().getString(AbstractSimulinkModel.PROPERTY_LIBRARY_PATH);
+		IPreferenceStore prefs = EpsilonCommonsPlugin.getDefault().getPreferenceStore();
+		this.matlabPath = prefs.getString(PROPERTY_MATLAB_PATH);
+		this.libraryPath = prefs.getString(PROPERTY_LIBRARY_PATH);
+		this.engineJarPath = prefs.getString(PROPERTY_ENGINE_JAR_PATH);
 	}
 	
 }
\ No newline at end of file
diff --git a/plugins/org.eclipse.epsilon.emc.simulink.requirement.dt/src/org/eclipse/epsilon/emc/simuink/requirement/dt/SimulinkRequirementModelInEclipse.java b/plugins/org.eclipse.epsilon.emc.simulink.requirement.dt/src/org/eclipse/epsilon/emc/simuink/requirement/dt/SimulinkRequirementModelInEclipse.java
index 42d6d0bd0..a0dbd9741 100644
--- a/plugins/org.eclipse.epsilon.emc.simulink.requirement.dt/src/org/eclipse/epsilon/emc/simuink/requirement/dt/SimulinkRequirementModelInEclipse.java
+++ b/plugins/org.eclipse.epsilon.emc.simulink.requirement.dt/src/org/eclipse/epsilon/emc/simuink/requirement/dt/SimulinkRequirementModelInEclipse.java
@@ -1,6 +1,5 @@
-package org.eclipse.epsilon.emc.simuink.requirement.dt;
 /*********************************************************************
-* Copyright (c) 2008 The University of York.
+* Copyright (c) 2019 The University of York.
 *
 * This program and the accompanying materials are made
 * available under the terms of the Eclipse Public License 2.0
@@ -8,17 +7,19 @@ package org.eclipse.epsilon.emc.simuink.requirement.dt;
 *
 * SPDX-License-Identifier: EPL-2.0
 **********************************************************************/
-
+package org.eclipse.epsilon.emc.simuink.requirement.dt;
 
 import org.eclipse.epsilon.common.dt.EpsilonCommonsPlugin;
-import org.eclipse.epsilon.emc.simulink.model.AbstractSimulinkModel;
 import org.eclipse.epsilon.emc.simulink.requirement.model.SimulinkRequirementModel;
+import org.eclipse.jface.preference.IPreferenceStore;
 
 public class SimulinkRequirementModelInEclipse extends SimulinkRequirementModel {
 	
 	public SimulinkRequirementModelInEclipse() {
-		this.engineJarPath = EpsilonCommonsPlugin.getDefault().getPreferenceStore().getString(AbstractSimulinkModel.PROPERTY_ENGINE_JAR_PATH);
-		this.libraryPath = EpsilonCommonsPlugin.getDefault().getPreferenceStore().getString(AbstractSimulinkModel.PROPERTY_LIBRARY_PATH);
+		IPreferenceStore prefs = EpsilonCommonsPlugin.getDefault().getPreferenceStore();
+		this.matlabPath = prefs.getString(PROPERTY_MATLAB_PATH);
+		this.libraryPath = prefs.getString(PROPERTY_LIBRARY_PATH);
+		this.engineJarPath = prefs.getString(PROPERTY_ENGINE_JAR_PATH);
 	}
 	
 }
\ No newline at end of file