hongshaorou/openrocket
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

fixed FinSetTest

Browse Source
This commit is contained in:
Daniel_M_Williams 2015-12-14 20:13:51 -05:00
parent e7fbec3d89
commit fb278b3566
2 changed files with 4 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
core/src/net/sf/openrocket/rocketcomponent/Rocket.java
View File

@ -432,10 +432,7 @@ public class Rocket extends RocketComponent {
freezeList.add(cce); freezeList.add(cce);
return; return;
} }
if( -1 == cce.getType()){
log.debug(">>fireComponentChangeEvent()>> . . .");
}
// Notify all components first // Notify all components first
Iterator<RocketComponent> iterator = this.iterator(true); Iterator<RocketComponent> iterator = this.iterator(true);
while (iterator.hasNext()) { while (iterator.hasNext()) {

5
core/test/net/sf/openrocket/rocketcomponent/FinSetTest.java
View File

@ -257,12 +257,13 @@ public class FinSetTest extends BaseTestCase {
rocket.addChild(stage); rocket.addChild(stage);
stage.addChild(body); stage.addChild(body);
body.addChild(fin); body.addChild(fin);
rocket.enableEvents();
Listener l1 = new Listener("l1"); Listener l1 = new Listener("l1");
rocket.addComponentChangeListener(l1); rocket.addComponentChangeListener(l1);
fin.setName("Custom name"); fin.setName("Custom name");
assertTrue(l1.changed); assertEquals("FinSet listener has not been notified: ", l1.changed, true);
assertEquals(ComponentChangeEvent.NONFUNCTIONAL_CHANGE, l1.changetype); assertEquals(ComponentChangeEvent.NONFUNCTIONAL_CHANGE, l1.changetype);
@ -275,7 +276,7 @@ public class FinSetTest extends BaseTestCase {
FinSet fincopy = (FinSet) rocketcopy.getChild(0).getChild(0).getChild(0); FinSet fincopy = (FinSet) rocketcopy.getChild(0).getChild(0).getChild(0);
FreeformFinSet.convertFinSet(fincopy); FreeformFinSet.convertFinSet(fincopy);
assertTrue(l2.changed); assertTrue("FinSet listener is changed", l2.changed);
assertEquals(ComponentChangeEvent.TREE_CHANGE, assertEquals(ComponentChangeEvent.TREE_CHANGE,
l2.changetype & ComponentChangeEvent.TREE_CHANGE); l2.changetype & ComponentChangeEvent.TREE_CHANGE);