aboutsummaryrefslogtreecommitdiffstats
path: root/ardor3d-jinput
diff options
context:
space:
mode:
authorJulien Gouesse <[email protected]>2016-06-30 22:36:24 +0200
committerJulien Gouesse <[email protected]>2016-06-30 22:36:24 +0200
commitced8e5e5a3439630b51a5aef53ef5dfbde69eb95 (patch)
treed09e41e49f4ad4a172a2cb4760d373aead49d4eb /ardor3d-jinput
parent1257dbbf93986d1c2f21c0b1758efd8ffd110cf5 (diff)
Switches from Java 1.6 to Java 1.7 and fixes numerous warnings
Diffstat (limited to 'ardor3d-jinput')
-rw-r--r--ardor3d-jinput/src/main/java/com/ardor3d/input/jinput/JInputControllerWrapper.java6
1 files changed, 3 insertions, 3 deletions
diff --git a/ardor3d-jinput/src/main/java/com/ardor3d/input/jinput/JInputControllerWrapper.java b/ardor3d-jinput/src/main/java/com/ardor3d/input/jinput/JInputControllerWrapper.java
index 52ab50a..f789f54 100644
--- a/ardor3d-jinput/src/main/java/com/ardor3d/input/jinput/JInputControllerWrapper.java
+++ b/ardor3d-jinput/src/main/java/com/ardor3d/input/jinput/JInputControllerWrapper.java
@@ -33,7 +33,7 @@ public class JInputControllerWrapper implements ControllerWrapper {
protected final Event _event = new Event();
protected final List<ControllerEvent> _events = Collections.synchronizedList(new ArrayList<ControllerEvent>());
protected JInputControllerEventIterator _eventsIt = new JInputControllerEventIterator();
- protected final List<ControllerInfo> _controllers = new ArrayList<ControllerInfo>();
+ protected final List<ControllerInfo> _controllers = new ArrayList<>();
protected static boolean _inited = false;
@Override
@@ -91,8 +91,8 @@ public class JInputControllerWrapper implements ControllerWrapper {
}
protected ControllerInfo getControllerInfo(final Controller controller) {
- final List<String> axisNames = new ArrayList<String>();
- final List<String> buttonNames = new ArrayList<String>();
+ final List<String> axisNames = new ArrayList<>();
+ final List<String> buttonNames = new ArrayList<>();
for (final Component comp : controller.getComponents()) {
if (comp.getIdentifier() instanceof Identifier.Axis) {