Skip to content

Commit 0bf931b

Browse files
committed
revert integration of PR #1071 which wasn't ready
1 parent 0bc060d commit 0bf931b

File tree

2 files changed

+5
-93
lines changed

2 files changed

+5
-93
lines changed

jme3-core/src/main/java/com/jme3/anim/AnimComposer.java

Lines changed: 5 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -3,10 +3,7 @@
33
import com.jme3.anim.tween.Tween;
44
import com.jme3.anim.tween.Tweens;
55
import com.jme3.anim.tween.action.*;
6-
import com.jme3.export.InputCapsule;
7-
import com.jme3.export.JmeExporter;
8-
import com.jme3.export.JmeImporter;
9-
import com.jme3.export.OutputCapsule;
6+
import com.jme3.export.*;
107
import com.jme3.renderer.RenderManager;
118
import com.jme3.renderer.ViewPort;
129
import com.jme3.scene.control.AbstractControl;
@@ -209,25 +206,12 @@ public void reset() {
209206
}
210207
}
211208

212-
/**
213-
* Returns an unmodifiable set of all available animations. When an attempt
214-
* is made to modify the set, an UnsupportedOperationException is thrown.
215-
*
216-
* @return the unmodifiable set of animations
217-
*/
218-
public Set<AnimClip> getAnimClips() {
219-
return Collections.unmodifiableSet(new HashSet<>(animClipMap.values()));
209+
public Collection<AnimClip> getAnimClips() {
210+
return Collections.unmodifiableCollection(animClipMap.values());
220211
}
221212

222-
/**
223-
* Returns an unmodifiable set of all available animation names. When an
224-
* attempt is made to modify the set, an UnsupportedOperationException is
225-
* thrown.
226-
*
227-
* @return the unmodifiable set of animation names.
228-
*/
229-
public Set<String> getAnimClipsNames() {
230-
return Collections.unmodifiableSet(animClipMap.keySet());
213+
public Collection<String> getAnimClipsNames() {
214+
return Collections.unmodifiableCollection(animClipMap.keySet());
231215
}
232216

233217
@Override

jme3-core/src/test/java/com/jme3/anim/AnimComposerTest.java

Lines changed: 0 additions & 72 deletions
This file was deleted.

0 commit comments

Comments
 (0)