[Osmose-dev-devel] osmose/src/osmose/application/file OSMFile.java, 1.4, 1.5 OSMFileLoad.java, 1.3, 1.4 OSMFileSaveAs.java, 1.2, 1.3

[Olivier G. <og...@us...>]

Update of /cvsroot/osmose-dev/osmose/src/osmose/application/file
In directory sc8-pr-cvs3.sourceforge.net:/tmp/cvs-serv6501/src/osmose/application/file

Modified Files:
	OSMFile.java OSMFileLoad.java OSMFileSaveAs.java 
Log Message:
Added choice for putting bullet lists in notes (by Fatimatou)

Index: OSMFile.java
===================================================================
RCS file: /cvsroot/osmose-dev/osmose/src/osmose/application/file/OSMFile.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** OSMFile.java	3 Oct 2007 21:31:14 -0000	1.4
--- OSMFile.java	17 Feb 2008 22:11:51 -0000	1.5
***************
*** 92,95 ****
--- 92,96 ----
    public static final String OSM_SLIDE_MODEL="model";
    public static final String OSM_SLIDE_TYPE="type";
+   public static final String OSM_SLIDE_STATE_BOX ="statebox";
    public static final String OSM_SLIDE_TITLE="title";
    public static final String OSM_SLIDE_NUMBER="number";

Index: OSMFileLoad.java
===================================================================
RCS file: /cvsroot/osmose-dev/osmose/src/osmose/application/file/OSMFileLoad.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** OSMFileLoad.java	3 Oct 2007 21:31:15 -0000	1.3
--- OSMFileLoad.java	17 Feb 2008 22:11:51 -0000	1.4
***************
*** 768,772 ****
    }
  
! 
    /**
     * It returns an integer that indicates the type of the slide
--- 768,787 ----
    }
  
!   /**
!    * It returns a boolean that indicates the state of the checkbox of the slide
!    * @param node the part of the file to be analyzed
!    * @return a boolean representing the stateof the checkbox of the slide
!    */
!   private boolean getSlideStateBox(Node node) {
!     boolean state = false;
!     NamedNodeMap map = node.getAttributes();
!     if(map.getLength() > 0) {
!       Node n = map.getNamedItem(OSMFile.OSM_SLIDE_STATE_BOX);
!       if(n != null)
!         state= Boolean.valueOf(getStringCleaned(n.getNodeValue())).booleanValue();
!     }
!     return state;
!   }
!   
    /**
     * It returns an integer that indicates the type of the slide
***************
*** 793,798 ****
      OSMElement elt = this.m_OSMDocument.getElementById(getSlideParent(n));
      int slideType = getSlideType(n);
!     if ( (elt != null) || (slideType == OSMSlide.TITLE) ||
!         (slideType == OSMSlide.SUMMARY)) {
        OSMSlide slide = null;
        if (slideType == OSMSlide.TITLE)
--- 808,813 ----
      OSMElement elt = this.m_OSMDocument.getElementById(getSlideParent(n));
      int slideType = getSlideType(n);
!     boolean statebox = getSlideStateBox(n);
!     if ( (elt != null) || (slideType == OSMSlide.TITLE) || (slideType == OSMSlide.SUMMARY)) {
        OSMSlide slide = null;
        if (slideType == OSMSlide.TITLE)
***************
*** 805,808 ****
--- 820,824 ----
          elt.setPage(slide);
        }
+       slide.setStateBox(statebox);
        NodeList children = n.getChildNodes();
        for (int k = 0; k < children.getLength(); k++) {
***************
*** 842,846 ****
        }
        if (slideType == OSMSlide.NORMAL) {
- 
          //Adds the slide that parent is on the line to the presentation.
          if (elt.isOnTheLine())
--- 858,861 ----

Index: OSMFileSaveAs.java
===================================================================
RCS file: /cvsroot/osmose-dev/osmose/src/osmose/application/file/OSMFileSaveAs.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** OSMFileSaveAs.java	3 Oct 2007 21:31:15 -0000	1.2
--- OSMFileSaveAs.java	17 Feb 2008 22:11:51 -0000	1.3
***************
*** 110,115 ****
      return str;
    }
! 
! 
    /**
     * it saves the properties (of a slide, a title, a media .....)
--- 110,114 ----
      return str;
    }
!   
    /**
     * it saves the properties (of a slide, a title, a media .....)
***************
*** 416,423 ****
      // Open slide tag
      String att = OSMFile.OSM_SLIDE_ATT_PARENT + "=\"" + slide.getElement().getID() + "\" ";
!     att += OSMFile.OSM_SLIDE_TYPE + "=\"" + slide.getType() + "\"";
      String str = OSMFile.getTag1(OSMFile.OSM_SLIDE_TAG, att) + "\n";
  
- 
      // Save model
      str += OSMFile.getTag1(OSMFile.OSM_SLIDE_MODEL) + slide.getModel().getName() + OSMFile.getTag2(OSMFile.OSM_SLIDE_MODEL) + "\n";
--- 415,422 ----
      // Open slide tag
      String att = OSMFile.OSM_SLIDE_ATT_PARENT + "=\"" + slide.getElement().getID() + "\" ";
!     att += OSMFile.OSM_SLIDE_TYPE + "=\"" + slide.getType() + "\" ";
!     att += OSMFile.OSM_SLIDE_STATE_BOX + "=\"" + slide.getStateBox() + "\"";
      String str = OSMFile.getTag1(OSMFile.OSM_SLIDE_TAG, att) + "\n";
  
      // Save model
      str += OSMFile.getTag1(OSMFile.OSM_SLIDE_MODEL) + slide.getModel().getName() + OSMFile.getTag2(OSMFile.OSM_SLIDE_MODEL) + "\n";
***************
*** 443,447 ****
      str += saveSlideOralNotes(slide) + "\n";
  
- 
      // Close slide tag
      str += OSMFile.getTag2(OSMFile.OSM_SLIDE_TAG) + "\n";
--- 442,445 ----
***************
*** 482,486 ****
      return sRet;
    }
! 
    /**
     * it saves the body of the slide in XML format
--- 480,484 ----
      return sRet;
    }
!   
    /**
     * it saves the body of the slide in XML format