cvs commit: jahia/core/src/java/org/jahia/data/containers JahiaContentContainerFacade.java

[Thomas Draier]

tdraier     2005/10/12 17:43:43 CEST

  Modified files:
    core/src/java/org/jahia/data/containers 
                                            JahiaContentContainerFacade.java 
  Log:
  much better fix for field ordering (which should really work)
  
  Revision  Changes    Path
  1.12      +4 -1      
jahia/core/src/java/org/jahia/data/containers/JahiaContentContainerFacade.java
http://jahia.mine.nu:8080/cgi-bin/cvsweb.cgi/jahia/core/src/java/org/jahia/data/containers/JahiaContentContainerFacade.java.diff?r1=1.11&r2=1.12&f=h
  
  
  
  Index: JahiaContentContainerFacade.java
  ===================================================================
  RCS file: 
/home/cvs/repository/jahia/core/src/java/org/jahia/data/containers/JahiaContentContainerFacade.java,v
  retrieving revision 1.11
  retrieving revision 1.12
  diff -u -r1.11 -r1.12
  --- JahiaContentContainerFacade.java  12 Oct 2005 15:27:38 -0000      1.11
  +++ JahiaContentContainerFacade.java  12 Oct 2005 15:43:43 -0000      1.12
  @@ -503,7 +503,10 @@
               orderedFields = new Vector();
               while (en.hasMoreElements()) {
                   JahiaField jahiaField = (JahiaField) en.nextElement();
  -                orderedFields.add(this.fields.get(new 
Integer(jahiaField.getID())));
  +                Object o = this.fields.get(new Integer(jahiaField.getID()));
  +                if (o != null) {
  +                    orderedFields.add(o);
  +                }
               }
               // we must ensure that all fields are loaded correctly
               Enumeration fields = container.getFields();