[Fudaa-cvs-commit] fudaa_devel/dodico/src/org/fudaa/dodico/h2d/type H2dEnumType.java,1.5,1.6 H2dFileFormatType.java,1.5,1.6

[<de...@us...>]

Update of /cvsroot/fudaa/fudaa_devel/dodico/src/org/fudaa/dodico/h2d/type
In directory sc8-pr-cvs1:/tmp/cvs-serv28839/h2d/type

Modified Files:
	H2dEnumType.java H2dFileFormatType.java 
Log Message:
Update for h2d model
Add support for evolution


Index: H2dEnumType.java
===================================================================
RCS file: /cvsroot/fudaa/fudaa_devel/dodico/src/org/fudaa/dodico/h2d/type/H2dEnumType.java,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -d -r1.5 -r1.6
*** H2dEnumType.java	25 Nov 2003 10:11:37 -0000	1.5
--- H2dEnumType.java	19 Dec 2003 12:10:36 -0000	1.6
***************
*** 8,11 ****
--- 8,12 ----
   */
  package org.fudaa.dodico.h2d.type;
+ import java.util.Comparator;
  import java.util.Iterator;
  import java.util.List;
***************
*** 60,62 ****
--- 61,77 ----
      return null;
    }
+   
+   public static class H2dEnumIDComparator implements Comparator{
+     
+       /**
+      *
+      */
+     public int compare(Object o1, Object o2) {
+       if( (o1 instanceof H2dEnumType)  && (o2 instanceof H2dEnumType)){
+         return ((H2dEnumType)o1).id_-((H2dEnumType)o2).id_;
+       }
+       throw new IllegalArgumentException("o1 and o2 must be H2dEnumType");
+     }
+ 
+ }
  }

Index: H2dFileFormatType.java
===================================================================
RCS file: /cvsroot/fudaa/fudaa_devel/dodico/src/org/fudaa/dodico/h2d/type/H2dFileFormatType.java,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -d -r1.5 -r1.6
*** H2dFileFormatType.java	25 Nov 2003 10:11:37 -0000	1.5
--- H2dFileFormatType.java	19 Dec 2003 12:10:36 -0000	1.6
***************
*** 23,28 ****
    public static final H2dFileFormatType CL=
      new H2dFileFormatType(2, H2dResource.getS("Conditions limites"));
!   public static final H2dFileFormatType CL_LIQUIDE=
!     new H2dFileFormatType(3, H2dResource.getS("Conditions limites liquides"));
    public static final H2dFileFormatType COURBE_TRANSITOIRE=
      new H2dFileFormatType(4, H2dResource.getS("Courbes transitoire"));
--- 23,28 ----
    public static final H2dFileFormatType CL=
      new H2dFileFormatType(2, H2dResource.getS("Conditions limites"));
! //  public static final H2dFileFormatType CL_LIQUIDE=
! //    new H2dFileFormatType(3, H2dResource.getS("Conditions limites liquides"));
    public static final H2dFileFormatType COURBE_TRANSITOIRE=
      new H2dFileFormatType(4, H2dResource.getS("Courbes transitoire"));
***************
*** 36,40 ****
            MAILLAGE,
            CL,
!           CL_LIQUIDE,
            COURBE_TRANSITOIRE }));
    /**
--- 36,40 ----
            MAILLAGE,
            CL,
! //          CL_LIQUIDE,
            COURBE_TRANSITOIRE }));
    /**