[Bprocessor-commit] model/src/net/sourceforge/bprocessor/model EnergyCalc.java, 1.6, 1.7

[Michael L. <he...@us...>]

Update of /cvsroot/bprocessor/model/src/net/sourceforge/bprocessor/model
In directory sc8-pr-cvs3.sourceforge.net:/tmp/cvs-serv12885/src/net/sourceforge/bprocessor/model

Modified Files:
	EnergyCalc.java 
Log Message:
Tests for error

Index: EnergyCalc.java
===================================================================
RCS file: /cvsroot/bprocessor/model/src/net/sourceforge/bprocessor/model/EnergyCalc.java,v
retrieving revision 1.6
retrieving revision 1.7
diff -C2 -d -r1.6 -r1.7
*** EnergyCalc.java	31 Jan 2007 12:48:23 -0000	1.6
--- EnergyCalc.java	20 Mar 2007 09:46:14 -0000	1.7
***************
*** 147,150 ****
--- 147,152 ----
        }
      }
+     
+    
      if (closest != null && closest.getFrontDomain().isFunctionalSpace()) {
        spa = closest.getFrontDomain();
***************
*** 154,170 ****
      }
      
!     if (spa.getClassification() != null) {
!       if (spa.getClassification().getParent() != null && 
!           spa.getClassification().getFullId(null).equalsIgnoreCase("-10")) {
!         relevant = true;
!       }
!       if (spa.getClassification().getParent() != null && 
!           spa.getClassification().getParent().getFullId(null)
!           .equalsIgnoreCase("-10")) {
!         relevant = true;
        }
      }
      
-     
      return relevant;
    }
--- 156,173 ----
      }
      
!     if (spa != null) {
!       if (spa.getClassification() != null) {
!         if (spa.getClassification().getParent() != null && 
!             spa.getClassification().getFullId(null).equalsIgnoreCase("-10")) {
!           relevant = true;
!         }
!         if (spa.getClassification().getParent() != null && 
!             spa.getClassification().getParent().getFullId(null)
!             .equalsIgnoreCase("-10")) {
!           relevant = true;
!         }
        }
      }
      
      return relevant;
    }