Merge commit '42b2e5ca519766e37ce6941ba4faecc9691cc403' into upstream

[debian/openrocket] / android / src / net / sf / openrocket / android / PreferencesAdapter.java

diff --git a/android/src/net/sf/openrocket/android/PreferencesAdapter.java b/android/src/net/sf/openrocket/android/PreferencesAdapter.java
index 086c18c32b1b499110004240911b669805a1097b..e4d68a7a54b8aee287d1c1aaa5b1d032a5329bbb 100644 (file)
--- a/android/src/net/sf/openrocket/android/PreferencesAdapter.java
+++ b/android/src/net/sf/openrocket/android/PreferencesAdapter.java
@@ -4,6 +4,8 @@ import java.util.Collections;
 import java.util.Set;\r
 \r
 import net.sf.openrocket.material.Material;\r
+import net.sf.openrocket.preset.ComponentPreset;\r
+import net.sf.openrocket.preset.ComponentPreset.Type;\r
 \r
 public class PreferencesAdapter extends net.sf.openrocket.startup.Preferences {\r
 \r
@@ -89,8 +91,15 @@ public class PreferencesAdapter extends net.sf.openrocket.startup.Preferences {
         */\r
        @Override\r
        public void removeUserMaterial(Material m) {\r
-               // TODO Auto-generated method stub\r
-               \r
+       }\r
+\r
+       @Override\r
+       public void setComponentFavorite(ComponentPreset preset, Type type,     boolean favorite) {\r
+       }\r
+\r
+       @Override\r
+       public Set<String> getComponentFavorites(Type type) {\r
+               return Collections.<String>emptySet();\r
        }\r
 \r
 }\r