Mercurial > dive4elements > river

comparison artifacts/src/main/java/org/dive4elements/river/artifacts/WINFOArtifact.java @ 6101:a0078e5e3b39

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Removed unused context from RangeAccess and subclasses leading to some dead code removal.
author Sascha L. Teichmann <teichmann@intevation.de>
date Sat, 25 May 2013 19:32:58 +0200
parents af13ceeba52a
children 20a32dbdbb59
comparison
equal deleted inserted replaced
6100:de92e0cdebdc 6101:a0078e5e3b39
240 WstValueTable wst = WstValueTableFactory.getTable(river); 240 WstValueTable wst = WstValueTableFactory.getTable(river);
241 if (wst == null) { 241 if (wst == null) {
242 return error(new WQKms[0], "no.wst.for.selected.river"); 242 return error(new WQKms[0], "no.wst.for.selected.river");
243 } 243 }
244 244
245 RangeAccess rangeAccess = new RangeAccess(this, null); 245 RangeAccess rangeAccess = new RangeAccess(this);
246 double [] range = rangeAccess.getKmRange(); 246 double [] range = rangeAccess.getKmRange();
247 if (range == null) { 247 if (range == null) {
248 return error(new WQKms[0], "no.range.found"); 248 return error(new WQKms[0], "no.range.found");
249 } 249 }
250 250
319 319
320 if (g == null) { 320 if (g == null) {
321 return error(null, "no.gauge.selected"); 321 return error(null, "no.gauge.selected");
322 } 322 }
323 323
324 RangeAccess rangeAccess = new RangeAccess(this, null); 324 RangeAccess rangeAccess = new RangeAccess(this);
325 double[] locations = rangeAccess.getLocations(); 325 double[] locations = rangeAccess.getLocations();
326 326
327 if (locations == null) { 327 if (locations == null) {
328 return error(null, "no.locations.selected"); 328 return error(null, "no.locations.selected");
329 } 329 }
377 377
378 if (r == null) { 378 if (r == null) {
379 return error(new WQKms[0], "no.river.selected"); 379 return error(new WQKms[0], "no.river.selected");
380 } 380 }
381 381
382 RangeAccess rangeAccess = new RangeAccess(this, null); 382 RangeAccess rangeAccess = new RangeAccess(this);
383 double[] locations = rangeAccess.getLocations(); 383 double[] locations = rangeAccess.getLocations();
384 384
385 if (locations == null) { 385 if (locations == null) {
386 return error(new WQKms[0], "no.locations.selected"); 386 return error(new WQKms[0], "no.locations.selected");
387 } 387 }
675 if (r == null) { 675 if (r == null) {
676 logger.warn("no river found"); 676 logger.warn("no river found");
677 return null; 677 return null;
678 } 678 }
679 679
680 RangeAccess rangeAccess = new RangeAccess(this, null); 680 RangeAccess rangeAccess = new RangeAccess(this);
681 double [] range = rangeAccess.getKmRange(); 681 double [] range = rangeAccess.getKmRange();
682 if (range == null) { 682 if (range == null) {
683 logger.warn("no ranges found"); 683 logger.warn("no ranges found");
684 return null; 684 return null;
685 } 685 }
847 * 847 *
848 * @return the selected kms. 848 * @return the selected kms.
849 */ 849 */
850 public double[] getKms() { 850 public double[] getKms() {
851 if (isRange()) { 851 if (isRange()) {
852 RangeAccess rangeAccess = new RangeAccess(this, null); 852 RangeAccess rangeAccess = new RangeAccess(this);
853 double [] distance = rangeAccess.getKmRange(); 853 double [] distance = rangeAccess.getKmRange();
854 return getKms(distance); 854 return getKms(distance);
855 855
856 } 856 }
857 else { 857 else {
862 862
863 public double [] getFromToStep() { 863 public double [] getFromToStep() {
864 if (!isRange()) { 864 if (!isRange()) {
865 return null; 865 return null;
866 } 866 }
867 RangeAccess rangeAccess = new RangeAccess(this, null); 867 RangeAccess rangeAccess = new RangeAccess(this);
868 double [] fromTo = rangeAccess.getKmRange(); 868 double [] fromTo = rangeAccess.getKmRange();
869 869
870 if (fromTo == null) { 870 if (fromTo == null) {
871 return null; 871 return null;
872 } 872 }
http://dive4elements.wald.intevation.org