Commit ef2f6ac3 authored by Valérie Maquil's avatar Valérie Maquil

Merge branch 'dev' of https://git.list.lu/nui/tulip into dev

parents 72d9c16e 0bdd2e9a
......@@ -2,7 +2,7 @@
<modelVersion>4.0.0</modelVersion>
<groupId>lu.list.itis.dkd.tui</groupId>
<artifactId>tulip</artifactId>
<version>2.3.0</version>
<version>2.3.1</version>
<name>TULIP</name>
<description>A framework for tabletop tangible user interface applications.</description>
......
......@@ -161,7 +161,7 @@ public class TangibleInterfaceManager extends JComponent {
}
});
frame.addKeyListener(new TUIKeyAdapter());
frame.addKeyListener(new TuiKeyAdapter());
}
/** Method used to show the application's main frame. */
......@@ -238,7 +238,7 @@ public class TangibleInterfaceManager extends JComponent {
}
});
frame.addKeyListener(new TUIConfigurationKeyAdapter());
frame.addKeyListener(new TuiConfigurationKeyAdapter());
if (fullscreen) {
int width = (int) Toolkit.getDefaultToolkit().getScreenSize().getWidth();
......@@ -338,13 +338,13 @@ public class TangibleInterfaceManager extends JComponent {
* Class extending a {@link KeyAdapter} to set the behaviour of key presses during regular
* execution of the TUI in the main window.
*
* @author Eric TOBIAS [eric.tobias@list.lu]
* @author Eric Tobias [eric.tobias@list.lu]
* @since 1.0
* @version 1.0.2
* @version 2.3.1
*/
private final class TUIKeyAdapter extends KeyAdapter {
private final class TuiKeyAdapter extends KeyAdapter {
/** Constructor */
protected TUIKeyAdapter() {}
protected TuiKeyAdapter() {}
@Override
public void keyPressed(@Nullable KeyEvent event) {
......@@ -381,13 +381,13 @@ public class TangibleInterfaceManager extends JComponent {
* Class extending a {@link KeyAdapter} to set the behaviour of key presses during the
* configuration of the TUI.
*
* @author Eric TOBIAS [eric.tobias@list.lu]
* @author Eric Tobias [eric.tobias@list.lu]
* @since 1.0
* @version 1.0.2
* @version 2.3.1
*/
private final class TUIConfigurationKeyAdapter extends KeyAdapter {
private final class TuiConfigurationKeyAdapter extends KeyAdapter {
/** Constructor. */
public TUIConfigurationKeyAdapter() {}
public TuiConfigurationKeyAdapter() {}
@Override
public void keyPressed(@Nullable KeyEvent event) {
......
......@@ -63,10 +63,16 @@ public class TuioAdapter extends TuiAdapter implements TuioListener {
/**
* Class which handle all interactions with tangible objects piloting the interface.
*
* TODO Should probably be moved into parent class.
*/
protected TangibleObjectManager objectManager;
/** This dictionary stores all the objects detected by reacTIVision */
/**
* This dictionary stores all the objects detected by reacTIVision.
*
* TODO Should probably be moved into parent class.
*/
protected volatile static ConcurrentHashMap<Integer, TangibleObject> tangibleObjectList = new ConcurrentHashMap<>();
/**
......
......@@ -75,14 +75,14 @@ public class TangibleObjectBootstrapper extends TangibleObjectManager {
/**
* Constructor initializing all fields.
*
* @param fileUri
* The URI of the document containing the XML definition of all objects to initialize.
* @param applicationContext
* The {@link TangibleApplication} hosting this manager.
* @param applicationLogger
* The {@link Logger} to use for all logging purposes.
* @param properties
* The properties instance from which to load the default values from.
* @param fileUri
* The URI of the document containing the XML definition of all objects to initialize.
* @throws BuildException
* Thrown when the provided file URI it not valid or empty.
*/
......
......@@ -75,9 +75,9 @@ public class ContentEvent extends EventObject {
/**
* Enumeration listing the possible sources for events triggering eventual updates of content.
*
* @author Eric TOBIAS [eric.tobias@tudor.lu]
* @since 28 Jan 2014
* @version 1
* @author Eric Tobias [eric.tobias@list.lu]
* @since 1.0
* @version 2.3.0
*/
public enum ContentEventType {
/** An event type occurring when a widget has been added to the table. */
......
......@@ -78,7 +78,7 @@ public class ContextEvent extends EventObject {
* Enumeration denoting all context types that are captured by the enclosing
* {@link ContextEvent} class.
*
* @author Eric TOBIAS [eric.tobias@list.lu]
* @author Eric Tobias [eric.tobias@list.lu]
* @since 1.0
* @version 2.0.42
*/
......
......@@ -144,9 +144,9 @@ public class InfoBox extends Corona implements InformationReceiver<List<String>>
/**
* An enumeration symbolising the four quadrants as viewed from a centre point.
*
* @author Eric TOBIAS [eric.tobias@tudor.lu]
* @since 23 Jan 2014
* @version 1
* @author Eric Tobias [eric.tobias@tudor.lu]
* @since 1.0
* @version 1.0.0
*/
private enum Quadrant {
TOP_LEFT, TOP_RIGHT, BOTTOM_RIGHT, BOTTOM_LEFT;
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment