From 0bf931bf7945fd28e1c91516340199aaec89e484 Mon Sep 17 00:00:00 2001
From: Stephen Gold <sgold@sonic.net>
Date: Mon, 22 Apr 2019 03:15:04 -0700
Subject: [PATCH] revert integration of PR #1071 which wasn't ready

---
 .../main/java/com/jme3/anim/AnimComposer.java | 26 ++-----
 .../java/com/jme3/anim/AnimComposerTest.java  | 72 -------------------
 2 files changed, 5 insertions(+), 93 deletions(-)
 delete mode 100644 jme3-core/src/test/java/com/jme3/anim/AnimComposerTest.java

diff --git a/jme3-core/src/main/java/com/jme3/anim/AnimComposer.java b/jme3-core/src/main/java/com/jme3/anim/AnimComposer.java
index 77392b4f8..a535b6acf 100644
--- a/jme3-core/src/main/java/com/jme3/anim/AnimComposer.java
+++ b/jme3-core/src/main/java/com/jme3/anim/AnimComposer.java
@@ -3,10 +3,7 @@ package com.jme3.anim;
 import com.jme3.anim.tween.Tween;
 import com.jme3.anim.tween.Tweens;
 import com.jme3.anim.tween.action.*;
-import com.jme3.export.InputCapsule;
-import com.jme3.export.JmeExporter;
-import com.jme3.export.JmeImporter;
-import com.jme3.export.OutputCapsule;
+import com.jme3.export.*;
 import com.jme3.renderer.RenderManager;
 import com.jme3.renderer.ViewPort;
 import com.jme3.scene.control.AbstractControl;
@@ -209,25 +206,12 @@ public class AnimComposer extends AbstractControl {
         }
     }
 
-    /**
-     * Returns an unmodifiable set of all available animations. When an attempt
-     * is made to modify the set, an UnsupportedOperationException is thrown.
-     *
-     * @return the unmodifiable set of animations
-     */
-    public Set<AnimClip> getAnimClips() {
-        return Collections.unmodifiableSet(new HashSet<>(animClipMap.values()));
+    public Collection<AnimClip> getAnimClips() {
+        return Collections.unmodifiableCollection(animClipMap.values());
     }
 
-    /**
-     * Returns an unmodifiable set of all available animation names. When an
-     * attempt is made to modify the set, an UnsupportedOperationException is
-     * thrown.
-     *
-     * @return the unmodifiable set of animation names.
-     */
-    public Set<String> getAnimClipsNames() {
-        return Collections.unmodifiableSet(animClipMap.keySet());
+    public Collection<String> getAnimClipsNames() {
+        return Collections.unmodifiableCollection(animClipMap.keySet());
     }
 
     @Override
diff --git a/jme3-core/src/test/java/com/jme3/anim/AnimComposerTest.java b/jme3-core/src/test/java/com/jme3/anim/AnimComposerTest.java
deleted file mode 100644
index 331784352..000000000
--- a/jme3-core/src/test/java/com/jme3/anim/AnimComposerTest.java
+++ /dev/null
@@ -1,72 +0,0 @@
-/*
- * Copyright (c) 2009-2019 jMonkeyEngine
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions are
- * met:
- *
- * * Redistributions of source code must retain the above copyright
- *   notice, this list of conditions and the following disclaimer.
- *
- * * Redistributions in binary form must reproduce the above copyright
- *   notice, this list of conditions and the following disclaimer in the
- *   documentation and/or other materials provided with the distribution.
- *
- * * Neither the name of 'jMonkeyEngine' nor the names of its contributors
- *   may be used to endorse or promote products derived from this software
- *   without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
- * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED
- * TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
- * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR
- * CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
- * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
- * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
- * PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF
- * LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
- * NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
- * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- */
-package com.jme3.anim;
-
-import org.junit.Assert;
-import org.junit.Test;
-
-/**
- * @author Remy Van Doosselaer
- */
-public class AnimComposerTest {
-
-    @Test
-    public void testGetAnimClips() {
-        AnimComposer composer = new AnimComposer();
-
-        Assert.assertNotNull(composer.getAnimClips());
-        Assert.assertEquals(0, composer.getAnimClips().size());
-    }
-
-    @Test
-    public void testGetAnimClipsNames() {
-        AnimComposer composer = new AnimComposer();
-
-        Assert.assertNotNull(composer.getAnimClipsNames());
-        Assert.assertEquals(0, composer.getAnimClipsNames().size());
-    }
-
-    @Test(expected = UnsupportedOperationException.class)
-    public void testGetAnimClipsIsNotModifiable() {
-        AnimComposer composer = new AnimComposer();
-
-        composer.getAnimClips().add(new AnimClip("test"));
-    }
-
-    @Test(expected = UnsupportedOperationException.class)
-    public void testGetAnimClipsNamesIsNotModifiable() {
-        AnimComposer composer = new AnimComposer();
-
-        composer.getAnimClipsNames().add("test");
-    }
-
-}