[Acmcontester-developers] SF.net SVN: acmcontester: [116] FFManifest/src

[<se...@us...>]

Revision: 116
          http://acmcontester.svn.sourceforge.net/acmcontester/?rev=116&view=rev
Author:   sem62
Date:     2008-05-10 02:16:37 -0700 (Sat, 10 May 2008)

Log Message:
-----------
Added throwing exception at generating xml when globalObjectives is null in Objectives instance.

Modified Paths:
--------------
    FFManifest/src/FFManifest.jardesc
    FFManifest/src/edu/lnu/FireFly/FFManifest/item/sequencing/objectives/Objectives.java

Modified: FFManifest/src/FFManifest.jardesc
===================================================================
--- FFManifest/src/FFManifest.jardesc	2008-05-10 08:20:21 UTC (rev 115)
+++ FFManifest/src/FFManifest.jardesc	2008-05-10 09:16:37 UTC (rev 116)
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="WINDOWS-1251" standalone="no"?>
 <jardesc>
-    <jar path="E:/ACMContester/out/web/WebEditor/FFManifest.jar"/>
+    <jar path="s:/WebEditor/FFManifest.jar"/>
     <options buildIfNeeded="true" compress="true" descriptionLocation="/FFManifest/src/FFManifest.jardesc" exportErrors="false" exportWarnings="true" includeDirectoryEntries="false" overwrite="true" saveDescription="true" storeRefactorings="false" useSourceFolders="false"/>
     <storedRefactorings deprecationInfo="true" structuralOnly="false"/>
     <selectedProjects/>

Modified: FFManifest/src/edu/lnu/FireFly/FFManifest/item/sequencing/objectives/Objectives.java
===================================================================
--- FFManifest/src/edu/lnu/FireFly/FFManifest/item/sequencing/objectives/Objectives.java	2008-05-10 08:20:21 UTC (rev 115)
+++ FFManifest/src/edu/lnu/FireFly/FFManifest/item/sequencing/objectives/Objectives.java	2008-05-10 09:16:37 UTC (rev 116)
@@ -39,10 +39,14 @@
 	public Element asXmlElement() throws TestDocException {
 		Element result = DocumentHelper.createElement("imsss:objectives");
 
-		Element primaryObjectiveElement = primaryObjective.asXmlElement();
-		primaryObjectiveElement.setName("primaryObjective");
-		result.add(primaryObjectiveElement);
-
+		if (primaryObjective != null) {
+			Element primaryObjectiveElement = primaryObjective.asXmlElement();
+			primaryObjectiveElement.setName("primaryObjective");
+			result.add(primaryObjectiveElement);
+		} else {
+			throw new TestDocException("PrimaryObjective is mandatory element in objective, but it is absent.");
+		}
+		
 		for (int i = 0; i < objective.size(); i++) {
 			result.add(objective.get(i).asXmlElement());
 		}


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.