Put queryArea in a JPanel in order to add other graphic elements on this area.

Nathanael Jourdane
1 parent 6b021d84
Showing 2 changed files with 61 additions and 5 deletions Show diff stats
src/main/java/eu/omp/irap/vespa/epntapclient/view/EpnTapMainView.java
src/main/java/eu/omp/irap/vespa/epntapclient/view/RequestView.java
@@ -20,7 +20,6 @@ import java.awt.BorderLayout;
 import javax.swing.JOptionPane;
 import javax.swing.JPanel;
-import javax.swing.JTextArea;
 import eu.omp.irap.vespa.epntapclient.controller.EpnTapController;
 import eu.omp.irap.vespa.epntapclient.votable.view.VOTableView;
@@ -39,8 +38,8 @@ public class EpnTapMainView extends JPanel {
 	/** The JPanel where the list of services is displayed. */
 	private VOTableView servicesView;
-	/** The text area where the user put its requests. */
-	private JTextArea queryArea;
+	/** The JPanel where the user put requests. */
+	private RequestView requestView;
 	/**
 	 * The constructor of the view.
@@ -51,7 +50,7 @@ public class EpnTapMainView extends JPanel {
 	public EpnTapMainView(EpnTapController controller, VOTableView servicesView) {
 		this.servicesView = servicesView;
 		resultsView = new VOTableView(controller.getResultsController());
-		queryArea = new JTextArea("");
+		this.requestView = new RequestView(this);
 		buildWindow();
 	}
@@ -94,7 +93,7 @@ public class EpnTapMainView extends JPanel {
 	public void buildWindow() {
 		JPanel northPanel = new JPanel(new BorderLayout());
 		northPanel.add(servicesView, BorderLayout.WEST);
-		northPanel.add(queryArea, BorderLayout.CENTER);
+		northPanel.add(requestView, BorderLayout.CENTER);
 		setLayout(new BorderLayout());
 		add(northPanel, BorderLayout.NORTH);
@@ -0,0 +1,57 @@
+/*
+ * 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.epntapclient.view;
+
+import java.awt.BorderLayout;
+
+import javax.swing.JLabel;
+import javax.swing.JPanel;
+import javax.swing.JTextArea;
+
+/**
+ * @author N. Jourdane
+ */
+public class RequestView extends JPanel {
+
+	/** The serial version UID (affected with a random number). */
+	private static final long serialVersionUID = 1262856496809315405L;
+
+	/** The EPN-TAP main view. */
+	EpnTapMainView mainView;
+
+	/** The text area where the user put its requests. */
+	private JTextArea queryArea;
+
+	/** The text area where the user put its requests. */
+	private JLabel queryTitle;
+
+	/**
+	 * Method constructor
+	 * 
+	 * @param mainView The EPN-TAP main view.
+	 */
+	public RequestView(EpnTapMainView mainView) {
+		this.mainView = mainView;
+		queryArea = new JTextArea("");
+		queryTitle = new JLabel("Query for the selected service");
+
+		setLayout(new BorderLayout());
+		this.add(queryTitle, BorderLayout.NORTH);
+		this.add(queryArea, BorderLayout.CENTER);
+	}
+
+}