remove unused loggers and make some attributes private

Nathanael Jourdane
1 parent aa2a59ba
Showing 12 changed files with 10 additions and 51 deletions Show diff stats
src/main/java/eu/omp/irap/vespa/epntapclient/EpnTapMainApp.java
src/main/java/eu/omp/irap/vespa/epntapclient/utils/Queries.java
src/main/java/eu/omp/irap/vespa/epntapclient/view/EpnTapMainView.java
src/main/java/eu/omp/irap/vespa/epntapclient/view/ParamField.java
src/main/java/eu/omp/irap/vespa/epntapclient/view/panels/BottomBarPanel.java
src/main/java/eu/omp/irap/vespa/epntapclient/view/panels/RequestPanel.java
src/main/java/eu/omp/irap/vespa/epntapclient/view/panels/ResultsPanel.java
src/main/java/eu/omp/irap/vespa/epntapclient/view/panels/ServicesPanel.java
src/main/java/eu/omp/irap/vespa/epntapclient/votable/VOTableApp.java
src/main/java/eu/omp/irap/vespa/epntapclient/votable/controller/VOTableController.java
src/main/java/eu/omp/irap/vespa/epntapclient/votable/utils/Utils.java
src/main/java/eu/omp/irap/vespa/epntapclient/votable/view/VOTableView.java
@@ -31,7 +31,7 @@ import eu.omp.irap.vespa.epntapclient.controller.EpnTapController;
 public class EpnTapMainApp {
  
 	/** The logger for the class EpnTapMainApp. */
-	static final Logger logger = Logger.getLogger(EpnTapMainApp.class.getName());
+	private static final Logger logger = Logger.getLogger(EpnTapMainApp.class.getName());
  
  
 	/** Constructor to hide the implicit public one. */
@@ -44,11 +44,11 @@ public class EpnTapMainApp {
 	 * @param args The program arguments (not used).
 	 */
 	public static void main(final String[] args) {
+		EpnTapMainApp.logger.info("Lauching EPN-TAP application...");
 		SwingUtilities.invokeLater(new Runnable() {
  
 			@Override
 			public void run() {
-				EpnTapMainApp.logger.info("Lauching EPN-TAP application...");
 				EpnTapController epnTapControl = new EpnTapController();
 				if (args.length != 0) {
 					System.console().writer().println("Usage: EpnTapMainApp");
@@ -19,7 +19,6 @@ package eu.omp.irap.vespa.epntapclient.utils;
 import java.util.ArrayList;
 import java.util.List;
 import java.util.Map;
-import java.util.logging.Logger;
  
 import eu.omp.irap.vespa.epntapclient.votable.utils.Utils.StringJoiner;
  
@@ -30,10 +29,6 @@ import eu.omp.irap.vespa.epntapclient.votable.utils.Utils.StringJoiner;
  */
 public final class Queries {
  
-	/** The logger for the class Queries. */
-	@SuppressWarnings("unused")
-	private Logger logger = Logger.getLogger(Queries.class.getName());
-
 	// AMDA access_url: http://cdpp-epntap.cesr.fr/__system__/tap/run/tap
 	// AMDA table name: amdadb.epn_core
  
@@ -17,7 +17,6 @@
 package eu.omp.irap.vespa.epntapclient.view;
  
 import java.awt.BorderLayout;
-import java.util.logging.Logger;
  
 import javax.swing.JOptionPane;
 import javax.swing.JPanel;
@@ -36,10 +35,6 @@ import eu.omp.irap.vespa.epntapclient.votable.view.VOTableView;
  */
 public class EpnTapMainView extends JPanel {
  
-	/** The logger for the class EpnTapMainView. */
-	@SuppressWarnings("unused")
-	private static final Logger logger = Logger.getLogger(EpnTapMainView.class.getName());
-
 	/** The serial version UID. */
 	private static final long serialVersionUID = 1L;
  
@@ -59,7 +59,7 @@ public abstract class ParamField extends JPanel {
 	private static final long serialVersionUID = 1L;
  
 	/** The logger for the class ParamField. */
-	static final Logger logger = Logger.getLogger(ParamField.class.getName());
+	protected static final Logger logger = Logger.getLogger(ParamField.class.getName());
  
 	/** The minimum width of the field. */
 	private static final int MIN_FIELD_WIDTH = 30;
@@ -17,7 +17,6 @@
 package eu.omp.irap.vespa.epntapclient.view.panels;
  
 import java.awt.BorderLayout;
-import java.util.logging.Logger;
  
 import javax.swing.JButton;
 import javax.swing.JLabel;
@@ -33,10 +32,6 @@ public class BottomBarPanel extends JPanel {
 	/** The serial version UID. */
 	private static final long serialVersionUID = 1L;
  
-	/** The logger for the class BottomBar. */
-	@SuppressWarnings("unused")
-	private static final Logger logger = Logger.getLogger(BottomBarPanel.class.getName());
-
 	/** A label to display several informations (aka. status bar). */
 	private JLabel infoLabel;
  
@@ -22,7 +22,6 @@ import java.awt.event.ActionEvent;
 import java.awt.event.ActionListener;
 import java.util.ArrayList;
 import java.util.List;
-import java.util.logging.Logger;
  
 import javax.swing.BorderFactory;
 import javax.swing.BoxLayout;
@@ -46,10 +45,6 @@ import eu.omp.irap.vespa.epntapclient.view.ParamField.TargetNameField;
  */
 public class RequestPanel extends JPanel implements ActionListener {
  
-	/** The logger for the class RequestView. */
-	@SuppressWarnings("unused")
-	private static final Logger logger = Logger.getLogger(RequestPanel.class.getName());
-
 	/** The serial version UID. */
 	private static final long serialVersionUID = 1L;
  
@@ -18,7 +18,6 @@ package eu.omp.irap.vespa.epntapclient.view.panels;
  
 import java.awt.BorderLayout;
 import java.awt.Dimension;
-import java.util.logging.Logger;
  
 import javax.swing.JPanel;
  
@@ -34,10 +33,6 @@ public class ResultsPanel extends JPanel {
 	/**  */
 	private static final long serialVersionUID = -3387526562625069156L;
  
-	/** The logger for the class ResultPanel. */
-	@SuppressWarnings("unused")
-	private static final Logger logger = Logger.getLogger(ResultsPanel.class.getName());
-
  
 	/**
 	 * Method constructor which customize the result panel, but don't build it from scratch since
@@ -18,7 +18,6 @@ package eu.omp.irap.vespa.epntapclient.view.panels;
  
 import java.awt.BorderLayout;
 import java.awt.Dimension;
-import java.util.logging.Logger;
  
 import javax.swing.JPanel;
 import javax.swing.event.ListSelectionEvent;
@@ -37,10 +36,6 @@ public class ServicesPanel extends JPanel {
 	/** The serial version UID. */
 	private static final long serialVersionUID = 1L;
  
-	/** The logger for the class ServicesView. */
-	@SuppressWarnings("unused")
-	private static final Logger logger = Logger.getLogger(ServicesPanel.class.getName());
-
 	/** The generic view of the VOTable panel. */
 	private VOTableView voTableView;
  
@@ -35,7 +35,7 @@ import eu.omp.irap.vespa.epntapclient.votable.controller.VOTableException;
 public class VOTableApp {
  
 	/** The logger for the class VOTableApp. */
-	static final Logger logger = Logger.getLogger(VOTableApp.class.getName());
+	protected static final Logger logger = Logger.getLogger(VOTableApp.class.getName());
  
  
 	/** Private constructor to hide the implicit public one. */
@@ -60,14 +60,13 @@ public class VOTableApp {
 	 * @param args The program arguments
 	 */
 	public static void main(final String[] args) {
+		VOTableApp.logger.info("Lauching VOTable app with arguments:\n" + new Gson().toJson(args));
 		SwingUtilities.invokeLater(new Runnable() {
  
 			@Override
 			public void run() {
 				// TODO: Add option to export to CSV and HTML in CLI.
 				VOTableController voTableControl;
-				VOTableApp.logger
-						.info("Lauching VOTable app with arguments:\n  " + new Gson().toJson(args));
 				if (args.length == 1) {
 					try {
 						voTableControl = new VOTableController(args[0]);
@@ -38,10 +38,10 @@ public class VOTableController {
 	private static final Logger logger = Logger.getLogger(VOTableController.class.getName());
  
 	/** The view of the VOTable */
-	VOTableView view;
+	private VOTableView view;
  
 	/** The VOTable model */
-	VOTABLE voTable;
+	private VOTABLE voTable;
  
  
 	/**
@@ -18,8 +18,6 @@ package eu.omp.irap.vespa.epntapclient.votable.utils;
  
 import java.io.FileWriter;
 import java.io.IOException;
-import java.util.ArrayList;
-import java.util.List;
 import java.util.logging.Logger;
  
 import com.google.gson.Gson;
@@ -47,14 +45,11 @@ public class Utils {
 	 */
 	public static class StringJoiner {
  
-		/** A list of words to join, ie. ["foo", "bar"]. */
-		List<String> list;
-
 		/** The string joiner separator to put between each word, ie. ';'. */
-		String separator;
+		private String separator;
  
 		/** The resulting string, ie. "foo;bar". */
-		String string;
+		private String string;
  
  
 		/**
@@ -64,7 +59,6 @@ public class Utils {
 		 */
 		public StringJoiner(String separator) {
 			this.separator = separator;
-			list = new ArrayList<>();
 			string = "";
 		}
  
@@ -18,7 +18,6 @@ package eu.omp.irap.vespa.epntapclient.votable.view;
  
 import java.awt.BorderLayout;
 import java.util.List;
-import java.util.logging.Logger;
  
 import javax.swing.JPanel;
 import javax.swing.JScrollPane;
@@ -37,15 +36,12 @@ import eu.omp.irap.vespa.epntapclient.votable.utils.Utils;
  */
 public class VOTableView extends JPanel implements TableModelListener {
  
-	/** The logger for the class VOTableView. */
-	static final Logger logger = Logger.getLogger(VOTableView.class.getName());
-
 	// TODO: Create class VOTableCLI the view for a CLI usage
 	/** The serial version UID. */
 	private static final long serialVersionUID = 1L;
  
 	/** The JTable component where the data are displayed. */
-	JTable table;
+	private JTable table;
  
 	/** The DataModel representing the VOTable data in the JTable element. */
 	private DefaultTableModel tableData;