Author: kmorin Date: 2014-12-23 09:53:10 +0000 (Tue, 23 Dec 2014) New Revision: 112 Url: http://forge.codelutin.com/projects/wlo/repository/revisions/112 Log: fixes #6051 Utiliser la nouvele r?\195?\168gle BIGFIN avec WLO Added: trunk/src/main/ trunk/src/main/java/ trunk/src/main/java/fr/ trunk/src/main/java/fr/ifremer/wlo/BigFinCommunicationService.java Removed: trunk/src/fr/ trunk/src/main/java/fr/ifremer/wlo/BigFinCommunicationService.java trunk/src/main/java/fr/ifremer/wlo/utils/BigFinFeedReaderRecord.java Modified: trunk/pom.xml trunk/res/drawable-hdpi/drawer_shadow.9.png trunk/src/main/java/fr/ifremer/wlo/CommercialSpeciesActivity.java trunk/src/main/java/fr/ifremer/wlo/CommercialSpeciesFormActivity.java trunk/src/main/java/fr/ifremer/wlo/ContextFormActivity.java trunk/src/main/java/fr/ifremer/wlo/ContextsActivity.java trunk/src/main/java/fr/ifremer/wlo/DeviceListActivity.java trunk/src/main/java/fr/ifremer/wlo/LocationFormActivity.java trunk/src/main/java/fr/ifremer/wlo/LocationsActivity.java trunk/src/main/java/fr/ifremer/wlo/MainActivity.java trunk/src/main/java/fr/ifremer/wlo/MetierFormActivity.java trunk/src/main/java/fr/ifremer/wlo/MetiersActivity.java trunk/src/main/java/fr/ifremer/wlo/ScientificSpeciesActivity.java trunk/src/main/java/fr/ifremer/wlo/ScientificSpeciesFormActivity.java trunk/src/main/java/fr/ifremer/wlo/VesselFormActivity.java trunk/src/main/java/fr/ifremer/wlo/VesselsActivity.java trunk/src/main/java/fr/ifremer/wlo/WeightsActivity.java trunk/src/main/java/fr/ifremer/wlo/WloApplication.java trunk/src/main/java/fr/ifremer/wlo/WloBaseActivity.java trunk/src/main/java/fr/ifremer/wlo/WloBaseListActivity.java trunk/src/main/java/fr/ifremer/wlo/WloModelEditionActivity.java trunk/src/main/java/fr/ifremer/wlo/imports/CalcifiedPartTakingRowModel.java trunk/src/main/java/fr/ifremer/wlo/imports/CommercialSpeciesRowModel.java trunk/src/main/java/fr/ifremer/wlo/imports/LocationRowModel.java trunk/src/main/java/fr/ifremer/wlo/imports/MensurationRowModel.java trunk/src/main/java/fr/ifremer/wlo/imports/MetierRowModel.java trunk/src/main/java/fr/ifremer/wlo/imports/PresentationRowModel.java trunk/src/main/java/fr/ifremer/wlo/imports/QualitativeValueRowModel.java trunk/src/main/java/fr/ifremer/wlo/imports/ScientificSpeciesRowModel.java trunk/src/main/java/fr/ifremer/wlo/imports/StateRowModel.java trunk/src/main/java/fr/ifremer/wlo/imports/VesselRowModel.java trunk/src/main/java/fr/ifremer/wlo/imports/WloAbstractImportExportModel.java trunk/src/main/java/fr/ifremer/wlo/measurement/GraphActivity.java trunk/src/main/java/fr/ifremer/wlo/measurement/GraphFragment.java trunk/src/main/java/fr/ifremer/wlo/measurement/LogsFragment.java trunk/src/main/java/fr/ifremer/wlo/measurement/MeasurementActivity.java trunk/src/main/java/fr/ifremer/wlo/measurement/MeasurementsDisplayerFragment.java trunk/src/main/java/fr/ifremer/wlo/measurement/TableAdapter.java trunk/src/main/java/fr/ifremer/wlo/measurement/TableFragment.java trunk/src/main/java/fr/ifremer/wlo/models/BaseModel.java trunk/src/main/java/fr/ifremer/wlo/models/CategoryWeightModel.java trunk/src/main/java/fr/ifremer/wlo/models/CommercialSpeciesModel.java trunk/src/main/java/fr/ifremer/wlo/models/ContextModel.java trunk/src/main/java/fr/ifremer/wlo/models/HierarchicalModel.java trunk/src/main/java/fr/ifremer/wlo/models/LocationModel.java trunk/src/main/java/fr/ifremer/wlo/models/MeasurementModel.java trunk/src/main/java/fr/ifremer/wlo/models/MeasurementsModel.java trunk/src/main/java/fr/ifremer/wlo/models/MetierModel.java trunk/src/main/java/fr/ifremer/wlo/models/ScientificSpeciesModel.java trunk/src/main/java/fr/ifremer/wlo/models/VesselModel.java trunk/src/main/java/fr/ifremer/wlo/models/categorization/CategoryModel.java trunk/src/main/java/fr/ifremer/wlo/models/categorization/QualitativeValueModel.java trunk/src/main/java/fr/ifremer/wlo/models/referentials/CalcifiedPartTaking.java trunk/src/main/java/fr/ifremer/wlo/models/referentials/CommercialSpecies.java trunk/src/main/java/fr/ifremer/wlo/models/referentials/HasCode.java trunk/src/main/java/fr/ifremer/wlo/models/referentials/Location.java trunk/src/main/java/fr/ifremer/wlo/models/referentials/Mensuration.java trunk/src/main/java/fr/ifremer/wlo/models/referentials/Metier.java trunk/src/main/java/fr/ifremer/wlo/models/referentials/Presentation.java trunk/src/main/java/fr/ifremer/wlo/models/referentials/ScientificSpecies.java trunk/src/main/java/fr/ifremer/wlo/models/referentials/State.java trunk/src/main/java/fr/ifremer/wlo/models/referentials/Vessel.java trunk/src/main/java/fr/ifremer/wlo/preferences/CategoryCreationAcivity.java trunk/src/main/java/fr/ifremer/wlo/preferences/ListItemPreference.java trunk/src/main/java/fr/ifremer/wlo/preferences/MultiSelectItemPreference.java trunk/src/main/java/fr/ifremer/wlo/preferences/MultiSelectionActivity.java trunk/src/main/java/fr/ifremer/wlo/preferences/SettingsActivity.java trunk/src/main/java/fr/ifremer/wlo/preferences/StringPreference.java trunk/src/main/java/fr/ifremer/wlo/storage/CsvExporter.java trunk/src/main/java/fr/ifremer/wlo/storage/DataCache.java trunk/src/main/java/fr/ifremer/wlo/storage/JsonExporter.java trunk/src/main/java/fr/ifremer/wlo/storage/StorageUtils.java trunk/src/main/java/fr/ifremer/wlo/storage/WloSqlOpenHelper.java trunk/src/main/java/fr/ifremer/wlo/utils/AbstractDateTimePickerFragment.java trunk/src/main/java/fr/ifremer/wlo/utils/BaseModelArrayAdapter.java trunk/src/main/java/fr/ifremer/wlo/utils/BaseTextWatcher.java trunk/src/main/java/fr/ifremer/wlo/utils/DatePickerFragment.java trunk/src/main/java/fr/ifremer/wlo/utils/ImportExportUtil.java trunk/src/main/java/fr/ifremer/wlo/utils/TimePickerFragment.java trunk/src/main/java/fr/ifremer/wlo/utils/UIUtils.java trunk/src/main/java/fr/ifremer/wlo/utils/UpdateCheckTask.java trunk/src/main/java/fr/ifremer/wlo/utils/WloAutoCompleteTextView.java trunk/src/main/java/fr/ifremer/wlo/utils/WloAutoCompleteTextViewWithFavorites.java trunk/src/main/java/fr/ifremer/wlo/utils/WloItemListViewBinder.java trunk/src/main/java/fr/ifremer/wlo/utils/filechooser/FileDialog.java trunk/src/main/java/fr/ifremer/wlo/utils/filechooser/SelectionMode.java Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2014-04-04 09:42:08 UTC (rev 111) +++ trunk/pom.xml 2014-12-23 09:53:10 UTC (rev 112) @@ -111,7 +111,7 @@ <relativizeDecorationLinks>false</relativizeDecorationLinks> <!-- license header configuration --> - <license.organizationName>Ifremer</license.organizationName> + <license.organizationName>Ifremer, Code Lutin</license.organizationName> <license.licenseName>gpl_v3</license.licenseName> <!-- Release configuration --> @@ -212,6 +212,12 @@ <version>4.5.0</version> </dependency> + <dependency> + <groupId>fr.ifremer.tutti</groupId> + <artifactId>tutti-ichtyometer</artifactId> + <version>3.11-SNAPSHOT</version> + </dependency> + </dependencies> <repositories> @@ -245,7 +251,7 @@ </pluginRepositories> <build> - <sourceDirectory>src</sourceDirectory> + <!--<sourceDirectory>src</sourceDirectory>--> <resources> <resource> <directory>res</directory> @@ -256,9 +262,9 @@ <plugins> <plugin> - <groupId>com.jayway.maven.plugins.android.generation2</groupId> + <groupId>com.simpligility.maven.plugins</groupId> <artifactId>android-maven-plugin</artifactId> - <version>3.8.2</version> + <version>4.0.0</version> <executions> <execution> <id>alignApk</id> @@ -270,9 +276,11 @@ </executions> <configuration> <sdk> - <!--<path>${env.ANDROID_HOME}</path>--> <platform>15</platform> </sdk> + <androidManifestFile>${project.basedir}/AndroidManifest.xml</androidManifestFile> + <resourceDirectory>${project.basedir}/res</resourceDirectory> + <assetsDirectory>${project.basedir}/assets</assetsDirectory> <extractDuplicates>true</extractDuplicates> <excludeJarResources> <excludeJarResource>.*nuiton.*</excludeJarResource> Modified: trunk/res/drawable-hdpi/drawer_shadow.9.png =================================================================== (Binary files differ) Deleted: trunk/src/main/java/fr/ifremer/wlo/BigFinCommunicationService.java =================================================================== --- trunk/src/fr/ifremer/wlo/BigFinCommunicationService.java 2014-04-03 08:57:26 UTC (rev 103) +++ trunk/src/main/java/fr/ifremer/wlo/BigFinCommunicationService.java 2014-12-23 09:53:10 UTC (rev 112) @@ -1,674 +0,0 @@ -/* - * Copyright (C) 2009 The Android Open Source Project - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -package fr.ifremer.wlo; - -/* - * #%L - * WLO - * $Id$ - * $HeadURL$ - * %% - * Copyright (C) 2013 - 2014 Ifremer - * %% - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as - * published by the Free Software Foundation, either version 3 of the - * License, or (at your option) any later version. - * - * This program 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 General Public License for more details. - * - * You should have received a copy of the GNU General Public - * License along with this program. If not, see - * <http://www.gnu.org/licenses/gpl-3.0.html>. - * #L% - */ - -import android.app.NotificationManager; -import android.app.PendingIntent; -import android.app.Service; -import android.bluetooth.BluetoothAdapter; -import android.bluetooth.BluetoothDevice; -import android.bluetooth.BluetoothServerSocket; -import android.bluetooth.BluetoothSocket; -import android.content.Intent; -import android.os.Bundle; -import android.os.Handler; -import android.os.IBinder; -import android.os.Message; -import android.os.Messenger; -import android.os.RemoteException; -import android.support.v4.app.NotificationCompat; -import android.util.Log; -import com.google.common.collect.Lists; -import fr.ifremer.wlo.utils.BigFinFeedReaderRecord; - -import java.io.IOException; -import java.io.InputStream; -import java.io.OutputStream; -import java.util.List; -import java.util.UUID; - -/** - * This class does all the work for setting up and managing Bluetooth - * connections with other devices. It has a thread that listens for - * incoming connections, a thread for connecting with a device, and a - * thread for performing data transmissions when connected. - */ -public class BigFinCommunicationService extends Service { - - private static final String TAG = "BigFinCommunicationService"; - - // Unique UUID for this application - private static final UUID MY_UUID = - UUID.fromString("00001101-0000-1000-8000-00805f9b34fb"); - private static final int NOIFICATION_ID = 42; - - // Constants that indicate the current connection state - public static final int STATE_NONE = 0; // we're doing nothing - public static final int STATE_LISTEN = 1; // now listening for incoming connections - public static final int STATE_CONNECTING = 2; // now initiating an outgoing connection - public static final int STATE_CONNECTED = 3; // now connected to a remote device - - // OUTGOING MESSAGE - public static final int MESSAGE_STATE_CHANGE = 1; - public static final int MESSAGE_READ = 2; - public static final int MESSAGE_WRITE = 3; - public static final int MESSAGE_DEVICE_NAME = 4; - public static final int MESSAGE_CONNECTION_LOST = 5; - public static final int MESSAGE_CONNECTION_FAILED = 6; - - // INCOMING MESSAGE - public static final int MESSAGE_REGISTER_CLIENT = 1; - public static final int MESSAGE_UNREGISTER_CLIENT = 2; - public static final int MESSAGE_CONNECT_DEVICE = 3; - public static final int MESSAGE_SEND_DATA = 4; - public static final int MESSAGE_DISCONNECT_DEVICE = 5; - - //BOTH - public static final int MESSAGE_CONNECTION_STATE = 7; - - public static final String DEVICE_NAME = "device_name"; - public static final String TOAST = "toast"; - public static final String DEVICE_ADDRESS = "device_address"; - public static final String DATA_TO_SEND = "dataToSend"; - public static final String EXTRA_DISCONNECT = "disconnect"; - - // Member fields - protected BluetoothAdapter mAdapter; - protected AcceptThread mAcceptThread; - protected ConnectThread mConnectThread; - protected ConnectedThread mConnectedThread; - protected int mState; - - // Keeps track of all current registered clients. - protected List<Messenger> mClients = Lists.newArrayList(); - // Target we publish for clients to send messages to IncomingHandler. - protected final Messenger mMessenger = new Messenger(new IncomingHandler()); - - protected NotificationCompat.Builder notificationBuilder; - - @Override - public void onCreate() { - super.onCreate(); - - mAdapter = BluetoothAdapter.getDefaultAdapter(); - - notificationBuilder = new NotificationCompat.Builder(this); - - setState(STATE_NONE); - - NotificationManager manager = (NotificationManager) getSystemService(NOTIFICATION_SERVICE); - manager.notify(NOIFICATION_ID, notificationBuilder.build()); - } - - @Override - public int onStartCommand(Intent intent, int flags, int startId) { - if (intent.getBooleanExtra(EXTRA_DISCONNECT, false)) { - if (mClients.isEmpty()) { - stopSelf(); - } else { - stop(); - } - } - return START_STICKY; - } - - @Override - public void onDestroy() { - super.onDestroy(); - stop(); - NotificationManager manager = (NotificationManager) getSystemService(NOTIFICATION_SERVICE); - manager.cancel(NOIFICATION_ID); - } - - @Override - public IBinder onBind(Intent intent) { - // start the service for it to keep living after all activities unbound it - startService(intent); - return mMessenger.getBinder(); - } - - @Override - public boolean onUnbind(Intent intent) { - // stop the service only if it is not connected - if (mState != STATE_CONNECTED) { - stopSelf(); - } - return true; - } - - protected void updateNotification(boolean connected) { - int title; - int text; - int icon; - PendingIntent pendingIntent; - - if (connected) { - title = R.string.bigfin_ichtyometer_connected_title; - text = R.string.bigfin_ichtyometer_connected_text; - icon = R.drawable.wlo_ico_small_connected; - Intent intent = new Intent(this, BigFinCommunicationService.class); - intent.putExtra(EXTRA_DISCONNECT, true); - pendingIntent = PendingIntent.getService(this, - -1, - intent, - PendingIntent.FLAG_CANCEL_CURRENT); - - } else { - title = R.string.bigfin_no_ichtyometer_connected_title; - text = R.string.bigfin_no_ichtyometer_connected_text; - icon = R.drawable.wlo_ico_small; - Intent intent = new Intent(this, DeviceListActivity.class); - pendingIntent = PendingIntent.getActivity(this, - -1, - intent, - PendingIntent.FLAG_CANCEL_CURRENT); - } - - notificationBuilder.setContentTitle(getText(title)) - .setSmallIcon(icon) - .setContentText(getText(text)) - .setContentIntent(pendingIntent); - - startForeground(NOIFICATION_ID, notificationBuilder.build()); - } - - protected void sendMessage(int what, int arg1) { - sendMessage(what, arg1, -1, null); - } - - protected void sendMessage(int what, int arg1, int arg2) { - sendMessage(what, arg1, arg2, null); - } - - protected void sendMessage(int what, Object obj) { - sendMessage(what, -1, -1, obj); - } - - protected void sendMessage(int what, int arg1, int arg2, Object obj) { - for (Messenger messenger : mClients) { - try { - Message message = Message.obtain(null, what, arg1, arg2, obj); - messenger.send(message); - - } catch (RemoteException e) { - mClients.remove(messenger); - } - } - } - - protected void sendMessage(int what, String key, String value) { - for (Messenger messenger : mClients) { - try { - Message message = Message.obtain(null, what); - Bundle bundle = new Bundle(); - bundle.putString(key, value); - message.setData(bundle); - messenger.send(message); - - } catch (RemoteException e) { - mClients.remove(messenger); - } - } - } - - /** - * Set the current state of the chat connection - * @param state An integer defining the current connection state - */ - protected synchronized void setState(int state) { - updateNotification(state== STATE_CONNECTED); - - mState = state; - sendMessage(MESSAGE_STATE_CHANGE, state); - } - - /** - * Stop all threads - */ - protected synchronized void stop() { - if (mConnectThread != null) { - mConnectThread.cancel(); - mConnectThread = null; - } - - if (mConnectedThread != null) { - mConnectedThread.cancel(); - mConnectedThread = null; - } - - if (mAcceptThread != null) { - mAcceptThread.cancel(); - mAcceptThread = null; - } - - setState(STATE_NONE); - - } - - protected synchronized void reset() { - stop(); - - setState(STATE_LISTEN); - - // Start the thread to listen on a BluetoothServerSocket - mAcceptThread = new AcceptThread(); - mAcceptThread.start(); - } - - /** - * Start the ConnectThread to initiate a connection to a remote device. - * @param device The BluetoothDevice to connect - */ - protected synchronized void connect(BluetoothDevice device) { - // Cancel any thread attempting to make a connection - if (mState == STATE_CONNECTING) { - if (mConnectThread != null) { - mConnectThread.cancel(); - mConnectThread = null; - } - } - - // Cancel any thread currently running a connection - if (mConnectedThread != null) { - mConnectedThread.cancel(); - mConnectedThread = null; - } - - // Start the thread to connect with the given device - mConnectThread = new ConnectThread(device); - mConnectThread.start(); - setState(STATE_CONNECTING); - setState(STATE_CONNECTED); - } - - /** - * Start the ConnectedThread to begin managing a Bluetooth connection - * @param socket The BluetoothSocket on which the connection was made - * @param device The BluetoothDevice that has been connected - */ - protected synchronized void connected(BluetoothSocket socket, BluetoothDevice device) { - // Cancel the thread that completed the connection - if (mConnectThread != null) { - mConnectThread.cancel(); - mConnectThread = null; - } - - // Cancel any thread currently running a connection - if (mConnectedThread != null) { - mConnectedThread.cancel(); - mConnectedThread = null; - } - - // Cancel the accept thread because we only want to connect to one device - if (mAcceptThread != null) { - mAcceptThread.cancel(); - mAcceptThread = null; - } - - // Start the thread to manage the connection and perform transmissions - mConnectedThread = new ConnectedThread(socket); - mConnectedThread.start(); - - // Send the name of the connected device back to the UI Activity - sendMessage(MESSAGE_DEVICE_NAME, DEVICE_NAME, device.getName()); - - setState(STATE_CONNECTED); - } - - /** - * Write to the ConnectedThread in an unsynchronized manner - * @param out The bytes to write - * @see ConnectedThread#write(byte[]) - */ - protected void write(byte[] out) { - // Create temporary object - ConnectedThread r; - // Synchronize a copy of the ConnectedThread - synchronized (this) { - if (mState != STATE_CONNECTED) return; - r = mConnectedThread; - } - // Perform the write unsynchronized - r.write(out); - } - - /** - * Indicate that the connection attempt failed and notify the UI Activity. - */ - protected void connectionFailed() { - // Send a failure message back to the Activity - sendMessage(MESSAGE_CONNECTION_FAILED, TOAST, "Unable to connect device"); - - // Start the service over to restart listening mode - reset(); - } - - /** - * Indicate that the connection was lost and notify the UI Activity. - */ - protected void connectionLost() { - // Send a failure message back to the Activity - sendMessage(MESSAGE_CONNECTION_LOST, TOAST, "Device connection was lost"); - - // Start the service over to restart listening mode - reset(); - } - - /** - * This thread runs while listening for incoming connections. It behaves - * like a server-side client. It runs until a connection is accepted - * (or until cancelled). - */ - protected class AcceptThread extends Thread { - // The local server socket - private BluetoothServerSocket mmServerSocket; - - public AcceptThread() { - BluetoothServerSocket tmp = null; - - // Create a new listening server socket - try { - tmp = mAdapter.listenUsingRfcommWithServiceRecord("BigFinBtSocket", MY_UUID); - - } catch (IOException e) { - Log.e(TAG, "Socket listen() failed", e); - } - mmServerSocket = tmp; - } - - public void run() { - setName("AcceptThread"); - - BluetoothSocket socket = null; - - // Listen to the server socket if we're not connected - while (mState != STATE_CONNECTED && mmServerSocket != null) { - try { - // This is a blocking call and will only return on a - // successful connection or an exception - socket = mmServerSocket.accept(); - } catch (IOException e) { - Log.e(TAG, "Socket accept() failed"); - break; - } - - // If a connection was accepted - if (socket != null) { - synchronized (BigFinCommunicationService.this) { - switch (mState) { - case STATE_LISTEN: - case STATE_CONNECTING: - // Situation normal. Start the connected thread. - connected(socket, socket.getRemoteDevice()); - break; - case STATE_NONE: - case STATE_CONNECTED: - // Either not ready or already connected. Terminate new socket. - try { - socket.close(); - } catch (IOException e) { - Log.e(TAG, "Could not close unwanted socket", e); - } - break; - } - } - } - } - } - - public void cancel() { - try { - mmServerSocket.close(); - mmServerSocket = null; - } catch (IOException e) { - Log.e(TAG, "Socket close() of server failed", e); - } - } - } - - - /** - * This thread runs while attempting to make an outgoing connection - * with a device. It runs straight through; the connection either - * succeeds or fails. - */ - protected class ConnectThread extends Thread { - protected final BluetoothSocket mmSocket; - protected final BluetoothDevice mmDevice; - - public ConnectThread(BluetoothDevice device) { - mmDevice = device; - BluetoothSocket tmp = null; - - // Get a BluetoothSocket for a connection with the - // given BluetoothDevice - try { - tmp = device.createRfcommSocketToServiceRecord(MY_UUID); - } catch (IOException e) { - Log.e(TAG, "Socket create() failed", e); - } - mmSocket = tmp; - } - - public void run() { - setName("ConnectThread"); - - // Make a connection to the BluetoothSocket - try { - // This is a blocking call and will only return on a - // successful connection or an exception - mmSocket.connect(); - - } catch (IOException e) { - Log.e(TAG, "Error while connecting", e); - // Close the socket - try { - mmSocket.close(); - } catch (IOException e2) { - Log.e(TAG, "unable to close() socket during connection failure", e2); - } - connectionFailed(); - return; - } - - // Reset the ConnectThread because we're done - synchronized (BigFinCommunicationService.this) { - mConnectThread = null; - } - - // Start the connected thread - connected(mmSocket, mmDevice); - } - - public void cancel() { - try { - mmSocket.close(); - } catch (IOException e) { - Log.e(TAG, "close() of connect socket failed", e); - } - } - } - - /** - * This thread runs during a connection with a remote device. - * It handles all incoming and outgoing transmissions. - */ - protected class ConnectedThread extends Thread { - protected final BluetoothSocket mmSocket; - protected final InputStream mmInStream; - protected final OutputStream mmOutStream; - protected boolean stop; - - public ConnectedThread(BluetoothSocket socket) { - mmSocket = socket; - InputStream tmpIn = null; - OutputStream tmpOut = null; - - // Get the BluetoothSocket input and output streams - try { - tmpIn = socket.getInputStream(); - tmpOut = socket.getOutputStream(); - } catch (IOException e) { - Log.e(TAG, "temp sockets not created", e); - } - - mmInStream = tmpIn; - mmOutStream = tmpOut; - - stop = false; - } - - public void run() { - byte[] buffer = new byte[1024]; - int bytes; - - // Keep listening to the InputStream while connected - while (!stop) { - try { - // Read from the InputStream -// bytes = mmInStream.read(buffer); - -// Log.d(TAG, "received " + new String(buffer, 0, bytes)); - String result = ""; - - // wait until got a @ - - boolean complete = false; - while (!complete) { - while (mmInStream.available() > 0) { - int c = mmInStream.read(); - if (c == '@') { - complete = true; - } else { - result += (char) c; - } - } - } - -// int atSignIndex = result.indexOf('@'); -// result = result.substring(0, atSignIndex); - - int lastComma = result.lastIndexOf(','); - result = result.substring(0, lastComma); - - lastComma = result.lastIndexOf(',') + 1; - String record = result.substring(0, lastComma); - - String crc = result.substring(lastComma); - - BigFinFeedReaderRecord readerRecord = new BigFinFeedReaderRecord(record, crc); - - // Send the obtained bytes to the UI Activity - sendMessage(MESSAGE_READ, readerRecord); - - } catch (IOException e) { - Log.e(TAG, "disconnected"); - connectionLost(); - } - } - } - - /** - * Write to the connected OutStream. - * @param buffer The bytes to write - */ - public void write(byte[] buffer) { - try { - mmOutStream.write(buffer); - - // Share the sent message back to the UI Activity - sendMessage(MESSAGE_WRITE, buffer); - - } catch (IOException e) { - Log.e(TAG, "Exception during write", e); - } - } - - public void cancel() { - try { - mmSocket.close(); - } catch (IOException e) { - Log.e(TAG, "close() of connect socket failed", e); - } - stop = true; - } - } - - // Handler of incoming messages from clients. - protected class IncomingHandler extends Handler { - @Override - public void handleMessage(Message msg) { - switch (msg.what) { - case MESSAGE_REGISTER_CLIENT: - mClients.add(msg.replyTo); - break; - - case MESSAGE_UNREGISTER_CLIENT: - mClients.remove(msg.replyTo); - break; - - case MESSAGE_CONNECT_DEVICE: - reset(); - - String deviceAddress = msg.getData().getString(DEVICE_ADDRESS); - // Get the BluetoothDevice object - BluetoothDevice device = mAdapter.getRemoteDevice(deviceAddress); - connect(device); - break; - - case MESSAGE_SEND_DATA: - String dataToSend = msg.getData().getString(DATA_TO_SEND); - write(dataToSend.getBytes()); - break; - - case MESSAGE_DISCONNECT_DEVICE: - stop(); - break; - - case MESSAGE_CONNECTION_STATE: - BigFinCommunicationService.this.sendMessage(MESSAGE_CONNECTION_STATE, mState); - - default: - super.handleMessage(msg); - } - } - } -} Copied: trunk/src/main/java/fr/ifremer/wlo/BigFinCommunicationService.java (from rev 104, trunk/src/fr/ifremer/wlo/BigFinCommunicationService.java) =================================================================== --- trunk/src/main/java/fr/ifremer/wlo/BigFinCommunicationService.java (rev 0) +++ trunk/src/main/java/fr/ifremer/wlo/BigFinCommunicationService.java 2014-12-23 09:53:10 UTC (rev 112) @@ -0,0 +1,698 @@ +/* + * Copyright (C) 2009 The Android Open Source Project + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +package fr.ifremer.wlo; + +/* + * #%L + * WLO + * $Id$ + * $HeadURL$ + * %% + * Copyright (C) 2013 - 2014 Ifremer, Code Lutin + * %% + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as + * published by the Free Software Foundation, either version 3 of the + * License, or (at your option) any later version. + * + * This program 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 General Public License for more details. + * + * You should have received a copy of the GNU General Public + * License along with this program. If not, see + * <http://www.gnu.org/licenses/gpl-3.0.html>. + * #L% + */ + +import android.app.NotificationManager; +import android.app.PendingIntent; +import android.app.Service; +import android.bluetooth.BluetoothAdapter; +import android.bluetooth.BluetoothDevice; +import android.bluetooth.BluetoothServerSocket; +import android.bluetooth.BluetoothSocket; +import android.content.Intent; +import android.os.Bundle; +import android.os.Handler; +import android.os.IBinder; +import android.os.Message; +import android.os.Messenger; +import android.os.RemoteException; +import android.support.v4.app.NotificationCompat; +import android.util.Log; +import com.google.common.collect.Lists; +import fr.ifremer.tutti.ichtyometer.feed.record.FeedReaderMeasureRecord; +import fr.ifremer.tutti.ichtyometer.feed.record.FeedReaderRecordFactory; +import fr.ifremer.tutti.ichtyometer.feed.record.FeedReaderRecordSupport; + +import java.io.IOException; +import java.io.InputStream; +import java.io.OutputStream; +import java.util.List; +import java.util.UUID; + +/** + * This class does all the work for setting up and managing Bluetooth + * connections with other devices. It has a thread that listens for + * incoming connections, a thread for connecting with a device, and a + * thread for performing data transmissions when connected. + */ +public class BigFinCommunicationService extends Service { + + private static final String TAG = "BigFinCommunicationService"; + + // Unique UUID for this application + private static final UUID MY_UUID = + UUID.fromString("00001101-0000-1000-8000-00805f9b34fb"); + private static final int NOIFICATION_ID = 42; + + // Constants that indicate the current connection state + public static final int STATE_NONE = 0; // we're doing nothing + public static final int STATE_LISTEN = 1; // now listening for incoming connections + public static final int STATE_CONNECTING = 2; // now initiating an outgoing connection + public static final int STATE_CONNECTED = 3; // now connected to a remote device + + // OUTGOING MESSAGE + public static final int MESSAGE_STATE_CHANGE = 1; + public static final int MESSAGE_READ = 2; + public static final int MESSAGE_WRITE = 3; + public static final int MESSAGE_DEVICE_NAME = 4; + public static final int MESSAGE_CONNECTION_LOST = 5; + public static final int MESSAGE_CONNECTION_FAILED = 6; + + // INCOMING MESSAGE + public static final int MESSAGE_REGISTER_CLIENT = 1; + public static final int MESSAGE_UNREGISTER_CLIENT = 2; + public static final int MESSAGE_CONNECT_DEVICE = 3; + public static final int MESSAGE_SEND_DATA = 4; + public static final int MESSAGE_DISCONNECT_DEVICE = 5; + + //BOTH + public static final int MESSAGE_CONNECTION_STATE = 7; + + public static final String DEVICE_NAME = "device_name"; + public static final String TOAST = "toast"; + public static final String DEVICE_ADDRESS = "device_address"; + public static final String DATA_TO_SEND = "dataToSend"; + public static final String EXTRA_DISCONNECT = "disconnect"; + + // Member fields + protected BluetoothAdapter mAdapter; + protected AcceptThread mAcceptThread; + protected ConnectThread mConnectThread; + protected ConnectedThread mConnectedThread; + protected int mState; + protected FeedReaderRecordFactory recordFactory; + + // Keeps track of all current registered clients. + protected List<Messenger> mClients = Lists.newArrayList(); + // Target we publish for clients to send messages to IncomingHandler. + protected final Messenger mMessenger = new Messenger(new IncomingHandler()); + + protected NotificationCompat.Builder notificationBuilder; + + @Override + public void onCreate() { + super.onCreate(); + + mAdapter = BluetoothAdapter.getDefaultAdapter(); + + notificationBuilder = new NotificationCompat.Builder(this); + + recordFactory = new FeedReaderRecordFactory(); + + setState(STATE_NONE); + + NotificationManager manager = (NotificationManager) getSystemService(NOTIFICATION_SERVICE); + manager.notify(NOIFICATION_ID, notificationBuilder.build()); + } + + @Override + public int onStartCommand(Intent intent, int flags, int startId) { + if (intent != null && intent.getBooleanExtra(EXTRA_DISCONNECT, false)) { + if (mClients.isEmpty()) { + stopSelf(); + } else { + stop(); + } + } + return START_STICKY; + } + + @Override + public void onDestroy() { + super.onDestroy(); + stop(); + NotificationManager manager = (NotificationManager) getSystemService(NOTIFICATION_SERVICE); + manager.cancel(NOIFICATION_ID); + } + + @Override + public IBinder onBind(Intent intent) { + // start the service for it to keep living after all activities unbound it + startService(intent); + return mMessenger.getBinder(); + } + + @Override + public boolean onUnbind(Intent intent) { + // stop the service only if it is not connected + if (mState != STATE_CONNECTED) { + stopSelf(); + } + return true; + } + + protected void updateNotification(boolean connected) { + int title; + int text; + int icon; + PendingIntent pendingIntent; + + if (connected) { + title = R.string.bigfin_ichtyometer_connected_title; + text = R.string.bigfin_ichtyometer_connected_text; + icon = R.drawable.wlo_ico_small_connected; + Intent intent = new Intent(this, BigFinCommunicationService.class); + intent.putExtra(EXTRA_DISCONNECT, true); + pendingIntent = PendingIntent.getService(this, + -1, + intent, + PendingIntent.FLAG_CANCEL_CURRENT); + + } else { + title = R.string.bigfin_no_ichtyometer_connected_title; + text = R.string.bigfin_no_ichtyometer_connected_text; + icon = R.drawable.wlo_ico_small; + Intent intent = new Intent(this, DeviceListActivity.class); + pendingIntent = PendingIntent.getActivity(this, + -1, + intent, + PendingIntent.FLAG_CANCEL_CURRENT); + } + + notificationBuilder.setContentTitle(getText(title)) + .setSmallIcon(icon) + .setContentText(getText(text)) + .setContentIntent(pendingIntent); + + startForeground(NOIFICATION_ID, notificationBuilder.build()); + } + + protected void sendMessage(int what, int arg1) { + sendMessage(what, arg1, -1, null); + } + + protected void sendMessage(int what, int arg1, int arg2) { + sendMessage(what, arg1, arg2, null); + } + + protected void sendMessage(int what, Object obj) { + sendMessage(what, -1, -1, obj); + } + + protected void sendMessage(int what, int arg1, int arg2, Object obj) { + for (Messenger messenger : mClients) { + try { + Message message = Message.obtain(null, what, arg1, arg2, obj); + messenger.send(message); + + } catch (RemoteException e) { + mClients.remove(messenger); + } + } + } + + protected void sendMessage(int what, String key, String value) { + for (Messenger messenger : mClients) { + try { + Message message = Message.obtain(null, what); + Bundle bundle = new Bundle(); + bundle.putString(key, value); + message.setData(bundle); + messenger.send(message); + + } catch (RemoteException e) { + mClients.remove(messenger); + } + } + } + + /** + * Set the current state of the chat connection + * @param state An integer defining the current connection state + */ + protected synchronized void setState(int state) { + updateNotification(state == STATE_CONNECTED); + + mState = state; + sendMessage(MESSAGE_STATE_CHANGE, state); + } + + /** + * Stop all threads + */ + protected synchronized void stop() { + if (mConnectThread != null) { + mConnectThread.cancel(); + mConnectThread = null; + } + + if (mConnectedThread != null) { + mConnectedThread.cancel(); + mConnectedThread = null; + } + + if (mAcceptThread != null) { + mAcceptThread.cancel(); + mAcceptThread = null; + } + + setState(STATE_NONE); + + } + + protected synchronized void reset() { + stop(); + + setState(STATE_LISTEN); + + // Start the thread to listen on a BluetoothServerSocket + mAcceptThread = new AcceptThread(); + mAcceptThread.start(); + } + + /** + * Start the ConnectThread to initiate a connection to a remote device. + * @param device The BluetoothDevice to connect + */ + protected synchronized void connect(BluetoothDevice device) { + // Cancel any thread attempting to make a connection + if (mState == STATE_CONNECTING) { + if (mConnectThread != null) { + mConnectThread.cancel(); + mConnectThread = null; + } + } + + // Cancel any thread currently running a connection + if (mConnectedThread != null) { + mConnectedThread.cancel(); + mConnectedThread = null; + } + + // Start the thread to connect with the given device + mConnectThread = new ConnectThread(device); + mConnectThread.start(); + setState(STATE_CONNECTING); + } + + /** + * Start the ConnectedThread to begin managing a Bluetooth connection + * @param socket The BluetoothSocket on which the connection was made + * @param device The BluetoothDevice that has been connected + */ + protected synchronized void connected(BluetoothSocket socket, BluetoothDevice device) { + // Cancel the thread that completed the connection + if (mConnectThread != null) { + mConnectThread.cancel(); + mConnectThread = null; + } + + // Cancel any thread currently running a connection + if (mConnectedThread != null) { + mConnectedThread.cancel(); + mConnectedThread = null; + } + + // Cancel the accept thread because we only want to connect to one device + if (mAcceptThread != null) { + mAcceptThread.cancel(); + mAcceptThread = null; + } + + // Start the thread to manage the connection and perform transmissions + mConnectedThread = new ConnectedThread(socket); + mConnectedThread.start(); + + // Send the name of the connected device back to the UI Activity + sendMessage(MESSAGE_DEVICE_NAME, DEVICE_NAME, device.getName()); + + Log.d(TAG, "conected"); + setState(STATE_CONNECTED); + } + + /** + * Write to the ConnectedThread in an unsynchronized manner + * @param out The bytes to write + * @see ConnectedThread#write(byte[]) + */ + protected void write(byte[] out) { + // Create temporary object + ConnectedThread r; + // Synchronize a copy of the ConnectedThread + synchronized (this) { + if (mState != STATE_CONNECTED) return; + r = mConnectedThread; + } + // Perform the write unsynchronized + r.write(out); + } + + /** + * Indicate that the connection attempt failed and notify the UI Activity. + */ + protected void connectionFailed() { + // Send a failure message back to the Activity + sendMessage(MESSAGE_CONNECTION_FAILED, TOAST, "Unable to connect device"); + + // Start the service over to restart listening mode + reset(); + } + + /** + * Indicate that the connection was lost and notify the UI Activity. + */ + protected void connectionLost() { + // Send a failure message back to the Activity + sendMessage(MESSAGE_CONNECTION_LOST, TOAST, "Device connection was lost"); + + // Start the service over to restart listening mode + reset(); + } + + /** + * This thread runs while listening for incoming connections. It behaves + * like a server-side client. It runs until a connection is accepted + * (or until cancelled). + */ + protected class AcceptThread extends Thread { + // The local server socket + private BluetoothServerSocket mmServerSocket; + + public AcceptThread() { + BluetoothServerSocket tmp = null; + + // Create a new listening server socket + try { + tmp = mAdapter.listenUsingRfcommWithServiceRecord("BigFinBtSocket", MY_UUID); + + } catch (IOException e) { + Log.e(TAG, "Socket listen() failed", e); + } + mmServerSocket = tmp; + } + + public void run() { + setName("AcceptThread"); + + BluetoothSocket socket = null; + + // Listen to the server socket if we're not connected + while (mState != STATE_CONNECTED && mmServerSocket != null) { + try { + // This is a blocking call and will only return on a + // successful connection or an exception + socket = mmServerSocket.accept(); + } catch (IOException e) { + Log.e(TAG, "Socket accept() failed"); + break; + } + + // If a connection was accepted + if (socket != null) { + synchronized (BigFinCommunicationService.this) { + switch (mState) { + case STATE_LISTEN: + case STATE_CONNECTING: + // Situation normal. Start the connected thread. + connected(socket, socket.getRemoteDevice()); + break; + case STATE_NONE: + case STATE_CONNECTED: + // Either not ready or already connected. Terminate new socket. + try { + socket.close(); + } catch (IOException e) { + Log.e(TAG, "Could not close unwanted socket", e); + } + break; + } + } + } + } + } + + public void cancel() { + try { + mmServerSocket.close(); + mmServerSocket = null; + } catch (IOException e) { + Log.e(TAG, "Socket close() of server failed", e); + } + } + } + + + /** + * This thread runs while attempting to make an outgoing connection + * with a device. It runs straight through; the connection either + * succeeds or fails. + */ + protected class ConnectThread extends Thread { + protected final BluetoothSocket mmSocket; + protected final BluetoothDevice mmDevice; + + public ConnectThread(BluetoothDevice device) { + mmDevice = device; + BluetoothSocket tmp = null; + + // Get a BluetoothSocket for a connection with the + // given BluetoothDevice + try { + tmp = device.createRfcommSocketToServiceRecord(MY_UUID); + } catch (IOException e) { + Log.e(TAG, "Socket create() failed", e); + } + mmSocket = tmp; + } + + public void run() { + setName("ConnectThread"); + + // Make a connection to the BluetoothSocket + try { + // This is a blocking call and will only return on a + // successful connection or an exception + mmSocket.connect(); + + } catch (IOException e) { + Log.e(TAG, "Error while connecting", e); + // Close the socket + try { + mmSocket.close(); + } catch (IOException e2) { + Log.e(TAG, "unable to close() socket during connection failure", e2); + } + connectionFailed(); + return; + } + + // Reset the ConnectThread because we're done + synchronized (BigFinCommunicationService.this) { + mConnectThread = null; + } + + // Start the connected thread + connected(mmSocket, mmDevice); + } + + public void cancel() { + try { + mmSocket.close(); + } catch (IOException e) { + Log.e(TAG, "close() of connect socket failed", e); + } + } + } + + /** + * This thread runs during a connection with a remote device. + * It handles all incoming and outgoing transmissions. + */ + protected class ConnectedThread extends Thread { + protected final BluetoothSocket mmSocket; + protected final InputStream mmInStream; + protected final OutputStream mmOutStream; + protected boolean stop; + + public ConnectedThread(BluetoothSocket socket) { + mmSocket = socket; + InputStream tmpIn = null; + OutputStream tmpOut = null; + + // Get the BluetoothSocket input and output streams + try { + tmpIn = socket.getInputStream(); + tmpOut = socket.getOutputStream(); + } catch (IOException e) { + Log.e(TAG, "temp sockets not created", e); + } + + mmInStream = tmpIn; + mmOutStream = tmpOut; + + stop = false; + } + + public void run() { + byte[] buffer = new byte[1024]; + int bytes; + + // Keep listening to the InputStream while connected + while (!stop) { + try { + // Read from the InputStream +// bytes = mmInStream.read(buffer); + +// Log.d(TAG, "received " + new String(buffer, 0, bytes)); + String result = ""; + + // wait until got a @ + + boolean complete = false; + while (!complete) { + while (mmInStream.available() > 0) { + + if (complete || stop) { + break; + } + + int c = mmInStream.read(); + + result += (char) c; + + if ('#' == (char) c) { + + complete = true; + } + } + } + +//// int atSignIndex = result.indexOf('@'); +//// result = result.substring(0, atSignIndex); +// +// int lastComma = result.lastIndexOf(','); +// result = result.substring(0, lastComma); +// +// lastComma = result.lastIndexOf(',') + 1; +// String record = result.substring(0, lastComma); +// +// String crc = result.substring(lastComma); +// +// BigFinFeedReaderRecord readerRecord = new BigFinFeedReaderRecord(record, crc); + + FeedReaderRecordSupport readerRecord = null; + if (!stop) { + + Log.i(TAG, "New raw record: " + result); + readerRecord = recordFactory.newRecord(result); + Log.i(TAG, "New feed record: " + readerRecord); + } + + if (!stop && readerRecord != null && readerRecord instanceof FeedReaderMeasureRecord) { + + // Send the obtained bytes to the UI Activity + sendMessage(MESSAGE_READ, readerRecord); + } + + + } catch (IOException e) { + Log.e(TAG, "disconnected"); + connectionLost(); + } + } + } + + /** + * Write to the connected OutStream. + * @param buffer The bytes to write + */ + public void write(byte[] buffer) { + try { + mmOutStream.write(buffer); + + // Share the sent message back to the UI Activity + sendMessage(MESSAGE_WRITE, buffer); + + } catch (IOException e) { + Log.e(TAG, "Exception during write", e); + } + } + + public void cancel() { + try { + mmSocket.close(); + } catch (IOException e) { + Log.e(TAG, "close() of connect socket failed", e); + } + stop = true; + } + } + + // Handler of incoming messages from clients. + protected class IncomingHandler extends Handler { + @Override + public void handleMessage(Message msg) { + switch (msg.what) { + case MESSAGE_REGISTER_CLIENT: + mClients.add(msg.replyTo); + break; + + case MESSAGE_UNREGISTER_CLIENT: + mClients.remove(msg.replyTo); + break; + + case MESSAGE_CONNECT_DEVICE: + reset(); + + String deviceAddress = msg.getData().getString(DEVICE_ADDRESS); + // Get the BluetoothDevice object + BluetoothDevice device = mAdapter.getRemoteDevice(deviceAddress); + connect(device); + break; + + case MESSAGE_SEND_DATA: + String dataToSend = msg.getData().getString(DATA_TO_SEND); + write(dataToSend.getBytes()); + break; + + case MESSAGE_DISCONNECT_DEVICE: + stop(); + break; + + case MESSAGE_CONNECTION_STATE: + BigFinCommunicationService.this.sendMessage(MESSAGE_CONNECTION_STATE, mState); + + default: + super.handleMessage(msg); + } + } + } +} Modified: trunk/src/main/java/fr/ifremer/wlo/CommercialSpeciesActivity.java =================================================================== --- trunk/src/fr/ifremer/wlo/CommercialSpeciesActivity.java 2014-04-03 08:57:26 UTC (rev 103) +++ trunk/src/main/java/fr/ifremer/wlo/CommercialSpeciesActivity.java 2014-12-23 09:53:10 UTC (rev 112) @@ -6,7 +6,7 @@ * $Id$ * $HeadURL$ * %% - * Copyright (C) 2013 - 2014 Ifremer + * Copyright (C) 2013 - 2014 Ifremer, Code Lutin * %% * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as @@ -28,7 +28,6 @@ import android.support.v4.widget.SimpleCursorAdapter; import com.google.common.collect.Maps; import fr.ifremer.wlo.models.CommercialSpeciesModel; -import fr.ifremer.wlo.models.referentials.CommercialSpecies; import fr.ifremer.wlo.utils.WloItemListViewBinder; import java.util.Map; @@ -99,4 +98,4 @@ types.put(7, WloItemListViewBinder.DataType.PRESENTATION); return new WloItemListViewBinder(this, types); } -} \ No newline at end of file +} Modified: trunk/src/main/java/fr/ifremer/wlo/CommercialSpeciesFormActivity.java =================================================================== --- trunk/src/fr/ifremer/wlo/CommercialSpeciesFormActivity.java 2014-04-03 08:57:26 UTC (rev 103) +++ trunk/src/main/java/fr/ifremer/wlo/CommercialSpeciesFormActivity.java 2014-12-23 09:53:10 UTC (rev 112) @@ -6,7 +6,7 @@ * $Id$ * $HeadURL$ * %% - * Copyright (C) 2013 - 2014 Ifremer + * Copyright (C) 2013 - 2014 Ifremer, Code Lutin * %% * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as Modified: trunk/src/main/java/fr/ifremer/wlo/ContextFormActivity.java =================================================================== --- trunk/src/fr/ifremer/wlo/ContextFormActivity.java 2014-04-03 08:57:26 UTC (rev 103) +++ trunk/src/main/java/fr/ifremer/wlo/ContextFormActivity.java 2014-12-23 09:53:10 UTC (rev 112) @@ -6,7 +6,7 @@ * $Id$ * $HeadURL$ * %% - * Copyright (C) 2013 - 2014 Ifremer + * Copyright (C) 2013 - 2014 Ifremer, Code Lutin * %% * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as Modified: trunk/src/main/java/fr/ifremer/wlo/ContextsActivity.java =================================================================== --- trunk/src/fr/ifremer/wlo/ContextsActivity.java 2014-04-03 08:57:26 UTC (rev 103) +++ trunk/src/main/java/fr/ifremer/wlo/ContextsActivity.java 2014-12-23 09:53:10 UTC (rev 112) @@ -6,7 +6,7 @@ * $Id$ * $HeadURL$ * %% - * Copyright (C) 2013 - 2014 Ifremer + * Copyright (C) 2013 - 2014 Ifremer, Code Lutin * %% * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as Modified: trunk/src/main/java/fr/ifremer/wlo/DeviceListActivity.java =================================================================== --- trunk/src/fr/ifremer/wlo/DeviceListActivity.java 2014-04-03 08:57:26 UTC (rev 103) +++ trunk/src/main/java/fr/ifremer/wlo/DeviceListActivity.java 2014-12-23 09:53:10 UTC (rev 112) @@ -22,7 +22,7 @@ * $Id$ * $HeadURL$ * %% - * Copyright (C) 2013 - 2014 Ifremer + * Copyright (C) 2013 - 2014 Ifremer, Code Lutin * %% * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as @@ -62,7 +62,6 @@ import android.widget.ListView; import android.widget.TextView; import android.widget.Toast; -import fr.ifremer.wlo.utils.BigFinFeedReaderRecord; import java.util.Set; @@ -234,7 +233,6 @@ break; case BigFinCommunicationService.MESSAGE_READ: - BigFinFeedReaderRecord record = (BigFinFeedReaderRecord) msg.obj; // construct a string from the valid bytes in the buffer break; Modified: trunk/src/main/java/fr/ifremer/wlo/LocationFormActivity.java =================================================================== --- trunk/src/fr/ifremer/wlo/LocationFormActivity.java 2014-04-03 08:57:26 UTC (rev 103) +++ trunk/src/main/java/fr/ifremer/wlo/LocationFormActivity.java 2014-12-23 09:53:10 UTC (rev 112) @@ -6,7 +6,7 @@ * $Id$ * $HeadURL$ * %% - * Copyright (C) 2013 - 2014 Ifremer + * Copyright (C) 2013 - 2014 Ifremer, Code Lutin * %% * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as Modified: trunk/src/main/java/fr/ifremer/wlo/LocationsActivity.java =================================================================== --- trunk/src/fr/ifremer/wlo/LocationsActivity.java 2014-04-03 08:57:26 UTC (rev 103) +++ trunk/src/main/java/fr/ifremer/wlo/LocationsActivity.java 2014-12-23 09:53:10 UTC (rev 112) @@ -6,7 +6,7 @@ * $Id$ * $HeadURL$ * %% - * Copyright (C) 2013 - 2014 Ifremer + * Copyright (C) 2013 - 2014 Ifremer, Code Lutin * %% * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as @@ -88,4 +88,4 @@ types.put(4, WloItemListViewBinder.DataType.LOCATION); return new WloItemListViewBinder(this, types); } -} \ No newline at end of file +} Modified: trunk/src/main/java/fr/ifremer/wlo/MainActivity.java =================================================================== --- trunk/src/fr/ifremer/wlo/MainActivity.java 2014-04-03 08:57:26 UTC (rev 103) +++ trunk/src/main/java/fr/ifremer/wlo/MainActivity.java 2014-12-23 09:53:10 UTC (rev 112) @@ -6,7 +6,7 @@ * $Id$ * $HeadURL$ * %% - * Copyright (C) 2013 - 2014 Ifremer + * Copyright (C) 2013 - 2014 Ifremer, Code Lutin * %% * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as @@ -553,4 +553,4 @@ } -} \ No newline at end of file +} Modified: trunk/src/main/java/fr/ifremer/wlo/MetierFormActivity.java =================================================================== --- trunk/src/fr/ifremer/wlo/MetierFormActivity.java 2014-04-03 08:57:26 UTC (rev 103) +++ trunk/src/main/java/fr/ifremer/wlo/MetierFormActivity.java 2014-12-23 09:53:10 UTC (rev 112) @@ -6,7 +6,7 @@ * $Id$ * $HeadURL$ * %% - * Copyright (C) 2013 - 2014 Ifremer + * Copyright (C) 2013 - 2014 Ifremer, Code Lutin * %% * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as Modified: trunk/src/main/java/fr/ifremer/wlo/MetiersActivity.java =================================================================== --- trunk/src/fr/ifremer/wlo/MetiersActivity.java 2014-04-03 08:57:26 UTC (rev 103) +++ trunk/src/main/java/fr/ifremer/wlo/MetiersActivity.java 2014-12-23 09:53:10 UTC (rev 112) @@ -6,7 +6,7 @@ * $Id$ * $HeadURL$ * %% - * Copyright (C) 2013 - 2014 Ifremer + * Copyright (C) 2013 - 2014 Ifremer, Code Lutin * %% * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as @@ -86,4 +86,4 @@ types.put(1, WloItemListViewBinder.DataType.METIER); return new WloItemListViewBinder(this, types); } -} \ No newline at end of file +} Modified: trunk/src/main/java/fr/ifremer/wlo/ScientificSpeciesActivity.java =================================================================== --- trunk/src/fr/ifremer/wlo/ScientificSpeciesActivity.java 2014-04-03 08:57:26 UTC (rev 103) +++ trunk/src/main/java/fr/ifremer/wlo/ScientificSpeciesActivity.java 2014-12-23 09:53:10 UTC (rev 112) @@ -6,7 +6,7 @@ * $Id$ * $HeadURL$ * %% - * Copyright (C) 2013 - 2014 Ifremer + * Copyright (C) 2013 - 2014 Ifremer, Code Lutin * %% * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as @@ -138,4 +138,4 @@ super.onActivityResult(requestCode, resultCode, data); } } -} \ No newline at end of file +} Modified: trunk/src/main/java/fr/ifremer/wlo/ScientificSpeciesFormActivity.java =================================================================== --- trunk/src/fr/ifremer/wlo/ScientificSpeciesFormActivity.java 2014-04-03 08:57:26 UTC (rev 103) +++ trunk/src/main/java/fr/ifremer/wlo/ScientificSpeciesFormActivity.java 2014-12-23 09:53:10 UTC (rev 112) @@ -6,7 +6,7 @@ * $Id$ * $HeadURL$ * %% - * Copyright (C) 2013 - 2014 Ifremer + * Copyright (C) 2013 - 2014 Ifremer, Code Lutin * %% * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as Modified: trunk/src/main/java/fr/ifremer/wlo/VesselFormActivity.java =================================================================== --- trunk/src/fr/ifremer/wlo/VesselFormActivity.java 2014-04-03 08:57:26 UTC (rev 103) +++ trunk/src/main/java/fr/ifremer/wlo/VesselFormActivity.java 2014-12-23 09:53:10 UTC (rev 112) @@ -6,7 +6,7 @@ * $Id$ * $HeadURL$ * %% - * Copyright (C) 2013 - 2014 Ifremer + * Copyright (C) 2013 - 2014 Ifremer, Code Lutin * %% * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as @@ -26,29 +26,20 @@ import android.os.Bundle; import android.support.v4.app.DialogFragment; -import android.util.Log; import android.view.View; import android.widget.EditText; import android.widget.TextView; -import com.google.common.collect.Collections2; import com.google.common.collect.Lists; -import com.google.common.collect.Maps; -import fr.ifremer.wlo.models.LocationModel; import fr.ifremer.wlo.models.VesselModel; -import fr.ifremer.wlo.models.referentials.HasCode; import fr.ifremer.wlo.models.referentials.Location; import fr.ifremer.wlo.models.referentials.Vessel; import fr.ifremer.wlo.storage.DataCache; import fr.ifremer.wlo.utils.DatePickerFragment; import fr.ifremer.wlo.utils.UIUtils; -import org.apache.commons.lang3.StringUtils; -import java.beans.PropertyChangeEvent; -import java.beans.PropertyChangeListener; import java.util.Calendar; import java.util.Collection; import java.util.List; -import java.util.Map; /** * @author kmorin <kmorin@codelutin.com> Modified: trunk/src/main/java/fr/ifremer/wlo/VesselsActivity.java =================================================================== --- trunk/src/fr/ifremer/wlo/VesselsActivity.java 2014-04-03 08:57:26 UTC (rev 103) +++ trunk/src/main/java/fr/ifremer/wlo/VesselsActivity.java 2014-12-23 09:53:10 UTC (rev 112) @@ -6,7 +6,7 @@ * $Id$ * $HeadURL$ * %% - * Copyright (C) 2013 - 2014 Ifremer + * Copyright (C) 2013 - 2014 Ifremer, Code Lutin * %% * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as @@ -75,4 +75,4 @@ protected Class<? extends WloBaseActivity> getUpActivity() { return LocationsActivity.class; } -} \ No newline at end of file +} Modified: trunk/src/main/java/fr/ifremer/wlo/WeightsActivity.java =================================================================== --- trunk/src/fr/ifremer/wlo/WeightsActivity.java 2014-04-03 08:57:26 UTC (rev 103) +++ trunk/src/main/java/fr/ifremer/wlo/WeightsActivity.java 2014-12-23 09:53:10 UTC (rev 112) @@ -6,7 +6,7 @@ * $Id$ * $HeadURL$ * %% - * Copyright (C) 2013 - 2014 Ifremer + * Copyright (C) 2013 - 2014 Ifremer, Code Lutin * %% * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as @@ -32,7 +32,6 @@ import android.preference.PreferenceManager; import android.text.InputType; import android.text.TextWatcher; -import android.util.Log; import android.view.View; import android.widget.EditText; import android.widget.LinearLayout; @@ -46,8 +45,6 @@ import fr.ifremer.wlo.models.categorization.CategoryModel; import fr.ifremer.wlo.models.categorization.QualitativeValueModel; import fr.ifremer.wlo.preferences.ListItemPreference; -import fr.ifremer.wlo.preferences.StringPreference; -import fr.ifremer.wlo.storage.DataCache; import fr.ifremer.wlo.storage.WloSqlOpenHelper; import fr.ifremer.wlo.utils.BaseTextWatcher; import org.apache.commons.lang3.StringUtils; Modified: trunk/src/main/java/fr/ifremer/wlo/WloApplication.java =================================================================== --- trunk/src/fr/ifremer/wlo/WloApplication.java 2014-04-03 08:57:26 UTC (rev 103) +++ trunk/src/main/java/fr/ifremer/wlo/WloApplication.java 2014-12-23 09:53:10 UTC (rev 112) @@ -6,7 +6,7 @@ * $Id$ * $HeadURL$ * %% - * Copyright (C) 2013 - 2014 Ifremer + * Copyright (C) 2013 - 2014 Ifremer, Code Lutin * %% * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as Modified: trunk/src/main/java/fr/ifremer/wlo/WloBaseActivity.java =================================================================== --- trunk/src/fr/ifremer/wlo/WloBaseActivity.java 2014-04-03 08:57:26 UTC (rev 103) +++ trunk/src/main/java/fr/ifremer/wlo/WloBaseActivity.java 2014-12-23 09:53:10 UTC (rev 112) @@ -6,7 +6,7 @@ * $Id$ * $HeadURL$ * %% - * Copyright (C) 2013 - 2014 Ifremer + * Copyright (C) 2013 - 2014 Ifremer, Code Lutin * %% * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as Modified: trunk/src/main/java/fr/ifremer/wlo/WloBaseListActivity.java =================================================================== --- trunk/src/fr/ifremer/wlo/WloBaseListActivity.java 2014-04-03 08:57:26 UTC (rev 103) +++ trunk/src/main/java/fr/ifremer/wlo/WloBaseListActivity.java 2014-12-23 09:53:10 UTC (rev 112) @@ -21,7 +21,7 @@ * $Id$ * $HeadURL$ * %% - * Copyright (C) 2013 - 2014 Ifremer + * Copyright (C) 2013 - 2014 Ifremer, Code Lutin * %% * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as Modified: trunk/src/main/java/fr/ifremer/wlo/WloModelEditionActivity.java =================================================================== --- trunk/src/fr/ifremer/wlo/WloModelEditionActivity.java 2014-04-03 08:57:26 UTC (rev 103) +++ trunk/src/main/java/fr/ifremer/wlo/WloModelEditionActivity.java 2014-12-23 09:53:10 UTC (rev 112) @@ -6,7 +6,7 @@ * $Id$ * $HeadURL$ * %% - * Copyright (C) 2013 - 2014 Ifremer + * Copyright (C) 2013 - 2014 Ifremer, Code Lutin * %% * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as Modified: trunk/src/main/java/fr/ifremer/wlo/imports/CalcifiedPartTakingRowModel.java =================================================================== --- trunk/src/fr/ifremer/wlo/imports/CalcifiedPartTakingRowModel.java 2014-04-03 08:57:26 UTC (rev 103) +++ trunk/src/main/java/fr/ifremer/wlo/imports/CalcifiedPartTakingRowModel.java 2014-12-23 09:53:10 UTC (rev 112) @@ -6,7 +6,7 @@ * $Id$ * $HeadURL$ * %% - * Copyright (C) 2013 - 2014 Ifremer + * Copyright (C) 2013 - 2014 Ifremer, Code Lutin * %% * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as Modified: trunk/src/main/java/fr/ifremer/wlo/imports/CommercialSpeciesRowModel.java =================================================================== --- trunk/src/fr/ifremer/wlo/imports/CommercialSpeciesRowModel.java 2014-04-03 08:57:26 UTC (rev 103) +++ trunk/src/main/java/fr/ifremer/wlo/imports/CommercialSpeciesRowModel.java 2014-12-23 09:53:10 UTC (rev 112) @@ -6,7 +6,7 @@ * $Id$ * $HeadURL$ * %% - * Copyright (C) 2013 - 2014 Ifremer + * Copyright (C) 2013 - 2014 Ifremer, Code Lutin * %% * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as @@ -26,8 +26,6 @@ import fr.ifremer.wlo.models.referentials.CommercialSpecies; import org.nuiton.csv.ValueGetterSetter; -import org.nuiton.csv.ValueSetter; -import org.nuiton.csv.ext.AbstractImportExportModel; /** * @author kmorin <kmorin@codelutin.com> Modified: trunk/src/main/java/fr/ifremer/wlo/imports/LocationRowModel.java =================================================================== --- trunk/src/fr/ifremer/wlo/imports/LocationRowModel.java 2014-04-03 08:57:26 UTC (rev 103) +++ trunk/src/main/java/fr/ifremer/wlo/imports/LocationRowModel.java 2014-12-23 09:53:10 UTC (rev 112) @@ -6,7 +6,7 @@ * $Id$ * $HeadURL$ * %% - * Copyright (C) 2013 - 2014 Ifremer + * Copyright (C) 2013 - 2014 Ifremer, Code Lutin * %% * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as @@ -26,8 +26,6 @@ import fr.ifremer.wlo.models.referentials.Location; import org.nuiton.csv.ValueGetterSetter; -import org.nuiton.csv.ValueSetter; -import org.nuiton.csv.ext.AbstractImportExportModel; /** * @author kmorin <kmorin@codelutin.com> Modified: trunk/src/main/java/fr/ifremer/wlo/imports/MensurationRowModel.java =================================================================== --- trunk/src/fr/ifremer/wlo/imports/MensurationRowModel.java 2014-04-03 08:57:26 UTC (rev 103) +++ trunk/src/main/java/fr/ifremer/wlo/imports/MensurationRowModel.java 2014-12-23 09:53:10 UTC (rev 112) @@ -6,7 +6,7 @@ * $Id$ * $HeadURL$ * %% - * Copyright (C) 2013 - 2014 Ifremer + * Copyright (C) 2013 - 2014 Ifremer, Code Lutin * %% * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as @@ -26,8 +26,6 @@ import fr.ifremer.wlo.models.referentials.Mensuration; import org.nuiton.csv.ValueGetterSetter; -import org.nuiton.csv.ValueSetter; -import org.nuiton.csv.ext.AbstractImportExportModel; /** * @author kmorin <kmorin@codelutin.com> Modified: trunk/src/main/java/fr/ifremer/wlo/imports/MetierRowModel.java =================================================================== --- trunk/src/fr/ifremer/wlo/imports/MetierRowModel.java 2014-04-03 08:57:26 UTC (rev 103) +++ trunk/src/main/java/fr/ifremer/wlo/imports/MetierRowModel.java 2014-12-23 09:53:10 UTC (rev 112) @@ -6,7 +6,7 @@ * $Id$ * $HeadURL$ * %% - * Copyright (C) 2013 - 2014 Ifremer + * Copyright (C) 2013 - 2014 Ifremer, Code Lutin * %% * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as @@ -26,8 +26,6 @@ import fr.ifremer.wlo.models.referentials.Metier; import org.nuiton.csv.ValueGetterSetter; -import org.nuiton.csv.ValueSetter; -import org.nuiton.csv.ext.AbstractImportExportModel; /** * @author kmorin <kmorin@codelutin.com> Modified: trunk/src/main/java/fr/ifremer/wlo/imports/PresentationRowModel.java =================================================================== --- trunk/src/fr/ifremer/wlo/imports/PresentationRowModel.java 2014-04-03 08:57:26 UTC (rev 103) +++ trunk/src/main/java/fr/ifremer/wlo/imports/PresentationRowModel.java 2014-12-23 09:53:10 UTC (rev 112) @@ -6,7 +6,7 @@ * $Id$ * $HeadURL$ * %% - * Copyright (C) 2013 - 2014 Ifremer + * Copyright (C) 2013 - 2014 Ifremer, Code Lutin * %% * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as @@ -26,8 +26,6 @@ import fr.ifremer.wlo.models.referentials.Presentation; import org.nuiton.csv.ValueGetterSetter; -import org.nuiton.csv.ValueSetter; -import org.nuiton.csv.ext.AbstractImportExportModel; /** * @author kmorin <kmorin@codelutin.com> Modified: trunk/src/main/java/fr/ifremer/wlo/imports/QualitativeValueRowModel.java =================================================================== --- trunk/src/fr/ifremer/wlo/imports/QualitativeValueRowModel.java 2014-04-03 08:57:26 UTC (rev 103) +++ trunk/src/main/java/fr/ifremer/wlo/imports/QualitativeValueRowModel.java 2014-12-23 09:53:10 UTC (rev 112) @@ -6,7 +6,7 @@ * $Id$ * $HeadURL$ * %% - * Copyright (C) 2013 - 2014 Ifremer + * Copyright (C) 2013 - 2014 Ifremer, Code Lutin * %% * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as Modified: trunk/src/main/java/fr/ifremer/wlo/imports/ScientificSpeciesRowModel.java =================================================================== --- trunk/src/fr/ifremer/wlo/imports/ScientificSpeciesRowModel.java 2014-04-03 08:57:26 UTC (rev 103) +++ trunk/src/main/java/fr/ifremer/wlo/imports/ScientificSpeciesRowModel.java 2014-12-23 09:53:10 UTC (rev 112) @@ -6,7 +6,7 @@ * $Id$ * $HeadURL$ * %% - * Copyright (C) 2013 - 2014 Ifremer + * Copyright (C) 2013 - 2014 Ifremer, Code Lutin * %% * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as @@ -26,8 +26,6 @@ import fr.ifremer.wlo.models.referentials.ScientificSpecies; import org.nuiton.csv.ValueGetterSetter; -import org.nuiton.csv.ValueSetter; -import org.nuiton.csv.ext.AbstractImportExportModel; /** * @author kmorin <kmorin@codelutin.com> Modified: trunk/src/main/java/fr/ifremer/wlo/imports/StateRowModel.java =================================================================== --- trunk/src/fr/ifremer/wlo/imports/StateRowModel.java 2014-04-03 08:57:26 UTC (rev 103) +++ trunk/src/main/java/fr/ifremer/wlo/imports/StateRowModel.java 2014-12-23 09:53:10 UTC (rev 112) @@ -6,7 +6,7 @@ * $Id$ * $HeadURL$ * %% - * Copyright (C) 2013 - 2014 Ifremer + * Copyright (C) 2013 - 2014 Ifremer, Code Lutin * %% * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as @@ -26,8 +26,6 @@ import fr.ifremer.wlo.models.referentials.State; import org.nuiton.csv.ValueGetterSetter; -import org.nuiton.csv.ValueSetter; -import org.nuiton.csv.ext.AbstractImportExportModel; /** * @author kmorin <kmorin@codelutin.com> Modified: trunk/src/main/java/fr/ifremer/wlo/imports/VesselRowModel.java =================================================================== --- trunk/src/fr/ifremer/wlo/imports/VesselRowModel.java 2014-04-03 08:57:26 UTC (rev 103) +++ trunk/src/main/java/fr/ifremer/wlo/imports/VesselRowModel.java 2014-12-23 09:53:10 UTC (rev 112) @@ -6,7 +6,7 @@ * $Id$ * $HeadURL$ * %% - * Copyright (C) 2013 - 2014 Ifremer + * Copyright (C) 2013 - 2014 Ifremer, Code Lutin * %% * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as @@ -26,8 +26,6 @@ import fr.ifremer.wlo.models.referentials.Vessel; import org.nuiton.csv.ValueGetterSetter; -import org.nuiton.csv.ValueSetter; -import org.nuiton.csv.ext.AbstractImportExportModel; /** * @author kmorin <kmorin@codelutin.com> Modified: trunk/src/main/java/fr/ifremer/wlo/imports/WloAbstractImportExportModel.java =================================================================== --- trunk/src/fr/ifremer/wlo/imports/WloAbstractImportExportModel.java 2014-04-03 08:57:26 UTC (rev 103) +++ trunk/src/main/java/fr/ifremer/wlo/imports/WloAbstractImportExportModel.java 2014-12-23 09:53:10 UTC (rev 112) @@ -6,7 +6,7 @@ * $Id$ * $HeadURL$ * %% - * Copyright (C) 2013 - 2014 Ifremer + * Copyright (C) 2013 - 2014 Ifremer, Code Lutin * %% * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as @@ -26,7 +26,6 @@ import fr.ifremer.wlo.models.BaseModel; import org.nuiton.csv.ValueGetter; -import org.nuiton.csv.ValueGetterSetter; import org.nuiton.csv.ValueSetter; import org.nuiton.csv.ext.AbstractImportExportModel; Modified: trunk/src/main/java/fr/ifremer/wlo/measurement/GraphActivity.java =================================================================== --- trunk/src/fr/ifremer/wlo/measurement/GraphActivity.java 2014-04-03 08:57:26 UTC (rev 103) +++ trunk/src/main/java/fr/ifremer/wlo/measurement/GraphActivity.java 2014-12-23 09:53:10 UTC (rev 112) @@ -3,10 +3,10 @@ /* * #%L * WLO - * $Id:$ - * $HeadURL:$ + * $Id$ + * $HeadURL$ * %% - * Copyright (C) 2013 - 2014 Ifremer + * Copyright (C) 2013 - 2014 Ifremer, Code Lutin * %% * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as Modified: trunk/src/main/java/fr/ifremer/wlo/measurement/GraphFragment.java =================================================================== --- trunk/src/fr/ifremer/wlo/measurement/GraphFragment.java 2014-04-03 08:57:26 UTC (rev 103) +++ trunk/src/main/java/fr/ifremer/wlo/measurement/GraphFragment.java 2014-12-23 09:53:10 UTC (rev 112) @@ -3,10 +3,10 @@ /* * #%L * WLO - * $Id:$ - * $HeadURL:$ + * $Id$ + * $HeadURL$ * %% - * Copyright (C) 2013 - 2014 Ifremer + * Copyright (C) 2013 - 2014 Ifremer, Code Lutin * %% * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as @@ -26,7 +26,6 @@ import android.content.Intent; import android.os.Bundle; -import android.util.Log; import android.view.LayoutInflater; import android.view.View; import android.view.ViewGroup; @@ -168,4 +167,4 @@ mRenderer.setXAxisMax(Math.max(mRenderer.getXAxisMax(), size + 1)); mRenderer.setYAxisMax(Math.max(mRenderer.getYAxisMax(), nb + 1)); } -} \ No newline at end of file +} Modified: trunk/src/main/java/fr/ifremer/wlo/measurement/LogsFragment.java =================================================================== --- trunk/src/fr/ifremer/wlo/measurement/LogsFragment.java 2014-04-03 08:57:26 UTC (rev 103) +++ trunk/src/main/java/fr/ifremer/wlo/measurement/LogsFragment.java 2014-12-23 09:53:10 UTC (rev 112) @@ -6,7 +6,7 @@ * $Id$ * $HeadURL$ * %% - * Copyright (C) 2013 - 2014 Ifremer + * Copyright (C) 2013 - 2014 Ifremer, Code Lutin * %% * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as @@ -40,7 +40,6 @@ import fr.ifremer.wlo.R; import fr.ifremer.wlo.models.MeasurementModel; import fr.ifremer.wlo.models.MeasurementsModel; -import fr.ifremer.wlo.storage.DataCache; import fr.ifremer.wlo.utils.BaseModelArrayAdapter; import fr.ifremer.wlo.utils.UIUtils; import org.apache.commons.lang3.ObjectUtils; Modified: trunk/src/main/java/fr/ifremer/wlo/measurement/MeasurementActivity.java =================================================================== --- trunk/src/fr/ifremer/wlo/measurement/MeasurementActivity.java 2014-04-03 08:57:26 UTC (rev 103) +++ trunk/src/main/java/fr/ifremer/wlo/measurement/MeasurementActivity.java 2014-12-23 09:53:10 UTC (rev 112) @@ -6,7 +6,7 @@ * $Id$ * $HeadURL$ * %% - * Copyright (C) 2013 - 2014 Ifremer + * Copyright (C) 2013 - 2014 Ifremer, Code Lutin * %% * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as @@ -56,6 +56,7 @@ import android.widget.TextView; import com.google.common.base.Function; import com.google.common.collect.Lists; +import fr.ifremer.tutti.ichtyometer.feed.record.FeedReaderMeasureRecord; import fr.ifremer.wlo.BigFinCommunicationService; import fr.ifremer.wlo.CommercialSpeciesActivity; import fr.ifremer.wlo.CommercialSpeciesFormActivity; @@ -85,7 +86,6 @@ import fr.ifremer.wlo.models.referentials.Mensuration; import fr.ifremer.wlo.storage.WloSqlOpenHelper; import fr.ifremer.wlo.utils.BaseTextWatcher; -import fr.ifremer.wlo.utils.BigFinFeedReaderRecord; import fr.ifremer.wlo.utils.UIUtils; import org.apache.commons.collections.CollectionUtils; @@ -226,11 +226,11 @@ if (!MeasurementActivity.this.isFinishing()) { switch (msg.what) { case BigFinCommunicationService.MESSAGE_READ: - BigFinFeedReaderRecord record = (BigFinFeedReaderRecord) msg.obj; + FeedReaderMeasureRecord record = (FeedReaderMeasureRecord) msg.obj; - if (record != null && record.getLength() != null) { + if (record != null && record.isValid()) { - int size = (int) Math.floor(record.getLength()); + int size = record.getMeasure(); measurement.setSize(size); MeasurementModel savedMeasurement = addMeasurement(); Modified: trunk/src/main/java/fr/ifremer/wlo/measurement/MeasurementsDisplayerFragment.java =================================================================== --- trunk/src/fr/ifremer/wlo/measurement/MeasurementsDisplayerFragment.java 2014-04-03 08:57:26 UTC (rev 103) +++ trunk/src/main/java/fr/ifremer/wlo/measurement/MeasurementsDisplayerFragment.java 2014-12-23 09:53:10 UTC (rev 112) @@ -3,10 +3,10 @@ /* * #%L * WLO - * $Id:$ - * $HeadURL:$ + * $Id$ + * $HeadURL$ * %% - * Copyright (C) 2013 - 2014 Ifremer + * Copyright (C) 2013 - 2014 Ifremer, Code Lutin * %% * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as Modified: trunk/src/main/java/fr/ifremer/wlo/measurement/TableAdapter.java =================================================================== --- trunk/src/fr/ifremer/wlo/measurement/TableAdapter.java 2014-04-03 08:57:26 UTC (rev 103) +++ trunk/src/main/java/fr/ifremer/wlo/measurement/TableAdapter.java 2014-12-23 09:53:10 UTC (rev 112) @@ -6,7 +6,7 @@ * $Id$ * $HeadURL$ * %% - * Copyright (C) 2013 - 2014 Ifremer + * Copyright (C) 2013 - 2014 Ifremer, Code Lutin * %% * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as @@ -28,8 +28,6 @@ import android.view.LayoutInflater; import android.view.View; import android.view.ViewGroup; -import android.view.ViewParent; -import android.widget.AbsListView; import android.widget.BaseAdapter; import android.widget.TextView; import fr.ifremer.wlo.R; Modified: trunk/src/main/java/fr/ifremer/wlo/measurement/TableFragment.java =================================================================== --- trunk/src/fr/ifremer/wlo/measurement/TableFragment.java 2014-04-03 08:57:26 UTC (rev 103) +++ trunk/src/main/java/fr/ifremer/wlo/measurement/TableFragment.java 2014-12-23 09:53:10 UTC (rev 112) @@ -3,10 +3,10 @@ /* * #%L * WLO - * $Id:$ - * $HeadURL:$ + * $Id$ + * $HeadURL$ * %% - * Copyright (C) 2013 - 2014 Ifremer + * Copyright (C) 2013 - 2014 Ifremer, Code Lutin * %% * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as @@ -78,4 +78,4 @@ int size = measurement.getSize(); adapter.set(size, source.getMeasurementNb(size)); } -} \ No newline at end of file +} Modified: trunk/src/main/java/fr/ifremer/wlo/models/BaseModel.java =================================================================== --- trunk/src/fr/ifremer/wlo/models/BaseModel.java 2014-04-03 08:57:26 UTC (rev 103) +++ trunk/src/main/java/fr/ifremer/wlo/models/BaseModel.java 2014-12-23 09:53:10 UTC (rev 112) @@ -6,7 +6,7 @@ * $Id$ * $HeadURL$ * %% - * Copyright (C) 2013 - 2014 Ifremer + * Copyright (C) 2013 - 2014 Ifremer, Code Lutin * %% * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as Modified: trunk/src/main/java/fr/ifremer/wlo/models/CategoryWeightModel.java =================================================================== --- trunk/src/fr/ifremer/wlo/models/CategoryWeightModel.java 2014-04-03 08:57:26 UTC (rev 103) +++ trunk/src/main/java/fr/ifremer/wlo/models/CategoryWeightModel.java 2014-12-23 09:53:10 UTC (rev 112) @@ -6,7 +6,7 @@ * $Id$ * $HeadURL$ * %% - * Copyright (C) 2013 - 2014 Ifremer + * Copyright (C) 2013 - 2014 Ifremer, Code Lutin * %% * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as @@ -25,9 +25,7 @@ */ import android.content.ContentValues; -import android.content.Context; import android.database.Cursor; -import fr.ifremer.wlo.utils.UIUtils; /** * @author Kevin Morin (Code Lutin) Modified: trunk/src/main/java/fr/ifremer/wlo/models/CommercialSpeciesModel.java =================================================================== --- trunk/src/fr/ifremer/wlo/models/CommercialSpeciesModel.java 2014-04-03 08:57:26 UTC (rev 103) +++ trunk/src/main/java/fr/ifremer/wlo/models/CommercialSpeciesModel.java 2014-12-23 09:53:10 UTC (rev 112) @@ -6,7 +6,7 @@ * $Id$ * $HeadURL$ * %% - * Copyright (C) 2013 - 2014 Ifremer + * Copyright (C) 2013 - 2014 Ifremer, Code Lutin * %% * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as Modified: trunk/src/main/java/fr/ifremer/wlo/models/ContextModel.java =================================================================== --- trunk/src/fr/ifremer/wlo/models/ContextModel.java 2014-04-03 08:57:26 UTC (rev 103) +++ trunk/src/main/java/fr/ifremer/wlo/models/ContextModel.java 2014-12-23 09:53:10 UTC (rev 112) @@ -6,7 +6,7 @@ * $Id$ * $HeadURL$ * %% - * Copyright (C) 2013 - 2014 Ifremer + * Copyright (C) 2013 - 2014 Ifremer, Code Lutin * %% * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as @@ -26,8 +26,6 @@ import android.content.ContentValues; import android.database.Cursor; -import android.util.Log; -import com.google.common.collect.Multimap; import java.util.Set; Modified: trunk/src/main/java/fr/ifremer/wlo/models/HierarchicalModel.java =================================================================== --- trunk/src/fr/ifremer/wlo/models/HierarchicalModel.java 2014-04-03 08:57:26 UTC (rev 103) +++ trunk/src/main/java/fr/ifremer/wlo/models/HierarchicalModel.java 2014-12-23 09:53:10 UTC (rev 112) @@ -6,7 +6,7 @@ * $Id$ * $HeadURL$ * %% - * Copyright (C) 2013 - 2014 Ifremer + * Copyright (C) 2013 - 2014 Ifremer, Code Lutin * %% * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as Modified: trunk/src/main/java/fr/ifremer/wlo/models/LocationModel.java =================================================================== --- trunk/src/fr/ifremer/wlo/models/LocationModel.java 2014-04-03 08:57:26 UTC (rev 103) +++ trunk/src/main/java/fr/ifremer/wlo/models/LocationModel.java 2014-12-23 09:53:10 UTC (rev 112) @@ -6,7 +6,7 @@ * $Id$ * $HeadURL$ * %% - * Copyright (C) 2013 - 2014 Ifremer + * Copyright (C) 2013 - 2014 Ifremer, Code Lutin * %% * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as Modified: trunk/src/main/java/fr/ifremer/wlo/models/MeasurementModel.java =================================================================== --- trunk/src/fr/ifremer/wlo/models/MeasurementModel.java 2014-04-03 08:57:26 UTC (rev 103) +++ trunk/src/main/java/fr/ifremer/wlo/models/MeasurementModel.java 2014-12-23 09:53:10 UTC (rev 112) @@ -6,7 +6,7 @@ * $Id$ * $HeadURL$ * %% - * Copyright (C) 2013 - 2014 Ifremer + * Copyright (C) 2013 - 2014 Ifremer, Code Lutin * %% * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as Modified: trunk/src/main/java/fr/ifremer/wlo/models/MeasurementsModel.java =================================================================== --- trunk/src/fr/ifremer/wlo/models/MeasurementsModel.java 2014-04-03 08:57:26 UTC (rev 103) +++ trunk/src/main/java/fr/ifremer/wlo/models/MeasurementsModel.java 2014-12-23 09:53:10 UTC (rev 112) @@ -6,7 +6,7 @@ * $Id$ * $HeadURL$ * %% - * Copyright (C) 2013 - 2014 Ifremer + * Copyright (C) 2013 - 2014 Ifremer, Code Lutin * %% * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as @@ -28,7 +28,6 @@ import com.google.common.collect.Lists; import com.google.common.collect.Maps; import com.google.common.collect.Multimap; -import fr.ifremer.wlo.models.categorization.CategoryModel; import fr.ifremer.wlo.models.categorization.QualitativeValueModel; import fr.ifremer.wlo.models.referentials.CalcifiedPartTaking; import fr.ifremer.wlo.models.referentials.Mensuration; Modified: trunk/src/main/java/fr/ifremer/wlo/models/MetierModel.java =================================================================== --- trunk/src/fr/ifremer/wlo/models/MetierModel.java 2014-04-03 08:57:26 UTC (rev 103) +++ trunk/src/main/java/fr/ifremer/wlo/models/MetierModel.java 2014-12-23 09:53:10 UTC (rev 112) @@ -6,7 +6,7 @@ * $Id$ * $HeadURL$ * %% - * Copyright (C) 2013 - 2014 Ifremer + * Copyright (C) 2013 - 2014 Ifremer, Code Lutin * %% * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as Modified: trunk/src/main/java/fr/ifremer/wlo/models/ScientificSpeciesModel.java =================================================================== --- trunk/src/fr/ifremer/wlo/models/ScientificSpeciesModel.java 2014-04-03 08:57:26 UTC (rev 103) +++ trunk/src/main/java/fr/ifremer/wlo/models/ScientificSpeciesModel.java 2014-12-23 09:53:10 UTC (rev 112) @@ -6,7 +6,7 @@ * $Id$ * $HeadURL$ * %% - * Copyright (C) 2013 - 2014 Ifremer + * Copyright (C) 2013 - 2014 Ifremer, Code Lutin * %% * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as @@ -27,7 +27,6 @@ import android.content.ContentValues; import android.content.Context; import android.database.Cursor; -import android.util.Log; import fr.ifremer.wlo.models.referentials.ScientificSpecies; import fr.ifremer.wlo.storage.DataCache; import fr.ifremer.wlo.utils.UIUtils; Modified: trunk/src/main/java/fr/ifremer/wlo/models/VesselModel.java =================================================================== --- trunk/src/fr/ifremer/wlo/models/VesselModel.java 2014-04-03 08:57:26 UTC (rev 103) +++ trunk/src/main/java/fr/ifremer/wlo/models/VesselModel.java 2014-12-23 09:53:10 UTC (rev 112) @@ -6,7 +6,7 @@ * $Id$ * $HeadURL$ * %% - * Copyright (C) 2013 - 2014 Ifremer + * Copyright (C) 2013 - 2014 Ifremer, Code Lutin * %% * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as Modified: trunk/src/main/java/fr/ifremer/wlo/models/categorization/CategoryModel.java =================================================================== --- trunk/src/fr/ifremer/wlo/models/categorization/CategoryModel.java 2014-04-03 08:57:26 UTC (rev 103) +++ trunk/src/main/java/fr/ifremer/wlo/models/categorization/CategoryModel.java 2014-12-23 09:53:10 UTC (rev 112) @@ -6,7 +6,7 @@ * $Id$ * $HeadURL$ * %% - * Copyright (C) 2013 - 2014 Ifremer + * Copyright (C) 2013 - 2014 Ifremer, Code Lutin * %% * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as @@ -26,7 +26,6 @@ import android.content.ContentValues; import android.database.Cursor; -import android.util.Log; import fr.ifremer.wlo.models.BaseModel; import java.util.List; @@ -89,4 +88,4 @@ putValue(value, COLUMN_LABEL, label); return value; } -} \ No newline at end of file +} Modified: trunk/src/main/java/fr/ifremer/wlo/models/categorization/QualitativeValueModel.java =================================================================== --- trunk/src/fr/ifremer/wlo/models/categorization/QualitativeValueModel.java 2014-04-03 08:57:26 UTC (rev 103) +++ trunk/src/main/java/fr/ifremer/wlo/models/categorization/QualitativeValueModel.java 2014-12-23 09:53:10 UTC (rev 112) @@ -6,7 +6,7 @@ * $Id$ * $HeadURL$ * %% - * Copyright (C) 2013 - 2014 Ifremer + * Copyright (C) 2013 - 2014 Ifremer, Code Lutin * %% * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as @@ -103,4 +103,4 @@ putValue(value, COLUMN_CATEGORY_ID, category != null ? category.getId() : null); return value; } -} \ No newline at end of file +} Modified: trunk/src/main/java/fr/ifremer/wlo/models/referentials/CalcifiedPartTaking.java =================================================================== --- trunk/src/fr/ifremer/wlo/models/referentials/CalcifiedPartTaking.java 2014-04-03 08:57:26 UTC (rev 103) +++ trunk/src/main/java/fr/ifremer/wlo/models/referentials/CalcifiedPartTaking.java 2014-12-23 09:53:10 UTC (rev 112) @@ -6,7 +6,7 @@ * $Id$ * $HeadURL$ * %% - * Copyright (C) 2013 - 2014 Ifremer + * Copyright (C) 2013 - 2014 Ifremer, Code Lutin * %% * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as @@ -135,4 +135,4 @@ putValue(value, COLUMN_SCIENTIFIC_SPECIES_ID, getParentId()); return value; } -} \ No newline at end of file +} Modified: trunk/src/main/java/fr/ifremer/wlo/models/referentials/CommercialSpecies.java =================================================================== --- trunk/src/fr/ifremer/wlo/models/referentials/CommercialSpecies.java 2014-04-03 08:57:26 UTC (rev 103) +++ trunk/src/main/java/fr/ifremer/wlo/models/referentials/CommercialSpecies.java 2014-12-23 09:53:10 UTC (rev 112) @@ -6,7 +6,7 @@ * $Id$ * $HeadURL$ * %% - * Copyright (C) 2013 - 2014 Ifremer + * Copyright (C) 2013 - 2014 Ifremer, Code Lutin * %% * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as Modified: trunk/src/main/java/fr/ifremer/wlo/models/referentials/HasCode.java =================================================================== --- trunk/src/fr/ifremer/wlo/models/referentials/HasCode.java 2014-04-03 08:57:26 UTC (rev 103) +++ trunk/src/main/java/fr/ifremer/wlo/models/referentials/HasCode.java 2014-12-23 09:53:10 UTC (rev 112) @@ -6,7 +6,7 @@ * $Id$ * $HeadURL$ * %% - * Copyright (C) 2013 - 2014 Ifremer + * Copyright (C) 2013 - 2014 Ifremer, Code Lutin * %% * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as Modified: trunk/src/main/java/fr/ifremer/wlo/models/referentials/Location.java =================================================================== --- trunk/src/fr/ifremer/wlo/models/referentials/Location.java 2014-04-03 08:57:26 UTC (rev 103) +++ trunk/src/main/java/fr/ifremer/wlo/models/referentials/Location.java 2014-12-23 09:53:10 UTC (rev 112) @@ -6,7 +6,7 @@ * $Id$ * $HeadURL$ * %% - * Copyright (C) 2013 - 2014 Ifremer + * Copyright (C) 2013 - 2014 Ifremer, Code Lutin * %% * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as Modified: trunk/src/main/java/fr/ifremer/wlo/models/referentials/Mensuration.java =================================================================== --- trunk/src/fr/ifremer/wlo/models/referentials/Mensuration.java 2014-04-03 08:57:26 UTC (rev 103) +++ trunk/src/main/java/fr/ifremer/wlo/models/referentials/Mensuration.java 2014-12-23 09:53:10 UTC (rev 112) @@ -6,7 +6,7 @@ * $Id$ * $HeadURL$ * %% - * Copyright (C) 2013 - 2014 Ifremer + * Copyright (C) 2013 - 2014 Ifremer, Code Lutin * %% * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as Modified: trunk/src/main/java/fr/ifremer/wlo/models/referentials/Metier.java =================================================================== --- trunk/src/fr/ifremer/wlo/models/referentials/Metier.java 2014-04-03 08:57:26 UTC (rev 103) +++ trunk/src/main/java/fr/ifremer/wlo/models/referentials/Metier.java 2014-12-23 09:53:10 UTC (rev 112) @@ -6,7 +6,7 @@ * $Id$ * $HeadURL$ * %% - * Copyright (C) 2013 - 2014 Ifremer + * Copyright (C) 2013 - 2014 Ifremer, Code Lutin * %% * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as Modified: trunk/src/main/java/fr/ifremer/wlo/models/referentials/Presentation.java =================================================================== --- trunk/src/fr/ifremer/wlo/models/referentials/Presentation.java 2014-04-03 08:57:26 UTC (rev 103) +++ trunk/src/main/java/fr/ifremer/wlo/models/referentials/Presentation.java 2014-12-23 09:53:10 UTC (rev 112) @@ -6,7 +6,7 @@ * $Id$ * $HeadURL$ * %% - * Copyright (C) 2013 - 2014 Ifremer + * Copyright (C) 2013 - 2014 Ifremer, Code Lutin * %% * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as Modified: trunk/src/main/java/fr/ifremer/wlo/models/referentials/ScientificSpecies.java =================================================================== --- trunk/src/fr/ifremer/wlo/models/referentials/ScientificSpecies.java 2014-04-03 08:57:26 UTC (rev 103) +++ trunk/src/main/java/fr/ifremer/wlo/models/referentials/ScientificSpecies.java 2014-12-23 09:53:10 UTC (rev 112) @@ -6,7 +6,7 @@ * $Id$ * $HeadURL$ * %% - * Copyright (C) 2013 - 2014 Ifremer + * Copyright (C) 2013 - 2014 Ifremer, Code Lutin * %% * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as Modified: trunk/src/main/java/fr/ifremer/wlo/models/referentials/State.java =================================================================== --- trunk/src/fr/ifremer/wlo/models/referentials/State.java 2014-04-03 08:57:26 UTC (rev 103) +++ trunk/src/main/java/fr/ifremer/wlo/models/referentials/State.java 2014-12-23 09:53:10 UTC (rev 112) @@ -6,7 +6,7 @@ * $Id$ * $HeadURL$ * %% - * Copyright (C) 2013 - 2014 Ifremer + * Copyright (C) 2013 - 2014 Ifremer, Code Lutin * %% * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as Modified: trunk/src/main/java/fr/ifremer/wlo/models/referentials/Vessel.java =================================================================== --- trunk/src/fr/ifremer/wlo/models/referentials/Vessel.java 2014-04-03 08:57:26 UTC (rev 103) +++ trunk/src/main/java/fr/ifremer/wlo/models/referentials/Vessel.java 2014-12-23 09:53:10 UTC (rev 112) @@ -6,7 +6,7 @@ * $Id$ * $HeadURL$ * %% - * Copyright (C) 2013 - 2014 Ifremer + * Copyright (C) 2013 - 2014 Ifremer, Code Lutin * %% * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as Modified: trunk/src/main/java/fr/ifremer/wlo/preferences/CategoryCreationAcivity.java =================================================================== --- trunk/src/fr/ifremer/wlo/preferences/CategoryCreationAcivity.java 2014-04-03 08:57:26 UTC (rev 103) +++ trunk/src/main/java/fr/ifremer/wlo/preferences/CategoryCreationAcivity.java 2014-12-23 09:53:10 UTC (rev 112) @@ -6,7 +6,7 @@ * $Id$ * $HeadURL$ * %% - * Copyright (C) 2013 - 2014 Ifremer + * Copyright (C) 2013 - 2014 Ifremer, Code Lutin * %% * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as @@ -34,12 +34,12 @@ import android.widget.TextView; import fr.ifremer.wlo.R; import fr.ifremer.wlo.WloBaseActivity; -import fr.ifremer.wlo.utils.ImportExportUtil; import fr.ifremer.wlo.models.categorization.CategoryModel; import fr.ifremer.wlo.models.categorization.QualitativeValueModel; import fr.ifremer.wlo.storage.DataCache; import fr.ifremer.wlo.storage.WloSqlOpenHelper; import fr.ifremer.wlo.utils.BaseTextWatcher; +import fr.ifremer.wlo.utils.ImportExportUtil; import fr.ifremer.wlo.utils.UIUtils; import fr.ifremer.wlo.utils.filechooser.FileDialog; import fr.ifremer.wlo.utils.filechooser.SelectionMode; Modified: trunk/src/main/java/fr/ifremer/wlo/preferences/ListItemPreference.java =================================================================== --- trunk/src/fr/ifremer/wlo/preferences/ListItemPreference.java 2014-04-03 08:57:26 UTC (rev 103) +++ trunk/src/main/java/fr/ifremer/wlo/preferences/ListItemPreference.java 2014-12-23 09:53:10 UTC (rev 112) @@ -6,7 +6,7 @@ * $Id$ * $HeadURL$ * %% - * Copyright (C) 2013 - 2014 Ifremer + * Copyright (C) 2013 - 2014 Ifremer, Code Lutin * %% * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as Modified: trunk/src/main/java/fr/ifremer/wlo/preferences/MultiSelectItemPreference.java =================================================================== --- trunk/src/fr/ifremer/wlo/preferences/MultiSelectItemPreference.java 2014-04-03 08:57:26 UTC (rev 103) +++ trunk/src/main/java/fr/ifremer/wlo/preferences/MultiSelectItemPreference.java 2014-12-23 09:53:10 UTC (rev 112) @@ -6,7 +6,7 @@ * $Id$ * $HeadURL$ * %% - * Copyright (C) 2013 - 2014 Ifremer + * Copyright (C) 2013 - 2014 Ifremer, Code Lutin * %% * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as Modified: trunk/src/main/java/fr/ifremer/wlo/preferences/MultiSelectionActivity.java =================================================================== --- trunk/src/fr/ifremer/wlo/preferences/MultiSelectionActivity.java 2014-04-03 08:57:26 UTC (rev 103) +++ trunk/src/main/java/fr/ifremer/wlo/preferences/MultiSelectionActivity.java 2014-12-23 09:53:10 UTC (rev 112) @@ -6,7 +6,7 @@ * $Id$ * $HeadURL$ * %% - * Copyright (C) 2013 - 2014 Ifremer + * Copyright (C) 2013 - 2014 Ifremer, Code Lutin * %% * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as @@ -28,11 +28,9 @@ import android.app.ListActivity; import android.content.Intent; import android.os.Bundle; -import android.util.Log; import android.view.View; import android.widget.AdapterView; import android.widget.ArrayAdapter; -import android.widget.ListView; import com.google.common.base.Function; import com.google.common.collect.Lists; import com.google.common.collect.Maps; @@ -41,7 +39,6 @@ import fr.ifremer.wlo.models.referentials.CommercialSpecies; import fr.ifremer.wlo.models.referentials.ScientificSpecies; import fr.ifremer.wlo.storage.DataCache; -import fr.ifremer.wlo.utils.BaseModelArrayAdapter; import fr.ifremer.wlo.utils.WloAutoCompleteTextView; import java.util.ArrayList; Modified: trunk/src/main/java/fr/ifremer/wlo/preferences/SettingsActivity.java =================================================================== --- trunk/src/fr/ifremer/wlo/preferences/SettingsActivity.java 2014-04-03 08:57:26 UTC (rev 103) +++ trunk/src/main/java/fr/ifremer/wlo/preferences/SettingsActivity.java 2014-12-23 09:53:10 UTC (rev 112) @@ -6,7 +6,7 @@ * $Id$ * $HeadURL$ * %% - * Copyright (C) 2013 - 2014 Ifremer + * Copyright (C) 2013 - 2014 Ifremer, Code Lutin * %% * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as @@ -619,4 +619,4 @@ } } -} \ No newline at end of file +} Modified: trunk/src/main/java/fr/ifremer/wlo/preferences/StringPreference.java =================================================================== --- trunk/src/fr/ifremer/wlo/preferences/StringPreference.java 2014-04-03 08:57:26 UTC (rev 103) +++ trunk/src/main/java/fr/ifremer/wlo/preferences/StringPreference.java 2014-12-23 09:53:10 UTC (rev 112) @@ -6,7 +6,7 @@ * $Id$ * $HeadURL$ * %% - * Copyright (C) 2013 - 2014 Ifremer + * Copyright (C) 2013 - 2014 Ifremer, Code Lutin * %% * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as Modified: trunk/src/main/java/fr/ifremer/wlo/storage/CsvExporter.java =================================================================== --- trunk/src/fr/ifremer/wlo/storage/CsvExporter.java 2014-04-03 08:57:26 UTC (rev 103) +++ trunk/src/main/java/fr/ifremer/wlo/storage/CsvExporter.java 2014-12-23 09:53:10 UTC (rev 112) @@ -6,7 +6,7 @@ * $Id$ * $HeadURL$ * %% - * Copyright (C) 2013 - 2014 Ifremer + * Copyright (C) 2013 - 2014 Ifremer, Code Lutin * %% * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as @@ -26,7 +26,6 @@ import android.content.Context; import android.database.Cursor; -import android.util.Log; import com.google.common.base.Function; import com.google.common.collect.Maps; import fr.ifremer.wlo.models.BaseModel; @@ -51,9 +50,7 @@ import org.nuiton.csv.ValueGetter; import org.nuiton.csv.ext.AbstractExportModel; -import java.util.Arrays; import java.util.Calendar; -import java.util.Date; import java.util.List; import java.util.Map; Modified: trunk/src/main/java/fr/ifremer/wlo/storage/DataCache.java =================================================================== --- trunk/src/fr/ifremer/wlo/storage/DataCache.java 2014-04-03 08:57:26 UTC (rev 103) +++ trunk/src/main/java/fr/ifremer/wlo/storage/DataCache.java 2014-12-23 09:53:10 UTC (rev 112) @@ -6,7 +6,7 @@ * $Id$ * $HeadURL$ * %% - * Copyright (C) 2013 - 2014 Ifremer + * Copyright (C) 2013 - 2014 Ifremer, Code Lutin * %% * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as Modified: trunk/src/main/java/fr/ifremer/wlo/storage/JsonExporter.java =================================================================== --- trunk/src/fr/ifremer/wlo/storage/JsonExporter.java 2014-04-03 08:57:26 UTC (rev 103) +++ trunk/src/main/java/fr/ifremer/wlo/storage/JsonExporter.java 2014-12-23 09:53:10 UTC (rev 112) @@ -6,7 +6,7 @@ * $Id$ * $HeadURL$ * %% - * Copyright (C) 2013 - 2014 Ifremer + * Copyright (C) 2013 - 2014 Ifremer, Code Lutin * %% * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as @@ -26,20 +26,32 @@ import android.content.Context; import android.database.Cursor; -import android.util.Pair; import com.google.common.base.Function; import com.google.common.base.Preconditions; import com.google.common.collect.Maps; -import fr.ifremer.wlo.models.*; +import fr.ifremer.wlo.models.BaseModel; +import fr.ifremer.wlo.models.CategoryWeightModel; +import fr.ifremer.wlo.models.CommercialSpeciesModel; +import fr.ifremer.wlo.models.ContextModel; +import fr.ifremer.wlo.models.LocationModel; +import fr.ifremer.wlo.models.MeasurementModel; +import fr.ifremer.wlo.models.MetierModel; +import fr.ifremer.wlo.models.ScientificSpeciesModel; +import fr.ifremer.wlo.models.VesselModel; import fr.ifremer.wlo.models.categorization.CategoryModel; import fr.ifremer.wlo.models.categorization.QualitativeValueModel; -import fr.ifremer.wlo.models.referentials.*; +import fr.ifremer.wlo.models.referentials.CommercialSpecies; +import fr.ifremer.wlo.models.referentials.Location; +import fr.ifremer.wlo.models.referentials.Mensuration; +import fr.ifremer.wlo.models.referentials.Metier; +import fr.ifremer.wlo.models.referentials.Presentation; +import fr.ifremer.wlo.models.referentials.ScientificSpecies; +import fr.ifremer.wlo.models.referentials.State; import fr.ifremer.wlo.utils.UIUtils; import org.json.JSONArray; import org.json.JSONException; import org.json.JSONObject; -import java.text.SimpleDateFormat; import java.util.ArrayList; import java.util.List; import java.util.Map; @@ -469,4 +481,4 @@ return jsonScientificSpecies; } -} \ No newline at end of file +} Modified: trunk/src/main/java/fr/ifremer/wlo/storage/StorageUtils.java =================================================================== --- trunk/src/fr/ifremer/wlo/storage/StorageUtils.java 2014-04-03 08:57:26 UTC (rev 103) +++ trunk/src/main/java/fr/ifremer/wlo/storage/StorageUtils.java 2014-12-23 09:53:10 UTC (rev 112) @@ -6,7 +6,7 @@ * $Id$ * $HeadURL$ * %% - * Copyright (C) 2013 - 2014 Ifremer + * Copyright (C) 2013 - 2014 Ifremer, Code Lutin * %% * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as Modified: trunk/src/main/java/fr/ifremer/wlo/storage/WloSqlOpenHelper.java =================================================================== --- trunk/src/fr/ifremer/wlo/storage/WloSqlOpenHelper.java 2014-04-03 08:57:26 UTC (rev 103) +++ trunk/src/main/java/fr/ifremer/wlo/storage/WloSqlOpenHelper.java 2014-12-23 09:53:10 UTC (rev 112) @@ -6,7 +6,7 @@ * $Id$ * $HeadURL$ * %% - * Copyright (C) 2013 - 2014 Ifremer + * Copyright (C) 2013 - 2014 Ifremer, Code Lutin * %% * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as Modified: trunk/src/main/java/fr/ifremer/wlo/utils/AbstractDateTimePickerFragment.java =================================================================== --- trunk/src/fr/ifremer/wlo/utils/AbstractDateTimePickerFragment.java 2014-04-03 08:57:26 UTC (rev 103) +++ trunk/src/main/java/fr/ifremer/wlo/utils/AbstractDateTimePickerFragment.java 2014-12-23 09:53:10 UTC (rev 112) @@ -6,7 +6,7 @@ * $Id$ * $HeadURL$ * %% - * Copyright (C) 2013 - 2014 Ifremer + * Copyright (C) 2013 - 2014 Ifremer, Code Lutin * %% * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as Modified: trunk/src/main/java/fr/ifremer/wlo/utils/BaseModelArrayAdapter.java =================================================================== --- trunk/src/fr/ifremer/wlo/utils/BaseModelArrayAdapter.java 2014-04-03 08:57:26 UTC (rev 103) +++ trunk/src/main/java/fr/ifremer/wlo/utils/BaseModelArrayAdapter.java 2014-12-23 09:53:10 UTC (rev 112) @@ -6,7 +6,7 @@ * $Id$ * $HeadURL$ * %% - * Copyright (C) 2013 - 2014 Ifremer + * Copyright (C) 2013 - 2014 Ifremer, Code Lutin * %% * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as Modified: trunk/src/main/java/fr/ifremer/wlo/utils/BaseTextWatcher.java =================================================================== --- trunk/src/fr/ifremer/wlo/utils/BaseTextWatcher.java 2014-04-03 08:57:26 UTC (rev 103) +++ trunk/src/main/java/fr/ifremer/wlo/utils/BaseTextWatcher.java 2014-12-23 09:53:10 UTC (rev 112) @@ -6,7 +6,7 @@ * $Id$ * $HeadURL$ * %% - * Copyright (C) 2013 - 2014 Ifremer + * Copyright (C) 2013 - 2014 Ifremer, Code Lutin * %% * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as Deleted: trunk/src/main/java/fr/ifremer/wlo/utils/BigFinFeedReaderRecord.java =================================================================== --- trunk/src/fr/ifremer/wlo/utils/BigFinFeedReaderRecord.java 2014-04-03 08:57:26 UTC (rev 103) +++ trunk/src/main/java/fr/ifremer/wlo/utils/BigFinFeedReaderRecord.java 2014-12-23 09:53:10 UTC (rev 112) @@ -1,161 +0,0 @@ -package fr.ifremer.wlo.utils; - -/* - * #%L - * Tutti :: Ichtyometer API - * $Id$ - * $HeadURL$ - * %% - * Copyright (C) 2012 - 2014 Ifremer - * %% - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as - * published by the Free Software Foundation, either version 3 of the - * License, or (at your option) any later version. - * - * This program 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 General Public License for more details. - * - * You should have received a copy of the GNU General Public - * License along with this program. If not, see - * <http://www.gnu.org/licenses/gpl-3.0.html>. - * #L% - */ - -import android.util.Log; -import org.apache.commons.lang3.builder.ToStringBuilder; - -/** - * Record_id,length(mm),weight(g),species,cruise,station,pan,Dt,sz class,gender,text, - * <p/> - * Created on 1/24/14. - * - * @author Tony Chemit <chemit@codelutin.com> - * @since 3.1 - */ -public class BigFinFeedReaderRecord { - - /** Logger. */ - private static final String TAG = "BigFinFeedReaderRecord"; - - /** - * Incoming raw record. - */ - protected final String record; - - /** - * Incoming crc. - */ - protected final String crc; - - /** - * Our computed crc. - */ - protected final String computedCrc; - - /** - * Extracted length (the first data of the record). - */ - protected final Float length; - - /** - * Computed valid flag (if crc == computedCrc and length != null). - */ - protected final boolean valid; - - public BigFinFeedReaderRecord(String record, String crc) { - this.record = record; - this.crc = crc; - this.computedCrc = computeCRC(record); - this.length = computeLength(record); - - //FIXME Uncomment when computedCrc will be ok - this.valid = length != null; /*&& crc.equals(computedCrc);*/ - } - - public boolean isValid() { - return valid; - } - - public String getRecord() { - return record; - } - - public String getCrc() { - return crc; - } - - public String getComputedCrc() { - return computedCrc; - } - - public Float getLength() { - return length; - } - - @Override - public String toString() { - return new ToStringBuilder(this) - .append("record", record) - .append("crc", crc) - .append("computedCrc", computedCrc) - .append("valid", valid) - .append("length", length) - .toString(); - } - - public static String computeCRC(String record) { - - // use long because int are signed and add doesn't work correctly - long checksum = 0; - - // to keep using 4 octets (32bites) - long mask = 0b0000000000000000000000000000000011111111111111111111111111111111L; - - for (int i = 0, recordLength = record.length(); i < recordLength; i++) { - - // keep only the first 32 bites - checksum = checksum & mask; - - // get msb bite value - long msb = checksum >> 31; - - - // logical shift left - checksum <<= 1; - - // rotates msb to lsb - checksum += msb; - - // add new caracter - checksum += record.charAt(i); - } - - // get a hexadecimal on 32bites -> 8 hexadecimal caracters - String hex = Long.toHexString(checksum).toUpperCase(); - return hex; - } - - protected Float computeLength(String record) { - Float length; - try { - String[] cells = record.split("\\s*,\\s*"); - // first cell is the record number, second one is the length - String lengthCell = cells[1]; - // remove any spaces - lengthCell = lengthCell.replaceAll("\\s*", ""); - - // remove any starting 0 - lengthCell = lengthCell.replaceAll("^0*", ""); - - length = Float.valueOf(lengthCell); - - } catch (Exception e) { - Log.e(TAG, "Could not get length from " + record, e); - length = null; - } - return length; - } -} Modified: trunk/src/main/java/fr/ifremer/wlo/utils/DatePickerFragment.java =================================================================== --- trunk/src/fr/ifremer/wlo/utils/DatePickerFragment.java 2014-04-03 08:57:26 UTC (rev 103) +++ trunk/src/main/java/fr/ifremer/wlo/utils/DatePickerFragment.java 2014-12-23 09:53:10 UTC (rev 112) @@ -6,7 +6,7 @@ * $Id$ * $HeadURL$ * %% - * Copyright (C) 2013 - 2014 Ifremer + * Copyright (C) 2013 - 2014 Ifremer, Code Lutin * %% * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as Modified: trunk/src/main/java/fr/ifremer/wlo/utils/ImportExportUtil.java =================================================================== --- trunk/src/fr/ifremer/wlo/utils/ImportExportUtil.java 2014-04-03 08:57:26 UTC (rev 103) +++ trunk/src/main/java/fr/ifremer/wlo/utils/ImportExportUtil.java 2014-12-23 09:53:10 UTC (rev 112) @@ -6,7 +6,7 @@ * $Id$ * $HeadURL$ * %% - * Copyright (C) 2013 - 2014 Ifremer + * Copyright (C) 2013 - 2014 Ifremer, Code Lutin * %% * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as @@ -26,12 +26,9 @@ import android.content.Context; import android.database.Cursor; -import android.os.AsyncTask; import android.util.Log; import com.google.common.base.Function; import com.google.common.base.Preconditions; -import com.google.common.base.Predicate; -import com.google.common.collect.Collections2; import com.google.common.collect.HashMultimap; import com.google.common.collect.Lists; import com.google.common.collect.Multimap; @@ -50,12 +47,9 @@ import fr.ifremer.wlo.models.categorization.CategoryModel; import fr.ifremer.wlo.models.categorization.QualitativeValueModel; import fr.ifremer.wlo.models.referentials.CalcifiedPartTaking; -import fr.ifremer.wlo.models.referentials.HasCode; import fr.ifremer.wlo.storage.DataCache; import fr.ifremer.wlo.storage.WloSqlOpenHelper; import org.apache.commons.collections.CollectionUtils; -import org.apache.commons.collections.ComparatorUtils; -import org.apache.commons.io.IOUtils; import org.apache.commons.lang3.ObjectUtils; import org.apache.commons.lang3.Range; import org.nuiton.csv.Export; @@ -67,15 +61,12 @@ import java.io.FileInputStream; import java.io.FileNotFoundException; import java.io.InputStream; -import java.util.ArrayList; import java.util.Collection; import java.util.Comparator; import java.util.Date; import java.util.HashMap; -import java.util.List; import java.util.Map; import java.util.Set; -import java.util.SortedSet; import java.util.TreeSet; /** Modified: trunk/src/main/java/fr/ifremer/wlo/utils/TimePickerFragment.java =================================================================== --- trunk/src/fr/ifremer/wlo/utils/TimePickerFragment.java 2014-04-03 08:57:26 UTC (rev 103) +++ trunk/src/main/java/fr/ifremer/wlo/utils/TimePickerFragment.java 2014-12-23 09:53:10 UTC (rev 112) @@ -6,7 +6,7 @@ * $Id$ * $HeadURL$ * %% - * Copyright (C) 2013 - 2014 Ifremer + * Copyright (C) 2013 - 2014 Ifremer, Code Lutin * %% * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as Modified: trunk/src/main/java/fr/ifremer/wlo/utils/UIUtils.java =================================================================== --- trunk/src/fr/ifremer/wlo/utils/UIUtils.java 2014-04-03 08:57:26 UTC (rev 103) +++ trunk/src/main/java/fr/ifremer/wlo/utils/UIUtils.java 2014-12-23 09:53:10 UTC (rev 112) @@ -6,7 +6,7 @@ * $Id$ * $HeadURL$ * %% - * Copyright (C) 2013 - 2014 Ifremer + * Copyright (C) 2013 - 2014 Ifremer, Code Lutin * %% * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as @@ -29,7 +29,6 @@ import android.content.SharedPreferences; import android.database.Cursor; import android.preference.PreferenceManager; -import android.util.Log; import com.google.common.base.Preconditions; import fr.ifremer.wlo.R; import fr.ifremer.wlo.models.BaseModel; Modified: trunk/src/main/java/fr/ifremer/wlo/utils/UpdateCheckTask.java =================================================================== --- trunk/src/fr/ifremer/wlo/utils/UpdateCheckTask.java 2014-04-03 08:57:26 UTC (rev 103) +++ trunk/src/main/java/fr/ifremer/wlo/utils/UpdateCheckTask.java 2014-12-23 09:53:10 UTC (rev 112) @@ -6,7 +6,7 @@ * $Id$ * $HeadURL$ * %% - * Copyright (C) 2013 - 2014 Ifremer + * Copyright (C) 2013 - 2014 Ifremer, Code Lutin * %% * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as Modified: trunk/src/main/java/fr/ifremer/wlo/utils/WloAutoCompleteTextView.java =================================================================== --- trunk/src/fr/ifremer/wlo/utils/WloAutoCompleteTextView.java 2014-04-03 08:57:26 UTC (rev 103) +++ trunk/src/main/java/fr/ifremer/wlo/utils/WloAutoCompleteTextView.java 2014-12-23 09:53:10 UTC (rev 112) @@ -6,7 +6,7 @@ * $Id$ * $HeadURL$ * %% - * Copyright (C) 2013 - 2014 Ifremer + * Copyright (C) 2013 - 2014 Ifremer, Code Lutin * %% * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as Modified: trunk/src/main/java/fr/ifremer/wlo/utils/WloAutoCompleteTextViewWithFavorites.java =================================================================== --- trunk/src/fr/ifremer/wlo/utils/WloAutoCompleteTextViewWithFavorites.java 2014-04-03 08:57:26 UTC (rev 103) +++ trunk/src/main/java/fr/ifremer/wlo/utils/WloAutoCompleteTextViewWithFavorites.java 2014-12-23 09:53:10 UTC (rev 112) @@ -6,7 +6,7 @@ * $Id$ * $HeadURL$ * %% - * Copyright (C) 2013 - 2014 Ifremer + * Copyright (C) 2013 - 2014 Ifremer, Code Lutin * %% * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as Modified: trunk/src/main/java/fr/ifremer/wlo/utils/WloItemListViewBinder.java =================================================================== --- trunk/src/fr/ifremer/wlo/utils/WloItemListViewBinder.java 2014-04-03 08:57:26 UTC (rev 103) +++ trunk/src/main/java/fr/ifremer/wlo/utils/WloItemListViewBinder.java 2014-12-23 09:53:10 UTC (rev 112) @@ -6,7 +6,7 @@ * $Id$ * $HeadURL$ * %% - * Copyright (C) 2013 - 2014 Ifremer + * Copyright (C) 2013 - 2014 Ifremer, Code Lutin * %% * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as Modified: trunk/src/main/java/fr/ifremer/wlo/utils/filechooser/FileDialog.java =================================================================== --- trunk/src/fr/ifremer/wlo/utils/filechooser/FileDialog.java 2014-04-03 08:57:26 UTC (rev 103) +++ trunk/src/main/java/fr/ifremer/wlo/utils/filechooser/FileDialog.java 2014-12-23 09:53:10 UTC (rev 112) @@ -6,7 +6,7 @@ * $Id$ * $HeadURL$ * %% - * Copyright (C) 2013 - 2014 Ifremer + * Copyright (C) 2013 - 2014 Ifremer, Code Lutin * %% * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as Modified: trunk/src/main/java/fr/ifremer/wlo/utils/filechooser/SelectionMode.java =================================================================== --- trunk/src/fr/ifremer/wlo/utils/filechooser/SelectionMode.java 2014-04-03 08:57:26 UTC (rev 103) +++ trunk/src/main/java/fr/ifremer/wlo/utils/filechooser/SelectionMode.java 2014-12-23 09:53:10 UTC (rev 112) @@ -6,7 +6,7 @@ * $Id$ * $HeadURL$ * %% - * Copyright (C) 2013 - 2014 Ifremer + * Copyright (C) 2013 - 2014 Ifremer, Code Lutin * %% * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as