[dcm4che-commits] CVS: dcm4jboss-ejb/src/java/org/dcm4chex/archive/common SeriesStored.java, 1.5, 1.6

[gunter z. <gun...@us...>]

Update of /cvsroot/dcm4che/dcm4jboss-ejb/src/java/org/dcm4chex/archive/common
In directory sc8-pr-cvs12.sourceforge.net:/tmp/cvs-serv2956/src/java/org/dcm4chex/archive/common

Modified Files:
	SeriesStored.java 
Log Message:
[#DCMEE-370] Include Study and Series Information in Series Stored Notification

Index: SeriesStored.java
===================================================================
RCS file: /cvsroot/dcm4che/dcm4jboss-ejb/src/java/org/dcm4chex/archive/common/SeriesStored.java,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -d -r1.5 -r1.6
*** SeriesStored.java	7 Jan 2007 23:16:32 -0000	1.5
--- SeriesStored.java	30 Apr 2007 08:43:19 -0000	1.6
***************
*** 41,45 ****
  
  import java.io.Serializable;
- import java.net.InetAddress;
  
  import org.dcm4che.data.Dataset;
--- 41,44 ----
***************
*** 53,126 ****
  public class SeriesStored implements Serializable {
  
!     private static final long serialVersionUID = 3482736440136478280L;
!     private InetAddress remoteAddress;
!     private String callingAET;
  
!     private String patientID;
!     private String patientName;
!     private String retrieveAET;
!     private String accessionNumber;
      private final Dataset ian;
  
!     public SeriesStored(Dataset ian) {
          this.ian = ian;
      }
  
      public String toString() {
!         return "SeriesStored[calling=" + callingAET + ", suid="
!                 + (ian != null ? ian.getString(Tags.StudyInstanceUID) : null)
!                 + "]";
!     }
! 
!     public final Dataset getIAN() {
!         return ian;
!     }
! 
!     public final String getCallingAET() {
!         return callingAET;
      }
  
!     public final void setCallingAET(String callingAET) {
!         this.callingAET = callingAET;
      }
  
!     public final String getRetrieveAET() {
!         return retrieveAET;
      }
  
!     public final void setRetrieveAET(String retrieveAET) {
!         this.retrieveAET = retrieveAET;
      }
  
!     public final String getPatientID() {
!         return patientID;
      }
  
!     public final void setPatientID(String patientID) {
!         this.patientID = patientID;
      }
  
!     public final String getPatientName() {
!         return patientName;
      }
  
!     public final void setPatientName(String patientName) {
!         this.patientName = patientName;
      }
  
!     public final String getAccessionNumber() {
!         return accessionNumber;
      }
  
!     public final void setAccessionNumber(String accessionNumber) {
!         this.accessionNumber = accessionNumber;
      }
  
!     public final InetAddress getRemoteAddress() {
!         return remoteAddress;
      }
  
!     public final void setRemoteAddress(InetAddress remoteAddress) {
!         this.remoteAddress = remoteAddress;
      }
  
--- 52,130 ----
  public class SeriesStored implements Serializable {
  
!     private static final long serialVersionUID = -8664338212703072265L;
  
!     private final Dataset patAttrs;
!     private final Dataset studyAttrs;
!     private final Dataset seriesAttrs;
      private final Dataset ian;
  
!     public SeriesStored(Dataset patient, Dataset study, Dataset series,
!             Dataset ian) {
!         if (patient == null) {
!             throw new NullPointerException("patient");
!         }
!         if (study == null) {
!             throw new NullPointerException("study");
!         }
!         if (series == null) {
!             throw new NullPointerException("series");
!         }
!         if (ian == null) {
!             throw new NullPointerException("ian");
!         }
!         this.patAttrs = patient;
!         this.studyAttrs = study;
!         this.seriesAttrs = series;
          this.ian = ian;
      }
  
      public String toString() {
!         return "SeriesStored[calling=" + getCallingAET() + ", suid="
!                 + getStudyInstanceUID() + "]";
      }
  
!     public final Dataset getPatientAttrs() {
!         return patAttrs;
      }
  
!     public final Dataset getStudyAttrs() {
!         return studyAttrs;
      }
  
!     public final Dataset getSeriesAttrs() {
!         return seriesAttrs;
      }
  
!     public final Dataset getIAN() {
!         return ian;
      }
  
!     public final String getCallingAET() {
!         seriesAttrs.setPrivateCreatorID(PrivateTags.CreatorID);
!         return seriesAttrs.getString(PrivateTags.CallingAET);
      }
  
!     public String getRetrieveAET() {
!         return seriesAttrs.getString(Tags.RetrieveAET);
      }
  
!     public String getPatientID() {
!         return patAttrs.getString(Tags.PatientID);
      }
  
!     public String getPatientName() {
!         return patAttrs.getString(Tags.PatientName);
      }
  
!     public String getStudyInstanceUID() {
!         return studyAttrs.getString(Tags.StudyInstanceUID);
      }
  
!     public String getAccessionNumber() {
!         return studyAttrs.getString(Tags.AccessionNumber);
      }
  
!     public String getSeriesInstanceUID() {
!         return seriesAttrs.getString(Tags.SeriesInstanceUID);
      }