Skip to content

Commit 83927d1

Browse files
committed
Minor refactoring
1 parent 74cc25e commit 83927d1

File tree

2 files changed

+9
-24
lines changed
  • portable
    • comp-android/diacomp/src/main/java/org/bosik/diacomp/android/frontend/activities
    • comp-transfer/src/main/java/org/bosik/diacomp/core/entities/business/dishbase

2 files changed

+9
-24
lines changed

portable/comp-android/diacomp/src/main/java/org/bosik/diacomp/android/frontend/activities/ActivityEditorDish.java

Lines changed: 1 addition & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -140,14 +140,7 @@ public void onClick(View v)
140140
@Override
141141
public void onSubmit(Double mass)
142142
{
143-
if (mass == null)
144-
{
145-
entity.getData().setMass(null);
146-
}
147-
else
148-
{
149-
entity.getData().setMass(mass);
150-
}
143+
entity.getData().setMass(mass);
151144
showMass();
152145
modified = true;
153146
}

portable/comp-transfer/src/main/java/org/bosik/diacomp/core/entities/business/dishbase/DishItem.java

Lines changed: 8 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -38,10 +38,10 @@ public class DishItem implements NamedRelative, Serializable
3838
{
3939
private static final long serialVersionUID = 1L;
4040

41-
public static final String FIELD_NAME = "name";
42-
public static final String FIELD_TAG = "tag";
43-
public static final String FIELD_MASS = "mass";
44-
public static final String FIELD_CONTENT = "content";
41+
public static final String FIELD_NAME = "name";
42+
public static final String FIELD_TAG = "tag";
43+
public static final String FIELD_MASS = "mass";
44+
public static final String FIELD_CONTENT = "content";
4545

4646
@JsonProperty(FIELD_NAME)
4747
private String name;
@@ -54,11 +54,11 @@ public class DishItem implements NamedRelative, Serializable
5454
private Double mass;
5555

5656
@JsonProperty(FIELD_CONTENT)
57-
private List<FoodMassed> content = new ArrayList<>();
57+
private final List<FoodMassed> content = new ArrayList<>();
5858

5959
// ================================ GET / SET ================================
6060

61-
private double getRealMass()
61+
public double getRealMass()
6262
{
6363
if (mass != null)
6464
{
@@ -82,17 +82,9 @@ public void setMass(Double mass)
8282
{
8383
if (mass == null)
8484
{
85-
this.mass = mass;
86-
}
87-
else
88-
{
89-
setMass((double) mass);
85+
this.mass = null;
9086
}
91-
}
92-
93-
public void setMass(double mass)
94-
{
95-
if (mass > Utils.EPS)
87+
else if (mass > Utils.EPS)
9688
{
9789
this.mass = mass;
9890
}

0 commit comments

Comments
 (0)