tracker 10451 - call isSplitTypePreventInhibited on fill context

TIBCOSoftware · Jul 17, 2018 · 263d245 · 263d245
1 parent f80f073
commit 263d245
Show file tree

Hide file tree

Showing 7 changed files with 31 additions and 2 deletions.
diff --git a/jasperreports/src/net/sf/jasperreports/components/list/FillListContents.java b/jasperreports/src/net/sf/jasperreports/components/list/FillListContents.java
@@ -140,4 +140,11 @@ protected void finalizeElementPositions()
 			moveBandBottomElements();
 		}
 	}
+
+	@Override
+	public boolean isSplitTypePreventInhibited(boolean isTopLevelCall)
+	{
+		//FIXME implement logic
+		return false;
+	}
 }
diff --git a/jasperreports/src/net/sf/jasperreports/engine/fill/FillContainerContext.java b/jasperreports/src/net/sf/jasperreports/engine/fill/FillContainerContext.java
@@ -36,4 +36,6 @@ public interface FillContainerContext
 
 	boolean isCurrentOverflowAllowed();
 
+	boolean isSplitTypePreventInhibited(boolean isTopLevelCall);
+
 }
diff --git a/jasperreports/src/net/sf/jasperreports/engine/fill/FillerSubreportParent.java b/jasperreports/src/net/sf/jasperreports/engine/fill/FillerSubreportParent.java
@@ -113,7 +113,7 @@ public boolean isPageBreakInhibited()
 	@Override
 	public boolean isSplitTypePreventInhibited(boolean isTopLevelCall)
 	{
-		return parentElement.getBand().isSplitTypePreventInhibited(isTopLevelCall);
+		return parentElement.isSplitTypePreventInhibited(isTopLevelCall);
 	}
 
 	@Override

diff --git a/jasperreports/src/net/sf/jasperreports/engine/fill/JRFillBand.java b/jasperreports/src/net/sf/jasperreports/engine/fill/JRFillBand.java
@@ -612,7 +612,8 @@ protected boolean isSplitTypePreventInhibited()
 		return isSplitTypePreventInhibited(true);
 	}
 
-	protected boolean isSplitTypePreventInhibited(boolean isTopLevelCall)
+	@Override
+	public boolean isSplitTypePreventInhibited(boolean isTopLevelCall)
 	{
 		boolean isSplitTypePreventInhibited = false;
 

diff --git a/jasperreports/src/net/sf/jasperreports/engine/fill/JRFillCellContents.java b/jasperreports/src/net/sf/jasperreports/engine/fill/JRFillCellContents.java
@@ -798,4 +798,11 @@ protected void addHtmlClass(String className)
 		setPrintProperty(HtmlExporter.PROPERTY_HTML_CLASS, newClasses);
 	}
 
+	@Override
+	public boolean isSplitTypePreventInhibited(boolean isTopLevelCall)
+	{
+		//FIXME implement logic
+		return false;
+	}
+
 }
diff --git a/jasperreports/src/net/sf/jasperreports/engine/fill/JRFillFrame.java b/jasperreports/src/net/sf/jasperreports/engine/fill/JRFillFrame.java
@@ -511,6 +511,13 @@ protected int getActualContainerHeight()
 
 			return containerHeight; 
 		}
+
+		@Override
+		public boolean isSplitTypePreventInhibited(boolean isTopLevelCall)
+		{
+			//not actually called because fillContainerContext in the children is actually the band
+			return JRFillFrame.this.fillContainerContext.isSplitTypePreventInhibited(isTopLevelCall);
+		}
 	}
 
 }
diff --git a/jasperreports/src/net/sf/jasperreports/engine/fill/JRFillSubreport.java b/jasperreports/src/net/sf/jasperreports/engine/fill/JRFillSubreport.java
@@ -1241,4 +1241,9 @@ protected String getReportName()
 	{
 		return getReport().getName();
 	}
+
+	protected boolean isSplitTypePreventInhibited(boolean isTopLevelCall)
+	{
+		return fillContainerContext.isSplitTypePreventInhibited(isTopLevelCall);
+	}
 }