- Wlo-commits - mailman.cloud.codelutin.com

r65 - in trunk: res/values res/values-fr src/fr/ifremer/wlo/preferences src/fr/ifremer/wlo/utils
by kmorin＠users.forge.codelutin.com 04 Mar '14

04 Mar '14

Author: kmorin Date: 2014-03-04 10:26:46 +0100 (Tue, 04 Mar 2014) New Revision: 65 Url: http://forge.codelutin.com/projects/wlo/repository/revisions/65 Log: fixes #4630 [TECH] Mise ?\195?\160 jour automatique de l'application Modified: trunk/res/values-fr/strings.xml trunk/res/values/strings.xml trunk/src/fr/ifremer/wlo/preferences/SettingsActivity.java trunk/src/fr/ifremer/wlo/utils/UpdateCheckTask.java Modified: trunk/res/values/strings.xml =================================================================== --- trunk/res/values/strings.xml 2014-03-04 09:17:33 UTC (rev 64) +++ trunk/res/values/strings.xml 2014-03-04 09:26:46 UTC (rev 65) @@ -226,5 +226,6 @@ <string name="update_available_title">New version available</string> <string name="update_available_message">A new version of WLO is available. Would you like to install it?</string> <string name="no_update">You already have the latest version of the application</string> + <string name="update_error">An error occured while checking the last version</string> </resources> Modified: trunk/res/values-fr/strings.xml =================================================================== --- trunk/res/values-fr/strings.xml 2014-03-04 09:17:33 UTC (rev 64) +++ trunk/res/values-fr/strings.xml 2014-03-04 09:26:46 UTC (rev 65) @@ -218,5 +218,6 @@ <string name="update_available_title">Nouvelle version disponible</string> <string name="update_available_message">Une nouvelle version de WLO est disponible. Voulez-vous la télécharger et l\'installer ?</string> <string name="no_update">Vous avez déjà la version la plus récente de l\'application</string> + <string name="update_error">Une erreur est survenue pendant la vérification de la version</string> </resources> Modified: trunk/src/fr/ifremer/wlo/preferences/SettingsActivity.java =================================================================== --- trunk/src/fr/ifremer/wlo/preferences/SettingsActivity.java 2014-03-04 09:17:33 UTC (rev 64) +++ trunk/src/fr/ifremer/wlo/preferences/SettingsActivity.java 2014-03-04 09:26:46 UTC (rev 65) @@ -489,11 +489,6 @@ .create().show(); } - @Override - protected void onCancelled() { - super.onCancelled(); - onCancelled(null); - } } } Modified: trunk/src/fr/ifremer/wlo/utils/UpdateCheckTask.java =================================================================== --- trunk/src/fr/ifremer/wlo/utils/UpdateCheckTask.java 2014-03-04 09:17:33 UTC (rev 64) +++ trunk/src/fr/ifremer/wlo/utils/UpdateCheckTask.java 2014-03-04 09:26:46 UTC (rev 65) @@ -156,4 +156,12 @@ } } + @Override + protected void onCancelled(String s) { + super.onCancelled(s); + if (showLoading) { + loadingDialog.dismiss(); + Toast.makeText(context, R.string.update_error, Toast.LENGTH_LONG).show(); + } + } }

1 0

r64 - in trunk: res/values res/values-fr res/xml src/fr/ifremer/wlo src/fr/ifremer/wlo/imports src/fr/ifremer/wlo/models/categorization src/fr/ifremer/wlo/preferences src/fr/ifremer/wlo/utils
by kmorin＠users.forge.codelutin.com 04 Mar '14

04 Mar '14

Author: kmorin Date: 2014-03-04 10:17:33 +0100 (Tue, 04 Mar 2014) New Revision: 64 Url: http://forge.codelutin.com/projects/wlo/repository/revisions/64 Log: fixes #4630 [TECH] Mise ?\195?\160 jour automatique de l'application Modified: trunk/res/values-fr/strings.xml trunk/res/values/strings.xml trunk/res/xml/preferences.xml trunk/src/fr/ifremer/wlo/WloApplication.java trunk/src/fr/ifremer/wlo/imports/QualitativeValueRowModel.java trunk/src/fr/ifremer/wlo/models/categorization/CategoryModel.java trunk/src/fr/ifremer/wlo/models/categorization/QualitativeValueModel.java trunk/src/fr/ifremer/wlo/preferences/CategoryCreationAcivity.java trunk/src/fr/ifremer/wlo/preferences/MultiSelectionActivity.java trunk/src/fr/ifremer/wlo/preferences/SettingsActivity.java trunk/src/fr/ifremer/wlo/utils/UpdateCheckTask.java Modified: trunk/res/values/strings.xml =================================================================== --- trunk/res/values/strings.xml 2014-03-03 17:36:04 UTC (rev 63) +++ trunk/res/values/strings.xml 2014-03-04 09:17:33 UTC (rev 64) @@ -127,6 +127,10 @@ <string name="qualitative_values_nb">%s qualitative values</string> <string name="category_created">The category has been successfully created.</string> + <string name="preferences_update">Update</string> + <string name="preferences_check_update">Check if the application is up to date</string> + <string name="preferences_current_version">Current version: %s</string> +  <string name="add_context">Create a new context</string> <string name="contexts_title">Contexts</string> @@ -217,8 +221,10 @@ <string name="crash_dialog_ok_toast">Thank you !</string>  + <string name="checking_update">Checking last available version</string> <string name="update_dowload_error">Error while downloading the new version of WLO</string> <string name="update_available_title">New version available</string> <string name="update_available_message">A new version of WLO is available. Would you like to install it?</string> + <string name="no_update">You already have the latest version of the application</string> </resources> Modified: trunk/res/values-fr/strings.xml =================================================================== --- trunk/res/values-fr/strings.xml 2014-03-03 17:36:04 UTC (rev 63) +++ trunk/res/values-fr/strings.xml 2014-03-04 09:17:33 UTC (rev 64) @@ -120,6 +120,10 @@ <string name="qualitative_values_nb">%s valeurs pour cette catégorie</string> <string name="category_created">La catégorie a bien été créée.</string> + <string name="preferences_update">Mise à jour</string> + <string name="preferences_check_update">Vérifier si l\'application est à jour</string> + <string name="preferences_current_version">Version actuelle : %s</string> +  <string name="add_context">Créer un nouveau contexte</string> <string name="contexts_title">Contextes</string> @@ -209,8 +213,10 @@ <string name="crash_dialog_ok_toast">Merci !</string>  + <string name="checking_update">Recherche d\'une version plus récente</string> <string name="update_dowload_error">Erreur lors du téléchargement de la dernière version de WLO</string> <string name="update_available_title">Nouvelle version disponible</string> <string name="update_available_message">Une nouvelle version de WLO est disponible. Voulez-vous la télécharger et l\'installer ?</string> + <string name="no_update">Vous avez déjà la version la plus récente de l\'application</string> </resources> Modified: trunk/res/xml/preferences.xml =================================================================== --- trunk/res/xml/preferences.xml 2014-03-03 17:36:04 UTC (rev 63) +++ trunk/res/xml/preferences.xml 2014-03-04 09:17:33 UTC (rev 64) @@ -85,4 +85,13 @@ </PreferenceCategory> + <PreferenceCategory + android:title="@string/preferences_update" + android:key="preferences_update"> + + <Preference android:title="@string/preferences_check_update" + android:key="preferences_check_update"/> + + </PreferenceCategory> + </PreferenceScreen> \ No newline at end of file Modified: trunk/src/fr/ifremer/wlo/WloApplication.java =================================================================== --- trunk/src/fr/ifremer/wlo/WloApplication.java 2014-03-03 17:36:04 UTC (rev 63) +++ trunk/src/fr/ifremer/wlo/WloApplication.java 2014-03-04 09:17:33 UTC (rev 64) @@ -1,5 +1,29 @@ 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.Application; import android.app.DownloadManager; import android.app.ProgressDialog; Modified: trunk/src/fr/ifremer/wlo/imports/QualitativeValueRowModel.java =================================================================== --- trunk/src/fr/ifremer/wlo/imports/QualitativeValueRowModel.java 2014-03-03 17:36:04 UTC (rev 63) +++ trunk/src/fr/ifremer/wlo/imports/QualitativeValueRowModel.java 2014-03-04 09:17:33 UTC (rev 64) @@ -1,5 +1,29 @@ package fr.ifremer.wlo.imports; +/* + * #%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 fr.ifremer.wlo.models.categorization.CategoryModel; import fr.ifremer.wlo.models.categorization.QualitativeValueModel; import org.nuiton.csv.ValueSetter; Modified: trunk/src/fr/ifremer/wlo/models/categorization/CategoryModel.java =================================================================== --- trunk/src/fr/ifremer/wlo/models/categorization/CategoryModel.java 2014-03-03 17:36:04 UTC (rev 63) +++ trunk/src/fr/ifremer/wlo/models/categorization/CategoryModel.java 2014-03-04 09:17:33 UTC (rev 64) @@ -1,5 +1,29 @@ package fr.ifremer.wlo.models.categorization; +/* + * #%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.content.ContentValues; import android.database.Cursor; import android.util.Log; Modified: trunk/src/fr/ifremer/wlo/models/categorization/QualitativeValueModel.java =================================================================== --- trunk/src/fr/ifremer/wlo/models/categorization/QualitativeValueModel.java 2014-03-03 17:36:04 UTC (rev 63) +++ trunk/src/fr/ifremer/wlo/models/categorization/QualitativeValueModel.java 2014-03-04 09:17:33 UTC (rev 64) @@ -1,5 +1,29 @@ package fr.ifremer.wlo.models.categorization; +/* + * #%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.content.ContentValues; import android.database.Cursor; import android.util.Log; Modified: trunk/src/fr/ifremer/wlo/preferences/CategoryCreationAcivity.java =================================================================== --- trunk/src/fr/ifremer/wlo/preferences/CategoryCreationAcivity.java 2014-03-03 17:36:04 UTC (rev 63) +++ trunk/src/fr/ifremer/wlo/preferences/CategoryCreationAcivity.java 2014-03-04 09:17:33 UTC (rev 64) @@ -1,5 +1,29 @@ package fr.ifremer.wlo.preferences; +/* + * #%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.AlertDialog; import android.content.Intent; import android.os.Bundle; Modified: trunk/src/fr/ifremer/wlo/preferences/MultiSelectionActivity.java =================================================================== --- trunk/src/fr/ifremer/wlo/preferences/MultiSelectionActivity.java 2014-03-03 17:36:04 UTC (rev 63) +++ trunk/src/fr/ifremer/wlo/preferences/MultiSelectionActivity.java 2014-03-04 09:17:33 UTC (rev 64) @@ -1,6 +1,30 @@ package fr.ifremer.wlo.preferences; +/* + * #%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.ListActivity; import android.content.Intent; import android.os.Bundle; Modified: trunk/src/fr/ifremer/wlo/preferences/SettingsActivity.java =================================================================== --- trunk/src/fr/ifremer/wlo/preferences/SettingsActivity.java 2014-03-03 17:36:04 UTC (rev 63) +++ trunk/src/fr/ifremer/wlo/preferences/SettingsActivity.java 2014-03-04 09:17:33 UTC (rev 64) @@ -30,6 +30,7 @@ import android.content.DialogInterface; import android.content.Intent; import android.content.SharedPreferences; +import android.content.pm.PackageManager; import android.os.AsyncTask; import android.os.Bundle; import android.os.Environment; @@ -55,6 +56,7 @@ import fr.ifremer.wlo.storage.WloSqlOpenHelper; import fr.ifremer.wlo.utils.ImportUtil; import fr.ifremer.wlo.utils.UIUtils; +import fr.ifremer.wlo.utils.UpdateCheckTask; import fr.ifremer.wlo.utils.filechooser.FileDialog; import fr.ifremer.wlo.utils.filechooser.SelectionMode; import org.apache.commons.io.FileUtils; @@ -193,6 +195,23 @@ ScientificSpecies.class, REQUEST_FAVORITES_SCIENTIFIC_SPECIES); + // update + Preference updatePref = findPreference("preferences_check_update"); + try { + String currentVersion = context.getPackageManager().getPackageInfo(context.getPackageName(), 0).versionName; + updatePref.setSummary(getString(R.string.preferences_current_version, currentVersion)); + + } catch (PackageManager.NameNotFoundException e) { + Log.e(TAG, "error while getting the version"); + } + updatePref.setOnPreferenceClickListener(new Preference.OnPreferenceClickListener() { + @Override + public boolean onPreferenceClick(Preference preference) { + new UpdateCheckTask(getActivity(), true).execute(); + return true; + } + }); + } @Override Modified: trunk/src/fr/ifremer/wlo/utils/UpdateCheckTask.java =================================================================== --- trunk/src/fr/ifremer/wlo/utils/UpdateCheckTask.java 2014-03-03 17:36:04 UTC (rev 63) +++ trunk/src/fr/ifremer/wlo/utils/UpdateCheckTask.java 2014-03-04 09:17:33 UTC (rev 64) @@ -1,7 +1,32 @@ package fr.ifremer.wlo.utils; +/* + * #%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.AlertDialog; import android.app.DownloadManager; +import android.app.ProgressDialog; import android.content.BroadcastReceiver; import android.content.Context; import android.content.DialogInterface; @@ -41,12 +66,30 @@ public static final String URL_PROP = "application.url"; protected Context context; + protected boolean showLoading; + protected ProgressDialog loadingDialog; public UpdateCheckTask(Context context) { + this(context, false); + } + + public UpdateCheckTask(Context context, boolean showLoading) { this.context = context; + this.showLoading = showLoading; } @Override + protected void onPreExecute() { + super.onPreExecute(); + if (showLoading) { + loadingDialog = new ProgressDialog(context); + loadingDialog.setIndeterminate(true); + loadingDialog.setMessage(context.getString(R.string.checking_update)); + loadingDialog.show(); + } + } + + @Override protected String doInBackground(String... params) { String result; @@ -85,6 +128,9 @@ @Override protected void onPostExecute(final String result) { super.onPostExecute(result); + if (showLoading) { + loadingDialog.dismiss(); + } if (result != null && WloBaseActivity.getDownloadingApkId() == null) { new AlertDialog.Builder(context) @@ -105,6 +151,8 @@ .create() .show(); + } else if (showLoading) { + Toast.makeText(context, R.string.no_update, Toast.LENGTH_LONG).show(); } }

1 0

r63 - in trunk: . res/values res/values-fr src/fr/ifremer/wlo src/fr/ifremer/wlo/imports src/fr/ifremer/wlo/preferences src/fr/ifremer/wlo/utils
by kmorin＠users.forge.codelutin.com 03 Mar '14

03 Mar '14

Author: kmorin Date: 2014-03-03 18:36:04 +0100 (Mon, 03 Mar 2014) New Revision: 63 Url: http://forge.codelutin.com/projects/wlo/repository/revisions/63 Log: setup application sign fixes #4630 [TECH] Mise ?\195?\160 jour automatique de l'application Added: trunk/src/fr/ifremer/wlo/utils/ImportUtil.java Removed: trunk/proguard.cfg trunk/src/fr/ifremer/wlo/imports/ImportUtil.java Modified: trunk/AndroidManifest.xml trunk/pom.xml trunk/res/values-fr/strings.xml trunk/res/values/strings.xml trunk/src/fr/ifremer/wlo/MainActivity.java trunk/src/fr/ifremer/wlo/WloApplication.java trunk/src/fr/ifremer/wlo/WloBaseActivity.java trunk/src/fr/ifremer/wlo/preferences/CategoryCreationAcivity.java trunk/src/fr/ifremer/wlo/preferences/SettingsActivity.java trunk/src/fr/ifremer/wlo/utils/UpdateCheckTask.java Modified: trunk/AndroidManifest.xml =================================================================== --- trunk/AndroidManifest.xml 2014-03-03 15:24:16 UTC (rev 62) +++ trunk/AndroidManifest.xml 2014-03-03 17:36:04 UTC (rev 63) @@ -16,7 +16,7 @@ <manifest xmlns:android="http://schemas.android.com/apk/res/android" package="fr.ifremer.wlo" android:versionCode="1" - android:versionName="1.0"> + android:versionName="0.2"> <uses-sdk minSdkVersion="15" android:targetSdkVersion="15"/> Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2014-03-03 15:24:16 UTC (rev 62) +++ trunk/pom.xml 2014-03-03 17:36:04 UTC (rev 63) @@ -269,9 +269,6 @@ <excludeJarResources> <excludeJarResource>.*nuiton.*</excludeJarResource> </excludeJarResources> -  -  -   <device>usb</device> <zipalign> @@ -284,9 +281,6 @@ ${project.build.directory}/${project.artifactId}-${project.version}-aligned.apk </outputApk> </zipalign> - <proguard> - <skip>true</skip>  - </proguard> </configuration> <extensions>true</extensions> </plugin> @@ -324,6 +318,70 @@ <profiles> <profile> + <id>sign</id> + <activation> + <property> + <name>performRelease</name> + <value>true</value> + </property> + </activation> + <build> + <plugins> + <plugin> + <groupId>org.nuiton</groupId> + <artifactId>helper-maven-plugin</artifactId> + <executions> + <execution> + <id>get-keystore</id> + <goals> + <goal>share-server-secret</goal> + </goals> + <phase>package</phase> + <configuration> + <serverId>codelutin-keystore</serverId> + <privateKeyOut>jarsigner.keystore</privateKeyOut> + <passwordOut>jarsigner.storepass</passwordOut> + <usernameOut>jarsigner.alias</usernameOut> + <passphraseOut>jarsigner.keypass</passphraseOut> + </configuration> + </execution> + </executions> + </plugin> + + <plugin> + <groupId>org.apache.maven.plugins</groupId> + <artifactId>maven-jarsigner-plugin</artifactId> + <executions> + <execution> + <id>signing</id> + <goals> + <goal>sign</goal> + </goals> + <phase>package</phase> + <inherited>true</inherited> + <configuration> + <includes> + <include>target/*.apk</include> + </includes> + </configuration> + </execution> + </executions> + </plugin> + <plugin> + <groupId>com.jayway.maven.plugins.android.generation2</groupId> + <artifactId>android-maven-plugin</artifactId> + <inherited>true</inherited> + <configuration> + <sign> + <debug>false</debug> + </sign> + </configuration> + </plugin> + </plugins> + </build> + </profile> + + <profile> <id>check-release-profile</id> <activation> <property> Deleted: trunk/proguard.cfg =================================================================== --- trunk/proguard.cfg 2014-03-03 15:24:16 UTC (rev 62) +++ trunk/proguard.cfg 2014-03-03 17:36:04 UTC (rev 63) @@ -1,10 +0,0 @@ --dontoptimize --dontobfuscate --dontwarn javax.annotation.** --dontwarn javax.inject.** --dontwarn sun.misc.Unsafe --dontwarn com.google.common.collect.MinMaxPriorityQueue - --keepclasseswithmembers public class * { - public static void main(java.lang.String[]); -} \ No newline at end of file Modified: trunk/res/values/strings.xml =================================================================== --- trunk/res/values/strings.xml 2014-03-03 15:24:16 UTC (rev 62) +++ trunk/res/values/strings.xml 2014-03-03 17:36:04 UTC (rev 63) @@ -216,4 +216,9 @@ <string name="crash_dialog_comment_prompt">You might add your comments about the problem below:</string> <string name="crash_dialog_ok_toast">Thank you !</string> +  + <string name="update_dowload_error">Error while downloading the new version of WLO</string> + <string name="update_available_title">New version available</string> + <string name="update_available_message">A new version of WLO is available. Would you like to install it?</string> + </resources> Modified: trunk/res/values-fr/strings.xml =================================================================== --- trunk/res/values-fr/strings.xml 2014-03-03 15:24:16 UTC (rev 62) +++ trunk/res/values-fr/strings.xml 2014-03-03 17:36:04 UTC (rev 63) @@ -208,4 +208,9 @@ <string name="crash_dialog_comment_prompt">Vous pouvez ajouter un commentaire ci-dessous:</string> <string name="crash_dialog_ok_toast">Merci !</string> +  + <string name="update_dowload_error">Erreur lors du téléchargement de la dernière version de WLO</string> + <string name="update_available_title">Nouvelle version disponible</string> + <string name="update_available_message">Une nouvelle version de WLO est disponible. Voulez-vous la télécharger et l\'installer ?</string> + </resources> Modified: trunk/src/fr/ifremer/wlo/MainActivity.java =================================================================== --- trunk/src/fr/ifremer/wlo/MainActivity.java 2014-03-03 15:24:16 UTC (rev 62) +++ trunk/src/fr/ifremer/wlo/MainActivity.java 2014-03-03 17:36:04 UTC (rev 63) @@ -28,8 +28,10 @@ import android.app.AlertDialog; import android.app.ProgressDialog; import android.bluetooth.BluetoothAdapter; +import android.content.Context; import android.content.Intent; import android.content.res.Configuration; +import android.os.AsyncTask; import android.os.Bundle; import android.os.Handler; import android.os.Message; @@ -40,13 +42,14 @@ import android.widget.Button; import android.widget.LinearLayout; import android.widget.Toast; -import fr.ifremer.wlo.imports.ImportUtil; +import fr.ifremer.wlo.utils.ImportUtil; import fr.ifremer.wlo.models.categorization.CategoryModel; import fr.ifremer.wlo.preferences.SettingsActivity; import fr.ifremer.wlo.storage.DataCache; import fr.ifremer.wlo.storage.Exporter; import fr.ifremer.wlo.storage.WloSqlOpenHelper; import fr.ifremer.wlo.utils.UIUtils; +import fr.ifremer.wlo.utils.UpdateCheckTask; import fr.ifremer.wlo.utils.filechooser.FileDialog; import fr.ifremer.wlo.utils.filechooser.SelectionMode; import org.apache.commons.io.FileUtils; @@ -109,6 +112,9 @@ super.onCreate(savedInstanceState); + new InitializationTask().execute(); + new UpdateCheckTask(this).execute(); + mainPanel = (LinearLayout) findViewById(R.id.main_panel); logoPanel = (LinearLayout) findViewById(R.id.logo_panel); buttonPanel = (LinearLayout) findViewById(R.id.button_panel); @@ -277,4 +283,108 @@ startActivityForResult(serverIntent, REQUEST_CONNECT_ICHTYOMETER); } + protected class InitializationTask extends AsyncTask<Void, Integer, Void> { + + protected ProgressDialog dialog; + + @Override + protected void onPreExecute() { + super.onPreExecute(); + + dialog = new ProgressDialog(MainActivity.this); + dialog.setIndeterminate(false); + dialog.setCancelable(false); + dialog.setProgressStyle(ProgressDialog.STYLE_HORIZONTAL); + dialog.setMax(9); + dialog.setMessage(getString(R.string.main_loading_referential)); + dialog.show(); + } + + @Override + protected Void doInBackground(Void... params) { + Context context = MainActivity.this; + try { + int i = 1; + if (DataCache.getAllCommercialSpecies(context).isEmpty()) { + ImportUtil.importCommercialSpecies(context, getAssets().open("ref_import_commercial_species.csv")); + } + publishProgress(i++); + + if (DataCache.getAllLocations(context).isEmpty()) { + ImportUtil.importLocations(context, getAssets().open("ref_import_locations.csv")); + } + publishProgress(i++); + + if (DataCache.getAllMensurations(context).isEmpty()) { + ImportUtil.importMensurations(context, getAssets().open("ref_import_mensurations.csv")); + } + publishProgress(i++); + + if (DataCache.getAllMetiers(context).isEmpty()) { + ImportUtil.importMetiers(context, getAssets().open("ref_import_metiers.csv")); + } + publishProgress(i++); + + if (DataCache.getAllPresentations(context).isEmpty()) { + ImportUtil.importPresentations(context, getAssets().open("ref_import_presentations.csv")); + } + publishProgress(i++); + + if (DataCache.getAllScientificSpecies(context).isEmpty()) { + ImportUtil.importScientificSpecies(context, getAssets().open("ref_import_scientific_species.csv")); + } + publishProgress(i++); + + if (DataCache.getAllStates(context).isEmpty()) { + ImportUtil.importStates(context, getAssets().open("ref_import_states.csv")); + } + publishProgress(i++); + + if (DataCache.getAllVessels(context).isEmpty()) { + ImportUtil.importVessels(context, getAssets().open("ref_import_vessels.csv")); + } + publishProgress(i++); + + if (DataCache.getAllCategories(context).isEmpty()) { + WloSqlOpenHelper soh = new WloSqlOpenHelper(context); + + CategoryModel ageCategory = new CategoryModel(); + ageCategory.setLabel(getString(R.string.age)); + soh.saveData(ageCategory); + + CategoryModel genderCategory = new CategoryModel(); + genderCategory.setLabel(getString(R.string.gender)); + soh.saveData(genderCategory); + + CategoryModel maturityCategory = new CategoryModel(); + maturityCategory.setLabel(getString(R.string.maturity)); + soh.saveData(maturityCategory); + + soh.saveData(ImportUtil.importQualitativeValues(ageCategory, getAssets().open("ref_import_ages.csv"))); + soh.saveData(ImportUtil.importQualitativeValues(genderCategory, getAssets().open("ref_import_genders.csv"))); + soh.saveData(ImportUtil.importQualitativeValues(maturityCategory, getAssets().open("ref_import_maturities.csv"))); + + soh.close(); + } + publishProgress(i++); + + } catch (IOException | RuntimeException e) { + Log.e(TAG, "error on initial import", e); + } + return null; + } + + @Override + protected void onProgressUpdate(Integer... progress) { + dialog.setProgress(progress[0]); + } + + @Override + protected void onPostExecute(Void aVoid) { + super.onPostExecute(aVoid); + dialog.dismiss(); + } + + } + } \ No newline at end of file Modified: trunk/src/fr/ifremer/wlo/WloApplication.java =================================================================== --- trunk/src/fr/ifremer/wlo/WloApplication.java 2014-03-03 15:24:16 UTC (rev 62) +++ trunk/src/fr/ifremer/wlo/WloApplication.java 2014-03-03 17:36:04 UTC (rev 63) @@ -1,16 +1,23 @@ package fr.ifremer.wlo; import android.app.Application; +import android.app.DownloadManager; import android.app.ProgressDialog; +import android.content.BroadcastReceiver; +import android.content.Context; +import android.content.Intent; +import android.os.AsyncTask; import android.util.Log; -import fr.ifremer.wlo.imports.ImportUtil; +import fr.ifremer.wlo.utils.ImportUtil; import fr.ifremer.wlo.models.categorization.CategoryModel; import fr.ifremer.wlo.storage.DataCache; import fr.ifremer.wlo.storage.WloSqlOpenHelper; +import fr.ifremer.wlo.utils.UpdateCheckTask; import org.acra.ACRA; import org.acra.ReportingInteractionMode; import org.acra.annotation.ReportsCrashes; +import java.io.FileNotFoundException; import java.io.IOException; /** @@ -34,68 +41,6 @@ public void onCreate() { ACRA.init(this); super.onCreate(); - - new Thread(new Runnable() { - @Override - public void run() { - initData(); - } - }).start(); - } - protected void initData() { - try { - if (DataCache.getAllCommercialSpecies(this).isEmpty()) { - ImportUtil.importCommercialSpecies(this, getAssets().open("ref_import_commercial_species.csv")); - } - if (DataCache.getAllLocations(this).isEmpty()) { - ImportUtil.importLocations(this, getAssets().open("ref_import_locations.csv")); - } - if (DataCache.getAllMensurations(this).isEmpty()) { - ImportUtil.importMensurations(this, getAssets().open("ref_import_mensurations.csv")); - } - if (DataCache.getAllMetiers(this).isEmpty()) { - ImportUtil.importMetiers(this, getAssets().open("ref_import_metiers.csv")); - } - if (DataCache.getAllPresentations(this).isEmpty()) { - ImportUtil.importPresentations(this, getAssets().open("ref_import_presentations.csv")); - } - if (DataCache.getAllScientificSpecies(this).isEmpty()) { - ImportUtil.importScientificSpecies(this, getAssets().open("ref_import_scientific_species.csv")); - } - if (DataCache.getAllStates(this).isEmpty()) { - ImportUtil.importStates(this, getAssets().open("ref_import_states.csv")); - } - if (DataCache.getAllVessels(this).isEmpty()) { - ImportUtil.importVessels(this, getAssets().open("ref_import_vessels.csv")); - } - if (DataCache.getAllCategories(this).isEmpty()) { - WloSqlOpenHelper soh = new WloSqlOpenHelper(this); - - CategoryModel ageCategory = new CategoryModel(); - ageCategory.setLabel(getString(R.string.age)); - soh.saveData(ageCategory); - - CategoryModel genderCategory = new CategoryModel(); - genderCategory.setLabel(getString(R.string.gender)); - soh.saveData(genderCategory); - - CategoryModel maturityCategory = new CategoryModel(); - maturityCategory.setLabel(getString(R.string.maturity)); - soh.saveData(maturityCategory); - - soh.saveData(ImportUtil.importQualitativeValues(ageCategory, getAssets().open("ref_import_ages.csv"))); - soh.saveData(ImportUtil.importQualitativeValues(genderCategory, getAssets().open("ref_import_genders.csv"))); - soh.saveData(ImportUtil.importQualitativeValues(maturityCategory, getAssets().open("ref_import_maturities.csv"))); - - soh.close(); - } - - } catch (IOException | RuntimeException e) { - //TODO kmorin 20140130 show error to the user - Log.e(TAG, "error on initial import", e); - } - } - } Modified: trunk/src/fr/ifremer/wlo/WloBaseActivity.java =================================================================== --- trunk/src/fr/ifremer/wlo/WloBaseActivity.java 2014-03-03 15:24:16 UTC (rev 62) +++ trunk/src/fr/ifremer/wlo/WloBaseActivity.java 2014-03-03 17:36:04 UTC (rev 63) @@ -24,20 +24,30 @@ * #L% */ +import android.app.DownloadManager; +import android.content.BroadcastReceiver; import android.content.ComponentName; import android.content.Context; import android.content.Intent; +import android.content.IntentFilter; import android.content.ServiceConnection; +import android.database.Cursor; +import android.net.Uri; import android.os.Bundle; import android.os.IBinder; import android.os.Message; import android.os.Messenger; +import android.os.ParcelFileDescriptor; import android.os.RemoteException; import android.support.v7.app.ActionBar; import android.support.v7.app.ActionBarActivity; import android.util.Log; import android.view.View; +import android.widget.Toast; +import java.io.File; +import java.io.FileNotFoundException; + /** * @author kmorin <kmorin(a)codelutin.com> * @since 0.1 @@ -49,10 +59,47 @@ protected Messenger mServiceMessenger = null; protected Messenger mMessenger = null; + protected DownloadManager downloadManager; + protected static Long downloadingApkId = null; + protected final BroadcastReceiver downloadReceiver = new BroadcastReceiver() { + + @Override + public void onReceive(Context arg0, Intent arg1) { + DownloadManager.Query query = new DownloadManager.Query(); + query.setFilterById(downloadingApkId); + Cursor cursor = downloadManager.query(query); + + if(cursor.moveToFirst()){ + int columnIndex = cursor.getColumnIndex(DownloadManager.COLUMN_STATUS); + int status = cursor.getInt(columnIndex); + int columnReason = cursor.getColumnIndex(DownloadManager.COLUMN_REASON); + int reason = cursor.getInt(columnReason); + + if(status == DownloadManager.STATUS_SUCCESSFUL){ + //Retrieve the saved download id + Uri uri = downloadManager.getUriForDownloadedFile(downloadingApkId); + + Intent promptInstall = new Intent(Intent.ACTION_VIEW) + .setDataAndType(uri, "application/vnd.android.package-archive"); + startActivity(promptInstall); + + } else if (status == DownloadManager.STATUS_FAILED){ + Toast.makeText(WloBaseActivity.this, + R.string.update_dowload_error, + Toast.LENGTH_LONG).show(); + } + downloadingApkId = null; + } + } + + }; + @Override protected void onCreate(Bundle savedInstanceState) { super.onCreate(savedInstanceState); + downloadManager = (DownloadManager)getSystemService(DOWNLOAD_SERVICE); + Integer viewId = getContentView(); if (viewId != null) { setContentView(viewId); @@ -65,6 +112,19 @@ } @Override + protected void onResume() { + super.onResume(); + IntentFilter intentFilter = new IntentFilter(DownloadManager.ACTION_DOWNLOAD_COMPLETE); + registerReceiver(downloadReceiver, intentFilter); + } + + @Override + protected void onPause() { + super.onPause(); + unregisterReceiver(downloadReceiver); + } + + @Override protected void onDestroy() { Log.d(TAG, "destroy"); super.onDestroy(); @@ -128,4 +188,12 @@ Intent intent = new Intent(this, upClass); return intent; } + + public static Long getDownloadingApkId() { + return downloadingApkId; + } + + public static void setDownloadingApkId(Long downloadingApkId) { + WloBaseActivity.downloadingApkId = downloadingApkId; + } } Deleted: trunk/src/fr/ifremer/wlo/imports/ImportUtil.java =================================================================== --- trunk/src/fr/ifremer/wlo/imports/ImportUtil.java 2014-03-03 15:24:16 UTC (rev 62) +++ trunk/src/fr/ifremer/wlo/imports/ImportUtil.java 2014-03-03 17:36:04 UTC (rev 63) @@ -1,284 +0,0 @@ -package fr.ifremer.wlo.imports; - -/* - * #%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.content.Context; -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.Lists; -import fr.ifremer.wlo.models.BaseModel; -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.nuiton.csv.Import; -import org.nuiton.csv.ImportModel; - -import java.io.FileInputStream; -import java.io.FileNotFoundException; -import java.io.InputStream; -import java.util.ArrayList; -import java.util.Collection; - -/** - * @author kmorin <kmorin(a)codelutin.com> - * @since 0.1 - */ -public class ImportUtil { - - private static final String TAG = "ImportUtil"; - - public static final char CSV_SEPARATOR = ';'; - - public static int importCommercialSpecies(Context context, String path) { - try { - return importCommercialSpecies(context, new FileInputStream(path)); - } catch (FileNotFoundException e) { - Log.e(TAG, "File " + path + " not found", e); - } - return 0; - } - - public static int importCommercialSpecies(Context context, InputStream inputStream) { - CommercialSpeciesRowModel commercialSpeciesRowModel = new CommercialSpeciesRowModel(CSV_SEPARATOR); - int result = importData(context, commercialSpeciesRowModel, inputStream, DataCache.getAllCommercialSpecies(context)); - DataCache.invalidateCommercialSpecies(); - return result; - } - - public static int importLocations(Context context, String path) { - try { - return importLocations(context, new FileInputStream(path)); - } catch (FileNotFoundException e) { - Log.e(TAG, "File " + path + " not found", e); - } - return 0; - } - - public static int importLocations(Context context, InputStream inputStream) { - LocationRowModel locationRowModel = new LocationRowModel(CSV_SEPARATOR); - int result = importData(context, locationRowModel, inputStream, DataCache.getAllLocations(context)); - DataCache.invalidateLocations(); - return result; - } - - public static int importMensurations(Context context, String path) { - try { - return importMensurations(context, new FileInputStream(path)); - } catch (FileNotFoundException e) { - Log.e(TAG, "File " + path + " not found", e); - } - return 0; - } - - public static int importMensurations(Context context, InputStream inputStream) { - MensurationRowModel mensurationRowModel = new MensurationRowModel(CSV_SEPARATOR); - int result = importData(context, mensurationRowModel, inputStream, DataCache.getAllMensurations(context)); - DataCache.invalidateMensurations(); - return result; - } - - public static int importMetiers(Context context, String path) { - try { - return importMetiers(context, new FileInputStream(path)); - } catch (FileNotFoundException e) { - Log.e(TAG, "File " + path + " not found", e); - } - return 0; - } - - public static int importMetiers(Context context, InputStream inputStream) { - MetierRowModel metierRowModel = new MetierRowModel(CSV_SEPARATOR); - int result = importData(context, metierRowModel, inputStream, DataCache.getAllMetiers(context)); - DataCache.invalidateMetiers(); - return result; - } - - public static int importPresentations(Context context, String path) { - try { - return importPresentations(context, new FileInputStream(path)); - } catch (FileNotFoundException e) { - Log.e(TAG, "File " + path + " not found", e); - } - return 0; - } - - public static int importPresentations(Context context, InputStream inputStream) { - PresentationRowModel presentationRowModel = new PresentationRowModel(CSV_SEPARATOR); - int result = importData(context, presentationRowModel, inputStream, DataCache.getAllPresentations(context)); - DataCache.invalidatePresentations(); - return result; - } - - public static int importScientificSpecies(Context context, String path) { - try { - return importScientificSpecies(context, new FileInputStream(path)); - } catch (FileNotFoundException e) { - Log.e(TAG, "File " + path + " not found", e); - } - return 0; - } - - public static int importScientificSpecies(Context context, InputStream inputStream) { - ScientificSpeciesRowModel scientificSpeciesRowModel = new ScientificSpeciesRowModel(CSV_SEPARATOR); - int result = importData(context, scientificSpeciesRowModel, inputStream, DataCache.getAllScientificSpecies(context)); - DataCache.invalidateScientificSpecies(); - return result; - } - - public static int importStates(Context context, String path) { - try { - return importStates(context, new FileInputStream(path)); - } catch (FileNotFoundException e) { - Log.e(TAG, "File " + path + " not found", e); - } - return 0; - } - - public static int importStates(Context context, InputStream inputStream) { - StateRowModel stateRowModel = new StateRowModel(CSV_SEPARATOR); - int result = importData(context, stateRowModel, inputStream, DataCache.getAllStates(context)); - DataCache.invalidateStates(); - return result; - } - - public static int importVessels(Context context, String path) { - try { - return importVessels(context, new FileInputStream(path)); - } catch (FileNotFoundException e) { - Log.e(TAG, "File " + path + " not found", e); - } - return 0; - } - - public static int importVessels(Context context, InputStream inputStream) { - VesselRowModel vesselRowModel = new VesselRowModel(CSV_SEPARATOR); - int result = importData(context, vesselRowModel, inputStream, DataCache.getAllVessels(context)); - DataCache.invalidateVessels(); - return result; - } - - public static int importCalcifiedPartTakings(Context context, String path) { - try { - return importCalcifiedPartTakings(context, new FileInputStream(path)); - } catch (FileNotFoundException e) { - Log.e(TAG, "File " + path + " not found", e); - } - return 0; - } - - public static int importCalcifiedPartTakings(Context context, InputStream inputStream) { - CalcifiedPartTakingRowModel calcifiedPartTakingRowModel = new CalcifiedPartTakingRowModel(CSV_SEPARATOR, DataCache.getAllScientificSpecies(context)); - int result = importData(context, calcifiedPartTakingRowModel, inputStream, new ArrayList<CalcifiedPartTaking>()); - return result; - } - - public static Collection<QualitativeValueModel> importQualitativeValues(CategoryModel categoryModel, String path) { - try { - return importQualitativeValues(categoryModel, new FileInputStream(path)); - } catch (FileNotFoundException e) { - Log.e(TAG, "File " + path + " not found", e); - } - return null; - } - - public static Collection<QualitativeValueModel> importQualitativeValues(CategoryModel categoryModel, InputStream inputStream) { - QualitativeValueRowModel qualitativeValueRowModel = new QualitativeValueRowModel(CSV_SEPARATOR, categoryModel); - Collection<QualitativeValueModel> result = importData(qualitativeValueRowModel, inputStream, new ArrayList<QualitativeValueModel>()); - return result; - } - - protected static <M extends BaseModel> int importData(Context context, ImportModel<M> importModel, - InputStream inputStream, final Collection<M> actualReferential) { - - Collection<M> models = importData(importModel, inputStream, actualReferential); - - if (CollectionUtils.isNotEmpty(models)) { - Predicate<M> filter; - //if the models have a code attribute, check - M first = models.iterator().next(); - if (HasCode.class.isAssignableFrom(first.getClass())) { - Collection<HasCode> hasCodes = Collections2.transform(actualReferential, new Function<M, HasCode>() { - @Override - public HasCode apply(M m) { - return (HasCode) m; - } - }); - final Collection<String> codes = Collections2.transform(hasCodes, HasCode.GET_CODE_FUNCTION); - filter = new Predicate<M>() { - @Override - public boolean apply(M model) { - HasCode hasCode = (HasCode) model; - return !codes.contains(hasCode.getCode()); - } - }; - } else { - filter = new Predicate<M>() { - @Override - public boolean apply(M m) { - return !actualReferential.contains(m); - } - }; - } - - models = Collections2.filter(models, filter); - WloSqlOpenHelper soh = new WloSqlOpenHelper(context); - soh.saveData(models); - soh.close(); - } - - return models.size(); - } - - protected static <M extends BaseModel> Collection<M> importData(ImportModel<M> importModel, InputStream inputStream, - Collection<M> actualReferential) { - Preconditions.checkNotNull(actualReferential); - Import<M> importer = null; - Collection<M> models = null; - - try { - importer = Import.newImport(importModel, inputStream); - models = Lists.newArrayList(importer.iterator()); - - } catch (ClassCastException e) { - // cf issue #4205 - // nuiton-i18n provocks an error when trying to get the error message - Log.e(TAG, "error during import", e); - throw e; - - } finally { - if (importer != null) { - importer.close(); - } - } - return models; - } -} Modified: trunk/src/fr/ifremer/wlo/preferences/CategoryCreationAcivity.java =================================================================== --- trunk/src/fr/ifremer/wlo/preferences/CategoryCreationAcivity.java 2014-03-03 15:24:16 UTC (rev 62) +++ trunk/src/fr/ifremer/wlo/preferences/CategoryCreationAcivity.java 2014-03-03 17:36:04 UTC (rev 63) @@ -10,7 +10,7 @@ import android.widget.TextView; import fr.ifremer.wlo.R; import fr.ifremer.wlo.WloBaseActivity; -import fr.ifremer.wlo.imports.ImportUtil; +import fr.ifremer.wlo.utils.ImportUtil; import fr.ifremer.wlo.models.categorization.CategoryModel; import fr.ifremer.wlo.models.categorization.QualitativeValueModel; import fr.ifremer.wlo.storage.DataCache; @@ -100,16 +100,10 @@ // cf issue #4205 // nuiton-i18n provocks an error when trying to get the error message Log.e(TAG, "error during import", e); - runOnUiThread(new Runnable() { - @Override - public void run() { - new AlertDialog.Builder(CategoryCreationAcivity.this) - .setMessage(R.string.import_error) - .setNeutralButton(android.R.string.ok, UIUtils.getCancelClickListener()) - .create().show(); - } - }); - + new AlertDialog.Builder(CategoryCreationAcivity.this) + .setMessage(R.string.import_error) + .setNeutralButton(android.R.string.ok, UIUtils.getCancelClickListener()) + .create().show(); } } else { Modified: trunk/src/fr/ifremer/wlo/preferences/SettingsActivity.java =================================================================== --- trunk/src/fr/ifremer/wlo/preferences/SettingsActivity.java 2014-03-03 15:24:16 UTC (rev 62) +++ trunk/src/fr/ifremer/wlo/preferences/SettingsActivity.java 2014-03-03 17:36:04 UTC (rev 63) @@ -30,6 +30,7 @@ import android.content.DialogInterface; import android.content.Intent; import android.content.SharedPreferences; +import android.os.AsyncTask; import android.os.Bundle; import android.os.Environment; import android.preference.MultiSelectListPreference; @@ -38,6 +39,7 @@ import android.util.Log; import android.widget.Toast; import com.google.common.base.Functions; +import com.google.common.base.Preconditions; import com.google.common.collect.BiMap; import com.google.common.collect.Collections2; import com.google.common.collect.HashBiMap; @@ -51,7 +53,7 @@ import fr.ifremer.wlo.storage.DataCache; import fr.ifremer.wlo.storage.StorageUtils; import fr.ifremer.wlo.storage.WloSqlOpenHelper; -import fr.ifremer.wlo.imports.ImportUtil; +import fr.ifremer.wlo.utils.ImportUtil; import fr.ifremer.wlo.utils.UIUtils; import fr.ifremer.wlo.utils.filechooser.FileDialog; import fr.ifremer.wlo.utils.filechooser.SelectionMode; @@ -291,112 +293,8 @@ protected void importData(final int requestCode, final Intent data, final boolean backupFile) { final Context context = getActivity(); - - final ProgressDialog dialog = new ProgressDialog(context); - dialog.setCancelable(false); - dialog.setMessage(getString(R.string.preferences_importing_referential)); - dialog.show(); - - new Thread(new Runnable() { - @Override - public void run() { - String path = data.getStringExtra(FileDialog.RESULT_PATH); - Log.d(TAG, path); - final Integer updatedNb; - final Integer newNb; - - try { - switch (requestCode) { - case REQUEST_IMPORT_COMMERCIAL_SPECIES: - newNb = ImportUtil.importCommercialSpecies(context, path); - updatedNb = DataCache.getAllCommercialSpecies(context).size(); - break; - case REQUEST_IMPORT_LOCATIONS: - newNb = ImportUtil.importLocations(context, path); - updatedNb = DataCache.getAllLocations(context).size(); - break; - case REQUEST_IMPORT_MENSURATIONS: - newNb = ImportUtil.importMensurations(context, path); - updatedNb = DataCache.getAllMensurations(context).size(); - break; - case REQUEST_IMPORT_METIERS: - newNb = ImportUtil.importMetiers(context, path); - updatedNb = DataCache.getAllMetiers(context).size(); - break; - case REQUEST_IMPORT_PRESENTATIONS: - newNb = ImportUtil.importPresentations(context, path); - updatedNb = DataCache.getAllPresentations(context).size(); - break; - case REQUEST_IMPORT_SCIENTIFIC_SPECIES: - newNb = ImportUtil.importScientificSpecies(context, path); - updatedNb = DataCache.getAllScientificSpecies(context).size(); - break; - case REQUEST_IMPORT_STATES: - newNb = ImportUtil.importStates(context, path); - updatedNb = DataCache.getAllStates(context).size(); - break; - case REQUEST_IMPORT_VESSELS: - newNb = ImportUtil.importVessels(context, path); - updatedNb = DataCache.getAllVessels(context).size(); - break; - case REQUEST_IMPORT_CALCIFIED_PARTS_TAKINGS: - WloSqlOpenHelper soh = new WloSqlOpenHelper(context); - soh.clearCalcifiedPartTakings(); - soh.close(); - newNb = ImportUtil.importCalcifiedPartTakings(context, path); - updatedNb = null; - break; - default: - newNb = null; - updatedNb = null; - } - - if (backupFile) { - File importedFile = new File(path); - String copyFileName = String.format("%1$tY%1$tm%1$td-%1$tH%1$tM%1$tS-", new Date()) + importedFile.getName(); - File dir = Environment.getExternalStoragePublicDirectory(".wlo"); - File file = new File(dir, copyFileName); - try { - FileUtils.copyInputStreamToFile(new FileInputStream(path), file); - } catch (IOException e) { - Log.e(TAG, "Error while copying the file", e); - } - } - - getActivity().runOnUiThread(new Runnable() { - @Override - public void run() { - dialog.dismiss(); - - if (updatedNb != null) { - String key = requestCodeByPrefKey.inverse().get(requestCode); - Preference filePicker = findPreference(key); - filePicker.setSummary(getString(R.string.preferences_import_summary, updatedNb)); - } - - Toast.makeText(context, context.getString(R.string.import_new_element_number, newNb), Toast.LENGTH_SHORT).show(); - } - }); - - } catch (Exception e) { - // cf issue #4205 - // nuiton-i18n provocks an error when trying to get the error message - Log.e(TAG, "error during import", e); - getActivity().runOnUiThread(new Runnable() { - @Override - public void run() { - dialog.dismiss(); - new AlertDialog.Builder(context) - .setMessage(R.string.import_error) - .setNeutralButton(android.R.string.ok, UIUtils.getCancelClickListener()) - .create().show(); - } - }); - - } - - } - }).start(); + String path = data.getStringExtra(FileDialog.RESULT_PATH); + new ImportAsyncTask().execute(path, requestCode, backupFile); } protected <M extends BaseModel> void initMultiSelectListPreference(String prefKey, @@ -439,7 +337,145 @@ } pref.setSummary(getString(R.string.favorite_nb, favoriteIds.size())); } + + protected class ImportAsyncTask extends AsyncTask<Object, Integer, Integer[]> { + + protected ProgressDialog dialog; + + @Override + protected void onPreExecute() { + super.onPreExecute(); + + dialog = new ProgressDialog(getActivity()); + dialog.setCancelable(false); + dialog.setMessage(getString(R.string.preferences_importing_referential)); + dialog.show(); + } + + @Override + protected Integer[] doInBackground(Object... params) { + if (params.length != 3) { + return null; + } + Context context = getActivity(); + String path = (String) params[0]; + Integer requestCode = (Integer) params[1]; + Boolean backupFile = (Boolean) params[2]; + Log.d(TAG, path); + + Integer[] result = new Integer[3]; + result[2] = requestCode; + + try { + switch (requestCode) { + case REQUEST_IMPORT_COMMERCIAL_SPECIES: + result[0] = ImportUtil.importCommercialSpecies(context, path); + result[1] = DataCache.getAllCommercialSpecies(context).size(); + break; + case REQUEST_IMPORT_LOCATIONS: + result[0] = ImportUtil.importLocations(context, path); + result[1] = DataCache.getAllLocations(context).size(); + break; + case REQUEST_IMPORT_MENSURATIONS: + result[0] = ImportUtil.importMensurations(context, path); + result[1] = DataCache.getAllMensurations(context).size(); + break; + case REQUEST_IMPORT_METIERS: + result[0] = ImportUtil.importMetiers(context, path); + result[1] = DataCache.getAllMetiers(context).size(); + break; + case REQUEST_IMPORT_PRESENTATIONS: + result[0] = ImportUtil.importPresentations(context, path); + result[1] = DataCache.getAllPresentations(context).size(); + break; + case REQUEST_IMPORT_SCIENTIFIC_SPECIES: + result[0] = ImportUtil.importScientificSpecies(context, path); + result[1] = DataCache.getAllScientificSpecies(context).size(); + break; + case REQUEST_IMPORT_STATES: + result[0] = ImportUtil.importStates(context, path); + result[1] = DataCache.getAllStates(context).size(); + break; + case REQUEST_IMPORT_VESSELS: + result[0] = ImportUtil.importVessels(context, path); + result[1] = DataCache.getAllVessels(context).size(); + break; + case REQUEST_IMPORT_CALCIFIED_PARTS_TAKINGS: + WloSqlOpenHelper soh = new WloSqlOpenHelper(context); + soh.clearCalcifiedPartTakings(); + soh.close(); + result[0] = ImportUtil.importCalcifiedPartTakings(context, path); + result[1] = null; + break; + default: + result[0] = null; + result[1] = null; + } + + if (backupFile) { + File importedFile = new File(path); + String copyFileName = String.format("%1$tY%1$tm%1$td-%1$tH%1$tM%1$tS-", new Date()) + importedFile.getName(); + File dir = Environment.getExternalStoragePublicDirectory(".wlo"); + File file = new File(dir, copyFileName); + try { + FileUtils.copyInputStreamToFile(new FileInputStream(path), file); + } catch (IOException e) { + Log.e(TAG, "Error while copying the file", e); + } + } + + } catch (Exception e) { + // cf issue #4205 + // nuiton-i18n provocks an error when trying to get the error message + Log.e(TAG, "error during import", e); + result = null; + cancel(true); + + } + return result; + } + + @Override + protected void onPostExecute(Integer[] result) { + super.onPostExecute(result); + + dialog.dismiss(); + + if (result != null) { + if (result[1] != null) { + String key = requestCodeByPrefKey.inverse().get(result[2]); + Preference filePicker = findPreference(key); + filePicker.setSummary(getString(R.string.preferences_import_summary, result[1])); + } + + Toast.makeText(getActivity(), getString(R.string.import_new_element_number, result[0]), Toast.LENGTH_LONG).show(); + +// } else { +// //error +// new AlertDialog.Builder(getActivity()) +// .setMessage(R.string.import_error) +// .setNeutralButton(android.R.string.ok, UIUtils.getCancelClickListener()) +// .create().show(); + } + } + + @Override + protected void onCancelled(Integer[] integer) { + super.onCancelled(integer); + dialog.dismiss(); + + new AlertDialog.Builder(getActivity()) + .setMessage(R.string.import_error) + .setNeutralButton(android.R.string.ok, UIUtils.getCancelClickListener()) + .create().show(); + } + + @Override + protected void onCancelled() { + super.onCancelled(); + onCancelled(null); + } + } } - } \ No newline at end of file Copied: trunk/src/fr/ifremer/wlo/utils/ImportUtil.java (from rev 57, trunk/src/fr/ifremer/wlo/imports/ImportUtil.java) =================================================================== --- trunk/src/fr/ifremer/wlo/utils/ImportUtil.java (rev 0) +++ trunk/src/fr/ifremer/wlo/utils/ImportUtil.java 2014-03-03 17:36:04 UTC (rev 63) @@ -0,0 +1,295 @@ +package fr.ifremer.wlo.utils; + +/* + * #%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.content.Context; +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.Lists; +import fr.ifremer.wlo.imports.CalcifiedPartTakingRowModel; +import fr.ifremer.wlo.imports.CommercialSpeciesRowModel; +import fr.ifremer.wlo.imports.LocationRowModel; +import fr.ifremer.wlo.imports.MensurationRowModel; +import fr.ifremer.wlo.imports.MetierRowModel; +import fr.ifremer.wlo.imports.PresentationRowModel; +import fr.ifremer.wlo.imports.QualitativeValueRowModel; +import fr.ifremer.wlo.imports.ScientificSpeciesRowModel; +import fr.ifremer.wlo.imports.StateRowModel; +import fr.ifremer.wlo.imports.VesselRowModel; +import fr.ifremer.wlo.models.BaseModel; +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.nuiton.csv.Import; +import org.nuiton.csv.ImportModel; + +import java.io.FileInputStream; +import java.io.FileNotFoundException; +import java.io.InputStream; +import java.util.ArrayList; +import java.util.Collection; + +/** + * @author kmorin <kmorin(a)codelutin.com> + * @since 0.1 + */ +public class ImportUtil { + + private static final String TAG = "ImportUtil"; + + public static final char CSV_SEPARATOR = ';'; + + public static int importCommercialSpecies(Context context, String path) { + try { + return importCommercialSpecies(context, new FileInputStream(path)); + } catch (FileNotFoundException e) { + Log.e(TAG, "File " + path + " not found", e); + } + return 0; + } + + public static int importCommercialSpecies(Context context, InputStream inputStream) { + CommercialSpeciesRowModel commercialSpeciesRowModel = new CommercialSpeciesRowModel(CSV_SEPARATOR); + int result = importData(context, commercialSpeciesRowModel, inputStream, DataCache.getAllCommercialSpecies(context)); + DataCache.invalidateCommercialSpecies(); + return result; + } + + public static int importLocations(Context context, String path) { + try { + return importLocations(context, new FileInputStream(path)); + } catch (FileNotFoundException e) { + Log.e(TAG, "File " + path + " not found", e); + } + return 0; + } + + public static int importLocations(Context context, InputStream inputStream) { + LocationRowModel locationRowModel = new LocationRowModel(CSV_SEPARATOR); + int result = importData(context, locationRowModel, inputStream, DataCache.getAllLocations(context)); + DataCache.invalidateLocations(); + return result; + } + + public static int importMensurations(Context context, String path) { + try { + return importMensurations(context, new FileInputStream(path)); + } catch (FileNotFoundException e) { + Log.e(TAG, "File " + path + " not found", e); + } + return 0; + } + + public static int importMensurations(Context context, InputStream inputStream) { + MensurationRowModel mensurationRowModel = new MensurationRowModel(CSV_SEPARATOR); + int result = importData(context, mensurationRowModel, inputStream, DataCache.getAllMensurations(context)); + DataCache.invalidateMensurations(); + return result; + } + + public static int importMetiers(Context context, String path) { + try { + return importMetiers(context, new FileInputStream(path)); + } catch (FileNotFoundException e) { + Log.e(TAG, "File " + path + " not found", e); + } + return 0; + } + + public static int importMetiers(Context context, InputStream inputStream) { + MetierRowModel metierRowModel = new MetierRowModel(CSV_SEPARATOR); + int result = importData(context, metierRowModel, inputStream, DataCache.getAllMetiers(context)); + DataCache.invalidateMetiers(); + return result; + } + + public static int importPresentations(Context context, String path) { + try { + return importPresentations(context, new FileInputStream(path)); + } catch (FileNotFoundException e) { + Log.e(TAG, "File " + path + " not found", e); + } + return 0; + } + + public static int importPresentations(Context context, InputStream inputStream) { + PresentationRowModel presentationRowModel = new PresentationRowModel(CSV_SEPARATOR); + int result = importData(context, presentationRowModel, inputStream, DataCache.getAllPresentations(context)); + DataCache.invalidatePresentations(); + return result; + } + + public static int importScientificSpecies(Context context, String path) { + try { + return importScientificSpecies(context, new FileInputStream(path)); + } catch (FileNotFoundException e) { + Log.e(TAG, "File " + path + " not found", e); + } + return 0; + } + + public static int importScientificSpecies(Context context, InputStream inputStream) { + ScientificSpeciesRowModel scientificSpeciesRowModel = new ScientificSpeciesRowModel(CSV_SEPARATOR); + int result = importData(context, scientificSpeciesRowModel, inputStream, DataCache.getAllScientificSpecies(context)); + DataCache.invalidateScientificSpecies(); + return result; + } + + public static int importStates(Context context, String path) { + try { + return importStates(context, new FileInputStream(path)); + } catch (FileNotFoundException e) { + Log.e(TAG, "File " + path + " not found", e); + } + return 0; + } + + public static int importStates(Context context, InputStream inputStream) { + StateRowModel stateRowModel = new StateRowModel(CSV_SEPARATOR); + int result = importData(context, stateRowModel, inputStream, DataCache.getAllStates(context)); + DataCache.invalidateStates(); + return result; + } + + public static int importVessels(Context context, String path) { + try { + return importVessels(context, new FileInputStream(path)); + } catch (FileNotFoundException e) { + Log.e(TAG, "File " + path + " not found", e); + } + return 0; + } + + public static int importVessels(Context context, InputStream inputStream) { + VesselRowModel vesselRowModel = new VesselRowModel(CSV_SEPARATOR); + int result = importData(context, vesselRowModel, inputStream, DataCache.getAllVessels(context)); + DataCache.invalidateVessels(); + return result; + } + + public static int importCalcifiedPartTakings(Context context, String path) { + try { + return importCalcifiedPartTakings(context, new FileInputStream(path)); + } catch (FileNotFoundException e) { + Log.e(TAG, "File " + path + " not found", e); + } + return 0; + } + + public static int importCalcifiedPartTakings(Context context, InputStream inputStream) { + CalcifiedPartTakingRowModel calcifiedPartTakingRowModel = new CalcifiedPartTakingRowModel(CSV_SEPARATOR, DataCache.getAllScientificSpecies(context)); + int result = importData(context, calcifiedPartTakingRowModel, inputStream, new ArrayList<CalcifiedPartTaking>()); + return result; + } + + public static Collection<QualitativeValueModel> importQualitativeValues(CategoryModel categoryModel, String path) { + try { + return importQualitativeValues(categoryModel, new FileInputStream(path)); + } catch (FileNotFoundException e) { + Log.e(TAG, "File " + path + " not found", e); + } + return null; + } + + public static Collection<QualitativeValueModel> importQualitativeValues(CategoryModel categoryModel, InputStream inputStream) { + QualitativeValueRowModel qualitativeValueRowModel = new QualitativeValueRowModel(CSV_SEPARATOR, categoryModel); + Collection<QualitativeValueModel> result = importData(qualitativeValueRowModel, inputStream, new ArrayList<QualitativeValueModel>()); + return result; + } + + protected static <M extends BaseModel> int importData(Context context, ImportModel<M> importModel, + InputStream inputStream, final Collection<M> actualReferential) { + + Collection<M> models = importData(importModel, inputStream, actualReferential); + + if (CollectionUtils.isNotEmpty(models)) { + Predicate<M> filter; + //if the models have a code attribute, check + M first = models.iterator().next(); + if (HasCode.class.isAssignableFrom(first.getClass())) { + Collection<HasCode> hasCodes = Collections2.transform(actualReferential, new Function<M, HasCode>() { + @Override + public HasCode apply(M m) { + return (HasCode) m; + } + }); + final Collection<String> codes = Collections2.transform(hasCodes, HasCode.GET_CODE_FUNCTION); + filter = new Predicate<M>() { + @Override + public boolean apply(M model) { + HasCode hasCode = (HasCode) model; + return !codes.contains(hasCode.getCode()); + } + }; + } else { + filter = new Predicate<M>() { + @Override + public boolean apply(M m) { + return !actualReferential.contains(m); + } + }; + } + + models = Collections2.filter(models, filter); + WloSqlOpenHelper soh = new WloSqlOpenHelper(context); + soh.saveData(models); + soh.close(); + } + + return models.size(); + } + + protected static <M extends BaseModel> Collection<M> importData(ImportModel<M> importModel, InputStream inputStream, + Collection<M> actualReferential) { + Preconditions.checkNotNull(actualReferential); + Import<M> importer = null; + Collection<M> models = null; + + try { + importer = Import.newImport(importModel, inputStream); + models = Lists.newArrayList(importer.iterator()); + + } catch (ClassCastException e) { + // cf issue #4205 + // nuiton-i18n provocks an error when trying to get the error message + Log.e(TAG, "error during import", e); + throw e; + + } finally { + if (importer != null) { + importer.close(); + } + } + return models; + } +} Modified: trunk/src/fr/ifremer/wlo/utils/UpdateCheckTask.java =================================================================== --- trunk/src/fr/ifremer/wlo/utils/UpdateCheckTask.java 2014-03-03 15:24:16 UTC (rev 62) +++ trunk/src/fr/ifremer/wlo/utils/UpdateCheckTask.java 2014-03-03 17:36:04 UTC (rev 63) @@ -1,18 +1,111 @@ package fr.ifremer.wlo.utils; +import android.app.AlertDialog; +import android.app.DownloadManager; +import android.content.BroadcastReceiver; +import android.content.Context; +import android.content.DialogInterface; +import android.content.Intent; +import android.content.IntentFilter; +import android.content.pm.PackageManager; +import android.database.Cursor; +import android.net.Uri; import android.os.AsyncTask; +import android.os.Environment; +import android.util.Log; +import android.widget.Toast; +import fr.ifremer.wlo.R; +import fr.ifremer.wlo.WloBaseActivity; +import org.nuiton.util.Version; +import org.nuiton.util.VersionUtil; +import java.io.BufferedReader; +import java.io.FileNotFoundException; +import java.io.IOException; +import java.io.InputStreamReader; +import java.net.MalformedURLException; import java.net.URL; +import java.util.Date; +import java.util.Properties; /** * @author Kevin Morin (Code Lutin) * @since x.x */ -public class UpdateCheckTask extends AsyncTask<URL, Integer, Long> { +public class UpdateCheckTask extends AsyncTask<String, Integer, String> { + private static final String TAG = "UpdateCheckTask"; + + public static final String UPDATE_URL = "http://appup.nuiton.org/wlo/wlo-update.properties"; + public static final String VERSION_PROP = "application.version"; + public static final String URL_PROP = "application.url"; + + protected Context context; + + public UpdateCheckTask(Context context) { + this.context = context; + } + @Override - protected Long doInBackground(URL... params) { + protected String doInBackground(String... params) { + String result; - return null; + if (WloBaseActivity.getDownloadingApkId() != null) { + result = null; + } else { + try { + // Create a URL for the desired page + URL url = new URL(UPDATE_URL); + + Properties props = new Properties(); + props.load(url.openStream()); + String version = props.getProperty(VERSION_PROP); + + String currentVersion = context.getPackageManager().getPackageInfo(context.getPackageName(), 0).versionName; + + Version newVersion = new Version(version); + if (!newVersion.isSnapshot() && VersionUtil.greaterThan(version, currentVersion)) { + result = props.getProperty(URL_PROP); + + } else { + Log.d(TAG, "The application is up to date"); + result = null; + } + + } catch (IOException | PackageManager.NameNotFoundException e) { + Log.e(TAG, "error while getting the version"); + cancel(true); + result = null; + } + } + + return result; } + + @Override + protected void onPostExecute(final String result) { + super.onPostExecute(result); + if (result != null && WloBaseActivity.getDownloadingApkId() == null) { + + new AlertDialog.Builder(context) + .setTitle(R.string.update_available_title) + .setMessage(R.string.update_available_message) + .setNegativeButton(R.string.no, UIUtils.getCancelClickListener()) + .setPositiveButton(R.string.yes, new DialogInterface.OnClickListener() { + @Override + public void onClick(DialogInterface dialog, int which) { + DownloadManager downloadManager = (DownloadManager) context.getSystemService(Context.DOWNLOAD_SERVICE); + Uri toDownload = Uri.parse(result); + DownloadManager.Request request = new DownloadManager.Request(toDownload); + request.setDestinationInExternalPublicDir(Environment.DIRECTORY_DOWNLOADS, toDownload.getLastPathSegment()); + long enqueue = downloadManager.enqueue(request); + WloBaseActivity.setDownloadingApkId(enqueue); + } + }) + .create() + .show(); + + } + } + }

1 0

r62 - in trunk: . update
by tchemit＠users.forge.codelutin.com 03 Mar '14

03 Mar '14

Author: tchemit Date: 2014-03-03 16:24:16 +0100 (Mon, 03 Mar 2014) New Revision: 62 Url: http://forge.codelutin.com/projects/wlo/repository/revisions/62 Log: refs #4630: [TECH] Mise ?\195?\160 jour automatique de l'application Added: trunk/update/ trunk/update/wlo-update.properties Modified: trunk/pom.xml Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2014-03-03 12:45:57 UTC (rev 61) +++ trunk/pom.xml 2014-03-03 15:24:16 UTC (rev 62) @@ -503,6 +503,75 @@ </plugins> </build> </profile> + + <profile> + <id>deploy-wlo-application-update</id> + <activation> + <property> + <name>performRelease</name> + <value>true</value> + </property> + </activation> + + <build> + <defaultGoal>deploy</defaultGoal> + <plugins> + <plugin> + <artifactId>maven-antrun-plugin</artifactId> + <executions> + <execution> + <id>Generate wlo-update.properties</id> + <phase>package</phase> + <inherited>false</inherited> + <configuration> + <tasks> + <copy verbose="true" failonerror="false" overwrite="true" filtering="true" todir="${project.build.directory}/update"> + <filterset> + <filter value="${project.version}" token="projectVersion" /> + </filterset> + <fileset dir="${basedir}/update/"> + <include name="wlo-update.properties" /> + </fileset> + </copy> + </tasks> + </configuration> + <goals> + <goal>run</goal> + </goals> + </execution> + </executions> + </plugin> + + <plugin> + <groupId>org.codehaus.mojo</groupId> + <artifactId>wagon-maven-plugin</artifactId> + <version>1.0-beta-4</version> + <executions> + <execution> + <id>deploy wlo-update.properties</id> + <phase>deploy</phase> + <inherited>false</inherited> + <goals> + <goal>upload-single</goal> + </goals> + <configuration> + <serverId>doc.codelutin.com</serverId> + <fromFile> + ${project.build.directory}/update/wlo-update.properties + </fromFile> + <url> + scpexe://doc.codelutin.com/var/www/ApplicationUpdate/http/wlo + </url> + </configuration> + </execution> + </executions> + + </plugin> + </plugins> + </build> + + </profile> + </profiles> </project> Added: trunk/update/wlo-update.properties =================================================================== --- trunk/update/wlo-update.properties (rev 0) +++ trunk/update/wlo-update.properties 2014-03-03 15:24:16 UTC (rev 62) @@ -0,0 +1,28 @@ +### +# #%L +# WLO +# %% +# Copyright (C) 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% +### + +################################################################################ +### Application Updates ######################################################## +################################################################################ + +application.version=@projectVersion@ +application.url=https://nexus.nuiton.org/nexus/content/groups/wlo-group/fr/ifremer/wlo/@projectVersion@/wlo-@projectVersion@.apk Property changes on: trunk/update/wlo-update.properties ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision Added: svn:eol-style + native

1 0

r61 - in trunk: res/layout src/fr/ifremer/wlo src/fr/ifremer/wlo/utils
by kmorin＠users.forge.codelutin.com 03 Mar '14

03 Mar '14

Author: kmorin Date: 2014-03-03 13:45:57 +0100 (Mon, 03 Mar 2014) New Revision: 61 Url: http://forge.codelutin.com/projects/wlo/repository/revisions/61 Log: fix bug when the user selects the item "No appaired device" in the device list Added: trunk/res/layout/device_list.xml trunk/src/fr/ifremer/wlo/utils/UpdateCheckTask.java Modified: trunk/src/fr/ifremer/wlo/DeviceListActivity.java Added: trunk/res/layout/device_list.xml =================================================================== --- trunk/res/layout/device_list.xml (rev 0) +++ trunk/res/layout/device_list.xml 2014-03-03 12:45:57 UTC (rev 61) @@ -0,0 +1,19 @@ +<?xml version="1.0" encoding="utf-8"?> + +<FrameLayout xmlns:android="http://schemas.android.com/apk/res/android" + android:layout_width="match_parent" + android:layout_height="match_parent"> + + <ListView android:id="@android:id/list" + android:layout_width="match_parent" + android:layout_height="match_parent" /> + + <TextView android:id="@android:id/empty" + android:text="@string/devices_none_paired" + android:layout_width="match_parent" + android:layout_height="wrap_content" + android:padding="5dp" + android:textSize="18sp" + android:textStyle="italic"/> + +</FrameLayout> \ No newline at end of file Modified: trunk/src/fr/ifremer/wlo/DeviceListActivity.java =================================================================== --- trunk/src/fr/ifremer/wlo/DeviceListActivity.java 2014-03-02 19:42:31 UTC (rev 60) +++ trunk/src/fr/ifremer/wlo/DeviceListActivity.java 2014-03-03 12:45:57 UTC (rev 61) @@ -56,6 +56,7 @@ import android.os.RemoteException; import android.util.Log; import android.view.View; +import android.view.ViewGroup; import android.widget.AdapterView; import android.widget.AdapterView.OnItemClickListener; import android.widget.ArrayAdapter; @@ -91,39 +92,15 @@ protected void onCreate(Bundle savedInstanceState) { super.onCreate(savedInstanceState); - // Initialize the button to perform device discovery -// Button scanButton = (Button) findViewById(R.id.button_scan); -// scanButton.setOnClickListener(new OnClickListener() { -// public void onClick(View v) { -// doDiscovery(); -// v.setVisibility(View.GONE); -// } -// }); + setContentView(R.layout.device_list); - // Initialize array adapters. One for already paired devices and - // one for newly discovered devices mPairedDevicesArrayAdapter = new ArrayAdapter<String>(this, R.layout.device_name); -// mNewDevicesArrayAdapter = new ArrayAdapter<String>(this, R.layout.device_name); // Find and set up the ListView for paired devices -// ListView pairedListView = (ListView) findViewById(R.id.paired_devices); ListView pairedListView = getListView(); pairedListView.setAdapter(mPairedDevicesArrayAdapter); pairedListView.setOnItemClickListener(mDeviceClickListener); - // Find and set up the ListView for newly discovered devices -// ListView newDevicesListView = (ListView) findViewById(R.id.new_devices); -// newDevicesListView.setAdapter(mNewDevicesArrayAdapter); -// newDevicesListView.setOnItemClickListener(mDeviceClickListener); - - // Register for broadcasts when a device is discovered -// IntentFilter filter = new IntentFilter(BluetoothDevice.ACTION_FOUND); -// this.registerReceiver(mReceiver, filter); - - // Register for broadcasts when discovery has finished -// filter = new IntentFilter(BluetoothAdapter.ACTION_DISCOVERY_FINISHED); -// this.registerReceiver(mReceiver, filter); - // Get the local Bluetooth adapter mBtAdapter = BluetoothAdapter.getDefaultAdapter(); @@ -132,13 +109,9 @@ // If there are paired devices, add each one to the ArrayAdapter if (pairedDevices.size() > 0) { -// findViewById(R.id.title_paired_devices).setVisibility(View.VISIBLE); for (BluetoothDevice device : pairedDevices) { mPairedDevicesArrayAdapter.add(device.getName() + "\n" + device.getAddress()); } - } else { - String noDevices = getResources().getText(R.string.devices_none_paired).toString(); - mPairedDevicesArrayAdapter.add(noDevices); } bindService(new Intent(this, BigFinCommunicationService.class), this, Context.BIND_AUTO_CREATE); @@ -153,32 +126,9 @@ mBtAdapter.cancelDiscovery(); } - // Unregister broadcast listeners -// this.unregisterReceiver(mReceiver); doUnbindService(); } - /** - * Start device discover with the BluetoothAdapter - */ -// private void doDiscovery() { -// Log.d(TAG, "doDiscovery()"); -// -// // Indicate scanning in the title -// setProgressBarIndeterminateVisibility(true); -// setTitle(R.string.scanning); -// -// // Turn on sub-title for new devices -// findViewById(R.id.title_new_devices).setVisibility(View.VISIBLE); -// -// // If we're already discovering, stop it -// if (mBtAdapter.isDiscovering()) { -// mBtAdapter.cancelDiscovery(); -// } -// -// // Request discover from BluetoothAdapter -// mBtAdapter.startDiscovery(); -// } /** * Un-bind this Activity to MyService @@ -227,10 +177,6 @@ String info = ((TextView) v).getText().toString(); String address = info.substring(info.length() - 17); - // Create the result Intent and include the MAC address -// Intent intent = new Intent(); -// intent.putExtra(EXTRA_DEVICE_ADDRESS, address); - // Attempt to connect to the device Message message = Message.obtain(null, BigFinCommunicationService.MESSAGE_CONNECT_DEVICE); Bundle bundle = new Bundle(); @@ -243,39 +189,9 @@ Log.e(TAG, "Error while sending data to the service"); } - // Set result and finish this Activity -// setResult(Activity.RESULT_OK, intent); -// finish(); } }; - // The BroadcastReceiver that listens for discovered devices and - // changes the title when discovery is finished -// private final BroadcastReceiver mReceiver = new BroadcastReceiver() { -// @Override -// public void onReceive(Context context, Intent intent) { -// String action = intent.getAction(); -// -// // When discovery finds a device -// if (BluetoothDevice.ACTION_FOUND.equals(action)) { -// // Get the BluetoothDevice object from the Intent -// BluetoothDevice device = intent.getParcelableExtra(BluetoothDevice.EXTRA_DEVICE); -// // If it's already paired, skip it, because it's been listed already -// if (device.getBondState() != BluetoothDevice.BOND_BONDED) { -// mNewDevicesArrayAdapter.add(device.getName() + "\n" + device.getAddress()); -// } -// // When discovery is finished, change the Activity title -// } else if (BluetoothAdapter.ACTION_DISCOVERY_FINISHED.equals(action)) { -// setProgressBarIndeterminateVisibility(false); -// setTitle(R.string.select_device); -// if (mNewDevicesArrayAdapter.getCount() == 0) { -// String noDevices = getResources().getText(R.string.none_found).toString(); -// mNewDevicesArrayAdapter.add(noDevices); -// } -// } -// } -// }; - protected void sendDataToDevice(String data) { Message message = Message.obtain(null, BigFinCommunicationService.MESSAGE_SEND_DATA); Bundle bundle = new Bundle(); Added: trunk/src/fr/ifremer/wlo/utils/UpdateCheckTask.java =================================================================== --- trunk/src/fr/ifremer/wlo/utils/UpdateCheckTask.java (rev 0) +++ trunk/src/fr/ifremer/wlo/utils/UpdateCheckTask.java 2014-03-03 12:45:57 UTC (rev 61) @@ -0,0 +1,18 @@ +package fr.ifremer.wlo.utils; + +import android.os.AsyncTask; + +import java.net.URL; + +/** + * @author Kevin Morin (Code Lutin) + * @since x.x + */ +public class UpdateCheckTask extends AsyncTask<URL, Integer, Long> { + + @Override + protected Long doInBackground(URL... params) { + + return null; + } +}

1 0

r60 - in trunk: res/layout src/fr/ifremer/wlo src/fr/ifremer/wlo/measurement
by kmorin＠users.forge.codelutin.com 02 Mar '14

02 Mar '14

Author: kmorin Date: 2014-03-02 20:42:31 +0100 (Sun, 02 Mar 2014) New Revision: 60 Url: http://codelutin.com/projects/wlo/repository/revisions/60 Log: refs #4372 navigation ?\195?\160 am?\195?\169liorer refs #4253 proposer le m?\195?\170me principe de navigation disponible actuellement sur le lot feuille (observations) ?\195?\160 toutes les ?\195?\169tapes Added: trunk/res/layout/wlo_list.xml Modified: trunk/src/fr/ifremer/wlo/ScientificSpeciesActivity.java trunk/src/fr/ifremer/wlo/WloBaseListActivity.java trunk/src/fr/ifremer/wlo/measurement/MeasurementActivity.java Copied: trunk/res/layout/wlo_list.xml (from rev 57, trunk/res/layout/measurement.xml) =================================================================== --- trunk/res/layout/wlo_list.xml (rev 0) +++ trunk/res/layout/wlo_list.xml 2014-03-02 19:42:31 UTC (rev 60) @@ -0,0 +1,20 @@ +<?xml version="1.0" encoding="utf-8"?> + +<android.support.v4.widget.DrawerLayout + xmlns:android="http://schemas.android.com/apk/res/android" + android:id="@+id/drawer_layout" + android:layout_width="match_parent" + android:layout_height="match_parent"> + + <ListView android:id="@android:id/list" + android:layout_width="match_parent" + android:layout_height="match_parent"/> + + <ListView android:id="@+id/left_drawer" + android:layout_width="240dp" + android:layout_height="match_parent" + android:layout_gravity="start" + android:choiceMode="singleChoice" + android:background="@color/dark_gray"/> + +</android.support.v4.widget.DrawerLayout> \ No newline at end of file Modified: trunk/src/fr/ifremer/wlo/ScientificSpeciesActivity.java =================================================================== --- trunk/src/fr/ifremer/wlo/ScientificSpeciesActivity.java 2014-03-01 21:36:10 UTC (rev 59) +++ trunk/src/fr/ifremer/wlo/ScientificSpeciesActivity.java 2014-03-02 19:42:31 UTC (rev 60) @@ -113,9 +113,10 @@ @Override protected void onListItemClick(ListView l, View v, int position, long id) { ScientificSpeciesModel model = createNewModel(l, position); - Log.d(TAG, model.toString(this) + " clicked"); + updateDrawerItems(model); + Intent intent = new Intent(this, getNextActivity()); intent.putExtra(MeasurementActivity.INTENT_EXTRA_SCIENTIFIC_SPECIES, model); startActivity(intent); Modified: trunk/src/fr/ifremer/wlo/WloBaseListActivity.java =================================================================== --- trunk/src/fr/ifremer/wlo/WloBaseListActivity.java 2014-03-01 21:36:10 UTC (rev 59) +++ trunk/src/fr/ifremer/wlo/WloBaseListActivity.java 2014-03-02 19:42:31 UTC (rev 60) @@ -39,6 +39,7 @@ * #L% */ +import android.app.ActionBar; import android.app.AlertDialog; import android.content.DialogInterface; import android.content.Intent; @@ -46,6 +47,8 @@ import android.database.Cursor; import android.os.Bundle; import android.os.Handler; +import android.support.v4.app.ActionBarDrawerToggle; +import android.support.v4.widget.DrawerLayout; import android.support.v4.widget.SimpleCursorAdapter; import android.util.Log; import android.view.ContextMenu; @@ -54,14 +57,29 @@ import android.view.MenuItem; import android.view.View; import android.widget.AdapterView; +import android.widget.ArrayAdapter; import android.widget.ListAdapter; import android.widget.ListView; +import com.google.common.base.Function; +import com.google.common.collect.Lists; import fr.ifremer.wlo.models.BaseModel; +import fr.ifremer.wlo.models.CommercialSpeciesModel; +import fr.ifremer.wlo.models.ContextModel; import fr.ifremer.wlo.models.HierarchicalModel; +import fr.ifremer.wlo.models.LocationModel; +import fr.ifremer.wlo.models.MetierModel; +import fr.ifremer.wlo.models.ScientificSpeciesModel; +import fr.ifremer.wlo.models.VesselModel; import fr.ifremer.wlo.storage.WloSqlOpenHelper; import fr.ifremer.wlo.utils.UIUtils; import fr.ifremer.wlo.utils.WloItemListViewBinder; +import java.util.ArrayList; +import java.util.Collection; +import java.util.LinkedHashMap; +import java.util.List; +import java.util.Map; + /** * An activity that displays a list of items by binding to a data source such as * an array or Cursor, and exposes event handlers when the user selects an item. @@ -220,11 +238,18 @@ public static final String INTENT_EXTRA_PARENT_MODEL = "parentModel"; + public static final int REQUEST_EDIT_MODEL = 0; + + protected final static Map<Class, BaseModel> drawerItems = new LinkedHashMap<>(); + protected BaseModel parentModel; protected WloSqlOpenHelper woh; protected SimpleCursorAdapter adapter; + protected ActionBarDrawerToggle mDrawerToggle; + protected ListView mDrawerList; + /** * This field should be made private, so it is hidden from the SDK. * {@hide} @@ -264,7 +289,7 @@ @Override protected Integer getContentView() { - return android.R.layout.list_content; + return R.layout.wlo_list; } protected SimpleCursorAdapter.ViewBinder getAdapterBinder() { @@ -282,13 +307,53 @@ setListAdapter(adapter); registerForContextMenu(mList); + + DrawerLayout mDrawerLayout = (DrawerLayout) findViewById(R.id.drawer_layout); + mDrawerList = (ListView) findViewById(R.id.left_drawer); + + // Set the list's click listener + mDrawerList.setOnItemClickListener(new ListView.OnItemClickListener() { + @Override + public void onItemClick(AdapterView parent, View view, int position, long id) { + selectItem(position); + } + }); + mDrawerList.setOnItemLongClickListener(new AdapterView.OnItemLongClickListener() { + @Override + public boolean onItemLongClick(AdapterView<?> parent, View view, int position, long id) { + editItem(position); + return true; + } + }); + mDrawerToggle = new ActionBarDrawerToggle( + this, /* host Activity */ + mDrawerLayout, /* DrawerLayout object */ + R.drawable.ic_drawer, /* nav drawer icon to replace 'Up' caret */ + R.string.drawer_open, /* "open drawer" description */ + R.string.drawer_close /* "close drawer" description */ + ); + + // Set the drawer toggle as the DrawerListener + mDrawerLayout.setDrawerListener(mDrawerToggle); + + ActionBar actionBar = getActionBar(); + actionBar.setDisplayHomeAsUpEnabled(true); + actionBar.setHomeButtonEnabled(true); } @Override + protected void onPostCreate(Bundle savedInstanceState) { + super.onPostCreate(savedInstanceState); + // Sync the toggle state after onRestoreInstanceState has occurred. + mDrawerToggle.syncState(); + } + + @Override protected void onResume() { super.onResume(); parentModel = (BaseModel) getIntent().getSerializableExtra(INTENT_EXTRA_PARENT_MODEL); + Log.d(TAG, "resume " + parentModel); if (parentModel != null) { Cursor cursor = getAllData(); Log.d(TAG, "cursor size : " + cursor.getCount()); @@ -299,7 +364,10 @@ String subtitle = getString(subtitleId, parentModel.toString(this)); getSupportActionBar().setSubtitle(subtitle); } + } + // Set the adapter for the list view + setDrawerListAdapter(); } @Override @@ -328,6 +396,12 @@ @Override public boolean onOptionsItemSelected(MenuItem item) { + // Pass the event to ActionBarDrawerToggle, if it returns + // true, then it has handled the app icon touch event + if (mDrawerToggle.onOptionsItemSelected(item)) { + return true; + } + switch (item.getItemId()) { case R.id.add_item: Intent intent = new Intent(this, getEditionActivity()); @@ -338,6 +412,39 @@ return super.onOptionsItemSelected(item); } + @Override + public void onConfigurationChanged(Configuration newConfig) { + super.onConfigurationChanged(newConfig); + mDrawerToggle.onConfigurationChanged(newConfig); + } + + @Override + protected void onActivityResult(int requestCode, int resultCode, Intent data) { + if (requestCode == REQUEST_EDIT_MODEL && resultCode == RESULT_OK) { + BaseModel editedModel = (BaseModel) data.getSerializableExtra(WloModelEditionActivity.INTENT_EXTRA_MODEL); + if (editedModel != null) { + drawerItems.put(editedModel.getClass(), editedModel); + } + } else { + super.onActivityResult(requestCode, resultCode, data); + } + } + + protected void setDrawerListAdapter() { + List<String> drawerItemsLabels = new ArrayList<>(); + drawerItemsLabels.add(getString(R.string.home_title)); + List<BaseModel> values = new ArrayList<>(drawerItems.values()); + drawerItemsLabels.addAll(Lists.transform(values, new Function<BaseModel, String>() { + @Override + public String apply(BaseModel input) { + return input.toString(WloBaseListActivity.this); + } + })); + mDrawerList.setAdapter(new ArrayAdapter<>(this, + android.R.layout.simple_list_item_1, + drawerItemsLabels)); + } + /** * This method will be called when an item in the list is selected. * Subclasses should override. Subclasses can call @@ -354,6 +461,8 @@ Log.d(TAG, model.toString(this) + " clicked"); + updateDrawerItems(model); + Intent intent = new Intent(this, getNextActivity()); intent.putExtra(INTENT_EXTRA_PARENT_MODEL, model); startActivity(intent); @@ -508,4 +617,101 @@ } }; + protected void updateDrawerItems(M model) { + Class<? extends BaseModel> itemClass = model.getClass(); + BaseModel currentItem = drawerItems.get(itemClass); + if (!model.equals(currentItem)) { + drawerItems.put(itemClass, model); + String itemTable = model.getTableName(); + switch (itemTable) { + case ContextModel.TABLE_NAME: + drawerItems.remove(LocationModel.class); + case LocationModel.TABLE_NAME: + drawerItems.remove(VesselModel.class); + case VesselModel.TABLE_NAME: + drawerItems.remove(MetierModel.class); + case MetierModel.TABLE_NAME: + drawerItems.remove(CommercialSpeciesModel.class); + case CommercialSpeciesModel.TABLE_NAME: + drawerItems.remove(ScientificSpeciesModel.class); + } + } + } + + protected void selectItem(int position) { + Class activityClass; + Class parentModelClass = null; + switch (position) { + case 0: + activityClass = MainActivity.class; + break; + case 1: + activityClass = ContextsActivity.class; + break; + case 2: + activityClass = LocationsActivity.class; + parentModelClass = ContextModel.class; + break; + case 3: + activityClass = VesselsActivity.class; + parentModelClass = LocationModel.class; + break; + case 4: + activityClass = MetiersActivity.class; + parentModelClass = VesselModel.class; + break; + case 5: + activityClass = CommercialSpeciesActivity.class; + parentModelClass = MetierModel.class; + break; + case 6: + activityClass = ScientificSpeciesActivity.class; + parentModelClass = CommercialSpeciesModel.class; + break; + default: + activityClass = null; + } + BaseModel parentModel = drawerItems.get(parentModelClass); + Intent intent = new Intent(this, activityClass); + intent.putExtra(WloBaseListActivity.INTENT_EXTRA_PARENT_MODEL, parentModel); + startActivity(intent); + } + + protected void editItem(int position) { + Class activityClass = null; + Class modelClass = null; + + switch (position) { + case 1: + activityClass = ContextFormActivity.class; + modelClass = ContextModel.class; + break; + case 2: + activityClass = LocationFormActivity.class; + modelClass = LocationModel.class; + break; + case 3: + activityClass = VesselFormActivity.class; + modelClass = VesselModel.class; + break; + case 4: + activityClass = MetierFormActivity.class; + modelClass = MetierModel.class; + break; + case 5: + activityClass = CommercialSpeciesFormActivity.class; + modelClass = CommercialSpeciesModel.class; + break; + case 6: + activityClass = ScientificSpeciesFormActivity.class; + modelClass = ScientificSpeciesModel.class; + break; + } + if (activityClass != null) { + BaseModel model = drawerItems.get(modelClass); + Intent intent = new Intent(this, activityClass); + intent.putExtra(WloModelEditionActivity.INTENT_EXTRA_MODEL, model); + startActivityForResult(intent, REQUEST_EDIT_MODEL); + } + } } Modified: trunk/src/fr/ifremer/wlo/measurement/MeasurementActivity.java =================================================================== --- trunk/src/fr/ifremer/wlo/measurement/MeasurementActivity.java 2014-03-01 21:36:10 UTC (rev 59) +++ trunk/src/fr/ifremer/wlo/measurement/MeasurementActivity.java 2014-03-02 19:42:31 UTC (rev 60) @@ -57,16 +57,21 @@ import com.google.common.base.Function; import com.google.common.collect.Lists; import fr.ifremer.wlo.BigFinCommunicationService; +import fr.ifremer.wlo.CommercialSpeciesActivity; import fr.ifremer.wlo.CommercialSpeciesFormActivity; import fr.ifremer.wlo.MainActivity; import fr.ifremer.wlo.MetierFormActivity; +import fr.ifremer.wlo.MetiersActivity; import fr.ifremer.wlo.R; import fr.ifremer.wlo.ScientificSpeciesActivity; import fr.ifremer.wlo.ScientificSpeciesFormActivity; import fr.ifremer.wlo.VesselFormActivity; +import fr.ifremer.wlo.VesselsActivity; import fr.ifremer.wlo.WloBaseActivity; +import fr.ifremer.wlo.WloBaseListActivity; import fr.ifremer.wlo.WloModelEditionActivity; import fr.ifremer.wlo.models.CategoryWeightModel; +import fr.ifremer.wlo.models.LocationModel; import fr.ifremer.wlo.models.categorization.CategoryModel; import fr.ifremer.wlo.models.categorization.QualitativeValueModel; import fr.ifremer.wlo.models.referentials.CalcifiedPartTaking; @@ -124,6 +129,7 @@ protected CommercialSpeciesModel commercialSpecies; protected MetierModel metier; protected VesselModel vessel; + protected LocationModel location; protected ListView mDrawerList; @@ -188,6 +194,7 @@ measurements.setPrecision(commercialSpecies.getPrecision()); metier = commercialSpecies.getParent(); vessel = metier.getParent(); + location = vessel.getParent(); tabs = (TabHost)findViewById(android.R.id.tabhost); @@ -248,7 +255,20 @@ setDrawerListAdapter(); // Set the list's click listener - mDrawerList.setOnItemClickListener(new DrawerItemClickListener()); + mDrawerList.setOnItemClickListener(new ListView.OnItemClickListener() { + @Override + public void onItemClick(AdapterView parent, View view, int position, long id) { + selectItem(position); + } + }); + mDrawerList.setOnItemLongClickListener(new AdapterView.OnItemLongClickListener() { + @Override + public boolean onItemLongClick(AdapterView<?> parent, View view, int position, long id) { + editItem(position); + return true; + } + }); + mDrawerToggle = new ActionBarDrawerToggle( this, /* host Activity */ mDrawerLayout, /* DrawerLayout object */ @@ -624,15 +644,15 @@ } protected void setDrawerListAdapter() { - mDrawerList.setAdapter(new ArrayAdapter<String>(this, - android.R.layout.simple_list_item_1, - new String[]{ - getString(R.string.home_title), - vessel.toString(this), - metier.toString(this), - commercialSpecies.toString(this), - scientificSpecies.toString(this) - })); + mDrawerList.setAdapter(new ArrayAdapter<>(this, + android.R.layout.simple_list_item_1, + new String[]{ + getString(R.string.home_title), + vessel.toString(this), + metier.toString(this), + commercialSpecies.toString(this), + scientificSpecies.toString(this) + })); } protected void fetchCalcifiedPartTakings() { @@ -650,15 +670,8 @@ } } - private class DrawerItemClickListener implements ListView.OnItemClickListener { - @Override - public void onItemClick(AdapterView parent, View view, int position, long id) { - selectItem(position); - } - } - /** Swaps fragments in the main content view */ - private void selectItem(int position) { + protected void editItem(int position) { Class clazz; BaseModel modelToEdit; switch (position) { @@ -686,9 +699,44 @@ clazz = null; modelToEdit = null; } - Intent intent = new Intent(this, clazz); - intent.putExtra(WloModelEditionActivity.INTENT_EXTRA_MODEL, modelToEdit); - startActivityForResult(intent, position); + if (clazz != null) { + Intent intent = new Intent(this, clazz); + intent.putExtra(WloModelEditionActivity.INTENT_EXTRA_MODEL, modelToEdit); + startActivityForResult(intent, position); + } } + protected void selectItem(int position) { + Class activityClass; + BaseModel parentModel = null; + switch (position) { + case 0: + activityClass = MainActivity.class; + break; + case 1: + activityClass = VesselsActivity.class; + parentModel = location; + break; + case 2: + activityClass = MetiersActivity.class; + parentModel = vessel; + break; + case 3: + activityClass = CommercialSpeciesActivity.class; + parentModel = metier; + break; + case 4: + activityClass = ScientificSpeciesActivity.class; + parentModel = commercialSpecies; + break; + default: + activityClass = null; + } + if (activityClass != null) { + Intent intent = new Intent(this, activityClass); + intent.putExtra(WloBaseListActivity.INTENT_EXTRA_PARENT_MODEL, parentModel); + startActivity(intent); + } + } + }

1 0

r59 - in trunk: . res/values res/values-fr src/fr/ifremer/wlo src/fr/ifremer/wlo/preferences
by kmorin＠users.forge.codelutin.com 01 Mar '14

01 Mar '14

Author: kmorin Date: 2014-03-01 22:36:10 +0100 (Sat, 01 Mar 2014) New Revision: 59 Url: http://codelutin.com/projects/wlo/repository/revisions/59 Log: add an error report Added: trunk/src/fr/ifremer/wlo/WloApplication.java Modified: trunk/AndroidManifest.xml trunk/pom.xml trunk/res/values-fr/strings.xml trunk/res/values/strings.xml trunk/src/fr/ifremer/wlo/MainActivity.java trunk/src/fr/ifremer/wlo/preferences/MultiSelectionActivity.java Modified: trunk/AndroidManifest.xml =================================================================== --- trunk/AndroidManifest.xml 2014-03-01 20:07:03 UTC (rev 58) +++ trunk/AndroidManifest.xml 2014-03-01 21:36:10 UTC (rev 59) @@ -24,8 +24,10 @@ <uses-permission android:name="android.permission.BLUETOOTH_ADMIN" /> <uses-permission android:name="android.permission.BLUETOOTH" /> <uses-permission android:name="android.permission.VIBRATE"/> + <uses-permission android:name="android.permission.INTERNET"/> - <application android:label="@string/app_name" + <application android:name=".WloApplication" + android:label="@string/app_name" android:icon="@drawable/wlo_ico_small" android:theme="@style/Theme.AppCompat"> @@ -128,5 +130,11 @@ <activity android:name=".utils.filechooser.FileDialog" android:configChanges="orientation|screenSize|keyboardHidden"/> + <activity android:name="org.acra.CrashReportDialog" + android:theme="@android:style/Theme.Holo.Dialog" + android:launchMode="singleInstance" + android:excludeFromRecents="true" + android:finishOnTaskLaunch="true" /> + </application> </manifest> Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2014-03-01 20:07:03 UTC (rev 58) +++ trunk/pom.xml 2014-03-01 21:36:10 UTC (rev 59) @@ -198,6 +198,12 @@ <artifactId>commons-io</artifactId> </dependency> + <dependency> + <groupId>ch.acra</groupId> + <artifactId>acra</artifactId> + <version>4.5.0</version> + </dependency> + </dependencies> <repositories> Modified: trunk/res/values/strings.xml =================================================================== --- trunk/res/values/strings.xml 2014-03-01 20:07:03 UTC (rev 58) +++ trunk/res/values/strings.xml 2014-03-01 21:36:10 UTC (rev 59) @@ -206,4 +206,14 @@ <string name="file_chooser_no_data">No Data</string> <string name="file_chooser_err">Error</string> +  + <string name="crash_toast_text">Ooooops ! I crashed, but a report has been sent to my developer to help fix the issue !</string> + + <string name="crash_dialog_title">WLO has crashed</string> + <string name="crash_dialog_text">An unexpected error occurred forcing the + application to stop. Please help us fix this by sending us error data, + all you have to do is click OK.</string> + <string name="crash_dialog_comment_prompt">You might add your comments about the problem below:</string> + <string name="crash_dialog_ok_toast">Thank you !</string> + </resources> Modified: trunk/res/values-fr/strings.xml =================================================================== --- trunk/res/values-fr/strings.xml 2014-03-01 20:07:03 UTC (rev 58) +++ trunk/res/values-fr/strings.xml 2014-03-01 21:36:10 UTC (rev 59) @@ -199,4 +199,13 @@ <string name="file_chooser_no_data">Aucun fichier</string> <string name="file_chooser_err">Erreur</string> +  + <string name="crash_toast_text">Erreur innatendue, préparation du rapport de bug</string> + + <string name="crash_dialog_title">WLO a planté</string> + <string name="crash_dialog_text">Une erreur inattendue s\'est produite et a forcé l\'application à s\'arrêter. + Si vous voulez nous aider à corriger ce bug, merci de nous envoyer les données par mail en appuyant sur OK.</string> + <string name="crash_dialog_comment_prompt">Vous pouvez ajouter un commentaire ci-dessous:</string> + <string name="crash_dialog_ok_toast">Merci !</string> + </resources> Modified: trunk/src/fr/ifremer/wlo/MainActivity.java =================================================================== --- trunk/src/fr/ifremer/wlo/MainActivity.java 2014-03-01 20:07:03 UTC (rev 58) +++ trunk/src/fr/ifremer/wlo/MainActivity.java 2014-03-01 21:36:10 UTC (rev 59) @@ -25,6 +25,7 @@ */ import android.app.Activity; +import android.app.AlertDialog; import android.app.ProgressDialog; import android.bluetooth.BluetoothAdapter; import android.content.Intent; @@ -45,6 +46,7 @@ import fr.ifremer.wlo.storage.DataCache; import fr.ifremer.wlo.storage.Exporter; import fr.ifremer.wlo.storage.WloSqlOpenHelper; +import fr.ifremer.wlo.utils.UIUtils; import fr.ifremer.wlo.utils.filechooser.FileDialog; import fr.ifremer.wlo.utils.filechooser.SelectionMode; import org.apache.commons.io.FileUtils; @@ -75,7 +77,6 @@ protected Button connectButton; protected Button disconnectButton; - protected ProgressDialog dialog; @Override protected void onCreate(Bundle savedInstanceState) { @@ -126,90 +127,8 @@ Configuration config = getResources().getConfiguration(); setOrientation(config.orientation); - - dialog = new ProgressDialog(this); - dialog.setIndeterminate(false); - dialog.setCancelable(false); - dialog.setProgressStyle(ProgressDialog.STYLE_HORIZONTAL); - dialog.setMax(9); - dialog.setMessage(getString(R.string.main_loading_referential)); - dialog.show(); - - new Thread(new Runnable() { - @Override - public void run() { - initData(); - } - }).start(); - } - protected void initData() { - try { - if (DataCache.getAllCommercialSpecies(this).isEmpty()) { - ImportUtil.importCommercialSpecies(this, getAssets().open("ref_import_commercial_species.csv")); - } - dialog.setProgress(1); - if (DataCache.getAllLocations(this).isEmpty()) { - ImportUtil.importLocations(this, getAssets().open("ref_import_locations.csv")); - } - dialog.setProgress(2); - if (DataCache.getAllMensurations(this).isEmpty()) { - ImportUtil.importMensurations(this, getAssets().open("ref_import_mensurations.csv")); - } - dialog.setProgress(3); - if (DataCache.getAllMetiers(this).isEmpty()) { - ImportUtil.importMetiers(this, getAssets().open("ref_import_metiers.csv")); - } - dialog.setProgress(4); - if (DataCache.getAllPresentations(this).isEmpty()) { - ImportUtil.importPresentations(this, getAssets().open("ref_import_presentations.csv")); - } - dialog.setProgress(5); - if (DataCache.getAllScientificSpecies(this).isEmpty()) { - ImportUtil.importScientificSpecies(this, getAssets().open("ref_import_scientific_species.csv")); - } - dialog.setProgress(6); - if (DataCache.getAllStates(this).isEmpty()) { - ImportUtil.importStates(this, getAssets().open("ref_import_states.csv")); - } - dialog.setProgress(7); - if (DataCache.getAllVessels(this).isEmpty()) { - ImportUtil.importVessels(this, getAssets().open("ref_import_vessels.csv")); - } - dialog.setProgress(8); - if (DataCache.getAllCategories(this).isEmpty()) { - WloSqlOpenHelper soh = new WloSqlOpenHelper(this); - - CategoryModel ageCategory = new CategoryModel(); - ageCategory.setLabel(getString(R.string.age)); - soh.saveData(ageCategory); - - CategoryModel genderCategory = new CategoryModel(); - genderCategory.setLabel(getString(R.string.gender)); - soh.saveData(genderCategory); - - CategoryModel maturityCategory = new CategoryModel(); - maturityCategory.setLabel(getString(R.string.maturity)); - soh.saveData(maturityCategory); - - soh.saveData(ImportUtil.importQualitativeValues(ageCategory, getAssets().open("ref_import_ages.csv"))); - soh.saveData(ImportUtil.importQualitativeValues(genderCategory, getAssets().open("ref_import_genders.csv"))); - soh.saveData(ImportUtil.importQualitativeValues(maturityCategory, getAssets().open("ref_import_maturities.csv"))); - - soh.close(); - } - dialog.setProgress(9); - - } catch (IOException | RuntimeException e) { - //TODO kmorin 20140130 show error to the user - Log.e(TAG, "error on initial import", e); - - } finally { - dialog.dismiss(); - } - } - protected void bigfinConnected() { disconnectButton.setVisibility(View.VISIBLE); connectButton.setVisibility(View.GONE); Added: trunk/src/fr/ifremer/wlo/WloApplication.java =================================================================== --- trunk/src/fr/ifremer/wlo/WloApplication.java (rev 0) +++ trunk/src/fr/ifremer/wlo/WloApplication.java 2014-03-01 21:36:10 UTC (rev 59) @@ -0,0 +1,101 @@ +package fr.ifremer.wlo; + +import android.app.Application; +import android.app.ProgressDialog; +import android.util.Log; +import fr.ifremer.wlo.imports.ImportUtil; +import fr.ifremer.wlo.models.categorization.CategoryModel; +import fr.ifremer.wlo.storage.DataCache; +import fr.ifremer.wlo.storage.WloSqlOpenHelper; +import org.acra.ACRA; +import org.acra.ReportingInteractionMode; +import org.acra.annotation.ReportsCrashes; + +import java.io.IOException; + +/** + * @author Kevin Morin (Code Lutin) + * @since x.x + */ +@ReportsCrashes(formKey = "", // will not be used + mailTo = "wlo-devel(a)list.forge.codelutin.com", + mode = ReportingInteractionMode.DIALOG, + resToastText = R.string.crash_toast_text, // optional, displayed as soon as the crash occurs, before collecting data which can take a few seconds + resDialogText = R.string.crash_dialog_text, + resDialogIcon = android.R.drawable.ic_dialog_info, //optional. default is a warning sign + resDialogTitle = R.string.crash_dialog_title, // optional. default is your application name + resDialogCommentPrompt = R.string.crash_dialog_comment_prompt, // optional. when defined, adds a user text field input with this text resource as a label + resDialogOkToast = R.string.crash_dialog_ok_toast) // optional. displays a Toast message when the user accepts to send a report. +public class WloApplication extends Application { + + private static final String TAG = "WloApplication"; + + @Override + public void onCreate() { + ACRA.init(this); + super.onCreate(); + + new Thread(new Runnable() { + @Override + public void run() { + initData(); + } + }).start(); + + } + + protected void initData() { + try { + if (DataCache.getAllCommercialSpecies(this).isEmpty()) { + ImportUtil.importCommercialSpecies(this, getAssets().open("ref_import_commercial_species.csv")); + } + if (DataCache.getAllLocations(this).isEmpty()) { + ImportUtil.importLocations(this, getAssets().open("ref_import_locations.csv")); + } + if (DataCache.getAllMensurations(this).isEmpty()) { + ImportUtil.importMensurations(this, getAssets().open("ref_import_mensurations.csv")); + } + if (DataCache.getAllMetiers(this).isEmpty()) { + ImportUtil.importMetiers(this, getAssets().open("ref_import_metiers.csv")); + } + if (DataCache.getAllPresentations(this).isEmpty()) { + ImportUtil.importPresentations(this, getAssets().open("ref_import_presentations.csv")); + } + if (DataCache.getAllScientificSpecies(this).isEmpty()) { + ImportUtil.importScientificSpecies(this, getAssets().open("ref_import_scientific_species.csv")); + } + if (DataCache.getAllStates(this).isEmpty()) { + ImportUtil.importStates(this, getAssets().open("ref_import_states.csv")); + } + if (DataCache.getAllVessels(this).isEmpty()) { + ImportUtil.importVessels(this, getAssets().open("ref_import_vessels.csv")); + } + if (DataCache.getAllCategories(this).isEmpty()) { + WloSqlOpenHelper soh = new WloSqlOpenHelper(this); + + CategoryModel ageCategory = new CategoryModel(); + ageCategory.setLabel(getString(R.string.age)); + soh.saveData(ageCategory); + + CategoryModel genderCategory = new CategoryModel(); + genderCategory.setLabel(getString(R.string.gender)); + soh.saveData(genderCategory); + + CategoryModel maturityCategory = new CategoryModel(); + maturityCategory.setLabel(getString(R.string.maturity)); + soh.saveData(maturityCategory); + + soh.saveData(ImportUtil.importQualitativeValues(ageCategory, getAssets().open("ref_import_ages.csv"))); + soh.saveData(ImportUtil.importQualitativeValues(genderCategory, getAssets().open("ref_import_genders.csv"))); + soh.saveData(ImportUtil.importQualitativeValues(maturityCategory, getAssets().open("ref_import_maturities.csv"))); + + soh.close(); + } + + } catch (IOException | RuntimeException e) { + //TODO kmorin 20140130 show error to the user + Log.e(TAG, "error on initial import", e); + } + } + +} Modified: trunk/src/fr/ifremer/wlo/preferences/MultiSelectionActivity.java =================================================================== --- trunk/src/fr/ifremer/wlo/preferences/MultiSelectionActivity.java 2014-03-01 20:07:03 UTC (rev 58) +++ trunk/src/fr/ifremer/wlo/preferences/MultiSelectionActivity.java 2014-03-01 21:36:10 UTC (rev 59) @@ -84,8 +84,6 @@ getListView().setOnItemLongClickListener(this); } - - public void cancel(View view) { setResult(RESULT_CANCELED); finish();

1 0

r58 - in trunk: . res/layout res/values res/values-fr res/xml src/fr/ifremer/wlo/preferences
by kmorin＠users.forge.codelutin.com 01 Mar '14

01 Mar '14

Author: kmorin Date: 2014-03-01 21:07:03 +0100 (Sat, 01 Mar 2014) New Revision: 58 Url: http://codelutin.com/projects/wlo/repository/revisions/58 Log: fixes #4598 [Favoris] am?\195?\169liorer l'ergonomie de la mise en favori des esp?\195?\168ces commerciales et scientifiques Added: trunk/res/layout/favorite_selection.xml trunk/src/fr/ifremer/wlo/preferences/MultiSelectionActivity.java Removed: trunk/src/fr/ifremer/wlo/preferences/WloMultiSelectListPreference.java Modified: trunk/AndroidManifest.xml trunk/res/layout/category_creation_form.xml trunk/res/values-fr/strings.xml trunk/res/values/strings.xml trunk/res/xml/preferences.xml trunk/src/fr/ifremer/wlo/preferences/SettingsActivity.java Modified: trunk/AndroidManifest.xml =================================================================== --- trunk/AndroidManifest.xml 2014-03-01 16:46:23 UTC (rev 57) +++ trunk/AndroidManifest.xml 2014-03-01 20:07:03 UTC (rev 58) @@ -121,6 +121,10 @@ android:label="@string/category_creation_title" android:configChanges="orientation|screenSize|keyboardHidden"/> + <activity android:name=".preferences.MultiSelectionActivity" + android:label="@string/favaorite_selection_title" + android:configChanges="orientation|screenSize|keyboardHidden"/> + <activity android:name=".utils.filechooser.FileDialog" android:configChanges="orientation|screenSize|keyboardHidden"/> Modified: trunk/res/layout/category_creation_form.xml =================================================================== --- trunk/res/layout/category_creation_form.xml 2014-03-01 16:46:23 UTC (rev 57) +++ trunk/res/layout/category_creation_form.xml 2014-03-01 20:07:03 UTC (rev 58) @@ -5,38 +5,38 @@ android:layout_width="match_parent" android:layout_height="match_parent"> - <ScrollView android:layout_width="match_parent" - android:layout_height="0dp" - android:layout_weight="1" - android:fillViewport="true"> + <ScrollView android:layout_width="match_parent" + android:layout_height="0dp" + android:layout_weight="1" + android:fillViewport="true"> - <LinearLayout android:orientation="vertical" - android:layout_width="match_parent" - android:layout_height="wrap_content"> - - <TextView android:text="@string/category_label" + <LinearLayout android:orientation="vertical" android:layout_width="match_parent" - android:layout_height="wrap_content"/> + android:layout_height="wrap_content"> - <EditText android:id="@+id/category_label" - android:layout_width="match_parent" - android:layout_height="wrap_content"/> + <TextView android:text="@string/category_label" + android:layout_width="match_parent" + android:layout_height="wrap_content"/> - <Button android:id="@+id/import_qualitative_values_button" - android:text="@string/import_qualitative_values" + <EditText android:id="@+id/category_label" android:layout_width="match_parent" + android:layout_height="wrap_content"/> + + <Button android:id="@+id/import_qualitative_values_button" + android:text="@string/import_qualitative_values" + android:layout_width="match_parent" + android:layout_height="wrap_content" + android:onClick="importQualitativeValues"/> + + <TextView android:id="@+id/qualitative_values_nb_label" + android:layout_width="match_parent" android:layout_height="wrap_content" - android:onClick="importQualitativeValues"/> + android:visibility="gone"/> - <TextView android:id="@+id/qualitative_values_nb_label" - android:layout_width="match_parent" - android:layout_height="wrap_content" - android:visibility="gone"/> + </LinearLayout> - </LinearLayout> + </ScrollView> - </ScrollView> - <LinearLayout android:orientation="horizontal" android:layout_width="match_parent" android:layout_height="wrap_content" Added: trunk/res/layout/favorite_selection.xml =================================================================== --- trunk/res/layout/favorite_selection.xml (rev 0) +++ trunk/res/layout/favorite_selection.xml 2014-03-01 20:07:03 UTC (rev 58) @@ -0,0 +1,39 @@ +<?xml version="1.0" encoding="utf-8"?> + +<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android" + android:orientation="vertical" + android:layout_width="match_parent" + android:layout_height="match_parent"> + + <fr.ifremer.wlo.utils.WloAutoCompleteTextView + android:id="@+id/favorite_search" + android:layout_width="match_parent" + android:layout_height="wrap_content" + android:singleLine="true" + android:hint="@string/select_new_favorite"/> + + <ListView android:id="@android:id/list" + android:layout_width="match_parent" + android:layout_height="0dp" + android:layout_weight="1"/> + + <LinearLayout android:orientation="horizontal" + android:layout_width="match_parent" + android:layout_height="wrap_content" + android:gravity="bottom"> + + <Button android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:layout_weight="1" + android:text="@android:string/cancel" + android:onClick="cancel" /> + + <Button android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:layout_weight="1" + android:text="@android:string/ok" + android:onClick="validate" /> + + </LinearLayout> + +</LinearLayout> \ No newline at end of file Modified: trunk/res/values/strings.xml =================================================================== --- trunk/res/values/strings.xml 2014-03-01 16:46:23 UTC (rev 57) +++ trunk/res/values/strings.xml 2014-03-01 20:07:03 UTC (rev 58) @@ -111,6 +111,9 @@ <string name="preferences_favorites_commercial_species">Commercial species</string> <string name="preferences_favorites_scientific_species">Scientific species</string> + <string name="favaorite_selection_title">Favorites</string> + <string name="select_new_favorite">Select a new favorite</string> + <string name="favorite_nb">%s favorites</string> <string name="import_new_element_number">%s new items imported</string> <string name="import_error">An error occurred during the import.\nCheck that the header names of the file you chose are correct.</string> Modified: trunk/res/values-fr/strings.xml =================================================================== --- trunk/res/values-fr/strings.xml 2014-03-01 16:46:23 UTC (rev 57) +++ trunk/res/values-fr/strings.xml 2014-03-01 20:07:03 UTC (rev 58) @@ -107,6 +107,9 @@ <string name="preferences_favorites_commercial_species">Espèces commerciales</string> <string name="preferences_favorites_scientific_species">Espèces scientifiques</string> + <string name="favaorite_selection_title">Favoris</string> + <string name="select_new_favorite">Choisissez un nouveau favori</string> + <string name="favorite_nb">%s favoris</string> <string name="preferences_calcified_parts_takings">Prélèvement des pièces calcifiées</string> <string name="preferences_import_calcified_parts_takings">Import des paramètres de l\'algorithme</string> Modified: trunk/res/xml/preferences.xml =================================================================== --- trunk/res/xml/preferences.xml 2014-03-01 16:46:23 UTC (rev 57) +++ trunk/res/xml/preferences.xml 2014-03-01 20:07:03 UTC (rev 58) @@ -66,13 +66,11 @@ android:key="preferences_favorites" android:title="@string/preferences_favorites"> - <fr.ifremer.wlo.preferences.WloMultiSelectListPreference - android:key="preferences_favorites_commercial_species" - android:title="@string/preferences_favorites_commercial_species"/> + <Preference android:key="preferences_favorites_commercial_species" + android:title="@string/preferences_favorites_commercial_species"/> - <fr.ifremer.wlo.preferences.WloMultiSelectListPreference - android:key="preferences_favorites_scientific_species" - android:title="@string/preferences_favorites_scientific_species"/> + <Preference android:key="preferences_favorites_scientific_species" + android:title="@string/preferences_favorites_scientific_species"/> </PreferenceScreen> Added: trunk/src/fr/ifremer/wlo/preferences/MultiSelectionActivity.java =================================================================== --- trunk/src/fr/ifremer/wlo/preferences/MultiSelectionActivity.java (rev 0) +++ trunk/src/fr/ifremer/wlo/preferences/MultiSelectionActivity.java 2014-03-01 20:07:03 UTC (rev 58) @@ -0,0 +1,109 @@ +package fr.ifremer.wlo.preferences; + + +import android.app.ListActivity; +import android.content.Intent; +import android.os.Bundle; +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; +import fr.ifremer.wlo.R; +import fr.ifremer.wlo.models.BaseModel; +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; +import java.util.List; +import java.util.Map; + +/** + * @author Kevin Morin (Code Lutin) + * @since x.x + */ +public class MultiSelectionActivity extends ListActivity implements AdapterView.OnItemLongClickListener { + + public static final String INTENT_FAVORITE_LIST = "favoriteList"; + public static final String INTENT_UNIVERSE_CLASS = "universeClass"; + + protected ArrayAdapter favoriteAdapter; + protected ArrayAdapter universeAdapter; + + protected ArrayList<String> favoriteIds = new ArrayList<>(); + + @Override + protected void onCreate(Bundle savedInstanceState) { + super.onCreate(savedInstanceState); + + setContentView(R.layout.favorite_selection); + + List<BaseModel> universe = new ArrayList<>(); + Class universeClass = (Class) getIntent().getSerializableExtra(INTENT_UNIVERSE_CLASS); + if (ScientificSpecies.class.equals(universeClass)) { + universe.addAll(DataCache.getAllScientificSpecies(this)); + + } else if (CommercialSpecies.class.equals(universeClass)) { + universe.addAll(DataCache.getAllCommercialSpecies(this)); + } + + final Map<String, BaseModel> modelsById = Maps.uniqueIndex(universe, BaseModel.GET_ID_FUNCTION); + + favoriteIds = getIntent().getStringArrayListExtra(INTENT_FAVORITE_LIST); + List<BaseModel> favorites = new ArrayList<>(Lists.transform(favoriteIds, new Function<String, BaseModel>() { + @Override + public BaseModel apply(String input) { + return modelsById.get(input); + } + })); + favoriteAdapter = new ArrayAdapter(this, android.R.layout.simple_list_item_1, favorites); + setListAdapter(favoriteAdapter); + + final WloAutoCompleteTextView search = (WloAutoCompleteTextView) findViewById(R.id.favorite_search); + + universe.removeAll(favorites); + universeAdapter = new ArrayAdapter(this, android.R.layout.simple_dropdown_item_1line, universe); + search.setAdapter(universeAdapter); + + search.setOnItemClickListener(new AdapterView.OnItemClickListener() { + @Override + public void onItemClick(AdapterView<?> parent, View view, int position, long id) { + BaseModel selected = (BaseModel) parent.getItemAtPosition(position); + favoriteAdapter.add(selected); + favoriteIds.add(selected.getId()); + search.setText(null); + universeAdapter.remove(selected); + } + }); + + getListView().setOnItemLongClickListener(this); + } + + + + public void cancel(View view) { + setResult(RESULT_CANCELED); + finish(); + } + + public void validate(View view) { + Intent result = new Intent(); + result.putExtra(INTENT_FAVORITE_LIST, favoriteIds); + setResult(RESULT_OK, result); + finish(); + } + + @Override + public boolean onItemLongClick(AdapterView<?> parent, View view, int position, long id) { + BaseModel selected = (BaseModel) parent.getItemAtPosition(position); + favoriteAdapter.remove(selected); + favoriteIds.remove(selected.getId()); + universeAdapter.add(selected); + return true; + } +} Modified: trunk/src/fr/ifremer/wlo/preferences/SettingsActivity.java =================================================================== --- trunk/src/fr/ifremer/wlo/preferences/SettingsActivity.java 2014-03-01 16:46:23 UTC (rev 57) +++ trunk/src/fr/ifremer/wlo/preferences/SettingsActivity.java 2014-03-01 20:07:03 UTC (rev 58) @@ -24,7 +24,6 @@ * #L% */ -import android.app.Activity; import android.app.AlertDialog; import android.app.ProgressDialog; import android.content.Context; @@ -37,7 +36,6 @@ import android.preference.Preference; import android.preference.PreferenceFragment; import android.util.Log; -import android.view.View; import android.widget.Toast; import com.google.common.base.Functions; import com.google.common.collect.BiMap; @@ -48,7 +46,6 @@ import fr.ifremer.wlo.R; import fr.ifremer.wlo.WloBaseActivity; import fr.ifremer.wlo.models.BaseModel; -import fr.ifremer.wlo.models.categorization.CategoryModel; import fr.ifremer.wlo.models.referentials.CommercialSpecies; import fr.ifremer.wlo.models.referentials.ScientificSpecies; import fr.ifremer.wlo.storage.DataCache; @@ -63,9 +60,11 @@ import java.io.File; import java.io.FileInputStream; import java.io.IOException; +import java.util.ArrayList; import java.util.Collection; import java.util.Date; import java.util.HashSet; +import java.util.List; import java.util.Map; import java.util.Set; @@ -87,6 +86,8 @@ protected static final int REQUEST_IMPORT_VESSELS = 7; protected static final int REQUEST_IMPORT_CALCIFIED_PARTS_TAKINGS = 8; protected static final int REQUEST_CREATE_CATEGORY = 9; + protected static final int REQUEST_FAVORITES_COMMERCIAL_SPECIES = 10; + protected static final int REQUEST_FAVORITES_SCIENTIFIC_SPECIES = 11; @Override @@ -181,6 +182,15 @@ } }); + // favorites + initMultiSelectListPreference(MultiSelectItemPreference.COMMERCIAL_SPECIES_FAVORITES.getKey(), + CommercialSpecies.class, + REQUEST_FAVORITES_COMMERCIAL_SPECIES); + + initMultiSelectListPreference(MultiSelectItemPreference.SCIENTIFIC_SPECIES_FAVORITES.getKey(), + ScientificSpecies.class, + REQUEST_FAVORITES_SCIENTIFIC_SPECIES); + } @Override @@ -225,12 +235,6 @@ preference.setSummary(summary); } - Collection<CommercialSpecies> commercialSpecies = DataCache.getAllCommercialSpecies(getActivity()); - initMultiSelectListPreference(MultiSelectItemPreference.COMMERCIAL_SPECIES_FAVORITES, commercialSpecies); - - Collection<ScientificSpecies> scientificSpecies = DataCache.getAllScientificSpecies(getActivity()); - initMultiSelectListPreference(MultiSelectItemPreference.SCIENTIFIC_SPECIES_FAVORITES, scientificSpecies); - Log.d(TAG, "registerOnSharedPreferenceChangeListener"); sharedPreferences.registerOnSharedPreferenceChangeListener(this); } @@ -246,33 +250,40 @@ @Override public void onActivityResult(final int requestCode, final int resultCode, final Intent data) { Context context = getActivity(); - if (resultCode == RESULT_OK - && requestCode >= REQUEST_IMPORT_COMMERCIAL_SPECIES && requestCode <= REQUEST_IMPORT_CALCIFIED_PARTS_TAKINGS) { + if (resultCode == RESULT_OK) { + if (requestCode >= REQUEST_IMPORT_COMMERCIAL_SPECIES + && requestCode <= REQUEST_IMPORT_CALCIFIED_PARTS_TAKINGS) { - if (!StorageUtils.isExternalStorageWritable()) { - AlertDialog dialog = new AlertDialog.Builder(context) - .setTitle(R.string.preferences_import_no_external_storage_title) - .setMessage(R.string.preferences_import_no_external_storage_message) - .setCancelable(false) - .setNegativeButton(R.string.no, UIUtils.getCancelClickListener()) - .setPositiveButton(R.string.yes, new DialogInterface.OnClickListener() { - @Override - public void onClick(DialogInterface dialog, int which) { - importData(requestCode, data, false); - } - }).create(); - dialog.show(); + if (!StorageUtils.isExternalStorageWritable()) { + AlertDialog dialog = new AlertDialog.Builder(context) + .setTitle(R.string.preferences_import_no_external_storage_title) + .setMessage(R.string.preferences_import_no_external_storage_message) + .setCancelable(false) + .setNegativeButton(R.string.no, UIUtils.getCancelClickListener()) + .setPositiveButton(R.string.yes, new DialogInterface.OnClickListener() { + @Override + public void onClick(DialogInterface dialog, int which) { + importData(requestCode, data, false); + } + }).create(); + dialog.show(); - } else { - importData(requestCode, data, true); + } else { + importData(requestCode, data, true); + } + + } else if (requestCode == REQUEST_CREATE_CATEGORY) { + int nb = DataCache.getAllCategories(context).size(); + Preference categoryPref = findPreference("import_categories"); + categoryPref.setSummary(getString(R.string.preferences_import_summary, nb)); + + } else if (requestCode == REQUEST_FAVORITES_SCIENTIFIC_SPECIES) { + saveMultiSelectListPreference(data, MultiSelectItemPreference.SCIENTIFIC_SPECIES_FAVORITES.getKey()); + + } else if (requestCode == REQUEST_FAVORITES_COMMERCIAL_SPECIES) { + saveMultiSelectListPreference(data, MultiSelectItemPreference.COMMERCIAL_SPECIES_FAVORITES.getKey()); } - } else if (resultCode == RESULT_OK && requestCode == REQUEST_CREATE_CATEGORY) { - Toast.makeText(context, R.string.category_created, Toast.LENGTH_LONG).show(); - int nb = DataCache.getAllCategories(context).size(); - Preference categoryPref = findPreference("import_categories"); - categoryPref.setSummary(getString(R.string.preferences_import_summary, nb)); - } else { super.onActivityResult(requestCode, resultCode, data); } @@ -388,22 +399,45 @@ }).start(); } - protected <M extends BaseModel> void initMultiSelectListPreference(MultiSelectItemPreference pref, Collection<M> refData) { - Log.d(TAG, "initMultiSelectListPreference " + pref.getKey()); + protected <M extends BaseModel> void initMultiSelectListPreference(String prefKey, + final Class clazz, + final int requestCode) { + Log.d(TAG, "initMultiSelectListPreference " + prefKey); + Preference preference = findPreference(prefKey); SharedPreferences sharedPreferences = getPreferenceScreen().getSharedPreferences(); - Set<String> data = sharedPreferences.getStringSet(pref.getKey(), new HashSet<String>()); - Log.d(TAG, "data " + data); + final ArrayList<String> data = new ArrayList<>(sharedPreferences.getStringSet(prefKey, + new HashSet<String>())); - MultiSelectListPreference preference = - (MultiSelectListPreference) findPreference(pref.getKey()); - Collection<String> entries = Collections2.transform(refData, Functions.toStringFunction()); - preference.setEntries(entries.toArray(new CharSequence[entries.size()])); - Collection<String> entryValues = Collections2.transform(refData, BaseModel.GET_ID_FUNCTION); - preference.setEntryValues(entryValues.toArray(new CharSequence[entryValues.size()])); + preference.setSummary(getString(R.string.favorite_nb, data.size())); + preference.setOnPreferenceClickListener(new Preference.OnPreferenceClickListener() { + @Override + public boolean onPreferenceClick(Preference preference) { + Intent intent = new Intent(getActivity(), MultiSelectionActivity.class); + intent.putExtra(MultiSelectionActivity.INTENT_UNIVERSE_CLASS, clazz); + intent.putExtra(MultiSelectionActivity.INTENT_FAVORITE_LIST, data); + startActivityForResult(intent, requestCode); + return true; + } + }); + } - preference.setValues(data); + protected void saveMultiSelectListPreference(Intent data, String key) { + Preference pref = findPreference(key); + Set<String> favoriteIds = new HashSet<>( + data.getStringArrayListExtra(MultiSelectionActivity.INTENT_FAVORITE_LIST)); + SharedPreferences.Editor editor = getPreferenceManager().getSharedPreferences().edit(); + editor.putStringSet(key, favoriteIds); + try { + editor.apply(); + } catch (AbstractMethodError unused) { + // The app injected its own pre-Gingerbread + // SharedPreferences.Editor implementation without + // an apply method. + editor.commit(); + } + pref.setSummary(getString(R.string.favorite_nb, favoriteIds.size())); } } Deleted: trunk/src/fr/ifremer/wlo/preferences/WloMultiSelectListPreference.java =================================================================== --- trunk/src/fr/ifremer/wlo/preferences/WloMultiSelectListPreference.java 2014-03-01 16:46:23 UTC (rev 57) +++ trunk/src/fr/ifremer/wlo/preferences/WloMultiSelectListPreference.java 2014-03-01 20:07:03 UTC (rev 58) @@ -1,83 +0,0 @@ -package fr.ifremer.wlo.preferences; - -/* - * #%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.content.Context; -import android.content.SharedPreferences; -import android.preference.MultiSelectListPreference; -import android.util.AttributeSet; - -import java.util.HashSet; -import java.util.Set; - -/** - * A {@link Preference} that displays a list of entries as - * a dialog. - * <p> - * This preference will store a set of strings into the SharedPreferences. - * This set will contain one or more values from the - * {@link #setEntryValues(CharSequence[])} array. - * - * @attr ref android.R.styleable#MultiSelectListPreference_entries - * @attr ref android.R.styleable#MultiSelectListPreference_entryValues - * @since 0.2 - */ -public class WloMultiSelectListPreference extends MultiSelectListPreference { - - public WloMultiSelectListPreference(Context context, AttributeSet attrs) { - super(context, attrs); - } - - public WloMultiSelectListPreference(Context context) { - this(context, null); - } - - /** - * Sets the value of the key. This should contain entries in - * {@link #getEntryValues()}. - * - * @param values The values to set for the key. - */ - public void setValues(Set<String> values) { - Set<String> mValues = getValues(); - mValues.clear(); - mValues.addAll(values); - - SharedPreferences.Editor editor = getPreferenceManager().getSharedPreferences().edit(); - editor.putStringSet(getKey(), mValues); - - try { - editor.apply(); - - } catch (AbstractMethodError unused) { - // The app injected its own pre-Gingerbread - // SharedPreferences.Editor implementation without - // an apply method. - editor.commit(); - } - - } - -}

1 0

r57 - in trunk: . assets res/layout res/values res/values-fr res/xml src/fr/ifremer/wlo src/fr/ifremer/wlo/imports src/fr/ifremer/wlo/measurement src/fr/ifremer/wlo/models src/fr/ifremer/wlo/models/calcifiedPartTaking src/fr/ifremer/wlo/models/categorization src/fr/ifremer/wlo/models/referentials src/fr/ifremer/wlo/preferences src/fr/ifremer/wlo/storage
by kmorin＠users.forge.codelutin.com 01 Mar '14

01 Mar '14

Author: kmorin Date: 2014-03-01 17:46:23 +0100 (Sat, 01 Mar 2014) New Revision: 57 Url: http://codelutin.com/projects/wlo/repository/revisions/57 Log: refs #4176 Import du param?\195?\169trage de l'algorithme de pr?\195?\169l?\195?\168vement des pi?\195?\168ces calcifi?\195?\169es fixes #4122 Gestion des pr?\195?\169l?\195?\168vements de pi?\195?\168ces calcifi?\195?\169es fixes #4093 Ajouter les cat?\195?\169gorisations au formulaire de cr?\195?\169ation de lieu fixes #4173 Ajouter les cat?\195?\169gorisations au formulaire de cr?\195?\169ation de lieu fixes #4187 Afficher les cat?\195?\169gorisations s?\195?\169lectionn?\195?\169es dans le lieu Added: trunk/res/layout/category_creation_form.xml trunk/src/fr/ifremer/wlo/imports/ trunk/src/fr/ifremer/wlo/imports/CalcifiedPartTakingRowModel.java trunk/src/fr/ifremer/wlo/imports/QualitativeValueRowModel.java trunk/src/fr/ifremer/wlo/models/categorization/ trunk/src/fr/ifremer/wlo/models/categorization/CategoryModel.java trunk/src/fr/ifremer/wlo/models/categorization/QualitativeValueModel.java trunk/src/fr/ifremer/wlo/models/referentials/CalcifiedPartTaking.java trunk/src/fr/ifremer/wlo/preferences/CategoryCreationAcivity.java Removed: trunk/src/fr/ifremer/wlo/imports/AgeRowModel.java trunk/src/fr/ifremer/wlo/imports/GenderRowModel.java trunk/src/fr/ifremer/wlo/imports/MaturityRowModel.java trunk/src/fr/ifremer/wlo/models/calcifiedPartTaking/CalcifiedPartTaking.java trunk/src/fr/ifremer/wlo/models/calcifiedPartTaking/CalcifiedPartTakingRowModel.java trunk/src/fr/ifremer/wlo/models/referentials/Age.java trunk/src/fr/ifremer/wlo/models/referentials/Gender.java trunk/src/fr/ifremer/wlo/models/referentials/Maturity.java trunk/src/fr/ifremer/wlo/models/referentials/imports/ Modified: trunk/AndroidManifest.xml trunk/assets/ref_import_ages.csv trunk/assets/ref_import_genders.csv trunk/assets/ref_import_maturities.csv trunk/pom.xml trunk/res/layout/commercial_species_form.xml trunk/res/layout/measurement.xml trunk/res/values-fr/arrays.xml trunk/res/values-fr/strings.xml trunk/res/values/strings.xml trunk/res/xml/preferences.xml trunk/src/fr/ifremer/wlo/CommercialSpeciesFormActivity.java trunk/src/fr/ifremer/wlo/MainActivity.java trunk/src/fr/ifremer/wlo/WeightsActivity.java trunk/src/fr/ifremer/wlo/imports/CommercialSpeciesRowModel.java trunk/src/fr/ifremer/wlo/imports/ImportUtil.java trunk/src/fr/ifremer/wlo/imports/LocationRowModel.java trunk/src/fr/ifremer/wlo/imports/MensurationRowModel.java trunk/src/fr/ifremer/wlo/imports/MetierRowModel.java trunk/src/fr/ifremer/wlo/imports/PresentationRowModel.java trunk/src/fr/ifremer/wlo/imports/ScientificSpeciesRowModel.java trunk/src/fr/ifremer/wlo/imports/StateRowModel.java trunk/src/fr/ifremer/wlo/imports/VesselRowModel.java trunk/src/fr/ifremer/wlo/measurement/LogsFragment.java trunk/src/fr/ifremer/wlo/measurement/MeasurementActivity.java trunk/src/fr/ifremer/wlo/models/BaseModel.java trunk/src/fr/ifremer/wlo/models/CommercialSpeciesModel.java trunk/src/fr/ifremer/wlo/models/MeasurementModel.java trunk/src/fr/ifremer/wlo/models/MeasurementsModel.java trunk/src/fr/ifremer/wlo/preferences/SettingsActivity.java trunk/src/fr/ifremer/wlo/storage/DataCache.java trunk/src/fr/ifremer/wlo/storage/Exporter.java trunk/src/fr/ifremer/wlo/storage/WloSqlOpenHelper.java Modified: trunk/AndroidManifest.xml =================================================================== --- trunk/AndroidManifest.xml 2014-02-28 13:25:58 UTC (rev 56) +++ trunk/AndroidManifest.xml 2014-03-01 16:46:23 UTC (rev 57) @@ -117,6 +117,10 @@ android:label="@string/main_settings" android:configChanges="orientation|screenSize|keyboardHidden"/> + <activity android:name=".preferences.CategoryCreationAcivity" + android:label="@string/category_creation_title" + android:configChanges="orientation|screenSize|keyboardHidden"/> + <activity android:name=".utils.filechooser.FileDialog" android:configChanges="orientation|screenSize|keyboardHidden"/> Modified: trunk/assets/ref_import_ages.csv =================================================================== --- trunk/assets/ref_import_ages.csv 2014-02-28 13:25:58 UTC (rev 56) +++ trunk/assets/ref_import_ages.csv 2014-03-01 16:46:23 UTC (rev 57) @@ -1,4 +1,4 @@ -Age +Code 1 2 3 Modified: trunk/assets/ref_import_genders.csv =================================================================== --- trunk/assets/ref_import_genders.csv 2014-02-28 13:25:58 UTC (rev 56) +++ trunk/assets/ref_import_genders.csv 2014-03-01 16:46:23 UTC (rev 57) @@ -1,4 +1,4 @@ -Sexe_cod;Sexe_lib +Code;Libelle UNK;Indetermine M;Male F;Femelle Modified: trunk/assets/ref_import_maturities.csv =================================================================== --- trunk/assets/ref_import_maturities.csv 2014-02-28 13:25:58 UTC (rev 56) +++ trunk/assets/ref_import_maturities.csv 2014-03-01 16:46:23 UTC (rev 57) @@ -1,4 +1,4 @@ -Maturite +Code 1 2 3 Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2014-02-28 13:25:58 UTC (rev 56) +++ trunk/pom.xml 2014-03-01 16:46:23 UTC (rev 57) @@ -162,7 +162,6 @@ <dependency> <groupId>com.google.guava</groupId> <artifactId>guava</artifactId> - <version>${guavaVersion}</version> </dependency> <dependency> @@ -174,7 +173,7 @@ <dependency> <groupId>org.nuiton</groupId> <artifactId>nuiton-csv</artifactId> - <version>3.0-alpha-1</version> + <version>3.0-alpha-3</version> </dependency> <dependency> @@ -229,14 +228,6 @@ <checksumPolicy>fail</checksumPolicy> </releases> </pluginRepository> - <pluginRepository> - <id>oss.sonatype.org-jayway-snapshots</id> - <name>Jayway OpenSource SNAPSHOTs on Sonatype.org</name> - <url>http://oss.sonatype.org/content/repositories/jayway-snapshots/</url> - <snapshots> - <enabled>true</enabled> - </snapshots> - </pluginRepository> </pluginRepositories> <build> @@ -253,7 +244,7 @@ <plugin> <groupId>com.jayway.maven.plugins.android.generation2</groupId> <artifactId>android-maven-plugin</artifactId> - <version>3.8.3-SNAPSHOT</version> + <version>3.8.2</version> <executions> <execution> <id>alignApk</id> Added: trunk/res/layout/category_creation_form.xml =================================================================== --- trunk/res/layout/category_creation_form.xml (rev 0) +++ trunk/res/layout/category_creation_form.xml 2014-03-01 16:46:23 UTC (rev 57) @@ -0,0 +1,59 @@ +<?xml version="1.0" encoding="utf-8"?> + +<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android" + android:orientation="vertical" + android:layout_width="match_parent" + android:layout_height="match_parent"> + + <ScrollView android:layout_width="match_parent" + android:layout_height="0dp" + android:layout_weight="1" + android:fillViewport="true"> + + <LinearLayout android:orientation="vertical" + android:layout_width="match_parent" + android:layout_height="wrap_content"> + + <TextView android:text="@string/category_label" + android:layout_width="match_parent" + android:layout_height="wrap_content"/> + + <EditText android:id="@+id/category_label" + android:layout_width="match_parent" + android:layout_height="wrap_content"/> + + <Button android:id="@+id/import_qualitative_values_button" + android:text="@string/import_qualitative_values" + android:layout_width="match_parent" + android:layout_height="wrap_content" + android:onClick="importQualitativeValues"/> + + <TextView android:id="@+id/qualitative_values_nb_label" + android:layout_width="match_parent" + android:layout_height="wrap_content" + android:visibility="gone"/> + + </LinearLayout> + + </ScrollView> + + <LinearLayout android:orientation="horizontal" + android:layout_width="match_parent" + android:layout_height="wrap_content" + android:gravity="bottom"> + + <Button android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:layout_weight="1" + android:text="@android:string/cancel" + android:onClick="cancel" /> + + <Button android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:layout_weight="1" + android:text="@android:string/ok" + android:onClick="validate" /> + + </LinearLayout> + +</LinearLayout> \ No newline at end of file Modified: trunk/res/layout/commercial_species_form.xml =================================================================== --- trunk/res/layout/commercial_species_form.xml 2014-02-28 13:25:58 UTC (rev 56) +++ trunk/res/layout/commercial_species_form.xml 2014-03-01 16:46:23 UTC (rev 57) @@ -41,7 +41,6 @@ <Spinner android:id="@+id/commercial_species_form_precision" android:layout_width="match_parent" android:layout_height="wrap_content" - android:singleLine="true" android:hint="@string/undefined"/> <CheckBox android:id="@+id/commercial_species_form_species_mix" @@ -82,6 +81,33 @@ android:singleLine="true" android:hint="@string/undefined"/> + <TextView android:text="@string/commercial_species_form_category1" + android:layout_width="match_parent" + android:layout_height="wrap_content"/> + + <Spinner android:id="@+id/category1_spinner" + android:layout_width="match_parent" + android:layout_height="wrap_content" + android:hint="@string/undefined"/> + + <TextView android:text="@string/commercial_species_form_category2" + android:layout_width="match_parent" + android:layout_height="wrap_content"/> + + <Spinner android:id="@+id/category2_spinner" + android:layout_width="match_parent" + android:layout_height="wrap_content" + android:hint="@string/undefined"/> + + <TextView android:text="@string/commercial_species_form_category3" + android:layout_width="match_parent" + android:layout_height="wrap_content"/> + + <Spinner android:id="@+id/category3_spinner" + android:layout_width="match_parent" + android:layout_height="wrap_content" + android:hint="@string/undefined"/> + <TextView android:text="@string/form_comment" android:layout_width="match_parent" android:layout_height="wrap_content"/> Modified: trunk/res/layout/measurement.xml =================================================================== --- trunk/res/layout/measurement.xml 2014-02-28 13:25:58 UTC (rev 56) +++ trunk/res/layout/measurement.xml 2014-03-01 16:46:23 UTC (rev 57) @@ -17,42 +17,78 @@ android:layout_height="match_parent" android:orientation="vertical"> - <TextView android:text="@string/gender" - android:layout_width="wrap_content" + <TextView android:id="@+id/form_category1_label" + android:layout_width="match_parent" android:layout_height="wrap_content" android:paddingTop="10dp" android:paddingLeft="10dp" android:paddingRight="5dp"/> - <Spinner android:id="@+id/gender_spinner" - android:layout_width="wrap_content" - android:layout_height="wrap_content" - android:layout_weight="1"/> + <LinearLayout android:id="@+id/category1_panel" + android:layout_width="match_parent" + android:layout_height="wrap_content" + android:layout_weight="1"> - <TextView android:text="@string/maturity" - android:layout_width="wrap_content" + <Spinner android:id="@+id/category1_spinner" + android:layout_width="match_parent" + android:layout_height="match_parent"/> + + <EditText android:id="@+id/category1_text" + android:layout_width="match_parent" + android:layout_height="match_parent" + android:singleLine="true" + android:inputType="number"/> + + </LinearLayout> + + <TextView android:id="@+id/form_category2_label" + android:layout_width="match_parent" android:layout_height="wrap_content" android:paddingTop="10dp" android:paddingLeft="10dp" android:paddingRight="5dp"/> - <Spinner android:id="@+id/maturity_spinner" - android:layout_width="wrap_content" - android:layout_height="wrap_content" - android:layout_weight="1"/> + <LinearLayout android:id="@+id/category2_panel" + android:layout_width="match_parent" + android:layout_height="wrap_content" + android:layout_weight="1"> - <TextView android:text="@string/age" - android:layout_width="wrap_content" + <Spinner android:id="@+id/category2_spinner" + android:layout_width="match_parent" + android:layout_height="match_parent"/> + + <EditText android:id="@+id/category2_text" + android:layout_width="match_parent" + android:layout_height="match_parent" + android:singleLine="true" + android:inputType="number"/> + + </LinearLayout> + + <TextView android:id="@+id/form_category3_label" + android:layout_width="match_parent" android:layout_height="wrap_content" android:paddingTop="10dp" android:paddingLeft="10dp" android:paddingRight="5dp"/> - <Spinner android:id="@+id/age_spinner" - android:layout_width="wrap_content" - android:layout_height="wrap_content" - android:layout_weight="1"/> + <LinearLayout android:id="@+id/category3_panel" + android:layout_width="match_parent" + android:layout_height="wrap_content" + android:layout_weight="1"> + <Spinner android:id="@+id/category3_spinner" + android:layout_width="match_parent" + android:layout_height="match_parent"/> + + <EditText android:id="@+id/category3_text" + android:layout_width="match_parent" + android:layout_height="match_parent" + android:singleLine="true" + android:inputType="number"/> + + </LinearLayout> + <LinearLayout android:layout_width="match_parent" android:layout_height="wrap_content" android:orientation="horizontal"> @@ -72,14 +108,15 @@ android:layout_height="wrap_content" android:onClick="incSize"/> + <Button android:id="@+id/measurement_add_button" + android:text="@android:string/ok" + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:onClick="addMeasurement" + android:layout_weight="1"/> + </LinearLayout> - <Button android:id="@+id/measurement_add_button" - android:text="@android:string/ok" - android:layout_width="match_parent" - android:layout_height="wrap_content" - android:onClick="addMeasurement"/> - </LinearLayout> <View android:layout_width="1px" Modified: trunk/res/values/strings.xml =================================================================== --- trunk/res/values/strings.xml 2014-02-28 13:25:58 UTC (rev 56) +++ trunk/res/values/strings.xml 2014-03-01 16:46:23 UTC (rev 57) @@ -103,7 +103,8 @@ <string name="preferences_import_scientific_species">Import scientific species</string> <string name="preferences_import_states">Import states</string> <string name="preferences_import_vessels">Import vessels</string> - <string name="preferences_import_calcified_parts_takings">Import calcified parts taking algorithm settings</string> + <string name="preferences_import_categories">Import categorizations</string> + <string name="preferences_import_no_external_storage_title">External storage unavailable</string> <string name="preferences_import_no_external_storage_message">No externat storage is available.\nWould you like to import the data without saving the source file?</string> <string name="preferences_importing_referential">Importing referential data</string> @@ -114,6 +115,15 @@ <string name="import_new_element_number">%s new items imported</string> <string name="import_error">An error occurred during the import.\nCheck that the header names of the file you chose are correct.</string> + <string name="preferences_calcified_parts_takings">Calcified parts taking</string> + <string name="preferences_import_calcified_parts_takings">Import algorithm settings</string> + + <string name="category_creation_title">New category</string> + <string name="category_label">Label</string> + <string name="import_qualitative_values">Import qualitative values</string> + <string name="qualitative_values_nb">%s qualitative values</string> + <string name="category_created">The category has been successfully created.</string> +  <string name="add_context">Create a new context</string> <string name="contexts_title">Contexts</string> @@ -158,6 +168,9 @@ <string name="commercial_species_form_state">State</string> <string name="commercial_species_form_presentation">Presentation</string> <string name="commercial_species_form_sortCategory">Sort category</string> + <string name="commercial_species_form_category1">Category 1</string> + <string name="commercial_species_form_category2">Category 2</string> + <string name="commercial_species_form_category3">Category 3</string> <string name="commercial_species_title">Commercial species</string> <string name="commercial_species_subtitle">Metier %s</string> <string name="add_commercial_species">Create a new commercial species</string> Modified: trunk/res/values-fr/arrays.xml =================================================================== --- trunk/res/values-fr/arrays.xml 2014-02-28 13:25:58 UTC (rev 56) +++ trunk/res/values-fr/arrays.xml 2014-03-01 16:46:23 UTC (rev 57) @@ -1,7 +1,7 @@ <?xml version="1.0" encoding="utf-8"?> <resources> - <string-array name="preferences_weightunit_entries"> + <string-array name="preferences_weight_unit_entries"> <item>grammes (g)</item> <item>kilogrammes (kg)</item> </string-array> Modified: trunk/res/values-fr/strings.xml =================================================================== --- trunk/res/values-fr/strings.xml 2014-02-28 13:25:58 UTC (rev 56) +++ trunk/res/values-fr/strings.xml 2014-03-01 16:46:23 UTC (rev 57) @@ -96,8 +96,8 @@ <string name="preferences_import_scientific_species">Importer des espèces scientifiques</string> <string name="preferences_import_states">Importer des états</string> <string name="preferences_import_vessels">Importer des navires</string> - <string name="preferences_import_calcified_parts_takings">Import des paramètres des prélèvements</string> - <string name="preferences_import_calcified_parts_takings_summary">des pièces calcifiées</string> + <string name="preferences_import_categories">Import des catégorisations</string> + <string name="preferences_import_no_external_storage_title">Stockage externe non trouvé</string> <string name="preferences_import_no_external_storage_message">Aucun stockage externe n\'est disponible.\nVoulez vous continuer sans sauvegarder le fichier d\'origine ?</string> <string name="preferences_importing_referential">Import des données du référentiel en cours</string> @@ -108,6 +108,15 @@ <string name="preferences_favorites_commercial_species">Espèces commerciales</string> <string name="preferences_favorites_scientific_species">Espèces scientifiques</string> + <string name="preferences_calcified_parts_takings">Prélèvement des pièces calcifiées</string> + <string name="preferences_import_calcified_parts_takings">Import des paramètres de l\'algorithme</string> + + <string name="category_creation_title">Nouvelle catégorie</string> + <string name="category_label">Libellé</string> + <string name="import_qualitative_values">Importer les valeurs possibles</string> + <string name="qualitative_values_nb">%s valeurs pour cette catégorie</string> + <string name="category_created">La catégorie a bien été créée.</string> +  <string name="add_context">Créer un nouveau contexte</string> <string name="contexts_title">Contextes</string> @@ -152,6 +161,9 @@ <string name="commercial_species_form_state">État</string> <string name="commercial_species_form_presentation">Présentation</string> <string name="commercial_species_form_sortCategory">Catégorie de tri</string> + <string name="commercial_species_form_category1">Catégorie 1</string> + <string name="commercial_species_form_category2">Catégorie 2</string> + <string name="commercial_species_form_category3">Catégorie 3</string> <string name="commercial_species_title">Espèces commerciales</string> <string name="commercial_species_subtitle">Métier %s</string> <string name="add_commercial_species">Créer une nouvelle espèce commerciale</string> @@ -169,7 +181,7 @@  <string name="weights_title">Poids</string> <string name="commercial_species_total_unloaded_weight">Poids total débarqué</string> - <string name="scientific_species_sample_weight">Poids trié</string> + <string name="scientific_species_sorted_weight">Poids trié</string> <string name="scientific_species_sample_weight">Poids d\'échantillon</string> <string name="scientific_species_categories">Poids par catégorie (Sexe / maturité / age)</string> Modified: trunk/res/xml/preferences.xml =================================================================== --- trunk/res/xml/preferences.xml 2014-02-28 13:25:58 UTC (rev 56) +++ trunk/res/xml/preferences.xml 2014-03-01 16:46:23 UTC (rev 57) @@ -57,15 +57,8 @@ android:key="import_states"/> <Preference android:title="@string/preferences_import_mensurations" android:key="import_mensurations"/> - <Preference android:title="@string/preferences_import_ages" - android:key="import_ages"/> - <Preference android:title="@string/preferences_import_maturities" - android:key="import_maturities"/> - <Preference android:title="@string/preferences_import_genders" - android:key="import_genders"/> - <Preference android:title="@string/preferences_import_calcified_parts_takings" - android:summary="@string/preferences_import_calcified_parts_takings_summary" - android:key="import_calcified_parts_takings"/> + <Preference android:title="@string/preferences_import_categories" + android:key="import_categories"/> </PreferenceScreen> @@ -85,4 +78,13 @@ </PreferenceCategory> + <PreferenceCategory + android:title="@string/preferences_calcified_parts_takings" + android:key="preferences_calcified_parts_takings"> + + <Preference android:title="@string/preferences_import_calcified_parts_takings" + android:key="import_calcified_parts_takings"/> + + </PreferenceCategory> + </PreferenceScreen> \ No newline at end of file Modified: trunk/src/fr/ifremer/wlo/CommercialSpeciesFormActivity.java =================================================================== --- trunk/src/fr/ifremer/wlo/CommercialSpeciesFormActivity.java 2014-02-28 13:25:58 UTC (rev 56) +++ trunk/src/fr/ifremer/wlo/CommercialSpeciesFormActivity.java 2014-03-01 16:46:23 UTC (rev 57) @@ -36,11 +36,14 @@ import android.widget.CheckBox; import android.widget.CompoundButton; import android.widget.Spinner; +import com.google.common.base.Function; import com.google.common.base.Predicate; import com.google.common.collect.Collections2; import com.google.common.collect.Lists; import com.google.common.collect.Sets; +import fr.ifremer.wlo.models.BaseModel; import fr.ifremer.wlo.models.CommercialSpeciesModel; +import fr.ifremer.wlo.models.categorization.CategoryModel; import fr.ifremer.wlo.models.referentials.CommercialSpecies; import fr.ifremer.wlo.models.referentials.Mensuration; import fr.ifremer.wlo.models.referentials.Presentation; @@ -50,6 +53,7 @@ import fr.ifremer.wlo.storage.WloSqlOpenHelper; import fr.ifremer.wlo.utils.WloAutoCompleteTextViewWithFavorites; +import java.util.ArrayList; import java.util.Collection; import java.util.List; import java.util.Set; @@ -164,8 +168,65 @@ initEditText(R.id.form_comment, CommercialSpeciesModel.COLUMN_COMMENT); + initCategorySpinner((Spinner) findViewById(R.id.category1_spinner), + model.getCategory1(), + new Function<CategoryModel, Void>() { + @Override + public Void apply(CategoryModel input) { + model.setCategory1(input); + return null; + } + }); + initCategorySpinner((Spinner) findViewById(R.id.category2_spinner), + model.getCategory2(), + new Function<CategoryModel, Void>() { + @Override + public Void apply(CategoryModel input) { + model.setCategory2(input); + return null; + } + }); + initCategorySpinner((Spinner) findViewById(R.id.category3_spinner), + model.getCategory3(), + new Function<CategoryModel, Void>() { + @Override + public Void apply(CategoryModel input) { + model.setCategory3(input); + return null; + } + }); + } + protected void initCategorySpinner(Spinner spinner, + CategoryModel category, + final Function<CategoryModel, Void> setCategoryFunction) { + List<Object> categories = new ArrayList<Object>(DataCache.getAllCategories(this)); + categories.add(0, ""); + Log.d(TAG, categories.toString()); + ArrayAdapter adapter = new ArrayAdapter(this, android.R.layout.simple_spinner_dropdown_item, categories); + spinner.setAdapter(adapter); + spinner.setSelection(adapter.getPosition(category)); + spinner.setOnItemSelectedListener(new AdapterView.OnItemSelectedListener() { + @Override + public void onItemSelected(AdapterView<?> parent, View view, int position, long id) { + CategoryModel category; + if (position == 0) { + category = null; + } else { + category = (CategoryModel) parent.getItemAtPosition(position); + category = DataCache.getCategoryById(CommercialSpeciesFormActivity.this, category.getId()); + } + setCategoryFunction.apply(category); + } + + @Override + public void onNothingSelected(AdapterView<?> parent) { + setCategoryFunction.apply(null); + } + }); + } + @Override protected void saveModel() { super.saveModel(); Modified: trunk/src/fr/ifremer/wlo/MainActivity.java =================================================================== --- trunk/src/fr/ifremer/wlo/MainActivity.java 2014-02-28 13:25:58 UTC (rev 56) +++ trunk/src/fr/ifremer/wlo/MainActivity.java 2014-03-01 16:46:23 UTC (rev 57) @@ -39,10 +39,12 @@ import android.widget.Button; import android.widget.LinearLayout; import android.widget.Toast; -import fr.ifremer.wlo.models.referentials.imports.ImportUtil; +import fr.ifremer.wlo.imports.ImportUtil; +import fr.ifremer.wlo.models.categorization.CategoryModel; import fr.ifremer.wlo.preferences.SettingsActivity; import fr.ifremer.wlo.storage.DataCache; import fr.ifremer.wlo.storage.Exporter; +import fr.ifremer.wlo.storage.WloSqlOpenHelper; import fr.ifremer.wlo.utils.filechooser.FileDialog; import fr.ifremer.wlo.utils.filechooser.SelectionMode; import org.apache.commons.io.FileUtils; @@ -129,69 +131,83 @@ dialog.setIndeterminate(false); dialog.setCancelable(false); dialog.setProgressStyle(ProgressDialog.STYLE_HORIZONTAL); - dialog.setMax(11); + dialog.setMax(9); dialog.setMessage(getString(R.string.main_loading_referential)); dialog.show(); new Thread(new Runnable() { @Override public void run() { - try { - if (DataCache.getAllAges(MainActivity.this).isEmpty()) { - ImportUtil.importAges(MainActivity.this, getAssets().open("ref_import_ages.csv")); - } - dialog.setProgress(1); - if (DataCache.getAllCommercialSpecies(MainActivity.this).isEmpty()) { - ImportUtil.importCommercialSpecies(MainActivity.this, getAssets().open("ref_import_commercial_species.csv")); - } - dialog.setProgress(2); - if (DataCache.getAllGenders(MainActivity.this).isEmpty()) { - ImportUtil.importGenders(MainActivity.this, getAssets().open("ref_import_genders.csv")); - } - dialog.setProgress(3); - if (DataCache.getAllLocations(MainActivity.this).isEmpty()) { - ImportUtil.importLocations(MainActivity.this, getAssets().open("ref_import_locations.csv")); - } - dialog.setProgress(4); - if (DataCache.getAllMaturities(MainActivity.this).isEmpty()) { - ImportUtil.importMaturities(MainActivity.this, getAssets().open("ref_import_maturities.csv")); - } - dialog.setProgress(5); - if (DataCache.getAllMensurations(MainActivity.this).isEmpty()) { - ImportUtil.importMensurations(MainActivity.this, getAssets().open("ref_import_mensurations.csv")); - } - dialog.setProgress(6); - if (DataCache.getAllMetiers(MainActivity.this).isEmpty()) { - ImportUtil.importMetiers(MainActivity.this, getAssets().open("ref_import_metiers.csv")); - } - dialog.setProgress(7); - if (DataCache.getAllPresentations(MainActivity.this).isEmpty()) { - ImportUtil.importPresentations(MainActivity.this, getAssets().open("ref_import_presentations.csv")); - } - dialog.setProgress(8); - if (DataCache.getAllScientificSpecies(MainActivity.this).isEmpty()) { - ImportUtil.importScientificSpecies(MainActivity.this, getAssets().open("ref_import_scientific_species.csv")); - } - dialog.setProgress(9); - if (DataCache.getAllStates(MainActivity.this).isEmpty()) { - ImportUtil.importStates(MainActivity.this, getAssets().open("ref_import_states.csv")); - } - dialog.setProgress(10); - if (DataCache.getAllVessels(MainActivity.this).isEmpty()) { - ImportUtil.importVessels(MainActivity.this, getAssets().open("ref_import_vessels.csv")); - } - dialog.setProgress(11); + initData(); + } + }).start(); - } catch (IOException | RuntimeException e) { - //TODO kmorin 20140130 show error to the user - Log.e(TAG, "error on initial import", e); + } - } finally { - dialog.dismiss(); - } + protected void initData() { + try { + if (DataCache.getAllCommercialSpecies(this).isEmpty()) { + ImportUtil.importCommercialSpecies(this, getAssets().open("ref_import_commercial_species.csv")); } - }).start(); + dialog.setProgress(1); + if (DataCache.getAllLocations(this).isEmpty()) { + ImportUtil.importLocations(this, getAssets().open("ref_import_locations.csv")); + } + dialog.setProgress(2); + if (DataCache.getAllMensurations(this).isEmpty()) { + ImportUtil.importMensurations(this, getAssets().open("ref_import_mensurations.csv")); + } + dialog.setProgress(3); + if (DataCache.getAllMetiers(this).isEmpty()) { + ImportUtil.importMetiers(this, getAssets().open("ref_import_metiers.csv")); + } + dialog.setProgress(4); + if (DataCache.getAllPresentations(this).isEmpty()) { + ImportUtil.importPresentations(this, getAssets().open("ref_import_presentations.csv")); + } + dialog.setProgress(5); + if (DataCache.getAllScientificSpecies(this).isEmpty()) { + ImportUtil.importScientificSpecies(this, getAssets().open("ref_import_scientific_species.csv")); + } + dialog.setProgress(6); + if (DataCache.getAllStates(this).isEmpty()) { + ImportUtil.importStates(this, getAssets().open("ref_import_states.csv")); + } + dialog.setProgress(7); + if (DataCache.getAllVessels(this).isEmpty()) { + ImportUtil.importVessels(this, getAssets().open("ref_import_vessels.csv")); + } + dialog.setProgress(8); + if (DataCache.getAllCategories(this).isEmpty()) { + WloSqlOpenHelper soh = new WloSqlOpenHelper(this); + CategoryModel ageCategory = new CategoryModel(); + ageCategory.setLabel(getString(R.string.age)); + soh.saveData(ageCategory); + + CategoryModel genderCategory = new CategoryModel(); + genderCategory.setLabel(getString(R.string.gender)); + soh.saveData(genderCategory); + + CategoryModel maturityCategory = new CategoryModel(); + maturityCategory.setLabel(getString(R.string.maturity)); + soh.saveData(maturityCategory); + + soh.saveData(ImportUtil.importQualitativeValues(ageCategory, getAssets().open("ref_import_ages.csv"))); + soh.saveData(ImportUtil.importQualitativeValues(genderCategory, getAssets().open("ref_import_genders.csv"))); + soh.saveData(ImportUtil.importQualitativeValues(maturityCategory, getAssets().open("ref_import_maturities.csv"))); + + soh.close(); + } + dialog.setProgress(9); + + } catch (IOException | RuntimeException e) { + //TODO kmorin 20140130 show error to the user + Log.e(TAG, "error on initial import", e); + + } finally { + dialog.dismiss(); + } } protected void bigfinConnected() { Modified: trunk/src/fr/ifremer/wlo/WeightsActivity.java =================================================================== --- trunk/src/fr/ifremer/wlo/WeightsActivity.java 2014-02-28 13:25:58 UTC (rev 56) +++ trunk/src/fr/ifremer/wlo/WeightsActivity.java 2014-03-01 16:46:23 UTC (rev 57) @@ -38,9 +38,13 @@ import android.widget.LinearLayout; import android.widget.TextView; import com.google.common.base.Function; +import com.google.common.collect.Maps; +import fr.ifremer.wlo.models.BaseModel; import fr.ifremer.wlo.models.CategoryWeightModel; import fr.ifremer.wlo.models.CommercialSpeciesModel; import fr.ifremer.wlo.models.ScientificSpeciesModel; +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; @@ -49,8 +53,10 @@ import org.apache.commons.lang3.StringUtils; import java.util.ArrayList; +import java.util.HashMap; import java.util.List; import java.util.Locale; +import java.util.Map; /** * @author Kevin Morin (Code Lutin) @@ -70,6 +76,8 @@ protected List<CategoryWeightModel> categoryWeightModels = new ArrayList<>(); + protected Map<String, QualitativeValueModel> valuesById = new HashMap<>(); + protected int weightUnit; protected String weightUnitLabel; @@ -93,6 +101,20 @@ } commercialSpeciesModel = (CommercialSpeciesModel) getIntent().getSerializableExtra(INTENT_COMMERCIAL_SPECIES); + + CategoryModel category1 = commercialSpeciesModel.getCategory1(); + if (category1 != null) { + valuesById.putAll(Maps.uniqueIndex(category1.getQualitativeValues(), BaseModel.GET_ID_FUNCTION)); + } + CategoryModel category2 = commercialSpeciesModel.getCategory2(); + if (category2 != null) { + valuesById.putAll(Maps.uniqueIndex(category2.getQualitativeValues(), BaseModel.GET_ID_FUNCTION)); + } + CategoryModel category3 = commercialSpeciesModel.getCategory3(); + if (category3 != null) { + valuesById.putAll(Maps.uniqueIndex(category3.getQualitativeValues(), BaseModel.GET_ID_FUNCTION)); + } + getSupportActionBar().setSubtitle(commercialSpeciesModel.toString(this)); // create total unloaded weight label @@ -176,16 +198,21 @@ } }); + for (final CategoryWeightModel categoryWeightModel : categoryWeightModels) { - // create the weight field - String category1Id = categoryWeightModel.getCategory1(); - String category2Id = categoryWeightModel.getCategory2(); - String category3Id = categoryWeightModel.getCategory3(); - String label = (category1Id != null ? DataCache.getGenderById(this, category1Id).getLabel() : "NA") + ", " + - (category2Id != null ? DataCache.getMaturityById(this, category2Id).getLabel() : "NA") + ", " + - (category3Id != null ? DataCache.getAgeById(this, category3Id).getLabel() : "NA"); + QualitativeValueModel category1Value = valuesById.get(categoryWeightModel.getCategory1()); + QualitativeValueModel category2Value = valuesById.get(categoryWeightModel.getCategory2()); + QualitativeValueModel category3Value = valuesById.get(categoryWeightModel.getCategory3()); + String category1ValueLabel = category1Value != null ? category1Value.toString() : categoryWeightModel.getCategory1(); + String category2ValueLabel = category2Value != null ? category2Value.toString() : categoryWeightModel.getCategory2(); + String category3ValueLabel = category3Value != null ? category3Value.toString() : categoryWeightModel.getCategory3(); + + String label = (category1ValueLabel != null ? category1ValueLabel : "NA") + ", " + + (category2ValueLabel != null ? category2ValueLabel : "NA") + ", " + + (category3ValueLabel != null ? category3ValueLabel : "NA"); + // add label createWeightLabel(label); Deleted: trunk/src/fr/ifremer/wlo/imports/AgeRowModel.java =================================================================== --- trunk/src/fr/ifremer/wlo/models/referentials/imports/AgeRowModel.java 2014-02-28 13:25:58 UTC (rev 56) +++ trunk/src/fr/ifremer/wlo/imports/AgeRowModel.java 2014-03-01 16:46:23 UTC (rev 57) @@ -1,52 +0,0 @@ -package fr.ifremer.wlo.models.referentials.imports; - -/* - * #%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 fr.ifremer.wlo.models.referentials.Age; -import org.nuiton.csv.ValueSetter; -import org.nuiton.csv.ext.AbstractImportExportModel; - -/** - * @author kmorin <kmorin(a)codelutin.com> - * @since 0.1 - */ -public class AgeRowModel extends AbstractImportExportModel<Age> { - - public AgeRowModel(char separator) { - super(separator); - - newMandatoryColumn("Age", new ValueSetter<Age, String>() { - @Override - public void set(Age object, String value) throws Exception { - object.setLabel(value); - } - }); - } - - @Override - public Age newEmptyInstance() { - return new Age(); - } -} Copied: trunk/src/fr/ifremer/wlo/imports/CalcifiedPartTakingRowModel.java (from rev 56, trunk/src/fr/ifremer/wlo/models/calcifiedPartTaking/CalcifiedPartTakingRowModel.java) =================================================================== --- trunk/src/fr/ifremer/wlo/imports/CalcifiedPartTakingRowModel.java (rev 0) +++ trunk/src/fr/ifremer/wlo/imports/CalcifiedPartTakingRowModel.java 2014-03-01 16:46:23 UTC (rev 57) @@ -0,0 +1,133 @@ +package fr.ifremer.wlo.imports; + +/* + * #%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.util.Log; +import com.google.common.base.Function; +import com.google.common.collect.Maps; +import fr.ifremer.wlo.models.referentials.CalcifiedPartTaking; +import fr.ifremer.wlo.models.referentials.ScientificSpecies; +import org.nuiton.csv.ValueSetter; +import org.nuiton.csv.ext.AbstractImportExportModel; + +import java.util.Collection; +import java.util.Map; + +/** + * @author kmorin <kmorin(a)codelutin.com> + * @since 0.1 + */ +public class CalcifiedPartTakingRowModel extends AbstractImportExportModel<CalcifiedPartTaking> { + + private static final String TAG = "CalcifiedPartTakingRowModel"; + + public CalcifiedPartTakingRowModel(char separator, Collection<ScientificSpecies> scientificSpecies) { + + super(separator); + + final Map<String, ScientificSpecies> scientificSpeciesByCode = Maps.uniqueIndex(scientificSpecies, new Function<ScientificSpecies, String>() { + @Override + public String apply(ScientificSpecies input) { + return input.getCode(); + } + }); + + newMandatoryColumn("Espece_scientifique", new ValueSetter<CalcifiedPartTaking, String>() { + @Override + public void set(CalcifiedPartTaking object, String value) throws Exception { + if (value == null) { + throw new NullPointerException("L'espece scientifique ne peut etre nulle"); + } + ScientificSpecies species = scientificSpeciesByCode.get(value); + object.setParent(species); + } + }); + + newMandatoryColumn("Classe_debut", new ValueSetter<CalcifiedPartTaking, String>() { + @Override + public void set(CalcifiedPartTaking object, String value) throws Exception { + Integer size; + try { + size = Integer.parseInt(value); + } catch (NumberFormatException e) { + size = null; + } + Log.d(TAG, object + "setStartSize " + size); + object.setStartSize(size); + } + }); + + newMandatoryColumn("Classe_fin", new ValueSetter<CalcifiedPartTaking, String>() { + @Override + public void set(CalcifiedPartTaking object, String value) throws Exception { + Integer size; + try { + size = Integer.parseInt(value); + } catch (NumberFormatException e) { + size = null; + } + Log.d(TAG, object + "setEndSize " + size); + object.setEndSize(size); + } + }); + + newMandatoryColumn("Pas_de_classe", new ValueSetter<CalcifiedPartTaking, String>() { + @Override + public void set(CalcifiedPartTaking object, String value) throws Exception { + Integer size = Integer.parseInt(value); + Log.d(TAG, object + "setSizeStep " + size); + object.setSizeStep(size); + } + }); + + newMandatoryColumn("Pas", new ValueSetter<CalcifiedPartTaking, String>() { + @Override + public void set(CalcifiedPartTaking object, String value) throws Exception { + Integer size = Integer.parseInt(value); + Log.d(TAG, object + "setStep " + size); + object.setStep(size); + } + }); + + newMandatoryColumn("Arret", new ValueSetter<CalcifiedPartTaking, String>() { + @Override + public void set(CalcifiedPartTaking object, String value) throws Exception { + Integer size; + try { + size = Integer.parseInt(value); + } catch (NumberFormatException e) { + size = null; + } + Log.d(TAG, object + "setStop " + size); + object.setStop(size); + } + }); + } + + @Override + public CalcifiedPartTaking newEmptyInstance() { + return new CalcifiedPartTaking(); + } +} Modified: trunk/src/fr/ifremer/wlo/imports/CommercialSpeciesRowModel.java =================================================================== --- trunk/src/fr/ifremer/wlo/models/referentials/imports/CommercialSpeciesRowModel.java 2014-02-28 13:25:58 UTC (rev 56) +++ trunk/src/fr/ifremer/wlo/imports/CommercialSpeciesRowModel.java 2014-03-01 16:46:23 UTC (rev 57) @@ -1,4 +1,4 @@ -package fr.ifremer.wlo.models.referentials.imports; +package fr.ifremer.wlo.imports; /* * #%L Deleted: trunk/src/fr/ifremer/wlo/imports/GenderRowModel.java =================================================================== --- trunk/src/fr/ifremer/wlo/models/referentials/imports/GenderRowModel.java 2014-02-28 13:25:58 UTC (rev 56) +++ trunk/src/fr/ifremer/wlo/imports/GenderRowModel.java 2014-03-01 16:46:23 UTC (rev 57) @@ -1,59 +0,0 @@ -package fr.ifremer.wlo.models.referentials.imports; - -/* - * #%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 fr.ifremer.wlo.models.referentials.Gender; -import org.nuiton.csv.ValueSetter; -import org.nuiton.csv.ext.AbstractImportExportModel; - -/** - * @author kmorin <kmorin(a)codelutin.com> - * @since 0.1 - */ -public class GenderRowModel extends AbstractImportExportModel<Gender> { - - - public GenderRowModel(char separator) { - super(separator); - - newMandatoryColumn("Sexe_cod", new ValueSetter<Gender, String>() { - @Override - public void set(Gender object, String value) throws Exception { - object.setCode(value); - } - }); - newMandatoryColumn("Sexe_lib", new ValueSetter<Gender, String>() { - @Override - public void set(Gender object, String value) throws Exception { - object.setLabel(value); - } - }); - } - - @Override - public Gender newEmptyInstance() { - return new Gender(); - } -} Modified: trunk/src/fr/ifremer/wlo/imports/ImportUtil.java =================================================================== --- trunk/src/fr/ifremer/wlo/models/referentials/imports/ImportUtil.java 2014-02-28 13:25:58 UTC (rev 56) +++ trunk/src/fr/ifremer/wlo/imports/ImportUtil.java 2014-03-01 16:46:23 UTC (rev 57) @@ -1,4 +1,4 @@ -package fr.ifremer.wlo.models.referentials.imports; +package fr.ifremer.wlo.imports; /* * #%L @@ -24,33 +24,27 @@ * #L% */ -import android.app.AlertDialog; import android.content.Context; import android.util.Log; -import com.csvreader.CsvReader; 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.Lists; -import fr.ifremer.wlo.R; import fr.ifremer.wlo.models.BaseModel; -import fr.ifremer.wlo.models.calcifiedPartTaking.CalcifiedPartTaking; -import fr.ifremer.wlo.models.calcifiedPartTaking.CalcifiedPartTakingRowModel; +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.io.IOUtils; import org.nuiton.csv.Import; import org.nuiton.csv.ImportModel; import java.io.FileInputStream; import java.io.FileNotFoundException; -import java.io.IOException; import java.io.InputStream; -import java.io.StringWriter; -import java.nio.charset.Charset; import java.util.ArrayList; import java.util.Collection; @@ -64,22 +58,6 @@ public static final char CSV_SEPARATOR = ';'; - public static int importAges(Context context, String path) { - try { - return importAges(context, new FileInputStream(path)); - } catch (FileNotFoundException e) { - Log.e(TAG, "File " + path + " not found", e); - } - return 0; - } - - public static int importAges(Context context, InputStream inputStream) { - AgeRowModel ageRowModel = new AgeRowModel(CSV_SEPARATOR); - int result = importData(context, ageRowModel, inputStream, DataCache.getAllAges(context)); - DataCache.invalidateAges(); - return result; - } - public static int importCommercialSpecies(Context context, String path) { try { return importCommercialSpecies(context, new FileInputStream(path)); @@ -96,22 +74,6 @@ return result; } - public static int importGenders(Context context, String path) { - try { - return importGenders(context, new FileInputStream(path)); - } catch (FileNotFoundException e) { - Log.e(TAG, "File " + path + " not found", e); - } - return 0; - } - - public static int importGenders(Context context, InputStream inputStream) { - GenderRowModel genderRowModel = new GenderRowModel(CSV_SEPARATOR); - int result = importData(context, genderRowModel, inputStream, DataCache.getAllGenders(context)); - DataCache.invalidateGenders(); - return result; - } - public static int importLocations(Context context, String path) { try { return importLocations(context, new FileInputStream(path)); @@ -128,22 +90,6 @@ return result; } - public static int importMaturities(Context context, String path) { - try { - return importMaturities(context, new FileInputStream(path)); - } catch (FileNotFoundException e) { - Log.e(TAG, "File " + path + " not found", e); - } - return 0; - } - - public static int importMaturities(Context context, InputStream inputStream) { - MaturityRowModel maturityRowModel = new MaturityRowModel(CSV_SEPARATOR); - int result = importData(context, maturityRowModel, inputStream, DataCache.getAllMaturities(context)); - DataCache.invalidateMaturities(); - return result; - } - public static int importMensurations(Context context, String path) { try { return importMensurations(context, new FileInputStream(path)); @@ -255,28 +201,26 @@ return result; } - protected static <M extends BaseModel> int importData(Context context, ImportModel<M> importModel, - InputStream inputStream, final Collection<M> actualReferential) { - Preconditions.checkNotNull(actualReferential); - Import<M> importer = null; - Collection<M> models = null; - + public static Collection<QualitativeValueModel> importQualitativeValues(CategoryModel categoryModel, String path) { try { - importer = Import.newImport(importModel, inputStream); - models = Lists.newArrayList(importer.iterator()); + return importQualitativeValues(categoryModel, new FileInputStream(path)); + } catch (FileNotFoundException e) { + Log.e(TAG, "File " + path + " not found", e); + } + return null; + } - } catch (ClassCastException e) { - // cf issue #4205 - // nuiton-i18n provocks an error when trying to get the error message - Log.e(TAG, "error during import", e); - throw e; + public static Collection<QualitativeValueModel> importQualitativeValues(CategoryModel categoryModel, InputStream inputStream) { + QualitativeValueRowModel qualitativeValueRowModel = new QualitativeValueRowModel(CSV_SEPARATOR, categoryModel); + Collection<QualitativeValueModel> result = importData(qualitativeValueRowModel, inputStream, new ArrayList<QualitativeValueModel>()); + return result; + } - } finally { - if (importer != null) { - importer.close(); - } - } + protected static <M extends BaseModel> int importData(Context context, ImportModel<M> importModel, + InputStream inputStream, final Collection<M> actualReferential) { + Collection<M> models = importData(importModel, inputStream, actualReferential); + if (CollectionUtils.isNotEmpty(models)) { Predicate<M> filter; //if the models have a code attribute, check @@ -313,4 +257,28 @@ return models.size(); } + + protected static <M extends BaseModel> Collection<M> importData(ImportModel<M> importModel, InputStream inputStream, + Collection<M> actualReferential) { + Preconditions.checkNotNull(actualReferential); + Import<M> importer = null; + Collection<M> models = null; + + try { + importer = Import.newImport(importModel, inputStream); + models = Lists.newArrayList(importer.iterator()); + + } catch (ClassCastException e) { + // cf issue #4205 + // nuiton-i18n provocks an error when trying to get the error message + Log.e(TAG, "error during import", e); + throw e; + + } finally { + if (importer != null) { + importer.close(); + } + } + return models; + } } Modified: trunk/src/fr/ifremer/wlo/imports/LocationRowModel.java =================================================================== --- trunk/src/fr/ifremer/wlo/models/referentials/imports/LocationRowModel.java 2014-02-28 13:25:58 UTC (rev 56) +++ trunk/src/fr/ifremer/wlo/imports/LocationRowModel.java 2014-03-01 16:46:23 UTC (rev 57) @@ -1,4 +1,4 @@ -package fr.ifremer.wlo.models.referentials.imports; +package fr.ifremer.wlo.imports; /* * #%L Deleted: trunk/src/fr/ifremer/wlo/imports/MaturityRowModel.java =================================================================== --- trunk/src/fr/ifremer/wlo/models/referentials/imports/MaturityRowModel.java 2014-02-28 13:25:58 UTC (rev 56) +++ trunk/src/fr/ifremer/wlo/imports/MaturityRowModel.java 2014-03-01 16:46:23 UTC (rev 57) @@ -1,53 +0,0 @@ -package fr.ifremer.wlo.models.referentials.imports; - -/* - * #%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 fr.ifremer.wlo.models.referentials.Maturity; -import org.nuiton.csv.ValueSetter; -import org.nuiton.csv.ext.AbstractImportExportModel; - -/** - * @author kmorin <kmorin(a)codelutin.com> - * @since 0.1 - */ -public class MaturityRowModel extends AbstractImportExportModel<Maturity> { - - - public MaturityRowModel(char separator) { - super(separator); - - newMandatoryColumn("Maturite", new ValueSetter<Maturity, String>() { - @Override - public void set(Maturity object, String value) throws Exception { - object.setLabel(value); - } - }); - } - - @Override - public Maturity newEmptyInstance() { - return new Maturity(); - } -} Modified: trunk/src/fr/ifremer/wlo/imports/MensurationRowModel.java =================================================================== --- trunk/src/fr/ifremer/wlo/models/referentials/imports/MensurationRowModel.java 2014-02-28 13:25:58 UTC (rev 56) +++ trunk/src/fr/ifremer/wlo/imports/MensurationRowModel.java 2014-03-01 16:46:23 UTC (rev 57) @@ -1,4 +1,4 @@ -package fr.ifremer.wlo.models.referentials.imports; +package fr.ifremer.wlo.imports; /* * #%L Modified: trunk/src/fr/ifremer/wlo/imports/MetierRowModel.java =================================================================== --- trunk/src/fr/ifremer/wlo/models/referentials/imports/MetierRowModel.java 2014-02-28 13:25:58 UTC (rev 56) +++ trunk/src/fr/ifremer/wlo/imports/MetierRowModel.java 2014-03-01 16:46:23 UTC (rev 57) @@ -1,4 +1,4 @@ -package fr.ifremer.wlo.models.referentials.imports; +package fr.ifremer.wlo.imports; /* * #%L Modified: trunk/src/fr/ifremer/wlo/imports/PresentationRowModel.java =================================================================== --- trunk/src/fr/ifremer/wlo/models/referentials/imports/PresentationRowModel.java 2014-02-28 13:25:58 UTC (rev 56) +++ trunk/src/fr/ifremer/wlo/imports/PresentationRowModel.java 2014-03-01 16:46:23 UTC (rev 57) @@ -1,4 +1,4 @@ -package fr.ifremer.wlo.models.referentials.imports; +package fr.ifremer.wlo.imports; /* * #%L Added: trunk/src/fr/ifremer/wlo/imports/QualitativeValueRowModel.java =================================================================== --- trunk/src/fr/ifremer/wlo/imports/QualitativeValueRowModel.java (rev 0) +++ trunk/src/fr/ifremer/wlo/imports/QualitativeValueRowModel.java 2014-03-01 16:46:23 UTC (rev 57) @@ -0,0 +1,41 @@ +package fr.ifremer.wlo.imports; + +import fr.ifremer.wlo.models.categorization.CategoryModel; +import fr.ifremer.wlo.models.categorization.QualitativeValueModel; +import org.nuiton.csv.ValueSetter; +import org.nuiton.csv.ext.AbstractImportExportModel; + +/** + * @author Kevin Morin (Code Lutin) + * @since x.x + */ +public class QualitativeValueRowModel extends AbstractImportExportModel<QualitativeValueModel> { + + protected CategoryModel categoryModel; + + public QualitativeValueRowModel(char separator, CategoryModel category) { + super(separator); + + categoryModel = category; + + newMandatoryColumn("Code", new ValueSetter<QualitativeValueModel, String>() { + @Override + public void set(QualitativeValueModel object, String value) throws Exception { + object.setValue(value); + } + }); + newOptionalColumn("Libelle", new ValueSetter<QualitativeValueModel, String>() { + @Override + public void set(QualitativeValueModel object, String value) throws Exception { + object.setLabel(value); + } + }); + } + + @Override + public QualitativeValueModel newEmptyInstance() { + QualitativeValueModel qualitativeValueModel = new QualitativeValueModel(); + qualitativeValueModel.setCategory(categoryModel); + return qualitativeValueModel; + } +} Modified: trunk/src/fr/ifremer/wlo/imports/ScientificSpeciesRowModel.java =================================================================== --- trunk/src/fr/ifremer/wlo/models/referentials/imports/ScientificSpeciesRowModel.java 2014-02-28 13:25:58 UTC (rev 56) +++ trunk/src/fr/ifremer/wlo/imports/ScientificSpeciesRowModel.java 2014-03-01 16:46:23 UTC (rev 57) @@ -1,4 +1,4 @@ -package fr.ifremer.wlo.models.referentials.imports; +package fr.ifremer.wlo.imports; /* * #%L Modified: trunk/src/fr/ifremer/wlo/imports/StateRowModel.java =================================================================== --- trunk/src/fr/ifremer/wlo/models/referentials/imports/StateRowModel.java 2014-02-28 13:25:58 UTC (rev 56) +++ trunk/src/fr/ifremer/wlo/imports/StateRowModel.java 2014-03-01 16:46:23 UTC (rev 57) @@ -1,4 +1,4 @@ -package fr.ifremer.wlo.models.referentials.imports; +package fr.ifremer.wlo.imports; /* * #%L Modified: trunk/src/fr/ifremer/wlo/imports/VesselRowModel.java =================================================================== --- trunk/src/fr/ifremer/wlo/models/referentials/imports/VesselRowModel.java 2014-02-28 13:25:58 UTC (rev 56) +++ trunk/src/fr/ifremer/wlo/imports/VesselRowModel.java 2014-03-01 16:46:23 UTC (rev 57) @@ -1,4 +1,4 @@ -package fr.ifremer.wlo.models.referentials.imports; +package fr.ifremer.wlo.imports; /* * #%L Modified: trunk/src/fr/ifremer/wlo/measurement/LogsFragment.java =================================================================== --- trunk/src/fr/ifremer/wlo/measurement/LogsFragment.java 2014-02-28 13:25:58 UTC (rev 56) +++ trunk/src/fr/ifremer/wlo/measurement/LogsFragment.java 2014-03-01 16:46:23 UTC (rev 57) @@ -80,19 +80,33 @@ public String apply(MeasurementModel measurement) { Context context = getActivity(); String result = measurement.toString(context,measurements.getPrecision()) + "\n"; + List<Object> cats = Lists.newArrayList(); - List<Object> cats = Lists.newArrayList(); - Object cat1 = DataCache.getGenderById(context, measurement.getCategory1()); - if (cat1 != null) { - cats.add(cat1); + String category1 = measurement.getCategory1(); + if (category1 != null) { + Object category1Value = measurements.getCategoryValuesById(category1); + if (category1Value == null) { + category1Value = category1; + } + cats.add(category1Value); } - Object cat2 = DataCache.getMaturityById(context, measurement.getCategory2()); - if (cat2 != null) { - cats.add(cat2); + + String category2 = measurement.getCategory2(); + if (category2 != null) { + Object category2Value = measurements.getCategoryValuesById(category2); + if (category2Value == null) { + category2Value = category2; + } + cats.add(category2Value); } - Object cat3 = DataCache.getAgeById(context, measurement.getCategory3()); - if (cat3 != null) { - cats.add(cat3); + + String category3 = measurement.getCategory3(); + if (category3 != null) { + Object category3Value = measurements.getCategoryValuesById(category3); + if (category3Value == null) { + category3Value = category3; + } + cats.add(category3Value); } result += StringUtils.join(cats, " - "); return result; Modified: trunk/src/fr/ifremer/wlo/measurement/MeasurementActivity.java =================================================================== --- trunk/src/fr/ifremer/wlo/measurement/MeasurementActivity.java 2014-02-28 13:25:58 UTC (rev 56) +++ trunk/src/fr/ifremer/wlo/measurement/MeasurementActivity.java 2014-03-01 16:46:23 UTC (rev 57) @@ -26,7 +26,6 @@ import android.app.ActionBar; import android.app.AlertDialog; -import android.content.DialogInterface; import android.content.Intent; import android.content.res.Configuration; import android.database.Cursor; @@ -50,6 +49,7 @@ import android.widget.ArrayAdapter; import android.widget.Button; import android.widget.EditText; +import android.widget.LinearLayout; import android.widget.ListView; import android.widget.Spinner; import android.widget.TabHost; @@ -67,9 +67,10 @@ import fr.ifremer.wlo.WloBaseActivity; import fr.ifremer.wlo.WloModelEditionActivity; import fr.ifremer.wlo.models.CategoryWeightModel; -import fr.ifremer.wlo.models.calcifiedPartTaking.CalcifiedPartTaking; +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; -import fr.ifremer.wlo.storage.DataCache; import fr.ifremer.wlo.models.BaseModel; import fr.ifremer.wlo.models.CommercialSpeciesModel; import fr.ifremer.wlo.models.MeasurementModel; @@ -81,6 +82,7 @@ import fr.ifremer.wlo.utils.BaseTextWatcher; import fr.ifremer.wlo.utils.BigFinFeedReaderRecord; import fr.ifremer.wlo.utils.UIUtils; +import org.apache.commons.collections4.CollectionUtils; import java.beans.PropertyChangeEvent; import java.beans.PropertyChangeListener; @@ -235,27 +237,8 @@ observedNumberText = (TextView) findViewById(R.id.observed_number); observedNumberText.setText(String.valueOf(measurements.getMeasurements().size())); - Spinner genderSpinner = (Spinner) findViewById(R.id.gender_spinner); - genderSpinner.setOnItemSelectedListener(this); - List genders = Lists.newArrayList(DataCache.getAllGenders(this)); - genders.add(0, ""); - ArrayAdapter gendersAdapter = new ArrayAdapter<>(this, android.R.layout.simple_spinner_item, genders); - genderSpinner.setAdapter(gendersAdapter); + initCategories(); - Spinner maturitySpinner = (Spinner) findViewById(R.id.maturity_spinner); - maturitySpinner.setOnItemSelectedListener(this); - List maturities = Lists.newArrayList(DataCache.getAllMaturities(this)); - maturities.add(0, ""); - ArrayAdapter maturitiesAdapter = new ArrayAdapter<>(this, android.R.layout.simple_spinner_item, maturities); - maturitySpinner.setAdapter(maturitiesAdapter); - - Spinner ageSpinner = (Spinner) findViewById(R.id.age_spinner); - ageSpinner.setOnItemSelectedListener(this); - List ages = Lists.newArrayList(DataCache.getAllAges(this)); - ages.add(0, ""); - ArrayAdapter agesAdapter = new ArrayAdapter<>(this, android.R.layout.simple_spinner_item, ages); - ageSpinner.setAdapter(agesAdapter); - initFishMeasurement(10 * measurements.getPrecision().getUnitDivider(), null, null, null); DrawerLayout mDrawerLayout = (DrawerLayout) findViewById(R.id.drawer_layout); @@ -296,7 +279,7 @@ if (record != null && record.getLength() != null) { - int size = Math.round(record.getLength()); + int size = (int) Math.floor(record.getLength()); measurement.setSize(size); MeasurementModel savedMeasurement = addMeasurement(); @@ -324,6 +307,72 @@ startActivityForResult(checkIntent, CHECK_TTS_REQUEST_CODE); } + protected void initCategories() { + CategoryModel category1 = commercialSpecies.getCategory1(); + TextView category1Label = (TextView) findViewById(R.id.form_category1_label); + LinearLayout category1Editors = (LinearLayout) findViewById(R.id.category1_panel); + Spinner category1Spinner = (Spinner) findViewById(R.id.category1_spinner); + EditText category1Text = (EditText) findViewById(R.id.category1_text); + initCategoryInput(category1, category1Label, category1Editors, category1Spinner, category1Text); + + CategoryModel category2 = commercialSpecies.getCategory2(); + TextView category2Label = (TextView) findViewById(R.id.form_category2_label); + LinearLayout category2Editors = (LinearLayout) findViewById(R.id.category2_panel); + Spinner category2Spinner = (Spinner) findViewById(R.id.category2_spinner); + EditText category2Text = (EditText) findViewById(R.id.category2_text); + initCategoryInput(category2, category2Label, category2Editors, category2Spinner, category2Text); + + CategoryModel category3 = commercialSpecies.getCategory3(); + TextView category3Label = (TextView) findViewById(R.id.form_category3_label); + LinearLayout category3Editors = (LinearLayout) findViewById(R.id.category3_panel); + Spinner category3Spinner = (Spinner) findViewById(R.id.category3_spinner); + EditText category3Text = (EditText) findViewById(R.id.category3_text); + initCategoryInput(category3, category3Label, category3Editors, category3Spinner, category3Text); + } + + protected void initCategoryInput(CategoryModel category, TextView categoryLabel, LinearLayout categoryEditorPanel, + Spinner categorySpinner, final EditText categoryText) { + if (category == null) { + categoryLabel.setVisibility(View.INVISIBLE); + categoryEditorPanel.setVisibility(View.INVISIBLE); + + } else { + categoryLabel.setText(category.getLabel()); + List values = Lists.newArrayList(category.getQualitativeValues()); + if (values.isEmpty()) { + categorySpinner.setVisibility(View.GONE); + categoryText.addTextChangedListener(new BaseTextWatcher() { + @Override + public void onTextChanged(CharSequence s, int start, int before, int count) { + categoryText.setSelection(start + count); + } + + @Override + public void afterTextChanged(Editable s) { + switch(categoryText.getId()) { + case R.id.category1_text: + measurement.setCategory1(String.valueOf(s)); + break; + case R.id.category2_text: + measurement.setCategory2(String.valueOf(s)); + break; + case R.id.category3_text: + measurement.setCategory3(String.valueOf(s)); + break; + } + } + }); + + } else { + categoryText.setVisibility(View.GONE); + categorySpinner.setOnItemSelectedListener(this); + measurements.addCategoryValues(values); + ArrayAdapter adapter = new ArrayAdapter<>(this, android.R.layout.simple_spinner_dropdown_item, values); + categorySpinner.setAdapter(adapter); + } + } + } + @Override protected void onPostCreate(Bundle savedInstanceState) { super.onPostCreate(savedInstanceState); @@ -353,6 +402,7 @@ case 3: commercialSpecies = (CommercialSpeciesModel) data.getSerializableExtra(WloModelEditionActivity.INTENT_EXTRA_MODEL); measurements.setPrecision(commercialSpecies.getPrecision()); + initCategories(); break; case 4: scientificSpecies = (ScientificSpeciesModel) data.getSerializableExtra(WloModelEditionActivity.INTENT_EXTRA_MODEL); @@ -390,21 +440,16 @@ @Override public void onItemSelected(AdapterView<?> adapterView, View view, int i, long l) { - String id; - if (i == 0) { - id = null; - } else { - BaseModel selected = (BaseModel) adapterView.getItemAtPosition(i); - id = selected != null ? selected.getId() : null; - } + BaseModel selected = (BaseModel) adapterView.getItemAtPosition(i); + String id = selected != null ? selected.getId() : null; switch(adapterView.getId()) { - case R.id.gender_spinner: + case R.id.category1_spinner: measurement.setCategory1(id); break; - case R.id.maturity_spinner: + case R.id.category2_spinner: measurement.setCategory2(id); break; - case R.id.age_spinner: + case R.id.category3_spinner: measurement.setCategory3(id); break; } @@ -413,13 +458,13 @@ @Override public void onNothingSelected(AdapterView<?> adapterView) { switch(adapterView.getId()) { - case R.id.gender_spinner: + case R.id.category1_spinner: measurement.setCategory1(null); break; - case R.id.maturity_spinner: + case R.id.category2_spinner: measurement.setCategory2(null); break; - case R.id.age_spinner: + case R.id.category3_spinner: measurement.setCategory3(null); break; } @@ -516,29 +561,30 @@ break; case MeasurementModel.COLUMN_CATEGORY_1: - Spinner spinner = (Spinner) findViewById(R.id.gender_spinner); - ArrayAdapter adapter = (ArrayAdapter) spinner.getAdapter(); - Object o = DataCache.getGenderById(MeasurementActivity.this, (String) newValue); - int position = adapter.getPosition(o); - spinner.setSelection(position); + CategoryModel category = commercialSpecies.getCategory1(); + Spinner spinner = (Spinner) findViewById(R.id.category1_spinner); + setCategorySpinnerSelection(newValue, category, spinner); + + EditText editText = (EditText) findViewById(R.id.category1_text); + editText.setText(String.valueOf(newValue)); break; case MeasurementModel.COLUMN_CATEGORY_2: - newValue = event.getNewValue(); - spinner = (Spinner) findViewById(R.id.maturity_spinner); - adapter = (ArrayAdapter) spinner.getAdapter(); - o = DataCache.getMaturityById(MeasurementActivity.this, (String) newValue); - position = adapter.getPosition(o); - spinner.setSelection(position); + category = commercialSpecies.getCategory2(); + spinner = (Spinner) findViewById(R.id.category2_spinner); + setCategorySpinnerSelection(newValue, category, spinner); + + editText = (EditText) findViewById(R.id.category2_text); + editText.setText(String.valueOf(newValue)); break; case MeasurementModel.COLUMN_CATEGORY_3: - newValue = event.getNewValue(); - spinner = (Spinner) findViewById(R.id.age_spinner); - adapter = (ArrayAdapter) spinner.getAdapter(); - o = DataCache.getAgeById(MeasurementActivity.this, (String) newValue); - position = adapter.getPosition(o); - spinner.setSelection(position); + category = commercialSpecies.getCategory3(); + spinner = (Spinner) findViewById(R.id.category3_spinner); + setCategorySpinnerSelection(newValue, category, spinner); + + editText = (EditText) findViewById(R.id.category3_text); + editText.setText(String.valueOf(newValue)); break; } } @@ -550,6 +596,19 @@ measurement.setParent(scientificSpecies); } + protected void setCategorySpinnerSelection(Object newValue, CategoryModel category, Spinner spinner) { + List<QualitativeValueModel> qualitativeValues = category.getQualitativeValues(); + if (category != null && CollectionUtils.isNotEmpty(qualitativeValues)) { + ArrayAdapter adapter = (ArrayAdapter) spinner.getAdapter(); + QualitativeValueModel value = null; + if (newValue != null) { + value = measurements.getCategoryValuesById(newValue.toString()); + } + int position = adapter.getPosition(value); + spinner.setSelection(position); + } + } + protected void setupTab(int contentId, String tag, int label) { View tabview = LayoutInflater.from(this).inflate(R.layout.tabs_bg, null); TextView tv = (TextView) tabview.findViewById(R.id.tabsText); Modified: trunk/src/fr/ifremer/wlo/models/BaseModel.java =================================================================== --- trunk/src/fr/ifremer/wlo/models/BaseModel.java 2014-02-28 13:25:58 UTC (rev 56) +++ trunk/src/fr/ifremer/wlo/models/BaseModel.java 2014-03-01 16:46:23 UTC (rev 57) @@ -208,4 +208,24 @@ } } + @Override + public boolean equals(Object o) { + if (this == o) { + return true; + } + if (o == null || getClass() != o.getClass()) { + return false; + } + + BaseModel baseModel = (BaseModel) o; + if (id != null) { + return id.equals(baseModel.id); + } + return super.equals(o); + } + + @Override + public int hashCode() { + return id != null ? id.hashCode() : super.hashCode(); + } } Modified: trunk/src/fr/ifremer/wlo/models/CommercialSpeciesModel.java =================================================================== --- trunk/src/fr/ifremer/wlo/models/CommercialSpeciesModel.java 2014-02-28 13:25:58 UTC (rev 56) +++ trunk/src/fr/ifremer/wlo/models/CommercialSpeciesModel.java 2014-03-01 16:46:23 UTC (rev 57) @@ -28,6 +28,7 @@ import android.content.Context; import android.database.Cursor; import android.util.Log; +import fr.ifremer.wlo.models.categorization.CategoryModel; import fr.ifremer.wlo.models.referentials.CommercialSpecies; import fr.ifremer.wlo.models.referentials.Mensuration; import fr.ifremer.wlo.models.referentials.Presentation; @@ -53,6 +54,9 @@ public static final String COLUMN_SORT_CATEGORY = "sortCategory"; public static final String COLUMN_STATE = "state"; public static final String COLUMN_PRESENTATION = "presentation"; + public static final String COLUMN_CATEGORY1 = "category1"; + public static final String COLUMN_CATEGORY2 = "category2"; + public static final String COLUMN_CATEGORY3 = "category3"; public static final String COLUMN_COMMENT = "comment"; public static final String COLUMN_TOTAL_UNLOADED_WEIGHT = "totalUnloadedWeight"; public static final String COLUMN_METIER_ID = "metierId"; @@ -65,6 +69,9 @@ COLUMN_SORT_CATEGORY, COLUMN_STATE, COLUMN_PRESENTATION, + COLUMN_CATEGORY1, + COLUMN_CATEGORY2, + COLUMN_CATEGORY3, COLUMN_COMMENT, COLUMN_TOTAL_UNLOADED_WEIGHT, COLUMN_METIER_ID @@ -77,6 +84,9 @@ protected String sortCategory; protected State state; protected Presentation presentation; + protected CategoryModel category1; + protected CategoryModel category2; + protected CategoryModel category3; protected String comment; protected Integer totalUnloadedWeight; @@ -98,9 +108,15 @@ state = DataCache.getStateById(context, stateId); String presentationId = cursor.getString(7); presentation = DataCache.getPresentationById(context, presentationId); - comment = cursor.getString(8); - if (!cursor.isNull(9)) { - totalUnloadedWeight = cursor.getInt(9); + String category1Id = cursor.getString(8); + category1 = DataCache.getCategoryById(context, category1Id); + String category2Id = cursor.getString(9); + category2 = DataCache.getCategoryById(context, category2Id); + String category3Id = cursor.getString(10); + category3 = DataCache.getCategoryById(context, category3Id); + comment = cursor.getString(11); + if (!cursor.isNull(12)) { + totalUnloadedWeight = cursor.getInt(12); } } @@ -175,6 +191,30 @@ firePropertyChange(_ID, oldValue, id); } + public CategoryModel getCategory1() { + return category1; + } + + public void setCategory1(CategoryModel category1) { + this.category1 = category1; + } + + public CategoryModel getCategory2() { + return category2; + } + + public void setCategory2(CategoryModel category2) { + this.category2 = category2; + } + + public CategoryModel getCategory3() { + return category3; + } + + public void setCategory3(CategoryModel category3) { + this.category3 = category3; + } + public String getComment() { return comment; } @@ -215,6 +255,9 @@ putValue(value, COLUMN_SORT_CATEGORY, sortCategory); putValue(value, COLUMN_STATE, state != null ? state.getId() : null); putValue(value, COLUMN_PRESENTATION, presentation != null ? presentation.getId() : null); + putValue(value, COLUMN_CATEGORY1, category1 != null ? category1.getId() : null); + putValue(value, COLUMN_CATEGORY2, category2 != null ? category2.getId() : null); + putValue(value, COLUMN_CATEGORY3, category3 != null ? category3.getId() : null); putValue(value, COLUMN_COMMENT, comment); putValue(value, COLUMN_TOTAL_UNLOADED_WEIGHT, totalUnloadedWeight); putValue(value, COLUMN_METIER_ID, getParentId()); Modified: trunk/src/fr/ifremer/wlo/models/MeasurementModel.java =================================================================== --- trunk/src/fr/ifremer/wlo/models/MeasurementModel.java 2014-02-28 13:25:58 UTC (rev 56) +++ trunk/src/fr/ifremer/wlo/models/MeasurementModel.java 2014-03-01 16:46:23 UTC (rev 57) @@ -27,15 +27,9 @@ import android.content.ContentValues; import android.content.Context; import android.database.Cursor; -import android.util.Log; import fr.ifremer.wlo.R; -import fr.ifremer.wlo.models.referentials.Age; -import fr.ifremer.wlo.models.referentials.Gender; -import fr.ifremer.wlo.models.referentials.Maturity; import fr.ifremer.wlo.models.referentials.Mensuration; -import fr.ifremer.wlo.storage.DataCache; import fr.ifremer.wlo.utils.UIUtils; -import org.apache.commons.lang3.ObjectUtils; import java.util.Calendar; Modified: trunk/src/fr/ifremer/wlo/models/MeasurementsModel.java =================================================================== --- trunk/src/fr/ifremer/wlo/models/MeasurementsModel.java 2014-02-28 13:25:58 UTC (rev 56) +++ trunk/src/fr/ifremer/wlo/models/MeasurementsModel.java 2014-03-01 16:46:23 UTC (rev 57) @@ -24,16 +24,21 @@ * #L% */ -import android.util.Log; import com.google.common.collect.HashMultimap; import com.google.common.collect.Lists; +import com.google.common.collect.Maps; import com.google.common.collect.Multimap; -import fr.ifremer.wlo.models.calcifiedPartTaking.CalcifiedPartTaking; +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; import java.io.Serializable; import java.util.ArrayList; +import java.util.Collection; +import java.util.HashMap; import java.util.List; +import java.util.Map; /** * @author kmorin <kmorin(a)codelutin.com> @@ -51,6 +56,8 @@ protected List<CalcifiedPartTaking> calcifiedPartTakings; + protected Map<String, QualitativeValueModel> categoryValuesById = new HashMap<>(); + transient protected List<MeasurementsListener> listeners = new ArrayList<MeasurementsListener>(); public ScientificSpeciesModel getScientificSpecies() { @@ -87,31 +94,24 @@ fireMeasurementAdded(fishMeasurement); boolean result = false; - Log.d(TAG, "calcifiedPartTakings : " + calcifiedPartTakings); if (calcifiedPartTakings != null) { CalcifiedPartTaking calcifiedPartTaking = null; for (CalcifiedPartTaking cpt : calcifiedPartTakings) { - Log.d(TAG, "size : " + size); Integer startSize = cpt.getStartSize(); - Log.d(TAG, "startSize : " + startSize); Integer endSize = cpt.getEndSize(); - Log.d(TAG, "endSize : " + endSize); if ((startSize == null || startSize <= size) && (endSize == null || endSize >= size)) { calcifiedPartTaking = cpt; break; } } - Log.d(TAG, "calcifiedPartTaking : " + calcifiedPartTaking); if (calcifiedPartTaking != null) { int nb = measurements.get(size).size(); - Log.d(TAG, "nb : " + nb); int step = calcifiedPartTaking.getStep(); - Log.d(TAG, "step : " + step); Integer stop = calcifiedPartTaking.getStop(); - Log.d(TAG, "stop : " + stop); - Log.d(TAG, "nb % step : " + (nb % step)); - result = nb == 1 || (nb % step == 0 && (stop == null || nb <= stop)); + boolean stepOk = (nb - 1) % step == 0; + boolean stopOk = stop == null || (nb - 1) / step < stop; + result = nb == 1 || stepOk && stopOk; } } @@ -132,6 +132,16 @@ this.calcifiedPartTakings = calcifiedPartTakings; } + public QualitativeValueModel getCategoryValuesById(String id) { + return categoryValuesById.get(id); + } + + public void addCategoryValues(Collection<QualitativeValueModel> categoryValues) { + if (categoryValues != null) { + categoryValuesById.putAll(Maps.uniqueIndex(categoryValues, BaseModel.GET_ID_FUNCTION)); + } + } + public void addMeasurementsListener(MeasurementsListener listener) { ensureListeners(); listeners.add(listener); Deleted: trunk/src/fr/ifremer/wlo/models/calcifiedPartTaking/CalcifiedPartTaking.java =================================================================== --- trunk/src/fr/ifremer/wlo/models/calcifiedPartTaking/CalcifiedPartTaking.java 2014-02-28 13:25:58 UTC (rev 56) +++ trunk/src/fr/ifremer/wlo/models/calcifiedPartTaking/CalcifiedPartTaking.java 2014-03-01 16:46:23 UTC (rev 57) @@ -1,142 +0,0 @@ -package fr.ifremer.wlo.models.calcifiedPartTaking; - -/* - * #%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.content.ContentValues; -import android.database.Cursor; -import android.util.Log; -import fr.ifremer.wlo.models.BaseModel; -import fr.ifremer.wlo.models.HierarchicalModel; -import fr.ifremer.wlo.models.referentials.ScientificSpecies; - -/** - * @author Kevin Morin (Code Lutin) - * @since x.x - */ -public class CalcifiedPartTaking extends HierarchicalModel<ScientificSpecies> { - - private static final String TAG = "CalcifiedPartTaking"; - - public static final String TABLE_NAME = "calcifiedPartTaking"; - public static final String COLUMN_START_SIZE = "startSize"; - public static final String COLUMN_END_SIZE = "endSize"; - public static final String COLUMN_SIZE_STEP = "sizeStep"; - public static final String COLUMN_STEP = "step"; - public static final String COLUMN_STOP = "stop"; - public static final String COLUMN_SCIENTIFIC_SPECIES_ID = "scientificSpeciesId"; - public static final String[] ALL_COLUMNS = new String[] { - _ID, - COLUMN_START_SIZE, - COLUMN_END_SIZE, - COLUMN_SIZE_STEP, - COLUMN_STEP, - COLUMN_STOP, - COLUMN_SCIENTIFIC_SPECIES_ID - }; - - @Override - public String getTableName() { - return TABLE_NAME; - } - - protected Integer startSize; - protected Integer endSize; - protected int sizeStep; - protected int step; - protected Integer stop; - - public CalcifiedPartTaking() { - } - - public CalcifiedPartTaking(Cursor cursor) { - super(cursor); - if (!cursor.isNull(1)) { - startSize = cursor.getInt(1); - } - if (!cursor.isNull(2)) { - endSize = cursor.getInt(2); - } - if (!cursor.isNull(3)) { - sizeStep = cursor.getInt(3); - } - step = cursor.getInt(4); - if (!cursor.isNull(5)) { - stop = cursor.getInt(5); - } - Log.d(TAG, startSize + " " + endSize + " " + sizeStep + " " + step + " " + stop); - } - - public Integer getStartSize() { - return startSize; - } - - public void setStartSize(Integer startSize) { - this.startSize = startSize; - } - - public Integer getEndSize() { - return endSize; - } - - public void setEndSize(Integer endSize) { - this.endSize = endSize; - } - - public int getSizeStep() { - return sizeStep; - } - - public void setSizeStep(int sizeStep) { - this.sizeStep = sizeStep; - } - - public int getStep() { - return step; - } - - public void setStep(int step) { - this.step = step; - } - - public Integer getStop() { - return stop; - } - - public void setStop(Integer stop) { - this.stop = stop; - } - - @Override - public ContentValues convertIntoContentValues() { - ContentValues value = super.convertIntoContentValues(); - putValue(value, COLUMN_START_SIZE, startSize); - putValue(value, COLUMN_END_SIZE, endSize); - putValue(value, COLUMN_SIZE_STEP, sizeStep); - putValue(value, COLUMN_STEP, step); - putValue(value, COLUMN_STOP, stop); - putValue(value, COLUMN_SCIENTIFIC_SPECIES_ID, getParentId()); - return value; - } -} \ No newline at end of file Deleted: trunk/src/fr/ifremer/wlo/models/calcifiedPartTaking/CalcifiedPartTakingRowModel.java =================================================================== --- trunk/src/fr/ifremer/wlo/models/calcifiedPartTaking/CalcifiedPartTakingRowModel.java 2014-02-28 13:25:58 UTC (rev 56) +++ trunk/src/fr/ifremer/wlo/models/calcifiedPartTaking/CalcifiedPartTakingRowModel.java 2014-03-01 16:46:23 UTC (rev 57) @@ -1,132 +0,0 @@ -package fr.ifremer.wlo.models.calcifiedPartTaking; - -/* - * #%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.util.Log; -import com.google.common.base.Function; -import com.google.common.collect.Maps; -import fr.ifremer.wlo.models.referentials.ScientificSpecies; -import org.nuiton.csv.ValueSetter; -import org.nuiton.csv.ext.AbstractImportExportModel; - -import java.util.Collection; -import java.util.Map; - -/** - * @author kmorin <kmorin(a)codelutin.com> - * @since 0.1 - */ -public class CalcifiedPartTakingRowModel extends AbstractImportExportModel<CalcifiedPartTaking> { - - private static final String TAG = "CalcifiedPartTakingRowModel"; - - public CalcifiedPartTakingRowModel(char separator, Collection<ScientificSpecies> scientificSpecies) { - - super(separator); - - final Map<String, ScientificSpecies> scientificSpeciesByCode = Maps.uniqueIndex(scientificSpecies, new Function<ScientificSpecies, String>() { - @Override - public String apply(ScientificSpecies input) { - return input.getCode(); - } - }); - - newMandatoryColumn("Espece_scientifique", new ValueSetter<CalcifiedPartTaking, String>() { - @Override - public void set(CalcifiedPartTaking object, String value) throws Exception { - if (value == null) { - throw new NullPointerException("L'espece scientifique ne peut etre nulle"); - } - ScientificSpecies species = scientificSpeciesByCode.get(value); - object.setParent(species); - } - }); - - newMandatoryColumn("Classe_debut", new ValueSetter<CalcifiedPartTaking, String>() { - @Override - public void set(CalcifiedPartTaking object, String value) throws Exception { - Integer size; - try { - size = Integer.parseInt(value); - } catch (NumberFormatException e) { - size = null; - } - Log.d(TAG, object + "setStartSize " + size); - object.setStartSize(size); - } - }); - - newMandatoryColumn("Classe_fin", new ValueSetter<CalcifiedPartTaking, String>() { - @Override - public void set(CalcifiedPartTaking object, String value) throws Exception { - Integer size; - try { - size = Integer.parseInt(value); - } catch (NumberFormatException e) { - size = null; - } - Log.d(TAG, object + "setEndSize " + size); - object.setEndSize(size); - } - }); - - newMandatoryColumn("Pas_de_classe", new ValueSetter<CalcifiedPartTaking, String>() { - @Override - public void set(CalcifiedPartTaking object, String value) throws Exception { - Integer size = Integer.parseInt(value); - Log.d(TAG, object + "setSizeStep " + size); - object.setSizeStep(size); - } - }); - - newMandatoryColumn("Pas", new ValueSetter<CalcifiedPartTaking, String>() { - @Override - public void set(CalcifiedPartTaking object, String value) throws Exception { - Integer size = Integer.parseInt(value); - Log.d(TAG, object + "setStep " + size); - object.setStep(size); - } - }); - - newMandatoryColumn("Arret", new ValueSetter<CalcifiedPartTaking, String>() { - @Override - public void set(CalcifiedPartTaking object, String value) throws Exception { - Integer size; - try { - size = Integer.parseInt(value); - } catch (NumberFormatException e) { - size = null; - } - Log.d(TAG, object + "setStop " + size); - object.setStop(size); - } - }); - } - - @Override - public CalcifiedPartTaking newEmptyInstance() { - return new CalcifiedPartTaking(); - } -} Added: trunk/src/fr/ifremer/wlo/models/categorization/CategoryModel.java =================================================================== --- trunk/src/fr/ifremer/wlo/models/categorization/CategoryModel.java (rev 0) +++ trunk/src/fr/ifremer/wlo/models/categorization/CategoryModel.java 2014-03-01 16:46:23 UTC (rev 57) @@ -0,0 +1,68 @@ +package fr.ifremer.wlo.models.categorization; + +import android.content.ContentValues; +import android.database.Cursor; +import android.util.Log; +import fr.ifremer.wlo.models.BaseModel; + +import java.util.List; + +/** + * @author Kevin Morin (Code Lutin) + * @since x.x + */ +public class CategoryModel extends BaseModel { + + private static final String TAG = "CategoryModel"; + + public static final String TABLE_NAME = "categories"; + public static final String COLUMN_LABEL = "label"; + public static final String[] ALL_COLUMNS = new String[] { + _ID, + COLUMN_LABEL + }; + + @Override + public String getTableName() { + return TABLE_NAME; + } + + protected String label; + protected List<QualitativeValueModel> qualitativeValues; + + public CategoryModel() { + } + + public CategoryModel(Cursor cursor) { + super(cursor); + label = cursor.getString(1); + } + + public String getLabel() { + return label; + } + + public void setLabel(String label) { + this.label = label; + } + + public List<QualitativeValueModel> getQualitativeValues() { + return qualitativeValues; + } + + public void setQualitativeValues(List<QualitativeValueModel> qualitativeValues) { + this.qualitativeValues = qualitativeValues; + } + + @Override + public String toString() { + return label; + } + + @Override + public ContentValues convertIntoContentValues() { + ContentValues value = super.convertIntoContentValues(); + putValue(value, COLUMN_LABEL, label); + return value; + } +} \ No newline at end of file Added: trunk/src/fr/ifremer/wlo/models/categorization/QualitativeValueModel.java =================================================================== --- trunk/src/fr/ifremer/wlo/models/categorization/QualitativeValueModel.java (rev 0) +++ trunk/src/fr/ifremer/wlo/models/categorization/QualitativeValueModel.java 2014-03-01 16:46:23 UTC (rev 57) @@ -0,0 +1,84 @@ +package fr.ifremer.wlo.models.categorization; + +import android.content.ContentValues; +import android.database.Cursor; +import android.util.Log; +import fr.ifremer.wlo.models.BaseModel; +import org.apache.commons.lang3.StringUtils; + +/** + * @author Kevin Morin (Code Lutin) + * @since x.x + */ +public class QualitativeValueModel extends BaseModel { + + private static final String TAG = "QualitativeValueModel"; + + public static final String TABLE_NAME = "qualitativeValues"; + public static final String COLUMN_VALUE = "value"; + public static final String COLUMN_LABEL = "label"; + public static final String COLUMN_CATEGORY_ID = "categoryId"; + public static final String[] ALL_COLUMNS = new String[] { + _ID, + COLUMN_VALUE, + COLUMN_LABEL, + COLUMN_CATEGORY_ID + }; + + @Override + public String getTableName() { + return TABLE_NAME; + } + + protected String value; + protected String label; + protected CategoryModel category; + + public QualitativeValueModel() { + } + + public QualitativeValueModel(Cursor cursor) { + super(cursor); + value = cursor.getString(1); + label = cursor.getString(2); + Log.d(TAG, cursor.getString(3) + " " + value + " " + label); + } + + public String getValue() { + return value; + } + + public void setValue(String value) { + this.value = value; + } + + public CategoryModel getCategory() { + return category; + } + + public void setCategory(CategoryModel category) { + this.category = category; + } + + public String getLabel() { + return label; + } + + public void setLabel(String label) { + this.label = label; + } + + @Override + public String toString() { + return StringUtils.isNotEmpty(label) ? label : value; + } + + @Override + public ContentValues convertIntoContentValues() { + ContentValues value = super.convertIntoContentValues(); + putValue(value, COLUMN_VALUE, this.value); + putValue(value, COLUMN_LABEL, label); + putValue(value, COLUMN_CATEGORY_ID, category != null ? category.getId() : null); + return value; + } +} \ No newline at end of file Deleted: trunk/src/fr/ifremer/wlo/models/referentials/Age.java =================================================================== --- trunk/src/fr/ifremer/wlo/models/referentials/Age.java 2014-02-28 13:25:58 UTC (rev 56) +++ trunk/src/fr/ifremer/wlo/models/referentials/Age.java 2014-03-01 16:46:23 UTC (rev 57) @@ -1,86 +0,0 @@ -package fr.ifremer.wlo.models.referentials; - -/* - * #%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.content.ContentValues; -import android.database.Cursor; -import fr.ifremer.wlo.models.BaseModel; -import fr.ifremer.wlo.utils.UIUtils; - -/** - * @author kmorin <kmorin(a)codelutin.com> - * @since 0.1 - */ -public class Age extends BaseModel { - - private static final String TAG = "Age"; - - public static final String TABLE_NAME = "ref_ages"; - public static final String COLUMN_LABEL = "label"; - public static final String[] ALL_COLUMNS = new String[] { - _ID, - COLUMN_LABEL - }; - - @Override - public String getTableName() { - return TABLE_NAME; - } - - protected String label; - - public Age() { - } - - public Age(Cursor cursor) { - super(cursor); - label = cursor.getString(1); - } - - public String getLabel() { - return label; - } - - public void setLabel(String label) { - this.label = label; - } - - @Override - public String toString() { - return label; - } - - @Override - public String toString(android.content.Context context) { - return UIUtils.getStringOrUndefined(label, context); - } - - @Override - public ContentValues convertIntoContentValues() { - ContentValues value = super.convertIntoContentValues(); - putValue(value, COLUMN_LABEL, label); - return value; - } -} Copied: trunk/src/fr/ifremer/wlo/models/referentials/CalcifiedPartTaking.java (from rev 56, trunk/src/fr/ifremer/wlo/models/calcifiedPartTaking/CalcifiedPartTaking.java) =================================================================== --- trunk/src/fr/ifremer/wlo/models/referentials/CalcifiedPartTaking.java (rev 0) +++ trunk/src/fr/ifremer/wlo/models/referentials/CalcifiedPartTaking.java 2014-03-01 16:46:23 UTC (rev 57) @@ -0,0 +1,142 @@ +package fr.ifremer.wlo.models.referentials; + +/* + * #%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.content.ContentValues; +import android.database.Cursor; +import android.util.Log; +import fr.ifremer.wlo.models.BaseModel; +import fr.ifremer.wlo.models.HierarchicalModel; +import fr.ifremer.wlo.models.referentials.ScientificSpecies; + +/** + * @author Kevin Morin (Code Lutin) + * @since x.x + */ +public class CalcifiedPartTaking extends HierarchicalModel<ScientificSpecies> { + + private static final String TAG = "CalcifiedPartTaking"; + + public static final String TABLE_NAME = "calcifiedPartTaking"; + public static final String COLUMN_START_SIZE = "startSize"; + public static final String COLUMN_END_SIZE = "endSize"; + public static final String COLUMN_SIZE_STEP = "sizeStep"; + public static final String COLUMN_STEP = "step"; + public static final String COLUMN_STOP = "stop"; + public static final String COLUMN_SCIENTIFIC_SPECIES_ID = "scientificSpeciesId"; + public static final String[] ALL_COLUMNS = new String[] { + _ID, + COLUMN_START_SIZE, + COLUMN_END_SIZE, + COLUMN_SIZE_STEP, + COLUMN_STEP, + COLUMN_STOP, + COLUMN_SCIENTIFIC_SPECIES_ID + }; + + @Override + public String getTableName() { + return TABLE_NAME; + } + + protected Integer startSize; + protected Integer endSize; + protected int sizeStep; + protected int step; + protected Integer stop; + + public CalcifiedPartTaking() { + } + + public CalcifiedPartTaking(Cursor cursor) { + super(cursor); + if (!cursor.isNull(1)) { + startSize = cursor.getInt(1); + } + if (!cursor.isNull(2)) { + endSize = cursor.getInt(2); + } + if (!cursor.isNull(3)) { + sizeStep = cursor.getInt(3); + } + step = cursor.getInt(4); + if (!cursor.isNull(5)) { + stop = cursor.getInt(5); + } + Log.d(TAG, startSize + " " + endSize + " " + sizeStep + " " + step + " " + stop); + } + + public Integer getStartSize() { + return startSize; + } + + public void setStartSize(Integer startSize) { + this.startSize = startSize; + } + + public Integer getEndSize() { + return endSize; + } + + public void setEndSize(Integer endSize) { + this.endSize = endSize; + } + + public int getSizeStep() { + return sizeStep; + } + + public void setSizeStep(int sizeStep) { + this.sizeStep = sizeStep; + } + + public int getStep() { + return step; + } + + public void setStep(int step) { + this.step = step; + } + + public Integer getStop() { + return stop; + } + + public void setStop(Integer stop) { + this.stop = stop; + } + + @Override + public ContentValues convertIntoContentValues() { + ContentValues value = super.convertIntoContentValues(); + putValue(value, COLUMN_START_SIZE, startSize); + putValue(value, COLUMN_END_SIZE, endSize); + putValue(value, COLUMN_SIZE_STEP, sizeStep); + putValue(value, COLUMN_STEP, step); + putValue(value, COLUMN_STOP, stop); + putValue(value, COLUMN_SCIENTIFIC_SPECIES_ID, getParentId()); + return value; + } +} \ No newline at end of file Deleted: trunk/src/fr/ifremer/wlo/models/referentials/Gender.java =================================================================== --- trunk/src/fr/ifremer/wlo/models/referentials/Gender.java 2014-02-28 13:25:58 UTC (rev 56) +++ trunk/src/fr/ifremer/wlo/models/referentials/Gender.java 2014-03-01 16:46:23 UTC (rev 57) @@ -1,99 +0,0 @@ -package fr.ifremer.wlo.models.referentials; - -/* - * #%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.content.ContentValues; -import android.database.Cursor; -import fr.ifremer.wlo.models.BaseModel; -import fr.ifremer.wlo.utils.UIUtils; - -/** - * @author kmorin <kmorin(a)codelutin.com> - * @since 0.1 - */ -public class Gender extends BaseModel implements HasCode { - - private static final String TAG = "Gender"; - - public static final String TABLE_NAME = "ref_genders"; - public static final String COLUMN_CODE = "code"; - public static final String COLUMN_LABEL = "label"; - public static final String[] ALL_COLUMNS = new String[] { - _ID, - COLUMN_CODE, - COLUMN_LABEL - }; - - @Override - public String getTableName() { - return TABLE_NAME; - } - - protected String code; - protected String label; - - public Gender() { - } - - public Gender(Cursor cursor) { - super(cursor); - code = cursor.getString(1); - label = cursor.getString(2); - } - - public String getCode() { - return code; - } - - public void setCode(String code) { - this.code = code; - } - - public String getLabel() { - return label; - } - - public void setLabel(String label) { - this.label = label; - } - - @Override - public String toString() { - return label; - } - - @Override - public String toString(android.content.Context context) { - return UIUtils.getStringOrUndefined(label, context); - } - - @Override - public ContentValues convertIntoContentValues() { - ContentValues value = super.convertIntoContentValues(); - putValue(value, COLUMN_CODE, code); - putValue(value, COLUMN_LABEL, label); - return value; - } -} Deleted: trunk/src/fr/ifremer/wlo/models/referentials/Maturity.java =================================================================== --- trunk/src/fr/ifremer/wlo/models/referentials/Maturity.java 2014-02-28 13:25:58 UTC (rev 56) +++ trunk/src/fr/ifremer/wlo/models/referentials/Maturity.java 2014-03-01 16:46:23 UTC (rev 57) @@ -1,86 +0,0 @@ -package fr.ifremer.wlo.models.referentials; - -/* - * #%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.content.ContentValues; -import android.database.Cursor; -import fr.ifremer.wlo.models.BaseModel; -import fr.ifremer.wlo.utils.UIUtils; - -/** - * @author kmorin <kmorin(a)codelutin.com> - * @since 0.1 - */ -public class Maturity extends BaseModel { - - private static final String TAG = "Maturity"; - - public static final String TABLE_NAME = "ref_maturities"; - public static final String COLUMN_LABEL = "label"; - public static final String[] ALL_COLUMNS = new String[] { - _ID, - COLUMN_LABEL - }; - - @Override - public String getTableName() { - return TABLE_NAME; - } - - protected String label; - - public Maturity() { - } - - public Maturity(Cursor cursor) { - super(cursor); - label = cursor.getString(1); - } - - public String getLabel() { - return label; - } - - public void setLabel(String label) { - this.label = label; - } - - @Override - public String toString() { - return label; - } - - @Override - public String toString(android.content.Context context) { - return UIUtils.getStringOrUndefined(label, context); - } - - @Override - public ContentValues convertIntoContentValues() { - ContentValues value = super.convertIntoContentValues(); - putValue(value, COLUMN_LABEL, label); - return value; - } -} Added: trunk/src/fr/ifremer/wlo/preferences/CategoryCreationAcivity.java =================================================================== --- trunk/src/fr/ifremer/wlo/preferences/CategoryCreationAcivity.java (rev 0) +++ trunk/src/fr/ifremer/wlo/preferences/CategoryCreationAcivity.java 2014-03-01 16:46:23 UTC (rev 57) @@ -0,0 +1,119 @@ +package fr.ifremer.wlo.preferences; + +import android.app.AlertDialog; +import android.content.Intent; +import android.os.Bundle; +import android.text.Editable; +import android.util.Log; +import android.view.View; +import android.widget.EditText; +import android.widget.TextView; +import fr.ifremer.wlo.R; +import fr.ifremer.wlo.WloBaseActivity; +import fr.ifremer.wlo.imports.ImportUtil; +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.UIUtils; +import fr.ifremer.wlo.utils.filechooser.FileDialog; +import fr.ifremer.wlo.utils.filechooser.SelectionMode; + +import java.util.ArrayList; +import java.util.Collection; + +/** + * @author Kevin Morin (Code Lutin) + * @since x.x + */ +public class CategoryCreationAcivity extends WloBaseActivity { + + private static final String TAG = "CategoryCreationAcivity"; + + protected static final int REQUEST_IMPORT_QUALITATIVE_VALUES = 0; + + protected CategoryModel model = new CategoryModel(); + + @Override + protected Integer getContentView() { + return R.layout.category_creation_form; + } + + @Override + protected void onCreate(Bundle savedInstanceState) { + super.onCreate(savedInstanceState); + + EditText labelEditor = (EditText) findViewById(R.id.category_label); + labelEditor.addTextChangedListener(new BaseTextWatcher() { + @Override + public void afterTextChanged(Editable s) { + model.setLabel(String.valueOf(s)); + } + }); + } + + @Override + protected Class<? extends WloBaseActivity> getUpActivity() { + return null; + } + + public void validate(View source) { + WloSqlOpenHelper soh = new WloSqlOpenHelper(this); + soh.saveData(model); + if (model.getQualitativeValues() != null) { + soh.saveData(model.getQualitativeValues()); + } + + DataCache.addCategory(model); + + setResult(RESULT_OK); + finish(); + } + + public void importQualitativeValues(View source) { + Intent intent = new Intent(this, FileDialog.class); + intent.putExtra(FileDialog.START_PATH, "/sdcard"); + intent.putExtra(FileDialog.CAN_SELECT_DIR, false); + intent.putExtra(FileDialog.SELECTION_MODE, SelectionMode.MODE_OPEN); + + //alternatively you can set file filter + intent.putExtra(FileDialog.FORMAT_FILTER, new String[] { "csv" }); + + startActivityForResult(intent, REQUEST_IMPORT_QUALITATIVE_VALUES); + } + + @Override + protected void onActivityResult(int requestCode, int resultCode, Intent data) { + if (requestCode == REQUEST_IMPORT_QUALITATIVE_VALUES && resultCode == RESULT_OK) { + String path = data.getStringExtra(FileDialog.RESULT_PATH); + try { + Collection<QualitativeValueModel> qualitativeValueModels = + ImportUtil.importQualitativeValues(model, path); + model.setQualitativeValues(new ArrayList<>(qualitativeValueModels)); + + TextView textView = (TextView) findViewById(R.id.qualitative_values_nb_label); + textView.setText(getString(R.string.qualitative_values_nb, qualitativeValueModels.size())); + textView.setVisibility(View.VISIBLE); + + } catch (Exception e) { + // cf issue #4205 + // nuiton-i18n provocks an error when trying to get the error message + Log.e(TAG, "error during import", e); + runOnUiThread(new Runnable() { + @Override + public void run() { + new AlertDialog.Builder(CategoryCreationAcivity.this) + .setMessage(R.string.import_error) + .setNeutralButton(android.R.string.ok, UIUtils.getCancelClickListener()) + .create().show(); + } + }); + + } + + } else { + super.onActivityResult(requestCode, resultCode, data); + } + } +} Modified: trunk/src/fr/ifremer/wlo/preferences/SettingsActivity.java =================================================================== --- trunk/src/fr/ifremer/wlo/preferences/SettingsActivity.java 2014-02-28 13:25:58 UTC (rev 56) +++ trunk/src/fr/ifremer/wlo/preferences/SettingsActivity.java 2014-03-01 16:46:23 UTC (rev 57) @@ -24,6 +24,7 @@ * #L% */ +import android.app.Activity; import android.app.AlertDialog; import android.app.ProgressDialog; import android.content.Context; @@ -35,25 +36,25 @@ import android.preference.MultiSelectListPreference; import android.preference.Preference; import android.preference.PreferenceFragment; -import android.text.format.DateFormat; import android.util.Log; +import android.view.View; import android.widget.Toast; import com.google.common.base.Functions; import com.google.common.collect.BiMap; import com.google.common.collect.Collections2; import com.google.common.collect.HashBiMap; import com.google.common.collect.Maps; -import com.google.common.collect.Sets; import fr.ifremer.wlo.MainActivity; import fr.ifremer.wlo.R; import fr.ifremer.wlo.WloBaseActivity; import fr.ifremer.wlo.models.BaseModel; +import fr.ifremer.wlo.models.categorization.CategoryModel; import fr.ifremer.wlo.models.referentials.CommercialSpecies; import fr.ifremer.wlo.models.referentials.ScientificSpecies; import fr.ifremer.wlo.storage.DataCache; import fr.ifremer.wlo.storage.StorageUtils; import fr.ifremer.wlo.storage.WloSqlOpenHelper; -import fr.ifremer.wlo.models.referentials.imports.ImportUtil; +import fr.ifremer.wlo.imports.ImportUtil; import fr.ifremer.wlo.utils.UIUtils; import fr.ifremer.wlo.utils.filechooser.FileDialog; import fr.ifremer.wlo.utils.filechooser.SelectionMode; @@ -63,7 +64,6 @@ import java.io.FileInputStream; import java.io.IOException; import java.util.Collection; -import java.util.Collections; import java.util.Date; import java.util.HashSet; import java.util.Map; @@ -77,19 +77,18 @@ private static final String TAG = "SettingsActivity"; - protected static final int REQUEST_IMPORT_AGES = 0; - protected static final int REQUEST_IMPORT_COMMERCIAL_SPECIES = 1; - protected static final int REQUEST_IMPORT_GENDERS = 2; - protected static final int REQUEST_IMPORT_LOCATIONS = 3; - protected static final int REQUEST_IMPORT_MATURITIES = 4; - protected static final int REQUEST_IMPORT_MENSURATIONS = 5; - protected static final int REQUEST_IMPORT_METIERS = 6; - protected static final int REQUEST_IMPORT_PRESENTATIONS = 7; - protected static final int REQUEST_IMPORT_SCIENTIFIC_SPECIES = 8; - protected static final int REQUEST_IMPORT_STATES = 9; - protected static final int REQUEST_IMPORT_VESSELS = 10; - protected static final int REQUEST_IMPORT_CALCIFIED_PARTS_TAKINGS = 11; + protected static final int REQUEST_IMPORT_COMMERCIAL_SPECIES = 0; + protected static final int REQUEST_IMPORT_LOCATIONS = 1; + protected static final int REQUEST_IMPORT_MENSURATIONS = 2; + protected static final int REQUEST_IMPORT_METIERS = 3; + protected static final int REQUEST_IMPORT_PRESENTATIONS = 4; + protected static final int REQUEST_IMPORT_SCIENTIFIC_SPECIES = 5; + protected static final int REQUEST_IMPORT_STATES = 6; + protected static final int REQUEST_IMPORT_VESSELS = 7; + protected static final int REQUEST_IMPORT_CALCIFIED_PARTS_TAKINGS = 8; + protected static final int REQUEST_CREATE_CATEGORY = 9; + @Override protected Integer getContentView() { return null; @@ -124,11 +123,8 @@ addPreferencesFromResource(R.xml.preferences); // create map pref_key / request code - requestCodeByPrefKey.put("import_ages", REQUEST_IMPORT_AGES); requestCodeByPrefKey.put("import_commercial_species", REQUEST_IMPORT_COMMERCIAL_SPECIES); - requestCodeByPrefKey.put("import_genders", REQUEST_IMPORT_GENDERS); requestCodeByPrefKey.put("import_locations", REQUEST_IMPORT_LOCATIONS); - requestCodeByPrefKey.put("import_maturities", REQUEST_IMPORT_MATURITIES); requestCodeByPrefKey.put("import_mensurations", REQUEST_IMPORT_MENSURATIONS); requestCodeByPrefKey.put("import_metiers", REQUEST_IMPORT_METIERS); requestCodeByPrefKey.put("import_presentations", REQUEST_IMPORT_PRESENTATIONS); @@ -139,11 +135,8 @@ Map<String, Integer> nbElementsByPrefKey = Maps.newHashMap(); Context context = getActivity(); - nbElementsByPrefKey.put("import_ages", DataCache.getAllAges(context).size()); nbElementsByPrefKey.put("import_commercial_species", DataCache.getAllCommercialSpecies(context).size()); - nbElementsByPrefKey.put("import_genders", DataCache.getAllGenders(context).size()); nbElementsByPrefKey.put("import_locations", DataCache.getAllLocations(context).size()); - nbElementsByPrefKey.put("import_maturities", DataCache.getAllMaturities(context).size()); nbElementsByPrefKey.put("import_mensurations", DataCache.getAllMensurations(context).size()); nbElementsByPrefKey.put("import_metiers", DataCache.getAllMetiers(context).size()); nbElementsByPrefKey.put("import_presentations", DataCache.getAllPresentations(context).size()); @@ -175,6 +168,19 @@ }); } + // categories + Preference categoryPref = findPreference("import_categories"); + int nb = DataCache.getAllCategories(context).size(); + categoryPref.setSummary(getString(R.string.preferences_import_summary, nb)); + categoryPref.setOnPreferenceClickListener(new Preference.OnPreferenceClickListener() { + @Override + public boolean onPreferenceClick(Preference preference) { + Intent intent = new Intent(getActivity(), CategoryCreationAcivity.class); + startActivityForResult(intent, REQUEST_CREATE_CATEGORY); + return true; + } + }); + } @Override @@ -239,10 +245,10 @@ @Override public void onActivityResult(final int requestCode, final int resultCode, final Intent data) { + Context context = getActivity(); if (resultCode == RESULT_OK - && requestCode >= REQUEST_IMPORT_AGES && requestCode <= REQUEST_IMPORT_CALCIFIED_PARTS_TAKINGS) { + && requestCode >= REQUEST_IMPORT_COMMERCIAL_SPECIES && requestCode <= REQUEST_IMPORT_CALCIFIED_PARTS_TAKINGS) { - Context context = getActivity(); if (!StorageUtils.isExternalStorageWritable()) { AlertDialog dialog = new AlertDialog.Builder(context) .setTitle(R.string.preferences_import_no_external_storage_title) @@ -261,6 +267,12 @@ importData(requestCode, data, true); } + } else if (resultCode == RESULT_OK && requestCode == REQUEST_CREATE_CATEGORY) { + Toast.makeText(context, R.string.category_created, Toast.LENGTH_LONG).show(); + int nb = DataCache.getAllCategories(context).size(); + Preference categoryPref = findPreference("import_categories"); + categoryPref.setSummary(getString(R.string.preferences_import_summary, nb)); + } else { super.onActivityResult(requestCode, resultCode, data); } @@ -284,26 +296,14 @@ try { switch (requestCode) { - case REQUEST_IMPORT_AGES: - newNb = ImportUtil.importAges(context, path); - updatedNb = DataCache.getAllAges(context).size(); - break; case REQUEST_IMPORT_COMMERCIAL_SPECIES: newNb = ImportUtil.importCommercialSpecies(context, path); updatedNb = DataCache.getAllCommercialSpecies(context).size(); break; - case REQUEST_IMPORT_GENDERS: - newNb = ImportUtil.importGenders(context, path); - updatedNb = DataCache.getAllGenders(context).size(); - break; case REQUEST_IMPORT_LOCATIONS: newNb = ImportUtil.importLocations(context, path); updatedNb = DataCache.getAllLocations(context).size(); break; - case REQUEST_IMPORT_MATURITIES: - newNb = ImportUtil.importMaturities(context, path); - updatedNb = DataCache.getAllMaturities(context).size(); - break; case REQUEST_IMPORT_MENSURATIONS: newNb = ImportUtil.importMensurations(context, path); updatedNb = DataCache.getAllMensurations(context).size(); @@ -407,4 +407,5 @@ } } + } \ No newline at end of file Modified: trunk/src/fr/ifremer/wlo/storage/DataCache.java =================================================================== --- trunk/src/fr/ifremer/wlo/storage/DataCache.java 2014-02-28 13:25:58 UTC (rev 56) +++ trunk/src/fr/ifremer/wlo/storage/DataCache.java 2014-03-01 16:46:23 UTC (rev 57) @@ -27,29 +27,26 @@ import android.content.Context; import android.database.Cursor; import com.google.common.base.Function; -import com.google.common.collect.HashBasedTable; +import com.google.common.base.Preconditions; import com.google.common.collect.Lists; import com.google.common.collect.Maps; import com.google.common.collect.Sets; -import com.google.common.collect.Table; import fr.ifremer.wlo.models.BaseModel; -import fr.ifremer.wlo.models.referentials.Age; +import fr.ifremer.wlo.models.categorization.CategoryModel; +import fr.ifremer.wlo.models.categorization.QualitativeValueModel; import fr.ifremer.wlo.models.referentials.CommercialSpecies; -import fr.ifremer.wlo.models.referentials.Gender; import fr.ifremer.wlo.models.referentials.HasCode; import fr.ifremer.wlo.models.referentials.Location; -import fr.ifremer.wlo.models.referentials.Maturity; 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.models.referentials.Vessel; -import org.apache.commons.lang3.ObjectUtils; import java.util.Collection; import java.util.Collections; -import java.util.Comparator; +import java.util.HashMap; import java.util.List; import java.util.Map; import java.util.Set; @@ -62,11 +59,8 @@ public static final String DEFAULT_MENSURATION_CODE = "LT"; - protected static Map<String, Age> ages; protected static Map<String, CommercialSpecies> commercialSpecies; - protected static Map<String, Gender> genders; protected static Map<String, Location> locations; - protected static Map<String, Maturity> maturities; protected static Map<String, Mensuration> mensurations; protected static Mensuration defaultMensuration; protected static Map<String, Metier> metiers; @@ -74,22 +68,9 @@ protected static Map<String, ScientificSpecies> scientificSpecies; protected static Map<String, State> states; protected static Map<String, Vessel> vessels; + protected static Map<String, CategoryModel> categories; protected static Set<String> sortCategories; - public static Collection<Age> getAllAges(Context context) { - initAges(context); - return ages.values(); - } - - public static Age getAgeById(Context context, String id) { - initAges(context); - return ages.get(id); - } - - public static void invalidateAges() { - ages = null; - } - public static Collection<CommercialSpecies> getAllCommercialSpecies(Context context) { initCommercialSpecies(context); List<CommercialSpecies> result = Lists.newArrayList(commercialSpecies.values()); @@ -106,20 +87,6 @@ commercialSpecies = null; } - public static Collection<Gender> getAllGenders(Context context) { - initGenders(context); - return genders.values(); - } - - public static Gender getGenderById(Context context, String id) { - initGenders(context); - return genders.get(id); - } - - public static void invalidateGenders() { - genders = null; - } - public static Collection<Location> getAllLocations(Context context) { initLocations(context); List<Location> result = Lists.newArrayList(locations.values()); @@ -136,20 +103,6 @@ locations = null; } - public static Collection<Maturity> getAllMaturities(Context context) { - initMaturities(context); - return maturities.values(); - } - - public static Maturity getMaturityById(Context context, String id) { - initMaturities(context); - return maturities.get(id); - } - - public static void invalidateMaturities() { - maturities = null; - } - public static Collection<Mensuration> getAllMensurations(Context context) { initMensurations(context); List<Mensuration> result = Lists.newArrayList(mensurations.values()); @@ -264,22 +217,36 @@ vessels = null; } - protected static void initAges(Context context) { - if (ages == null) { + public static Collection<CategoryModel> getAllCategories(Context context) { + initCategories(context); + List<CategoryModel> result = Lists.newArrayList(categories.values()); + return result; + } + + public static CategoryModel getCategoryById(Context context, String id) { + initCategories(context); + CategoryModel result = categories.get(id); + if (result != null && result.getQualitativeValues() == null) { WloSqlOpenHelper soh = new WloSqlOpenHelper(context); - Cursor cursor = soh.getAllRefAges(); - List<Age> data = WloSqlOpenHelper.transformCursorIntoCollection(cursor, - new Function<Cursor, Age>() { - @Override - public Age apply(Cursor input) { - return new Age(input); - } - }); - ages = Maps.uniqueIndex(data, BaseModel.GET_ID_FUNCTION); + Cursor cursor = soh.getAllQualitativeValues(id); + List<QualitativeValueModel> qualitativeValues = + WloSqlOpenHelper.transformCursorIntoCollection(cursor, new Function<Cursor, QualitativeValueModel>() { + @Override + public QualitativeValueModel apply(Cursor input) { + return new QualitativeValueModel(input); + } + }); + result.setQualitativeValues(qualitativeValues); soh.close(); } + return result; } + public static void addCategory(CategoryModel categoryModel) { + Preconditions.checkNotNull(categoryModel); + categories.put(categoryModel.getId(), categoryModel); + } + protected static void initCommercialSpecies(Context context) { if (commercialSpecies == null) { WloSqlOpenHelper soh = new WloSqlOpenHelper(context); @@ -297,23 +264,6 @@ } } - protected static void initGenders(Context context) { - if (genders == null) { - WloSqlOpenHelper soh = new WloSqlOpenHelper(context); - Cursor cursor = soh.getAllRefGenders(); - List<Gender> data = WloSqlOpenHelper.transformCursorIntoCollection(cursor, - new Function<Cursor, Gender>() { - @Override - public Gender apply(Cursor input) { - return new Gender(input); - } - }); - - genders = Maps.uniqueIndex(data, BaseModel.GET_ID_FUNCTION); - soh.close(); - } - } - protected static void initLocations(Context context) { if (locations == null) { WloSqlOpenHelper soh = new WloSqlOpenHelper(context); @@ -330,22 +280,6 @@ } } - protected static void initMaturities(Context context) { - if (maturities == null) { - WloSqlOpenHelper soh = new WloSqlOpenHelper(context); - Cursor cursor = soh.getAllRefMaturities(); - List<Maturity> data = WloSqlOpenHelper.transformCursorIntoCollection(cursor, - new Function<Cursor, Maturity>() { - @Override - public Maturity apply(Cursor input) { - return new Maturity(input); - } - }); - maturities = Maps.uniqueIndex(data, BaseModel.GET_ID_FUNCTION); - soh.close(); - } - } - protected static void initMensurations(Context context) { if (mensurations == null) { WloSqlOpenHelper soh = new WloSqlOpenHelper(context); @@ -448,17 +382,34 @@ } } + protected static void initCategories(Context context) { + if (categories == null) { + WloSqlOpenHelper soh = new WloSqlOpenHelper(context); + Cursor cursor = soh.getAllCategories(); + List<CategoryModel> data = WloSqlOpenHelper.transformCursorIntoCollection(cursor, + new Function<Cursor, CategoryModel>() { + @Override + public CategoryModel apply(Cursor input) { + return new CategoryModel(input); + } + }); + + categories = new HashMap<>(Maps.uniqueIndex(data, BaseModel.GET_ID_FUNCTION)); + soh.close(); + } + } + protected static void initSortCategories(Context context) { if (sortCategories == null) { WloSqlOpenHelper soh = new WloSqlOpenHelper(context); Cursor cursor = soh.getAllSortCategories(); List<String> sc = WloSqlOpenHelper.transformCursorIntoCollection(cursor, - new Function<Cursor, String>() { - @Override - public String apply(Cursor cursor) { - return cursor.getString(0); - } - }); + new Function<Cursor, String>() { + @Override + public String apply(Cursor cursor) { + return cursor.getString(0); + } + }); sortCategories = Sets.newHashSet(sc); soh.close(); } Modified: trunk/src/fr/ifremer/wlo/storage/Exporter.java =================================================================== --- trunk/src/fr/ifremer/wlo/storage/Exporter.java 2014-02-28 13:25:58 UTC (rev 56) +++ trunk/src/fr/ifremer/wlo/storage/Exporter.java 2014-03-01 16:46:23 UTC (rev 57) @@ -26,16 +26,22 @@ 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.categorization.CategoryModel; +import fr.ifremer.wlo.models.categorization.QualitativeValueModel; import fr.ifremer.wlo.models.referentials.*; 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; /** * @author Kevin Morin (Code Lutin) @@ -45,11 +51,23 @@ public static final SimpleDateFormat UTC_DATE_FORMAT = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss.SSSZ"); + protected static Map<String, QualitativeValueModel> qualitativeValuesById; + public static String exportData(Context context) throws JSONException { WloSqlOpenHelper soh = new WloSqlOpenHelper(context); JSONArray root = new JSONArray(); try { + Cursor qualitativeValuesCursor = soh.getAllQualitativeValues(); + List<QualitativeValueModel> qualitativeValues = WloSqlOpenHelper.transformCursorIntoCollection(qualitativeValuesCursor, + new Function<Cursor, QualitativeValueModel>() { + @Override + public QualitativeValueModel apply(Cursor input) { + return new QualitativeValueModel(input); + } + }); + qualitativeValuesById = Maps.uniqueIndex(qualitativeValues, BaseModel.GET_ID_FUNCTION); + Cursor cursor = soh.getAllContexts(); List<ContextModel> contexts = WloSqlOpenHelper.transformCursorIntoCollection(cursor, new Function<Cursor, ContextModel>() { @Override @@ -224,6 +242,7 @@ }); JSONArray jsonScientificSpeciesArray = new JSONArray(); for (ScientificSpeciesModel scientificSpeciesModel : scientificSpecies) { + scientificSpeciesModel.setParent(model); JSONObject jsonScientificSpecies = createJSONScientificSpeciesModel(scientificSpeciesModel, context, soh); jsonScientificSpeciesArray.put(jsonScientificSpecies); } @@ -253,9 +272,19 @@ return new MeasurementModel(input); } }); + + List<String> categories = new ArrayList<>(); + CommercialSpeciesModel parent = model.getParent(); + CategoryModel cat1 = parent.getCategory1(); + categories.add(cat1 != null ? cat1.getLabel() : null); + CategoryModel cat2 = parent.getCategory2(); + categories.add(cat2 != null ? cat2.getLabel() : null); + CategoryModel cat3 = parent.getCategory3(); + categories.add(cat3 != null ? cat3.getLabel() : null); + JSONArray jsonMeasurements = new JSONArray(); for (MeasurementModel measurement : measurements) { - JSONObject jsonMeasurement = createJSONMeasurementModel(measurement, context); + JSONObject jsonMeasurement = createJSONMeasurementModel(measurement, categories); jsonMeasurements.put(jsonMeasurement); } jsonScientificSpeciesModel.put("observations", jsonMeasurements); @@ -270,7 +299,7 @@ }); JSONArray jsonCategoryWeightModels = new JSONArray(); for (CategoryWeightModel categoryWeight : categoryWeights) { - JSONObject jsonCategoryWeightModel = createJSONCategoryWeightModel(categoryWeight, context); + JSONObject jsonCategoryWeightModel = createJSONCategoryWeightModel(categoryWeight, categories); jsonCategoryWeightModels.put(jsonCategoryWeightModel); } jsonScientificSpeciesModel.put("poids-par-categorie", jsonCategoryWeightModels); @@ -280,19 +309,38 @@ } public static JSONObject createJSONMeasurementModel(MeasurementModel model, - final Context context) throws JSONException { + List<String> categories) throws JSONException { Preconditions.checkNotNull(model); + JSONObject jsonMeasurementModel = new JSONObject(); + for (int i = 0 ; i < categories.size() ; i++) { + String categoryLabel = categories.get(i); + if (categoryLabel != null) { + String measurementCategory = null; + switch (i) { + case 0: + measurementCategory = model.getCategory1(); + break; + case 1: + measurementCategory = model.getCategory2(); + break; + case 2: + measurementCategory = model.getCategory3(); + break; + } + if (measurementCategory != null) { + QualitativeValueModel value = qualitativeValuesById.get(measurementCategory); + if (value == null) { + jsonMeasurementModel.put(categoryLabel, measurementCategory); - JSONObject jsonMeasurementModel = new JSONObject(); - jsonMeasurementModel.put("sexe", createJSONGender(DataCache.getGenderById(context, model.getCategory1()))); - Maturity maturity = DataCache.getMaturityById(context, model.getCategory2()); - if (maturity != null) { - jsonMeasurementModel.put("maturité", maturity.getLabel()); + } else { + JSONObject jsonCategory = new JSONObject(); + jsonCategory.put("code", value.getValue()); + jsonCategory.put("libellé", value.getLabel()); + jsonMeasurementModel.put(categoryLabel, jsonCategory); + } + } + } } - Age age = DataCache.getAgeById(context, model.getCategory3()); - if (age != null) { - jsonMeasurementModel.put("âge", age.getLabel()); - } jsonMeasurementModel.put("taille", model.getSize()); jsonMeasurementModel.put("date", UTC_DATE_FORMAT.format(model.getDate().getTime())); @@ -300,19 +348,38 @@ } public static JSONObject createJSONCategoryWeightModel(CategoryWeightModel model, - final Context context) throws JSONException { + List<String> categories) throws JSONException { Preconditions.checkNotNull(model); + JSONObject jsonCategoryWeightModel = new JSONObject(); + for (int i = 0 ; i < categories.size() ; i++) { + String categoryLabel = categories.get(i); + if (categoryLabel != null) { + String measurementCategory = null; + switch (i) { + case 0: + measurementCategory = model.getCategory1(); + break; + case 1: + measurementCategory = model.getCategory2(); + break; + case 2: + measurementCategory = model.getCategory3(); + break; + } + if (measurementCategory != null) { + QualitativeValueModel value = qualitativeValuesById.get(measurementCategory); + if (value == null) { + jsonCategoryWeightModel.put(categoryLabel, measurementCategory); - JSONObject jsonCategoryWeightModel = new JSONObject(); - jsonCategoryWeightModel.put("sexe", createJSONGender(DataCache.getGenderById(context, model.getCategory1()))); - Maturity maturity = DataCache.getMaturityById(context, model.getCategory2()); - if (maturity != null) { - jsonCategoryWeightModel.put("maturité", maturity.getLabel()); + } else { + JSONObject jsonCategory = new JSONObject(); + jsonCategory.put("code", value.getValue()); + jsonCategory.put("libellé", value.getLabel()); + jsonCategoryWeightModel.put(categoryLabel, jsonCategory); + } + } + } } - Age age = DataCache.getAgeById(context, model.getCategory3()); - if (age != null) { - jsonCategoryWeightModel.put("âge", age.getLabel()); - } jsonCategoryWeightModel.put("poids", model.getWeight()); return jsonCategoryWeightModel; @@ -403,14 +470,4 @@ return jsonScientificSpecies; } - public static JSONObject createJSONGender(Gender gender) throws JSONException { - if (gender == null) { - return null; - } - JSONObject jsonGender = new JSONObject(); - jsonGender.put("code", gender.getCode()); - jsonGender.put("libellé", gender.getLabel()); - return jsonGender; - } - } \ No newline at end of file Modified: trunk/src/fr/ifremer/wlo/storage/WloSqlOpenHelper.java =================================================================== --- trunk/src/fr/ifremer/wlo/storage/WloSqlOpenHelper.java 2014-02-28 13:25:58 UTC (rev 56) +++ trunk/src/fr/ifremer/wlo/storage/WloSqlOpenHelper.java 2014-03-01 16:46:23 UTC (rev 57) @@ -28,7 +28,6 @@ import android.database.Cursor; import android.database.sqlite.SQLiteDatabase; import android.database.sqlite.SQLiteOpenHelper; -import android.util.Log; import com.google.common.base.Function; import com.google.common.base.Preconditions; import com.google.common.collect.Lists; @@ -41,12 +40,11 @@ import fr.ifremer.wlo.models.MetierModel; import fr.ifremer.wlo.models.ScientificSpeciesModel; import fr.ifremer.wlo.models.VesselModel; -import fr.ifremer.wlo.models.calcifiedPartTaking.CalcifiedPartTaking; -import fr.ifremer.wlo.models.referentials.Age; +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.CommercialSpecies; -import fr.ifremer.wlo.models.referentials.Gender; import fr.ifremer.wlo.models.referentials.Location; -import fr.ifremer.wlo.models.referentials.Maturity; import fr.ifremer.wlo.models.referentials.Mensuration; import fr.ifremer.wlo.models.referentials.Metier; import fr.ifremer.wlo.models.referentials.Presentation; @@ -67,7 +65,7 @@ private static final String TAG = "WloOpenHelper"; public static final String DATABASE_NAME = "wlo.db"; - public static final int DATABASE_VERSION = 18; + public static final int DATABASE_VERSION = 19; public static final String TEXT_TYPE = " TEXT"; public static final String INTEGER_TYPE = " INTEGER"; @@ -155,6 +153,9 @@ CommercialSpeciesModel.COLUMN_SORT_CATEGORY + TEXT_TYPE + COMMA_SEP + CommercialSpeciesModel.COLUMN_STATE + TEXT_TYPE + COMMA_SEP + CommercialSpeciesModel.COLUMN_PRESENTATION + TEXT_TYPE + COMMA_SEP + + CommercialSpeciesModel.COLUMN_CATEGORY1 + TEXT_TYPE + COMMA_SEP + + CommercialSpeciesModel.COLUMN_CATEGORY2 + TEXT_TYPE + COMMA_SEP + + CommercialSpeciesModel.COLUMN_CATEGORY3 + TEXT_TYPE + COMMA_SEP + CommercialSpeciesModel.COLUMN_COMMENT + TEXT_TYPE + COMMA_SEP + CommercialSpeciesModel.COLUMN_TOTAL_UNLOADED_WEIGHT + INTEGER_TYPE + COMMA_SEP + CommercialSpeciesModel.COLUMN_METIER_ID + TEXT_TYPE + NOT_NULL + COMMA_SEP + @@ -167,7 +168,13 @@ "FOREIGN KEY(" + CommercialSpeciesModel.COLUMN_STATE + ") REFERENCES " + State.TABLE_NAME + "(" + State._ID + ")" + COMMA_SEP + "FOREIGN KEY(" + CommercialSpeciesModel.COLUMN_PRESENTATION + ") REFERENCES " + - Presentation.TABLE_NAME + "(" + Presentation._ID + ")" + + Presentation.TABLE_NAME + "(" + Presentation._ID + ")" + COMMA_SEP + + "FOREIGN KEY(" + CommercialSpeciesModel.COLUMN_CATEGORY1 + ") REFERENCES " + + CategoryModel.TABLE_NAME + "(" + CategoryModel._ID + ")" + COMMA_SEP + + "FOREIGN KEY(" + CommercialSpeciesModel.COLUMN_CATEGORY2 + ") REFERENCES " + + CategoryModel.TABLE_NAME + "(" + CategoryModel._ID + ")" + COMMA_SEP + + "FOREIGN KEY(" + CommercialSpeciesModel.COLUMN_CATEGORY3 + ") REFERENCES " + + CategoryModel.TABLE_NAME + "(" + CategoryModel._ID + ")" + " )"; protected static final String SQL_DELETE_COMMERCIAL_SPECIES = @@ -242,18 +249,31 @@ protected static final String SQL_DELETE_CALCIFIED_PART_TAKINGS = "DROP TABLE IF EXISTS " + CalcifiedPartTaking.TABLE_NAME; - // Referentials + // CATEGORIES + protected static final String SQL_CREATE_CATEGORIES = + "CREATE TABLE " + CategoryModel.TABLE_NAME + " (" + + CategoryModel._ID + TEXT_TYPE + " PRIMARY KEY" + COMMA_SEP + + CategoryModel.COLUMN_LABEL + TEXT_TYPE + NOT_NULL + + " )"; - // Ages - protected static final String SQL_CREATE_REF_AGES = - "CREATE TABLE " + Age.TABLE_NAME + " (" + - Age._ID + TEXT_TYPE + " PRIMARY KEY," + - Age.COLUMN_LABEL + TEXT_TYPE + NOT_NULL + - " )"; + protected static final String SQL_DELETE_CATEGORIES = + "DROP TABLE IF EXISTS " + CategoryModel.TABLE_NAME; - protected static final String SQL_DELETE_REF_AGES = - "DROP TABLE IF EXISTS " + Age.TABLE_NAME; + protected static final String SQL_CREATE_QUALITATIVE_VALUES = + "CREATE TABLE " + QualitativeValueModel.TABLE_NAME + " (" + + QualitativeValueModel._ID + TEXT_TYPE + " PRIMARY KEY" + COMMA_SEP + + QualitativeValueModel.COLUMN_VALUE + TEXT_TYPE + NOT_NULL + COMMA_SEP + + QualitativeValueModel.COLUMN_LABEL + TEXT_TYPE + COMMA_SEP + + QualitativeValueModel.COLUMN_CATEGORY_ID + TEXT_TYPE + NOT_NULL + COMMA_SEP + + "FOREIGN KEY(" + QualitativeValueModel.COLUMN_CATEGORY_ID + ") REFERENCES " + + CategoryModel.TABLE_NAME + "(" + CategoryModel._ID + ") ON DELETE CASCADE" + + " )"; + protected static final String SQL_DELETE_QUALITATIVE_VALUES = + "DROP TABLE IF EXISTS " + QualitativeValueModel.TABLE_NAME; + + // Referentials + // Commercial Species protected static final String SQL_CREATE_REF_COMMERCIAL_SPECIES = "CREATE TABLE " + CommercialSpecies.TABLE_NAME + " (" + @@ -271,17 +291,6 @@ protected static final String SQL_DELETE_REF_COMMERCIAL_SPECIES = "DROP TABLE IF EXISTS " + CommercialSpecies.TABLE_NAME; - // Genders - protected static final String SQL_CREATE_REF_GENDERS = - "CREATE TABLE " + Gender.TABLE_NAME + " (" + - Gender._ID + TEXT_TYPE + " PRIMARY KEY" + COMMA_SEP + - Gender.COLUMN_CODE + TEXT_TYPE + NOT_NULL + COMMA_SEP + - Gender.COLUMN_LABEL + TEXT_TYPE + - " )"; - - protected static final String SQL_DELETE_REF_GENDERS = - "DROP TABLE IF EXISTS " + Gender.TABLE_NAME; - // Locations protected static final String SQL_CREATE_REF_LOCATIONS = "CREATE TABLE " + Location.TABLE_NAME + " (" + @@ -294,16 +303,6 @@ protected static final String SQL_DELETE_REF_LOCATIONS = "DROP TABLE IF EXISTS " + Location.TABLE_NAME; - // Maturities - protected static final String SQL_CREATE_REF_MATURITIES = - "CREATE TABLE " + Maturity.TABLE_NAME + " (" + - Maturity._ID + TEXT_TYPE + " PRIMARY KEY" + COMMA_SEP + - Maturity.COLUMN_LABEL + TEXT_TYPE + NOT_NULL + - " )"; - - protected static final String SQL_DELETE_REF_MATURITIES = - "DROP TABLE IF EXISTS " + Maturity.TABLE_NAME; - // Mensurations protected static final String SQL_CREATE_REF_MENSURATIONS = "CREATE TABLE " + Mensuration.TABLE_NAME + " (" + @@ -387,11 +386,8 @@ @Override public void onCreate(SQLiteDatabase db) { // referentials - db.execSQL(SQL_CREATE_REF_AGES); db.execSQL(SQL_CREATE_REF_COMMERCIAL_SPECIES); - db.execSQL(SQL_CREATE_REF_GENDERS); db.execSQL(SQL_CREATE_REF_LOCATIONS); - db.execSQL(SQL_CREATE_REF_MATURITIES); db.execSQL(SQL_CREATE_REF_MENSURATIONS); db.execSQL(SQL_CREATE_REF_METIERS); db.execSQL(SQL_CREATE_REF_PRESENTATIONS); @@ -399,6 +395,9 @@ db.execSQL(SQL_CREATE_REF_STATES); db.execSQL(SQL_CREATE_REF_VESSELS); + db.execSQL(SQL_CREATE_CATEGORIES); + db.execSQL(SQL_CREATE_QUALITATIVE_VALUES); + // models db.execSQL(SQL_CREATE_CONTEXTS); db.execSQL(SQL_CREATE_LOCATIONS); @@ -425,12 +424,12 @@ db.execSQL(SQL_DELETE_LOCATIONS); db.execSQL(SQL_DELETE_CONTEXTS); + db.execSQL(SQL_DELETE_CATEGORIES); + db.execSQL(SQL_DELETE_QUALITATIVE_VALUES); + // referentials - db.execSQL(SQL_DELETE_REF_AGES); db.execSQL(SQL_DELETE_REF_COMMERCIAL_SPECIES); - db.execSQL(SQL_DELETE_REF_GENDERS); db.execSQL(SQL_DELETE_REF_LOCATIONS); - db.execSQL(SQL_DELETE_REF_MATURITIES); db.execSQL(SQL_DELETE_REF_MENSURATIONS); db.execSQL(SQL_DELETE_REF_METIERS); db.execSQL(SQL_DELETE_REF_PRESENTATIONS); @@ -584,25 +583,35 @@ db.delete(CalcifiedPartTaking.TABLE_NAME, null, null); } - // Referentials + // CATEGORIES - public Cursor getAllRefAges() { + public Cursor getAllCategories() { SQLiteDatabase db = getReadableDatabase(); - Cursor cursor = db.query(Age.TABLE_NAME, Age.ALL_COLUMNS, + Cursor cursor = db.query(CategoryModel.TABLE_NAME, CategoryModel.ALL_COLUMNS, null, null, null, null, null); return cursor; } - public Cursor getAllRefCommercialSpecies() { + public Cursor getAllQualitativeValues() { SQLiteDatabase db = getReadableDatabase(); - Cursor cursor = db.query(CommercialSpecies.TABLE_NAME, CommercialSpecies.ALL_COLUMNS, + Cursor cursor = db.query(QualitativeValueModel.TABLE_NAME, QualitativeValueModel.ALL_COLUMNS, null, null, null, null, null); return cursor; } - public Cursor getAllRefGenders() { + public Cursor getAllQualitativeValues(String categoryId) { SQLiteDatabase db = getReadableDatabase(); - Cursor cursor = db.query(Gender.TABLE_NAME, Gender.ALL_COLUMNS, + Cursor cursor = db.query(QualitativeValueModel.TABLE_NAME, QualitativeValueModel.ALL_COLUMNS, + QualitativeValueModel.COLUMN_CATEGORY_ID + " = ?", new String[]{ categoryId }, + null, null, null, null); + return cursor; + } + + // Referentials + + public Cursor getAllRefCommercialSpecies() { + SQLiteDatabase db = getReadableDatabase(); + Cursor cursor = db.query(CommercialSpecies.TABLE_NAME, CommercialSpecies.ALL_COLUMNS, null, null, null, null, null); return cursor; } @@ -614,13 +623,6 @@ return cursor; } - public Cursor getAllRefMaturities() { - SQLiteDatabase db = getReadableDatabase(); - Cursor cursor = db.query(Maturity.TABLE_NAME, Maturity.ALL_COLUMNS, - null, null, null, null, null); - return cursor; - } - public Cursor getAllRefMensurations() { SQLiteDatabase db = getReadableDatabase(); Cursor cursor = db.query(Mensuration.TABLE_NAME, Mensuration.ALL_COLUMNS,

1 0

Build failed in Jenkins: wlo-nightly #1
by admin+ci-codelutin.com＠codelutin.com 01 Mar '14

01 Mar '14

See <http://ci.codelutin.com/jenkins/job/wlo-nightly/1/> ------------------------------------------ [...truncated 65 lines...] A src/fr/ifremer/wlo/models/MetierModel.java A src/fr/ifremer/wlo/models/CommercialSpeciesModel.java A src/fr/ifremer/wlo/models/LocationModel.java AU src/fr/ifremer/wlo/models/MeasurementsModel.java A src/fr/ifremer/wlo/models/BaseModel.java A src/fr/ifremer/wlo/models/ScientificSpeciesModel.java A src/fr/ifremer/wlo/CommercialSpeciesActivity.java A src/fr/ifremer/wlo/measurement AU src/fr/ifremer/wlo/measurement/MeasurementActivity.java AU src/fr/ifremer/wlo/measurement/GraphFragment.java AU src/fr/ifremer/wlo/measurement/LogsFragment.java AU src/fr/ifremer/wlo/measurement/TableAdapter.java AU src/fr/ifremer/wlo/measurement/MeasurementsDisplayerFragment.java AU src/fr/ifremer/wlo/measurement/TableFragment.java AU src/fr/ifremer/wlo/measurement/GraphActivity.java A src/fr/ifremer/wlo/WloBaseListActivity.java AU src/fr/ifremer/wlo/BigFinCommunicationService.java AU src/fr/ifremer/wlo/DeviceListActivity.java A src/fr/ifremer/wlo/LocationsActivity.java A src/fr/ifremer/wlo/WloBaseActivity.java A src/fr/ifremer/wlo/LocationFormActivity.java A src/fr/ifremer/wlo/ScientificSpeciesActivity.java A src/fr/ifremer/wlo/WloModelEditionActivity.java A src/fr/ifremer/wlo/utils A src/fr/ifremer/wlo/utils/DatePickerFragment.java A src/fr/ifremer/wlo/utils/TimePickerFragment.java A src/fr/ifremer/wlo/utils/AbstractDateTimePickerFragment.java A src/fr/ifremer/wlo/utils/WloAutoCompleteTextViewWithFavorites.java A src/fr/ifremer/wlo/utils/filechooser A src/fr/ifremer/wlo/utils/filechooser/FileDialog.java A src/fr/ifremer/wlo/utils/filechooser/SelectionMode.java A src/fr/ifremer/wlo/utils/WloAutoCompleteTextView.java A src/fr/ifremer/wlo/utils/BigFinFeedReaderRecord.java A src/fr/ifremer/wlo/utils/BaseModelArrayAdapter.java A src/fr/ifremer/wlo/utils/WloItemListViewBinder.java A src/fr/ifremer/wlo/utils/BaseTextWatcher.java AU src/fr/ifremer/wlo/utils/UIUtils.java A src/fr/ifremer/wlo/preferences A src/fr/ifremer/wlo/preferences/StringPreference.java A src/fr/ifremer/wlo/preferences/WloMultiSelectListPreference.java A src/fr/ifremer/wlo/preferences/MultiSelectItemPreference.java A src/fr/ifremer/wlo/preferences/ListItemPreference.java A src/fr/ifremer/wlo/preferences/SettingsActivity.java AU src/fr/ifremer/wlo/ContextsActivity.java A src/fr/ifremer/wlo/storage AU src/fr/ifremer/wlo/storage/WloSqlOpenHelper.java A src/fr/ifremer/wlo/storage/StorageUtils.java A src/fr/ifremer/wlo/storage/DataCache.java A src/fr/ifremer/wlo/MetiersActivity.java A src/fr/ifremer/wlo/ContextFormActivity.java A src/fr/ifremer/wlo/MetierFormActivity.java A src/fr/ifremer/wlo/WeightsActivity.java A src/fr/ifremer/wlo/CommercialSpeciesFormActivity.java A src/fr/ifremer/wlo/ScientificSpeciesFormActivity.java A res A res/values AU res/values/style.xml A res/values/arrays.xml A res/values/colors.xml AU res/values/strings.xml A res/xml A res/xml/preferences.xml A res/drawable A res/drawable/favorite_toggle.xml AU res/drawable/file.png AU res/drawable/weight.png AU res/drawable/app_icon.png AU res/drawable/border_bottom.9.png AU res/drawable/icon.png AU res/drawable/tab_bg_selector.xml AU res/drawable/folder.png AU res/drawable/wlo_ico.png A res/drawable-hdpi AU res/drawable-hdpi/ic_drawer.png AU res/drawable-hdpi/drawer_shadow.9.png A res/drawable-xxhdpi AU res/drawable-xxhdpi/ic_drawer.png AU res/drawable-xxhdpi/drawer_shadow.9.png A res/menu A res/menu/form_menu.xml A res/menu/weight_menu.xml AU res/menu/model_list_menu.xml A res/values-fr A res/values-fr/arrays.xml A res/values-fr/strings.xml A res/drawable-mdpi AU res/drawable-mdpi/ic_drawer.png AU res/drawable-mdpi/drawer_shadow.9.png A res/drawable-xhdpi AU res/drawable-xhdpi/ic_drawer.png AU res/drawable-xhdpi/drawer_shadow.9.png A res/layout A res/layout/location_list_item.xml AU res/layout/measurement_table_row.xml A res/layout/vessel_form.xml AU res/layout/message.xml AU res/layout/main.xml A res/layout/file_dialog_row.xml AU res/layout/measurement.xml AU res/layout/measurement_graph_fragment.xml A res/layout/location_form.xml AU res/layout/measurement_logs_fragment.xml AU res/layout/device_name.xml AU res/layout/measurement_logs_row.xml AU res/layout/tabs_bg.xml A res/layout/file_dialog_main.xml AU res/layout/measurement_graph.xml A res/layout/context_form.xml A res/layout/metier_form.xml A res/layout/commercial_species_form.xml A res/layout/vessel_list_item.xml A res/layout/weights.xml AU res/layout/custom_title.xml A res/layout/autocomplete_text_view_with_favorites.xml A res/layout/scientific_species_form.xml AU res/layout/measurement_table_fragment.xml AU pom.xml AU README.txt U . At revision 48 Parsing POMs Discovered a new module fr.ifremer:wlo WLO Modules changed, recalculating dependency graph [trunk] $ /opt/jdk7/bin/java -Dsettings.security=/var/local/forge/data/codelutin.com/maven/settings-security.xml -Djava.awt.headless=true -cp /var/local/forge/data/codelutin.com/jenkins/plugins/maven-plugin/WEB-INF/lib/maven31-agent-1.4.jar:/opt/maven3/boot/plexus-classworlds-2.5.1.jar:/opt/maven3/conf/logging jenkins.maven3.agent.Maven31Main /opt/maven3 /var/local/forge/exec/tomcat-codelutin.com/webapps/jenkins/WEB-INF/lib/remoting-2.33.jar /var/local/forge/data/codelutin.com/jenkins/plugins/maven-plugin/WEB-INF/lib/maven31-interceptor-1.4.jar /var/local/forge/data/codelutin.com/jenkins/plugins/maven-plugin/WEB-INF/lib/maven3-interceptor-commons-1.4.jar 34922 <===[JENKINS REMOTING CAPACITY]===> channel started log4j:WARN No appenders could be found for logger (org.apache.commons.beanutils.converters.BooleanConverter). log4j:WARN Please initialize the log4j system properly. Executing Maven: -B -f <http://ci.codelutin.com/jenkins/job/wlo-nightly/ws/trunk/pom.xml> -s /var/local/forge/data/codelutin.com/maven/settings.xml -e -U clean verify -DperformRelease [INFO] Error stacktraces are turned on. [INFO] Scanning for projects... [INFO] [INFO] ------------------------------------------------------------------------ [INFO] Building WLO 0.2-SNAPSHOT [INFO] ------------------------------------------------------------------------ [INFO] [INFO] --- maven-clean-plugin:2.5:clean (default-clean) @ wlo --- [INFO] [INFO] --- maven-enforcer-plugin:1.3.1:enforce (ensure-no-container-api) @ wlo --- [INFO] [INFO] --- maven-enforcer-plugin:1.3.1:enforce (check-project-files) @ wlo --- [INFO] [INFO] --- helper-maven-plugin:2.1:share-server-secret (get-redmine-login) @ wlo --- [INFO] Exporting server [redmine-forge.codelutin.com] username in ${redmine.username} [INFO] Exporting server [redmine-forge.codelutin.com] privateKey in ${redmine.apiKey} [INFO] [INFO] --- android-maven-plugin:3.8.2:generate-sources (default-generate-sources) @ wlo --- [DEBUG] Expanding: /var/local/forge/data/codelutin.com/maven/repository/android/support/compatibility-v7-appcompat/19.0.1/compatibility-v7-appcompat-19.0.1.apklib into <http://ci.codelutin.com/jenkins/job/wlo-nightly/ws/trunk/target/unpacked-li…> [DEBUG] expand complete [INFO] ANDROID-904-002: Found aidl files: Count = 0 [INFO] ANDROID-904-002: Found aidl files: Count = 0 [INFO] ANDROID-904-002: Found aidl files: Count = 0 [INFO] Manifest merging disabled. Using project manifest only [ERROR] Error when generating sources. org.apache.maven.plugin.MojoExecutionException: No Android SDK path could be found. You may configure it in the plugin configuration section in the pom file using <sdk><path>...</path></sdk> or <properties><android.sdk.path>...</android.sdk.path></properties> or on command-line using -Dandroid.sdk.path=... or by setting environment variable ANDROID_HOME at com.jayway.maven.plugins.android.AbstractAndroidMojo.getAndroidHomeOrThrow(AbstractAndroidMojo.java:1176) at com.jayway.maven.plugins.android.AbstractAndroidMojo.getAndroidSdk(AbstractAndroidMojo.java:1129) at com.jayway.maven.plugins.android.phase01generatesources.GenerateSourcesMojo.generateR(GenerateSourcesMojo.java:481) at com.jayway.maven.plugins.android.phase01generatesources.GenerateSourcesMojo.execute(GenerateSourcesMojo.java:216) at org.apache.maven.plugin.DefaultBuildPluginManager.executeMojo(DefaultBuildPluginManager.java:106) at org.apache.maven.lifecycle.internal.MojoExecutor.execute(MojoExecutor.java:208) at org.apache.maven.lifecycle.internal.MojoExecutor.execute(MojoExecutor.java:153) at org.apache.maven.lifecycle.internal.MojoExecutor.execute(MojoExecutor.java:145) at org.apache.maven.lifecycle.internal.LifecycleModuleBuilder.buildProject(LifecycleModuleBuilder.java:84) at org.apache.maven.lifecycle.internal.LifecycleModuleBuilder.buildProject(LifecycleModuleBuilder.java:59) at org.apache.maven.lifecycle.internal.LifecycleStarter.singleThreadedBuild(LifecycleStarter.java:183) at org.apache.maven.lifecycle.internal.LifecycleStarter.execute(LifecycleStarter.java:161) at org.apache.maven.DefaultMaven.doExecute(DefaultMaven.java:317) at org.apache.maven.DefaultMaven.execute(DefaultMaven.java:152) at org.jvnet.hudson.maven3.launcher.Maven31Launcher.main(Maven31Launcher.java:132) at sun.reflect.NativeMethodAccessorImpl.invoke0(Native Method) at sun.reflect.NativeMethodAccessorImpl.invoke(NativeMethodAccessorImpl.java:57) at sun.reflect.DelegatingMethodAccessorImpl.invoke(DelegatingMethodAccessorImpl.java:43) at java.lang.reflect.Method.invoke(Method.java:606) at org.codehaus.plexus.classworlds.launcher.Launcher.launchStandard(Launcher.java:330) at org.codehaus.plexus.classworlds.launcher.Launcher.launch(Launcher.java:238) at jenkins.maven3.agent.Maven31Main.launch(Maven31Main.java:181) at sun.reflect.NativeMethodAccessorImpl.invoke0(Native Method) at sun.reflect.NativeMethodAccessorImpl.invoke(NativeMethodAccessorImpl.java:57) at sun.reflect.DelegatingMethodAccessorImpl.invoke(DelegatingMethodAccessorImpl.java:43) at java.lang.reflect.Method.invoke(Method.java:606) at hudson.maven.Maven3Builder.call(Maven3Builder.java:134) at hudson.maven.Maven3Builder.call(Maven3Builder.java:69) at hudson.remoting.UserRequest.perform(UserRequest.java:118) at hudson.remoting.UserRequest.perform(UserRequest.java:48) at hudson.remoting.Request$2.run(Request.java:328) at hudson.remoting.InterceptingExecutorService$1.call(InterceptingExecutorService.java:72) at java.util.concurrent.FutureTask.run(FutureTask.java:262) at java.util.concurrent.ThreadPoolExecutor.runWorker(ThreadPoolExecutor.java:1145) at java.util.concurrent.ThreadPoolExecutor$Worker.run(ThreadPoolExecutor.java:615) at java.lang.Thread.run(Thread.java:744) [JENKINS] Archiving disabled [JENKINS] Archiving disabled [INFO] ------------------------------------------------------------------------ [INFO] BUILD FAILURE [INFO] ------------------------------------------------------------------------ [INFO] Total time: 9.306s [INFO] Finished at: Sat Feb 15 02:01:36 CET 2014 [INFO] Final Memory: 20M/246M [INFO] ------------------------------------------------------------------------ Waiting for Jenkins to finish collecting data [ERROR] Failed to execute goal com.jayway.maven.plugins.android.generation2:android-maven-plugin:3.8.2:generate-sources (default-generate-sources) on project wlo: No Android SDK path could be found. You may configure it in the plugin configuration section in the pom file using <sdk><path>...</path></sdk> or <properties><android.sdk.path>...</android.sdk.path></properties> or on command-line using -Dandroid.sdk.path=... or by setting environment variable ANDROID_HOME -> [Help 1] org.apache.maven.lifecycle.LifecycleExecutionException: Failed to execute goal com.jayway.maven.plugins.android.generation2:android-maven-plugin:3.8.2:generate-sources (default-generate-sources) on project wlo: No Android SDK path could be found. You may configure it in the plugin configuration section in the pom file using <sdk><path>...</path></sdk> or <properties><android.sdk.path>...</android.sdk.path></properties> or on command-line using -Dandroid.sdk.path=... or by setting environment variable ANDROID_HOME at org.apache.maven.lifecycle.internal.MojoExecutor.execute(MojoExecutor.java:216) at org.apache.maven.lifecycle.internal.MojoExecutor.execute(MojoExecutor.java:153) at org.apache.maven.lifecycle.internal.MojoExecutor.execute(MojoExecutor.java:145) at org.apache.maven.lifecycle.internal.LifecycleModuleBuilder.buildProject(LifecycleModuleBuilder.java:84) at org.apache.maven.lifecycle.internal.LifecycleModuleBuilder.buildProject(LifecycleModuleBuilder.java:59) at org.apache.maven.lifecycle.internal.LifecycleStarter.singleThreadedBuild(LifecycleStarter.java:183) at org.apache.maven.lifecycle.internal.LifecycleStarter.execute(LifecycleStarter.java:161) at org.apache.maven.DefaultMaven.doExecute(DefaultMaven.java:317) at org.apache.maven.DefaultMaven.execute(DefaultMaven.java:152) at org.jvnet.hudson.maven3.launcher.Maven31Launcher.main(Maven31Launcher.java:132) at sun.reflect.NativeMethodAccessorImpl.invoke0(Native Method) at sun.reflect.NativeMethodAccessorImpl.invoke(NativeMethodAccessorImpl.java:57) at sun.reflect.DelegatingMethodAccessorImpl.invoke(DelegatingMethodAccessorImpl.java:43) at java.lang.reflect.Method.invoke(Method.java:606) at org.codehaus.plexus.classworlds.launcher.Launcher.launchStandard(Launcher.java:330) at org.codehaus.plexus.classworlds.launcher.Launcher.launch(Launcher.java:238) at jenkins.maven3.agent.Maven31Main.launch(Maven31Main.java:181) at sun.reflect.NativeMethodAccessorImpl.invoke0(Native Method) at sun.reflect.NativeMethodAccessorImpl.invoke(NativeMethodAccessorImpl.java:57) at sun.reflect.DelegatingMethodAccessorImpl.invoke(DelegatingMethodAccessorImpl.java:43) at java.lang.reflect.Method.invoke(Method.java:606) at hudson.maven.Maven3Builder.call(Maven3Builder.java:134) at hudson.maven.Maven3Builder.call(Maven3Builder.java:69) at hudson.remoting.UserRequest.perform(UserRequest.java:118) at hudson.remoting.UserRequest.perform(UserRequest.java:48) at hudson.remoting.Request$2.run(Request.java:328) at hudson.remoting.InterceptingExecutorService$1.call(InterceptingExecutorService.java:72) at java.util.concurrent.FutureTask.run(FutureTask.java:262) at java.util.concurrent.ThreadPoolExecutor.runWorker(ThreadPoolExecutor.java:1145) at java.util.concurrent.ThreadPoolExecutor$Worker.run(ThreadPoolExecutor.java:615) at java.lang.Thread.run(Thread.java:744) Caused by: org.apache.maven.plugin.MojoExecutionException: No Android SDK path could be found. You may configure it in the plugin configuration section in the pom file using <sdk><path>...</path></sdk> or <properties><android.sdk.path>...</android.sdk.path></properties> or on command-line using -Dandroid.sdk.path=... or by setting environment variable ANDROID_HOME at com.jayway.maven.plugins.android.AbstractAndroidMojo.getAndroidHomeOrThrow(AbstractAndroidMojo.java:1176) at com.jayway.maven.plugins.android.AbstractAndroidMojo.getAndroidSdk(AbstractAndroidMojo.java:1129) at com.jayway.maven.plugins.android.phase01generatesources.GenerateSourcesMojo.generateR(GenerateSourcesMojo.java:481) at com.jayway.maven.plugins.android.phase01generatesources.GenerateSourcesMojo.execute(GenerateSourcesMojo.java:216) at org.apache.maven.plugin.DefaultBuildPluginManager.executeMojo(DefaultBuildPluginManager.java:106) at org.apache.maven.lifecycle.internal.MojoExecutor.execute(MojoExecutor.java:208) ... 30 more [ERROR] [ERROR] Re-run Maven using the -X switch to enable full debug logging. [ERROR] [ERROR] For more information about the errors and possible solutions, please read the following articles: [ERROR] [Help 1] http://cwiki.apache.org/confluence/display/MAVEN/MojoExecutionException Sending e-mails to: wlo-commits(a)list.forge.codelutin.com channel stopped Skipping sonar analysis due to bad build status FAILURE

1 6