[PATCH 2 of 2] Merged
Wald Commits
scm-commit at wald.intevation.org
Mon Sep 8 12:28:22 CEST 2014
# HG changeset patch
# User Sascha L. Teichmann <teichmann at intevation.de>
# Date 1410172096 -7200
# Node ID ed8c1a0b4cfbb14771500594e1dcff51419b2188
# Parent a12e0245643bbfd14084a2a78958df8ba9edb0d4
# Parent cb25ea4d455159bf241eb49a050cd5688b4ce8c3
Merged
diff -r a12e0245643b -r ed8c1a0b4cfb artifacts/src/main/java/org/dive4elements/river/artifacts/model/minfo/SedimentLoadData.java
--- a/artifacts/src/main/java/org/dive4elements/river/artifacts/model/minfo/SedimentLoadData.java Mon Sep 08 12:27:55 2014 +0200
+++ b/artifacts/src/main/java/org/dive4elements/river/artifacts/model/minfo/SedimentLoadData.java Mon Sep 08 12:28:16 2014 +0200
@@ -221,7 +221,6 @@
private List<List<Value>> grainFractions;
- private Station next;
private Station prev;
public Station() {
@@ -259,14 +258,6 @@
return (this.type & type) != 0;
}
- public void setNext(Station next) {
- this.next = next;
- }
-
- public Station getNext() {
- return next;
- }
-
public void setPrev(Station prev) {
this.prev = prev;
}
@@ -299,15 +290,6 @@
return a;
}
- public Station nextByType(int type) {
- for (Station curr = this; curr != null; curr = curr.getNext()) {
- if (curr.isType(type)) {
- return curr;
- }
- }
- return null;
- }
-
public Station prevByType(int type) {
for (Station curr = this; curr != null; curr = curr.getPrev()) {
if (curr.isType(type)) {
@@ -431,13 +413,11 @@
private void wireNeighbors(boolean kmUp) {
if (kmUp) {
for (int i = stations.length - 1; i > 0; --i) {
- stations[i].setNext(stations[i-1]);
stations[i-1].setPrev(stations[i]);
}
}
else {
for (int i = 1; i < stations.length; ++i) {
- stations[i-1].setNext(stations[i]);
stations[i].setPrev(stations[i-1]);
}
}
More information about the Dive4Elements-commits
mailing list