Removed the dependency from the UI logger
Refactoring Logging: Made logging method member methods
Refactoring based on the moving of three classes
Added missing JavaDoc
Don't externalize tokens used in the parsing process
Clean up imports
Merged from branch
Make TODO a comment
Make sure that all sql parameters are used in upper case to inhibit confusion
Clean up many warnings