krlhBlupine/iBioSim
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Move to dataModels

Browse source
This commit is contained in:
Chris Myers 2019-04-20 17:49:26 -06:00
parent 92830cadcf
commit 22b91c89d6
14 changed files with 21 additions and 15 deletions
Download patch file Download diff file Expand all files Collapse all files

2
gui/src/main/java/edu/utah/ece/async/ibiosim/biomodels/AbstractResponseHandler.java → dataModels/src/main/java/edu/utah/ece/async/ibiosim/dataModels/ebiBiomodels/AbstractResponseHandler.java
View file

@ -1,4 +1,4 @@
package edu.utah.ece.async.ibiosim.biomodels;
package edu.utah.ece.async.ibiosim.dataModels.ebiBiomodels;
import com.google.gson.Gson;
import com.google.gson.GsonBuilder;

6
gui/src/main/java/edu/utah/ece/async/ibiosim/biomodels/BioModelsConnectionService.java → dataModels/src/main/java/edu/utah/ece/async/ibiosim/dataModels/ebiBiomodels/BioModelsConnectionService.java
View file

@ -1,9 +1,11 @@
package edu.utah.ece.async.ibiosim.biomodels;
package edu.utah.ece.async.ibiosim.dataModels.ebiBiomodels;
import org.apache.http.client.methods.HttpGet;
import org.apache.http.impl.client.CloseableHttpClient;
import org.apache.http.impl.client.HttpClients;
import static edu.utah.ece.async.ibiosim.dataModels.ebiBiomodels.Requests.SEARCH_RESULTS_PER_PAGE;
import java.io.IOException;
import java.util.Objects;
import java.util.Set;
@ -12,8 +14,6 @@ import java.util.stream.Collectors;
import java.util.stream.IntStream;
import java.util.stream.Stream;
import static edu.utah.ece.async.ibiosim.biomodels.Requests.SEARCH_RESULTS_PER_PAGE;
/**
* @author Mihai Glon\u021b mglont@ebi.ac.uk
*/

2
gui/src/main/java/edu/utah/ece/async/ibiosim/biomodels/CuratedModelsResponse.java → dataModels/src/main/java/edu/utah/ece/async/ibiosim/dataModels/ebiBiomodels/CuratedModelsResponse.java
View file

@ -1,4 +1,4 @@
package edu.utah.ece.async.ibiosim.biomodels;
package edu.utah.ece.async.ibiosim.dataModels.ebiBiomodels;
import java.util.Set;
import java.util.stream.Stream;

2
gui/src/main/java/edu/utah/ece/async/ibiosim/biomodels/CuratedModelsResponseHandler.java → dataModels/src/main/java/edu/utah/ece/async/ibiosim/dataModels/ebiBiomodels/CuratedModelsResponseHandler.java
View file

@ -1,4 +1,4 @@
package edu.utah.ece.async.ibiosim.biomodels;
package edu.utah.ece.async.ibiosim.dataModels.ebiBiomodels;
/**
* @author Mihai Glon\u021b mglont@ebi.ac.uk

2
gui/src/main/java/edu/utah/ece/async/ibiosim/biomodels/GetFilesResponseHandler.java → dataModels/src/main/java/edu/utah/ece/async/ibiosim/dataModels/ebiBiomodels/GetFilesResponseHandler.java
View file

@ -1,4 +1,4 @@
package edu.utah.ece.async.ibiosim.biomodels;
package edu.utah.ece.async.ibiosim.dataModels.ebiBiomodels;
/**
* @author Mihai Glon\u021b mglont@ebi.ac.uk

2
gui/src/main/java/edu/utah/ece/async/ibiosim/biomodels/GetModelFileResponseHandler.java → dataModels/src/main/java/edu/utah/ece/async/ibiosim/dataModels/ebiBiomodels/GetModelFileResponseHandler.java
View file

@ -1,4 +1,4 @@
package edu.utah.ece.async.ibiosim.biomodels;
package edu.utah.ece.async.ibiosim.dataModels.ebiBiomodels;
import java.io.BufferedReader;

2
gui/src/main/java/edu/utah/ece/async/ibiosim/biomodels/GetModelResponseHandler.java → dataModels/src/main/java/edu/utah/ece/async/ibiosim/dataModels/ebiBiomodels/GetModelResponseHandler.java
View file

@ -1,4 +1,4 @@
package edu.utah.ece.async.ibiosim.biomodels;
package edu.utah.ece.async.ibiosim.dataModels.ebiBiomodels;
/**
* @author Mihai Glon\u021b mglont@ebi.ac.uk

2
gui/src/main/java/edu/utah/ece/async/ibiosim/biomodels/ModelFileResponse.java → dataModels/src/main/java/edu/utah/ece/async/ibiosim/dataModels/ebiBiomodels/ModelFileResponse.java
View file

@ -1,4 +1,4 @@
package edu.utah.ece.async.ibiosim.biomodels;
package edu.utah.ece.async.ibiosim.dataModels.ebiBiomodels;
import java.io.BufferedReader;
import java.io.IOException;

2
gui/src/main/java/edu/utah/ece/async/ibiosim/biomodels/ModelFilesResponse.java → dataModels/src/main/java/edu/utah/ece/async/ibiosim/dataModels/ebiBiomodels/ModelFilesResponse.java
View file

@ -1,4 +1,4 @@
package edu.utah.ece.async.ibiosim.biomodels;
package edu.utah.ece.async.ibiosim.dataModels.ebiBiomodels;
import java.util.List;

2
gui/src/main/java/edu/utah/ece/async/ibiosim/biomodels/ModelResponse.java → dataModels/src/main/java/edu/utah/ece/async/ibiosim/dataModels/ebiBiomodels/ModelResponse.java
View file

@ -1,4 +1,4 @@
package edu.utah.ece.async.ibiosim.biomodels;
package edu.utah.ece.async.ibiosim.dataModels.ebiBiomodels;
import java.util.Optional;

2
gui/src/main/java/edu/utah/ece/async/ibiosim/biomodels/ModelSummary.java → dataModels/src/main/java/edu/utah/ece/async/ibiosim/dataModels/ebiBiomodels/ModelSummary.java
View file

@ -1,4 +1,4 @@
package edu.utah.ece.async.ibiosim.biomodels;
package edu.utah.ece.async.ibiosim.dataModels.ebiBiomodels;
@SuppressWarnings("unused")
public class ModelSummary implements Comparable<ModelSummary> {

2
gui/src/main/java/edu/utah/ece/async/ibiosim/biomodels/Requests.java → dataModels/src/main/java/edu/utah/ece/async/ibiosim/dataModels/ebiBiomodels/Requests.java
View file

@ -1,4 +1,4 @@
package edu.utah.ece.async.ibiosim.biomodels;
package edu.utah.ece.async.ibiosim.dataModels.ebiBiomodels;
import org.apache.http.client.methods.HttpGet;

6
gui/src/test/java/edu/utah/ece/async/ibiosim/biomodels/BioModelsConnectionServiceTest.java → dataModels/src/test/java/edu/utah/ece/async/ibiosim/biomodels/BioModelsConnectionServiceTest.java
View file

@ -5,6 +5,12 @@ import org.junit.After;
import org.junit.Before;
import org.junit.Test;
import edu.utah.ece.async.ibiosim.dataModels.ebiBiomodels.BioModelsConnectionService;
import edu.utah.ece.async.ibiosim.dataModels.ebiBiomodels.CuratedModelsResponse;
import edu.utah.ece.async.ibiosim.dataModels.ebiBiomodels.ModelFileResponse;
import edu.utah.ece.async.ibiosim.dataModels.ebiBiomodels.ModelResponse;
import edu.utah.ece.async.ibiosim.dataModels.ebiBiomodels.ModelSummary;
import java.util.Optional;
import static org.junit.Assert.*;

2
gui/src/main/java/edu/utah/ece/async/ibiosim/gui/Gui.java
View file

@ -101,7 +101,6 @@ import javax.xml.stream.XMLStreamException;
import javax.xml.transform.TransformerException;
import javax.xml.xpath.XPathExpressionException;
import edu.utah.ece.async.ibiosim.biomodels.*;
import org.antlr.runtime.ANTLRFileStream;
import org.antlr.runtime.CommonTokenStream;
import org.antlr.runtime.TokenStream;
@ -201,6 +200,7 @@ import edu.utah.ece.async.ibiosim.dataModels.util.Message;
import edu.utah.ece.async.ibiosim.dataModels.util.SEDMLutilities;
import edu.utah.ece.async.ibiosim.dataModels.util.exceptions.BioSimException;
import edu.utah.ece.async.ibiosim.dataModels.util.observe.BioObserver;
import edu.utah.ece.async.ibiosim.dataModels.ebiBiomodels.*;
import edu.utah.ece.async.ibiosim.dataModels.util.exceptions.SBOLException;
import edu.utah.ece.async.ibiosim.gui.analysisView.AnalysisView;
import edu.utah.ece.async.ibiosim.gui.graphEditor.Graph;