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
/
rocketcomponent
/
BodyComponent.java
diff --git
a/core/src/net/sf/openrocket/rocketcomponent/BodyComponent.java
b/core/src/net/sf/openrocket/rocketcomponent/BodyComponent.java
index a102e87f720871ae46f1341a3f3f05280bb6c858..6f4d7dbe4a9df41d89ee933e8f9c1fd65e9942f0 100644
(file)
--- a/
core/src/net/sf/openrocket/rocketcomponent/BodyComponent.java
+++ b/
core/src/net/sf/openrocket/rocketcomponent/BodyComponent.java
@@
-1,5
+1,7
@@
package net.sf.openrocket.rocketcomponent;
package net.sf.openrocket.rocketcomponent;
+import net.sf.openrocket.preset.ComponentPreset;
+
/**
/**
@@
-49,10
+51,7
@@
public abstract class BodyComponent extends ExternalComponent {
@Override
@Override
- protected void loadFromPreset(RocketComponent preset) {
- BodyComponent c = (BodyComponent) preset;
- this.setLength(c.getLength());
-
+ protected void loadFromPreset(ComponentPreset preset) {
super.loadFromPreset(preset);
}
super.loadFromPreset(preset);
}