fix for ticket GLIPCI-226. Now putting content of -dest from command line into preference store, to have it available when generating files

2 files changed, 16 insertions, 18 deletions

diff --git a/org.genivi.commonapi.core.cli/src/org/genivi/commonapi/core/cli/CommandlineToolMain.java b/org.genivi.commonapi.core.cli/src/org/genivi/commonapi/core/cli/CommandlineToolMain.java
index 5cdeef9..027eca5 100644
--- a/org.genivi.commonapi.core.cli/src/org/genivi/commonapi/core/cli/CommandlineToolMain.java
+++ b/org.genivi.commonapi.core.cli/src/org/genivi/commonapi/core/cli/CommandlineToolMain.java
@@ -25,6 +25,8 @@ import java.util.List;
 import javax.inject.Inject;
 
 import org.eclipse.core.runtime.Platform;
+import org.eclipse.core.runtime.preferences.DefaultScope;
+import org.eclipse.core.runtime.preferences.InstanceScope;
 import org.eclipse.emf.common.util.URI;
 import org.eclipse.emf.ecore.resource.Resource;
 import org.eclipse.xtext.generator.IFileSystemAccess;
@@ -256,6 +258,12 @@ public class CommandlineToolMain
 
             final JavaIoFileSystemAccess fsa = fileAccessProvider.get();
 
+            DefaultScope.INSTANCE.getNode(PreferenceConstants.SCOPE).put(PreferenceConstants.P_OUTPUT_PROXIES, dest);
+            DefaultScope.INSTANCE.getNode(PreferenceConstants.SCOPE).put(PreferenceConstants.P_OUTPUT_STUBS, dest);
+            InstanceScope.INSTANCE.getNode(PreferenceConstants.SCOPE).get(PreferenceConstants.P_OUTPUT_PROXIES, dest);
+            InstanceScope.INSTANCE.getNode(PreferenceConstants.SCOPE).get(PreferenceConstants.P_OUTPUT_STUBS, dest);
+            pref.setPreference(PreferenceConstants.P_OUTPUT_PROXIES, dest);
+            pref.setPreference(PreferenceConstants.P_OUTPUT_STUBS, dest);
             fsa.setOutputPath(createAbsolutPath(dest));
             fsa.getOutputConfigurations().get(IFileSystemAccess.DEFAULT_OUTPUT).setCreateOutputDirectory(true);
             for (String file : filelist)
diff --git a/org.genivi.commonapi.core/src/org/genivi/commonapi/core/generator/FrancaGenerator.xtend b/org.genivi.commonapi.core/src/org/genivi/commonapi/core/generator/FrancaGenerator.xtend
index 22142ed..35d8bf8 100644
--- a/org.genivi.commonapi.core/src/org/genivi/commonapi/core/generator/FrancaGenerator.xtend
+++ b/org.genivi.commonapi.core/src/org/genivi/commonapi/core/generator/FrancaGenerator.xtend
@@ -125,20 +125,7 @@ class FrancaGenerator implements IGenerator
 
         if(res != null)
         {
-            var defaultValue = DefaultScope::INSTANCE.getNode(PreferenceConstants::SCOPE).get(PreferenceConstants::P_OUTPUT_PROXIES,
-                PreferenceConstants::DEFAULT_OUTPUT);
-            defaultValue = InstanceScope::INSTANCE.getNode(PreferenceConstants::SCOPE).get(PreferenceConstants::P_OUTPUT_PROXIES,
-                defaultValue)
-            defaultValue = FPreferences::instance.getPreference(res, PreferenceConstants::P_OUTPUT_PROXIES, defaultValue)
-
-            if(fileSystemAccess instanceof EclipseResourceFileSystemAccess2)
-            {
-                (fileSystemAccess as EclipseResourceFileSystemAccess2).setOutputPath(defaultValue)
-            }
-            else if(fileSystemAccess instanceof JavaIoFileSystemAccess)
-            {
-                (fileSystemAccess as JavaIoFileSystemAccess).setOutputPath(defaultValue)
-            }
+            fileSystemAccess.setFileAccessOutputPathForPreference(PreferenceConstants::P_OUTPUT_PROXIES, res)
         }
     }
 
@@ -348,14 +335,17 @@ class FrancaGenerator implements IGenerator
 
     def void setFileAccessOutputPathForPreference(IFileSystemAccess access, String preference, IResource res)
     {
+        var defaultValue = DefaultScope::INSTANCE.getNode(PreferenceConstants::SCOPE).get(preference,
+            PreferenceConstants::DEFAULT_OUTPUT);
+        defaultValue = InstanceScope::INSTANCE.getNode(PreferenceConstants::SCOPE).get(preference, defaultValue)
+        defaultValue = FPreferences::instance.getPreference(res, preference, defaultValue)
+
         switch (access)
         {
             EclipseResourceFileSystemAccess2:
-                access.setOutputPath(
-                    FPreferences::instance.getPreference(res, preference, PreferenceConstants::DEFAULT_OUTPUT))
+                access.setOutputPath(defaultValue)
             JavaIoFileSystemAccess:
-                access.setOutputPath(
-                    FPreferences::instance.getPreference(res, preference, PreferenceConstants::DEFAULT_OUTPUT))
+                access.setOutputPath(defaultValue)
         }
     }
 }