Merge branch 'master' into develop

esoco · Feb 12, 2018 · 801ec68 · 801ec68
2 parents 8b0b2ed + c8ccf45
commit 801ec68
Showing 1 changed file with 19 additions and 8 deletions.
diff --git a/src/main/java/de/esoco/gwt/client/ui/DataElementSwitchPanelManager.java b/src/main/java/de/esoco/gwt/client/ui/DataElementSwitchPanelManager.java
@@ -104,9 +104,7 @@ public void collectInput(List<DataElement<?>> rModifiedElements)
 
 		if (nSelection >= 0)
 		{
-			DataElementUI<?> rDataElementUI = getDataElementUI(nSelection);
-
-			rDataElementUI.collectInput(rModifiedElements);
+			getDataElementUI(nSelection).collectInput(rModifiedElements);
 		}
 	}
 
@@ -132,7 +130,14 @@ public void handleEvent(EWTEvent rEvent)
 
 		if (nSelection >= 0)
 		{
-			getDataElementUI(nSelection).update();
+			DataElementUI<?> rDataElementUI = getDataElementUI(nSelection);
+
+			// can be NULL because GWT tab panel fires selection events on
+			// clear() which is performed on a rebuild
+			if (rDataElementUI != null)
+			{
+				rDataElementUI.update();
+			}
 		}
 	}
 
@@ -146,6 +151,15 @@ public void setSelectedElement(int nElement)
 		aSwitchPanel.setSelection(nElement);
 	}
 
+	/***************************************
+	 * {@inheritDoc}
+	 */
+	@Override
+	public void update(DataElementList rNewDataElementList, boolean bUpdateUI)
+	{
+		super.update(rNewDataElementList, bUpdateUI);
+	}
+
 	/***************************************
 	 * {@inheritDoc}
 	 */
@@ -207,8 +221,6 @@ protected void buildElementUIs()
 			setSelectedElement(getDataElementList().getProperty(CURRENT_SELECTION,
 																0));
 		}
-
-		aSwitchPanel.addEventListener(EventType.SELECTION, this);
 	}
 
 	/***************************************
@@ -245,6 +257,7 @@ protected ContainerBuilder<? extends Panel> createPanel(
 		}
 
 		aSwitchPanel = aPanelBuilder.getContainer();
+		aSwitchPanel.addEventListener(EventType.SELECTION, this);
 
 		return aPanelBuilder;
 	}
@@ -262,8 +275,6 @@ protected ContainerBuilder<? extends Panel> createPanel(
 	 */
 	private DataElementUI<?> getDataElementUI(int nIndex)
 	{
-		assert nIndex >= 0 && nIndex < getDataElementUIs().size();
-
 		Iterator<DataElementUI<?>> rUIs =
 			getDataElementUIs().values().iterator();