merge JMG modifications.

Nathanael Jourdane
2 parents 0d36b4b0 b021ed9a
Showing 3 changed files with 89 additions and 18 deletions Show diff stats
src/main/java/eu/omp/irap/vespa/epntapclient/granule/GranuleCtrl.java
src/main/java/eu/omp/irap/vespa/epntapclient/gui/requestpanel/paramfield/DataProductTypeField.java
src/main/java/eu/omp/irap/vespa/epntapclient/gui/requestpanel/paramfield/TargetNameField.java
@@ -42,16 +42,38 @@ public class GranuleCtrl {
 	}
  
 	private String parseString(int rowId, GranuleEnum granuleEnum) {
-		return (String) data.getCell(rowId, granuleEnum.toString());
+		String res = "";
+		try {
+			res = (String) data.getCell(rowId, granuleEnum.toString());
+		} catch (Exception e) {
+			logger.warning(granuleEnum + "not found in the rowId" + rowId + 
+					": return an empty string");
+		}
+		return res;
 	}
  
 	private Date parseDate(int rowId, GranuleEnum granuleEnum) throws ParseException {
 		SimpleDateFormat sdf = new SimpleDateFormat("yyyy-mm-dd");
-		return sdf.parse((String) data.getCell(rowId, granuleEnum.toString()));
+		Date date = new Date();
+		try {
+			date = sdf.parse((String) data.getCell(rowId, granuleEnum.toString()));
+		} catch (Exception e) {
+			logger.warning(granuleEnum + "not found in the rowId" + rowId + 
+					": return an empty Date");
+		}
+		
+		return date;
 	}
  
 	private Double parseDouble(int rowId, GranuleEnum granuleEnum) {
-		Double d = (Double) data.getCell(rowId, granuleEnum.toString());
+		Double d = null;
+		try {
+			d = (Double) data.getCell(rowId, granuleEnum.toString());
+		} catch (Exception e) {
+			logger.warning(granuleEnum + "not found in the rowId" + rowId + 
+					": return a Double.NaN");
+		}
+		
 		return d == null ? Double.NaN : d;
 	}
  
@@ -103,7 +125,7 @@ public class GranuleCtrl {
 		g.instrumentHostName = parseString(rowId, GranuleEnum.INSTRUMENT_HOST_NAME);
 		g.instrumentName = parseString(rowId, GranuleEnum.INSTRUMENT_NAME);
 		g.measurementType = parseString(rowId, GranuleEnum.MEASUREMENT_TYPE);
-		g.processingLevel = (Integer) data.getCell(rowId, GranuleEnum.PROCESSING_LEVEL.toString());
+		g.processingLevel = parseInteger(rowId);
 		g.creationDate = parseDate(rowId, GranuleEnum.CREATION_DATE);
 		g.modificationDate = parseDate(rowId, GranuleEnum.MODIFICATION_DATE) ;
 		g.releaseDate = parseDate(rowId, GranuleEnum.RELEASE_DATE) ;
@@ -116,6 +138,20 @@ public class GranuleCtrl {
 		return g;
 	}
  
+	/**
+	 * @param rowId
+	 * @return
+	 */
+	public Integer parseInteger(int rowId) {
+		Integer val = 0;
+		try {
+			val = (Integer) data.getCell(rowId, GranuleEnum.PROCESSING_LEVEL.toString());
+		} catch (Exception e) {
+			// TODO: handle exception
+		}
+		return val;
+	}
+
 	public static boolean isV2(VOTableData data) {
 		return !data.isContainingColumnName("index");
 	}
@@ -129,8 +165,10 @@ public class GranuleCtrl {
 		}
 		List<Granule> granules = new ArrayList<>();
  
-		for (int rowId = 0; rowId < data.getNbRows(); rowId++) {
-			granules.add(getGranuleFromVOTableRow(rowId));
+		if (data != null){
+			for (int rowId = 0; rowId < data.getNbRows(); rowId++) {
+				granules.add(getGranuleFromVOTableRow(rowId));
+			}
 		}
 		return granules;
 	}
@@ -52,20 +52,29 @@ public class DataProductTypeField extends ParamField {
 	 */
 	public DataProductTypeField(RequestPanelListener requestPanelListener, String paramName) {
 		super(requestPanelListener, paramName);
-		comboBox = new JComboBox<>(DataProductType.values());
-		comboBox.setSelectedItem(DataProductType.ALL);
-		comboBox.setPreferredSize(
-				new Dimension(ParamField.MIN_FIELD_WIDTH, ParamField.FIELD_HEIGHT));
-
-		comboBox.addActionListener(new ActionListener() {
+		this.add(getComboBox());
+	}
  
-			@Override
-			public void actionPerformed(ActionEvent e) {
-				update();
-			}
-		});
+	/**
+	 * @return
+	 */
+	public JComboBox<DataProductType> getComboBox() {
+		if (comboBox == null) {
+			comboBox = new JComboBox<>(DataProductType.values());
+			comboBox.setSelectedItem(DataProductType.ALL);
+			comboBox.setPreferredSize(
+					new Dimension(ParamField.MIN_FIELD_WIDTH, ParamField.FIELD_HEIGHT));
+
+			comboBox.addActionListener(new ActionListener() {
+
+				@Override
+				public void actionPerformed(ActionEvent e) {
+					update();
+				}
+			});
+		}
  
-		this.add(comboBox);
+		return comboBox;
 	}
  
 	/**
@@ -17,6 +17,7 @@
 package eu.omp.irap.vespa.epntapclient.gui.requestpanel.paramfield;
  
 import java.awt.Dimension;
+import java.io.File;
 import java.util.logging.Level;
  
 import javax.swing.JComboBox;
@@ -72,6 +73,29 @@ public class TargetNameField extends ParamField implements TextFieldListener {
 		this.add(comboBox);
 	}
  
+	public TargetNameField(String paraName) {
+		this(new RequestPanelListener() {
+
+			public void onServiceSelected(int selectedService) {
+			}
+
+			@Override
+			public void onSendButtonClicked(String query) {
+			}
+
+			@Override
+			public void onParameterRemoved(String paramName) {
+			}
+
+			@Override
+			public void onParameterChanged(String paramName, Object paramValue) {
+			}
+
+			public void onDownloadButtonClicked(File outputFile) {
+			}
+		}, paraName);
+	}
+
 	/**
 	 * This method is called each time the field is modified.
 	 */