[PATCH] Replaced some tabs by spaces. Guys, please configure your editors not to insert tabs!
Wald Commits
scm-commit at wald.intevation.org
Sat Oct 5 12:48:51 CEST 2013
# HG changeset patch
# User Sascha L. Teichmann <teichmann at intevation.de>
# Date 1380970124 -7200
# Node ID c894b7b45c4c198239a1ae522c93dee10f97c93e
# Parent 3823b8bd6bfd45108596e24e0722c23877cc22f9
Replaced some tabs by spaces. Guys, please configure your editors not to insert tabs!
diff -r 3823b8bd6bfd -r c894b7b45c4c backend/src/main/java/org/dive4elements/river/importer/ImportBedHeightSingle.java
--- a/backend/src/main/java/org/dive4elements/river/importer/ImportBedHeightSingle.java Sat Oct 05 12:19:54 2013 +0200
+++ b/backend/src/main/java/org/dive4elements/river/importer/ImportBedHeightSingle.java Sat Oct 05 12:48:44 2013 +0200
@@ -145,19 +145,19 @@
if (theType == null) {
log.warn("BHS: No bed height type given. Skip file '" +
- description + "'");
+ description + "'");
return null;
}
if (theCurModel == null) {
log.warn("BHS: No elevation model given. Skip file '" +
- description + "'");
+ description + "'");
return null;
}
if (theRange == null) {
log.warn("BHS: No km-range given: '" +
- description + "'");
+ description + "'");
}
Session session = ImporterSession.getInstance().getDatabaseSession();
diff -r 3823b8bd6bfd -r c894b7b45c4c backend/src/main/java/org/dive4elements/river/importer/ImportRiver.java
--- a/backend/src/main/java/org/dive4elements/river/importer/ImportRiver.java Sat Oct 05 12:19:54 2013 +0200
+++ b/backend/src/main/java/org/dive4elements/river/importer/ImportRiver.java Sat Oct 05 12:48:44 2013 +0200
@@ -1344,8 +1344,7 @@
log.debug("name: " + desc);
- single.storeDependencies(river);
-
+ single.storeDependencies(river);
}
}
else {
@@ -1365,8 +1364,7 @@
log.debug("name: " + desc);
- epoch.storeDependencies(river);
-
+ epoch.storeDependencies(river);
}
}
else {
@@ -1385,8 +1383,7 @@
log.debug("name: " + desc);
- density.storeDependencies(river);
-
+ density.storeDependencies(river);
}
}
}
@@ -1398,9 +1395,7 @@
River river = getPeer();
for (ImportMorphWidth width: morphologicalWidths) {
-
- width.storeDependencies(river);
-
+ width.storeDependencies(river);
}
}
}
@@ -1412,15 +1407,11 @@
River river = getPeer();
for (ImportFlowVelocityModel flowVelocityModel: flowVelocityModels){
-
- flowVelocityModel.storeDependencies(river);
-
+ flowVelocityModel.storeDependencies(river);
}
for (ImportFlowVelocityMeasurement m: flowVelocityMeasurements) {
-
- m.storeDependencies(river);
-
+ m.storeDependencies(river);
}
}
}
@@ -1433,9 +1424,7 @@
River river = getPeer();
for (ImportSedimentYield sedimentYield: sedimentYields) {
-
- sedimentYield.storeDependencies(river);
-
+ sedimentYield.storeDependencies(river);
}
}
}
@@ -1450,12 +1439,10 @@
int count = 0;
for (ImportMeasurementStation station: measurementStations) {
-
- boolean success = station.storeDependencies(river);
- if (success) {
- count++;
- }
-
+ boolean success = station.storeDependencies(river);
+ if (success) {
+ count++;
+ }
}
log.info("stored " + count + " measurement stations.");
@@ -1472,10 +1459,8 @@
int count = 0;
for (ImportSQRelation sqRelation: sqRelations) {
-
- sqRelation.storeDependencies(river);
- count++;
-
+ sqRelation.storeDependencies(river);
+ count++;
}
log.info("stored " + count + " sq relations.");
diff -r 3823b8bd6bfd -r c894b7b45c4c backend/src/main/java/org/dive4elements/river/importer/parsers/BedHeightParser.java
--- a/backend/src/main/java/org/dive4elements/river/importer/parsers/BedHeightParser.java Sat Oct 05 12:19:54 2013 +0200
+++ b/backend/src/main/java/org/dive4elements/river/importer/parsers/BedHeightParser.java Sat Oct 05 12:48:44 2013 +0200
@@ -98,7 +98,6 @@
);
-
public BedHeightParser() {
this.bedHeights = new ArrayList<ImportBedHeight>();
}
@@ -253,10 +252,10 @@
}
catch (NumberFormatException e) {
log.warn("BHP: Could not parse sounding width in line '" + line +
- "'. -> Set default value '0'");
+ "'. -> Set default value '0'");
}
obj.setSoundingWidth(0);
- return true;
+ return true;
}
return false;
diff -r 3823b8bd6bfd -r c894b7b45c4c backend/src/main/java/org/dive4elements/river/importer/parsers/FlowVelocityModelParser.java
--- a/backend/src/main/java/org/dive4elements/river/importer/parsers/FlowVelocityModelParser.java Sat Oct 05 12:19:54 2013 +0200
+++ b/backend/src/main/java/org/dive4elements/river/importer/parsers/FlowVelocityModelParser.java Sat Oct 05 12:48:44 2013 +0200
@@ -94,8 +94,7 @@
@Override
protected void finish() {
models.add(current);
-
- // description = null;
+ // description = null;
}
diff -r 3823b8bd6bfd -r c894b7b45c4c backend/src/main/java/org/dive4elements/river/importer/parsers/LineParser.java
--- a/backend/src/main/java/org/dive4elements/river/importer/parsers/LineParser.java Sat Oct 05 12:19:54 2013 +0200
+++ b/backend/src/main/java/org/dive4elements/river/importer/parsers/LineParser.java Sat Oct 05 12:48:44 2013 +0200
@@ -140,7 +140,7 @@
/** Create Date on first moment (1st jan) of given year. */
public static Date getStartDateFromYear(int year) {
Calendar cal = Calendar.getInstance();
- cal.clear();
+ cal.clear();
cal.set(year, 0, 1, 0, 0, 0);
return cal.getTime();
@@ -150,7 +150,7 @@
/** Create Date on last moment (31st dec) of given year. */
public static Date getEndDateFromYear(int year) {
Calendar cal = Calendar.getInstance();
- cal.clear();
+ cal.clear();
cal.set(year, 11, 31, 23, 59, 59);
return cal.getTime();
diff -r 3823b8bd6bfd -r c894b7b45c4c backend/src/main/java/org/dive4elements/river/importer/parsers/SQRelationParser.java
--- a/backend/src/main/java/org/dive4elements/river/importer/parsers/SQRelationParser.java Sat Oct 05 12:19:54 2013 +0200
+++ b/backend/src/main/java/org/dive4elements/river/importer/parsers/SQRelationParser.java Sat Oct 05 12:48:44 2013 +0200
@@ -127,18 +127,21 @@
Integer nOutlier = parseInteger(cols[11], line);
Double cFer = parseDouble(cols[12], line);
Double cDuan = parseDouble(cols[13], line);
- if (km == null || a == null || b == null ||
- qMax == null || cols[1].length() == 0) {
- if (km == null) {
- log.error("No km for measurement station: Can not reference measurement station: "
- + line);
- }
- if ( a == null || b == null ||
- qMax == null || cols[1].length() == 0) {
- log.error("Incomplete SQ-relation row (missing a, b, Qmax or parameter): "
- + line);
- }
- return;
+
+ if (km == null || a == null || b == null
+ || qMax == null || cols[1].length() == 0
+ ) {
+ if (km == null) {
+ log.error("No km for measurement station: Can not reference measurement station: "
+ + line);
+ }
+ if (a == null || b == null
+ || qMax == null || cols[1].length() == 0
+ ) {
+ log.error("Incomplete SQ-relation row (missing a, b, Qmax or parameter): "
+ + line);
+ }
+ return;
}
current.addValue(new ImportSQRelationValue(
cols[1],
diff -r 3823b8bd6bfd -r c894b7b45c4c backend/src/main/java/org/dive4elements/river/importer/parsers/SedimentYieldParser.java
--- a/backend/src/main/java/org/dive4elements/river/importer/parsers/SedimentYieldParser.java Sat Oct 05 12:19:54 2013 +0200
+++ b/backend/src/main/java/org/dive4elements/river/importer/parsers/SedimentYieldParser.java Sat Oct 05 12:48:44 2013 +0200
@@ -379,7 +379,7 @@
public static String getGrainFractionTypeName(String filename) {
if (Pattern.matches(FRACTION_COARSE_STR, filename)) {
- return GrainFraction.COARSE;
+ return GrainFraction.COARSE;
}
else if (Pattern.matches(FRACTION_FINE_MIDDLE_STR, filename)) {
return GrainFraction.FINE_MIDDLE;
@@ -391,7 +391,7 @@
else if (Pattern.matches(FRACTION_SUSP_SAND, filename)) {
return GrainFraction.SUSP_SAND;
}
- else if (Pattern.matches(FRACTION_SAND, filename)) {
+ else if (Pattern.matches(FRACTION_SAND, filename)) {
return GrainFraction.SAND;
}
else if (Pattern.matches(FRACTION_SUSPENDED_SEDIMENT, filename)) {
diff -r 3823b8bd6bfd -r c894b7b45c4c backend/src/main/java/org/dive4elements/river/importer/parsers/WstParser.java
--- a/backend/src/main/java/org/dive4elements/river/importer/parsers/WstParser.java Sat Oct 05 12:19:54 2013 +0200
+++ b/backend/src/main/java/org/dive4elements/river/importer/parsers/WstParser.java Sat Oct 05 12:48:44 2013 +0200
@@ -229,7 +229,7 @@
continue;
}
quellen = StringUtil.splitQuoted(spezial, '"');
- log.debug("sources: " + Arrays.toString(quellen));
+ log.debug("sources: " + Arrays.toString(quellen));
}
else if (spezial.startsWith(COLUMN_DATUM)) {
spezial = spezial.substring(COLUMN_DATUM.length()).trim();
diff -r 3823b8bd6bfd -r c894b7b45c4c backend/src/main/java/org/dive4elements/river/model/BedHeightType.java
--- a/backend/src/main/java/org/dive4elements/river/model/BedHeightType.java Sat Oct 05 12:19:54 2013 +0200
+++ b/backend/src/main/java/org/dive4elements/river/model/BedHeightType.java Sat Oct 05 12:48:44 2013 +0200
@@ -72,14 +72,14 @@
}
public static BedHeightType fetchBedHeightTypeForType(String type) {
- return fetchBedHeightTypeForType(type, null);
+ return fetchBedHeightTypeForType(type, null);
}
public static BedHeightType fetchBedHeightTypeForType(String name, Session session) {
- if (session == null) {
- session = SessionHolder.HOLDER.get();
- }
+ if (session == null) {
+ session = SessionHolder.HOLDER.get();
+ }
Query query = session.createQuery(
"from BedHeightType where name=:name");
diff -r 3823b8bd6bfd -r c894b7b45c4c backend/src/main/java/org/dive4elements/river/model/SedimentDensityValue.java
--- a/backend/src/main/java/org/dive4elements/river/model/SedimentDensityValue.java Sat Oct 05 12:19:54 2013 +0200
+++ b/backend/src/main/java/org/dive4elements/river/model/SedimentDensityValue.java Sat Oct 05 12:48:44 2013 +0200
@@ -45,14 +45,14 @@
public SedimentDensityValue(
SedimentDensity sedimentDensity,
BigDecimal station,
- BigDecimal shoreOffset,
+ BigDecimal shoreOffset,
BigDecimal density,
BigDecimal year,
String desc
) {
this.sedimentDensity = sedimentDensity;
this.station = station;
- this.shoreOffset = shoreOffset;
+ this.shoreOffset = shoreOffset;
this.density = density;
this.year = year;
this.description = desc;
diff -r 3823b8bd6bfd -r c894b7b45c4c backend/src/main/java/org/dive4elements/river/seddb/model/SlotlinksId.java
--- a/backend/src/main/java/org/dive4elements/river/seddb/model/SlotlinksId.java Sat Oct 05 12:19:54 2013 +0200
+++ b/backend/src/main/java/org/dive4elements/river/seddb/model/SlotlinksId.java Sat Oct 05 12:48:44 2013 +0200
@@ -181,11 +181,11 @@
public boolean equals(Object other) {
if ( (this == other ) ) return true;
- if ( (other == null ) ) return false;
- if ( !(other instanceof SlotlinksId) ) return false;
- SlotlinksId castOther = ( SlotlinksId ) other;
+ if ( (other == null ) ) return false;
+ if ( !(other instanceof SlotlinksId) ) return false;
+ SlotlinksId castOther = ( SlotlinksId ) other;
- return (this.getSlotrechteid()==castOther.getSlotrechteid())
+ return (this.getSlotrechteid()==castOther.getSlotrechteid())
&& (this.getMessungid()==castOther.getMessungid())
&& ( (this.getUferabst()==castOther.getUferabst()) || ( this.getUferabst()!=null && castOther.getUferabst()!=null && this.getUferabst().equals(castOther.getUferabst()) ) )
&& ( (this.getTsand()==castOther.getTsand()) || ( this.getTsand()!=null && castOther.getTsand()!=null && this.getTsand().equals(castOther.getTsand()) ) )
diff -r 3823b8bd6bfd -r c894b7b45c4c backend/src/main/java/org/dive4elements/river/seddb/model/SsiebungsiebId.java
--- a/backend/src/main/java/org/dive4elements/river/seddb/model/SsiebungsiebId.java Sat Oct 05 12:19:54 2013 +0200
+++ b/backend/src/main/java/org/dive4elements/river/seddb/model/SsiebungsiebId.java Sat Oct 05 12:48:44 2013 +0200
@@ -588,11 +588,11 @@
public boolean equals(Object other) {
if ( (this == other ) ) return true;
- if ( (other == null ) ) return false;
- if ( !(other instanceof SsiebungsiebId) ) return false;
- SsiebungsiebId castOther = ( SsiebungsiebId ) other;
+ if ( (other == null ) ) return false;
+ if ( !(other instanceof SsiebungsiebId) ) return false;
+ SsiebungsiebId castOther = ( SsiebungsiebId ) other;
- return (this.getSiebanalyseid()==castOther.getSiebanalyseid())
+ return (this.getSiebanalyseid()==castOther.getSiebanalyseid())
&& (this.getGsiebsatzid()==castOther.getGsiebsatzid())
&& ( (this.getGmasse()==castOther.getGmasse()) || ( this.getGmasse()!=null && castOther.getGmasse()!=null && this.getGmasse().equals(castOther.getGmasse()) ) )
&& ( (this.getMasche01()==castOther.getMasche01()) || ( this.getMasche01()!=null && castOther.getMasche01()!=null && this.getMasche01().equals(castOther.getMasche01()) ) )
More information about the Dive4elements-commits
mailing list