Menu
▾
▴
[Osmose-dev-devel] osmose/src/osmose/application/file OSMFileLoad.java, 1.1.1.1, 1.2
|
From: Olivier G. <og...@us...> - 2006-07-06 13:35:45
|
Update of /cvsroot/osmose-dev/osmose/src/osmose/application/file In directory sc8-pr-cvs3.sourceforge.net:/tmp/cvs-serv13579/src/osmose/application/file Modified Files: OSMFileLoad.java Log Message: Fixed opening presentations containing an empty property Index: OSMFileLoad.java =================================================================== RCS file: /cvsroot/osmose-dev/osmose/src/osmose/application/file/OSMFileLoad.java,v retrieving revision 1.1.1.1 retrieving revision 1.2 diff -C2 -d -r1.1.1.1 -r1.2 *** OSMFileLoad.java 30 Aug 2005 17:44:16 -0000 1.1.1.1 --- OSMFileLoad.java 6 Jul 2006 13:35:40 -0000 1.2 *************** *** 165,170 **** m_OSMDocument.getPresentation().setTitleIncluded( getPropertyInclude(n)); ! m_OSMDocument.getPresentation().setTitle(getStringCleaned(n. ! getFirstChild().getNodeValue())); m_OSMDocument.getTitleElement().setTitle(getStringCleaned( m_OSMDocument.getPresentation().getTitle())); --- 165,173 ---- m_OSMDocument.getPresentation().setTitleIncluded( getPropertyInclude(n)); ! if (n.getFirstChild()!=null) ! m_OSMDocument.getPresentation().setTitle(getStringCleaned(n. ! getFirstChild().getNodeValue())); ! else ! m_OSMDocument.getPresentation().setTitle(""); m_OSMDocument.getTitleElement().setTitle(getStringCleaned( m_OSMDocument.getPresentation().getTitle())); *************** *** 174,179 **** m_OSMDocument.getPresentation().setAuthorNameIncluded( getPropertyInclude(n)); ! m_OSMDocument.getPresentation().setAuthorName( ! getStringCleaned(n.getFirstChild().getNodeValue())); } else --- 177,185 ---- m_OSMDocument.getPresentation().setAuthorNameIncluded( getPropertyInclude(n)); ! if (n.getFirstChild()!=null) ! m_OSMDocument.getPresentation().setAuthorName( ! getStringCleaned(n.getFirstChild().getNodeValue())); ! else ! m_OSMDocument.getPresentation().setAuthorName(""); } else *************** *** 181,186 **** m_OSMDocument.getPresentation().setAuthorOrganismIncluded( getPropertyInclude(n)); ! m_OSMDocument.getPresentation().setAuthorOrganism( ! getStringCleaned(n.getFirstChild().getNodeValue())); } else --- 187,195 ---- m_OSMDocument.getPresentation().setAuthorOrganismIncluded( getPropertyInclude(n)); ! if (n.getFirstChild()!=null) ! m_OSMDocument.getPresentation().setAuthorOrganism( ! getStringCleaned(n.getFirstChild().getNodeValue())); ! else ! m_OSMDocument.getPresentation().setAuthorOrganism(""); } else *************** *** 188,193 **** m_OSMDocument.getPresentation().setAuthorAddressIncluded( getPropertyInclude(n)); ! m_OSMDocument.getPresentation().setAuthorAddress( ! getStringCleaned(n.getFirstChild().getNodeValue())); } else --- 197,205 ---- m_OSMDocument.getPresentation().setAuthorAddressIncluded( getPropertyInclude(n)); ! if (n.getFirstChild()!=null) ! m_OSMDocument.getPresentation().setAuthorAddress( ! getStringCleaned(n.getFirstChild().getNodeValue())); ! else ! m_OSMDocument.getPresentation().setAuthorAddress(""); } else *************** *** 195,200 **** m_OSMDocument.getPresentation().setVersionNumberIncluded( getPropertyInclude(n)); ! m_OSMDocument.getPresentation().setVersionNumber( ! getStringCleaned(n.getFirstChild().getNodeValue())); } else --- 207,215 ---- m_OSMDocument.getPresentation().setVersionNumberIncluded( getPropertyInclude(n)); ! if (n.getFirstChild()!=null) ! m_OSMDocument.getPresentation().setVersionNumber( ! getStringCleaned(n.getFirstChild().getNodeValue())); ! else ! m_OSMDocument.getPresentation().setVersionNumber(""); } else *************** *** 202,207 **** m_OSMDocument.getPresentation().setVersionDateIncluded( getPropertyInclude(n)); ! m_OSMDocument.getPresentation().setVersionDate( ! getStringCleaned(n.getFirstChild().getNodeValue())); } else --- 217,225 ---- m_OSMDocument.getPresentation().setVersionDateIncluded( getPropertyInclude(n)); ! if (n.getFirstChild()!=null) ! m_OSMDocument.getPresentation().setVersionDate( ! getStringCleaned(n.getFirstChild().getNodeValue())); ! else ! m_OSMDocument.getPresentation().setVersionDate(""); } else *************** *** 209,214 **** m_OSMDocument.getPresentation().setKeywordsIncluded( getPropertyInclude(n)); ! m_OSMDocument.getPresentation().setKeywords(n.getFirstChild(). ! getNodeValue()); } else --- 227,235 ---- m_OSMDocument.getPresentation().setKeywordsIncluded( getPropertyInclude(n)); ! if (n.getFirstChild()!=null) ! m_OSMDocument.getPresentation().setKeywords(n.getFirstChild(). ! getNodeValue()); ! else ! m_OSMDocument.getPresentation().setKeywords(""); } else *************** *** 216,221 **** m_OSMDocument.getPresentation().setResumeIncluded( getPropertyInclude(n)); ! m_OSMDocument.getPresentation().setResume(n.getFirstChild(). ! getNodeValue()); } else --- 237,245 ---- m_OSMDocument.getPresentation().setResumeIncluded( getPropertyInclude(n)); ! if (n.getFirstChild()!=null) ! m_OSMDocument.getPresentation().setResume(n.getFirstChild(). ! getNodeValue()); ! else ! m_OSMDocument.getPresentation().setResume(""); } else *************** *** 223,228 **** m_OSMDocument.getPresentation().setPurposeIncluded( getPropertyInclude(n)); ! m_OSMDocument.getPresentation().setPurpose(n.getFirstChild(). ! getNodeValue()); } else --- 247,255 ---- m_OSMDocument.getPresentation().setPurposeIncluded( getPropertyInclude(n)); ! if (n.getFirstChild()!=null) ! m_OSMDocument.getPresentation().setPurpose(n.getFirstChild(). ! getNodeValue()); ! else ! m_OSMDocument.getPresentation().setPurpose(""); } else |
