Cleanup through inspection

Signed-off-by:Roland Häder <roland@mxchange.org>

diff --git a/src/org/mxchange/jcore/BaseFrameworkSystem.java b/src/org/mxchange/jcore/BaseFrameworkSystem.java
index 7276e42751ea7a4754015b34a1c0264822fe6199..481508fffda767104db200cea5e27f5687889cf6 100644 (file)
--- a/src/org/mxchange/jcore/BaseFrameworkSystem.java
+++ b/src/org/mxchange/jcore/BaseFrameworkSystem.java
@@ -39,6 +39,26 @@ public abstract class BaseFrameworkSystem implements FrameworkInterface {
         */
        private static FrameworkInterface selfInstance;
 
+       /**
+        * Getter for this application
+        * <p>
+        * @return Instance from this application
+        */
+       public static FrameworkInterface getInstance () {
+               // Return it
+               return selfInstance;
+       }
+
+       /**
+        * Checks if the bundle is initialized
+        * <p>
+        * @return Whether the bundle has been initialized
+        */
+       protected static boolean isBundledInitialized () {
+               // Check it
+               return (bundle instanceof ResourceBundle);
+       }
+
        /**
         * Application instance
         */
@@ -68,19 +88,56 @@ public abstract class BaseFrameworkSystem implements FrameworkInterface {
        protected BaseFrameworkSystem () {
        }
 
+       @Override
+       public Application getApplication () {
+               return this.application;
+       }
+
+       @Override
+       public Facade getFacade () {
+               return this.facade;
+       }
+
+       @Override
+       public String getMessageStringFromKey (final String key) {
+               // Return message
+               return this.getBundle().getString(key);
+       }
+
        /**
-        * Getter for this application
+        * Getter for bundle instance
         * <p>
-        * @return Instance from this application
+        * @return Resource bundle
         */
-       public static FrameworkInterface getInstance () {
-               // Return it
-               return selfInstance;
+       protected ResourceBundle getBundle () {
+               return BaseFrameworkSystem.bundle;
        }
 
-       @Override
-       public Application getApplication () {
-               return this.application;
+       /**
+        * Setter for bundle instance
+        * <p>
+        * @param bundle the bundle to set
+        */
+       protected static void setBundle (final ResourceBundle bundle) {
+               BaseFrameworkSystem.bundle = bundle;
+       }
+
+       /**
+        * Manager instance
+        * <p>
+        * @param facade the facade instance to set
+        */
+       protected void setFacade (final Facade facade) {
+               this.facade = facade;
+       }
+
+       /**
+        * Application instance
+        * <p>
+        * @param application the application to set
+        */
+       protected void setApplication (final Application application) {
+               this.application = application;
        }
 
        @Override
@@ -88,6 +145,15 @@ public abstract class BaseFrameworkSystem implements FrameworkInterface {
                return this.client;
        }
 
+       /**
+        * Client instance
+        * <p>
+        * @param client the client to set
+        */
+       protected void setClient (final Client client) {
+               this.client = client;
+       }
+
        /**
         * Converts null to empty string or leaves original object untouched.
         * <p>
@@ -137,62 +203,6 @@ public abstract class BaseFrameworkSystem implements FrameworkInterface {
                return tokens;
        }
 
-       /**
-        * Client instance
-        * <p>
-        * @param client the client to set
-        */
-       protected void setClient (final Client client) {
-               this.client = client;
-       }
-
-       /**
-        * Application instance
-        * <p>
-        * @param application the application to set
-        */
-       protected void setApplication (final Application application) {
-               this.application = application;
-       }
-
-       @Override
-       public Facade getFacade () {
-               return this.facade;
-       }
-
-       /**
-        * Manager instance
-        * <p>
-        * @param facade the facade instance to set
-        */
-       protected void setFacade (final Facade facade) {
-               this.facade = facade;
-       }
-
-       @Override
-       public String getMessageStringFromKey (final String key) {
-               // Return message
-               return this.getBundle().getString(key);
-       }
-
-       /**
-        * Getter for bundle instance
-        * <p>
-        * @return Resource bundle
-        */
-       protected ResourceBundle getBundle () {
-               return BaseFrameworkSystem.bundle;
-       }
-
-       /**
-        * Setter for bundle instance
-        * <p>
-        * @param bundle the bundle to set
-        */
-       protected static void setBundle (final ResourceBundle bundle) {
-               BaseFrameworkSystem.bundle = bundle;
-       }
-
        /**
         * Initializes i18n bundles
         */
@@ -207,13 +217,4 @@ public abstract class BaseFrameworkSystem implements FrameworkInterface {
                setBundle(ResourceBundle.getBundle(FrameworkInterface.I18N_BUNDLE_FILE)); // NOI18N
        }
 
-       /**
-        * Checks if the bundle is initialized
-        * <p>
-        * @return Whether the bundle has been initialized
-        */
-       protected static boolean isBundledInitialized () {
-               // Check it
-               return (bundle instanceof ResourceBundle);
-       }
 }

diff --git a/src/org/mxchange/jcore/FrameworkInterface.java b/src/org/mxchange/jcore/FrameworkInterface.java
index 612c6bb59cf17182aff9d965e711c5b5f29d80a4..fae3265ace4b4a0bbcece0ec0563613de07519a2 100644 (file)
--- a/src/org/mxchange/jcore/FrameworkInterface.java
+++ b/src/org/mxchange/jcore/FrameworkInterface.java
@@ -30,28 +30,28 @@ public interface FrameworkInterface {
        /**
         * File name (and path) for internalization bundle
         */
-       public static final String I18N_BUNDLE_FILE = "org/mxchange/localization/bundle"; //NOI18N
+       String I18N_BUNDLE_FILE = "org/mxchange/localization/bundle"; //NOI18N
 
        /**
         * Application instance
         * <p>
         * @return the application
         */
-       public Application getApplication ();
+       Application getApplication ();
 
        /**
         * Client instance
         * <p>
         * @return the client
         */
-       public Client getClient ();
+       Client getClient ();
 
        /**
         * Getter for manager
         * <p>
         * @return Manager instance
         */
-       public Facade getFacade ();
+       Facade getFacade ();
 
        /**
         * Getter for human-readable string from given key
@@ -60,5 +60,5 @@ public interface FrameworkInterface {
         * <p>
         * @return Human-readable message
         */
-       public String getMessageStringFromKey (final String key);
+       String getMessageStringFromKey (final String key);
 }

diff --git a/src/org/mxchange/jcore/application/Application.java b/src/org/mxchange/jcore/application/Application.java
index 4d45b2e0a538ec5e5404a2dac49b35a412981504..c9883b2ab570881b9cc3e7b2a624660d03abb96b 100644 (file)
--- a/src/org/mxchange/jcore/application/Application.java
+++ b/src/org/mxchange/jcore/application/Application.java
@@ -30,7 +30,7 @@ public interface Application extends FrameworkInterface {
        /**
         * Bootstraps the application
         */
-       public void doBootstrap ();
+       void doBootstrap ();
 
        /**
         * Run the main loop
@@ -38,7 +38,7 @@ public interface Application extends FrameworkInterface {
         * @throws org.mxchange.jcore.exceptions.MenuInitializationException If the
         * menu could not be initialized
         */
-       public void doMainLoop () throws MenuInitializationException;
+       void doMainLoop () throws MenuInitializationException;
 
        /**
         * Shutdown the application
@@ -46,5 +46,5 @@ public interface Application extends FrameworkInterface {
         * @throws java.io.IOException If an IO error occurs
         * @throws java.sql.SQLException If a SQL error occurs
         */
-       public void doShutdown () throws IOException, SQLException;
+       void doShutdown () throws IOException, SQLException;
 }

diff --git a/src/org/mxchange/jcore/client/Client.java b/src/org/mxchange/jcore/client/Client.java
index 40ead407c7797e9225a90fd28bfbe303b39b259b..a6ff2c3e1ad22883d20ae65990a033a308b2363d 100644 (file)
--- a/src/org/mxchange/jcore/client/Client.java
+++ b/src/org/mxchange/jcore/client/Client.java
@@ -33,34 +33,34 @@ public interface Client extends FrameworkInterface {
         * @throws java.io.IOException If an IO error occurs
         * @throws java.sql.SQLException If a SQL error occurs
         */
-       public void doShutdown () throws IOException, SQLException;
+       void doShutdown () throws IOException, SQLException;
 
        /**
         * Enables isRunning attribute which singals that the client is running
         */
-       public void enableIsRunning ();
+       void enableIsRunning ();
 
        /**
         * Inizializes this client
         */
-       public void init ();
+       void init ();
 
        /**
         * Determines whether the client is still active by checking some conditions
         * <p>
         * @return Whether the client is still active
         */
-       public boolean isRunning ();
+       boolean isRunning ();
 
        /**
         * Displays a message to the user
         * <p>
         * @param message Message to show to the user
         */
-       public void outputMessage (final String message);
+       void outputMessage (final String message);
 
        /**
         * Shows introduction to user
         */
-       public void showWelcome ();
+       void showWelcome ();
 }

diff --git a/src/org/mxchange/jcore/facade/Facade.java b/src/org/mxchange/jcore/facade/Facade.java
index 315329cf4ca417a05a7536875fb91b9a4b63c48a..3be7f491121c5b87b973e24e11eca886877402bc 100644 (file)
--- a/src/org/mxchange/jcore/facade/Facade.java
+++ b/src/org/mxchange/jcore/facade/Facade.java
@@ -33,5 +33,5 @@ public interface Facade extends FrameworkInterface {
         * @throws java.sql.SQLException If an SQL error occurs
         * @throws java.io.IOException If an IO error occurs
         */
-       public void doShutdown () throws SQLException, IOException;
+       void doShutdown () throws SQLException, IOException;
 }

diff --git a/src/org/mxchange/jcore/manager/application/ManageableApplication.java b/src/org/mxchange/jcore/manager/application/ManageableApplication.java
index ee11eaa1aaef1785970b1e9c25d96aa5d88a1556..8bc07a1686275f34a2d57e79ce56127f9ff9b68a 100644 (file)
--- a/src/org/mxchange/jcore/manager/application/ManageableApplication.java
+++ b/src/org/mxchange/jcore/manager/application/ManageableApplication.java
@@ -32,5 +32,5 @@ public interface ManageableApplication extends Facade {
         * @throws org.mxchange.jcore.exceptions.MenuInitializationException If the
         * menu could not be initialized
         */
-       public void start () throws MenuInitializationException;
+       void start () throws MenuInitializationException;
 }