You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@myfaces.apache.org by we...@apache.org on 2015/04/25 19:01:19 UTC
svn commit: r1676039 -
/myfaces/tobago/trunk/tobago-extension/tobago-sandbox/src/main/java/org/apache/myfaces/tobago/renderkit/html/scarborough/standard/tag/SplitLayoutRenderer.java
Author: weber
Date: Sat Apr 25 17:01:19 2015
New Revision: 1676039
URL: http://svn.apache.org/r1676039
Log:
TOBAGO-1459 - Possilble NPE in SplitLayoutRenderer
Modified:
myfaces/tobago/trunk/tobago-extension/tobago-sandbox/src/main/java/org/apache/myfaces/tobago/renderkit/html/scarborough/standard/tag/SplitLayoutRenderer.java
Modified: myfaces/tobago/trunk/tobago-extension/tobago-sandbox/src/main/java/org/apache/myfaces/tobago/renderkit/html/scarborough/standard/tag/SplitLayoutRenderer.java
URL: http://svn.apache.org/viewvc/myfaces/tobago/trunk/tobago-extension/tobago-sandbox/src/main/java/org/apache/myfaces/tobago/renderkit/html/scarborough/standard/tag/SplitLayoutRenderer.java?rev=1676039&r1=1676038&r2=1676039&view=diff
==============================================================================
--- myfaces/tobago/trunk/tobago-extension/tobago-sandbox/src/main/java/org/apache/myfaces/tobago/renderkit/html/scarborough/standard/tag/SplitLayoutRenderer.java (original)
+++ myfaces/tobago/trunk/tobago-extension/tobago-sandbox/src/main/java/org/apache/myfaces/tobago/renderkit/html/scarborough/standard/tag/SplitLayoutRenderer.java Sat Apr 25 17:01:19 2015
@@ -115,15 +115,20 @@ public class SplitLayoutRenderer extends
final LayoutComponent firstComponent = container.getComponents().get(0);
final LayoutComponent secondComponent = container.getComponents().get(1);
+ Measure minimum;
if (AbstractUISplitLayout.HORIZONTAL.equals(layout.getOrientation())) {
- final int minimumSize1 = firstComponent.getMinimumWidth().getPixel();
- final int minimumSize2 = secondComponent.getMinimumWidth().getPixel();
+ minimum = firstComponent.getMinimumWidth();
+ final int minimumSize1 = minimum != null ? minimum.getPixel() : 0;
+ minimum = secondComponent.getMinimumWidth();
+ final int minimumSize2 = minimum != null ? minimum.getPixel() : 0;
final int totalSize = container.getCurrentWidth().getPixel();
return new StringBuilder("[").append(minimumSize1).append(", 0, ").append(totalSize-minimumSize2).append(", 0]")
.toString();
} else {
- final int minimumSize1 = firstComponent.getMinimumHeight().getPixel();
- final int minimumSize2 = secondComponent.getMinimumHeight().getPixel();
+ minimum = firstComponent.getMinimumHeight();
+ final int minimumSize1 = minimum != null ? minimum.getPixel() : 0;
+ minimum = secondComponent.getMinimumHeight();
+ final int minimumSize2 = minimum != null ? minimum.getPixel() : 0;
final int totalSize = container.getCurrentHeight().getPixel();
return new StringBuilder("[0, ").append(minimumSize1).append(", 0, ").append(totalSize-minimumSize2).append("]")
.toString();