Author: kmorin Date: 2014-04-01 18:16:09 +0200 (Tue, 01 Apr 2014) New Revision: 95 Url: http://forge.codelutin.com/projects/wlo/repository/revisions/95 Log: uncomment commented lines for tests Modified: trunk/pom.xml trunk/src/fr/ifremer/wlo/BigFinCommunicationService.java trunk/src/fr/ifremer/wlo/DeviceListActivity.java Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2014-04-01 16:12:49 UTC (rev 94) +++ trunk/pom.xml 2014-04-01 16:16:09 UTC (rev 95) @@ -33,7 +33,7 @@ <groupId>fr.ifremer</groupId> <artifactId>wlo</artifactId> - <version>0.6-SNAPSHOT</version> + <version>0.5-SNAPSHOT</version> <name>WLO</name> <description> Modified: trunk/src/fr/ifremer/wlo/BigFinCommunicationService.java =================================================================== --- trunk/src/fr/ifremer/wlo/BigFinCommunicationService.java 2014-04-01 16:12:49 UTC (rev 94) +++ trunk/src/fr/ifremer/wlo/BigFinCommunicationService.java 2014-04-01 16:16:09 UTC (rev 95) @@ -313,10 +313,9 @@ } // Start the thread to connect with the given device - //TODO -// mConnectThread = new ConnectThread(device); -// mConnectThread.start(); -// setState(STATE_CONNECTING); + mConnectThread = new ConnectThread(device); + mConnectThread.start(); + setState(STATE_CONNECTING); setState(STATE_CONNECTED); } @@ -368,8 +367,7 @@ r = mConnectedThread; } // Perform the write unsynchronized - //TODO -// r.write(out); + r.write(out); } /** Modified: trunk/src/fr/ifremer/wlo/DeviceListActivity.java =================================================================== --- trunk/src/fr/ifremer/wlo/DeviceListActivity.java 2014-04-01 16:12:49 UTC (rev 94) +++ trunk/src/fr/ifremer/wlo/DeviceListActivity.java 2014-04-01 16:16:09 UTC (rev 95) @@ -212,8 +212,8 @@ case BigFinCommunicationService.STATE_CONNECTED: sendDataToDevice("a"); sendDataToDevice("b"); -//TODO -// dialog.dismiss(); + + dialog.dismiss(); setResult(RESULT_OK); finish();