Commit 8cd3532c authored by Eric Tobias's avatar Eric Tobias
Browse files

Ported project to Maven.

+ Cleaned up a few class names to adhere to the naming policy
+ Switched to the new namespace of dbc-annotations
parent 02df5d1d
......@@ -4,8 +4,8 @@
* This file is part of TULIP.
*
* TULIP is free software: you can redistribute it and/or modify it under the terms of the GNU
* Lesser General Public License as published by the Free Software Foundation, version 3 of
* the License.
* Lesser General Public License as published by the Free Software Foundation, version 3 of the
* License.
*
* TULIP is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even
* the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser
......@@ -16,7 +16,7 @@
*/
package lu.list.itis.dkd.tui.network.adapter;
import lu.tudor.ssi.kiss.dbc.annotation.NonNullByDefault;
import lu.list.itis.dkd.dbc.annotation.NonNullByDefault;
import java.io.IOException;
......
......@@ -4,8 +4,8 @@
* This file is part of TULIP.
*
* TULIP is free software: you can redistribute it and/or modify it under the terms of the GNU
* Lesser General Public License as published by the Free Software Foundation, version 3 of
* the License.
* Lesser General Public License as published by the Free Software Foundation, version 3 of the
* License.
*
* TULIP is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even
* the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser
......@@ -16,14 +16,14 @@
*/
package lu.list.itis.dkd.tui.network.adapter;
import lu.tudor.ssi.kiss.dbc.annotation.NonNullByDefault;
import gnu.io.PortInUseException;
import gnu.io.UnsupportedCommOperationException;
import lu.list.itis.dkd.dbc.annotation.NonNullByDefault;
import java.io.IOException;
import java.net.UnknownHostException;
import gnu.io.PortInUseException;
import gnu.io.UnsupportedCommOperationException;
/**
* Abstract class managing interaction between application and remote device
......
......@@ -4,8 +4,8 @@
* This file is part of TULIP.
*
* TULIP is free software: you can redistribute it and/or modify it under the terms of the GNU
* Lesser General Public License as published by the Free Software Foundation, version 3 of
* the License.
* Lesser General Public License as published by the Free Software Foundation, version 3 of the
* License.
*
* TULIP is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even
* the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser
......@@ -16,7 +16,7 @@
*/
package lu.list.itis.dkd.tui.network.adapter;
import lu.tudor.ssi.kiss.dbc.annotation.NonNullByDefault;
import lu.list.itis.dkd.dbc.annotation.NonNullByDefault;
import java.io.InputStream;
import java.io.OutputStream;
......
......@@ -4,8 +4,8 @@
* This file is part of TULIP.
*
* TULIP is free software: you can redistribute it and/or modify it under the terms of the GNU
* Lesser General Public License as published by the Free Software Foundation, version 3 of
* the License.
* Lesser General Public License as published by the Free Software Foundation, version 3 of the
* License.
*
* TULIP is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even
* the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser
......@@ -16,7 +16,7 @@
*/
package lu.list.itis.dkd.tui.network.adapter;
import lu.tudor.ssi.kiss.dbc.annotation.NonNullByDefault;
import lu.list.itis.dkd.dbc.annotation.NonNullByDefault;
import java.io.IOException;
......
......@@ -4,8 +4,8 @@
* This file is part of TULIP.
*
* TULIP is free software: you can redistribute it and/or modify it under the terms of the GNU
* Lesser General Public License as published by the Free Software Foundation, version 3 of
* the License.
* Lesser General Public License as published by the Free Software Foundation, version 3 of the
* License.
*
* TULIP is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even
* the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser
......@@ -16,7 +16,7 @@
*/
package lu.list.itis.dkd.tui.network.adapter;
import lu.tudor.ssi.kiss.dbc.annotation.NonNullByDefault;
import lu.list.itis.dkd.dbc.annotation.NonNullByDefault;
import com.google.common.base.Preconditions;
......
......@@ -4,8 +4,8 @@
* This file is part of TULIP.
*
* TULIP is free software: you can redistribute it and/or modify it under the terms of the GNU
* Lesser General Public License as published by the Free Software Foundation, version 3 of
* the License.
* Lesser General Public License as published by the Free Software Foundation, version 3 of the
* License.
*
* TULIP is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even
* the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser
......@@ -16,7 +16,7 @@
*/
package lu.list.itis.dkd.tui.network.adapter;
import lu.tudor.ssi.kiss.dbc.annotation.NonNullByDefault;
import lu.list.itis.dkd.dbc.annotation.NonNullByDefault;
import com.google.common.base.Preconditions;
......
......@@ -4,8 +4,8 @@
* This file is part of TULIP.
*
* TULIP is free software: you can redistribute it and/or modify it under the terms of the GNU
* Lesser General Public License as published by the Free Software Foundation, version 3 of
* the License.
* Lesser General Public License as published by the Free Software Foundation, version 3 of the
* License.
*
* TULIP is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even
* the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser
......@@ -16,19 +16,19 @@
*/
package lu.list.itis.dkd.tui.network.adapter;
import lu.tudor.ssi.kiss.dbc.annotation.NonNullByDefault;
import lu.list.itis.dkd.dbc.annotation.NonNullByDefault;
import com.google.common.base.Preconditions;
import java.io.IOException;
import java.net.UnknownHostException;
import java.util.Enumeration;
import gnu.io.CommPortIdentifier;
import gnu.io.PortInUseException;
import gnu.io.SerialPort;
import gnu.io.UnsupportedCommOperationException;
import java.io.IOException;
import java.net.UnknownHostException;
import java.util.Enumeration;
/**
* Adapter class managing a communication over XBee's protocol using {@link SerialPort}.
*
......
......@@ -4,8 +4,8 @@
* This file is part of TULIP.
*
* TULIP is free software: you can redistribute it and/or modify it under the terms of the GNU
* Lesser General Public License as published by the Free Software Foundation, version 3 of
* the License.
* Lesser General Public License as published by the Free Software Foundation, version 3 of the
* License.
*
* TULIP is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even
* the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser
......@@ -16,10 +16,9 @@
*/
package lu.list.itis.dkd.tui.utility;
import lu.list.itis.dkd.dbc.annotation.NonNullByDefault;
import lu.list.itis.dkd.tui.TangibleApplication;
import lu.tudor.ssi.kiss.dbc.annotation.NonNullByDefault;
import com.google.common.base.Preconditions;
import org.jdom2.Document;
......@@ -49,6 +48,7 @@ import java.util.logging.Logger;
public class Calibration {
/** A {@link Logger} to log all messages during execution. */
private static final Logger logger = Logger.getLogger(Calibration.class.getSimpleName());
static {
TangibleApplication.configureLogger(logger);
}
......@@ -195,7 +195,8 @@ public class Calibration {
/**
* Method for transforming the coordinate mapping from the camera in the range [0;1] to the
* table mapping in millimetres. The method multiplies by the camera width before adding the
* camera initialTranslation. Then, the intermediate result is multiplied by the table's width.<br>
* camera initialTranslation. Then, the intermediate result is multiplied by the table's width.
* <br>
* <b>Note:</b> The measures in table coordinates a equivalent to concrete measures.
*
* @param x
......@@ -242,7 +243,8 @@ public class Calibration {
/**
* Method for transforming the coordinate mapping from the camera in the range [0;1] to the
* table mapping in millimetres. The method multiplies by the camera width before adding the
* camera initialTranslation. Then, the intermediate result is multiplied by the table's width.<br>
* camera initialTranslation. Then, the intermediate result is multiplied by the table's width.
* <br>
* <b>Note:</b> The measures in table coordinates a equivalent to concrete measures.
*
* @param y
......
......@@ -4,8 +4,8 @@
* This file is part of TULIP.
*
* TULIP is free software: you can redistribute it and/or modify it under the terms of the GNU
* Lesser General Public License as published by the Free Software Foundation, version 3 of
* the License.
* Lesser General Public License as published by the Free Software Foundation, version 3 of the
* License.
*
* TULIP is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even
* the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser
......@@ -16,7 +16,7 @@
*/
package lu.list.itis.dkd.tui.utility;
import lu.tudor.ssi.kiss.dbc.annotation.NonNull;
import lu.list.itis.dkd.dbc.annotation.NonNull;
/**
* Class implementing a {@link CoordinateState} for camera coordinates. The class features methods
......@@ -62,8 +62,9 @@ public class CameraCoordinates extends CoordinateState {
*/
@Override
public void toCamera(@NonNull Point context) {/**
* The conversion is naught as the point's
* coordinates are already given in this reference scheme!
*/
* The conversion is naught as the point's
* coordinates are already given in this reference
* scheme!
*/
}
}
\ No newline at end of file
......@@ -4,8 +4,8 @@
* This file is part of TULIP.
*
* TULIP is free software: you can redistribute it and/or modify it under the terms of the GNU
* Lesser General Public License as published by the Free Software Foundation, version 3 of
* the License.
* Lesser General Public License as published by the Free Software Foundation, version 3 of the
* License.
*
* TULIP is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even
* the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser
......@@ -16,7 +16,7 @@
*/
package lu.list.itis.dkd.tui.utility;
import lu.tudor.ssi.kiss.dbc.annotation.NonNull;
import lu.list.itis.dkd.dbc.annotation.NonNull;
/**
* Abstract class defining methods for the StateManager pattern.
......
......@@ -4,8 +4,8 @@
* This file is part of TULIP.
*
* TULIP is free software: you can redistribute it and/or modify it under the terms of the GNU
* Lesser General Public License as published by the Free Software Foundation, version 3 of
* the License.
* Lesser General Public License as published by the Free Software Foundation, version 3 of the
* License.
*
* TULIP is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even
* the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser
......@@ -16,12 +16,11 @@
*/
package lu.list.itis.dkd.tui.utility;
import lu.list.itis.dkd.dbc.annotation.NonNullByDefault;
import lu.list.itis.dkd.dbc.annotation.Nullable;
import lu.list.itis.dkd.tui.adapter.TangibleObject;
import lu.list.itis.dkd.tui.adapter.TuiAdapter;
import lu.tudor.ssi.kiss.dbc.annotation.NonNullByDefault;
import lu.tudor.ssi.kiss.dbc.annotation.Nullable;
import com.google.common.base.Preconditions;
import java.util.Collection;
......
......@@ -16,7 +16,7 @@
*/
package lu.list.itis.dkd.tui.utility;
import lu.tudor.ssi.kiss.dbc.annotation.NonNullByDefault;
import lu.list.itis.dkd.dbc.annotation.NonNullByDefault;
import com.google.common.base.Preconditions;
......@@ -31,7 +31,7 @@ import java.util.Properties;
* @version 2.0.1
*/
@NonNullByDefault
public class IDMapper {
public class IdMapper {
static Properties properties = new Properties();
/**
......@@ -41,7 +41,7 @@ public class IDMapper {
* The properties to set the field to.
*/
public static void initialise(Properties applicationProperties) {
IDMapper.properties = applicationProperties;
IdMapper.properties = applicationProperties;
}
/**
......
......@@ -4,8 +4,8 @@
* This file is part of TULIP.
*
* TULIP is free software: you can redistribute it and/or modify it under the terms of the GNU
* Lesser General Public License as published by the Free Software Foundation, version 3 of
* the License.
* Lesser General Public License as published by the Free Software Foundation, version 3 of the
* License.
*
* TULIP is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even
* the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser
......@@ -16,8 +16,8 @@
*/
package lu.list.itis.dkd.tui.utility;
import lu.tudor.ssi.kiss.dbc.annotation.NonNullByDefault;
import lu.tudor.ssi.kiss.dbc.annotation.Nullable;
import lu.list.itis.dkd.dbc.annotation.NonNullByDefault;
import lu.list.itis.dkd.dbc.annotation.Nullable;
import com.google.common.base.Preconditions;
......
......@@ -4,8 +4,8 @@
* This file is part of TULIP.
*
* TULIP is free software: you can redistribute it and/or modify it under the terms of the GNU
* Lesser General Public License as published by the Free Software Foundation, version 3 of
* the License.
* Lesser General Public License as published by the Free Software Foundation, version 3 of the
* License.
*
* TULIP is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even
* the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser
......@@ -16,7 +16,7 @@
*/
package lu.list.itis.dkd.tui.utility;
import lu.tudor.ssi.kiss.dbc.annotation.NonNull;
import lu.list.itis.dkd.dbc.annotation.NonNull;
/**
* Class implementing a {@link CoordinateState} for screen coordinates. The class features methods
......@@ -54,9 +54,10 @@ public class ScreenCoordinates extends CoordinateState {
*/
@Override
public void toScreen(@NonNull Point context) {/**
* The conversion is naught as the point's
* coordinates are already given in this reference scheme!
*/
* The conversion is naught as the point's
* coordinates are already given in this reference
* scheme!
*/
}
/**
......
......@@ -4,8 +4,8 @@
* This file is part of TULIP.
*
* TULIP is free software: you can redistribute it and/or modify it under the terms of the GNU
* Lesser General Public License as published by the Free Software Foundation, version 3 of
* the License.
* Lesser General Public License as published by the Free Software Foundation, version 3 of the
* License.
*
* TULIP is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even
* the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser
......@@ -16,7 +16,7 @@
*/
package lu.list.itis.dkd.tui.utility;
import lu.tudor.ssi.kiss.dbc.annotation.NonNull;
import lu.list.itis.dkd.dbc.annotation.NonNull;
/**
* Class implementing a {@link CoordinateState} for table coordinates. The class features methods to
......@@ -46,9 +46,10 @@ public class TableCoordinates extends CoordinateState {
*/
@Override
public void toTable(@NonNull Point context) {/**
* The conversion is naught as the point's
* coordinates are already given in this reference scheme!
*/
* The conversion is naught as the point's
* coordinates are already given in this reference
* scheme!
*/
}
/**
......
......@@ -4,8 +4,8 @@
* This file is part of TULIP.
*
* TULIP is free software: you can redistribute it and/or modify it under the terms of the GNU
* Lesser General Public License as published by the Free Software Foundation, version 3 of
* the License.
* Lesser General Public License as published by the Free Software Foundation, version 3 of the
* License.
*
* TULIP is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even
* the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser
......@@ -16,7 +16,7 @@
*/
package lu.list.itis.dkd.tui.utility;
import lu.tudor.ssi.kiss.dbc.annotation.NonNullByDefault;
import lu.list.itis.dkd.dbc.annotation.NonNullByDefault;
import java.awt.Color;
import java.awt.Font;
......
......@@ -4,8 +4,8 @@
* This file is part of TULIP.
*
* TULIP is free software: you can redistribute it and/or modify it under the terms of the GNU
* Lesser General Public License as published by the Free Software Foundation, version 3 of
* the License.
* Lesser General Public License as published by the Free Software Foundation, version 3 of the
* License.
*
* TULIP is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even
* the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser
......@@ -16,6 +16,7 @@
*/
package lu.list.itis.dkd.tui.widget;
import lu.list.itis.dkd.dbc.annotation.NonNullByDefault;
import lu.list.itis.dkd.tui.adapter.TangibleObject;
import lu.list.itis.dkd.tui.logging.EventLogger;
import lu.list.itis.dkd.tui.network.adapter.NetworkAdapter;
......@@ -23,8 +24,6 @@ import lu.list.itis.dkd.tui.utility.Point;
import lu.list.itis.dkd.tui.widget.builder.BaseBuilder;
import lu.list.itis.dkd.tui.widget.corona.Corona;
import lu.tudor.ssi.kiss.dbc.annotation.NonNullByDefault;
import com.google.common.collect.Multimap;
import java.awt.Graphics2D;
......
......@@ -4,8 +4,8 @@
* This file is part of TULIP.
*
* TULIP is free software: you can redistribute it and/or modify it under the terms of the GNU
* Lesser General Public License as published by the Free Software Foundation, version 3 of
* the License.
* Lesser General Public License as published by the Free Software Foundation, version 3 of the
* License.
*
* TULIP is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even
* the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser
......@@ -16,14 +16,13 @@
*/
package lu.list.itis.dkd.tui.widget;
import lu.list.itis.dkd.dbc.annotation.NonNullByDefault;
import lu.list.itis.dkd.tui.adapter.TangibleObject;
import lu.list.itis.dkd.tui.event.ContentEvent;
import lu.list.itis.dkd.tui.event.ContentEvent.ContentEventType;
import lu.list.itis.dkd.tui.event.ContentEventListener;
import lu.list.itis.dkd.tui.widget.builder.BaseContentBuilder;
import lu.tudor.ssi.kiss.dbc.annotation.NonNullByDefault;
import java.util.ArrayList;
/**
......
......@@ -4,8 +4,8 @@
* This file is part of TULIP.
*
* TULIP is free software: you can redistribute it and/or modify it under the terms of the GNU
* Lesser General Public License as published by the Free Software Foundation, version 3 of
* the License.
* Lesser General Public License as published by the Free Software Foundation, version 3 of the
* License.
*
* TULIP is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even
* the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser
......@@ -16,6 +16,7 @@
*/
package lu.list.itis.dkd.tui.widget;
import lu.list.itis.dkd.dbc.annotation.NonNullByDefault;
import lu.list.itis.dkd.tui.adapter.TangibleObject;
import lu.list.itis.dkd.tui.event.ContextEvent;
import lu.list.itis.dkd.tui.event.ContextEvent.ContextType;
......@@ -26,10 +27,6 @@ import lu.list.itis.dkd.tui.widget.builder.BaseContextAwareBuilder;
import lu.list.itis.dkd.tui.widget.corona.ContextAwareCorona;
import lu.list.itis.dkd.tui.widget.corona.Corona;
import lu.tudor.ssi.kiss.dbc.annotation.NonNullByDefault;
import TUIO.TuioCursor;
import com.google.common.collect.HashMultimap;
import java.util.Collection;
......@@ -37,6 +34,8 @@ import java.util.Vector;
import java.util.logging.Level;
import java.util.logging.Logger;
import TUIO.TuioCursor;
/**
* Widget implementation of a widget being aware of its context, that is, of its corona. The widget
* will be able to react to interactions with its coronas. Furthermore, the widget also notifies a
......
......@@ -4,8 +4,8 @@
* This file is part of TULIP.
*
* TULIP is free software: you can redistribute it and/or modify it under the terms of the GNU
* Lesser General Public License as published by the Free Software Foundation, version 3 of
* the License.
* Lesser General Public License as published by the Free Software Foundation, version 3 of the
* License.
*
* TULIP is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even
* the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser
......@@ -16,6 +16,7 @@
*/
package lu.list.itis.dkd.tui.widget;
import lu.list.itis.dkd.dbc.annotation.NonNullByDefault;
import lu.list.itis.dkd.tui.adapter.TangibleObject;
import lu.list.itis.dkd.tui.content.AsynchronousInfomationProvider;
import lu.list.itis.dkd.tui.content.InformationProvider;
......@@ -27,8 +28,6 @@ import lu.list.itis.dkd.tui.widget.corona.Corona;
import lu.list.itis.dkd.tui.widget.corona.InfoBox;
import lu.list.itis.dkd.tui.widget.state.StateManager;
import lu.tudor.ssi.kiss.dbc.annotation.NonNullByDefault;
import com.google.common.base.Preconditions;
/**
......
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