projects
/
debian
/
openrocket
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge commit '42b2e5ca519766e37ce6941ba4faecc9691cc403' into upstream
[debian/openrocket]
/
core
/
src
/
net
/
sf
/
openrocket
/
startup
/
Application.java
diff --git
a/core/src/net/sf/openrocket/startup/Application.java
b/core/src/net/sf/openrocket/startup/Application.java
index 7718b67ec0f94504c844b6c50cb2ee31d43277c1..18d1af776e4855fb212a9716300c67fccbbd45b4 100644
(file)
--- a/
core/src/net/sf/openrocket/startup/Application.java
+++ b/
core/src/net/sf/openrocket/startup/Application.java
@@
-1,5
+1,6
@@
package net.sf.openrocket.startup;
package net.sf.openrocket.startup;
+import net.sf.openrocket.database.ComponentPresetDao;
import net.sf.openrocket.database.MotorDatabase;
import net.sf.openrocket.l10n.ClassBasedTranslator;
import net.sf.openrocket.l10n.DebugTranslator;
import net.sf.openrocket.database.MotorDatabase;
import net.sf.openrocket.l10n.ClassBasedTranslator;
import net.sf.openrocket.l10n.DebugTranslator;
@@
-23,6
+24,8
@@
public final class Application {
private static Translator baseTranslator = new DebugTranslator(null);
private static MotorDatabase motorSetDatabase;
private static Translator baseTranslator = new DebugTranslator(null);
private static MotorDatabase motorSetDatabase;
+
+ private static ComponentPresetDao componentPresetDao;
private static Preferences preferences;
private static Preferences preferences;
@@
-159,6
+162,15
@@
public final class Application {
public static void setMotorSetDatabase(MotorDatabase motorSetDatabase) {
Application.motorSetDatabase = motorSetDatabase;
}
public static void setMotorSetDatabase(MotorDatabase motorSetDatabase) {
Application.motorSetDatabase = motorSetDatabase;
}
+
+ public static ComponentPresetDao getComponentPresetDao() {
+ return componentPresetDao;
+
+ }
+
+ public static void setComponentPresetDao(ComponentPresetDao componentPresetDao) {
+ Application.componentPresetDao = componentPresetDao;
+ }
}
}