package mprog.nl.mars_weather_explorer;

import org.json.JSONObject;

/**
 * Created by Nadeche on 14-6-2016.
 */
public class ReturnDataRequestModel {

    private JSONObject jsonObject;
    private HttpRequestModel requestModel;
    private boolean internetConnection;

    public ReturnDataRequestModel (HttpRequestModel requestModel, boolean internetConnection){
        this.requestModel = requestModel;
        this.internetConnection = internetConnection;
    }

    public HttpRequestModel getRequestModel() {
        return requestModel;
    }

    public void setRequestModel(HttpRequestModel requestModel) {
        this.requestModel = requestModel;
    }

    public JSONObject getJsonObject() {
        return jsonObject;
    }

    public void setJsonObject(JSONObject jsonObject) {
        this.jsonObject = jsonObject;
    }

    public boolean isInternetConnection() {
        return internetConnection;
    }

    public void setInternetConnection(boolean internetConnection) {
        this.internetConnection = internetConnection;
    }
}

@@ -38,237 +38,627 @@
 r;%0A%0A
-import org.json.JSONObject;%0A%0A/**%0A * Created by Nadeche on 14-6-2016.%0A */%0Apublic class ReturnDataRequestModel %7B%0A%0A    private JSONObject jsonObject;%0A    private HttpRequestModel requestModel;%0A    private boolean internetConnection;
+/**%0A * ReturnDataRequestModel.java%0A *%0A * Created by Nadeche Studer%0A * */%0Aimport org.json.JSONObject;%0A%0A/**%0A * This class acts as a collector of information about a data request in progress.%0A * During the execution of the data request, the gathered data is collected in this class%0A * for later processing.%0A */%0Apublic class ReturnDataRequestModel %7B%0A%0A    private JSONObject jsonObject;          // contains the returned json data%0A    private HttpRequestModel requestModel;  // contains information about the kind of request%0A    private boolean internetConnection;     // is true if there is an internet connection available
 %0A%0A  
@@ -941,122 +941,8 @@
  %7D%0A%0A
-    public void setRequestModel(HttpRequestModel requestModel) %7B%0A        this.requestModel = requestModel;%0A    %7D%0A%0A
     
@@ -1199,136 +1199,7 @@
    %7D
-%0A%0A    public void setInternetConnection(boolean internetConnection) %7B%0A        this.internetConnection = internetConnection;%0A    %7D
 %0A%7D%0A

Refactor and comments added to ReturnDataRequestModel.