interface refactoring

CIRDLES · Dec 8, 2015 · ddfb3e3 · ddfb3e3
1 parent 83807a8
commit ddfb3e3
Show file tree

Hide file tree

Showing 3 changed files with 11 additions and 4 deletions.
diff --git a/src/main/java/org/earthtime/aliquots/ReduxAliquotInterface.java b/src/main/java/org/earthtime/aliquots/ReduxAliquotInterface.java
@@ -15,6 +15,7 @@
  */
 package org.earthtime.aliquots;
 
+import java.util.Collections;
 import java.util.Vector;
 import org.earthtime.fractions.ETFractionInterface;
 
@@ -30,6 +31,13 @@ public interface ReduxAliquotInterface {
 
     public Vector<ETFractionInterface> getAliquotFractions();
 
+    public default Vector<ETFractionInterface> getAliquotFractionsSorted() {
+        if (getAliquotFractions() != null) {
+            Collections.sort(getAliquotFractions(), ETFractionInterface.FRACTION_ID_ORDER);
+        }
+        return getAliquotFractions();
+    }
+
     public void setAliquotFractions(Vector<ETFractionInterface> aliquotFractions);
 
     public boolean isCompiled();
@@ -114,6 +122,6 @@ public default Vector<ETFractionInterface> getAliquotSampleDateModelDeSelectedFr
 
         return retVal;
     }
-    
+
     public void reduceData();
 }
diff --git a/src/main/java/org/earthtime/fractions/ETFractionInterface.java b/src/main/java/org/earthtime/fractions/ETFractionInterface.java
@@ -375,8 +375,8 @@ public default ValueModel getRadiogenicIsotopeRatioByName(String ratioName) {
         ValueModel rirModel
                 = new ValueModel(ratioName.trim(),
                         ratioName.startsWith("rho") ?//
-                                new BigDecimal(ReduxConstants.NO_RHO_FLAG, ReduxConstants.mathContext15) //
-                                : BigDecimal.ZERO,// June 2010 to force out of range of legal cov [-1,,,1]0.0;
+                        new BigDecimal(ReduxConstants.NO_RHO_FLAG, ReduxConstants.mathContext15) //
+                        : BigDecimal.ZERO,// June 2010 to force out of range of legal cov [-1,,,1]0.0;
                         "ABS",
                         BigDecimal.ZERO, BigDecimal.ZERO);
 

diff --git a/src/main/java/org/earthtime/samples/SampleInterface.java b/src/main/java/org/earthtime/samples/SampleInterface.java
@@ -569,7 +569,6 @@ public default AliquotInterface getAliquotByNumber(int aliquotNum) {
         }
 
         ((ReduxAliquotInterface) retAliquot).setAliquotFractions(retFractions);
-////        retAliquot.setMyReduxLabData(ReduxLabData.getInstance());
 
         return retAliquot;
     }
-Original file line number
+Diff line change
@@ Expand Up @@
             }
             ((ReduxAliquotInterface) retAliquot).setAliquotFractions(retFractions);
-    ////        retAliquot.setMyReduxLabData(ReduxLabData.getInstance());
             return retAliquot;
         }
@@ Expand Down @@