diff --git a/JAVA/GUI/Plotter/src/nl/astron/lofar/java/gui/plotter/test/PlotDataAccessTestImpl.java b/JAVA/GUI/Plotter/src/nl/astron/lofar/java/gui/plotter/test/PlotDataAccessTestImpl.java index e2952c55ce66215b1341ac4c920be2cb5b7c6a05..0619447413ef0e76c49ed2ab4ca2e0f9a62089e9 100644 --- a/JAVA/GUI/Plotter/src/nl/astron/lofar/java/gui/plotter/test/PlotDataAccessTestImpl.java +++ b/JAVA/GUI/Plotter/src/nl/astron/lofar/java/gui/plotter/test/PlotDataAccessTestImpl.java @@ -13,7 +13,7 @@ import java.util.HashMap; import java.util.HashSet; import nl.astron.lofar.sas.plotter.IPlotDataAccess; import nl.astron.lofar.sas.plotter.PlotConstants; -import nl.astron.lofar.sas.plotter.exceptions.PlotterException; +import nl.astron.lofar.sas.plotter.exceptions.PlotterDataAccessException; /** * @created 19-04-2006, 11:00 @@ -34,13 +34,13 @@ public class PlotDataAccessTestImpl implements IPlotDataAccess{ } /** - * @param constraint + * @param constraints * */ - public HashMap retrieveData(String constraint) throws PlotterException{ + public HashMap retrieveData(String[] constraints) throws PlotterDataAccessException{ //create the hashmap to be returned HashMap<String,Object> data = new HashMap<String,Object>(); - if(constraint.equalsIgnoreCase("line")){ + if(constraints[0].equalsIgnoreCase("line")){ String plotTitle = "Testset LOFAR Plotter | XYLine"; data.put(PlotConstants.DATASET_NAME,plotTitle); @@ -109,7 +109,7 @@ public class PlotDataAccessTestImpl implements IPlotDataAccess{ values.add(aLine2); data.put(PlotConstants.DATASET_VALUES,values); - }else if (constraint.equalsIgnoreCase("grid")){ + }else if (constraints[0].equalsIgnoreCase("grid")){ String plotTitle = "Testset LOFAR Plotter | Grid"; data.put(PlotConstants.DATASET_NAME,plotTitle); @@ -186,4 +186,4 @@ public class PlotDataAccessTestImpl implements IPlotDataAccess{ } return data; } -} \ No newline at end of file +} diff --git a/JAVA/GUI/Plotter/src/nl/astron/lofar/sas/plotter/test/PlotDataAccessTestImpl.java b/JAVA/GUI/Plotter/src/nl/astron/lofar/sas/plotter/test/PlotDataAccessTestImpl.java index e2952c55ce66215b1341ac4c920be2cb5b7c6a05..0619447413ef0e76c49ed2ab4ca2e0f9a62089e9 100644 --- a/JAVA/GUI/Plotter/src/nl/astron/lofar/sas/plotter/test/PlotDataAccessTestImpl.java +++ b/JAVA/GUI/Plotter/src/nl/astron/lofar/sas/plotter/test/PlotDataAccessTestImpl.java @@ -13,7 +13,7 @@ import java.util.HashMap; import java.util.HashSet; import nl.astron.lofar.sas.plotter.IPlotDataAccess; import nl.astron.lofar.sas.plotter.PlotConstants; -import nl.astron.lofar.sas.plotter.exceptions.PlotterException; +import nl.astron.lofar.sas.plotter.exceptions.PlotterDataAccessException; /** * @created 19-04-2006, 11:00 @@ -34,13 +34,13 @@ public class PlotDataAccessTestImpl implements IPlotDataAccess{ } /** - * @param constraint + * @param constraints * */ - public HashMap retrieveData(String constraint) throws PlotterException{ + public HashMap retrieveData(String[] constraints) throws PlotterDataAccessException{ //create the hashmap to be returned HashMap<String,Object> data = new HashMap<String,Object>(); - if(constraint.equalsIgnoreCase("line")){ + if(constraints[0].equalsIgnoreCase("line")){ String plotTitle = "Testset LOFAR Plotter | XYLine"; data.put(PlotConstants.DATASET_NAME,plotTitle); @@ -109,7 +109,7 @@ public class PlotDataAccessTestImpl implements IPlotDataAccess{ values.add(aLine2); data.put(PlotConstants.DATASET_VALUES,values); - }else if (constraint.equalsIgnoreCase("grid")){ + }else if (constraints[0].equalsIgnoreCase("grid")){ String plotTitle = "Testset LOFAR Plotter | Grid"; data.put(PlotConstants.DATASET_NAME,plotTitle); @@ -186,4 +186,4 @@ public class PlotDataAccessTestImpl implements IPlotDataAccess{ } return data; } -} \ No newline at end of file +}