Skip to content

Fixes to the java application for linux/oracle jvm

Maarten Billemont requested to merge joelsnape:master into master

Created by: joelsnape

The commit messages (with minor corrections):

  • On linux, the application fails to to stop gracefully, the problem is that the UnlockFrame is instantiated two times by 'TypeUtils.newInstance( "com.lyndir.masterpassword.gui.platform.mac.AppleGUI" ).or( new GUI() ).open()' and the close operation only disposes the second. This commit fixes the problem for linux by disposing the unused UnlockFrame created by the AppleGUI failed instantiation. However, according to my tests, even if AppleGUI didn't threw an exception the UnlockFrame would still be created twice (by the 'new GUI()') which I think is not the objective. Maybe the "or" should be changed for a simple if !isPresent() or something like that.

  • Fixes to the site counter handling: - Using UnsignedInteger directly in the SpinnerNumberModel doesn't work in Oracle 1.8.0_131. I don't know how it worked before (I had tested the previous version of the spinner model) but now it only works with the basic number types (Float, Double, Integer, Long, Short or Byte). I chose Double to avoid having to add casts to Comparable to use the constructor with longs. - Added the negation to the if condition on ModelSite to allow changing the site counter of stored sites.

Merge request reports