Modeler cleanup

* IDE warnings, unused stuff
* removing package.html ... kinda usless
* unifying LOGGER declarations

Author: andrus

modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/Application.java

@@ -230,7 +230,7 @@ public void initClassLoader() {
         } catch (BackingStoreException ignored) {
         }
 
-        if (values.size() > 0) {
+        if (!values.isEmpty()) {
             classLoader.setPathFiles(values.stream().map(File::new).collect(Collectors.toList()));
         }
 

modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/CayenneModelerController.java

@@ -62,15 +62,10 @@ public class CayenneModelerController extends CayenneController {
 
     private static final ProjectStateUtil PROJECT_STATE_UTIL = new ProjectStateUtil();
 
-    private ProjectController projectController;
-
-    protected CayenneModelerFrame frame;
+    private final ProjectController projectController;
+    private final CayenneModelerFrame frame;
 	private EditorView editorView;
-
-	private DbImportController dbImportController;
-
-    public CayenneModelerController(){
-    }
+	private final DbImportController dbImportController;
 
     public CayenneModelerController(Application application) {
         super(application);
@@ -295,7 +290,7 @@ public void updateStatus(String message) {
         frame.getStatus().setText(message);
 
         // start message cleanup thread that would remove the message after X seconds
-        if (message != null && message.trim().length() > 0) {
+        if (message != null && !message.trim().isEmpty()) {
             new Thread(() -> {
                 try {
                     Thread.sleep(6 * 10000);

modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/Main.java

@@ -44,7 +44,7 @@
  */
 public class Main {
 
-    private static Logger logger = LoggerFactory.getLogger(Main.class);
+    private static final Logger LOGGER = LoggerFactory.getLogger(Main.class);
 
     protected String[] args;
 
@@ -54,8 +54,7 @@ public class Main {
     public static void main(String[] args) {
         try {
             new Main(args).launch();
-        }
-        catch (Exception e) {
+        } catch (Exception e) {
             e.printStackTrace();
             System.exit(1);
         }
@@ -68,17 +67,14 @@ protected Main(String[] args) {
     protected void launch() {
 
         // TODO: use module auto-loading...
-        final Injector injector = DIBootstrap.createInjector(appendModules(new ArrayList<Module>()));
+        Injector injector = DIBootstrap.createInjector(appendModules(new ArrayList<>()));
 
         // init look and feel before using any Swing classes...
         injector.getInstance(PlatformInitializer.class).initLookAndFeel();
 
         // logger should go after Look And Feel or Logger Console will be without style
-        logger.info("Starting CayenneModeler.");
-        logger.info("JRE v."
-                + System.getProperty("java.version")
-                + " at "
-                + System.getProperty("java.home"));
+        LOGGER.info("Starting CayenneModeler.");
+        LOGGER.info("JRE v.{} at {}", System.getProperty("java.version"), System.getProperty("java.home"));
 
         SwingUtilities.invokeLater(() -> {
 

modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/ModelerPreferences.java

@@ -44,7 +44,7 @@ public class ModelerPreferences implements PreferenceChangeListener {
 
     private static Preferences cayennePrefs;
 
-    private static final Logger logObj = LoggerFactory.getLogger(ModelerPreferences.class);
+    private static final Logger LOGGER = LoggerFactory.getLogger(ModelerPreferences.class);
 
     /** Name of the log file. */
     public static final String LOGFILE_NAME = "modeler.log";
@@ -87,7 +87,7 @@ public static List<File> getLastProjFiles() {
         try {
             keys = filesPrefs.keys();
         } catch (BackingStoreException e) {
-            logObj.warn("Error reading preferences file.", e);
+            LOGGER.warn("Error reading preferences file.", e);
             return new ArrayList<>();
         }