I have a couple classes that build JFreeCharts from a HSQLDB. I want it to basically be rewritten with the same features and for it to implement SwingWorker to avoid the GUI becoming unresponsive during the database reads. I will provide the original source code. There are some objects that I will not be able to provide however everything from those objects is fairly self explanatory (Such as getName()). I can also provide a database that can be used for testing. Attached is the source code to the relevant files.