[dcm4che-commits] CVS: dcm4jboss-ejb/src/java/org/dcm4chex/archive/ejb/entity InstanceBean.java,1.27,1.28 SeriesBean.java,1.30,1.31 StudyBean.java,1.26,1.27

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

Update of /cvsroot/dcm4che/dcm4jboss-ejb/src/java/org/dcm4chex/archive/ejb/entity
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv17793/src/java/org/dcm4chex/archive/ejb/entity

Modified Files:
	InstanceBean.java SeriesBean.java StudyBean.java 
Log Message:
+ int getAvailibilitySafe
+ boolean getHiddenSafe
+ boolean getCommitmentSafe

Index: InstanceBean.java
===================================================================
RCS file: /cvsroot/dcm4che/dcm4jboss-ejb/src/java/org/dcm4chex/archive/ejb/entity/InstanceBean.java,v
retrieving revision 1.27
retrieving revision 1.28
diff -C2 -d -r1.27 -r1.28
*** InstanceBean.java	21 May 2004 09:41:29 -0000	1.27
--- InstanceBean.java	15 Jun 2004 11:13:46 -0000	1.28
***************
*** 214,218 ****
       * Instance Availability
       *
-      * @ejb.interface-method
       * @ejb.persistence
       *  column-name="availability"
--- 214,217 ----
***************
*** 220,223 ****
--- 219,233 ----
      public abstract int getAvailability();
  
+     /**
+      * @ejb.interface-method
+      */
+     public int getAvailabilitySafe() {
+         try {
+             return getAvailability();
+         } catch (NullPointerException npe) {
+             return 0;
+         }
+     }
+     
      public abstract void setAvailability(int availability);
  
***************
*** 225,229 ****
       * Storage Commitment
       *
-      * @ejb.interface-method
       * @ejb.persistence
       *  column-name="commitment"
--- 235,238 ----
***************
*** 234,237 ****
--- 243,257 ----
       * @ejb.interface-method
       */
+     public boolean getCommitmentSafe() {
+         try {
+             return getCommitment();
+         } catch (NullPointerException npe) {
+             return false;
+         }
+     }
+     
+     /**
+      * @ejb.interface-method
+      */
      public abstract void setCommitment(boolean commitment);
  
***************
*** 336,340 ****
       */
      public boolean updateAvailability(int availability) {
!         if (availability != getAvailability()) {
              setAvailability(availability);
              return true;
--- 356,360 ----
       */
      public boolean updateAvailability(int availability) {
!         if (availability != getAvailabilitySafe()) {
              setAvailability(availability);
              return true;

Index: SeriesBean.java
===================================================================
RCS file: /cvsroot/dcm4che/dcm4jboss-ejb/src/java/org/dcm4chex/archive/ejb/entity/SeriesBean.java,v
retrieving revision 1.30
retrieving revision 1.31
diff -C2 -d -r1.30 -r1.31
*** SeriesBean.java	2 May 2004 19:13:35 -0000	1.30
--- SeriesBean.java	15 Jun 2004 11:13:46 -0000	1.31
***************
*** 229,233 ****
       * Instance Availability
       *
-      * @ejb.interface-method
       * @ejb.persistence
       *  column-name="availability"
--- 229,232 ----
***************
*** 235,238 ****
--- 234,248 ----
      public abstract int getAvailability();
  
+     /**
+      * @ejb.interface-method
+      */
+     public int getAvailabilitySafe() {
+         try {
+             return getAvailability();
+         } catch (NullPointerException npe) {
+             return 0;
+         }
+     }
+     
      public abstract void setAvailability(int availability);
  
***************
*** 240,244 ****
       * Hidden Flag
       *
-      * @ejb.interface-method
       * @ejb.persistence
       *  column-name="hidden"
--- 250,253 ----
***************
*** 246,249 ****
--- 255,269 ----
      public abstract boolean getHidden();
  
+     /**
+      * @ejb.interface-method
+      */
+     public boolean getHiddenSafe() {
+         try {
+             return getHidden();
+         } catch (NullPointerException npe) {
+             return false;
+         }
+     }
+     
      public abstract void setHidden(boolean hidden);
  
***************
*** 386,390 ****
          setNumberOfSeriesRelatedInstances(
              getNumberOfSeriesRelatedInstances() + inc);
!         if (!getHidden()) {
              getStudy().incNumberOfStudyRelatedInstances(inc);
          }
--- 406,410 ----
          setNumberOfSeriesRelatedInstances(
              getNumberOfSeriesRelatedInstances() + inc);
!         if (!getHiddenSafe()) {
              getStudy().incNumberOfStudyRelatedInstances(inc);
          }
***************
*** 395,399 ****
       */
      public void hide() {
!         if (getHidden())
              return;
          StudyLocal study = getStudy();
--- 415,419 ----
       */
      public void hide() {
!         if (getHiddenSafe())
              return;
          StudyLocal study = getStudy();
***************
*** 408,412 ****
       */
      public void unhide() {
!         if (!getHidden())
              return;
          StudyLocal study = getStudy();
--- 428,432 ----
       */
      public void unhide() {
!         if (!getHiddenSafe())
              return;
          StudyLocal study = getStudy();
***************
*** 472,478 ****
          for (Iterator it = c.iterator(); it.hasNext();) {
              InstanceLocal instance = (InstanceLocal) it.next();
!             availability = Math.max(availability, instance.getAvailability());
          }
!         if (availability != getAvailability()) {
              return false;
          }
--- 492,498 ----
          for (Iterator it = c.iterator(); it.hasNext();) {
              InstanceLocal instance = (InstanceLocal) it.next();
!             availability = Math.max(availability, instance.getAvailabilitySafe());
          }
!         if (availability != getAvailabilitySafe()) {
              return false;
          }

Index: StudyBean.java
===================================================================
RCS file: /cvsroot/dcm4che/dcm4jboss-ejb/src/java/org/dcm4chex/archive/ejb/entity/StudyBean.java,v
retrieving revision 1.26
retrieving revision 1.27
diff -C2 -d -r1.26 -r1.27
*** StudyBean.java	2 May 2004 19:13:35 -0000	1.26
--- StudyBean.java	15 Jun 2004 11:13:46 -0000	1.27
***************
*** 195,199 ****
       * Instance Availability
       *
-      * @ejb.interface-method
       * @ejb.persistence
       *  column-name="availability"
--- 195,198 ----
***************
*** 201,204 ****
--- 200,214 ----
      public abstract int getAvailability();
  
+     /**
+      * @ejb.interface-method
+      */
+     public int getAvailabilitySafe() {
+         try {
+             return getAvailability();
+         } catch (NullPointerException npe) {
+             return 0;
+         }
+     }
+ 
      public abstract void setAvailability(int availability);
      
***************
*** 370,376 ****
          for (Iterator it = c.iterator(); it.hasNext();) {
              SeriesLocal series = (SeriesLocal) it.next();
!             availability = Math.max(availability, series.getAvailability());            
          }
!         if (availability != getAvailability()) {
              setAvailability(availability);
              return true;
--- 380,386 ----
          for (Iterator it = c.iterator(); it.hasNext();) {
              SeriesLocal series = (SeriesLocal) it.next();
!             availability = Math.max(availability, series.getAvailabilitySafe());            
          }
!         if (availability != getAvailabilitySafe()) {
              setAvailability(availability);
              return true;