[dcm4che-commits] CVS: dcm4jboss-cdw/src/java/org/dcm4chex/cdw/cdrecord CDRecordService.java,1.15,1.16

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

Update of /cvsroot/dcm4che/dcm4jboss-cdw/src/java/org/dcm4chex/cdw/cdrecord
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv19451/src/java/org/dcm4chex/cdw/cdrecord

Modified Files:
	CDRecordService.java 
Log Message:
+ Label Print via acroread

Index: CDRecordService.java
===================================================================
RCS file: /cvsroot/dcm4che/dcm4jboss-cdw/src/java/org/dcm4chex/cdw/cdrecord/CDRecordService.java,v
retrieving revision 1.15
retrieving revision 1.16
diff -C2 -d -r1.15 -r1.16
*** CDRecordService.java	23 Sep 2004 01:30:26 -0000	1.15
--- CDRecordService.java	25 Sep 2004 20:36:31 -0000	1.16
***************
*** 29,32 ****
--- 29,33 ----
  import org.dcm4chex.cdw.common.FileUtils;
  import org.dcm4chex.cdw.common.JMSDelegate;
+ import org.dcm4chex.cdw.common.LabelPrintDelegate;
  import org.dcm4chex.cdw.common.MediaCreationException;
  import org.dcm4chex.cdw.common.MediaCreationRequest;
***************
*** 94,98 ****
  
      private boolean multiSession = false;
!     
      private boolean padding = false;
  
--- 95,99 ----
  
      private boolean multiSession = false;
! 
      private boolean padding = false;
  
***************
*** 114,123 ****
  
      private int mountTime = 10;
!     
      private int pauseTime = 10;
  
      private final File logFile;
  
!     protected ObjectName labelPrintName;
  
      public CDRecordService() {
--- 115,124 ----
  
      private int mountTime = 10;
! 
      private int pauseTime = 10;
  
      private final File logFile;
  
!     private final LabelPrintDelegate labelPrint = new LabelPrintDelegate(this);
  
      public CDRecordService() {
***************
*** 127,135 ****
  
      public final ObjectName getLabelPrintName() {
!         return labelPrintName;
      }
  
      public final void setLabelPrintName(ObjectName labelPrintName) {
!         this.labelPrintName = labelPrintName;
      }
  
--- 128,136 ----
  
      public final ObjectName getLabelPrintName() {
!         return labelPrint.getLabelPrintName();
      }
  
      public final void setLabelPrintName(ObjectName labelPrintName) {
!         labelPrint.setLabelPrintName(labelPrintName);
      }
  
***************
*** 177,180 ****
--- 178,197 ----
      }
  
+     public String getKeepLabelFiles() {
+         return labelPrint.getKeepLabelFiles();
+     }
+ 
+     public void setKeepLabelFiles(String s) {
+         labelPrint.setKeepLabelFiles(s);
+     }
+ 
+     public boolean isPrintLabel() {
+         return labelPrint.isPrintLabel();
+     }
+ 
+     public void setPrintLabel(boolean printLabel) {
+         labelPrint.setPrintLabel(printLabel);
+     }
+ 
      public final int getGraceTime() {
          return graceTime;
***************
*** 194,198 ****
          this.mountTime = mountTime;
      }
!     
      public final int getPauseTime() {
          return pauseTime;
--- 211,215 ----
          this.mountTime = mountTime;
      }
! 
      public final int getPauseTime() {
          return pauseTime;
***************
*** 216,228 ****
--- 233,249 ----
          return appendEnabled;
      }
+ 
      public final void setAppendEnabled(boolean appendEnabled) {
          this.appendEnabled = appendEnabled;
      }
+ 
      public final boolean isMultiSession() {
          return multiSession;
      }
+ 
      public final void setMultiSession(boolean multiSession) {
          this.multiSession = multiSession;
      }
+ 
      public final boolean isSimulate() {
          return simulate;
***************
*** 318,346 ****
                  log.info("Burned " + rq);
                  if (verify) {
!                     if (!hasTOC()) // load media
!                         throw new MediaCreationException(
!                                 ExecutionStatusInfo.PROC_FAILURE, "Verification failed!");
                      if (!mount) { // On Windows wait for automount
! 	                    if (mountTime > 0) {
! 	                        try {
! 	                            Thread.sleep(mountTime * 1000L);
! 	                        } catch (InterruptedException e) {
! 	                            log.warn("Mount Time was interrupted:", e);
! 	                        }
! 	                    }
                      } else {
                          mount();
                      }
                      try {
! 	                    log.info("Verifying " + rq);
! 	                    verify(rq.getFilesetDir());
! 	                    log.info("Verified " + rq);
                      } finally {
!                         if (mount)
!                             umount();
                      }
                      if (eject) eject();
                  }
-                 if (rq.getLabelFile() != null) printLabel(rq);
              } catch (MediaCreationException e) {
                  eject();
--- 339,367 ----
                  log.info("Burned " + rq);
                  if (verify) {
!                     if (!hasTOC())
!                             // load media
!                             throw new MediaCreationException(
!                                     ExecutionStatusInfo.PROC_FAILURE,
!                                     "Verification failed!");
                      if (!mount) { // On Windows wait for automount
!                         if (mountTime > 0) {
!                             try {
!                                 Thread.sleep(mountTime * 1000L);
!                             } catch (InterruptedException e) {
!                                 log.warn("Mount Time was interrupted:", e);
!                             }
!                         }
                      } else {
                          mount();
                      }
                      try {
!                         log.info("Verifying " + rq);
!                         verify(rq.getFilesetDir());
!                         log.info("Verified " + rq);
                      } finally {
!                         if (mount) umount();
                      }
                      if (eject) eject();
                  }
              } catch (MediaCreationException e) {
                  eject();
***************
*** 348,351 ****
--- 369,374 ----
              }
  
+             labelPrint.print(rq);
+ 
              if (rq.isCanceled()) {
                  log.info("" + rq + " was canceled");
***************
*** 375,383 ****
          rq.writeAttributes(attrs, log);
          try {
!             JMSDelegate.getInstance(rq.getMediaWriterName()).queue(log, rq,
                      System.currentTimeMillis() + retryInterval * 1000L);
          } catch (JMSException e) {
!             throw new MediaCreationException(ExecutionStatusInfo.PROC_FAILURE, e);
!         }        
      }
  
--- 398,408 ----
          rq.writeAttributes(attrs, log);
          try {
!             JMSDelegate.getInstance(rq.getMediaWriterName()).queue(log,
!                     rq,
                      System.currentTimeMillis() + retryInterval * 1000L);
          } catch (JMSException e) {
!             throw new MediaCreationException(ExecutionStatusInfo.PROC_FAILURE,
!                     e);
!         }
      }
  
***************
*** 392,408 ****
      }
  
-     private void printLabel(MediaCreationRequest rq)
-             throws MediaCreationException {
-         try {
-             server.invoke(labelPrintName,
-                     "print",
-                     new Object[] { rq},
-                     new String[] { MediaCreationRequest.class.getName()});
-         } catch (Exception e) {
-             throw new MediaCreationException(ExecutionStatusInfo.PROC_FAILURE,
-                     e);
-         }
-     }
- 
      public void burn(File isoImageFile) throws MediaCreationException {
          int exitCode;
--- 417,420 ----