Merge modifications

Nathanael Jourdane
2 parents 70b98e7e 385482f3
Showing 4 changed files with 135 additions and 8 deletions Show diff stats
pom.xml
src/main/java/eu/omp/irap/vespa/epntapclient/gui/mainPanel/MainPanelController.java
src/main/java/eu/omp/irap/vespa/epntapclient/gui/requestpanel/RequestPanelView.java
src/main/java/eu/omp/irap/vespa/epntapclient/service/Queries.java
@@ -22,7 +22,60 @@
 			</roles>
 		</developer>
 	</developers>
-
+	<reporting>
+		<outputDirectory>${basedir}/target/site</outputDirectory>
+		<plugins>
+			<plugin>
+				<groupId>org.apache.maven.plugins</groupId>
+				<artifactId>maven-jxr-plugin</artifactId>
+				<version>2.5</version>
+			</plugin>
+			<plugin>
+				<artifactId>maven-project-info-reports-plugin</artifactId>
+				<version>2.8</version>
+				<configuration>
+					<dependencyLocationsEnabled>false</dependencyLocationsEnabled>
+				</configuration>
+			</plugin>
+			<plugin>
+				<groupId>org.apache.maven.plugins</groupId>
+				<artifactId>maven-javadoc-plugin</artifactId>
+				<version>2.10.3</version>
+				<configuration>
+					<quiet>true</quiet>
+				</configuration>
+			</plugin>
+			<plugin>
+				<groupId>org.apache.maven.plugins</groupId>
+				<artifactId>maven-surefire-report-plugin</artifactId>
+				<version>2.18.1</version>
+			</plugin>
+			<plugin>
+				<groupId>org.codehaus.mojo</groupId>
+				<artifactId>findbugs-maven-plugin</artifactId>
+				<version>2.5.5</version>
+				<configuration>
+					<onlyAnalyze>eu.omp.irap.cassis.-</onlyAnalyze>
+				</configuration>
+			</plugin>
+			<plugin>
+				<groupId>org.apache.maven.plugins</groupId>
+				<artifactId>maven-pmd-plugin</artifactId>
+				<version>3.4</version>
+				<configuration>
+					<includes>
+						<include>**/eu/omp/irap/**</include>
+					</includes>
+				</configuration>
+			</plugin>
+			<plugin>
+				<groupId>org.codehaus.mojo</groupId>
+				<artifactId>cobertura-maven-plugin</artifactId>
+				<version>2.6</version>
+				
+			</plugin>
+		</plugins>
+	</reporting>
 	<!-- The files encoding. -->
 	<properties>
 		<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
@@ -47,6 +47,8 @@ public class MainPanelController extends EpnTapController implements ViewListene
 	/** The URL of the service corresponding to the selected table. */
 	private String selectedTableServiceURL;
+	private int nbMaxResult = 10;
+
 	public MainPanelController() {
 		super();
@@ -128,10 +130,24 @@ public class MainPanelController extends EpnTapController implements ViewListene
 	 * Update the query area with a working ADQL query, based on the parameters list.
 	 */
 	private void updateQueryArea() {
-		String query = Queries.getQuery(selectedTableName, paramValues, 10);
+		String query = Queries.getQuery(selectedTableName, paramValues, getNbMaxResult());
 		mainView.getRequestPanel().updateQueryArea(query);
 	}
+	/**
+	 * @return the nb max of result
+	 */
+	public int getNbMaxResult() {
+		return nbMaxResult;
+	}
+	
+	/**
+	 * set the nb max of result for a query
+	 */
+	public void setNbMaxResult(int nb) {
+		nbMaxResult = nb;
+	}
+
 	public void updateService(String serviceURL, String tableName) {
 		if (!tableName.equals(selectedTableName)) {
 			selectedTableServiceURL = serviceURL;
@@ -57,6 +57,14 @@ public class RequestPanelView extends JPanel {
 	 */
 	private List<ParamField> paramFields;
+	private TargetNameField targetNameField;
+
+	private DateRangeField timeRangeField;
+
+	private FloatRangeField spectralRangeField;
+
+	private DataProductTypeField dataProductTypeField;
+
 	/** The height of the buttons panel. */
 	private static final int BUTTON_PANEL_HEIGHT = 20;
@@ -84,12 +92,12 @@ public class RequestPanelView extends JPanel {
 	 *
 	 * @return The JPanel.
 	 */
-	private JPanel buildParamPanel() {
+	public JPanel buildParamPanel() {
 		paramFields = new ArrayList<>();
-		paramFields.add(new TargetNameField(viewListener, "target_name"));
-		paramFields.add(new DateRangeField(viewListener, "time_"));
-		paramFields.add(new FloatRangeField(viewListener, "spectral_range_"));
-		paramFields.add(new DataProductTypeField(viewListener, "dataproduct_type"));
+		paramFields.add(getTargetNameField());
+		paramFields.add(getTimeRangeField());
+		paramFields.add(getSpectralRangeField());
+		paramFields.add(getDataProductTypeField());
 		JPanel paramPanel = new JPanel();
 		paramPanel.setLayout(new BoxLayout(paramPanel, BoxLayout.Y_AXIS));
 		paramPanel.setBorder(BorderFactory.createTitledBorder("Query parameters"));
@@ -102,6 +110,50 @@ public class RequestPanelView extends JPanel {
 	}
 	/**
+	 * @return the data product field
+	 */
+	public DataProductTypeField getDataProductTypeField() {
+		if(dataProductTypeField == null){
+			dataProductTypeField = new DataProductTypeField(viewListener, "dataproduct_type");
+		}
+		
+		return dataProductTypeField;
+	}
+
+	/**
+	 * @return the spectral range field
+	 */
+	public FloatRangeField getSpectralRangeField() {
+		if (spectralRangeField == null){
+			spectralRangeField = new FloatRangeField(viewListener, "spectral_range_");
+		}
+		
+		return spectralRangeField;
+	}
+
+	/**
+	 * @return the time range field
+	 */
+	public DateRangeField getTimeRangeField() {
+		if (timeRangeField == null){
+			timeRangeField = new DateRangeField(viewListener, "time_");
+		}
+		
+		return timeRangeField;
+	}
+
+	/**
+	 * @return the target name field
+	 */
+	public TargetNameField getTargetNameField() {
+		if(targetNameField == null){
+			targetNameField = new TargetNameField(viewListener, "target_name");
+		}
+		
+		return targetNameField;
+	}
+
+	/**
 	 * Build a JPanel containing a text-area where the query is displayed.
 	 *
 	 * @return The JPanel.
@@ -28,6 +28,8 @@ import eu.omp.irap.vespa.votable.utils.StringJoiner;
  * @author N. Jourdane
  */
 public final class Queries {
+	
+	public static  String RETURN_PARAMETERS = "target_name, target_class";
 	private static final String SELECT = "SELECT DISTINCT short_name, res_title, "
 			+ "table_name, schema_name, ivoid, access_url ";
@@ -113,7 +115,11 @@ public final class Queries {
 			}
 		}
 		String where = addJoin.isEmpty() ? "" : " WHERE " + addJoin;
-		return "SELECT TOP " + nbRow + " target_name, target_class FROM " + tableName + where;
+		
+		return "SELECT TOP " + nbRow + " "
+				+ RETURN_PARAMETERS
+				+ " "
+				+ "FROM " + tableName + where;
 	}
 }