Merge pull request #798 from seadowg/ambiguous-contructor

lognaturel · web-flow · commit 3efbb35b86cf · 2024-10-10T10:08:22.000-07:00
Fix ambiguous constructors
diff --git a/src/main/java/org/javarosa/core/model/data/DecimalData.java b/src/main/java/org/javarosa/core/model/data/DecimalData.java
@@ -45,9 +45,6 @@ public DecimalData() {
     public DecimalData(double d) {
         this.d = d;
     }
-    public DecimalData(@NotNull Double d) {
-        setValue(d);
-    }
 
     @Override
     public IAnswerData clone () {
diff --git a/src/main/java/org/javarosa/core/model/data/IntegerData.java b/src/main/java/org/javarosa/core/model/data/IntegerData.java
@@ -45,9 +45,6 @@ public IntegerData() {
     public IntegerData(int n) {
         this.n = n;
     }
-    public IntegerData(@NotNull Integer n) {
-        setValue(n);
-    }
 
     @Override
     public IAnswerData clone () {
diff --git a/src/main/java/org/javarosa/core/model/data/LongData.java b/src/main/java/org/javarosa/core/model/data/LongData.java
@@ -44,9 +44,6 @@ public LongData() {
     public LongData(long n) {
         this.n = n;
     }
-    public LongData(@NotNull Long n) {
-        setValue(n);
-    }
 
     @Override
     public IAnswerData clone () {

Original file line number	Diff line number	Diff line change
`@@ -45,9 +45,6 @@ public DecimalData() {`
`45`	`45`	`public DecimalData(double d) {`
`46`	`46`	`this.d = d;`
`47`	`47`	`}`
`48`		`- public DecimalData(@NotNull Double d) {`
`49`		`- setValue(d);`
`50`		`- }`
`51`	`48`
`52`	`49`	`@Override`
`53`	`50`	`public IAnswerData clone () {`
Original file line number	Diff line number	Diff line change
`@@ -45,9 +45,6 @@ public IntegerData() {`
`45`	`45`	`public IntegerData(int n) {`
`46`	`46`	`this.n = n;`
`47`	`47`	`}`
`48`		`- public IntegerData(@NotNull Integer n) {`
`49`		`- setValue(n);`
`50`		`- }`
`51`	`48`
`52`	`49`	`@Override`
`53`	`50`	`public IAnswerData clone () {`
Original file line number	Diff line number	Diff line change
`@@ -44,9 +44,6 @@ public LongData() {`
`44`	`44`	`public LongData(long n) {`
`45`	`45`	`this.n = n;`
`46`	`46`	`}`
`47`		`- public LongData(@NotNull Long n) {`
`48`		`- setValue(n);`
`49`		`- }`
`50`	`47`
`51`	`48`	`@Override`
`52`	`49`	`public IAnswerData clone () {`