MeteoriteDB

commit 175f5e08ecec9f589131f2e18a59144ab5631fa5
parent 935eab7965be9bf679051deb2f071764d43bfe4c
Author: William Lindholm <william_lindholm@outlook.com>
Date:   Wed, 24 May 2023 15:46:00 +0200

Improved encapsulation.

Diffstat:
M
app/src/main/java/com/example/project_assignment/Meteorite.java
 | 
23
+++++++----------------
M
app/src/main/java/com/example/project_assignment/MeteoriteActivity.java
 | 
2
+-

2 files changed, 8 insertions(+), 17 deletions(-)
diff --git a/app/src/main/java/com/example/project_assignment/Meteorite.java b/app/src/main/java/com/example/project_assignment/Meteorite.java
@@ -10,20 +10,20 @@ import com.google.gson.JsonObject;
 import com.google.gson.annotations.SerializedName;
 
 public class Meteorite implements Parcelable {
-    protected String name;
+    private final String name;
 
     @SerializedName(value = "ID", alternate = "id")
-    protected String id;
+    private final String id;
     @SerializedName(value = "size", alternate = "mass")
-    protected String mass;
+    private final String mass;
 
-    protected String category;
+    private final String category;
 
-    protected String location;
+    private String location;
 
-    private String date;
+    private final String date;
 
-    protected JsonObject auxdata;
+    private JsonObject auxdata;
 
     private double distance;
 
@@ -179,7 +179,6 @@ public class Meteorite implements Parcelable {
      */
     public String getDate() {
         if (date == null) {
-            date = auxdata.get("date").getAsString().substring(0, 4);
             return auxdata.get("date").getAsString().substring(0, 4);
         }
         return date;
@@ -229,15 +228,7 @@ public class Meteorite implements Parcelable {
         return name;
     }
 
-    public void setName(String name) {
-        this.name = name;
-    }
-
     public String getId() {
         return id;
     }
-
-    public void setId(String id) {
-        this.id = id;
-    }
 }
diff --git a/app/src/main/java/com/example/project_assignment/MeteoriteActivity.java b/app/src/main/java/com/example/project_assignment/MeteoriteActivity.java
@@ -32,7 +32,7 @@ public class MeteoriteActivity extends AppCompatActivity implements OnMapReadyCa
         TextView title = findViewById(R.id.textview_meteoriteTitle);
         TextView info = findViewById(R.id.textview_meteoriteInfo);
 
-        title.setText(meteorite.name);
+        title.setText(meteorite.getName());
         info.setText(meteorite.getDescription());
 
         SupportMapFragment mapFragment = (SupportMapFragment) getSupportFragmentManager().findFragmentById(R.id.mapFragment);