projects
/
debian
/
openrocket
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Make preset favorites per component type. That is, a single preset can be a favorite...
[debian/openrocket]
/
core
/
src
/
net
/
sf
/
openrocket
/
preset
/
xml
/
OpenRocketComponentLoader.java
diff --git
a/core/src/net/sf/openrocket/preset/xml/OpenRocketComponentLoader.java
b/core/src/net/sf/openrocket/preset/xml/OpenRocketComponentLoader.java
index fc6893195a1cdfd78f0114ba8b9488070f7783b8..23c2fe02908406256e31ab2f1ce04590b68201bf 100644
(file)
--- a/
core/src/net/sf/openrocket/preset/xml/OpenRocketComponentLoader.java
+++ b/
core/src/net/sf/openrocket/preset/xml/OpenRocketComponentLoader.java
@@
-4,7
+4,6
@@
import java.io.InputStream;
import java.io.InputStreamReader;
import java.util.Collection;
import java.util.List;
import java.io.InputStreamReader;
import java.util.Collection;
import java.util.List;
-import java.util.Set;
import javax.xml.bind.JAXBException;
import javax.xml.bind.JAXBException;
@@
-24,16
+23,9
@@
public class OpenRocketComponentLoader implements Loader<ComponentPreset> {
log.debug("Loading presets from file " + filename);
log.debug("Loading presets from file " + filename);
- Set<String> favorites = Application.getPreferences().getComponentFavorites();
-
try {
List<ComponentPreset> presets;
presets = (new OpenRocketComponentSaver().unmarshalFromOpenRocketComponent( new InputStreamReader (stream))).asComponentPresets();
try {
List<ComponentPreset> presets;
presets = (new OpenRocketComponentSaver().unmarshalFromOpenRocketComponent( new InputStreamReader (stream))).asComponentPresets();
- for( ComponentPreset preset : presets ) {
- if ( favorites.contains(preset.preferenceKey())) {
- preset.setFavorite(true);
- }
- }
log.debug("ComponentPreset file " + filename + " contained " + presets.size() + " presets");
return presets;
} catch (JAXBException e) {
log.debug("ComponentPreset file " + filename + " contained " + presets.size() + " presets");
return presets;
} catch (JAXBException e) {