[Nmrshiftdb-devel] CVS: nmrshiftdb/src/java/org/openscience/nmrshiftdb/util IntTriple.java,1.1,1.2 S
Brought to you by:
steinbeck
|
From: Stefan K. <sh...@us...> - 2002-03-05 09:29:08
|
Update of /cvsroot/nmrshiftdb/nmrshiftdb/src/java/org/openscience/nmrshiftdb/util
In directory usw-pr-cvs1:/tmp/cvs-serv29878/src/java/org/openscience/nmrshiftdb/util
Modified Files:
IntTriple.java SubmittingData.java
Log Message:
New Version
Index: IntTriple.java
===================================================================
RCS file: /cvsroot/nmrshiftdb/nmrshiftdb/src/java/org/openscience/nmrshiftdb/util/IntTriple.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -r1.1 -r1.2
*** IntTriple.java 27 Feb 2002 14:08:52 -0000 1.1
--- IntTriple.java 5 Mar 2002 09:29:04 -0000 1.2
***************
*** 1,11 ****
package org.openscience.nmrshiftdb.util;
! public class IntTriple{
public int value1;
public int value2;
! public int value3;
!
! public String toString(){
! return(new String(""+value1+" "+value2+" "+value3));
}
}
--- 1,33 ----
package org.openscience.nmrshiftdb.util;
! /**
! *Description of the Class
! *
! * @author shk3
! * @created 4. März 2002
! */
! public class IntTriple {
! /**
! *Shift
! */
public int value1;
+ /**
+ *Intensity
+ */
public int value2;
! /**
! *Atom assigned, -1==none
! */
! public int value3 = -1;
!
!
! /**
! *Description of the Method
! *
! * @return Description of the Returned Value
! */
! public String toString() {
! return (new String("" + value1 + " " + value2 + " " + value3));
}
}
+
Index: SubmittingData.java
===================================================================
RCS file: /cvsroot/nmrshiftdb/nmrshiftdb/src/java/org/openscience/nmrshiftdb/util/SubmittingData.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -r1.2 -r1.3
*** SubmittingData.java 28 Feb 2002 15:45:29 -0000 1.2
--- SubmittingData.java 5 Mar 2002 09:29:04 -0000 1.3
***************
*** 3,64 ****
import java.util.*;
! public class SubmittingData{
! String molecule="";
! ArrayList signalstable=new ArrayList();
! String solvent="";
! int fieldStrength=0;
! long temperature=0;
! String chemName="";
! public void setChemName(String chemName){
! this.chemName=chemName;
}
!
! public String getChemName(){
! return(chemName);
}
! public void setTemperature(long temperature){
! this.temperature=temperature;
}
!
! public long getTemperature(){
! return(temperature);
}
! public void setFieldStrength(int fieldStrength){
! this.fieldStrength=fieldStrength;
}
!
! public int getFieldStrength(){
! return(fieldStrength);
}
! public void setSolvent(String sol){
! solvent=sol;
}
!
! public String getSolvent(){
! return(solvent);
}
! public void setMolecule(String mol){
! molecule=mol;
}
!
! public String getMolecule(){
! return(molecule);
}
!
! public void setSignalstable(ArrayList al){
! signalstable=al;
}
!
! public ArrayList getSignalstable(){
! return(signalstable);
}
!
! public void addToSignalstable(Object signal){
signalstable.add(signal);
}
}
--- 3,149 ----
import java.util.*;
! /**
! *This class is used for holding the data of a molecule and an assigned spectrum in the session while the user is doing the sumbmit
! *
! * @author shk3
! * @created 4. März 2002
! */
! public class SubmittingData {
! String molecule = "";
! ArrayList signalstable = new ArrayList();
! String solvent = "";
! int fieldStrength = 0;
! long temperature = 0;
! String chemName = "";
!
! /**
! *Sets the chemName attribute of the SubmittingData object
! *
! * @param chemName The new chemName value
! */
! public void setChemName(String chemName) {
! this.chemName = chemName;
}
!
!
! /**
! *Sets the temperature attribute of the SubmittingData object
! *
! * @param temperature The new temperature value
! */
! public void setTemperature(long temperature) {
! this.temperature = temperature;
}
!
! /**
! *Sets the fieldStrength attribute of the SubmittingData object
! *
! * @param fieldStrength The new fieldStrength value
! */
! public void setFieldStrength(int fieldStrength) {
! this.fieldStrength = fieldStrength;
}
!
!
! /**
! *Sets the solvent attribute of the SubmittingData object
! *
! * @param sol The new solvent value
! */
! public void setSolvent(String sol) {
! solvent = sol;
}
!
! /**
! *Sets the molecule attribute of the SubmittingData object
! *
! * @param mol The new molecule value
! */
! public void setMolecule(String mol) {
! molecule = mol;
}
!
!
! /**
! *Sets the signalstable attribute of the SubmittingData object
! *
! * @param al The new signalstable value
! */
! public void setSignalstable(ArrayList al) {
! signalstable = al;
}
!
! /**
! *Gets the chemName attribute of the SubmittingData object
! *
! * @return The chemName value
! */
! public String getChemName() {
! return (chemName);
}
!
!
! /**
! *Gets the temperature attribute of the SubmittingData object
! *
! * @return The temperature value
! */
! public long getTemperature() {
! return (temperature);
}
!
! /**
! *Gets the fieldStrength attribute of the SubmittingData object
! *
! * @return The fieldStrength value
! */
! public int getFieldStrength() {
! return (fieldStrength);
}
!
!
! /**
! *Gets the solvent attribute of the SubmittingData object
! *
! * @return The solvent value
! */
! public String getSolvent() {
! return (solvent);
}
!
!
! /**
! *Gets the molecule attribute of the SubmittingData object
! *
! * @return The molecule value
! */
! public String getMolecule() {
! return (molecule);
}
!
!
! /**
! *Gets the signalstable attribute of the SubmittingData object
! *
! * @return The signalstable value
! */
! public ArrayList getSignalstable() {
! return (signalstable);
}
!
!
! /**
! *Adds a feature to the ToSignalstable attribute of the SubmittingData object
! *
! * @param signal The feature to be added to the ToSignalstable attribute
! */
! public void addToSignalstable(Object signal) {
signalstable.add(signal);
}
}
+
|