Reorder systemthermo

src/main/java/neqsim/thermo/system/SystemInterface.java

@@ -6,6 +6,7 @@
 import neqsim.thermo.characterization.WaxModelInterface;
 import neqsim.thermo.component.ComponentInterface;
 import neqsim.thermo.phase.PhaseInterface;
+import neqsim.thermo.phase.PhaseType;
 
 /**
  * <p>
@@ -997,14 +998,36 @@ public void addPlusFraction(String componentName, double numberOfMoles, double m
    */
   public void setBmixType(int bmixType);
 
+  /**
+   * Verify if system has a phase of a specific type.
+   *
+   * @param pt PhaseType to look for
+   * @return True if system contains a phase of requested type
+   */
+  public boolean hasPhaseType(PhaseType pt);
+
+  /**
+   * Verify if system has a phase of a specific type.
+   *
+   * @param phaseTypeName PhaseType to look for
+   * @return True if system contains a phase of requested type
+   * @deprecated Replaced by {@link hasPhaseType}
+   */
+  @Deprecated
+  public default boolean hasPhaseType(String phaseTypeName) {
+    return hasPhaseType(PhaseType.byDesc(phaseTypeName));
+  }
+
   /**
    * <p>
    * hasSolidPhase.
    * </p>
    *
-   * @return a boolean
+   * @return True if system contains a solid phase
    */
-  public boolean hasSolidPhase();
+  public default boolean hasSolidPhase() {
+    return hasPhaseType(PhaseType.SOLID);
+  }
 
   /**
    * <p>
@@ -2360,16 +2383,6 @@ public default double getNumberOfMoles() {
    */
   public void setTotalNumberOfMoles(double totalNumberOfMoles);
 
-  /**
-   * <p>
-   * hasPhaseType.
-   * </p>
-   *
-   * @param phaseTypeName a {@link java.lang.String} object
-   * @return a boolean
-   */
-  public boolean hasPhaseType(String phaseTypeName);
-
   /**
    * <p>
    * getPhaseNumberOfPhase.