RenJuan/TASKPM
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

ItEr20S04ArquitecturaServidorItEr19S04: Changing precision field name.

Browse source 
It was causing problems in mysql, since schema exported created a column with the same name and it's a reserved word.
This commit is contained in:
Óscar González Fernández 2009-08-06 21:14:41 +02:00 • committed by Javier Moran Rua
parent 36f2020212
commit 2ad7043d2b
3 changed files with 19 additions and 18 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
navalplanner-business/src/main/java/org/navalplanner/business/advance/bootstrap/PredefinedAdvancedTypes.java
View file

@ -14,17 +14,18 @@ public enum PredefinedAdvancedTypes {
this.name = name;
this.defaultMaxValue = defaultMaxValue.setScale(4,
BigDecimal.ROUND_HALF_UP);
this.precision = precision.setScale(4, BigDecimal.ROUND_HALF_UP);
this.unitPrecision = precision.setScale(4, BigDecimal.ROUND_HALF_UP);
}
private final String name;
private final BigDecimal defaultMaxValue;
private final BigDecimal precision;
private final BigDecimal unitPrecision;
public AdvanceType createType() {
return new AdvanceType(name, defaultMaxValue, false, precision, true);
return new AdvanceType(name, defaultMaxValue, false, unitPrecision,
true);
}
public String getTypeName() {

22
navalplanner-business/src/main/java/org/navalplanner/business/advance/entities/AdvanceType.java
View file

@ -23,7 +23,7 @@ public class AdvanceType extends BaseEntity {
private boolean updatable;
@NotNull
private BigDecimal precision;
private BigDecimal unitPrecision;
@NotNull
private boolean active;
@ -34,13 +34,13 @@ public class AdvanceType extends BaseEntity {
}
public AdvanceType(String unitName, BigDecimal defaultMaxValue,
boolean updatable, BigDecimal precision, boolean active) {
boolean updatable, BigDecimal unitPrecision, boolean active) {
this.unitName = unitName;
this.defaultMaxValue = defaultMaxValue;
this.defaultMaxValue.setScale(2, BigDecimal.ROUND_HALF_UP);
this.updatable = updatable;
this.precision = precision;
this.precision.setScale(4, BigDecimal.ROUND_HALF_UP);
this.unitPrecision = unitPrecision;
this.unitPrecision.setScale(4, BigDecimal.ROUND_HALF_UP);
this.active = active;
}
@ -69,13 +69,13 @@ public class AdvanceType extends BaseEntity {
return this.updatable;
}
public void setPrecision(BigDecimal precision) {
this.precision = precision;
this.precision.setScale(4, BigDecimal.ROUND_HALF_UP);
public void setUnitPrecision(BigDecimal precision) {
this.unitPrecision = precision;
this.unitPrecision.setScale(4, BigDecimal.ROUND_HALF_UP);
}
public BigDecimal getPrecision() {
return this.precision;
public BigDecimal getUnitPrecision() {
return this.unitPrecision;
}
public void setActive(boolean active) {
@ -105,9 +105,9 @@ public class AdvanceType extends BaseEntity {
}
public boolean isDefaultMaxValueValid(BigDecimal defaultMaxValue) {
if ((this.precision == null) || (defaultMaxValue == null))
if ((this.unitPrecision == null) || (defaultMaxValue == null))
return true;
if (this.precision.compareTo(defaultMaxValue) > 0)
if (this.unitPrecision.compareTo(defaultMaxValue) > 0)
return false;
return true;
}

8
navalplanner-business/src/main/resources/org/navalplanner/business/advance/entities/Advance.hbm.xml
View file

@ -3,7 +3,7 @@
<hibernate-mapping package="org.navalplanner.business.advance.entities" default-access="field">
<!-- AdvanceType -->
<class name="AdvanceType" table="ADVANCE_TYPE">
<class name="AdvanceType" >
<id name="id" type="long" access="property">
<generator class="native"/>
</id>
@ -12,12 +12,12 @@
<property name="unitName" access="field" unique="true"/>
<property name="defaultMaxValue" access="field" scale="4"/>
<property name="updatable" access="field"/>
<property name="precision" access="field" scale="4"/>
<property name="unitPrecision" access="field" scale="4"/>
<property name="active" access="field"/>
</class>
<!-- AdvanceAssigment -->
<class name="AdvanceAssigment" table="ADVANCE_ASSIGMENT">
<class name="AdvanceAssigment">
<id name="id" type="long" access="property">
<generator class="native"/>
</id>
@ -37,7 +37,7 @@
</class>
<!-- AdvanceMeasurement -->
<class name="AdvanceMeasurement" table="ADVANCE_MEASUREMENT">
<class name="AdvanceMeasurement">
<id name="id" type="long" access="property">
<generator class="native"/>
</id>