Add DisposalHelper class

gdx/res/com/badlogic/gdx.gwt.xml

@@ -424,8 +424,10 @@
 		<include name="utils/DataOutput.java"/>
 		<include name="utils/DelayedRemovalArray.java"/>
 		<include name="utils/Disposable.java"/>
+		<include name="utils/DisposalHelper.java"/>
 		<include name="utils/FloatArray.java"/>
 		<include name="utils/FlushablePool.java"/>
+		<include name="utils/GdxComplexDisposalException.java"/>
 		<exclude name="utils/GdxNativesLoader.java"/> <!-- Reason: Natives -->
 		<include name="utils/GdxRuntimeException.java"/>
 		<include name="utils/I18NBundle.java"/>

gdx/src/com/badlogic/gdx/graphics/Mesh.java

@@ -44,6 +44,7 @@
 import com.badlogic.gdx.math.collision.BoundingBox;
 import com.badlogic.gdx.utils.Array;
 import com.badlogic.gdx.utils.Disposable;
+import com.badlogic.gdx.utils.DisposalHelper;
 import com.badlogic.gdx.utils.GdxRuntimeException;
 
 /**
@@ -660,9 +661,7 @@ public void render (ShaderProgram shader, int primitiveType, int offset, int cou
 	/** Frees all resources associated with this Mesh */
 	public void dispose () {
 		if (meshes.get(Gdx.app) != null) meshes.get(Gdx.app).removeValue(this, true);
-		vertices.dispose();
-		if (instances != null) instances.dispose();
-		indices.dispose();
+		DisposalHelper.disposeAll(vertices, instances, indices);
 	}
 
 	/** Returns the first {@link VertexAttribute} having the given {@link Usage}.

gdx/src/com/badlogic/gdx/graphics/g2d/SpriteCache.java

@@ -35,6 +35,7 @@
 import com.badlogic.gdx.math.Matrix4;
 import com.badlogic.gdx.utils.Array;
 import com.badlogic.gdx.utils.Disposable;
+import com.badlogic.gdx.utils.DisposalHelper;
 import com.badlogic.gdx.utils.GdxRuntimeException;
 import com.badlogic.gdx.utils.IntArray;
 
@@ -942,8 +943,7 @@ public void draw (int cacheID, int offset, int length) {
 
 	/** Releases all resources held by this SpriteCache. */
 	public void dispose () {
-		mesh.dispose();
-		if (shader != null) shader.dispose();
+		DisposalHelper.disposeAll(mesh, shader);
 	}
 
 	public Matrix4 getProjectionMatrix () {

gdx/src/com/badlogic/gdx/scenes/scene2d/ui/Skin.java

@@ -37,6 +37,7 @@
 import com.badlogic.gdx.scenes.scene2d.utils.TiledDrawable;
 import com.badlogic.gdx.utils.Array;
 import com.badlogic.gdx.utils.Disposable;
+import com.badlogic.gdx.utils.DisposalHelper;
 import com.badlogic.gdx.utils.GdxRuntimeException;
 import com.badlogic.gdx.utils.Json;
 import com.badlogic.gdx.utils.Json.ReadOnlySerializer;
@@ -449,11 +450,12 @@ public void setEnabled (Actor actor, boolean enabled) {
 
 	/** Disposes the {@link TextureAtlas} and all {@link Disposable} resources in the skin. */
 	public void dispose () {
-		if (atlas != null) atlas.dispose();
+		DisposalHelper disposalHelper = new DisposalHelper(atlas);
 		for (ObjectMap<String, Object> entry : resources.values()) {
 			for (Object resource : entry.values())
-				if (resource instanceof Disposable) ((Disposable)resource).dispose();
+				if (resource instanceof Disposable) disposalHelper.add((Disposable)resource);
 		}
+		disposalHelper.dispose();
 	}
 
 	protected Json getJsonLoader (final FileHandle skinFile) {

gdx/src/com/badlogic/gdx/utils/DisposalHelper.java

@@ -0,0 +1,116 @@
+/*******************************************************************************
+ * Copyright 2011 See AUTHORS file.
+ * 
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * 
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ ******************************************************************************/
+
+package com.badlogic.gdx.utils;
+
+/** Util class for disposing resources. It's useful for disposing multiple resources. Null-safe: provided disposable resources
+ * could be null. There is a guarantee that all resources are disposed of, even when exception(s) occurs.
+ * @author Anton-Samarkyi */
+public class DisposalHelper implements Disposable {
+	private final Array<Disposable> toDispose = new Array<>();
+	private Array<Exception> exceptions;
+
+	/** Constructs an empty DisposalHelper. */
+	public DisposalHelper () {
+	}
+
+	/** Constructs a DisposalHelper with disposableItems set to dispose.
+	 * @param disposableItems items to dispose */
+	public DisposalHelper (Disposable... disposableItems) {
+		addAll(disposableItems);
+	}
+
+	/** Constructs a DisposalHelper with disposableItems set to dispose.
+	 * @param disposableItems items to dispose */
+	public DisposalHelper (Iterable<Disposable> disposableItems) {
+		addAll(disposableItems);
+	}
+
+	/** Adds item to dispose.
+	 * @param disposableItem item to dispose
+	 * @return this helper */
+	public DisposalHelper add (Disposable disposableItem) {
+		toDispose.add(disposableItem);
+		return this;
+	}
+
+	/** Adds items to dispose.
+	 * @param disposableItems items to dispose
+	 * @return this helper */
+	public DisposalHelper addAll (Disposable... disposableItems) {
+		if (disposableItems == null) return this;
+		for (Disposable item : disposableItems) {
+			toDispose.add(item);
+		}
+		return this;
+	}
+
+	/** Adds items to dispose.
+	 * @param disposableItems items to dispose
+	 * @return this helper */
+	public DisposalHelper addAll (Iterable<Disposable> disposableItems) {
+		if (disposableItems == null) return this;
+		for (Disposable item : disposableItems) {
+			toDispose.add(item);
+		}
+		return this;
+	}
+
+	@Override
+	public void dispose () {
+		for (Disposable item : toDispose) {
+			if (item != null && item != this) {
+				try {
+					item.dispose();
+				} catch (Exception e) {
+					addException(e);
+				}
+			}
+		}
+
+		if (exceptions != null) {
+			if (exceptions.size == 1) {
+				Exception exception = exceptions.get(0);
+				if (exception instanceof RuntimeException) {
+					throw (RuntimeException)exception;
+				} else {
+					throw new GdxRuntimeException("Disposal exception", exception);
+				}
+			} else {
+				throw new GdxComplexDisposalException(exceptions);
+			}
+		}
+	}
+
+	private void addException (Exception e) {
+		if (exceptions == null) {
+			exceptions = new Array<>();
+		}
+		exceptions.add(e);
+	}
+
+	/** Disposes multiple items. There is a guarantee that all resources are disposed of, even when exception(s) occurs.
+	 * @param disposableItems items to dispose */
+	public static void disposeAll (Disposable... disposableItems) {
+		new DisposalHelper(disposableItems).dispose();
+	}
+
+	/** Disposes multiple items. There is a guarantee that all resources are disposed of, even when exception(s) occurs.
+	 * @param disposableItems items to dispose */
+	public static void disposeAll (Iterable<Disposable> disposableItems) {
+		new DisposalHelper(disposableItems).dispose();
+	}
+}

gdx/src/com/badlogic/gdx/utils/GdxComplexDisposalException.java

@@ -0,0 +1,41 @@
+/*******************************************************************************
+ * Copyright 2011 See AUTHORS file.
+ * 
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * 
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ ******************************************************************************/
+
+package com.badlogic.gdx.utils;
+
+/** Runtime exception that contains array of exceptions occurred during the disposing process.
+ * @author Anton-Samarkyi */
+public class GdxComplexDisposalException extends GdxRuntimeException {
+	private static final long serialVersionUID = 1L;
+	private static final String MESSAGE = "Multiple exceptions occurred during the disposal process: ";
+
+	public final Array<Exception> exceptions;
+
+	public GdxComplexDisposalException (Array<Exception> exceptions) {
+		super(composeMessage(exceptions));
+		this.exceptions = exceptions;
+	}
+
+	private static String composeMessage (Array<Exception> exceptions) {
+		StringBuilder builder = new StringBuilder(MESSAGE);
+
+		for (Exception exception : exceptions) {
+			builder.append(exception.toString()).append(", ");
+		}
+
+		return builder.substring(0, builder.length() - 2);
+	}
+}