review comments

kuali · Apr 18, 2015 · 869aef0 · 869aef0
1 parent 4b2e140
commit 869aef0
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 15 deletions.
diff --git a/...src/main/java/org/kuali/coeus/s2sgen/impl/generate/support/NSFCoverPageBaseGenerator.java b/...src/main/java/org/kuali/coeus/s2sgen/impl/generate/support/NSFCoverPageBaseGenerator.java
@@ -49,7 +49,7 @@ public abstract class NSFCoverPageBaseGenerator extends S2SBaseFormGenerator {
 	protected static final int QUESTION_EARLY_CONCEPT_GRANT = 4;
 	protected static final int QUESTION_RAPIDRESPONSE_GRANT = 3;
 	protected static final int QUESTION_ACCOMPLISHMENT_RENEWAL = 5;
-    protected static final int FUNDING_MECHANISM_QUESTION = 9;
+    protected static final int FUNDING_MECHANISM_QUESTION = 10;
     protected static final int QUESTION_RESOLUTION_GRAPHICS = 6;
 
 	protected static final int SINGLE_COPY_DOCUMENT = 87;

diff --git a/...src/main/java/org/kuali/coeus/s2sgen/impl/generate/support/NSFCoverPageV1_6Generator.java b/...src/main/java/org/kuali/coeus/s2sgen/impl/generate/support/NSFCoverPageV1_6Generator.java
@@ -112,20 +112,10 @@ private NSFCoverPage16Document getNSFCoverPage16() {
 
 
 
-	private void setFundingOpportunityNumber(NSFCoverPage16 nsfCoverPage16) {
-		if (pdDoc.getDevelopmentProposal().getProgramAnnouncementNumber() != null) {
-			if (pdDoc.getDevelopmentProposal().getProgramAnnouncementNumber()
-					.length() > PROGRAM_ANNOUNCEMENT_NUMBER_MAX_LENGTH) {
-				nsfCoverPage16.setFundingOpportunityNumber(pdDoc
-						.getDevelopmentProposal()
-						.getProgramAnnouncementNumber().substring(0,
-								PROGRAM_ANNOUNCEMENT_NUMBER_MAX_LENGTH));
-			} else {
-				nsfCoverPage16.setFundingOpportunityNumber(pdDoc
-						.getDevelopmentProposal()
-						.getProgramAnnouncementNumber());
-			}
-		}
+	protected void setFundingOpportunityNumber(NSFCoverPage16 nsfCoverPage16) {
+        nsfCoverPage16.setFundingOpportunityNumber(StringUtils.substring(pdDoc
+                        .getDevelopmentProposal()
+                        .getProgramAnnouncementNumber(), 0, PROGRAM_ANNOUNCEMENT_NUMBER_MAX_LENGTH));
 	}
 
 	/**