Skip to content
Snippets Groups Projects
Commit 895d2784 authored by pompert's avatar pompert
Browse files

BugID: 701 

Additions:
-None
Mods:
-Modified the retrieveData method to accept an Object instead of a String[]
parent ef4f2f3f
No related branches found
No related tags found
No related merge requests found
Hide whitespace changes
Inline Side-by-side
JAVA/CEP/jParmFacade/src/nl/astron/lofar/java/cep/jparmfacade/PlotDataAccessParmDBImpl.java
+ 15
− 14
View file @ 895d2784
...@@ -73,7 +73,7 @@ public class PlotDataAccessParmDBImpl implements IPlotDataAccess{ ...@@ -73,7 +73,7 @@ public class PlotDataAccessParmDBImpl implements IPlotDataAccess{
* *
* *
* @param constraints The constraints provided by the PlotPanel. * @param constraints The constraints provided by the PlotPanel.
* These must be modelled as follows:<br><br> * These must be modelled as follows in a String[] :<br><br>
* -constraints[0]= the parameter name filter (for example parm*) (String)<br> * -constraints[0]= the parameter name filter (for example parm*) (String)<br>
* -constraints[1]= the startx variable (for example 0) (double)<br> * -constraints[1]= the startx variable (for example 0) (double)<br>
* -constraints[2]= the endx variable (for example 5) (double)<br> * -constraints[2]= the endx variable (for example 5) (double)<br>
...@@ -86,24 +86,25 @@ public class PlotDataAccessParmDBImpl implements IPlotDataAccess{ ...@@ -86,24 +86,25 @@ public class PlotDataAccessParmDBImpl implements IPlotDataAccess{
* with the ParmDB interface and calls to it. * with the ParmDB interface and calls to it.
* *
*/ */
public HashMap retrieveData(String[] constraints) throws PlotterDataAccessException{ public HashMap retrieveData(Object constraints) throws PlotterDataAccessException{
if(parmDB == null){ if(parmDB == null){
this.initiateConnectionToParmDB(); this.initiateConnectionToParmDB();
} }
String[] constraintsArray = (String[])constraints;
HashMap<String,Object> returnMap = new HashMap<String, Object>(); HashMap<String,Object> returnMap = new HashMap<String, Object>();
LinkedList<HashMap> returnValues = new LinkedList<HashMap>(); LinkedList<HashMap> returnValues = new LinkedList<HashMap>();
if(parmDB != null){ if(parmDB != null){
Vector names; Vector names;
try{ try{
names = parmDB.getNames(constraints[0]); names = parmDB.getNames(constraintsArray[0]);
} catch (Exception ex) { } catch (Exception ex) {
//TODO LOG! //TODO LOG!
PlotterDataAccessException exx = new PlotterDataAccessException("An invalid getNames() call was made to the ParmDB interface. Please check that all variables seem OK. Root cause: "+ex.getMessage()); PlotterDataAccessException exx = new PlotterDataAccessException("An invalid getNames() call was made to the ParmDB interface. Please check that all variables seem OK. Root cause: "+ex.getMessage());
exx.initCause(ex); exx.initCause(ex);
throw exx; throw exx;
} }
if(names != null && names.size()>=1 && constraints.length == this.requiredDataConstraints){ if(names != null && names.size()>=1 && constraintsArray.length == this.requiredDataConstraints){
returnMap.put(PlotConstants.DATASET_NAME,"ParmDB dataset '"+constraints[0]+"'"); returnMap.put(PlotConstants.DATASET_NAME,"ParmDB dataset '"+constraintsArray[0]+"'");
TimeZone utcZone = TimeZone.getTimeZone("UTC"); TimeZone utcZone = TimeZone.getTimeZone("UTC");
utcZone.setDefault(utcZone); utcZone.setDefault(utcZone);
Calendar aCalendar = Calendar.getInstance(utcZone); Calendar aCalendar = Calendar.getInstance(utcZone);
...@@ -134,12 +135,12 @@ public class PlotDataAccessParmDBImpl implements IPlotDataAccess{ ...@@ -134,12 +135,12 @@ public class PlotDataAccessParmDBImpl implements IPlotDataAccess{
exx.initCause(ex); exx.initCause(ex);
throw exx; throw exx;
} }
double startx = Double.parseDouble(constraints[1]); double startx = Double.parseDouble(constraintsArray[1]);
double endx = Double.parseDouble(constraints[2]); double endx = Double.parseDouble(constraintsArray[2]);
double starty = Double.parseDouble(constraints[4]); double starty = Double.parseDouble(constraintsArray[4]);
double endy = Double.parseDouble(constraints[5]); double endy = Double.parseDouble(constraintsArray[5]);
int numx = Integer.parseInt(constraints[3]); int numx = Integer.parseInt(constraintsArray[3]);
int numy = Integer.parseInt(constraints[6]); int numy = Integer.parseInt(constraintsArray[6]);
if(paramValues != null && paramValues.size()==4){ if(paramValues != null && paramValues.size()==4){
//startx = Double.parseDouble(paramValues.get(0).toString()); //startx = Double.parseDouble(paramValues.get(0).toString());
...@@ -191,10 +192,10 @@ public class PlotDataAccessParmDBImpl implements IPlotDataAccess{ ...@@ -191,10 +192,10 @@ public class PlotDataAccessParmDBImpl implements IPlotDataAccess{
} }
returnMap.put(PlotConstants.DATASET_VALUES,returnValues); returnMap.put(PlotConstants.DATASET_VALUES,returnValues);
}else if (constraints.length != this.requiredDataConstraints){ }else if (constraintsArray.length != this.requiredDataConstraints){
throw new PlotterDataAccessException("An invalid amount of parameters (" +constraints.length+" instead of " +this.requiredDataConstraints+") were passed to the ParmDB Data Access Interface"); throw new PlotterDataAccessException("An invalid amount of parameters (" +constraintsArray.length+" instead of " +this.requiredDataConstraints+") were passed to the ParmDB Data Access Interface");
}else if (names.size() < 1){ }else if (names.size() < 1){
throw new PlotterDataAccessException("No results were found in the ParmDB table(s) using the given parameter name filter ( "+constraints[0]+" )"); throw new PlotterDataAccessException("No results were found in the ParmDB table(s) using the given parameter name filter ( "+constraintsArray[0]+" )");
} }
} }
......
JAVA/GUI/Plotter/src/nl/astron/lofar/java/gui/plotter/test/PlotDataAccessTestImpl.java
+ 5
− 5
View file @ 895d2784
...@@ -24,7 +24,6 @@ ...@@ -24,7 +24,6 @@
package nl.astron.lofar.java.gui.plotter.test; package nl.astron.lofar.java.gui.plotter.test;
import java.util.HashMap; import java.util.HashMap;
import java.util.HashSet;
import java.util.LinkedList; import java.util.LinkedList;
import nl.astron.lofar.java.gui.plotter.IPlotDataAccess; import nl.astron.lofar.java.gui.plotter.IPlotDataAccess;
import nl.astron.lofar.java.gui.plotter.PlotConstants; import nl.astron.lofar.java.gui.plotter.PlotConstants;
...@@ -54,16 +53,17 @@ public class PlotDataAccessTestImpl implements IPlotDataAccess{ ...@@ -54,16 +53,17 @@ public class PlotDataAccessTestImpl implements IPlotDataAccess{
/** /**
* This method returns a test data set that can be plotted using the PlotSGTImpl plotter * This method returns a test data set that can be plotted using the PlotSGTImpl plotter
* @param constraints The type of plot you would like to have data for:<br> * @param constraints A String[] containing the type of plot you would like to have data for:<br>
* -constraints[0] == "line" --> for a XYLINE plot<br> * -constraints[0] == "line" --> for a XYLINE plot<br>
* -constraints[0] == "grid" --> for a GRID plot<br><br> * -constraints[0] == "grid" --> for a GRID plot<br><br>
* @throws PlotterDataAccessException will be thrown if something goes wrong during the making of the * @throws PlotterDataAccessException will be thrown if something goes wrong during the making of the
* test data set (not likely though as no other classes are called!) * test data set (not likely though as no other classes are called!)
*/ */
public HashMap retrieveData(String[] constraints) throws PlotterDataAccessException{ public HashMap retrieveData(Object constraints) throws PlotterDataAccessException{
//create the hashmap to be returned //create the hashmap to be returned
HashMap<String,Object> data = new HashMap<String,Object>(); HashMap<String,Object> data = new HashMap<String,Object>();
if(constraints[0].equalsIgnoreCase("line")){ String[] constraintsArray = (String[])constraints;
if(constraintsArray[0].equalsIgnoreCase("line")){
String plotTitle = "Testset LOFAR Plotter | XYLine"; String plotTitle = "Testset LOFAR Plotter | XYLine";
data.put(PlotConstants.DATASET_NAME,plotTitle); data.put(PlotConstants.DATASET_NAME,plotTitle);
...@@ -132,7 +132,7 @@ public class PlotDataAccessTestImpl implements IPlotDataAccess{ ...@@ -132,7 +132,7 @@ public class PlotDataAccessTestImpl implements IPlotDataAccess{
values.add(aLine2); values.add(aLine2);
data.put(PlotConstants.DATASET_VALUES,values); data.put(PlotConstants.DATASET_VALUES,values);
}else if (constraints[0].equalsIgnoreCase("grid")){ }else if (constraintsArray[0].equalsIgnoreCase("grid")){
String plotTitle = "Testset LOFAR Plotter | Grid"; String plotTitle = "Testset LOFAR Plotter | Grid";
data.put(PlotConstants.DATASET_NAME,plotTitle); data.put(PlotConstants.DATASET_NAME,plotTitle);
......
SAS/OTB/OTB/src/nl/astron/lofar/sas/otb/util/plotter/PlotDataAccessParmDBImpl.java
+ 15
− 14
View file @ 895d2784
...@@ -73,7 +73,7 @@ public class PlotDataAccessParmDBImpl implements IPlotDataAccess{ ...@@ -73,7 +73,7 @@ public class PlotDataAccessParmDBImpl implements IPlotDataAccess{
* *
* *
* @param constraints The constraints provided by the PlotPanel. * @param constraints The constraints provided by the PlotPanel.
* These must be modelled as follows:<br><br> * These must be modelled as follows in a String[] :<br><br>
* -constraints[0]= the parameter name filter (for example parm*) (String)<br> * -constraints[0]= the parameter name filter (for example parm*) (String)<br>
* -constraints[1]= the startx variable (for example 0) (double)<br> * -constraints[1]= the startx variable (for example 0) (double)<br>
* -constraints[2]= the endx variable (for example 5) (double)<br> * -constraints[2]= the endx variable (for example 5) (double)<br>
...@@ -86,24 +86,25 @@ public class PlotDataAccessParmDBImpl implements IPlotDataAccess{ ...@@ -86,24 +86,25 @@ public class PlotDataAccessParmDBImpl implements IPlotDataAccess{
* with the ParmDB interface and calls to it. * with the ParmDB interface and calls to it.
* *
*/ */
public HashMap retrieveData(String[] constraints) throws PlotterDataAccessException{ public HashMap retrieveData(Object constraints) throws PlotterDataAccessException{
if(parmDB == null){ if(parmDB == null){
this.initiateConnectionToParmDB(); this.initiateConnectionToParmDB();
} }
String[] constraintsArray = (String[])constraints;
HashMap<String,Object> returnMap = new HashMap<String, Object>(); HashMap<String,Object> returnMap = new HashMap<String, Object>();
LinkedList<HashMap> returnValues = new LinkedList<HashMap>(); LinkedList<HashMap> returnValues = new LinkedList<HashMap>();
if(parmDB != null){ if(parmDB != null){
Vector names; Vector names;
try{ try{
names = parmDB.getNames(constraints[0]); names = parmDB.getNames(constraintsArray[0]);
} catch (Exception ex) { } catch (Exception ex) {
//TODO LOG! //TODO LOG!
PlotterDataAccessException exx = new PlotterDataAccessException("An invalid getNames() call was made to the ParmDB interface. Please check that all variables seem OK. Root cause: "+ex.getMessage()); PlotterDataAccessException exx = new PlotterDataAccessException("An invalid getNames() call was made to the ParmDB interface. Please check that all variables seem OK. Root cause: "+ex.getMessage());
exx.initCause(ex); exx.initCause(ex);
throw exx; throw exx;
} }
if(names != null && names.size()>=1 && constraints.length == this.requiredDataConstraints){ if(names != null && names.size()>=1 && constraintsArray.length == this.requiredDataConstraints){
returnMap.put(PlotConstants.DATASET_NAME,"ParmDB dataset '"+constraints[0]+"'"); returnMap.put(PlotConstants.DATASET_NAME,"ParmDB dataset '"+constraintsArray[0]+"'");
TimeZone utcZone = TimeZone.getTimeZone("UTC"); TimeZone utcZone = TimeZone.getTimeZone("UTC");
utcZone.setDefault(utcZone); utcZone.setDefault(utcZone);
Calendar aCalendar = Calendar.getInstance(utcZone); Calendar aCalendar = Calendar.getInstance(utcZone);
...@@ -134,12 +135,12 @@ public class PlotDataAccessParmDBImpl implements IPlotDataAccess{ ...@@ -134,12 +135,12 @@ public class PlotDataAccessParmDBImpl implements IPlotDataAccess{
exx.initCause(ex); exx.initCause(ex);
throw exx; throw exx;
} }
double startx = Double.parseDouble(constraints[1]); double startx = Double.parseDouble(constraintsArray[1]);
double endx = Double.parseDouble(constraints[2]); double endx = Double.parseDouble(constraintsArray[2]);
double starty = Double.parseDouble(constraints[4]); double starty = Double.parseDouble(constraintsArray[4]);
double endy = Double.parseDouble(constraints[5]); double endy = Double.parseDouble(constraintsArray[5]);
int numx = Integer.parseInt(constraints[3]); int numx = Integer.parseInt(constraintsArray[3]);
int numy = Integer.parseInt(constraints[6]); int numy = Integer.parseInt(constraintsArray[6]);
if(paramValues != null && paramValues.size()==4){ if(paramValues != null && paramValues.size()==4){
//startx = Double.parseDouble(paramValues.get(0).toString()); //startx = Double.parseDouble(paramValues.get(0).toString());
...@@ -191,10 +192,10 @@ public class PlotDataAccessParmDBImpl implements IPlotDataAccess{ ...@@ -191,10 +192,10 @@ public class PlotDataAccessParmDBImpl implements IPlotDataAccess{
} }
returnMap.put(PlotConstants.DATASET_VALUES,returnValues); returnMap.put(PlotConstants.DATASET_VALUES,returnValues);
}else if (constraints.length != this.requiredDataConstraints){ }else if (constraintsArray.length != this.requiredDataConstraints){
throw new PlotterDataAccessException("An invalid amount of parameters (" +constraints.length+" instead of " +this.requiredDataConstraints+") were passed to the ParmDB Data Access Interface"); throw new PlotterDataAccessException("An invalid amount of parameters (" +constraintsArray.length+" instead of " +this.requiredDataConstraints+") were passed to the ParmDB Data Access Interface");
}else if (names.size() < 1){ }else if (names.size() < 1){
throw new PlotterDataAccessException("No results were found in the ParmDB table(s) using the given parameter name filter ( "+constraints[0]+" )"); throw new PlotterDataAccessException("No results were found in the ParmDB table(s) using the given parameter name filter ( "+constraintsArray[0]+" )");
} }
} }
......
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment