Fixed overridden license header in FPreferences

1 files changed, 16 insertions, 5 deletions

diff --git a/org.genivi.commonapi.core/src/org/genivi/commonapi/core/preferences/FPreferences.java b/org.genivi.commonapi.core/src/org/genivi/commonapi/core/preferences/FPreferences.java
index a82205e..f3c5021 100644
--- a/org.genivi.commonapi.core/src/org/genivi/commonapi/core/preferences/FPreferences.java
+++ b/org.genivi.commonapi.core/src/org/genivi/commonapi/core/preferences/FPreferences.java
@@ -32,6 +32,10 @@ public class FPreferences {
     private FPreferences() {
         preferences = new HashMap<IResource, Map<String, String>>();
     }
+    
+    public void resetPreferences(){
+        preferences.clear();
+    }
 
     public static FPreferences getInstance() {
         if (instance == null) {
@@ -42,6 +46,7 @@ public class FPreferences {
 
     public void addPreferences(IResource res) {
         Map<String, String> map = new HashMap<String, String>();
+        
         if (res != null) {
             try {
                 QualifiedName useProjectSettingsIdentifier = new QualifiedName(PreferenceConstants.PROJECT_PAGEID, PreferenceConstants.USEPROJECTSETTINGS);
@@ -64,11 +69,17 @@ public class FPreferences {
             }
 
         } else {
-            map.put(PreferenceConstants.USEPROJECTSETTINGS, Boolean.FALSE.toString());
-            map.put(PreferenceConstants.P_OUTPUT, PreferenceConstants.DEFAULT_OUTPUT);
-            map.put(PreferenceConstants.P_LICENSE, PreferenceConstants.DEFAULT_LICENSE);
-            map.put(PreferenceConstants.P_GENERATESTUB, Boolean.TRUE.toString());
-            map.put(PreferenceConstants.P_GENERATEPROXY, Boolean.TRUE.toString());
+            if(!preferences.get(null).containsKey(PreferenceConstants.USEPROJECTSETTINGS))
+                map.put(PreferenceConstants.USEPROJECTSETTINGS, Boolean.FALSE.toString());
+            if(!preferences.get(null).containsKey(PreferenceConstants.P_OUTPUT))
+                map.put(PreferenceConstants.P_OUTPUT, PreferenceConstants.DEFAULT_OUTPUT);
+            if(!preferences.get(null).containsKey(PreferenceConstants.P_LICENSE))
+                map.put(PreferenceConstants.P_LICENSE, PreferenceConstants.DEFAULT_LICENSE);
+            if(!preferences.get(null).containsKey(PreferenceConstants.P_GENERATESTUB))
+                map.put(PreferenceConstants.P_GENERATESTUB, Boolean.TRUE.toString());
+            if(!preferences.get(null).containsKey(PreferenceConstants.P_GENERATEPROXY))
+                map.put(PreferenceConstants.P_GENERATEPROXY, Boolean.TRUE.toString());
+            map.putAll(preferences.get(null));
         }
         preferences.put(res, map);
     }