diff --git a/components/apu_oil_tank/jar/apu_oil_tank.jar b/components/apu_oil_tank/jar/apu_oil_tank.jar deleted file mode 100644 index e83df98..0000000 Binary files a/components/apu_oil_tank/jar/apu_oil_tank.jar and /dev/null differ diff --git a/components/battery/jar/battery.jar b/components/battery/jar/battery.jar index 6544701..142b706 100644 Binary files a/components/battery/jar/battery.jar and b/components/battery/jar/battery.jar differ diff --git a/data/flightRecorderA380.db.properties b/data/flightRecorderA380.db.properties index 59d661f..1b64040 100644 --- a/data/flightRecorderA380.db.properties +++ b/data/flightRecorderA380.db.properties @@ -1,5 +1,5 @@ #HSQL Database Engine 2.5.0 -#Sat Aug 10 11:39:27 IST 2019 +#Sat Aug 10 14:02:28 IST 2019 tx_timestamp=0 modified=no version=2.5.0 diff --git a/data/flightRecorderA380.db.script b/data/flightRecorderA380.db.script index bec159a..be072fd 100644 --- a/data/flightRecorderA380.db.script +++ b/data/flightRecorderA380.db.script @@ -44,360 +44,102 @@ GRANT DBA TO SA SET SCHEMA SYSTEM_LOBS INSERT INTO BLOCKS VALUES(0,2147483647,0) SET SCHEMA PUBLIC -INSERT INTO DATA VALUES(39855568798900,'BatteryFactory','battery: 849057230') -INSERT INTO DATA VALUES(39855574535100,'batteryFactory','batteryInstance: 441819287') -INSERT INTO DATA VALUES(39855576447500,'batteryFactory','batteryPort: 1697586160') -INSERT INTO DATA VALUES(39855578820200,'BatteryFactory','battery: 1848225285') -INSERT INTO DATA VALUES(39855579445100,'batteryFactory','batteryInstance: 1072973255') -INSERT INTO DATA VALUES(39855579921000,'batteryFactory','batteryPort: 804479325') -INSERT INTO DATA VALUES(39855582556600,'BatteryFactory','battery: 1811489037') -INSERT INTO DATA VALUES(39855583265400,'batteryFactory','batteryInstance: 343058156') -INSERT INTO DATA VALUES(39855583817300,'batteryFactory','batteryPort: 653969948') -INSERT INTO DATA VALUES(39855586386900,'BatteryFactory','battery: 921850125') -INSERT INTO DATA VALUES(39855587110400,'batteryFactory','batteryInstance: 256829155') -INSERT INTO DATA VALUES(39855587683500,'batteryFactory','batteryPort: 1811420448') -INSERT INTO DATA VALUES(39855589870500,'BatteryFactory','battery: 545202061') -INSERT INTO DATA VALUES(39855590497400,'batteryFactory','batteryInstance: 1014169502') -INSERT INTO DATA VALUES(39855591026200,'batteryFactory','batteryPort: 947735872') -INSERT INTO DATA VALUES(39855593108400,'BatteryFactory','battery: 1775179517') -INSERT INTO DATA VALUES(39855593882600,'batteryFactory','batteryInstance: 206258922') -INSERT INTO DATA VALUES(39855594548000,'batteryFactory','batteryPort: 222922520') -INSERT INTO DATA VALUES(39855597564600,'BatteryFactory','battery: 810022057') -INSERT INTO DATA VALUES(39855598258300,'batteryFactory','batteryInstance: 733110531') -INSERT INTO DATA VALUES(39855598806000,'batteryFactory','batteryPort: 504446278') -INSERT INTO DATA VALUES(39855601101300,'BatteryFactory','battery: 2021429792') -INSERT INTO DATA VALUES(39855601894200,'batteryFactory','batteryInstance: 1217397924') -INSERT INTO DATA VALUES(39855602590200,'batteryFactory','batteryPort: 896457651') -INSERT INTO DATA VALUES(39855605705400,'BatteryFactory','battery: 1159026309') -INSERT INTO DATA VALUES(39855606333400,'batteryFactory','batteryInstance: 2069723339') -INSERT INTO DATA VALUES(39855606769900,'batteryFactory','batteryPort: 1922055341') -INSERT INTO DATA VALUES(39855608774300,'BatteryFactory','battery: 240871777') -INSERT INTO DATA VALUES(39855609384900,'batteryFactory','batteryInstance: 805843476') -INSERT INTO DATA VALUES(39855609840100,'batteryFactory','batteryPort: 339371752') -INSERT INTO DATA VALUES(39855611887900,'BatteryFactory','battery: 1559181585') -INSERT INTO DATA VALUES(39855612504200,'batteryFactory','batteryInstance: 704764302') -INSERT INTO DATA VALUES(39855612951200,'batteryFactory','batteryPort: 432809846') -INSERT INTO DATA VALUES(39855615135600,'BatteryFactory','battery: 1102155015') -INSERT INTO DATA VALUES(39855615918500,'batteryFactory','batteryInstance: 174426463') -INSERT INTO DATA VALUES(39855616389500,'batteryFactory','batteryPort: 1348976892') -INSERT INTO DATA VALUES(39855618601600,'BatteryFactory','battery: 727120128') -INSERT INTO DATA VALUES(39855619285200,'batteryFactory','batteryInstance: 2098748839') -INSERT INTO DATA VALUES(39855619746900,'batteryFactory','batteryPort: 511852815') -INSERT INTO DATA VALUES(39855622012000,'BatteryFactory','battery: 887817126') -INSERT INTO DATA VALUES(39855635131800,'batteryFactory','batteryInstance: 1447268700') -INSERT INTO DATA VALUES(39855635757700,'batteryFactory','batteryPort: 305460642') -INSERT INTO DATA VALUES(39855638122400,'BatteryFactory','battery: 484045502') -INSERT INTO DATA VALUES(39855638767800,'batteryFactory','batteryInstance: 828712926') -INSERT INTO DATA VALUES(39855639208000,'batteryFactory','batteryPort: 83654308') -INSERT INTO DATA VALUES(39855641526800,'BatteryFactory','battery: 46518643') -INSERT INTO DATA VALUES(39855642475200,'batteryFactory','batteryInstance: 18646938') -INSERT INTO DATA VALUES(39855642924000,'batteryFactory','batteryPort: 115035927') -INSERT INTO DATA VALUES(39855644970900,'BatteryFactory','battery: 655662377') -INSERT INTO DATA VALUES(39855645611100,'batteryFactory','batteryInstance: 1004073654') -INSERT INTO DATA VALUES(39855646089300,'batteryFactory','batteryPort: 1161442645') -INSERT INTO DATA VALUES(39855648071500,'BatteryFactory','battery: 990475956') -INSERT INTO DATA VALUES(39855648637700,'batteryFactory','batteryInstance: 1025350025') -INSERT INTO DATA VALUES(39855649092600,'batteryFactory','batteryPort: 848824071') -INSERT INTO DATA VALUES(39855651221300,'BatteryFactory','battery: 756747497') -INSERT INTO DATA VALUES(39855652246200,'batteryFactory','batteryInstance: 777923901') -INSERT INTO DATA VALUES(39855653084000,'batteryFactory','batteryPort: 1762003232') -INSERT INTO DATA VALUES(39855656316700,'BatteryFactory','battery: 1101356399') -INSERT INTO DATA VALUES(39855657085500,'batteryFactory','batteryInstance: 152158609') -INSERT INTO DATA VALUES(39855657677100,'batteryFactory','batteryPort: 884104573') -INSERT INTO DATA VALUES(39855660470000,'BatteryFactory','battery: 232445006') -INSERT INTO DATA VALUES(39855661226700,'batteryFactory','batteryInstance: 23067952') -INSERT INTO DATA VALUES(39855661859400,'batteryFactory','batteryPort: 1856960799') -INSERT INTO DATA VALUES(39855664715500,'BatteryFactory','battery: 95466175') -INSERT INTO DATA VALUES(39855665614200,'batteryFactory','batteryInstance: 2145365199') -INSERT INTO DATA VALUES(39855666309900,'batteryFactory','batteryPort: 544752150') -INSERT INTO DATA VALUES(39855669443500,'BatteryFactory','battery: 546449477') -INSERT INTO DATA VALUES(39855670318100,'batteryFactory','batteryInstance: 981296615') -INSERT INTO DATA VALUES(39855670939400,'batteryFactory','batteryPort: 1957549971') -INSERT INTO DATA VALUES(39855673812000,'BatteryFactory','battery: 613567598') -INSERT INTO DATA VALUES(39855674579300,'batteryFactory','batteryInstance: 1286228828') -INSERT INTO DATA VALUES(39855675138500,'batteryFactory','batteryPort: 725045682') -INSERT INTO DATA VALUES(39855679222000,'ApuOilTankFactory','ApuOilTank: 255640790') -INSERT INTO DATA VALUES(39855679962500,'ApuOilTankFactory','apuOilTankInstance: 2015939974') -INSERT INTO DATA VALUES(39855680593300,'ApuOilTankFactory','apuOilTankPort: 255640790') -INSERT INTO DATA VALUES(39855682870700,'ApuOilTankFactory','ApuOilTank: 567866534') -INSERT INTO DATA VALUES(39855683465600,'ApuOilTankFactory','apuOilTankInstance: 375899495') -INSERT INTO DATA VALUES(39855683917500,'ApuOilTankFactory','apuOilTankPort: 567866534') -INSERT INTO DATA VALUES(39973369998500,'Cockpit','startup') -INSERT INTO DATA VALUES(39973381303100,'Body','receive(Event: Battery - Charge)') -INSERT INTO DATA VALUES(39973384632100,'Body','Battery (percentage): 1') -INSERT INTO DATA VALUES(39973386803900,'Body','Battery (percentage): 1') -INSERT INTO DATA VALUES(39973388931900,'Body','Battery (percentage): 1') -INSERT INTO DATA VALUES(39973390809000,'Body','Battery (percentage): 1') -INSERT INTO DATA VALUES(39973392880400,'Body','Battery (percentage): 1') -INSERT INTO DATA VALUES(39973394904800,'Body','Battery (percentage): 1') -INSERT INTO DATA VALUES(39973396907400,'Body','Battery (percentage): 1') -INSERT INTO DATA VALUES(39973398862600,'Body','Battery (percentage): 1') -INSERT INTO DATA VALUES(39973401062400,'Body','Battery (percentage): 1') -INSERT INTO DATA VALUES(39973403325000,'Body','Battery (percentage): 1') -INSERT INTO DATA VALUES(39973405173900,'Body','Battery (percentage): 1') -INSERT INTO DATA VALUES(39973406987100,'Body','Battery (percentage): 1') -INSERT INTO DATA VALUES(39973409046300,'Body','Battery (percentage): 1') -INSERT INTO DATA VALUES(39973410784600,'Body','Battery (percentage): 1') -INSERT INTO DATA VALUES(39973412738700,'Body','Battery (percentage): 1') -INSERT INTO DATA VALUES(39973414454200,'Body','Battery (percentage): 1') -INSERT INTO DATA VALUES(39973417673800,'Body','Battery (percentage): 1') -INSERT INTO DATA VALUES(39973419254300,'Body','Battery (percentage): 1') -INSERT INTO DATA VALUES(39973420767200,'Body','Battery (percentage): 1') -INSERT INTO DATA VALUES(39973422380600,'Body','Battery (percentage): 1') -INSERT INTO DATA VALUES(39973423909900,'Body','Battery (percentage): 1') -INSERT INTO DATA VALUES(39973425484700,'Body','Battery (percentage): 1') -INSERT INTO DATA VALUES(39973427050600,'Body','Battery (percentage): 1') -INSERT INTO DATA VALUES(39973428538700,'Body','Battery (percentage): 1') -INSERT INTO DATA VALUES(39973431023500,'PrimaryFlightDisplay','chargeBatteryPercentage: 1') -INSERT INTO DATA VALUES(39973433498900,'Body','receive(Event: APUOilTank - IncreaseLevel)') -INSERT INTO DATA VALUES(39973436229900,'Body','APUOilTank (increaseLevel): 100') -INSERT INTO DATA VALUES(39973438162300,'Body','APUOilTank (increaseLevel): 100') -INSERT INTO DATA VALUES(39973439901100,'PrimaryFlightDisplay','increaseLevel: 100') -INSERT INTO DATA VALUES(39975204088000,'Cockpit','taxi') -INSERT INTO DATA VALUES(39975205583300,'Body','receive(Event: Battery - Charge)') -INSERT INTO DATA VALUES(39975206943900,'Body','Battery (percentage): 2') -INSERT INTO DATA VALUES(39975208769200,'Body','Battery (percentage): 2') -INSERT INTO DATA VALUES(39975210373200,'Body','Battery (percentage): 2') -INSERT INTO DATA VALUES(39975211938800,'Body','Battery (percentage): 2') -INSERT INTO DATA VALUES(39975213326400,'Body','Battery (percentage): 2') -INSERT INTO DATA VALUES(39975214687600,'Body','Battery (percentage): 2') -INSERT INTO DATA VALUES(39975216267300,'Body','Battery (percentage): 2') -INSERT INTO DATA VALUES(39975217755400,'Body','Battery (percentage): 2') -INSERT INTO DATA VALUES(39975219190100,'Body','Battery (percentage): 2') -INSERT INTO DATA VALUES(39975221135100,'Body','Battery (percentage): 2') -INSERT INTO DATA VALUES(39975223174500,'Body','Battery (percentage): 2') -INSERT INTO DATA VALUES(39975225130600,'Body','Battery (percentage): 2') -INSERT INTO DATA VALUES(39975226819600,'Body','Battery (percentage): 2') -INSERT INTO DATA VALUES(39975228788700,'Body','Battery (percentage): 2') -INSERT INTO DATA VALUES(39975231076900,'Body','Battery (percentage): 2') -INSERT INTO DATA VALUES(39975232894400,'Body','Battery (percentage): 2') -INSERT INTO DATA VALUES(39975235472000,'Body','Battery (percentage): 2') -INSERT INTO DATA VALUES(39975237467700,'Body','Battery (percentage): 2') -INSERT INTO DATA VALUES(39975238909000,'Body','Battery (percentage): 2') -INSERT INTO DATA VALUES(39975240469700,'Body','Battery (percentage): 2') -INSERT INTO DATA VALUES(39975242044200,'Body','Battery (percentage): 2') -INSERT INTO DATA VALUES(39975243623800,'Body','Battery (percentage): 2') -INSERT INTO DATA VALUES(39975245127900,'Body','Battery (percentage): 2') -INSERT INTO DATA VALUES(39975246926200,'Body','Battery (percentage): 2') -INSERT INTO DATA VALUES(39975248013100,'PrimaryFlightDisplay','chargeBatteryPercentage: 2') -INSERT INTO DATA VALUES(39975249349800,'Body','receive(Event: APUOilTank - IncreaseLevel)') -INSERT INTO DATA VALUES(39975250787600,'Body','APUOilTank (increaseLevel): 200') -INSERT INTO DATA VALUES(39975252177100,'Body','APUOilTank (increaseLevel): 200') -INSERT INTO DATA VALUES(39975253197300,'PrimaryFlightDisplay','increaseLevel: 200') -INSERT INTO DATA VALUES(39975877036900,'Cockpit','takeoff') -INSERT INTO DATA VALUES(39975878505100,'Body','receive(Event: Battery - Charge)') -INSERT INTO DATA VALUES(39975880033600,'Body','Battery (percentage): 3') -INSERT INTO DATA VALUES(39975882094400,'Body','Battery (percentage): 3') -INSERT INTO DATA VALUES(39975883454500,'Body','Battery (percentage): 3') -INSERT INTO DATA VALUES(39975884784200,'Body','Battery (percentage): 3') -INSERT INTO DATA VALUES(39975886061200,'Body','Battery (percentage): 3') -INSERT INTO DATA VALUES(39975887360400,'Body','Battery (percentage): 3') -INSERT INTO DATA VALUES(39975889532300,'Body','Battery (percentage): 3') -INSERT INTO DATA VALUES(39975891055500,'Body','Battery (percentage): 3') -INSERT INTO DATA VALUES(39975892831900,'Body','Battery (percentage): 3') -INSERT INTO DATA VALUES(39975894321800,'Body','Battery (percentage): 3') -INSERT INTO DATA VALUES(39975895716400,'Body','Battery (percentage): 3') -INSERT INTO DATA VALUES(39975897315300,'Body','Battery (percentage): 3') -INSERT INTO DATA VALUES(39975898792000,'Body','Battery (percentage): 3') -INSERT INTO DATA VALUES(39975900456000,'Body','Battery (percentage): 3') -INSERT INTO DATA VALUES(39975902114800,'Body','Battery (percentage): 3') -INSERT INTO DATA VALUES(39975903568000,'Body','Battery (percentage): 3') -INSERT INTO DATA VALUES(39975904937800,'Body','Battery (percentage): 3') -INSERT INTO DATA VALUES(39975907650100,'Body','Battery (percentage): 3') -INSERT INTO DATA VALUES(39975909250300,'Body','Battery (percentage): 3') -INSERT INTO DATA VALUES(39975910568500,'Body','Battery (percentage): 3') -INSERT INTO DATA VALUES(39975911920100,'Body','Battery (percentage): 3') -INSERT INTO DATA VALUES(39975914232800,'Body','Battery (percentage): 3') -INSERT INTO DATA VALUES(39975916929000,'Body','Battery (percentage): 3') -INSERT INTO DATA VALUES(39975919399800,'Body','Battery (percentage): 3') -INSERT INTO DATA VALUES(39975921350700,'PrimaryFlightDisplay','chargeBatteryPercentage: 3') -INSERT INTO DATA VALUES(39975951919000,'Body','receive(Event: APUOilTank - DecreaseLevel)') -INSERT INTO DATA VALUES(39975954194600,'Body','APUOilTank (decreaseLevel): 190') -INSERT INTO DATA VALUES(39975955443600,'Body','APUOilTank (decreaseLevel): 190') -INSERT INTO DATA VALUES(39975956883600,'PrimaryFlightDisplay','decreaseLevel: 190') -INSERT INTO DATA VALUES(39976480384600,'Cockpit','climbing') -INSERT INTO DATA VALUES(39976482116200,'Body','receive(Event: Battery - Charge)') -INSERT INTO DATA VALUES(39976483491700,'Body','Battery (percentage): 4') -INSERT INTO DATA VALUES(39976484984800,'Body','Battery (percentage): 4') -INSERT INTO DATA VALUES(39976486222800,'Body','Battery (percentage): 4') -INSERT INTO DATA VALUES(39976487481700,'Body','Battery (percentage): 4') -INSERT INTO DATA VALUES(39976488690300,'Body','Battery (percentage): 4') -INSERT INTO DATA VALUES(39976489899500,'Body','Battery (percentage): 4') -INSERT INTO DATA VALUES(39976491263800,'Body','Battery (percentage): 4') -INSERT INTO DATA VALUES(39976492544600,'Body','Battery (percentage): 4') -INSERT INTO DATA VALUES(39976494995600,'Body','Battery (percentage): 4') -INSERT INTO DATA VALUES(39976496513800,'Body','Battery (percentage): 4') -INSERT INTO DATA VALUES(39976498061000,'Body','Battery (percentage): 4') -INSERT INTO DATA VALUES(39976499314900,'Body','Battery (percentage): 4') -INSERT INTO DATA VALUES(39976500571900,'Body','Battery (percentage): 4') -INSERT INTO DATA VALUES(39976501803400,'Body','Battery (percentage): 4') -INSERT INTO DATA VALUES(39976503111400,'Body','Battery (percentage): 4') -INSERT INTO DATA VALUES(39976504785000,'Body','Battery (percentage): 4') -INSERT INTO DATA VALUES(39976506426700,'Body','Battery (percentage): 4') -INSERT INTO DATA VALUES(39976509422100,'Body','Battery (percentage): 4') -INSERT INTO DATA VALUES(39976511888700,'Body','Battery (percentage): 4') -INSERT INTO DATA VALUES(39976515091900,'Body','Battery (percentage): 4') -INSERT INTO DATA VALUES(39976516502700,'Body','Battery (percentage): 4') -INSERT INTO DATA VALUES(39976518474000,'Body','Battery (percentage): 4') -INSERT INTO DATA VALUES(39976519807100,'Body','Battery (percentage): 4') -INSERT INTO DATA VALUES(39976521033000,'Body','Battery (percentage): 4') -INSERT INTO DATA VALUES(39976522109700,'PrimaryFlightDisplay','chargeBatteryPercentage: 4') -INSERT INTO DATA VALUES(39976523224700,'Body','receive(Event: APUOilTank - DecreaseLevel)') -INSERT INTO DATA VALUES(39976524593400,'Body','APUOilTank (decreaseLevel): 180') -INSERT INTO DATA VALUES(39976526142400,'Body','APUOilTank (decreaseLevel): 180') -INSERT INTO DATA VALUES(39976527447100,'PrimaryFlightDisplay','decreaseLevel: 180') -INSERT INTO DATA VALUES(39977163156500,'Cockpit','rightTurn') -INSERT INTO DATA VALUES(39977163816400,'Body','receive(Event: Battery - Charge)') -INSERT INTO DATA VALUES(39977164198900,'Body','Battery (percentage): 5') -INSERT INTO DATA VALUES(39977164545400,'Body','Battery (percentage): 5') -INSERT INTO DATA VALUES(39977164893200,'Body','Battery (percentage): 5') -INSERT INTO DATA VALUES(39977165235300,'Body','Battery (percentage): 5') -INSERT INTO DATA VALUES(39977165580500,'Body','Battery (percentage): 5') -INSERT INTO DATA VALUES(39977165903100,'Body','Battery (percentage): 5') -INSERT INTO DATA VALUES(39977166234700,'Body','Battery (percentage): 5') -INSERT INTO DATA VALUES(39977166560600,'Body','Battery (percentage): 5') -INSERT INTO DATA VALUES(39977166877500,'Body','Battery (percentage): 5') -INSERT INTO DATA VALUES(39977167202200,'Body','Battery (percentage): 5') -INSERT INTO DATA VALUES(39977167547900,'Body','Battery (percentage): 5') -INSERT INTO DATA VALUES(39977167881500,'Body','Battery (percentage): 5') -INSERT INTO DATA VALUES(39977168219500,'Body','Battery (percentage): 5') -INSERT INTO DATA VALUES(39977168556500,'Body','Battery (percentage): 5') -INSERT INTO DATA VALUES(39977168863000,'Body','Battery (percentage): 5') -INSERT INTO DATA VALUES(39977169206600,'Body','Battery (percentage): 5') -INSERT INTO DATA VALUES(39977169541900,'Body','Battery (percentage): 5') -INSERT INTO DATA VALUES(39977170169100,'Body','Battery (percentage): 5') -INSERT INTO DATA VALUES(39977170498900,'Body','Battery (percentage): 5') -INSERT INTO DATA VALUES(39977170807300,'Body','Battery (percentage): 5') -INSERT INTO DATA VALUES(39977171176400,'Body','Battery (percentage): 5') -INSERT INTO DATA VALUES(39977171522500,'Body','Battery (percentage): 5') -INSERT INTO DATA VALUES(39977171887000,'Body','Battery (percentage): 5') -INSERT INTO DATA VALUES(39977172220400,'Body','Battery (percentage): 5') -INSERT INTO DATA VALUES(39977172463700,'PrimaryFlightDisplay','chargeBatteryPercentage: 5') -INSERT INTO DATA VALUES(39977172745200,'Body','receive(Event: APUOilTank - DecreaseLevel)') -INSERT INTO DATA VALUES(39977173029700,'Body','APUOilTank (decreaseLevel): 170') -INSERT INTO DATA VALUES(39977173327800,'Body','APUOilTank (decreaseLevel): 170') -INSERT INTO DATA VALUES(39977173569700,'PrimaryFlightDisplay','decreaseLevel: 170') -INSERT INTO DATA VALUES(39977908123800,'Cockpit','leftTurn') -INSERT INTO DATA VALUES(39977909448100,'Body','receive(Event: Battery - Charge)') -INSERT INTO DATA VALUES(39977910388000,'Body','Battery (percentage): 6') -INSERT INTO DATA VALUES(39977911367700,'Body','Battery (percentage): 6') -INSERT INTO DATA VALUES(39977912334500,'Body','Battery (percentage): 6') -INSERT INTO DATA VALUES(39977913452200,'Body','Battery (percentage): 6') -INSERT INTO DATA VALUES(39977914486500,'Body','Battery (percentage): 6') -INSERT INTO DATA VALUES(39977915394300,'Body','Battery (percentage): 6') -INSERT INTO DATA VALUES(39977916252900,'Body','Battery (percentage): 6') -INSERT INTO DATA VALUES(39977917192800,'Body','Battery (percentage): 6') -INSERT INTO DATA VALUES(39977918106500,'Body','Battery (percentage): 6') -INSERT INTO DATA VALUES(39977918998900,'Body','Battery (percentage): 6') -INSERT INTO DATA VALUES(39977919836800,'Body','Battery (percentage): 6') -INSERT INTO DATA VALUES(39977920654400,'Body','Battery (percentage): 6') -INSERT INTO DATA VALUES(39977921569300,'Body','Battery (percentage): 6') -INSERT INTO DATA VALUES(39977922477400,'Body','Battery (percentage): 6') -INSERT INTO DATA VALUES(39977923349800,'Body','Battery (percentage): 6') -INSERT INTO DATA VALUES(39977924162300,'Body','Battery (percentage): 6') -INSERT INTO DATA VALUES(39977925165600,'Body','Battery (percentage): 6') -INSERT INTO DATA VALUES(39977926058400,'Body','Battery (percentage): 6') -INSERT INTO DATA VALUES(39977927867400,'Body','Battery (percentage): 6') -INSERT INTO DATA VALUES(39977929176400,'Body','Battery (percentage): 6') -INSERT INTO DATA VALUES(39977930340300,'Body','Battery (percentage): 6') -INSERT INTO DATA VALUES(39977931524200,'Body','Battery (percentage): 6') -INSERT INTO DATA VALUES(39977932642200,'Body','Battery (percentage): 6') -INSERT INTO DATA VALUES(39977933565800,'Body','Battery (percentage): 6') -INSERT INTO DATA VALUES(39977934530300,'PrimaryFlightDisplay','chargeBatteryPercentage: 6') -INSERT INTO DATA VALUES(39977935352500,'Body','receive(Event: APUOilTank - DecreaseLevel)') -INSERT INTO DATA VALUES(39977936376900,'Body','APUOilTank (decreaseLevel): 160') -INSERT INTO DATA VALUES(39977937277400,'Body','APUOilTank (decreaseLevel): 160') -INSERT INTO DATA VALUES(39977938048000,'PrimaryFlightDisplay','decreaseLevel: 160') -INSERT INTO DATA VALUES(39978552276200,'Cockpit','descent') -INSERT INTO DATA VALUES(39978553590200,'Body','receive(Event: Battery - Charge)') -INSERT INTO DATA VALUES(39978554464100,'Body','Battery (percentage): 7') -INSERT INTO DATA VALUES(39978555536300,'Body','Battery (percentage): 7') -INSERT INTO DATA VALUES(39978556429500,'Body','Battery (percentage): 7') -INSERT INTO DATA VALUES(39978557342300,'Body','Battery (percentage): 7') -INSERT INTO DATA VALUES(39978558252100,'Body','Battery (percentage): 7') -INSERT INTO DATA VALUES(39978559208100,'Body','Battery (percentage): 7') -INSERT INTO DATA VALUES(39978560121200,'Body','Battery (percentage): 7') -INSERT INTO DATA VALUES(39978561051300,'Body','Battery (percentage): 7') -INSERT INTO DATA VALUES(39978561886000,'Body','Battery (percentage): 7') -INSERT INTO DATA VALUES(39978562709100,'Body','Battery (percentage): 7') -INSERT INTO DATA VALUES(39978563594700,'Body','Battery (percentage): 7') -INSERT INTO DATA VALUES(39978564448200,'Body','Battery (percentage): 7') -INSERT INTO DATA VALUES(39978565271800,'Body','Battery (percentage): 7') -INSERT INTO DATA VALUES(39978566242200,'Body','Battery (percentage): 7') -INSERT INTO DATA VALUES(39978567064700,'Body','Battery (percentage): 7') -INSERT INTO DATA VALUES(39978567887700,'Body','Battery (percentage): 7') -INSERT INTO DATA VALUES(39978568844800,'Body','Battery (percentage): 7') -INSERT INTO DATA VALUES(39978569913100,'Body','Battery (percentage): 7') -INSERT INTO DATA VALUES(39978571850500,'Body','Battery (percentage): 7') -INSERT INTO DATA VALUES(39978572790500,'Body','Battery (percentage): 7') -INSERT INTO DATA VALUES(39978574124700,'Body','Battery (percentage): 7') -INSERT INTO DATA VALUES(39978575264500,'Body','Battery (percentage): 7') -INSERT INTO DATA VALUES(39978576251000,'Body','Battery (percentage): 7') -INSERT INTO DATA VALUES(39978577332700,'Body','Battery (percentage): 7') -INSERT INTO DATA VALUES(39978578049200,'PrimaryFlightDisplay','chargeBatteryPercentage: 7') -INSERT INTO DATA VALUES(39978578879800,'Body','receive(Event: APUOilTank - DecreaseLevel)') -INSERT INTO DATA VALUES(39978579753100,'Body','APUOilTank (decreaseLevel): 150') -INSERT INTO DATA VALUES(39978580659000,'Body','APUOilTank (decreaseLevel): 150') -INSERT INTO DATA VALUES(39978581337600,'PrimaryFlightDisplay','decreaseLevel: 150') -INSERT INTO DATA VALUES(39979266591200,'Cockpit','landing') -INSERT INTO DATA VALUES(39979268023400,'Body','receive(Event: Battery - Charge)') -INSERT INTO DATA VALUES(39979269046000,'Body','Battery (percentage): 8') -INSERT INTO DATA VALUES(39979270456900,'Body','Battery (percentage): 8') -INSERT INTO DATA VALUES(39979271817400,'Body','Battery (percentage): 8') -INSERT INTO DATA VALUES(39979272965300,'Body','Battery (percentage): 8') -INSERT INTO DATA VALUES(39979274014100,'Body','Battery (percentage): 8') -INSERT INTO DATA VALUES(39979275024300,'Body','Battery (percentage): 8') -INSERT INTO DATA VALUES(39979275908800,'Body','Battery (percentage): 8') -INSERT INTO DATA VALUES(39979277045400,'Body','Battery (percentage): 8') -INSERT INTO DATA VALUES(39979278615000,'Body','Battery (percentage): 8') -INSERT INTO DATA VALUES(39979279633800,'Body','Battery (percentage): 8') -INSERT INTO DATA VALUES(39979280580600,'Body','Battery (percentage): 8') -INSERT INTO DATA VALUES(39979281425100,'Body','Battery (percentage): 8') -INSERT INTO DATA VALUES(39979282293600,'Body','Battery (percentage): 8') -INSERT INTO DATA VALUES(39979283331800,'Body','Battery (percentage): 8') -INSERT INTO DATA VALUES(39979284347000,'Body','Battery (percentage): 8') -INSERT INTO DATA VALUES(39979285277000,'Body','Battery (percentage): 8') -INSERT INTO DATA VALUES(39979286109600,'Body','Battery (percentage): 8') -INSERT INTO DATA VALUES(39979286982400,'Body','Battery (percentage): 8') -INSERT INTO DATA VALUES(39979288726800,'Body','Battery (percentage): 8') -INSERT INTO DATA VALUES(39979289567700,'Body','Battery (percentage): 8') -INSERT INTO DATA VALUES(39979290715400,'Body','Battery (percentage): 8') -INSERT INTO DATA VALUES(39979291620700,'Body','Battery (percentage): 8') -INSERT INTO DATA VALUES(39979292749100,'Body','Battery (percentage): 8') -INSERT INTO DATA VALUES(39979293614300,'Body','Battery (percentage): 8') -INSERT INTO DATA VALUES(39979294464900,'PrimaryFlightDisplay','chargeBatteryPercentage: 8') -INSERT INTO DATA VALUES(39979295297600,'Body','receive(Event: APUOilTank - DecreaseLevel)') -INSERT INTO DATA VALUES(39979296099100,'Body','APUOilTank (decreaseLevel): 140') -INSERT INTO DATA VALUES(39979296931400,'Body','APUOilTank (decreaseLevel): 140') -INSERT INTO DATA VALUES(39979297605400,'PrimaryFlightDisplay','decreaseLevel: 140') -INSERT INTO DATA VALUES(39979938183200,'Cockpit','shutdown') -INSERT INTO DATA VALUES(39979940982100,'Body','receive(Event: Battery - Discharge)') -INSERT INTO DATA VALUES(39979943334900,'Body','Battery (percentage): 0') -INSERT INTO DATA VALUES(39979944353200,'Body','Battery (percentage): 0') -INSERT INTO DATA VALUES(39979945294200,'Body','Battery (percentage): 0') -INSERT INTO DATA VALUES(39979946124500,'Body','Battery (percentage): 0') -INSERT INTO DATA VALUES(39979947127400,'Body','Battery (percentage): 0') -INSERT INTO DATA VALUES(39979947965700,'Body','Battery (percentage): 0') -INSERT INTO DATA VALUES(39979949152200,'Body','Battery (percentage): 0') -INSERT INTO DATA VALUES(39979950101100,'Body','Battery (percentage): 0') -INSERT INTO DATA VALUES(39979950983000,'Body','Battery (percentage): 0') -INSERT INTO DATA VALUES(39979951939000,'Body','Battery (percentage): 0') -INSERT INTO DATA VALUES(39979952794600,'Body','Battery (percentage): 0') -INSERT INTO DATA VALUES(39979953685200,'Body','Battery (percentage): 0') -INSERT INTO DATA VALUES(39979954531800,'Body','Battery (percentage): 0') -INSERT INTO DATA VALUES(39979955398800,'Body','Battery (percentage): 0') -INSERT INTO DATA VALUES(39979956232200,'Body','Battery (percentage): 0') -INSERT INTO DATA VALUES(39979957116200,'Body','Battery (percentage): 0') -INSERT INTO DATA VALUES(39979958060100,'Body','Battery (percentage): 0') -INSERT INTO DATA VALUES(39979958929400,'Body','Battery (percentage): 0') -INSERT INTO DATA VALUES(39979960871200,'Body','Battery (percentage): 0') -INSERT INTO DATA VALUES(39979961923100,'Body','Battery (percentage): 0') -INSERT INTO DATA VALUES(39979962813600,'Body','Battery (percentage): 0') -INSERT INTO DATA VALUES(39979963693700,'Body','Battery (percentage): 0') -INSERT INTO DATA VALUES(39979964568400,'Body','Battery (percentage): 0') -INSERT INTO DATA VALUES(39979965393400,'Body','Battery (percentage): 0') -INSERT INTO DATA VALUES(39979966888800,'PrimaryFlightDisplay','dischargeBatteryPercentage: 0') -INSERT INTO DATA VALUES(39979967772600,'Body','receive(Event: APUOilTank - DecreaseLevel)') -INSERT INTO DATA VALUES(39979968576200,'Body','APUOilTank (decreaseLevel): 130') -INSERT INTO DATA VALUES(39979969372400,'Body','APUOilTank (decreaseLevel): 130') -INSERT INTO DATA VALUES(39979969972300,'PrimaryFlightDisplay','decreaseLevel: 130') +INSERT INTO DATA VALUES(48560815206500,'BatteryFactory','battery: 2042979183') +INSERT INTO DATA VALUES(48560815505400,'batteryFactory','batteryInstance: 1561347421') +INSERT INTO DATA VALUES(48560815657400,'batteryFactory','batteryPort: 1398508580') +INSERT INTO DATA VALUES(48560817427100,'BatteryFactory','battery: 346377974') +INSERT INTO DATA VALUES(48560818816600,'batteryFactory','batteryInstance: 23053378') +INSERT INTO DATA VALUES(48560819231300,'batteryFactory','batteryPort: 1060928475') +INSERT INTO DATA VALUES(48560823411900,'BatteryFactory','battery: 1536728519') +INSERT INTO DATA VALUES(48560824796300,'batteryFactory','batteryInstance: 298724898') +INSERT INTO DATA VALUES(48560825457600,'batteryFactory','batteryPort: 1671811074') +INSERT INTO DATA VALUES(48560829219400,'BatteryFactory','battery: 353206468') +INSERT INTO DATA VALUES(48560829596200,'batteryFactory','batteryInstance: 68217166') +INSERT INTO DATA VALUES(48560829852700,'batteryFactory','batteryPort: 761863997') +INSERT INTO DATA VALUES(48560833348500,'BatteryFactory','battery: 1897221921') +INSERT INTO DATA VALUES(48560833972200,'batteryFactory','batteryInstance: 78265654') +INSERT INTO DATA VALUES(48560834351200,'batteryFactory','batteryPort: 47268007') +INSERT INTO DATA VALUES(48560837352300,'BatteryFactory','battery: 2124731287') +INSERT INTO DATA VALUES(48560837734500,'batteryFactory','batteryInstance: 1744713739') +INSERT INTO DATA VALUES(48560838036800,'batteryFactory','batteryPort: 1244815033') +INSERT INTO DATA VALUES(48560840832800,'BatteryFactory','battery: 495051009') +INSERT INTO DATA VALUES(48560841258100,'batteryFactory','batteryInstance: 828610686') +INSERT INTO DATA VALUES(48560841538200,'batteryFactory','batteryPort: 1811942924') +INSERT INTO DATA VALUES(48560844019100,'BatteryFactory','battery: 10405169') +INSERT INTO DATA VALUES(48560844366700,'batteryFactory','batteryInstance: 1837533591') +INSERT INTO DATA VALUES(48560844596500,'batteryFactory','batteryPort: 741883443') +INSERT INTO DATA VALUES(48560846933500,'BatteryFactory','battery: 2081269248') +INSERT INTO DATA VALUES(48560847305800,'batteryFactory','batteryInstance: 235162442') +INSERT INTO DATA VALUES(48560847533700,'batteryFactory','batteryPort: 296234255') +INSERT INTO DATA VALUES(48560850003100,'BatteryFactory','battery: 962700314') +INSERT INTO DATA VALUES(48560850341800,'batteryFactory','batteryInstance: 249515830') +INSERT INTO DATA VALUES(48560850510500,'batteryFactory','batteryPort: 43856716') +INSERT INTO DATA VALUES(48560852032200,'BatteryFactory','battery: 109065770') +INSERT INTO DATA VALUES(48560852287800,'batteryFactory','batteryInstance: 1401737458') +INSERT INTO DATA VALUES(48560852438300,'batteryFactory','batteryPort: 37268876') +INSERT INTO DATA VALUES(48560853931300,'BatteryFactory','battery: 485047320') +INSERT INTO DATA VALUES(48560854201400,'batteryFactory','batteryInstance: 2112135199') +INSERT INTO DATA VALUES(48560854335000,'batteryFactory','batteryPort: 738111983') +INSERT INTO DATA VALUES(48560856108300,'BatteryFactory','battery: 151515831') +INSERT INTO DATA VALUES(48560856372100,'batteryFactory','batteryInstance: 810262298') +INSERT INTO DATA VALUES(48560856529600,'batteryFactory','batteryPort: 1969856053') +INSERT INTO DATA VALUES(48560858729000,'BatteryFactory','battery: 1850646717') +INSERT INTO DATA VALUES(48560859183700,'batteryFactory','batteryInstance: 619241052') +INSERT INTO DATA VALUES(48560859409100,'batteryFactory','batteryPort: 1677984391') +INSERT INTO DATA VALUES(48560861396400,'BatteryFactory','battery: 969811954') +INSERT INTO DATA VALUES(48560861756700,'batteryFactory','batteryInstance: 951677655') +INSERT INTO DATA VALUES(48560861937200,'batteryFactory','batteryPort: 1396292525') +INSERT INTO DATA VALUES(48560864116600,'BatteryFactory','battery: 1191874608') +INSERT INTO DATA VALUES(48560865633200,'batteryFactory','batteryInstance: 2144334265') +INSERT INTO DATA VALUES(48560865816700,'batteryFactory','batteryPort: 1769227988') +INSERT INTO DATA VALUES(48560871926100,'BatteryFactory','battery: 1968196847') +INSERT INTO DATA VALUES(48560872630400,'batteryFactory','batteryInstance: 327840833') +INSERT INTO DATA VALUES(48560872816000,'batteryFactory','batteryPort: 136312946') +INSERT INTO DATA VALUES(48560880621700,'BatteryFactory','battery: 855501888') +INSERT INTO DATA VALUES(48560881413000,'batteryFactory','batteryInstance: 701724503') +INSERT INTO DATA VALUES(48560881939800,'batteryFactory','batteryPort: 83674409') +INSERT INTO DATA VALUES(48560886318800,'BatteryFactory','battery: 845388562') +INSERT INTO DATA VALUES(48560887235100,'batteryFactory','batteryInstance: 1340086277') +INSERT INTO DATA VALUES(48560887611100,'batteryFactory','batteryPort: 1427247001') +INSERT INTO DATA VALUES(48560891663300,'BatteryFactory','battery: 648358364') +INSERT INTO DATA VALUES(48560892002100,'batteryFactory','batteryInstance: 2065886345') +INSERT INTO DATA VALUES(48560892210900,'batteryFactory','batteryPort: 2030121719') +INSERT INTO DATA VALUES(48560895237600,'BatteryFactory','battery: 195163481') +INSERT INTO DATA VALUES(48560895685600,'batteryFactory','batteryInstance: 1335914322') +INSERT INTO DATA VALUES(48560895920100,'batteryFactory','batteryPort: 1613514326') +INSERT INTO DATA VALUES(48560898643700,'BatteryFactory','battery: 2114687352') +INSERT INTO DATA VALUES(48560899045900,'batteryFactory','batteryInstance: 1323514615') +INSERT INTO DATA VALUES(48560899271800,'batteryFactory','batteryPort: 1795468466') +INSERT INTO DATA VALUES(48560901401000,'BatteryFactory','battery: 310212872') +INSERT INTO DATA VALUES(48560901782200,'batteryFactory','batteryInstance: 1306085976') +INSERT INTO DATA VALUES(48560902045400,'batteryFactory','batteryPort: 793319856') +INSERT INTO DATA VALUES(48560903983500,'BatteryFactory','battery: 742568993') +INSERT INTO DATA VALUES(48560904307300,'batteryFactory','batteryInstance: 669700766') +INSERT INTO DATA VALUES(48560904474700,'batteryFactory','batteryPort: 1275464847') +INSERT INTO DATA VALUES(48560905270400,'Cockpit','shutdown') +INSERT INTO DATA VALUES(48560905629300,'Body','receive(Event: Battery - Discharge)') +INSERT INTO DATA VALUES(48560905915500,'Body','Battery (percentage): 0') +INSERT INTO DATA VALUES(48560906161400,'Body','Battery (percentage): 0') +INSERT INTO DATA VALUES(48560906384000,'Body','Battery (percentage): 0') +INSERT INTO DATA VALUES(48560906611000,'Body','Battery (percentage): 0') +INSERT INTO DATA VALUES(48560906823400,'Body','Battery (percentage): 0') +INSERT INTO DATA VALUES(48560907050100,'Body','Battery (percentage): 0') +INSERT INTO DATA VALUES(48560907314900,'Body','Battery (percentage): 0') +INSERT INTO DATA VALUES(48560907571400,'Body','Battery (percentage): 0') +INSERT INTO DATA VALUES(48560907779900,'Body','Battery (percentage): 0') +INSERT INTO DATA VALUES(48560908030600,'Body','Battery (percentage): 0') +INSERT INTO DATA VALUES(48560908263500,'Body','Battery (percentage): 0') +INSERT INTO DATA VALUES(48560908446700,'Body','Battery (percentage): 0') +INSERT INTO DATA VALUES(48560908691200,'Body','Battery (percentage): 0') +INSERT INTO DATA VALUES(48560908938100,'Body','Battery (percentage): 0') +INSERT INTO DATA VALUES(48560909320200,'Body','Battery (percentage): 0') +INSERT INTO DATA VALUES(48560909548900,'Body','Battery (percentage): 0') +INSERT INTO DATA VALUES(48560909761500,'Body','Battery (percentage): 0') +INSERT INTO DATA VALUES(48560909971000,'Body','Battery (percentage): 0') +INSERT INTO DATA VALUES(48560910298000,'Body','Battery (percentage): 0') +INSERT INTO DATA VALUES(48560911028800,'Body','Battery (percentage): 0') +INSERT INTO DATA VALUES(48560911363400,'Body','Battery (percentage): 0') +INSERT INTO DATA VALUES(48560911530600,'Body','Battery (percentage): 0') +INSERT INTO DATA VALUES(48560911677900,'Body','Battery (percentage): 0') +INSERT INTO DATA VALUES(48560911811800,'Body','Battery (percentage): 0') +INSERT INTO DATA VALUES(48560911898900,'PrimaryFlightDisplay','dischargeBatteryPercentage: 0') diff --git a/src/base/Airplane.java b/src/base/Airplane.java index 8392e82..2892839 100644 --- a/src/base/Airplane.java +++ b/src/base/Airplane.java @@ -37,63 +37,49 @@ public void build() { public void startup() { // battery eventBus.post(new BatteryCharge()); - //apu_oil_tank - eventBus.post(new APUOilTankIncreaseLevel(100)); + } public void taxi() { // battery - eventBus.post(new BatteryCharge()); - //apu_oil_tank - eventBus.post(new APUOilTankIncreaseLevel(100)); + eventBus.post(new BatteryDischarge()); + } public void takeoff() { // battery - eventBus.post(new BatteryCharge()); - //apu_oil_tank - eventBus.post(new APUOilTankDecreaseLevel(1)); + eventBus.post(new BatteryDischarge()); + } public void climbing() { // battery - eventBus.post(new BatteryCharge()); - //apu_oil_tank - eventBus.post(new APUOilTankDecreaseLevel(10)); + eventBus.post(new BatteryDischarge()); + } public void rightTurn() { // battery - eventBus.post(new BatteryCharge()); - //apu_oil_tank - eventBus.post(new APUOilTankDecreaseLevel(10));; + eventBus.post(new BatteryDischarge()); } public void leftTurn() { // battery - eventBus.post(new BatteryCharge()); - //apu_oil_tank - eventBus.post(new APUOilTankDecreaseLevel(20)); + eventBus.post(new BatteryDischarge()); } public void descent() { // battery - eventBus.post(new BatteryCharge()); - //apu_oil_tank - eventBus.post(new APUOilTankDecreaseLevel(10)); + eventBus.post(new BatteryDischarge()); } public void landing() { // battery - eventBus.post(new BatteryCharge()); - //apu_oil_tank - eventBus.post(new APUOilTankDecreaseLevel(10)); + eventBus.post(new BatteryDischarge()); } public void shutdown() { // battery eventBus.post(new BatteryDischarge()); - //apu_oil_tank - eventBus.post(new APUOilTankDecreaseLevel(10)); } } \ No newline at end of file diff --git a/src/base/PrimaryFlightDisplayGUI.java b/src/base/PrimaryFlightDisplayGUI.java index b519056..4c129a7 100644 --- a/src/base/PrimaryFlightDisplayGUI.java +++ b/src/base/PrimaryFlightDisplayGUI.java @@ -21,7 +21,6 @@ public class PrimaryFlightDisplayGUI extends Application { private ComboBox batteryComboBox; - private ComboBox apuOilTankComboBox; private TableView tableView; private ArrayList dataList; private ObservableList data; @@ -29,9 +28,6 @@ public class PrimaryFlightDisplayGUI extends Application { //battery private PrimaryFlightDisplayEntry batteryEntry; - //apu_oil_tank - private PrimaryFlightDisplayEntry apuOilTankEntry; - public static void main(String... args) { LogEngine.instance.init(); FlightRecorder.instance.startup(); @@ -191,16 +187,6 @@ public GridPane buildVisualView() { batteryComboBox.setEditable(false); gridPane.add(batteryComboBox, 7, 0); - //apu_oil_tank - Label apuOilTankStatusLabel = new Label("APUOilTankStatus : "); - gridPane.add(apuOilTankStatusLabel, 9, 0); - - apuOilTankComboBox = new ComboBox<>(); - apuOilTankComboBox.getItems().addAll("0", "50","100"); - apuOilTankComboBox.setValue("0"); - apuOilTankComboBox.setEditable(false); - gridPane.add(apuOilTankComboBox, 10, 0); - return gridPane; } @@ -227,23 +213,12 @@ public void setBatteryStatus(int percentage) { batteryComboBox.setEditable(false); } - public void setApuOilTankStatus(int percentage) { - apuOilTankComboBox.getItems().addAll(Integer.toString(percentage)); - apuOilTankComboBox.setValue(Integer.toString(percentage)); - apuOilTankComboBox.setEditable(false); - } - private void initData() { dataList = new ArrayList<>(); - // battery batteryEntry = new PrimaryFlightDisplayEntry("BatteryStatus", Integer.toString(PrimaryFlightDisplay.instance.percentage)); dataList.add(batteryEntry); - //apu_oil_tank - apuOilTankEntry = new PrimaryFlightDisplayEntry("APUOilTankStatus",Integer.toString(PrimaryFlightDisplay.instance.level)); - dataList.add(apuOilTankEntry); - } private ObservableList getInitialTableData() { @@ -258,9 +233,5 @@ public void update() { setBatteryStatus(PrimaryFlightDisplay.instance.percentage); tableView.refresh(); - //apu_oil_tank - apuOilTankEntry.setValue(Integer.toString(PrimaryFlightDisplay.instance.level)); - setApuOilTankStatus(PrimaryFlightDisplay.instance.level); - tableView.refresh(); } } \ No newline at end of file diff --git a/src/factory/ApuOilTankFactory.java b/src/factory/ApuOilTankFactory.java deleted file mode 100644 index c1a45d4..0000000 --- a/src/factory/ApuOilTankFactory.java +++ /dev/null @@ -1,31 +0,0 @@ -package factory; - -import configuration.Configuration; -import recorder.FlightRecorder; - -import java.io.File; -import java.net.URL; -import java.net.URLClassLoader; - -public class ApuOilTankFactory { - public static Object build() { - Object apuOilTankPort = null; - - try { - URL[] urlList = {new File(Configuration.instance.pathToApuOilTankJavaArchive).toURI().toURL()}; - URLClassLoader urlLoader = new URLClassLoader(urlList, ApuOilTankFactory.class.getClassLoader()); - Class apuoiltank = Class.forName("APUOilTank", true, urlLoader); - FlightRecorder.instance.insert("ApuOilTankFactory", "ApuOilTank: " + apuoiltank.hashCode()); - - Object apuoiltankInstance = apuoiltank.getMethod("getInstance").invoke(null); - FlightRecorder.instance.insert("ApuOilTankFactory", "apuOilTankInstance: " + apuoiltankInstance.hashCode()); - - apuOilTankPort = apuoiltank.getDeclaredField("port").get(apuoiltankInstance); - FlightRecorder.instance.insert("ApuOilTankFactory","apuOilTankPort: "+apuoiltank.hashCode()); - } catch (Exception e) { - e.printStackTrace(); - } - - return apuOilTankPort; - } -} \ No newline at end of file diff --git a/src/section/Body.java b/src/section/Body.java index 6ab7d0e..d88de65 100644 --- a/src/section/Body.java +++ b/src/section/Body.java @@ -9,7 +9,6 @@ import event.apu_oil_tank.APUOilTankDecreaseLevel; import event.apu_oil_tank.APUOilTankIncreaseLevel; import factory.BatteryFactory; -import factory.ApuOilTankFactory; import logging.LogEngine; import recorder.FlightRecorder; @@ -18,11 +17,10 @@ public class Body extends Subscriber { private ArrayList batteryPortList; - private ArrayList apuOilTankPortList; + public Body() { batteryPortList = new ArrayList<>(); - apuOilTankPortList = new ArrayList<>(); build(); } @@ -32,10 +30,7 @@ public void build() { { batteryPortList.add(BatteryFactory.build()); } - for(int j = 0; j < Configuration.instance.numberOfApuOilTank;j++) - { - apuOilTankPortList.add(ApuOilTankFactory.build()); - } + } // --- Battery ----------------------------------------------------------------------------------------------- @@ -91,58 +86,7 @@ public void receive(BatteryDischarge batteryDischarge) { FlightRecorder.instance.insert("PrimaryFlightDisplay", "dischargeBatteryPercentage: " + PrimaryFlightDisplay.instance.percentage); } - // --- APUOilTank ----------------------------------------------------------------------------------------------- - @Subscribe - public void receive(APUOilTankIncreaseLevel apuOilTankIncreaseLevel) { - LogEngine.instance.write("+ Body.receive(" + apuOilTankIncreaseLevel.toString() + ")"); - FlightRecorder.instance.insert("Body", "receive(" + apuOilTankIncreaseLevel.toString() + ")"); - - try { - for (int i = 0; i < Configuration.instance.numberOfApuOilTank; i++) { - Method onMethod = apuOilTankPortList.get(i).getClass().getDeclaredMethod("increase",int.class); - LogEngine.instance.write("onMethod = " + onMethod); - - int level = (int) onMethod.invoke(apuOilTankPortList.get(i),100); - LogEngine.instance.write("increaseLevel = " + level); - - PrimaryFlightDisplay.instance.level = level; - FlightRecorder.instance.insert("Body", "APUOilTank (increaseLevel): " + level); - - LogEngine.instance.write("+"); - } - } catch (Exception e) { - System.out.println(e.getMessage()); - } - - LogEngine.instance.write("PrimaryFlightDisplay (increaseLevel): " + PrimaryFlightDisplay.instance.level); - FlightRecorder.instance.insert("PrimaryFlightDisplay", "increaseLevel: " + PrimaryFlightDisplay.instance.level); - } - - @Subscribe - public void receive(APUOilTankDecreaseLevel apuOilTankDecreaseLevel) { - LogEngine.instance.write("+ Body.receive(" + apuOilTankDecreaseLevel.toString() + ")"); - FlightRecorder.instance.insert("Body", "receive(" + apuOilTankDecreaseLevel.toString() + ")"); - - try { - for (int i = 0; i < Configuration.instance.numberOfApuOilTank; i++) { - Method onMethod = apuOilTankPortList.get(i).getClass().getDeclaredMethod("decrease",int.class); - LogEngine.instance.write("onMethod = " + onMethod); - - int level = (int) onMethod.invoke(apuOilTankPortList.get(i),10); - LogEngine.instance.write("decreaseLevel = " + level); - PrimaryFlightDisplay.instance.level = level; - FlightRecorder.instance.insert("Body", "APUOilTank (decreaseLevel): " + level); - - LogEngine.instance.write("+"); - } - } catch (Exception e) { - System.out.println(e.getMessage()); - } - - LogEngine.instance.write("PrimaryFlightDisplay (decreaseLevel): " + PrimaryFlightDisplay.instance.level); - FlightRecorder.instance.insert("PrimaryFlightDisplay", "decreaseLevel: " + PrimaryFlightDisplay.instance.level); - } // @Subscribe // public void receive(WeatherRadarScan weatherRadarScan) { diff --git a/src/test/ProcedureTest.java b/src/test/ProcedureTest.java index e01a14a..8fa3bf3 100644 --- a/src/test/ProcedureTest.java +++ b/src/test/ProcedureTest.java @@ -32,9 +32,8 @@ public void startUpTest() { cockpit.startup(); // battery - assertNotEquals(0,PrimaryFlightDisplay.instance.percentage); - //apu_oil_tank - assertNotEquals(0,PrimaryFlightDisplay.instance.level); + assertEquals(100,PrimaryFlightDisplay.instance.percentage); + } @Test @@ -43,9 +42,8 @@ public void taxiTest() { cockpit.taxi(); // battery - assertNotEquals(0,PrimaryFlightDisplay.instance.percentage); - //apu_oil_tank - assertNotEquals(0,PrimaryFlightDisplay.instance.level);; + assertNotEquals(100,PrimaryFlightDisplay.instance.percentage); + } @Test @@ -53,9 +51,8 @@ public void taxiTest() { public void takeOffTest() { cockpit.takeoff(); // battery - assertNotEquals(0,PrimaryFlightDisplay.instance.percentage); - //apu_oil_tank - assertNotEquals(0,PrimaryFlightDisplay.instance.level); + assertNotEquals(100,PrimaryFlightDisplay.instance.percentage); + } @Test @@ -63,9 +60,8 @@ public void takeOffTest() { public void climbingTest() { cockpit.climbing(); // battery - assertNotEquals(0,PrimaryFlightDisplay.instance.percentage); - //apu_oil_tank - assertNotEquals(0,PrimaryFlightDisplay.instance.level); + assertNotEquals(100,PrimaryFlightDisplay.instance.percentage); + } @Test @@ -73,9 +69,8 @@ public void climbingTest() { public void rightTurnTest() { cockpit.rightTurn(); // battery - assertNotEquals(0,PrimaryFlightDisplay.instance.percentage); - //apu_oil_tank - assertNotEquals(0,PrimaryFlightDisplay.instance.level); + assertNotEquals(100,PrimaryFlightDisplay.instance.percentage); + } @Test @@ -83,9 +78,7 @@ public void rightTurnTest() { public void leftTurnTest() { cockpit.leftTurn(); // battery - assertNotEquals(0,PrimaryFlightDisplay.instance.percentage); - //apu_oil_tank - assertNotEquals(0,PrimaryFlightDisplay.instance.level); + assertNotEquals(100,PrimaryFlightDisplay.instance.percentage); } @Test @@ -93,9 +86,8 @@ public void leftTurnTest() { public void descentTest() { cockpit.descent(); // battery - assertNotEquals(0,PrimaryFlightDisplay.instance.percentage); - //apu_oil_tank - assertNotEquals(0,PrimaryFlightDisplay.instance.level); + assertNotEquals(100,PrimaryFlightDisplay.instance.percentage); + } @Test @@ -103,9 +95,8 @@ public void descentTest() { public void landingTest() { cockpit.landing(); // battery - assertNotEquals(0,PrimaryFlightDisplay.instance.percentage); - //apu_oil_tank - assertNotEquals(0,PrimaryFlightDisplay.instance.level); + assertNotEquals(100,PrimaryFlightDisplay.instance.percentage); + } @Test @@ -113,8 +104,7 @@ public void landingTest() { public void shutdownTest() { cockpit.shutdown(); // battery - assertNotEquals(1,PrimaryFlightDisplay.instance.percentage); - //apu_oil_tank - assertNotEquals(100,PrimaryFlightDisplay.instance.level); + assertNotEquals(100,PrimaryFlightDisplay.instance.percentage); + } } \ No newline at end of file diff --git a/src/test/TestAPUOilTank.java b/src/test/TestAPUOilTank.java deleted file mode 100644 index c13ccb3..0000000 --- a/src/test/TestAPUOilTank.java +++ /dev/null @@ -1,194 +0,0 @@ -package test; - -import base.PrimaryFlightDisplay; -import factory.ApuOilTankFactory; -import factory.BatteryFactory; -import logging.LogEngine; -import org.junit.jupiter.api.AfterEach; -import org.junit.jupiter.api.BeforeEach; -import org.junit.jupiter.api.Test; -import recorder.FlightRecorder; - -import java.lang.reflect.Method; - -import static org.junit.jupiter.api.Assertions.*; - -class TestAPUOilTank { - private Object componentPort; - - @BeforeEach - public void init() { - LogEngine.instance.init(); - FlightRecorder.instance.startup(); - FlightRecorder.instance.init(); - } - - @Test - public void factory() { - componentPort = ApuOilTankFactory.build(); - assertNotNull(componentPort); - } - - @Test - public void methods() { - componentPort = ApuOilTankFactory.build(); - try { - Method onMethod = componentPort.getClass().getDeclaredMethod("increase",int.class); - assertNotNull(onMethod); - - Method offMethod = componentPort.getClass().getDeclaredMethod("decrease",int.class); - assertNotNull(offMethod); - - } catch (Exception e) { - System.out.println(e.getMessage()); - } - } - - @Test - public void Increase() { - componentPort = ApuOilTankFactory.build(); - try { - Method onMethod = componentPort.getClass().getDeclaredMethod("increase",int.class); - int level = (int) onMethod.invoke(componentPort,100); - assertEquals(100,level); - } catch (Exception e) { - System.out.println(e.getMessage()); - } - } - - @Test - public void Decrease() { - componentPort = ApuOilTankFactory.build(); - try { - Method onMethod = componentPort.getClass().getDeclaredMethod("decrease",int.class); - int level = (int) onMethod.invoke(componentPort,10); - assertNotEquals(100,level); - } catch (Exception e) { - System.out.println(e.getMessage()); - } - } - - @Test - public void startup() { - componentPort = ApuOilTankFactory.build(); - try { - Method onMethod = componentPort.getClass().getDeclaredMethod("increase",int.class); - int level = (int) onMethod.invoke(componentPort,100); - PrimaryFlightDisplay.instance.level = level; - assertNotEquals(0,PrimaryFlightDisplay.instance.level); - } catch (Exception e) { - System.out.println(e.getMessage()); - } - } - - @Test - public void taxi() { - componentPort = ApuOilTankFactory.build(); - try { - Method onMethod = componentPort.getClass().getDeclaredMethod("decrease",int.class); - int level = (int) onMethod.invoke(componentPort,1); - PrimaryFlightDisplay.instance.level = level; - assertNotEquals(0,PrimaryFlightDisplay.instance.level); - } catch (Exception e) { - System.out.println(e.getMessage()); - } - } - - @Test - public void takeoff() { - componentPort = ApuOilTankFactory.build(); - try { - Method onMethod = componentPort.getClass().getDeclaredMethod("decrease",int.class); - int level = (int) onMethod.invoke(componentPort,1); - PrimaryFlightDisplay.instance.level = level; - assertNotEquals(0,PrimaryFlightDisplay.instance.level); - } catch (Exception e) { - System.out.println(e.getMessage()); - } - } - - @Test - public void climbing() { - componentPort = ApuOilTankFactory.build(); - try { - Method onMethod = componentPort.getClass().getDeclaredMethod("decrease",int.class); - int level = (int) onMethod.invoke(componentPort,10); - PrimaryFlightDisplay.instance.level = level; - assertNotEquals(0,PrimaryFlightDisplay.instance.level); - } catch (Exception e) { - System.out.println(e.getMessage()); - } - } - - @Test - public void rightTurn() { - componentPort = ApuOilTankFactory.build(); - try { - Method onMethod = componentPort.getClass().getDeclaredMethod("decrease",int.class); - int level = (int) onMethod.invoke(componentPort,10); - PrimaryFlightDisplay.instance.level = level; - assertNotEquals(0,PrimaryFlightDisplay.instance.level); - } catch (Exception e) { - System.out.println(e.getMessage()); - } - } - - @Test - public void leftTurn() { - componentPort = BatteryFactory.build(); - try { - Method onMethod = componentPort.getClass().getDeclaredMethod("decrease",int.class); - int level = (int) onMethod.invoke(componentPort,10); - PrimaryFlightDisplay.instance.level = level; - assertNotEquals(0,PrimaryFlightDisplay.instance.level); - } catch (Exception e) { - System.out.println(e.getMessage()); - } - } - - @Test - public void descent() { - componentPort = ApuOilTankFactory.build(); - try { - Method onMethod = componentPort.getClass().getDeclaredMethod("decrease",int.class); - int level = (int) onMethod.invoke(componentPort,10); - PrimaryFlightDisplay.instance.level = level; - assertNotEquals(0,PrimaryFlightDisplay.instance.level); - } catch (Exception e) { - System.out.println(e.getMessage()); - } - } - - @Test - public void landing() { - componentPort = ApuOilTankFactory.build(); - try { - Method onMethod = componentPort.getClass().getDeclaredMethod("decrease",int.class); - int level = (int) onMethod.invoke(componentPort,20); - PrimaryFlightDisplay.instance.level = level; - assertNotEquals(0,PrimaryFlightDisplay.instance.level); - } catch (Exception e) { - System.out.println(e.getMessage()); - } - } - - - @Test - public void shutdown() { - componentPort = ApuOilTankFactory.build(); - try { - Method onMethod = componentPort.getClass().getDeclaredMethod("decrease",int.class); - int level = (int) onMethod.invoke(componentPort,50); - PrimaryFlightDisplay.instance.level = level; - assertNotEquals(100,PrimaryFlightDisplay.instance.level); - } catch (Exception e) { - System.out.println(e.getMessage()); - } - } - - @AfterEach - public void close() { - FlightRecorder.instance.shutdown(); - LogEngine.instance.close(); - } -} \ No newline at end of file