Merge branch 'servlets'

[proteocache.git] / datadb / compbio / cassandra / DataBase.java

diff --git a/datadb/compbio/cassandra/DataBase.java b/datadb/compbio/cassandra/DataBase.java
index 2f10eef..ab21e43 100644 (file)
--- a/datadb/compbio/cassandra/DataBase.java
+++ b/datadb/compbio/cassandra/DataBase.java
@@ -17,11 +17,10 @@ public class DataBase {
        private String ip;
        private String prot;                            // protein sequence
        private String jpred;
-       private List<String> subProt;           // protein sequence divided by several parts for highlighting the particular part
        private List<Integer> timeRez;
        private List<Integer> timeTotalExec;
        private StructureJobLog logInfo;
-       private AnnotatedProteinSequenceBean predictions;
+       private ProteinBean predictions;
 
        public DataBase() {
        }
@@ -129,14 +128,6 @@ public class DataBase {
                return ip;
        }
 
-       public void setSubProt(List<String> subProt) {
-               this.subProt = subProt;
-       }
-
-       public List<String> getSubProt() {
-               return subProt;
-       }
-
        public void setTimeRez(List<Integer> timeRez) {
                this.timeRez = timeRez;
        }
@@ -161,11 +152,11 @@ public class DataBase {
                return logInfo;
        }
        
-       public void setPredictions(AnnotatedProteinSequenceBean predictions){
+       public void setPredictions(ProteinBean predictions){
                this.predictions = predictions;
        }
        
-       public AnnotatedProteinSequenceBean getPredictions() {
+       public ProteinBean getPredictions() {
                return predictions;
        }