Commit 4e8f70c0 authored by Nicolas Gilmard's avatar Nicolas Gilmard
Browse files

Fix issue #20

Correct version numbering
parent 51e2e145
......@@ -108,8 +108,7 @@ public abstract class TangibleApplication {
adapter = (TuiAdapter) Class.forName(properties.getProperty("tableAdapter")).getConstructor(TangibleInterfaceManager.class).newInstance(interfaceManager); //$NON-NLS-1$
} catch (InstantiationException e) {
logger.log(Level.SEVERE, "Cannot instantiate adapter.\n" //$NON-NLS-1$
+ "You try to instantiate an abstract class or an interface!"); //$NON-NLS-1$s
logger.log(Level.SEVERE, "Cannot instantiate adapter. You try to instantiate an abstract class or an interface!"); //$NON-NLS-1$s
System.exit(42);
} catch (IllegalAccessException e) {
......@@ -132,12 +131,10 @@ public abstract class TangibleApplication {
System.exit(42);
} catch (ClassNotFoundException e) {
logger.log(Level.SEVERE, "The class " + properties.getProperty("tableAdapter") + "was not found."); //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
logger.log(Level.SEVERE, "The class " + properties.getProperty("tableAdapter") + " was not found. Check the spelling !"); //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
System.exit(42);
}
GlobalContext.setGlobalContext(adapter);
IDMapper.initialise(properties);
......
......@@ -28,8 +28,8 @@ import javax.microedition.io.StreamConnection;
* Adapter class managing a communication over Bluetooth using {@link StreamConnection}.
*
* @author Nicolas GILMARD [nicolas.gilmard@list.lu]
* @since 1.0
* @version 1.0.0
* @since 2.0
* @version 2.0.41
*/
@NonNullByDefault
public class BluetoothClient extends ClientAdapter {
......@@ -61,13 +61,13 @@ public class BluetoothClient extends ClientAdapter {
*/
@Override
public void connect() throws IOException {
UUID SERVICE_ID = new UUID(uuidService, false);
UUID serviceId = new UUID(uuidService, false);
DiscoveryAgent mDiscoveryAgent;
mDiscoveryAgent = LocalDevice.getLocalDevice().getDiscoveryAgent();
DiscoveryAgent discoveryAgent;
discoveryAgent = LocalDevice.getLocalDevice().getDiscoveryAgent();
String mConnect = null;
mConnect = mDiscoveryAgent.selectService(SERVICE_ID, ServiceRecord.NOAUTHENTICATE_NOENCRYPT, false);
mConnect = discoveryAgent.selectService(serviceId, ServiceRecord.NOAUTHENTICATE_NOENCRYPT, false);
if (mConnect != null) {
client = (StreamConnection) Connector.open(mConnect);
inputStream = client.openInputStream();
......
......@@ -29,8 +29,8 @@ import javax.microedition.io.StreamConnectionNotifier;
* {@link StreamConnection}.
*
* @author Nicolas GILMARD [nicolas.gilmard@list.lu]
* @since 1.0
* @version 1.0.0
* @since 2.0
* @version 2.0.41
*/
@NonNullByDefault
public class BluetoothServer extends ServerAdapter {
......
......@@ -26,8 +26,8 @@ import java.net.UnknownHostException;
* Abstract class managing interaction between application and remote device
*
* @author Nicolas GILMARD [nicolas.gilmard@list.lu]
* @since 1.0
* @version 1.0.0
* @since 2.0
* @version 2.0.41
*/
@NonNullByDefault
public abstract class ClientAdapter extends NetworkAdapter {
......
......@@ -22,8 +22,8 @@ import java.io.OutputStream;
* Abstract class managing communication between a tangible table and external device
*
* @author Nicolas GILMARD [nicolas.gilmard@list.lu]
* @since 1.0
* @version 1.0.0
* @since 2.0
* @version 2.0.41
*/
@NonNullByDefault
public abstract class NetworkAdapter {
......
......@@ -22,8 +22,8 @@ import java.io.IOException;
* Abstract class managing interaction between application and remote device
*
* @author Nicolas GILMARD [nicolas.gilmard@list.lu]
* @since 1.0
* @version 1.0.0
* @since 2.0
* @version 2.0.41
*/
@NonNullByDefault
public abstract class ServerAdapter extends NetworkAdapter {
......
......@@ -23,8 +23,8 @@ import java.net.UnknownHostException;
* Adapter class managing a communication over TCP using {@link Socket}.
*
* @author Nicolas GILMARD [nicolas.gilmard@list.lu]
* @since 1.0
* @version 1.0.0
* @since 2.0
* @version 2.0.41
*/
@NonNullByDefault
public class TcpClient extends ClientAdapter {
......
......@@ -23,8 +23,8 @@ import java.net.Socket;
* Adapter class managing a communication over TCP using {@link ServerSocket} and {@link Socket}.
*
* @author Nicolas GILMARD [nicolas.gilmard@list.lu]
* @since 1.0
* @version 1.0.0
* @since 2.0
* @version 2.0.41
*/
@NonNullByDefault
public class TcpServer extends ServerAdapter {
......
......@@ -29,8 +29,8 @@ import java.util.Enumeration;
* Adapter class managing a communication over XBee's protocol using {@link SerialPort}.
*
* @author Nicolas GILMARD [nicolas.gilmard@list.lu]
* @since 1.0
* @version 1.0.0
* @since 2.0
* @version 2.0.41
*/
@NonNullByDefault
public class XbeeAdapter extends ClientAdapter {
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment