Create a VOTablePanelCtrl and dissociate graphics from processing (#3), this fixes #1.

Nathanael Jourdane
1 parent a2c89bc1
Showing 6 changed files with 93 additions and 40 deletions Show diff stats
src/main/java/eu/omp/irap/vespa/votable/VOTableApp.java
src/main/java/eu/omp/irap/vespa/votable/gui/VOTablePanelCtrl.java
src/main/java/eu/omp/irap/vespa/votable/votabledata/BinaryStreamParser.java
src/main/java/eu/omp/irap/vespa/votable/votabledata/DataParser.java
src/main/java/eu/omp/irap/vespa/votable/votabledata/VOTableData.java
src/main/java/eu/omp/irap/vespa/votable/votabledata/VOTableDataParser.java
@@ -19,13 +19,9 @@ package eu.omp.irap.vespa.votable;
 import java.util.logging.Level;
 import java.util.logging.Logger;
  
-import javax.swing.JFrame;
-import javax.swing.SwingUtilities;
-
-import eu.omp.irap.vespa.votable.controller.VOTableController;
-import eu.omp.irap.vespa.votable.controller.VOTableException;
+import eu.omp.irap.vespa.votable.gui.VOTablePanelCtrl;
 import eu.omp.irap.vespa.votable.utils.StringJoiner;
-import eu.omp.irap.vespa.votable.view.VOTableView;
+import eu.omp.irap.vespa.votable.votable.VOTableException;
  
 /**
  * Simple class to have a main function to display a voTable from a XML file.
@@ -52,11 +48,9 @@ public class VOTableApp {
 	 * @param args The program arguments
 	 */
 	public static void main(final String[] args) {
-		VOTableApp.LOGGER
-				.info("Lauching VOTable app with arguments: " + StringJoiner.join(args));
-		VOTableController ctrl;
+		LOGGER.info("Lauching VOTable app with arguments: " + StringJoiner.join(args));
  
-		ctrl = new VOTableController();
+		VOTablePanelCtrl ctrl = new VOTablePanelCtrl();
 		try {
 			if (args.length == 1) {
 				ctrl.newVOTable(args[0]);
@@ -71,30 +65,6 @@ public class VOTableApp {
 			return;
 		}
  
-		VOTableView view = new VOTableView();
-		view.fillTable(ctrl.getVOTableData());
-		SwingUtilities.invokeLater(VOTableApp.run(view, args[0]));
-	}
-
-	/**
-	 * Create the runnable to launch the application.
-	 *
-	 * @param voTableView The view of the VOTable, created by the VOTableController.
-	 * @param title The title of the window displaying the VOTable.
-	 * @return The Runnable.
-	 */
-	private static Runnable run(final VOTableView voTableView, final String title) {
-		return new Runnable() {
-
-			@Override
-			public void run() {
-				JFrame frame = new JFrame(title);
-				frame.setDefaultCloseOperation(JFrame.EXIT_ON_CLOSE);
-				frame.setContentPane(voTableView);
-				frame.setVisible(true);
-				frame.setSize(800, 600);
-				frame.setLocationRelativeTo(null);
-			}
-		};
+		ctrl.fillTable();
 	}
 }
 \ No newline at end of file
@@ -0,0 +1,83 @@
+/*
+ * This file is a part of EpnTAPClient.
+ * This program aims to provide EPN-TAP support for software clients, like CASSIS spectrum analyzer.
+ * See draft specifications: https://voparis-confluence.obspm.fr/pages/viewpage.action?pageId=559861
+ * Copyright (C) 2016 Institut de Recherche en Astrophysique et Planétologie.
+ *
+ * This program is free software: you can
+ * redistribute it and/or modify it under the terms of the GNU General Public License as published
+ * by the Free Software Foundation, either version 3 of the License, or (at your option) any later
+ * version. This program is distributed in the hope that it will be useful, but WITHOUT ANY
+ * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR
+ * PURPOSE. See the GNU General Public License for more details. You should have received a copy of
+ * the GNU General Public License along with this program. If not, see
+ * <http://www.gnu.org/licenses/>.
+ */
+
+package eu.omp.irap.vespa.votable.gui;
+
+import javax.swing.JFrame;
+import javax.swing.SwingUtilities;
+
+import eu.omp.irap.vespa.votable.votable.VOTableCtrl;
+
+/**
+ * @author N. Jourdane
+ */
+public class VOTablePanelCtrl extends VOTableCtrl implements VOTablePanelListener {
+
+	/** The view of the VOTable panel. */
+	private VOTablePanelView view;
+
+
+	/**
+	 * Constructor of VOTablePanelCtrl
+	 */
+	public VOTablePanelCtrl() {
+		view = new VOTablePanelView(this);
+		SwingUtilities.invokeLater(run("EPN-TAP client", view));
+	}
+
+	/**
+	 * Create the runnable to launch the application.
+	 *
+	 * @param voTableView The view of the VOTable, created by the VOTableController.
+	 * @param title The title of the window displaying the VOTable.
+	 * @return The Runnable.
+	 */
+	private static Runnable run(final String title, final VOTablePanelView voTableView) {
+		return new Runnable() {
+
+			@Override
+			public void run() {
+				JFrame frame = new JFrame(title);
+				frame.setDefaultCloseOperation(JFrame.EXIT_ON_CLOSE);
+				frame.setContentPane(voTableView);
+				frame.setVisible(true);
+				frame.setSize(800, 600);
+				frame.setLocationRelativeTo(null);
+			}
+		};
+	}
+
+	@Override
+	public void displayInfo(String shortMessage, String detailledMessage) {
+		super.displayInfo(shortMessage, detailledMessage);
+		view.displayInfo(shortMessage, detailledMessage);
+	}
+
+	/** Put the VOTable data in the JTable. */
+	public void fillTable() {
+		view.fillTable(getVOTableData());
+	}
+
+	/** @return The view of the VOTable panel */
+	public VOTablePanelView getView() {
+		return view;
+	}
+
+	@Override
+	public void onRowsSelected() {
+		// Do nothing yet when a column is selected.
+	}
+}
@@ -28,8 +28,8 @@ import javax.xml.bind.DatatypeConverter;
 import eu.omp.irap.vespa.epntapclient.votable.model.DataType;
 import eu.omp.irap.vespa.epntapclient.votable.model.Field;
 import eu.omp.irap.vespa.epntapclient.votable.model.Stream;
-import eu.omp.irap.vespa.votable.controller.VOTableException.CantParseVOTableException;
 import eu.omp.irap.vespa.votable.utils.Debug;
+import eu.omp.irap.vespa.votable.votable.VOTableException.CantParseVOTableException;
  
 /**
  * @author N. Jourdane
@@ -18,7 +18,7 @@ package eu.omp.irap.vespa.votable.votabledata;
  
 import java.util.List;
  
-import eu.omp.irap.vespa.votable.controller.VOTableException.CantParseVOTableException;
+import eu.omp.irap.vespa.votable.votable.VOTableException.CantParseVOTableException;
  
 /**
  * @author N. Jourdane
@@ -21,7 +21,7 @@ import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
  
-import eu.omp.irap.vespa.votable.controller.VOTableException.CanNotParseDataException;
+import eu.omp.irap.vespa.votable.votable.VOTableException.CanNotParseDataException;
  
 /**
  * @author N. Jourdane
@@ -23,9 +23,9 @@ import java.util.logging.Logger;
 import eu.omp.irap.vespa.epntapclient.votable.model.Data;
 import eu.omp.irap.vespa.epntapclient.votable.model.Field;
 import eu.omp.irap.vespa.epntapclient.votable.model.Table;
-import eu.omp.irap.vespa.votable.controller.VOTableException;
-import eu.omp.irap.vespa.votable.controller.VOTableException.VOTableIsNotValidException;
 import eu.omp.irap.vespa.votable.utils.StringJoiner;
+import eu.omp.irap.vespa.votable.votable.VOTableException;
+import eu.omp.irap.vespa.votable.votable.VOTableException.VOTableIsNotValidException;
  
 /**
  * @author N. Jourdane