diff --git a/TULIP/.classpath b/TULIP/.classpath index 1e60c707583fd4769950dc6a9893d17c23ff3f11..fcdb38c258ecdd15fb8ae106feeca827c94216fb 100644 --- a/TULIP/.classpath +++ b/TULIP/.classpath @@ -1,22 +1,27 @@ - - - - + - + + - + - + + + + + + + - - - - - + + + + + + diff --git a/TULIP/.gitignore b/TULIP/.gitignore index c27a6eacfb989b1f498091ec8d74724465772a8b..d7e315054fdaeda4a1f86b53edc6b4dc09729a38 100644 --- a/TULIP/.gitignore +++ b/TULIP/.gitignore @@ -6,3 +6,4 @@ /bin/ /bin/ /bin/ +/target/ diff --git a/TULIP/.project b/TULIP/.project index e80a87fa942293373e7281fcbe297955db6e21ea..7bd50cde2e36e8728d0ef784354c89af7dfccdcc 100644 --- a/TULIP/.project +++ b/TULIP/.project @@ -10,8 +10,14 @@ + + org.eclipse.m2e.core.maven2Builder + + + + org.eclipse.m2e.core.maven2Nature org.eclipse.jdt.core.javanature diff --git a/TULIP/.settings/org.eclipse.jdt.core.prefs b/TULIP/.settings/org.eclipse.jdt.core.prefs index 2d0d2aac2ad77a9bd054668caaa566d27eee202c..cb8d8cfa2bb5d371f92d76ae6c757dae13ea9e92 100644 --- a/TULIP/.settings/org.eclipse.jdt.core.prefs +++ b/TULIP/.settings/org.eclipse.jdt.core.prefs @@ -15,6 +15,8 @@ org.eclipse.jdt.core.compiler.annotation.nonnull=org.eclipse.jdt.annotation.NonN org.eclipse.jdt.core.compiler.annotation.nonnullbydefault=org.eclipse.jdt.annotation.NonNullByDefault org.eclipse.jdt.core.compiler.annotation.nullable=org.eclipse.jdt.annotation.Nullable org.eclipse.jdt.core.compiler.annotation.nullanalysis=enabled +org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.8 +org.eclipse.jdt.core.compiler.compliance=1.8 org.eclipse.jdt.core.compiler.doc.comment.support=enabled org.eclipse.jdt.core.compiler.problem.annotationSuperInterface=warning org.eclipse.jdt.core.compiler.problem.autoboxing=ignore @@ -111,6 +113,7 @@ org.eclipse.jdt.core.compiler.problem.unusedPrivateMember=warning org.eclipse.jdt.core.compiler.problem.unusedTypeParameter=ignore org.eclipse.jdt.core.compiler.problem.unusedWarningToken=warning org.eclipse.jdt.core.compiler.problem.varargsArgumentNeedCast=warning +org.eclipse.jdt.core.compiler.source=1.8 org.eclipse.jdt.core.formatter.align_type_members_on_columns=false org.eclipse.jdt.core.formatter.alignment_for_arguments_in_allocation_expression=16 org.eclipse.jdt.core.formatter.alignment_for_arguments_in_annotation=0 diff --git a/TULIP/.settings/org.eclipse.m2e.core.prefs b/TULIP/.settings/org.eclipse.m2e.core.prefs new file mode 100644 index 0000000000000000000000000000000000000000..f897a7f1cb2389f85fe6381425d29f0a9866fb65 --- /dev/null +++ b/TULIP/.settings/org.eclipse.m2e.core.prefs @@ -0,0 +1,4 @@ +activeProfiles= +eclipse.preferences.version=1 +resolveWorkspaceProjects=true +version=1 diff --git a/TULIP/build.xml b/TULIP/build.xml deleted file mode 100644 index 51f63e71c7e78b693a0ae4d148676379f0cfaecb..0000000000000000000000000000000000000000 --- a/TULIP/build.xml +++ /dev/null @@ -1,151 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - Application: ${application.name} ${application.version} - Build File : ${ant.file} - Run Date : ${build.time} - Run by : ${user.name} - Build Dir : ${dist} - Base Dir : ${basedir} - Java Home : ${java.home} - Connected to the web : ${jdk.javadoc.visible} - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - TULIP classpath: ${manifest.classpath} - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
${application.name} ${application.version}]]>
- - - - - - - - - - - \ No newline at end of file diff --git a/TULIP/libs/RXTXcomm.jar b/TULIP/libs/RXTXcomm.jar deleted file mode 100644 index 84e5f01dff26139e016015725e00afc37ce58e0d..0000000000000000000000000000000000000000 Binary files a/TULIP/libs/RXTXcomm.jar and /dev/null differ diff --git a/TULIP/libs/bluecove-2.1.1-SNAPSHOT.jar b/TULIP/libs/bluecove-2.1.1-SNAPSHOT.jar deleted file mode 100644 index 88f27886761f8a5c72734a685ee603f5d15644c0..0000000000000000000000000000000000000000 Binary files a/TULIP/libs/bluecove-2.1.1-SNAPSHOT.jar and /dev/null differ diff --git a/TULIP/libs/dbc.annotation.jar b/TULIP/libs/dbc.annotation.jar deleted file mode 100644 index 069f09cc3536e7f2f2f910562079526f415e81f8..0000000000000000000000000000000000000000 Binary files a/TULIP/libs/dbc.annotation.jar and /dev/null differ diff --git a/TULIP/libs/guava-15.0-javadoc.jar b/TULIP/libs/guava-15.0-javadoc.jar deleted file mode 100644 index c8f10c50ca404c6cc188f3d786dc68a5507308be..0000000000000000000000000000000000000000 Binary files a/TULIP/libs/guava-15.0-javadoc.jar and /dev/null differ diff --git a/TULIP/libs/guava-15.0-sources.jar b/TULIP/libs/guava-15.0-sources.jar deleted file mode 100644 index c0b87424d7aca7a6c404283869da78de0fdbafe1..0000000000000000000000000000000000000000 Binary files a/TULIP/libs/guava-15.0-sources.jar and /dev/null differ diff --git a/TULIP/libs/guava-15.0.jar b/TULIP/libs/guava-15.0.jar deleted file mode 100644 index eb9ef8ad5ffffcdac6d1271bd9fee0e30ec85b21..0000000000000000000000000000000000000000 Binary files a/TULIP/libs/guava-15.0.jar and /dev/null differ diff --git a/TULIP/libs/jdom-2.0.5-javadoc.jar b/TULIP/libs/jdom-2.0.5-javadoc.jar deleted file mode 100644 index 79f0c1971f71a186b06cdea6b9a94e95ccad9a92..0000000000000000000000000000000000000000 Binary files a/TULIP/libs/jdom-2.0.5-javadoc.jar and /dev/null differ diff --git a/TULIP/libs/jdom-2.0.5-sources.jar b/TULIP/libs/jdom-2.0.5-sources.jar deleted file mode 100644 index 7ccbe808c95001b198ce8b00c52a7caa28b5bfd1..0000000000000000000000000000000000000000 Binary files a/TULIP/libs/jdom-2.0.5-sources.jar and /dev/null differ diff --git a/TULIP/libs/jdom-2.0.5.jar b/TULIP/libs/jdom-2.0.5.jar deleted file mode 100644 index b6996c725a290b4e29a202d2b6bda39f9d7ffbfe..0000000000000000000000000000000000000000 Binary files a/TULIP/libs/jdom-2.0.5.jar and /dev/null differ diff --git a/TULIP/libs/libTUIO.jar b/TULIP/libs/libTUIO.jar deleted file mode 100644 index 33487ab3f7ede071be7f68dbad487b5ac6ef7ba6..0000000000000000000000000000000000000000 Binary files a/TULIP/libs/libTUIO.jar and /dev/null differ diff --git a/TULIP/pom.xml b/TULIP/pom.xml new file mode 100644 index 0000000000000000000000000000000000000000..e3bded0dc0a98f6faf02ee132a3c1b82f5a8d6dd --- /dev/null +++ b/TULIP/pom.xml @@ -0,0 +1,55 @@ + + 4.0.0 + lu.list.itis.dkd.tui + tulip + 2.0.41 + TULIP + A framework for tabletop tangible user interface applications. + + src + test + + + maven-compiler-plugin + 3.3 + + 1.8 + 1.8 + + + + + + + org.jdom + jdom2 + 2.0.5 + + + com.google.guava + guava + 15.0 + + + net.sf.bluecove + bluecove + 2.1.0 + + + org.rxtx + rxtx + 2.1.7 + + + + net.sourceforge.tuio + tuio + 1.5 + + + lu.list.itis.dkd + dbc-annotation + 1.1 + + + \ No newline at end of file diff --git a/TULIP/src/lu/list/itis/dkd/tui/TangibleApplication.java b/TULIP/src/lu/list/itis/dkd/tui/TangibleApplication.java index 3e102972943ee6c617240d437ce5ee219b2bf7b6..056387460096eb6f8df1aadb077d0e6c96d8431b 100644 --- a/TULIP/src/lu/list/itis/dkd/tui/TangibleApplication.java +++ b/TULIP/src/lu/list/itis/dkd/tui/TangibleApplication.java @@ -16,14 +16,13 @@ */ package lu.list.itis.dkd.tui; +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.list.itis.dkd.tui.logging.EventLogger; import lu.list.itis.dkd.tui.utility.GlobalContext; -import lu.list.itis.dkd.tui.utility.IDMapper; - -import lu.tudor.ssi.kiss.dbc.annotation.NonNullByDefault; -import lu.tudor.ssi.kiss.dbc.annotation.Nullable; +import lu.list.itis.dkd.tui.utility.IdMapper; import com.google.common.base.Preconditions; @@ -109,7 +108,7 @@ public abstract class TangibleApplication { try { adapter = (TuiAdapter) Class.forName(properties.getProperty("adapter.class")).getConstructor(TangibleInterfaceManager.class).newInstance(interfaceManager); //$NON-NLS-1$ } catch (InstantiationException e) { - logger.log(Level.SEVERE, "Cannot instantiate adapter. The adapter must be a concrete class, not an interface or abstract class and it must directly inherit from TuiAdapter! Check your properties file and set adapter.class accordingly."); //$NON-NLS-1$s + logger.log(Level.SEVERE, "Cannot instantiate adapter. The adapter must be a concrete class, not an interface or abstract class and it must directly inherit from TuiAdapter! Check your properties file and set adapter.class accordingly."); //$NON-NLS-1$ s System.exit(42); } catch (IllegalAccessException e) { logger.log(Level.SEVERE, "The currently executing method does not have access to the definition of the constructor."); //$NON-NLS-1$ @@ -127,12 +126,12 @@ public abstract class TangibleApplication { logger.log(Level.SEVERE, "Security violation."); //$NON-NLS-1$ System.exit(42); } catch (ClassNotFoundException e) { - logger.log(Level.SEVERE, "The class " + properties.getProperty("adapter.class") + " was not found. Check your spelling!"); //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ + logger.log(Level.SEVERE, "The class " + properties.getProperty("adapter.class") + " was not found. Check your spelling!"); //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ System.exit(42); } GlobalContext.setGlobalContext(adapter); - IDMapper.initialise(properties); + IdMapper.initialise(properties); EventLogger.getInstance().initialise(properties); } diff --git a/TULIP/src/lu/list/itis/dkd/tui/TangibleContentManager.java b/TULIP/src/lu/list/itis/dkd/tui/TangibleContentManager.java index 9255d7a16d42c3f779f33fed9537cc3fa3e6fbc1..82a3b44ca3238c4d571761b514e39b8f2e6725f0 100644 --- a/TULIP/src/lu/list/itis/dkd/tui/TangibleContentManager.java +++ b/TULIP/src/lu/list/itis/dkd/tui/TangibleContentManager.java @@ -16,14 +16,13 @@ */ package lu.list.itis.dkd.tui; +import lu.list.itis.dkd.dbc.annotation.NonNullByDefault; +import lu.list.itis.dkd.dbc.annotation.Nullable; import lu.list.itis.dkd.tui.content.Content; import lu.list.itis.dkd.tui.content.InformationProvider; import lu.list.itis.dkd.tui.content.Zoomable; import lu.list.itis.dkd.tui.event.ContentEventListener; -import lu.tudor.ssi.kiss.dbc.annotation.NonNullByDefault; -import lu.tudor.ssi.kiss.dbc.annotation.Nullable; - import com.google.common.collect.HashMultimap; import com.google.common.collect.Multimap; diff --git a/TULIP/src/lu/list/itis/dkd/tui/TangibleInterfaceManager.java b/TULIP/src/lu/list/itis/dkd/tui/TangibleInterfaceManager.java index 59f51feb21e468feec4c812bc1c57d416b038eb3..efc593ed0c5129b721f9ab9c019c1526fcfc4785 100644 --- a/TULIP/src/lu/list/itis/dkd/tui/TangibleInterfaceManager.java +++ b/TULIP/src/lu/list/itis/dkd/tui/TangibleInterfaceManager.java @@ -16,14 +16,13 @@ */ package lu.list.itis.dkd.tui; +import lu.list.itis.dkd.dbc.annotation.NonNullByDefault; +import lu.list.itis.dkd.dbc.annotation.Nullable; import lu.list.itis.dkd.tui.content.Content; import lu.list.itis.dkd.tui.utility.Calibration; import lu.list.itis.dkd.tui.utility.TextHelper; import lu.list.itis.dkd.tui.widget.BaseWidget; -import lu.tudor.ssi.kiss.dbc.annotation.NonNullByDefault; -import lu.tudor.ssi.kiss.dbc.annotation.Nullable; - import com.google.common.base.Preconditions; import java.awt.Color; @@ -126,7 +125,9 @@ public class TangibleInterfaceManager extends JComponent { setupWindow(); showWindow(); - /** Checks added due to missing contracts on inherited or implemented classes or interfaces. */ + /** + * Checks added due to missing contracts on inherited or implemented classes or interfaces. + */ assert title != null; assert device != null; } @@ -393,7 +394,7 @@ public class TangibleInterfaceManager extends JComponent { public void keyPressed(@Nullable KeyEvent event) { Preconditions.checkArgument(event != null, "The event is null!"); //$NON-NLS-1$ switch (event.getKeyCode()) { - /** Exit calibration mode without storing changes. */ + /** Exit calibration mode without storing changes. */ case KeyEvent.VK_ESCAPE: destroyWindow(); setupWindow(); diff --git a/TULIP/src/lu/list/itis/dkd/tui/TangibleObjectManager.java b/TULIP/src/lu/list/itis/dkd/tui/TangibleObjectManager.java index 24256ebd39e5ceb3e23502f47258b4dd493c1b38..f16e78445b4d2f6208ee18344e59a725ac13a733 100644 --- a/TULIP/src/lu/list/itis/dkd/tui/TangibleObjectManager.java +++ b/TULIP/src/lu/list/itis/dkd/tui/TangibleObjectManager.java @@ -16,18 +16,17 @@ */ package lu.list.itis.dkd.tui; +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.exception.BuildException; -import lu.list.itis.dkd.tui.utility.IDMapper; +import lu.list.itis.dkd.tui.utility.IdMapper; import lu.list.itis.dkd.tui.utility.Point; import lu.list.itis.dkd.tui.widget.BaseWidget; import lu.list.itis.dkd.tui.widget.builder.BaseWidgetBuilder; import lu.list.itis.dkd.tui.widget.corona.ShapeFactory; import lu.list.itis.dkd.tui.widget.corona.builder.ShadowBuilder; -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; @@ -49,7 +48,9 @@ import java.util.logging.Logger; */ @NonNullByDefault public abstract class TangibleObjectManager { - /** This dictionary stores all tangibles detected by reacTIVision relevant to the application. */ + /** + * This dictionary stores all tangibles detected by reacTIVision relevant to the application. + */ protected volatile static ConcurrentHashMap objectList = new ConcurrentHashMap<>(); /** This dictionary stores all cursors detected by reacTIVision. */ @@ -86,10 +87,11 @@ public abstract class TangibleObjectManager { /** * Method used to define all widgets. In this method, all handles need to be assigned to * instances of {@link BaseWidget} or a child thereof. Implementing classes should define what - * widgets to use by implementing this method. By default, no widgets are instantiated.
+ * widgets to use by implementing this method. By default, no widgets are instantiated. + *
*
* - * When adding Widgets to map to cursors, refer to {@link IDMapper#remapCursorId(int)}. Cursor + * When adding Widgets to map to cursors, refer to {@link IdMapper#remapCursorId(int)}. Cursor * IDs are remapped as not to clash with any symbol ID assigned by reacTIVision. A good practice * is to reason with regular cursor IDs and add them to the map by calling for example: * objectList.put(remapCursorID(0), W extends BaseWidget); to the first cursor that diff --git a/TULIP/src/lu/list/itis/dkd/tui/adapter/TangibleObject.java b/TULIP/src/lu/list/itis/dkd/tui/adapter/TangibleObject.java index 3be6bc87a21c42e951a3117f831d11efe0c5fbb0..495a1ad1f7ec2743a48a76895fb08d5114241e0c 100644 --- a/TULIP/src/lu/list/itis/dkd/tui/adapter/TangibleObject.java +++ b/TULIP/src/lu/list/itis/dkd/tui/adapter/TangibleObject.java @@ -16,12 +16,11 @@ */ package lu.list.itis.dkd.tui.adapter; +import lu.list.itis.dkd.dbc.annotation.NonNullByDefault; +import lu.list.itis.dkd.dbc.annotation.Nullable; import lu.list.itis.dkd.tui.TangibleApplication; import lu.list.itis.dkd.tui.utility.Point; -import lu.tudor.ssi.kiss.dbc.annotation.NonNullByDefault; -import lu.tudor.ssi.kiss.dbc.annotation.Nullable; - import java.util.ArrayList; import java.util.logging.Level; import java.util.logging.Logger; diff --git a/TULIP/src/lu/list/itis/dkd/tui/adapter/TangibleObjectBuilder.java b/TULIP/src/lu/list/itis/dkd/tui/adapter/TangibleObjectBuilder.java index a3f7ff7f2fcea45d829838b6db45e146445cfdee..474d4289c7032c1a9bacf04575574ccf406d1089 100644 --- a/TULIP/src/lu/list/itis/dkd/tui/adapter/TangibleObjectBuilder.java +++ b/TULIP/src/lu/list/itis/dkd/tui/adapter/TangibleObjectBuilder.java @@ -16,12 +16,11 @@ */ package lu.list.itis.dkd.tui.adapter; +import lu.list.itis.dkd.dbc.annotation.NonNullByDefault; import lu.list.itis.dkd.tui.adapter.TangibleObject.State; import lu.list.itis.dkd.tui.adapter.TangibleObject.Type; import lu.list.itis.dkd.tui.utility.Point; -import lu.tudor.ssi.kiss.dbc.annotation.NonNullByDefault; - import java.util.ArrayList; /** diff --git a/TULIP/src/lu/list/itis/dkd/tui/adapter/TuiAdapter.java b/TULIP/src/lu/list/itis/dkd/tui/adapter/TuiAdapter.java index 487fbc529924005b193d09cee00e5347817c5d28..bd0223d4c9e1f0249857e5479f1f9562effc9a16 100644 --- a/TULIP/src/lu/list/itis/dkd/tui/adapter/TuiAdapter.java +++ b/TULIP/src/lu/list/itis/dkd/tui/adapter/TuiAdapter.java @@ -16,12 +16,11 @@ */ package lu.list.itis.dkd.tui.adapter; +import lu.list.itis.dkd.dbc.annotation.NonNullByDefault; import lu.list.itis.dkd.tui.TangibleInterfaceManager; import lu.list.itis.dkd.tui.TangibleObjectManager; import lu.list.itis.dkd.tui.logging.EventLogger; -import lu.tudor.ssi.kiss.dbc.annotation.NonNullByDefault; - import java.util.Collection; import java.util.logging.Level; import java.util.logging.Logger; diff --git a/TULIP/src/lu/list/itis/dkd/tui/adapter/TuioAdapter.java b/TULIP/src/lu/list/itis/dkd/tui/adapter/TuioAdapter.java index 8e7734f924b645efc45e4a7f03f80533e5b29aae..cd181d06f12b413d1cec1aa90fb97093a4823882 100644 --- a/TULIP/src/lu/list/itis/dkd/tui/adapter/TuioAdapter.java +++ b/TULIP/src/lu/list/itis/dkd/tui/adapter/TuioAdapter.java @@ -16,14 +16,20 @@ */ package lu.list.itis.dkd.tui.adapter; +import lu.list.itis.dkd.dbc.annotation.NonNullByDefault; import lu.list.itis.dkd.tui.TangibleInterfaceManager; import lu.list.itis.dkd.tui.TangibleObjectManager; import lu.list.itis.dkd.tui.adapter.TangibleObject.Type; import lu.list.itis.dkd.tui.logging.EventLogger; -import lu.list.itis.dkd.tui.utility.IDMapper; +import lu.list.itis.dkd.tui.utility.IdMapper; import lu.list.itis.dkd.tui.utility.Point; -import lu.tudor.ssi.kiss.dbc.annotation.NonNullByDefault; +import com.google.common.base.Preconditions; + +import java.util.ArrayList; +import java.util.Collection; +import java.util.Vector; +import java.util.concurrent.ConcurrentHashMap; import TUIO.TuioBlob; import TUIO.TuioClient; @@ -32,13 +38,6 @@ import TUIO.TuioListener; import TUIO.TuioObject; import TUIO.TuioTime; -import com.google.common.base.Preconditions; - -import java.util.ArrayList; -import java.util.Collection; -import java.util.Vector; -import java.util.concurrent.ConcurrentHashMap; - /** * Adapter class managing interaction with reacTIVision tangible table using TUIO protocol. * @@ -196,7 +195,7 @@ public class TuioAdapter extends TuiAdapter implements TuioListener { ArrayList tempPath = new ArrayList<>(); tuioCursor.getPath().forEach(path -> tempPath.add(new Point(path.getX(), path.getY(), 0))); - TangibleObject convertedTangibleObject = new TangibleObjectBuilder(IDMapper.remapCursorId(tuioCursor.getCursorID()), Type.CURSOR, tuioCursor.getPath().get(tuioCursor.getPath().size() - 1).getX(), tuioCursor.getPath().get(tuioCursor.getPath().size() - 1).getY()) + TangibleObject convertedTangibleObject = new TangibleObjectBuilder(IdMapper.remapCursorId(tuioCursor.getCursorID()), Type.CURSOR, tuioCursor.getPath().get(tuioCursor.getPath().size() - 1).getX(), tuioCursor.getPath().get(tuioCursor.getPath().size() - 1).getY()) .withSeconds(tuioCursor.getTuioTime().getSeconds()) .withMicroSeconds(tuioCursor.getTuioTime().getMicroseconds()) .withxSpeed(tuioCursor.getXSpeed()) @@ -228,7 +227,7 @@ public class TuioAdapter extends TuiAdapter implements TuioListener { ArrayList tempPath = new ArrayList<>(); tuioBlob.getPath().forEach(path -> tempPath.add(new Point(path.getX(), path.getY(), tuioBlob.getAngle()))); - convertedTangibleObject = new TangibleObjectBuilder(IDMapper.remapCursorId(tuioBlob.getBlobID()), Type.BLOB, tuioBlob.getPath().get(tuioBlob.getPath().size() - 1).getX(), tuioBlob.getPath().get(tuioBlob.getPath().size() - 1).getY()) + convertedTangibleObject = new TangibleObjectBuilder(IdMapper.remapCursorId(tuioBlob.getBlobID()), Type.BLOB, tuioBlob.getPath().get(tuioBlob.getPath().size() - 1).getX(), tuioBlob.getPath().get(tuioBlob.getPath().size() - 1).getY()) .withSeconds(tuioBlob.getTuioTime().getSeconds()) .withMicroSeconds(tuioBlob.getTuioTime().getMicroseconds()) .withxSpeed(tuioBlob.getXSpeed()) @@ -248,7 +247,7 @@ public class TuioAdapter extends TuiAdapter implements TuioListener { int index = tuioBlob.getPath().size() - 1; tempPath.add(new Point(tuioBlob.getPath().get(index).getX(), tuioBlob.getPath().get(index).getY(), tuioBlob.getAngle())); - convertedTangibleObject = new TangibleObjectBuilder(IDMapper.remapCursorId(tuioBlob.getBlobID()), Type.BLOB, tuioBlob.getPath().get(tuioBlob.getPath().size() - 1).getX(), tuioBlob.getPath().get(tuioBlob.getPath().size() - 1).getY()) + convertedTangibleObject = new TangibleObjectBuilder(IdMapper.remapCursorId(tuioBlob.getBlobID()), Type.BLOB, tuioBlob.getPath().get(tuioBlob.getPath().size() - 1).getX(), tuioBlob.getPath().get(tuioBlob.getPath().size() - 1).getY()) .withSeconds(tuioBlob.getTuioTime().getSeconds()) .withMicroSeconds(tuioBlob.getTuioTime().getMicroseconds()) .withxSpeed(tuioBlob.getXSpeed()) @@ -477,7 +476,7 @@ public class TuioAdapter extends TuiAdapter implements TuioListener { */ @Override public TangibleObject getCursor(long id) { - return convertTuioCursorToTangibleObject(client.getTuioCursor(IDMapper.remapTangibleObjectId((int) id))); + return convertTuioCursorToTangibleObject(client.getTuioCursor(IdMapper.remapTangibleObjectId((int) id))); } /** @@ -497,6 +496,6 @@ public class TuioAdapter extends TuiAdapter implements TuioListener { */ @Override public TangibleObject getBlob(long id) { - return convertTuioBlobToTangibleObject(client.getTuioBlob(IDMapper.remapTangibleObjectId((int) id))); + return convertTuioBlobToTangibleObject(client.getTuioBlob(IdMapper.remapTangibleObjectId((int) id))); } } \ No newline at end of file diff --git a/TULIP/src/lu/list/itis/dkd/tui/content/AsynchronousInfomationProvider.java b/TULIP/src/lu/list/itis/dkd/tui/content/AsynchronousInfomationProvider.java index afd456edbd86d8e61bef6b5457f173b378962e87..1421b108319918ba4477f7de0698a0bde73fa356 100644 --- a/TULIP/src/lu/list/itis/dkd/tui/content/AsynchronousInfomationProvider.java +++ b/TULIP/src/lu/list/itis/dkd/tui/content/AsynchronousInfomationProvider.java @@ -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.content; +import lu.list.itis.dkd.dbc.annotation.NonNullByDefault; import lu.list.itis.dkd.tui.utility.Point; -import lu.tudor.ssi.kiss.dbc.annotation.NonNullByDefault; - /** * @author Eric TOBIAS [eric.tobias@list.lu] * @since 1.0 diff --git a/TULIP/src/lu/list/itis/dkd/tui/content/Content.java b/TULIP/src/lu/list/itis/dkd/tui/content/Content.java index 0e8ff344723d804919538bba0eb25dcb4312895a..aac01d7f17c1aef1b4bf9f5acb3fe3db333d8a4b 100644 --- a/TULIP/src/lu/list/itis/dkd/tui/content/Content.java +++ b/TULIP/src/lu/list/itis/dkd/tui/content/Content.java @@ -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.content; -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 java.awt.Graphics2D; diff --git a/TULIP/src/lu/list/itis/dkd/tui/content/InformationProvider.java b/TULIP/src/lu/list/itis/dkd/tui/content/InformationProvider.java index d668165bc2b7eb8d9d50e34717499a0ef5167c22..888eceee4ed27ddf69decb5fb57c2d9a1850f41e 100644 --- a/TULIP/src/lu/list/itis/dkd/tui/content/InformationProvider.java +++ b/TULIP/src/lu/list/itis/dkd/tui/content/InformationProvider.java @@ -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.content; +import lu.list.itis.dkd.dbc.annotation.NonNullByDefault; import lu.list.itis.dkd.tui.utility.Point; -import lu.tudor.ssi.kiss.dbc.annotation.NonNullByDefault; - /** * Interface specifying the contract for all information provider instances. * diff --git a/TULIP/src/lu/list/itis/dkd/tui/content/InformationReceiver.java b/TULIP/src/lu/list/itis/dkd/tui/content/InformationReceiver.java index 4f15f67c4b034763d2c818e68cfd52172446fc59..8fe8bfe3d30921fab1410a6739317a02398cdcaf 100644 --- a/TULIP/src/lu/list/itis/dkd/tui/content/InformationReceiver.java +++ b/TULIP/src/lu/list/itis/dkd/tui/content/InformationReceiver.java @@ -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.content; -import lu.tudor.ssi.kiss.dbc.annotation.NonNullByDefault; +import lu.list.itis.dkd.dbc.annotation.NonNullByDefault; /** * @author Eric TOBIAS [eric.tobias@list.lu] diff --git a/TULIP/src/lu/list/itis/dkd/tui/content/Zoomable.java b/TULIP/src/lu/list/itis/dkd/tui/content/Zoomable.java index 1b7aa461889a0e1aaf37f6c92f8f84499fb61a04..63b8d210909332de0dc0d706f240f18fcd392614 100644 --- a/TULIP/src/lu/list/itis/dkd/tui/content/Zoomable.java +++ b/TULIP/src/lu/list/itis/dkd/tui/content/Zoomable.java @@ -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.content; +import lu.list.itis.dkd.dbc.annotation.NonNullByDefault; +import lu.list.itis.dkd.dbc.annotation.Nullable; import lu.list.itis.dkd.tui.utility.Point; import lu.list.itis.dkd.tui.widget.ZoomWidget; -import lu.tudor.ssi.kiss.dbc.annotation.NonNullByDefault; -import lu.tudor.ssi.kiss.dbc.annotation.Nullable; - /** * Interface imposing functionality in order to be used with the {@link ZoomWidget}. * diff --git a/TULIP/src/lu/list/itis/dkd/tui/event/ContentEvent.java b/TULIP/src/lu/list/itis/dkd/tui/event/ContentEvent.java index eba31eafc3a7c1498009a43aef117ae54e8d1b04..6795f5c264facb9167c80b5f961a56a4b33ff419 100644 --- a/TULIP/src/lu/list/itis/dkd/tui/event/ContentEvent.java +++ b/TULIP/src/lu/list/itis/dkd/tui/event/ContentEvent.java @@ -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.event; +import lu.list.itis.dkd.dbc.annotation.NonNullByDefault; import lu.list.itis.dkd.tui.widget.BaseWidget; -import lu.tudor.ssi.kiss.dbc.annotation.NonNullByDefault; - import java.util.EventObject; /** diff --git a/TULIP/src/lu/list/itis/dkd/tui/event/ContentEventListener.java b/TULIP/src/lu/list/itis/dkd/tui/event/ContentEventListener.java index 405d159567e251ae5812dd3b0bd2c6fc2a0bd58e..69555eecf9ef1c84622e91a6b30e277e635f78b4 100644 --- a/TULIP/src/lu/list/itis/dkd/tui/event/ContentEventListener.java +++ b/TULIP/src/lu/list/itis/dkd/tui/event/ContentEventListener.java @@ -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.event; -import lu.tudor.ssi.kiss.dbc.annotation.NonNullByDefault; +import lu.list.itis.dkd.dbc.annotation.NonNullByDefault; import java.util.EventListener; diff --git a/TULIP/src/lu/list/itis/dkd/tui/event/ContextEvent.java b/TULIP/src/lu/list/itis/dkd/tui/event/ContextEvent.java index ab799bd0b987c1a521bf729083530aa95d348060..a4bd39af8d00e1bb6474e3de239b74d3a454f87f 100644 --- a/TULIP/src/lu/list/itis/dkd/tui/event/ContextEvent.java +++ b/TULIP/src/lu/list/itis/dkd/tui/event/ContextEvent.java @@ -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.event; -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 java.util.EventObject; diff --git a/TULIP/src/lu/list/itis/dkd/tui/event/ContextEventListener.java b/TULIP/src/lu/list/itis/dkd/tui/event/ContextEventListener.java index 639a54c775f56cd350d1166525c512f4ac35dfd8..9222ed94bb0648558883720c4be2db489357d74d 100644 --- a/TULIP/src/lu/list/itis/dkd/tui/event/ContextEventListener.java +++ b/TULIP/src/lu/list/itis/dkd/tui/event/ContextEventListener.java @@ -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.event; +import lu.list.itis.dkd.dbc.annotation.NonNullByDefault; import lu.list.itis.dkd.tui.exception.UnsupportedInformationException; -import lu.tudor.ssi.kiss.dbc.annotation.NonNullByDefault; - import java.util.EventListener; /** diff --git a/TULIP/src/lu/list/itis/dkd/tui/event/TimerEvent.java b/TULIP/src/lu/list/itis/dkd/tui/event/TimerEvent.java index e9c4181d2c4b0bc9b4ddc5648ffed9f032b0bbfd..7ad3beba3f8f65f969e14f57232eb743b811437a 100644 --- a/TULIP/src/lu/list/itis/dkd/tui/event/TimerEvent.java +++ b/TULIP/src/lu/list/itis/dkd/tui/event/TimerEvent.java @@ -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.event; +import lu.list.itis.dkd.dbc.annotation.NonNullByDefault; import lu.list.itis.dkd.tui.widget.state.StateManager; -import lu.tudor.ssi.kiss.dbc.annotation.NonNullByDefault; - import java.util.EventObject; /** diff --git a/TULIP/src/lu/list/itis/dkd/tui/event/TimerEventListener.java b/TULIP/src/lu/list/itis/dkd/tui/event/TimerEventListener.java index 84150b5461af449a6b33c28fe0ea39a3ee4d4f64..8ab1f400ac175f84c6eeb2dbf7340826671abc72 100644 --- a/TULIP/src/lu/list/itis/dkd/tui/event/TimerEventListener.java +++ b/TULIP/src/lu/list/itis/dkd/tui/event/TimerEventListener.java @@ -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,11 +16,10 @@ */ package lu.list.itis.dkd.tui.event; +import lu.list.itis.dkd.dbc.annotation.NonNullByDefault; import lu.list.itis.dkd.tui.widget.StatefulWidget; import lu.list.itis.dkd.tui.widget.state.StateManager; -import lu.tudor.ssi.kiss.dbc.annotation.NonNullByDefault; - import java.util.EventListener; /** diff --git a/TULIP/src/lu/list/itis/dkd/tui/exception/BuildException.java b/TULIP/src/lu/list/itis/dkd/tui/exception/BuildException.java index f1ff8b6af591d55844618e3dc0fc69b6b20dd0e8..a0ba688c2a917c0f9c874ea2356d44a35f7ebb10 100644 --- a/TULIP/src/lu/list/itis/dkd/tui/exception/BuildException.java +++ b/TULIP/src/lu/list/itis/dkd/tui/exception/BuildException.java @@ -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.exception; -import lu.tudor.ssi.kiss.dbc.annotation.NonNullByDefault; +import lu.list.itis.dkd.dbc.annotation.NonNullByDefault; /** * Exception raised when the building on a widget or corona instance cannot complete successfully diff --git a/TULIP/src/lu/list/itis/dkd/tui/exception/UnsupportedInformationException.java b/TULIP/src/lu/list/itis/dkd/tui/exception/UnsupportedInformationException.java index 508d9c5bc48d1f1a361d9a71067d1ffe3dbf4013..bf639bd5b817d34e33de0aaefe23ee742ff2aff1 100644 --- a/TULIP/src/lu/list/itis/dkd/tui/exception/UnsupportedInformationException.java +++ b/TULIP/src/lu/list/itis/dkd/tui/exception/UnsupportedInformationException.java @@ -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.exception; -import lu.tudor.ssi.kiss.dbc.annotation.NonNullByDefault; +import lu.list.itis.dkd.dbc.annotation.NonNullByDefault; /** * Class modelling a simple exception to be thrown when provided information cannot be processed. diff --git a/TULIP/src/lu/list/itis/dkd/tui/logging/EventLogger.java b/TULIP/src/lu/list/itis/dkd/tui/logging/EventLogger.java index 9a1807ae74de9c2544ee393b3dc94dc6197f1270..b6091d5d89d502b94b9b70e6222e9308efa33809 100644 --- a/TULIP/src/lu/list/itis/dkd/tui/logging/EventLogger.java +++ b/TULIP/src/lu/list/itis/dkd/tui/logging/EventLogger.java @@ -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.logging; -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 org.jdom2.Document; import org.jdom2.Element; diff --git a/TULIP/src/lu/list/itis/dkd/tui/network/adapter/BluetoothClient.java b/TULIP/src/lu/list/itis/dkd/tui/network/adapter/BluetoothClient.java index ea56fbb84a74a901dae38894af47f5d7cd73e466..d592760993d9d9d2286f6d4a305c884986aa5346 100644 --- a/TULIP/src/lu/list/itis/dkd/tui/network/adapter/BluetoothClient.java +++ b/TULIP/src/lu/list/itis/dkd/tui/network/adapter/BluetoothClient.java @@ -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; diff --git a/TULIP/src/lu/list/itis/dkd/tui/network/adapter/BluetoothServer.java b/TULIP/src/lu/list/itis/dkd/tui/network/adapter/BluetoothServer.java index d1d6ae46083cce47b7965ee42514b73c8b05b2a4..dd6024ce9509758e7cbb58bfdbdc92e7106d7e32 100644 --- a/TULIP/src/lu/list/itis/dkd/tui/network/adapter/BluetoothServer.java +++ b/TULIP/src/lu/list/itis/dkd/tui/network/adapter/BluetoothServer.java @@ -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; diff --git a/TULIP/src/lu/list/itis/dkd/tui/network/adapter/ClientAdapter.java b/TULIP/src/lu/list/itis/dkd/tui/network/adapter/ClientAdapter.java index 3aa51bd5be7dd85847465434d8c89a96e77a2f74..3c0e0b95b1d80e5aeb6e35043dd0fbbeb2f18740 100644 --- a/TULIP/src/lu/list/itis/dkd/tui/network/adapter/ClientAdapter.java +++ b/TULIP/src/lu/list/itis/dkd/tui/network/adapter/ClientAdapter.java @@ -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 diff --git a/TULIP/src/lu/list/itis/dkd/tui/network/adapter/NetworkAdapter.java b/TULIP/src/lu/list/itis/dkd/tui/network/adapter/NetworkAdapter.java index cb1a847d3fa8449a3a93908e242b8eb9d268983a..f5703a2cdaff30841e7d8cf2f2b4265ecd80e285 100644 --- a/TULIP/src/lu/list/itis/dkd/tui/network/adapter/NetworkAdapter.java +++ b/TULIP/src/lu/list/itis/dkd/tui/network/adapter/NetworkAdapter.java @@ -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; diff --git a/TULIP/src/lu/list/itis/dkd/tui/network/adapter/ServerAdapter.java b/TULIP/src/lu/list/itis/dkd/tui/network/adapter/ServerAdapter.java index 634da686c2efe75ac5d2e16ea4312d4b525affbc..57fa6e2ade63dcad06e4d1e77f056291739aafd2 100644 --- a/TULIP/src/lu/list/itis/dkd/tui/network/adapter/ServerAdapter.java +++ b/TULIP/src/lu/list/itis/dkd/tui/network/adapter/ServerAdapter.java @@ -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; diff --git a/TULIP/src/lu/list/itis/dkd/tui/network/adapter/TcpClient.java b/TULIP/src/lu/list/itis/dkd/tui/network/adapter/TcpClient.java index 4903251637d81af603712ffd3b36518a610b4de3..8a8411b625d7ee619822ea26d986df1bba6b45f7 100644 --- a/TULIP/src/lu/list/itis/dkd/tui/network/adapter/TcpClient.java +++ b/TULIP/src/lu/list/itis/dkd/tui/network/adapter/TcpClient.java @@ -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; diff --git a/TULIP/src/lu/list/itis/dkd/tui/network/adapter/TcpServer.java b/TULIP/src/lu/list/itis/dkd/tui/network/adapter/TcpServer.java index 1d1228765eada0f841e63ec275e01248c611ca77..e7f0d9547489f49f04b382dc6296a16b6ae83d51 100644 --- a/TULIP/src/lu/list/itis/dkd/tui/network/adapter/TcpServer.java +++ b/TULIP/src/lu/list/itis/dkd/tui/network/adapter/TcpServer.java @@ -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; diff --git a/TULIP/src/lu/list/itis/dkd/tui/network/adapter/XbeeAdapter.java b/TULIP/src/lu/list/itis/dkd/tui/network/adapter/XbeeAdapter.java index 072024da37dbf56f5d5b556162ac83ea58b9f0e1..302a91e42cd3853215b229e1ce03328c9a19c303 100644 --- a/TULIP/src/lu/list/itis/dkd/tui/network/adapter/XbeeAdapter.java +++ b/TULIP/src/lu/list/itis/dkd/tui/network/adapter/XbeeAdapter.java @@ -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}. * diff --git a/TULIP/src/lu/list/itis/dkd/tui/utility/Calibration.java b/TULIP/src/lu/list/itis/dkd/tui/utility/Calibration.java index 0415001c0cdc0962919875233c7785d4db655739..5c87eeb22ebb6fc486a145d9262f4437df9f51b6 100644 --- a/TULIP/src/lu/list/itis/dkd/tui/utility/Calibration.java +++ b/TULIP/src/lu/list/itis/dkd/tui/utility/Calibration.java @@ -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.
+ * camera initialTranslation. Then, the intermediate result is multiplied by the table's width. + *
* Note: 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.
+ * camera initialTranslation. Then, the intermediate result is multiplied by the table's width. + *
* Note: The measures in table coordinates a equivalent to concrete measures. * * @param y diff --git a/TULIP/src/lu/list/itis/dkd/tui/utility/CameraCoordinates.java b/TULIP/src/lu/list/itis/dkd/tui/utility/CameraCoordinates.java index b3a047c05efe9ad006e008a959104079ae6f2122..96ec0d34ca8b17146366c87ad8d1c8f7b28fd62f 100644 --- a/TULIP/src/lu/list/itis/dkd/tui/utility/CameraCoordinates.java +++ b/TULIP/src/lu/list/itis/dkd/tui/utility/CameraCoordinates.java @@ -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 diff --git a/TULIP/src/lu/list/itis/dkd/tui/utility/CoordinateState.java b/TULIP/src/lu/list/itis/dkd/tui/utility/CoordinateState.java index 93031d32952895792ab26ceb383c15c191f75675..f781b405e2182081e49c2d30141b39cbb331c851 100644 --- a/TULIP/src/lu/list/itis/dkd/tui/utility/CoordinateState.java +++ b/TULIP/src/lu/list/itis/dkd/tui/utility/CoordinateState.java @@ -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. diff --git a/TULIP/src/lu/list/itis/dkd/tui/utility/GlobalContext.java b/TULIP/src/lu/list/itis/dkd/tui/utility/GlobalContext.java index 3177b279a6c128d8982b276d154d8ddc6f90875c..9ed6e02eb9cf82506558f66e8d711616f1cb2450 100644 --- a/TULIP/src/lu/list/itis/dkd/tui/utility/GlobalContext.java +++ b/TULIP/src/lu/list/itis/dkd/tui/utility/GlobalContext.java @@ -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; diff --git a/TULIP/src/lu/list/itis/dkd/tui/utility/IDMapper.java b/TULIP/src/lu/list/itis/dkd/tui/utility/IdMapper.java similarity index 95% rename from TULIP/src/lu/list/itis/dkd/tui/utility/IDMapper.java rename to TULIP/src/lu/list/itis/dkd/tui/utility/IdMapper.java index d248d81b4b38af6dff176804a0497a319210bf4a..e899a7eeeb36558dc1110184c1c221db41bf7f49 100644 --- a/TULIP/src/lu/list/itis/dkd/tui/utility/IDMapper.java +++ b/TULIP/src/lu/list/itis/dkd/tui/utility/IdMapper.java @@ -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; } /** diff --git a/TULIP/src/lu/list/itis/dkd/tui/utility/Point.java b/TULIP/src/lu/list/itis/dkd/tui/utility/Point.java index 1470a51da3f71b35de234504c7defe90a4eca3c5..5f6d5c8f09920290b379887f9009522f625cd122 100644 --- a/TULIP/src/lu/list/itis/dkd/tui/utility/Point.java +++ b/TULIP/src/lu/list/itis/dkd/tui/utility/Point.java @@ -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; diff --git a/TULIP/src/lu/list/itis/dkd/tui/utility/ScreenCoordinates.java b/TULIP/src/lu/list/itis/dkd/tui/utility/ScreenCoordinates.java index 2bef0447872ef10f2fa3a4ea6169dedf866d1eca..b21fddc06ec51f77da5e331e4d650450158d4aec 100644 --- a/TULIP/src/lu/list/itis/dkd/tui/utility/ScreenCoordinates.java +++ b/TULIP/src/lu/list/itis/dkd/tui/utility/ScreenCoordinates.java @@ -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! + */ } /** diff --git a/TULIP/src/lu/list/itis/dkd/tui/utility/TableCoordinates.java b/TULIP/src/lu/list/itis/dkd/tui/utility/TableCoordinates.java index c04750e612e1150e1058c1bd9a23d6f2905e80a5..0f68be7864dc6960ed27c354198f9504cf63e7d7 100644 --- a/TULIP/src/lu/list/itis/dkd/tui/utility/TableCoordinates.java +++ b/TULIP/src/lu/list/itis/dkd/tui/utility/TableCoordinates.java @@ -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! + */ } /** diff --git a/TULIP/src/lu/list/itis/dkd/tui/utility/TextHelper.java b/TULIP/src/lu/list/itis/dkd/tui/utility/TextHelper.java index 555a28a3e63c4fb85da5ffc85317699924a2f55a..804bf0e9516592cf250d5a77260835266ddb8fc3 100644 --- a/TULIP/src/lu/list/itis/dkd/tui/utility/TextHelper.java +++ b/TULIP/src/lu/list/itis/dkd/tui/utility/TextHelper.java @@ -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; diff --git a/TULIP/src/lu/list/itis/dkd/tui/widget/BaseWidget.java b/TULIP/src/lu/list/itis/dkd/tui/widget/BaseWidget.java index 48354c70750b8699922ad45042fb4863ea9d46fc..97b4891e60610cd29e51e655151d51feb9f192b6 100644 --- a/TULIP/src/lu/list/itis/dkd/tui/widget/BaseWidget.java +++ b/TULIP/src/lu/list/itis/dkd/tui/widget/BaseWidget.java @@ -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; diff --git a/TULIP/src/lu/list/itis/dkd/tui/widget/ContentWidget.java b/TULIP/src/lu/list/itis/dkd/tui/widget/ContentWidget.java index ad258399783f046eeef2204f2c20dc4ebc01c1cc..79a5e93d2695f3eeda99df7eabdb5d6e235af757 100644 --- a/TULIP/src/lu/list/itis/dkd/tui/widget/ContentWidget.java +++ b/TULIP/src/lu/list/itis/dkd/tui/widget/ContentWidget.java @@ -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; /** diff --git a/TULIP/src/lu/list/itis/dkd/tui/widget/ContextAwareWidget.java b/TULIP/src/lu/list/itis/dkd/tui/widget/ContextAwareWidget.java index 9ed52006f9d7908e18ff239acee97d880992c8ff..3e584744e5457dc806e020c6bb0217a866bd025f 100644 --- a/TULIP/src/lu/list/itis/dkd/tui/widget/ContextAwareWidget.java +++ b/TULIP/src/lu/list/itis/dkd/tui/widget/ContextAwareWidget.java @@ -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 diff --git a/TULIP/src/lu/list/itis/dkd/tui/widget/InfoWidget.java b/TULIP/src/lu/list/itis/dkd/tui/widget/InfoWidget.java index 7f5db23c3d97102b59ea834d0dd447885b7ece0b..2c238a3f802cecc1b6a13f0761b1ecf80358539d 100644 --- a/TULIP/src/lu/list/itis/dkd/tui/widget/InfoWidget.java +++ b/TULIP/src/lu/list/itis/dkd/tui/widget/InfoWidget.java @@ -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; /** diff --git a/TULIP/src/lu/list/itis/dkd/tui/widget/PieChartWidget.java b/TULIP/src/lu/list/itis/dkd/tui/widget/PieChartWidget.java index 109492163caac919f99f323884d105d5ade5f875..33e38058c82afd13fe31298ef1bbd9b0050a7f6e 100644 --- a/TULIP/src/lu/list/itis/dkd/tui/widget/PieChartWidget.java +++ b/TULIP/src/lu/list/itis/dkd/tui/widget/PieChartWidget.java @@ -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,8 @@ */ package lu.list.itis.dkd.tui.widget; +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.event.ContextEvent; import lu.list.itis.dkd.tui.event.ContextEvent.ContextType; @@ -27,11 +29,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 lu.tudor.ssi.kiss.dbc.annotation.Nullable; - -import TUIO.TuioCursor; - import java.awt.Graphics2D; import java.util.HashMap; import java.util.Map; @@ -39,6 +36,8 @@ import java.util.Set; import java.util.logging.Level; import java.util.logging.Logger; +import TUIO.TuioCursor; + /** * Widget implementing the {@link ContextAwareWidget} which is able to react to changes in the * widget's context, that is, the domain defined by the union of all of its coronas. This diff --git a/TULIP/src/lu/list/itis/dkd/tui/widget/StatefulWidget.java b/TULIP/src/lu/list/itis/dkd/tui/widget/StatefulWidget.java index 69d19ced83bf886ebec209561a89fa10d6b10577..cb49317bdae0dbcbe6f2c830cad392cdd8776538 100644 --- a/TULIP/src/lu/list/itis/dkd/tui/widget/StatefulWidget.java +++ b/TULIP/src/lu/list/itis/dkd/tui/widget/StatefulWidget.java @@ -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,21 +16,20 @@ */ 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.utility.Point; import lu.list.itis.dkd.tui.widget.builder.BaseStatefulBuilder; -import lu.list.itis.dkd.tui.widget.state.NUIState; +import lu.list.itis.dkd.tui.widget.state.NuiState; import lu.list.itis.dkd.tui.widget.state.StateManager; -import lu.tudor.ssi.kiss.dbc.annotation.NonNullByDefault; - import com.google.common.base.Preconditions; import java.util.Collection; import java.util.concurrent.ConcurrentHashMap; /** - * A widget implementation which adds a {@link NUIState} to the widget keeping track of state + * A widget implementation which adds a {@link NuiState} to the widget keeping track of state * transitions and the actual state. * * @author Eric TOBIAS [eric.tobias@list.lu] @@ -39,7 +38,7 @@ import java.util.concurrent.ConcurrentHashMap; */ @NonNullByDefault public class StatefulWidget extends BaseWidget { - /** The coalesced NUIState instances per handle. */ + /** The coalesced NuiState instances per handle. */ protected ConcurrentHashMap states; /** Fields to track changes in position and rotation. */ protected Point rotationDelta, movementDelta; diff --git a/TULIP/src/lu/list/itis/dkd/tui/widget/ZoomWidget.java b/TULIP/src/lu/list/itis/dkd/tui/widget/ZoomWidget.java index 58be27ede3c15486a2ad8ceaf38aca27318184f3..9969835ef84243c75c3dd80fc2f2f6e85d5d1acf 100644 --- a/TULIP/src/lu/list/itis/dkd/tui/widget/ZoomWidget.java +++ b/TULIP/src/lu/list/itis/dkd/tui/widget/ZoomWidget.java @@ -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.TangibleApplication; import lu.list.itis.dkd.tui.adapter.TangibleObject; import lu.list.itis.dkd.tui.content.Zoomable; @@ -25,8 +26,6 @@ import lu.list.itis.dkd.tui.utility.Point; import lu.list.itis.dkd.tui.widget.builder.BaseZoomBuilder; import lu.list.itis.dkd.tui.widget.state.StateManager; -import lu.tudor.ssi.kiss.dbc.annotation.NonNullByDefault; - import com.google.common.base.Preconditions; import java.util.concurrent.ConcurrentHashMap; @@ -109,7 +108,9 @@ public class ZoomWidget extends StatefulWidget implements TimerEventListener { } } - /** Method making a call to the super method and setting the base angle for ration computations. */ + /** + * Method making a call to the super method and setting the base angle for ration computations. + */ @Override public void actionDrop(TangibleObject tangibleObject) { super.actionDrop(tangibleObject); @@ -118,9 +119,9 @@ public class ZoomWidget extends StatefulWidget implements TimerEventListener { /** {@inheritDoc} */ @Override public void stoppedMoving(TimerEvent event) {/** - * The widget recentres synchronously, no need to - * do anything here! - */ + * The widget recentres synchronously, no need to + * do anything here! + */ // TODO Maybe issue a new map request for the content? } diff --git a/TULIP/src/lu/list/itis/dkd/tui/widget/builder/BaseBuilder.java b/TULIP/src/lu/list/itis/dkd/tui/widget/builder/BaseBuilder.java index db8c35a25a66526de5c208faf5cc312524281d2e..d3f92a9ac5cabd99e9dea73747bbbc19b241c15a 100644 --- a/TULIP/src/lu/list/itis/dkd/tui/widget/builder/BaseBuilder.java +++ b/TULIP/src/lu/list/itis/dkd/tui/widget/builder/BaseBuilder.java @@ -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,13 +16,12 @@ */ package lu.list.itis.dkd.tui.widget.builder; +import lu.list.itis.dkd.dbc.annotation.NonNullByDefault; import lu.list.itis.dkd.tui.network.adapter.NetworkAdapter; import lu.list.itis.dkd.tui.utility.Point; import lu.list.itis.dkd.tui.widget.BaseWidget; import lu.list.itis.dkd.tui.widget.corona.Corona; -import lu.tudor.ssi.kiss.dbc.annotation.NonNullByDefault; - import com.google.common.collect.Multimap; import com.google.common.collect.TreeMultimap; diff --git a/TULIP/src/lu/list/itis/dkd/tui/widget/builder/BaseContentBuilder.java b/TULIP/src/lu/list/itis/dkd/tui/widget/builder/BaseContentBuilder.java index 3a8282759f62bf8e0f4b1359742619ed213f8fdd..a7cd3aac45e7f2d01ed0be267d6fbfacdadf1926 100644 --- a/TULIP/src/lu/list/itis/dkd/tui/widget/builder/BaseContentBuilder.java +++ b/TULIP/src/lu/list/itis/dkd/tui/widget/builder/BaseContentBuilder.java @@ -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.widget.builder; +import lu.list.itis.dkd.dbc.annotation.NonNullByDefault; import lu.list.itis.dkd.tui.content.Content; import lu.list.itis.dkd.tui.event.ContentEventListener; import lu.list.itis.dkd.tui.widget.ContentWidget; -import lu.tudor.ssi.kiss.dbc.annotation.NonNullByDefault; - import java.util.ArrayList; import java.util.Collection; diff --git a/TULIP/src/lu/list/itis/dkd/tui/widget/builder/BaseContextAwareBuilder.java b/TULIP/src/lu/list/itis/dkd/tui/widget/builder/BaseContextAwareBuilder.java index 59d4908f3dc1a98f9bee6e950b0c35e2d786942b..46c5e94de3315887fa97a31dce4889c0f79e8a0b 100644 --- a/TULIP/src/lu/list/itis/dkd/tui/widget/builder/BaseContextAwareBuilder.java +++ b/TULIP/src/lu/list/itis/dkd/tui/widget/builder/BaseContextAwareBuilder.java @@ -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.widget.builder; +import lu.list.itis.dkd.dbc.annotation.NonNullByDefault; import lu.list.itis.dkd.tui.event.ContextEventListener; import lu.list.itis.dkd.tui.widget.ContextAwareWidget; import lu.list.itis.dkd.tui.widget.corona.ContextAwareCorona; -import lu.tudor.ssi.kiss.dbc.annotation.NonNullByDefault; - import com.google.common.collect.HashMultimap; import java.util.Vector; diff --git a/TULIP/src/lu/list/itis/dkd/tui/widget/builder/BaseInfoBuilder.java b/TULIP/src/lu/list/itis/dkd/tui/widget/builder/BaseInfoBuilder.java index 365e27121cf3c7618c2fe79e7fa9992324127829..a94da8a90dae767a386098a1e8498d966272ce6c 100644 --- a/TULIP/src/lu/list/itis/dkd/tui/widget/builder/BaseInfoBuilder.java +++ b/TULIP/src/lu/list/itis/dkd/tui/widget/builder/BaseInfoBuilder.java @@ -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,13 +16,12 @@ */ package lu.list.itis.dkd.tui.widget.builder; +import lu.list.itis.dkd.dbc.annotation.NonNullByDefault; +import lu.list.itis.dkd.dbc.annotation.Nullable; import lu.list.itis.dkd.tui.content.AsynchronousInfomationProvider; import lu.list.itis.dkd.tui.content.InformationProvider; import lu.list.itis.dkd.tui.widget.InfoWidget; -import lu.tudor.ssi.kiss.dbc.annotation.NonNullByDefault; -import lu.tudor.ssi.kiss.dbc.annotation.Nullable; - /** * Builder serving as abstract super class for all information builders. * diff --git a/TULIP/src/lu/list/itis/dkd/tui/widget/builder/BaseStatefulBuilder.java b/TULIP/src/lu/list/itis/dkd/tui/widget/builder/BaseStatefulBuilder.java index d3c21a19a5fee9aa0dd522cfdfd1073dc717521f..edb6c8e1b191d0c89ddd01a5da96c3c10863e4a3 100644 --- a/TULIP/src/lu/list/itis/dkd/tui/widget/builder/BaseStatefulBuilder.java +++ b/TULIP/src/lu/list/itis/dkd/tui/widget/builder/BaseStatefulBuilder.java @@ -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,13 +16,12 @@ */ package lu.list.itis.dkd.tui.widget.builder; +import lu.list.itis.dkd.dbc.annotation.NonNullByDefault; import lu.list.itis.dkd.tui.utility.Point; import lu.list.itis.dkd.tui.widget.StatefulWidget; -import lu.list.itis.dkd.tui.widget.state.NUIState; +import lu.list.itis.dkd.tui.widget.state.NuiState; import lu.list.itis.dkd.tui.widget.state.StateManager; -import lu.tudor.ssi.kiss.dbc.annotation.NonNullByDefault; - import java.util.concurrent.ConcurrentHashMap; /** @@ -36,7 +35,7 @@ import java.util.concurrent.ConcurrentHashMap; */ @NonNullByDefault public abstract class BaseStatefulBuilder> extends BaseBuilder { - /** The coalesced NUIState instances per handle! */ + /** The coalesced NuiState instances per handle! */ public ConcurrentHashMap states; /** Constructor initialising the fields. */ @@ -45,7 +44,7 @@ public abstract class BaseStatefulBuilder> exte } /** - * Method for setting the {@link NUIState} the widget is to have upon construction. + * Method for setting the {@link NuiState} the widget is to have upon construction. * * @param handleID * The identifier of the handle to add a state for. diff --git a/TULIP/src/lu/list/itis/dkd/tui/widget/builder/BaseWidgetBuilder.java b/TULIP/src/lu/list/itis/dkd/tui/widget/builder/BaseWidgetBuilder.java index e3f329be725f82c44db91ec884e95e5f9ee4865e..9492155aed3f5ce3b678f568800305e02b2d21f4 100644 --- a/TULIP/src/lu/list/itis/dkd/tui/widget/builder/BaseWidgetBuilder.java +++ b/TULIP/src/lu/list/itis/dkd/tui/widget/builder/BaseWidgetBuilder.java @@ -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.widget.builder; +import lu.list.itis.dkd.dbc.annotation.NonNullByDefault; import lu.list.itis.dkd.tui.widget.BaseWidget; -import lu.tudor.ssi.kiss.dbc.annotation.NonNullByDefault; - /** * BaseWidgetBuilder class used to construct a simple widget by providing methods to set all * parameters and permutations thereof. diff --git a/TULIP/src/lu/list/itis/dkd/tui/widget/builder/BaseZoomBuilder.java b/TULIP/src/lu/list/itis/dkd/tui/widget/builder/BaseZoomBuilder.java index a9568d1bd4c596e9f408e6ec548dadece87dd8c3..2b76f77dcbf181ceb09648330fbde0af0899f132 100644 --- a/TULIP/src/lu/list/itis/dkd/tui/widget/builder/BaseZoomBuilder.java +++ b/TULIP/src/lu/list/itis/dkd/tui/widget/builder/BaseZoomBuilder.java @@ -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,13 +16,12 @@ */ package lu.list.itis.dkd.tui.widget.builder; +import lu.list.itis.dkd.dbc.annotation.NonNull; +import lu.list.itis.dkd.dbc.annotation.NonNullByDefault; import lu.list.itis.dkd.tui.content.Zoomable; import lu.list.itis.dkd.tui.widget.ZoomWidget; import lu.list.itis.dkd.tui.widget.state.StateManager; -import lu.tudor.ssi.kiss.dbc.annotation.NonNull; -import lu.tudor.ssi.kiss.dbc.annotation.NonNullByDefault; - import com.google.common.base.Preconditions; import java.util.concurrent.ConcurrentHashMap; diff --git a/TULIP/src/lu/list/itis/dkd/tui/widget/builder/ContentWidgetBuilder.java b/TULIP/src/lu/list/itis/dkd/tui/widget/builder/ContentWidgetBuilder.java index dfd93563a11ffdff9e911225647b5cdc79b82862..07d61bd939989bb11f72397b1febe21d1564b471 100644 --- a/TULIP/src/lu/list/itis/dkd/tui/widget/builder/ContentWidgetBuilder.java +++ b/TULIP/src/lu/list/itis/dkd/tui/widget/builder/ContentWidgetBuilder.java @@ -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.widget.builder; +import lu.list.itis.dkd.dbc.annotation.NonNullByDefault; import lu.list.itis.dkd.tui.widget.ContentWidget; -import lu.tudor.ssi.kiss.dbc.annotation.NonNullByDefault; - /** * {@link ContentWidgetBuilder} class used to construct a content widget by providing methods to set * all parameters and permutations thereof. diff --git a/TULIP/src/lu/list/itis/dkd/tui/widget/builder/InfoWidgetBuilder.java b/TULIP/src/lu/list/itis/dkd/tui/widget/builder/InfoWidgetBuilder.java index bf0f1835ab23206c3692d8e7d07961d4dd9f4a35..b327dbdb463422a37f9818803d72cd584f0ba1ff 100644 --- a/TULIP/src/lu/list/itis/dkd/tui/widget/builder/InfoWidgetBuilder.java +++ b/TULIP/src/lu/list/itis/dkd/tui/widget/builder/InfoWidgetBuilder.java @@ -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.widget.builder; +import lu.list.itis.dkd.dbc.annotation.NonNullByDefault; import lu.list.itis.dkd.tui.widget.InfoWidget; -import lu.tudor.ssi.kiss.dbc.annotation.NonNullByDefault; - import com.google.common.base.Preconditions; /** diff --git a/TULIP/src/lu/list/itis/dkd/tui/widget/builder/PieChartWidgetBuilder.java b/TULIP/src/lu/list/itis/dkd/tui/widget/builder/PieChartWidgetBuilder.java index efcd717a75089f049d5ab863503a1bc966d14595..cbca98267570b527a5c99ddd1b312e3f35c284ea 100644 --- a/TULIP/src/lu/list/itis/dkd/tui/widget/builder/PieChartWidgetBuilder.java +++ b/TULIP/src/lu/list/itis/dkd/tui/widget/builder/PieChartWidgetBuilder.java @@ -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,11 +16,10 @@ */ package lu.list.itis.dkd.tui.widget.builder; +import lu.list.itis.dkd.dbc.annotation.NonNullByDefault; import lu.list.itis.dkd.tui.widget.ContextAwareWidget; import lu.list.itis.dkd.tui.widget.PieChartWidget; -import lu.tudor.ssi.kiss.dbc.annotation.NonNullByDefault; - /** * {@link PieChartWidgetBuilder} class used to construct a simple widget by providing methods to set * all parameters and permutations thereof. diff --git a/TULIP/src/lu/list/itis/dkd/tui/widget/builder/StatefulWidgetBuilder.java b/TULIP/src/lu/list/itis/dkd/tui/widget/builder/StatefulWidgetBuilder.java index 5ad27b12cab8b688238ec091bc2772a57a05944b..036e987eef5e93fbb86141cb5f3743187d027fbe 100644 --- a/TULIP/src/lu/list/itis/dkd/tui/widget/builder/StatefulWidgetBuilder.java +++ b/TULIP/src/lu/list/itis/dkd/tui/widget/builder/StatefulWidgetBuilder.java @@ -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.widget.builder; +import lu.list.itis.dkd.dbc.annotation.NonNullByDefault; import lu.list.itis.dkd.tui.widget.StatefulWidget; -import lu.tudor.ssi.kiss.dbc.annotation.NonNullByDefault; - /** * StatefulWidgetBuilder class used to construct a stateful widget by providing methods to set all * parameters and permutations thereof. diff --git a/TULIP/src/lu/list/itis/dkd/tui/widget/builder/ZoomWidgetBuilder.java b/TULIP/src/lu/list/itis/dkd/tui/widget/builder/ZoomWidgetBuilder.java index 9a0b6494a2db68b9ff35ba51244d154ee8b6341d..5f0ff40ca2778ac3fe4e8195a744abb418a82ff9 100644 --- a/TULIP/src/lu/list/itis/dkd/tui/widget/builder/ZoomWidgetBuilder.java +++ b/TULIP/src/lu/list/itis/dkd/tui/widget/builder/ZoomWidgetBuilder.java @@ -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.widget.builder; +import lu.list.itis.dkd.dbc.annotation.NonNullByDefault; import lu.list.itis.dkd.tui.widget.ZoomWidget; -import lu.tudor.ssi.kiss.dbc.annotation.NonNullByDefault; - import com.google.common.base.Preconditions; /** diff --git a/TULIP/src/lu/list/itis/dkd/tui/widget/corona/ContextAwareCorona.java b/TULIP/src/lu/list/itis/dkd/tui/widget/corona/ContextAwareCorona.java index ff75e8ef01c5b56d4e1b9a92212d3be21d123357..fd9429809f24784db98bd5e6348a955b6400068a 100644 --- a/TULIP/src/lu/list/itis/dkd/tui/widget/corona/ContextAwareCorona.java +++ b/TULIP/src/lu/list/itis/dkd/tui/widget/corona/ContextAwareCorona.java @@ -16,11 +16,10 @@ */ package lu.list.itis.dkd.tui.widget.corona; +import lu.list.itis.dkd.dbc.annotation.NonNullByDefault; import lu.list.itis.dkd.tui.utility.Point; import lu.list.itis.dkd.tui.widget.corona.builder.CoronaBuilder; -import lu.tudor.ssi.kiss.dbc.annotation.NonNullByDefault; - import com.google.common.base.Preconditions; import java.awt.Shape; diff --git a/TULIP/src/lu/list/itis/dkd/tui/widget/corona/Corona.java b/TULIP/src/lu/list/itis/dkd/tui/widget/corona/Corona.java index 5c7802ecbcd95eae020cbb01ce9d0cf12c8a6e83..478dfeb7291bbe875c975ee5c40850331ed41a3a 100644 --- a/TULIP/src/lu/list/itis/dkd/tui/widget/corona/Corona.java +++ b/TULIP/src/lu/list/itis/dkd/tui/widget/corona/Corona.java @@ -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,13 +16,12 @@ */ package lu.list.itis.dkd.tui.widget.corona; +import lu.list.itis.dkd.dbc.annotation.NonNullByDefault; +import lu.list.itis.dkd.dbc.annotation.Nullable; import lu.list.itis.dkd.tui.utility.Point; import lu.list.itis.dkd.tui.utility.ScreenCoordinates; import lu.list.itis.dkd.tui.widget.corona.builder.CoronaBuilder; -import lu.tudor.ssi.kiss.dbc.annotation.NonNullByDefault; -import lu.tudor.ssi.kiss.dbc.annotation.Nullable; - import com.google.common.base.Preconditions; import com.google.common.collect.Multimap; @@ -76,7 +75,9 @@ public abstract class Corona implements Comparable { /** Field holding the shape representing the corona. */ @Nullable protected Shape shape; - /** Field indicating whether the corona is part of the background. Default: false. */ + /** + * Field indicating whether the corona is part of the background. Default: false. + */ protected boolean background = false; /** diff --git a/TULIP/src/lu/list/itis/dkd/tui/widget/corona/Image.java b/TULIP/src/lu/list/itis/dkd/tui/widget/corona/Image.java index 12253652e38b29f976e4b376af7e7ee1116e0492..240ddb8ba9a5d47bfa2a09d1222cc6a2d3fc5568 100644 --- a/TULIP/src/lu/list/itis/dkd/tui/widget/corona/Image.java +++ b/TULIP/src/lu/list/itis/dkd/tui/widget/corona/Image.java @@ -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,8 @@ */ package lu.list.itis.dkd.tui.widget.corona; +import lu.list.itis.dkd.dbc.annotation.NonNullByDefault; +import lu.list.itis.dkd.dbc.annotation.Nullable; import lu.list.itis.dkd.tui.content.InformationProvider; import lu.list.itis.dkd.tui.content.InformationReceiver; import lu.list.itis.dkd.tui.event.ContextEvent; @@ -25,9 +27,6 @@ import lu.list.itis.dkd.tui.exception.UnsupportedInformationException; import lu.list.itis.dkd.tui.utility.Point; import lu.list.itis.dkd.tui.widget.corona.builder.ImageBuilder; -import lu.tudor.ssi.kiss.dbc.annotation.NonNullByDefault; -import lu.tudor.ssi.kiss.dbc.annotation.Nullable; - import java.awt.Graphics2D; import java.awt.geom.AffineTransform; diff --git a/TULIP/src/lu/list/itis/dkd/tui/widget/corona/InfoBox.java b/TULIP/src/lu/list/itis/dkd/tui/widget/corona/InfoBox.java index b8ee5bec399825f227f212a4ab4557906f8dfccf..51648d169910b9432a5cb98a0044055c6864be08 100644 --- a/TULIP/src/lu/list/itis/dkd/tui/widget/corona/InfoBox.java +++ b/TULIP/src/lu/list/itis/dkd/tui/widget/corona/InfoBox.java @@ -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.corona; +import lu.list.itis.dkd.dbc.annotation.NonNullByDefault; import lu.list.itis.dkd.tui.content.InformationReceiver; import lu.list.itis.dkd.tui.utility.Calibration; import lu.list.itis.dkd.tui.utility.Point; import lu.list.itis.dkd.tui.utility.TableCoordinates; import lu.list.itis.dkd.tui.widget.corona.builder.BaseInfoBoxBuilder; -import lu.tudor.ssi.kiss.dbc.annotation.NonNullByDefault; - import java.awt.Color; import java.awt.Font; import java.awt.Graphics2D; diff --git a/TULIP/src/lu/list/itis/dkd/tui/widget/corona/Pointer.java b/TULIP/src/lu/list/itis/dkd/tui/widget/corona/Pointer.java index 297a56a4487279fe5d302d5e6a93e57e20ea5ccc..baa6983cbc3db6ce47855f7250f37fe74ec7927a 100644 --- a/TULIP/src/lu/list/itis/dkd/tui/widget/corona/Pointer.java +++ b/TULIP/src/lu/list/itis/dkd/tui/widget/corona/Pointer.java @@ -16,12 +16,11 @@ */ package lu.list.itis.dkd.tui.widget.corona; +import lu.list.itis.dkd.dbc.annotation.NonNullByDefault; import lu.list.itis.dkd.tui.utility.Point; import lu.list.itis.dkd.tui.utility.TableCoordinates; import lu.list.itis.dkd.tui.widget.corona.builder.BasePointerBuilder; -import lu.tudor.ssi.kiss.dbc.annotation.NonNullByDefault; - import com.google.common.base.Preconditions; import java.awt.Color; diff --git a/TULIP/src/lu/list/itis/dkd/tui/widget/corona/Radius.java b/TULIP/src/lu/list/itis/dkd/tui/widget/corona/Radius.java index 9a3cf33d2d77e843da8bf0c7574dfffbfd21ff65..62facfe67fe9fc669b5f8875ba8741e8322e3e68 100644 --- a/TULIP/src/lu/list/itis/dkd/tui/widget/corona/Radius.java +++ b/TULIP/src/lu/list/itis/dkd/tui/widget/corona/Radius.java @@ -16,12 +16,11 @@ */ package lu.list.itis.dkd.tui.widget.corona; +import lu.list.itis.dkd.dbc.annotation.NonNullByDefault; +import lu.list.itis.dkd.dbc.annotation.Nullable; import lu.list.itis.dkd.tui.utility.Point; import lu.list.itis.dkd.tui.widget.corona.builder.BaseRadiusBuilder; -import lu.tudor.ssi.kiss.dbc.annotation.NonNullByDefault; -import lu.tudor.ssi.kiss.dbc.annotation.Nullable; - import java.awt.BasicStroke; import java.awt.Color; import java.awt.Graphics2D; diff --git a/TULIP/src/lu/list/itis/dkd/tui/widget/corona/Shadow.java b/TULIP/src/lu/list/itis/dkd/tui/widget/corona/Shadow.java index c18824ac367be3c69ead768e4b86450a48961754..ed43ae67848a34ebc6b0954f1e7ac0657ccb3d3e 100644 --- a/TULIP/src/lu/list/itis/dkd/tui/widget/corona/Shadow.java +++ b/TULIP/src/lu/list/itis/dkd/tui/widget/corona/Shadow.java @@ -16,11 +16,10 @@ */ package lu.list.itis.dkd.tui.widget.corona; +import lu.list.itis.dkd.dbc.annotation.NonNullByDefault; import lu.list.itis.dkd.tui.utility.Point; import lu.list.itis.dkd.tui.widget.corona.builder.BaseShadowBuilder; -import lu.tudor.ssi.kiss.dbc.annotation.NonNullByDefault; - import java.awt.Color; import java.awt.Graphics2D; import java.awt.geom.AffineTransform; diff --git a/TULIP/src/lu/list/itis/dkd/tui/widget/corona/ShapeFactory.java b/TULIP/src/lu/list/itis/dkd/tui/widget/corona/ShapeFactory.java index 3865ef2511474e0e8ca02875e6362027b839dbcd..9050a34010620870ca0cb430373fbaa70afcd88f 100644 --- a/TULIP/src/lu/list/itis/dkd/tui/widget/corona/ShapeFactory.java +++ b/TULIP/src/lu/list/itis/dkd/tui/widget/corona/ShapeFactory.java @@ -16,10 +16,9 @@ */ package lu.list.itis.dkd.tui.widget.corona; +import lu.list.itis.dkd.dbc.annotation.NonNullByDefault; import lu.list.itis.dkd.tui.utility.Calibration; -import lu.tudor.ssi.kiss.dbc.annotation.NonNullByDefault; - import java.awt.geom.Arc2D; import java.awt.geom.Ellipse2D; import java.awt.geom.GeneralPath; diff --git a/TULIP/src/lu/list/itis/dkd/tui/widget/corona/TextBox.java b/TULIP/src/lu/list/itis/dkd/tui/widget/corona/TextBox.java index cd2843b74514c18fd7deb1008e4bbfffa127528e..4f73e549f56b738ab15fd606400972084d0d17e3 100644 --- a/TULIP/src/lu/list/itis/dkd/tui/widget/corona/TextBox.java +++ b/TULIP/src/lu/list/itis/dkd/tui/widget/corona/TextBox.java @@ -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,8 @@ */ package lu.list.itis.dkd.tui.widget.corona; +import lu.list.itis.dkd.dbc.annotation.NonNullByDefault; +import lu.list.itis.dkd.dbc.annotation.Nullable; import lu.list.itis.dkd.tui.content.InformationProvider; import lu.list.itis.dkd.tui.content.InformationReceiver; import lu.list.itis.dkd.tui.event.ContextEvent; @@ -25,9 +27,6 @@ import lu.list.itis.dkd.tui.utility.Point; import lu.list.itis.dkd.tui.utility.TextHelper; import lu.list.itis.dkd.tui.widget.corona.builder.BaseTextBoxBuilder; -import lu.tudor.ssi.kiss.dbc.annotation.NonNullByDefault; -import lu.tudor.ssi.kiss.dbc.annotation.Nullable; - import java.awt.Color; import java.awt.Font; import java.awt.Graphics2D; diff --git a/TULIP/src/lu/list/itis/dkd/tui/widget/corona/Wedge.java b/TULIP/src/lu/list/itis/dkd/tui/widget/corona/Wedge.java index 9ab0239539207ff3dd38d7d8a71fc7ab548f5913..b281bbe8aea9b5368369dda2113cfe7f20cd1396 100644 --- a/TULIP/src/lu/list/itis/dkd/tui/widget/corona/Wedge.java +++ b/TULIP/src/lu/list/itis/dkd/tui/widget/corona/Wedge.java @@ -16,13 +16,12 @@ */ package lu.list.itis.dkd.tui.widget.corona; +import lu.list.itis.dkd.dbc.annotation.NonNullByDefault; +import lu.list.itis.dkd.dbc.annotation.Nullable; import lu.list.itis.dkd.tui.utility.Point; import lu.list.itis.dkd.tui.utility.ScreenCoordinates; import lu.list.itis.dkd.tui.widget.corona.builder.BaseWedgeBuilder; -import lu.tudor.ssi.kiss.dbc.annotation.NonNullByDefault; -import lu.tudor.ssi.kiss.dbc.annotation.Nullable; - import com.google.common.base.Preconditions; import java.awt.Color; diff --git a/TULIP/src/lu/list/itis/dkd/tui/widget/corona/builder/BaseImageBuilder.java b/TULIP/src/lu/list/itis/dkd/tui/widget/corona/builder/BaseImageBuilder.java index c8d274f7db7843db993f6665bcd3a34c6d13e70e..249f8a97fde9e4170002af922d169cc87d18461b 100644 --- a/TULIP/src/lu/list/itis/dkd/tui/widget/corona/builder/BaseImageBuilder.java +++ b/TULIP/src/lu/list/itis/dkd/tui/widget/corona/builder/BaseImageBuilder.java @@ -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,15 +16,14 @@ */ package lu.list.itis.dkd.tui.widget.corona.builder; +import lu.list.itis.dkd.dbc.annotation.NonNullByDefault; +import lu.list.itis.dkd.dbc.annotation.Nullable; import lu.list.itis.dkd.tui.content.InformationProvider; import lu.list.itis.dkd.tui.exception.BuildException; import lu.list.itis.dkd.tui.utility.Point; import lu.list.itis.dkd.tui.widget.corona.Image; import lu.list.itis.dkd.tui.widget.corona.TextBox; -import lu.tudor.ssi.kiss.dbc.annotation.NonNullByDefault; -import lu.tudor.ssi.kiss.dbc.annotation.Nullable; - /** * Builder serving as abstract super class for all {@link Image} builders. * diff --git a/TULIP/src/lu/list/itis/dkd/tui/widget/corona/builder/BaseInfoBoxBuilder.java b/TULIP/src/lu/list/itis/dkd/tui/widget/corona/builder/BaseInfoBoxBuilder.java index 65c5d24bdbab35f0f13705618d349f34c461b392..abbd466fc8d32bc6a8dbe361e09a6f2661bac5df 100644 --- a/TULIP/src/lu/list/itis/dkd/tui/widget/corona/builder/BaseInfoBoxBuilder.java +++ b/TULIP/src/lu/list/itis/dkd/tui/widget/corona/builder/BaseInfoBoxBuilder.java @@ -16,12 +16,11 @@ */ package lu.list.itis.dkd.tui.widget.corona.builder; +import lu.list.itis.dkd.dbc.annotation.NonNullByDefault; +import lu.list.itis.dkd.dbc.annotation.Nullable; import lu.list.itis.dkd.tui.utility.Point; import lu.list.itis.dkd.tui.widget.corona.InfoBox; -import lu.tudor.ssi.kiss.dbc.annotation.NonNullByDefault; -import lu.tudor.ssi.kiss.dbc.annotation.Nullable; - import java.util.List; /** diff --git a/TULIP/src/lu/list/itis/dkd/tui/widget/corona/builder/BasePointerBuilder.java b/TULIP/src/lu/list/itis/dkd/tui/widget/corona/builder/BasePointerBuilder.java index f80cf244197c1163d73658ccb818495751a4074f..6c300e053b739705336e36286716a99cb287068f 100644 --- a/TULIP/src/lu/list/itis/dkd/tui/widget/corona/builder/BasePointerBuilder.java +++ b/TULIP/src/lu/list/itis/dkd/tui/widget/corona/builder/BasePointerBuilder.java @@ -16,11 +16,10 @@ */ package lu.list.itis.dkd.tui.widget.corona.builder; +import lu.list.itis.dkd.dbc.annotation.NonNullByDefault; import lu.list.itis.dkd.tui.utility.Point; import lu.list.itis.dkd.tui.widget.corona.Pointer; -import lu.tudor.ssi.kiss.dbc.annotation.NonNullByDefault; - /** * {@link CoronaBuilder} extension building {@link Pointer} coronas. * diff --git a/TULIP/src/lu/list/itis/dkd/tui/widget/corona/builder/BaseRadiusBuilder.java b/TULIP/src/lu/list/itis/dkd/tui/widget/corona/builder/BaseRadiusBuilder.java index 0d99054de38a664e723abd28aef1cf54e2c0c680..baab6859b48b908fe85d9bc0e9c2df8f1768c094 100644 --- a/TULIP/src/lu/list/itis/dkd/tui/widget/corona/builder/BaseRadiusBuilder.java +++ b/TULIP/src/lu/list/itis/dkd/tui/widget/corona/builder/BaseRadiusBuilder.java @@ -16,12 +16,11 @@ */ package lu.list.itis.dkd.tui.widget.corona.builder; +import lu.list.itis.dkd.dbc.annotation.NonNullByDefault; +import lu.list.itis.dkd.dbc.annotation.Nullable; import lu.list.itis.dkd.tui.utility.Point; import lu.list.itis.dkd.tui.widget.corona.Radius; -import lu.tudor.ssi.kiss.dbc.annotation.NonNullByDefault; -import lu.tudor.ssi.kiss.dbc.annotation.Nullable; - import com.google.common.base.Preconditions; import java.awt.Color; diff --git a/TULIP/src/lu/list/itis/dkd/tui/widget/corona/builder/BaseShadowBuilder.java b/TULIP/src/lu/list/itis/dkd/tui/widget/corona/builder/BaseShadowBuilder.java index a2b9eca4290bb6654494fc5f3b5679fd121a2cf5..e62c125c30e5dd88bf1f23597b0d4fd5d1fdfbe6 100644 --- a/TULIP/src/lu/list/itis/dkd/tui/widget/corona/builder/BaseShadowBuilder.java +++ b/TULIP/src/lu/list/itis/dkd/tui/widget/corona/builder/BaseShadowBuilder.java @@ -16,11 +16,10 @@ */ package lu.list.itis.dkd.tui.widget.corona.builder; +import lu.list.itis.dkd.dbc.annotation.NonNullByDefault; import lu.list.itis.dkd.tui.utility.Point; import lu.list.itis.dkd.tui.widget.corona.Shadow; -import lu.tudor.ssi.kiss.dbc.annotation.NonNullByDefault; - /** * {@link CoronaBuilder} extension building {@link Shadow} coronas. * diff --git a/TULIP/src/lu/list/itis/dkd/tui/widget/corona/builder/BaseTextBoxBuilder.java b/TULIP/src/lu/list/itis/dkd/tui/widget/corona/builder/BaseTextBoxBuilder.java index 0ed2624a65b9ff9e4ba16d3cd87e4ae4329cf7e9..fd4657388bc7b38a9a68432dba7f1d2fbbdbd34a 100644 --- a/TULIP/src/lu/list/itis/dkd/tui/widget/corona/builder/BaseTextBoxBuilder.java +++ b/TULIP/src/lu/list/itis/dkd/tui/widget/corona/builder/BaseTextBoxBuilder.java @@ -16,13 +16,12 @@ */ package lu.list.itis.dkd.tui.widget.corona.builder; +import lu.list.itis.dkd.dbc.annotation.NonNullByDefault; +import lu.list.itis.dkd.dbc.annotation.Nullable; import lu.list.itis.dkd.tui.content.InformationProvider; import lu.list.itis.dkd.tui.utility.Point; import lu.list.itis.dkd.tui.widget.corona.TextBox; -import lu.tudor.ssi.kiss.dbc.annotation.NonNullByDefault; -import lu.tudor.ssi.kiss.dbc.annotation.Nullable; - import java.awt.Color; import java.awt.Font; diff --git a/TULIP/src/lu/list/itis/dkd/tui/widget/corona/builder/BaseWedgeBuilder.java b/TULIP/src/lu/list/itis/dkd/tui/widget/corona/builder/BaseWedgeBuilder.java index 40fe4bf74e5931704c4df5bb8c72e0ecda560714..d8fb5ca6b6f55a5e802632cc67cf68c5916b8e4f 100644 --- a/TULIP/src/lu/list/itis/dkd/tui/widget/corona/builder/BaseWedgeBuilder.java +++ b/TULIP/src/lu/list/itis/dkd/tui/widget/corona/builder/BaseWedgeBuilder.java @@ -16,12 +16,11 @@ */ package lu.list.itis.dkd.tui.widget.corona.builder; +import lu.list.itis.dkd.dbc.annotation.NonNullByDefault; +import lu.list.itis.dkd.dbc.annotation.Nullable; import lu.list.itis.dkd.tui.utility.Point; import lu.list.itis.dkd.tui.widget.corona.Wedge; -import lu.tudor.ssi.kiss.dbc.annotation.NonNullByDefault; -import lu.tudor.ssi.kiss.dbc.annotation.Nullable; - import java.awt.Color; /** diff --git a/TULIP/src/lu/list/itis/dkd/tui/widget/corona/builder/CoronaBuilder.java b/TULIP/src/lu/list/itis/dkd/tui/widget/corona/builder/CoronaBuilder.java index 23e208edc3492ad1ec24e90ca963d6e2693e4447..018fadc4a5432a9faf0a253621bf982733dab361 100644 --- a/TULIP/src/lu/list/itis/dkd/tui/widget/corona/builder/CoronaBuilder.java +++ b/TULIP/src/lu/list/itis/dkd/tui/widget/corona/builder/CoronaBuilder.java @@ -16,13 +16,12 @@ */ package lu.list.itis.dkd.tui.widget.corona.builder; +import lu.list.itis.dkd.dbc.annotation.NonNullByDefault; +import lu.list.itis.dkd.dbc.annotation.Nullable; import lu.list.itis.dkd.tui.exception.BuildException; import lu.list.itis.dkd.tui.utility.Point; import lu.list.itis.dkd.tui.widget.corona.Corona; -import lu.tudor.ssi.kiss.dbc.annotation.NonNullByDefault; -import lu.tudor.ssi.kiss.dbc.annotation.Nullable; - import java.awt.Shape; /** diff --git a/TULIP/src/lu/list/itis/dkd/tui/widget/corona/builder/ImageBuilder.java b/TULIP/src/lu/list/itis/dkd/tui/widget/corona/builder/ImageBuilder.java index 56cf5adfa6767c90f59a06b15ef7dd34b5a7047e..a4d06d54216aa97399ec3ba9a94a85aad3f450f4 100644 --- a/TULIP/src/lu/list/itis/dkd/tui/widget/corona/builder/ImageBuilder.java +++ b/TULIP/src/lu/list/itis/dkd/tui/widget/corona/builder/ImageBuilder.java @@ -16,12 +16,11 @@ */ package lu.list.itis.dkd.tui.widget.corona.builder; +import lu.list.itis.dkd.dbc.annotation.NonNullByDefault; import lu.list.itis.dkd.tui.exception.BuildException; import lu.list.itis.dkd.tui.utility.Point; import lu.list.itis.dkd.tui.widget.corona.Image; -import lu.tudor.ssi.kiss.dbc.annotation.NonNullByDefault; - /** * {@link ImageBuilder} class used to construct an {@link Image} corona by providing methods to set * all parameters and permutations thereof. diff --git a/TULIP/src/lu/list/itis/dkd/tui/widget/corona/builder/InfoBoxBuilder.java b/TULIP/src/lu/list/itis/dkd/tui/widget/corona/builder/InfoBoxBuilder.java index 12f8ee4e9facd3daf6fc67d6caffb96cd1608e8d..5c7a08147916c795457016e12398c58370659249 100644 --- a/TULIP/src/lu/list/itis/dkd/tui/widget/corona/builder/InfoBoxBuilder.java +++ b/TULIP/src/lu/list/itis/dkd/tui/widget/corona/builder/InfoBoxBuilder.java @@ -16,11 +16,10 @@ */ package lu.list.itis.dkd.tui.widget.corona.builder; +import lu.list.itis.dkd.dbc.annotation.NonNullByDefault; import lu.list.itis.dkd.tui.utility.Point; import lu.list.itis.dkd.tui.widget.corona.InfoBox; -import lu.tudor.ssi.kiss.dbc.annotation.NonNullByDefault; - /** * {@link InfoBoxBuilder} class used to construct an {@link InfoBox} corona by providing methods to * set all parameters and permutations thereof. diff --git a/TULIP/src/lu/list/itis/dkd/tui/widget/corona/builder/PointerBuilder.java b/TULIP/src/lu/list/itis/dkd/tui/widget/corona/builder/PointerBuilder.java index ff9824ce7a9ab7aaafe261bd47426202296373f1..e62179419362294717f6d1bb763da55eb023dce2 100644 --- a/TULIP/src/lu/list/itis/dkd/tui/widget/corona/builder/PointerBuilder.java +++ b/TULIP/src/lu/list/itis/dkd/tui/widget/corona/builder/PointerBuilder.java @@ -16,11 +16,10 @@ */ package lu.list.itis.dkd.tui.widget.corona.builder; +import lu.list.itis.dkd.dbc.annotation.NonNullByDefault; import lu.list.itis.dkd.tui.utility.Point; import lu.list.itis.dkd.tui.widget.corona.Pointer; -import lu.tudor.ssi.kiss.dbc.annotation.NonNullByDefault; - /** * {@link PointerBuilder} class used to construct a {@link Pointer} corona by providing methods to * set all parameters and permutations thereof. diff --git a/TULIP/src/lu/list/itis/dkd/tui/widget/corona/builder/RadiusBuilder.java b/TULIP/src/lu/list/itis/dkd/tui/widget/corona/builder/RadiusBuilder.java index 4ef6827792c7556892c2a78d0b813fc5b9fd56d2..206079e23c8d4b077f9f219ce2f7a0dd09c9bbfe 100644 --- a/TULIP/src/lu/list/itis/dkd/tui/widget/corona/builder/RadiusBuilder.java +++ b/TULIP/src/lu/list/itis/dkd/tui/widget/corona/builder/RadiusBuilder.java @@ -16,11 +16,10 @@ */ package lu.list.itis.dkd.tui.widget.corona.builder; +import lu.list.itis.dkd.dbc.annotation.NonNullByDefault; import lu.list.itis.dkd.tui.utility.Point; import lu.list.itis.dkd.tui.widget.corona.Radius; -import lu.tudor.ssi.kiss.dbc.annotation.NonNullByDefault; - /** * {@link RadiusBuilder} class used to construct an {@link Radius} corona by providing methods to * set all parameters and permutations thereof. diff --git a/TULIP/src/lu/list/itis/dkd/tui/widget/corona/builder/ShadowBuilder.java b/TULIP/src/lu/list/itis/dkd/tui/widget/corona/builder/ShadowBuilder.java index ee6891c1fd1f9fcfda602e05b4810659f28432f4..61471b9a3037d6de96d6252ae232b8d7d0ed051a 100644 --- a/TULIP/src/lu/list/itis/dkd/tui/widget/corona/builder/ShadowBuilder.java +++ b/TULIP/src/lu/list/itis/dkd/tui/widget/corona/builder/ShadowBuilder.java @@ -16,11 +16,10 @@ */ package lu.list.itis.dkd.tui.widget.corona.builder; +import lu.list.itis.dkd.dbc.annotation.NonNullByDefault; import lu.list.itis.dkd.tui.utility.Point; import lu.list.itis.dkd.tui.widget.corona.Shadow; -import lu.tudor.ssi.kiss.dbc.annotation.NonNullByDefault; - /** * {@link ShadowBuilder} class used to construct a {@link Shadow} corona by providing methods to set * all parameters and permutations thereof. diff --git a/TULIP/src/lu/list/itis/dkd/tui/widget/corona/builder/TextBoxBuilder.java b/TULIP/src/lu/list/itis/dkd/tui/widget/corona/builder/TextBoxBuilder.java index d833c2917e954634d8290d3264d3de1312167803..d374ca0bfcbec98254d7ba281f23135d482c0827 100644 --- a/TULIP/src/lu/list/itis/dkd/tui/widget/corona/builder/TextBoxBuilder.java +++ b/TULIP/src/lu/list/itis/dkd/tui/widget/corona/builder/TextBoxBuilder.java @@ -16,11 +16,10 @@ */ package lu.list.itis.dkd.tui.widget.corona.builder; +import lu.list.itis.dkd.dbc.annotation.NonNullByDefault; import lu.list.itis.dkd.tui.utility.Point; import lu.list.itis.dkd.tui.widget.corona.TextBox; -import lu.tudor.ssi.kiss.dbc.annotation.NonNullByDefault; - /** * {@link TextBoxBuilder} class used to construct a {@link TextBox} corona by providing methods to * set all parameters and permutations thereof. diff --git a/TULIP/src/lu/list/itis/dkd/tui/widget/corona/builder/WedgeBuilder.java b/TULIP/src/lu/list/itis/dkd/tui/widget/corona/builder/WedgeBuilder.java index ae4400bc8d058fe8cde6d2db5ddd7c63c3eb97d2..ee703fec1bf55e5e3d02f3559724245b51c6894a 100644 --- a/TULIP/src/lu/list/itis/dkd/tui/widget/corona/builder/WedgeBuilder.java +++ b/TULIP/src/lu/list/itis/dkd/tui/widget/corona/builder/WedgeBuilder.java @@ -16,11 +16,10 @@ */ package lu.list.itis.dkd.tui.widget.corona.builder; +import lu.list.itis.dkd.dbc.annotation.NonNullByDefault; import lu.list.itis.dkd.tui.utility.Point; import lu.list.itis.dkd.tui.widget.corona.Wedge; -import lu.tudor.ssi.kiss.dbc.annotation.NonNullByDefault; - /** * {@link WedgeBuilder} class used to construct a {@link Wedge} corona by providing methods to set * all parameters and permutations thereof. diff --git a/TULIP/src/lu/list/itis/dkd/tui/widget/state/Attenuator.java b/TULIP/src/lu/list/itis/dkd/tui/widget/state/Attenuator.java index 4f9aa74f475c79af6d5306d3a30b800ab9a8df33..c0a28de52601d56bb30821a960ff331681c30261 100644 --- a/TULIP/src/lu/list/itis/dkd/tui/widget/state/Attenuator.java +++ b/TULIP/src/lu/list/itis/dkd/tui/widget/state/Attenuator.java @@ -16,11 +16,10 @@ */ package lu.list.itis.dkd.tui.widget.state; +import lu.list.itis.dkd.dbc.annotation.NonNullByDefault; +import lu.list.itis.dkd.dbc.annotation.Nullable; import lu.list.itis.dkd.tui.utility.Point; -import lu.tudor.ssi.kiss.dbc.annotation.NonNullByDefault; -import lu.tudor.ssi.kiss.dbc.annotation.Nullable; - /** * Class used to compensate jitter before transitioning to another widget state. The class also * features a timer to be used to set attenuation timers for blocking state transitions before a diff --git a/TULIP/src/lu/list/itis/dkd/tui/widget/state/FunctionState.java b/TULIP/src/lu/list/itis/dkd/tui/widget/state/FunctionState.java index e57fc649d6d87f60396ce6053f3b5e44d05742a0..dac7550f49b5585131ef2b96271343811cc8ab2a 100644 --- a/TULIP/src/lu/list/itis/dkd/tui/widget/state/FunctionState.java +++ b/TULIP/src/lu/list/itis/dkd/tui/widget/state/FunctionState.java @@ -16,10 +16,9 @@ */ package lu.list.itis.dkd.tui.widget.state; +import lu.list.itis.dkd.dbc.annotation.NonNull; import lu.list.itis.dkd.tui.utility.Point; -import lu.tudor.ssi.kiss.dbc.annotation.NonNull; - import java.util.UUID; /** @@ -29,7 +28,7 @@ import java.util.UUID; * @since 1.0 * @version 1.0.2 */ -public class FunctionState extends NUIState { +public class FunctionState extends NuiState { /** * Constructor initialising the base where the NUI element is or was last at. * diff --git a/TULIP/src/lu/list/itis/dkd/tui/widget/state/LimboState.java b/TULIP/src/lu/list/itis/dkd/tui/widget/state/LimboState.java index 7e0116bef471e2949a61820bae195025ed94454b..e848bcd5e006bde40ad81d21af9b94520d1ac4d2 100644 --- a/TULIP/src/lu/list/itis/dkd/tui/widget/state/LimboState.java +++ b/TULIP/src/lu/list/itis/dkd/tui/widget/state/LimboState.java @@ -16,19 +16,18 @@ */ package lu.list.itis.dkd.tui.widget.state; +import lu.list.itis.dkd.dbc.annotation.NonNull; import lu.list.itis.dkd.tui.utility.Point; -import lu.tudor.ssi.kiss.dbc.annotation.NonNull; - /** - * StateManager implementation of a {@link NUIState} where the concrete state is unknown or cannot + * StateManager implementation of a {@link NuiState} where the concrete state is unknown or cannot * be ascertained. * * @author Eric TOBIAS [eric.tobias@list.lu] * @since 1.0 * @version 1.0.2 */ -public class LimboState extends NUIState { +public class LimboState extends NuiState { /** * Constructor initialising the base where the NUI element is or was last at. * diff --git a/TULIP/src/lu/list/itis/dkd/tui/widget/state/MovementState.java b/TULIP/src/lu/list/itis/dkd/tui/widget/state/MovementState.java index d0d1ae556459b5131f1fc200a1d2af383f86877b..11da12ae7e056986654b6041a2a6ae3c089d1a53 100644 --- a/TULIP/src/lu/list/itis/dkd/tui/widget/state/MovementState.java +++ b/TULIP/src/lu/list/itis/dkd/tui/widget/state/MovementState.java @@ -16,10 +16,9 @@ */ package lu.list.itis.dkd.tui.widget.state; +import lu.list.itis.dkd.dbc.annotation.NonNull; import lu.list.itis.dkd.tui.utility.Point; -import lu.tudor.ssi.kiss.dbc.annotation.NonNull; - /** * StateManager implementation of a NUI element where the concrete state is moving. The state * retains the last known position of the NUI element without applying any compensation. @@ -28,7 +27,7 @@ import lu.tudor.ssi.kiss.dbc.annotation.NonNull; * @since 1.0 * @version 1.0.2 */ -public class MovementState extends NUIState { +public class MovementState extends NuiState { /** * Constructor initialising the base where the NUI element is or was last at. * diff --git a/TULIP/src/lu/list/itis/dkd/tui/widget/state/NUIState.java b/TULIP/src/lu/list/itis/dkd/tui/widget/state/NuiState.java similarity index 92% rename from TULIP/src/lu/list/itis/dkd/tui/widget/state/NUIState.java rename to TULIP/src/lu/list/itis/dkd/tui/widget/state/NuiState.java index c2e712694d6d5e1226783a041ed39e03b7edcf42..02dfa3bbfc92e803ebe2eca00d015b28f1e6d024 100644 --- a/TULIP/src/lu/list/itis/dkd/tui/widget/state/NUIState.java +++ b/TULIP/src/lu/list/itis/dkd/tui/widget/state/NuiState.java @@ -16,11 +16,10 @@ */ package lu.list.itis.dkd.tui.widget.state; +import lu.list.itis.dkd.dbc.annotation.NonNullByDefault; +import lu.list.itis.dkd.dbc.annotation.Nullable; import lu.list.itis.dkd.tui.utility.Point; -import lu.tudor.ssi.kiss.dbc.annotation.NonNullByDefault; -import lu.tudor.ssi.kiss.dbc.annotation.Nullable; - import com.google.common.base.Preconditions; /** @@ -32,7 +31,7 @@ import com.google.common.base.Preconditions; * @version 1.0.2 */ @NonNullByDefault -public abstract class NUIState { +public abstract class NuiState { protected Point base; protected String id; @@ -45,7 +44,7 @@ public abstract class NUIState { * The string identifying this state. * @pre identifier != null */ - public NUIState(Point position, @Nullable String identifier) { + public NuiState(Point position, @Nullable String identifier) { Preconditions.checkState(identifier != null, "The provided identifier may not be null!"); //$NON-NLS-1$ base = position; id = identifier; @@ -134,8 +133,8 @@ public abstract class NUIState { if (this == state) return true; - if (state instanceof NUIState) { - return hashCode() == ((NUIState) state).hashCode(); + if (state instanceof NuiState) { + return hashCode() == ((NuiState) state).hashCode(); } return false; } diff --git a/TULIP/src/lu/list/itis/dkd/tui/widget/state/RotationState.java b/TULIP/src/lu/list/itis/dkd/tui/widget/state/RotationState.java index 891340d185b5092b940b047e97b6f205c507a281..b4fe28040d4fa5a5189514454d55f43555735667 100644 --- a/TULIP/src/lu/list/itis/dkd/tui/widget/state/RotationState.java +++ b/TULIP/src/lu/list/itis/dkd/tui/widget/state/RotationState.java @@ -16,10 +16,9 @@ */ package lu.list.itis.dkd.tui.widget.state; +import lu.list.itis.dkd.dbc.annotation.NonNull; import lu.list.itis.dkd.tui.utility.Point; -import lu.tudor.ssi.kiss.dbc.annotation.NonNull; - /** * StateManager implementation of a NUI element where the concrete state is rotating. The state * retains the last known position of the NUI element without applying any compensation. @@ -28,7 +27,7 @@ import lu.tudor.ssi.kiss.dbc.annotation.NonNull; * @since 1.0 * @version 1.0.2 */ -public class RotationState extends NUIState { +public class RotationState extends NuiState { /** * Constructor initialising the base where the NUI element is or was last at. * diff --git a/TULIP/src/lu/list/itis/dkd/tui/widget/state/StateManager.java b/TULIP/src/lu/list/itis/dkd/tui/widget/state/StateManager.java index 608f91c6e8205574f2da2150a5517ad1796709b7..f99b12439282e741cac05b1bf906b6fb0b5b9b01 100644 --- a/TULIP/src/lu/list/itis/dkd/tui/widget/state/StateManager.java +++ b/TULIP/src/lu/list/itis/dkd/tui/widget/state/StateManager.java @@ -16,13 +16,12 @@ */ package lu.list.itis.dkd.tui.widget.state; +import lu.list.itis.dkd.dbc.annotation.NonNullByDefault; +import lu.list.itis.dkd.dbc.annotation.Nullable; import lu.list.itis.dkd.tui.event.TimerEvent; import lu.list.itis.dkd.tui.event.TimerEventListener; import lu.list.itis.dkd.tui.utility.Point; -import lu.tudor.ssi.kiss.dbc.annotation.NonNullByDefault; -import lu.tudor.ssi.kiss.dbc.annotation.Nullable; - import com.google.common.collect.HashMultimap; import com.google.common.collect.Multimap; @@ -34,7 +33,7 @@ import java.util.Iterator; import javax.swing.Timer; /** - * Class holding a map of {@link NUIState} instances which coalesce into the overall state. The + * Class holding a map of {@link NuiState} instances which coalesce into the overall state. The * class features methods to receive actions which may affect the state. The class is thread safe as * all operations make use of reentrant locks. * @@ -45,11 +44,11 @@ import javax.swing.Timer; @NonNullByDefault public class StateManager { /** - * A map storing all {@link NUIState} instances coalescing into the overall state. Due to the - * equality of all {@link NUIState} instances in regard to themselves, with the exception of + * A map storing all {@link NuiState} instances coalescing into the overall state. Due to the + * equality of all {@link NuiState} instances in regard to themselves, with the exception of * FunctionState, all keys will only map to one instance. */ - protected volatile Multimap states; + protected volatile Multimap states; /** A list of listeners that will be notified when timers expire. */ protected volatile ArrayList listeners; @@ -108,7 +107,7 @@ public class StateManager { lastMovementStart = position.clone(); ArrayList transitions = new ArrayList<>(); - for (NUIState state : states.values()) { + for (NuiState state : states.values()) { Transition transition = state.drop(position); if (transition != null) transitions.add(transition); @@ -229,21 +228,21 @@ public class StateManager { // /** - // * Method used to retrieve the sole {@link NUIState} with the given name + // * Method used to retrieve the sole {@link NuiState} with the given name // * as key. Note that all states except for the {@link FunctionState} have // * IDs depending on their classes names and can be retrieved that way. // * @param name // * The name serving as key to retrieve the state. // * @return - // * The {@link NUIState} matching the key. + // * The {@link NuiState} matching the key. // * @pre states.containsKey(name) // */ // @SuppressWarnings("null") - // private synchronized NUIState retrieveState(String name) + // private synchronized NuiState retrieveState(String name) // { // Preconditions.checkArgument(states.containsKey(name)); // Preconditions.checkState(states.get(name).toArray().length == 1); - // return (NUIState) states.get(name).toArray()[0]; // ArrayIndexOutOfBoundsException + // return (NuiState) states.get(name).toArray()[0]; // ArrayIndexOutOfBoundsException // } @@ -258,7 +257,7 @@ public class StateManager { lastPosition = position; ArrayList transitions = new ArrayList<>(); - for (NUIState state : states.values()) { + for (NuiState state : states.values()) { Transition transition = state.lift(position); if (transition != null) transitions.add(transition); @@ -287,7 +286,7 @@ public class StateManager { lastPosition = position; ArrayList transitions = new ArrayList<>(); - for (NUIState state : states.values()) { + for (NuiState state : states.values()) { Transition transition = state.move(position); // TODO ConcurrentModificationException if (transition != null) transitions.add(transition); @@ -314,7 +313,7 @@ public class StateManager { lastPosition = position; ArrayList transitions = new ArrayList<>(); - for (NUIState state : states.values()) { + for (NuiState state : states.values()) { Transition transition = state.rotate(position); if (transition != null) transitions.add(transition); @@ -339,7 +338,7 @@ public class StateManager { */ public synchronized StateManager function(Point position) { ArrayList transitions = new ArrayList<>(); - for (NUIState state : states.values()) { + for (NuiState state : states.values()) { Transition transition = state.function(position); if (transition != null) transitions.add(transition); @@ -408,7 +407,7 @@ public class StateManager { */ @Deprecated public synchronized @Nullable Point getBase(String state) { - Iterator iterator = states.get(state).iterator(); + Iterator iterator = states.get(state).iterator(); if (iterator.hasNext()) { return iterator.next().base; } diff --git a/TULIP/src/lu/list/itis/dkd/tui/widget/state/StillState.java b/TULIP/src/lu/list/itis/dkd/tui/widget/state/StillState.java index 16fa94e91960023fab21593afa0343fc541d367b..1e3c284e0fa3ebb48a74eec2e4a1458cb26dcdd7 100644 --- a/TULIP/src/lu/list/itis/dkd/tui/widget/state/StillState.java +++ b/TULIP/src/lu/list/itis/dkd/tui/widget/state/StillState.java @@ -16,19 +16,18 @@ */ package lu.list.itis.dkd.tui.widget.state; +import lu.list.itis.dkd.dbc.annotation.NonNull; import lu.list.itis.dkd.tui.utility.Point; -import lu.tudor.ssi.kiss.dbc.annotation.NonNull; - /** - * StateManager implementation of a {@link NUIState} where the concrete state is neither moving nor + * StateManager implementation of a {@link NuiState} where the concrete state is neither moving nor * rotating nor functioning but still present on the table. * * @author Eric TOBIAS [eric.tobias@list.lu] * @since 1.0 * @version 1.0.2 */ -public class StillState extends NUIState { +public class StillState extends NuiState { /** * Constructor initialising the base where the NUI element is or was last at. * diff --git a/TULIP/src/lu/list/itis/dkd/tui/widget/state/Transition.java b/TULIP/src/lu/list/itis/dkd/tui/widget/state/Transition.java index c7a9c2860d4c070f07e7ecc2f8bd79a8d8ce6ff5..c912379c0064b3f9e3afef6a84d0cda772d064f0 100644 --- a/TULIP/src/lu/list/itis/dkd/tui/widget/state/Transition.java +++ b/TULIP/src/lu/list/itis/dkd/tui/widget/state/Transition.java @@ -16,19 +16,19 @@ */ package lu.list.itis.dkd.tui.widget.state; -import lu.tudor.ssi.kiss.dbc.annotation.NonNull; -import lu.tudor.ssi.kiss.dbc.annotation.NonNullByDefault; +import lu.list.itis.dkd.dbc.annotation.NonNull; +import lu.list.itis.dkd.dbc.annotation.NonNullByDefault; /** - * Wrapper class serving as a wrapper to two {@link NUIState} instances being part of a state + * Wrapper class serving as a wrapper to two {@link NuiState} instances being part of a state * transition. * * @author Eric TOBIAS [eric.tobias@list.lu] * @since 1.0 * @version 1.0.2 */ -public class Transition extends java.util.AbstractMap.SimpleEntry { +public class Transition extends java.util.AbstractMap.SimpleEntry { /** Generated default serial UID for serialisation purposes */ private static final long serialVersionUID = 8192623541100584952L; @@ -40,27 +40,27 @@ public class Transition extends java.util.AbstractMap.SimpleEntry stateMap = getStateMap(thisManager.getClass()); + Multimap stateMap = getStateMap(thisManager.getClass()); assertNotNull(stateMap); assertEquals(1, stateMap.size()); assertTrue(stateMap.containsKey(LimboState.class.getSimpleName())); @@ -89,26 +89,26 @@ public class StateManagerTest { */ @Test public void testDrop() { - Multimap stateMap = getStateMap(manager.getClass()); + Multimap stateMap = getStateMap(manager.getClass()); manager.drop(point); assertTrue(manager.isStill()); assertEquals(1, stateMap.size()); assertTrue(stateMap.containsKey(StillState.class.getSimpleName())); assertEquals(1, stateMap.get(StillState.class.getSimpleName()).size()); - assertEquals(point, ((NUIState) (stateMap.get(StillState.class.getSimpleName()).toArray()[0])).getBase()); + assertEquals(point, ((NuiState) (stateMap.get(StillState.class.getSimpleName()).toArray()[0])).getBase()); manager.lift(point); manager.drop(pointEnough); assertTrue(manager.isStill()); assertEquals(1, stateMap.size()); assertTrue(stateMap.containsKey(StillState.class.getSimpleName())); - assertEquals(pointEnough, ((NUIState) (stateMap.get(StillState.class.getSimpleName()).toArray()[0])).getBase()); + assertEquals(pointEnough, ((NuiState) (stateMap.get(StillState.class.getSimpleName()).toArray()[0])).getBase()); manager.lift(pointEnough); manager.drop(pointToLittle); assertTrue(manager.isStill()); assertEquals(1, stateMap.size()); assertTrue(stateMap.containsKey(StillState.class.getSimpleName())); - assertEquals(pointToLittle, ((NUIState) (stateMap.get(StillState.class.getSimpleName()).toArray()[0])).getBase()); + assertEquals(pointToLittle, ((NuiState) (stateMap.get(StillState.class.getSimpleName()).toArray()[0])).getBase()); manager.lift(pointToLittle); manager.drop(point); @@ -180,7 +180,7 @@ public class StateManagerTest { */ @Test public void testLift() { - Multimap stateMap = getStateMap(manager.getClass()); + Multimap stateMap = getStateMap(manager.getClass()); manager.lift(pointEnough); manager.lift(point); manager.lift(pointToLittle); @@ -192,21 +192,21 @@ public class StateManagerTest { manager.lift(point); assertEquals(1, stateMap.size()); assertTrue(stateMap.containsKey(LimboState.class.getSimpleName())); - assertEquals(point, ((NUIState) (stateMap.get(LimboState.class.getSimpleName()).toArray()[0])).getBase()); + assertEquals(point, ((NuiState) (stateMap.get(LimboState.class.getSimpleName()).toArray()[0])).getBase()); manager.drop(point); assertEquals(1, stateMap.size()); assertTrue(stateMap.containsKey(StillState.class.getSimpleName())); manager.lift(pointEnough); assertEquals(1, stateMap.size()); assertTrue(stateMap.containsKey(LimboState.class.getSimpleName())); - assertEquals(pointEnough, ((NUIState) (stateMap.get(LimboState.class.getSimpleName()).toArray()[0])).getBase()); + assertEquals(pointEnough, ((NuiState) (stateMap.get(LimboState.class.getSimpleName()).toArray()[0])).getBase()); manager.drop(point); assertEquals(1, stateMap.size()); assertTrue(stateMap.containsKey(StillState.class.getSimpleName())); manager.lift(pointToLittle); assertEquals(1, stateMap.size()); assertTrue(stateMap.containsKey(LimboState.class.getSimpleName())); - assertEquals(pointToLittle, ((NUIState) (stateMap.get(LimboState.class.getSimpleName()).toArray()[0])).getBase()); + assertEquals(pointToLittle, ((NuiState) (stateMap.get(LimboState.class.getSimpleName()).toArray()[0])).getBase()); manager.drop(point); manager.move(pointEnough); @@ -304,7 +304,7 @@ public class StateManagerTest { */ @Test public void testMoveAndIsMoving() throws InterruptedException { - Multimap stateMap = getStateMap(manager.getClass()); + Multimap stateMap = getStateMap(manager.getClass()); manager.move(point); manager.move(pointEnough); @@ -318,17 +318,17 @@ public class StateManagerTest { assertTrue(manager.isStill()); assertEquals(1, stateMap.size()); assertFalse(stateMap.containsKey(MovementState.class.getSimpleName())); - assertEquals(point, ((NUIState) (stateMap.get(StillState.class.getSimpleName()).toArray()[0])).getBase()); + assertEquals(point, ((NuiState) (stateMap.get(StillState.class.getSimpleName()).toArray()[0])).getBase()); manager.move(pointEnough); assertTrue(manager.isMoving()); assertEquals(1, stateMap.size()); assertTrue(stateMap.containsKey(MovementState.class.getSimpleName())); - assertEquals(pointEnough, ((NUIState) (stateMap.get(MovementState.class.getSimpleName()).toArray()[0])).getBase()); + assertEquals(pointEnough, ((NuiState) (stateMap.get(MovementState.class.getSimpleName()).toArray()[0])).getBase()); manager.move(pointEvenMore); assertTrue(manager.isMoving()); assertEquals(1, stateMap.size()); assertTrue(stateMap.containsKey(MovementState.class.getSimpleName())); - assertEquals(pointEvenMore, ((NUIState) (stateMap.get(MovementState.class.getSimpleName()).toArray()[0])).getBase()); + assertEquals(pointEvenMore, ((NuiState) (stateMap.get(MovementState.class.getSimpleName()).toArray()[0])).getBase()); Thread.sleep(Attenuator.getMovementCooldown() + 100); assertFalse(manager.isMoving()); manager.lift(point); @@ -376,16 +376,16 @@ public class StateManagerTest { manager.move(pointToLittle); assertEquals(1, stateMap.size()); assertTrue(stateMap.containsKey(StillState.class.getSimpleName())); - assertEquals(point, ((NUIState) (stateMap.get(StillState.class.getSimpleName()).toArray()[0])).getBase()); + assertEquals(point, ((NuiState) (stateMap.get(StillState.class.getSimpleName()).toArray()[0])).getBase()); manager.move(pointEnough); assertEquals(1, stateMap.size()); assertTrue(stateMap.containsKey(MovementState.class.getSimpleName())); - assertEquals(pointEnough, ((NUIState) (stateMap.get(MovementState.class.getSimpleName()).toArray()[0])).getBase()); + assertEquals(pointEnough, ((NuiState) (stateMap.get(MovementState.class.getSimpleName()).toArray()[0])).getBase()); manager.move(new Point(12f + 0.007f, 12f + 0.007f, 3f)); assertEquals(1, stateMap.size()); assertTrue(stateMap.containsKey(MovementState.class.getSimpleName())); - assertEquals(pointEnough, ((NUIState) (stateMap.get(MovementState.class.getSimpleName()).toArray()[0])).getBase()); + assertEquals(pointEnough, ((NuiState) (stateMap.get(MovementState.class.getSimpleName()).toArray()[0])).getBase()); } /** @@ -397,7 +397,7 @@ public class StateManagerTest { */ @Test public void testRotateAndIsRotating() throws InterruptedException { - Multimap stateMap = getStateMap(manager.getClass()); + Multimap stateMap = getStateMap(manager.getClass()); manager.rotate(point); manager.rotate(pointEnough); @@ -409,15 +409,15 @@ public class StateManagerTest { manager.rotate(pointToLittle); assertEquals(1, stateMap.size()); assertFalse(stateMap.containsKey(RotationState.class.getSimpleName())); - assertEquals(point, ((NUIState) (stateMap.get(StillState.class.getSimpleName()).toArray()[0])).getBase()); + assertEquals(point, ((NuiState) (stateMap.get(StillState.class.getSimpleName()).toArray()[0])).getBase()); manager.rotate(pointEnough); assertEquals(1, stateMap.size()); assertTrue(stateMap.containsKey(RotationState.class.getSimpleName())); - assertEquals(pointEnough, ((NUIState) (stateMap.get(RotationState.class.getSimpleName()).toArray()[0])).getBase()); + assertEquals(pointEnough, ((NuiState) (stateMap.get(RotationState.class.getSimpleName()).toArray()[0])).getBase()); manager.rotate(pointEvenMore); assertEquals(1, stateMap.size()); assertTrue(stateMap.containsKey(RotationState.class.getSimpleName())); - assertEquals(pointEvenMore, ((NUIState) (stateMap.get(RotationState.class.getSimpleName()).toArray()[0])).getBase()); + assertEquals(pointEvenMore, ((NuiState) (stateMap.get(RotationState.class.getSimpleName()).toArray()[0])).getBase()); manager.lift(point); @@ -467,16 +467,16 @@ public class StateManagerTest { manager.rotate(pointToLittle); assertEquals(1, stateMap.size()); assertTrue(stateMap.containsKey(StillState.class.getSimpleName())); - assertEquals(point, ((NUIState) (stateMap.get(StillState.class.getSimpleName()).toArray()[0])).getBase()); + assertEquals(point, ((NuiState) (stateMap.get(StillState.class.getSimpleName()).toArray()[0])).getBase()); manager.rotate(pointEnough); assertEquals(1, stateMap.size()); assertTrue(stateMap.containsKey(RotationState.class.getSimpleName())); - assertEquals(pointEnough, ((NUIState) (stateMap.get(RotationState.class.getSimpleName()).toArray()[0])).getBase()); + assertEquals(pointEnough, ((NuiState) (stateMap.get(RotationState.class.getSimpleName()).toArray()[0])).getBase()); manager.rotate(new Point(12f + 0.007f, 12f + 0.007f, 3f)); assertEquals(1, stateMap.size()); assertTrue(stateMap.containsKey(RotationState.class.getSimpleName())); - assertEquals(pointEnough, ((NUIState) (stateMap.get(RotationState.class.getSimpleName()).toArray()[0])).getBase()); + assertEquals(pointEnough, ((NuiState) (stateMap.get(RotationState.class.getSimpleName()).toArray()[0])).getBase()); } /** @@ -486,7 +486,7 @@ public class StateManagerTest { */ @Test public void testFunction() { - Multimap stateMap = getStateMap(manager.getClass()); + Multimap stateMap = getStateMap(manager.getClass()); ArrayList points = new ArrayList<>(2); points.add(new Point(33f, 31f, 353f)); points.add(new Point(1f, 5f, 345f)); @@ -501,8 +501,8 @@ public class StateManagerTest { assertEquals(3, stateMap.size()); stateMap.removeAll(LimboState.class.getSimpleName()); assertEquals(2, stateMap.size()); - Collection functions = stateMap.values(); - for (NUIState state : functions) { + Collection functions = stateMap.values(); + for (NuiState state : functions) { assertTrue(state instanceof FunctionState); functionsStates.add((FunctionState) state); } @@ -555,11 +555,11 @@ public class StateManagerTest { // } @SuppressWarnings("unchecked") - private Multimap getStateMap(Class managerClass) { + private Multimap getStateMap(Class managerClass) { try { Field states = managerClass.getDeclaredField("states"); //$NON-NLS-1$ states.setAccessible(true); - return (Multimap) states.get(manager); + return (Multimap) states.get(manager); } catch (NoSuchFieldException e) { System.err.println("Error accessing field! No such field!"); //$NON-NLS-1$ diff --git a/TULIP/test/lu/list/itis/dkd/tui/widget/state/StillStateTest.java b/TULIP/test/lu/list/itis/dkd/tui/widget/state/StillStateTest.java index 22337d4fc2f910da74f9f963a54307acf169144b..8582830ddbc76825610d67ea52a8ce78a0aa134f 100644 --- a/TULIP/test/lu/list/itis/dkd/tui/widget/state/StillStateTest.java +++ b/TULIP/test/lu/list/itis/dkd/tui/widget/state/StillStateTest.java @@ -194,7 +194,7 @@ public class StillStateTest { } /** - * Test method for {@link lu.list.itis.dkd.tui.widget.state.NUIState#hashCode()}. + * Test method for {@link lu.list.itis.dkd.tui.widget.state.NuiState#hashCode()}. */ @Test public void testHashCode() { @@ -206,7 +206,7 @@ public class StillStateTest { } /** - * Test method for {@link lu.list.itis.dkd.tui.widget.state.NUIState#getID()}. + * Test method for {@link lu.list.itis.dkd.tui.widget.state.NuiState#getID()}. */ @Test public void testGetID() { @@ -218,7 +218,7 @@ public class StillStateTest { } /** - * Test method for {@link lu.list.itis.dkd.tui.widget.state.NUIState#equals(java.lang.Object)}. + * Test method for {@link lu.list.itis.dkd.tui.widget.state.NuiState#equals(java.lang.Object)}. */ @Test public void testEqualsObject() { diff --git a/TULIP/test/lu/list/itis/dkd/tui/widget/state/TransitionTest.java b/TULIP/test/lu/list/itis/dkd/tui/widget/state/TransitionTest.java index dffd6bdba7ae55427a3183774040b13ad8f33618..3db3fc97baa5b3a29b0361c2899a54279d111903 100644 --- a/TULIP/test/lu/list/itis/dkd/tui/widget/state/TransitionTest.java +++ b/TULIP/test/lu/list/itis/dkd/tui/widget/state/TransitionTest.java @@ -53,7 +53,7 @@ public class TransitionTest { /** * Test method for - * {@link lu.list.itis.dkd.tui.widget.state.Transition#Transition(lu.list.itis.dkd.tui.widget.state.NUIState, lu.list.itis.dkd.tui.widget.state.NUIState)} + * {@link lu.list.itis.dkd.tui.widget.state.Transition#Transition(lu.list.itis.dkd.tui.widget.state.NuiState, lu.list.itis.dkd.tui.widget.state.NuiState)} * . */ @Test