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

r41 - in trunk: res/layout src/fr/ifremer/wlo src/fr/ifremer/wlo/utils
by kmorin＠users.forge.codelutin.com 30 Jan '14

30 Jan '14

Author: kmorin Date: 2014-01-30 11:34:36 +0100 (Thu, 30 Jan 2014) New Revision: 41 Url: http://forge.codelutin.com/projects/wlo/repository/revisions/41 Log: fixes #4183 Liste de favoris Modified: trunk/res/layout/autocomplete_text_view_with_favorites.xml trunk/res/layout/commercial_species_form.xml trunk/src/fr/ifremer/wlo/CommercialSpeciesFormActivity.java trunk/src/fr/ifremer/wlo/ScientificSpeciesFormActivity.java trunk/src/fr/ifremer/wlo/utils/WloAutoCompleteTextView.java trunk/src/fr/ifremer/wlo/utils/WloAutoCompleteTextViewWithFavorites.java Modified: trunk/res/layout/autocomplete_text_view_with_favorites.xml =================================================================== --- trunk/res/layout/autocomplete_text_view_with_favorites.xml 2014-01-29 18:51:33 UTC (rev 40) +++ trunk/res/layout/autocomplete_text_view_with_favorites.xml 2014-01-30 10:34:36 UTC (rev 41) @@ -14,8 +14,9 @@ android:hint="@string/undefined"/> <ToggleButton android:id="@+id/favorite_button" - android:layout_width="wrap_content" - android:layout_height="wrap_content" + android:layout_width="32dp" + android:layout_height="32dp" + android:paddingRight="2dp" android:background="@drawable/favorite_toggle" android:textOff="" android:textOn=""/> Modified: trunk/res/layout/commercial_species_form.xml =================================================================== --- trunk/res/layout/commercial_species_form.xml 2014-01-29 18:51:33 UTC (rev 40) +++ trunk/res/layout/commercial_species_form.xml 2014-01-30 10:34:36 UTC (rev 41) @@ -18,12 +18,10 @@ android:layout_width="match_parent" android:layout_height="wrap_content"/> - <fr.ifremer.wlo.utils.WloAutoCompleteTextView + <fr.ifremer.wlo.utils.WloAutoCompleteTextViewWithFavorites android:id="@+id/commercial_species_form_fao_code" android:layout_width="match_parent" - android:layout_height="wrap_content" - android:singleLine="true" - android:hint="@string/undefined"/> + android:layout_height="wrap_content"/> <TextView android:text="@string/commercial_species_form_measurement_method" android:layout_width="match_parent" Modified: trunk/src/fr/ifremer/wlo/CommercialSpeciesFormActivity.java =================================================================== --- trunk/src/fr/ifremer/wlo/CommercialSpeciesFormActivity.java 2014-01-29 18:51:33 UTC (rev 40) +++ trunk/src/fr/ifremer/wlo/CommercialSpeciesFormActivity.java 2014-01-30 10:34:36 UTC (rev 41) @@ -24,8 +24,10 @@ * #L% */ +import android.content.SharedPreferences; import android.database.Cursor; import android.os.Bundle; +import android.preference.PreferenceManager; import android.util.Log; import android.view.View; import android.widget.AdapterView; @@ -34,15 +36,21 @@ import android.widget.CheckBox; import android.widget.CompoundButton; import android.widget.Spinner; +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.CommercialSpeciesModel; import fr.ifremer.wlo.models.referentials.CommercialSpecies; import fr.ifremer.wlo.models.referentials.Mensuration; import fr.ifremer.wlo.models.referentials.Presentation; import fr.ifremer.wlo.models.referentials.State; +import fr.ifremer.wlo.preferences.MultiSelectItemPreference; import fr.ifremer.wlo.storage.DataCache; import fr.ifremer.wlo.storage.WloSqlOpenHelper; +import fr.ifremer.wlo.utils.WloAutoCompleteTextViewWithFavorites; +import java.util.Collection; import java.util.List; import java.util.Set; @@ -83,8 +91,20 @@ // init editors List<CommercialSpecies> commercialSpecies = Lists.newArrayList(DataCache.getAllCommercialSpecies(this)); - initAutoCompleteTextView(R.id.commercial_species_form_fao_code, CommercialSpeciesModel.COLUMN_FAO_CODE, commercialSpecies); + SharedPreferences sharedPref = PreferenceManager.getDefaultSharedPreferences(this); + final Set<String> favoriteIds = sharedPref.getStringSet(MultiSelectItemPreference.COMMERCIAL_SPECIES_FAVORITES.getKey(), + Sets.<String>newHashSet()); + Collection<CommercialSpecies> favorites = Collections2.filter(commercialSpecies, new Predicate<CommercialSpecies>() { + @Override + public boolean apply(CommercialSpecies input) { + return favoriteIds.contains(input.getId()); + } + }); + WloAutoCompleteTextViewWithFavorites actvwf = (WloAutoCompleteTextViewWithFavorites) findViewById(R.id.commercial_species_form_fao_code); + initAutoCompleteTextView(actvwf.getAutoCompleteTextView(), CommercialSpeciesModel.COLUMN_FAO_CODE, commercialSpecies, favorites); + actvwf.useFavorites(!favorites.isEmpty()); + if (model.getMeasurementMethod() == null) { Mensuration defaultMensuration = DataCache.getDefaultMensuration(this); model.setMeasurementMethod(defaultMensuration); Modified: trunk/src/fr/ifremer/wlo/ScientificSpeciesFormActivity.java =================================================================== --- trunk/src/fr/ifremer/wlo/ScientificSpeciesFormActivity.java 2014-01-29 18:51:33 UTC (rev 40) +++ trunk/src/fr/ifremer/wlo/ScientificSpeciesFormActivity.java 2014-01-30 10:34:36 UTC (rev 41) @@ -98,6 +98,7 @@ WloAutoCompleteTextViewWithFavorites actvwf = (WloAutoCompleteTextViewWithFavorites) findViewById(R.id.scientific_species_form_name); initAutoCompleteTextView(actvwf.getAutoCompleteTextView(), ScientificSpeciesModel.COLUMN_NAME, scientificSpecies, favorites); + actvwf.useFavorites(!favorites.isEmpty()); CheckBox takingActivationEditor = (CheckBox) findViewById(R.id.scientific_species_form_takingActivation); takingActivationEditor.setChecked(model.isTakingActivation()); Modified: trunk/src/fr/ifremer/wlo/utils/WloAutoCompleteTextView.java =================================================================== --- trunk/src/fr/ifremer/wlo/utils/WloAutoCompleteTextView.java 2014-01-29 18:51:33 UTC (rev 40) +++ trunk/src/fr/ifremer/wlo/utils/WloAutoCompleteTextView.java 2014-01-30 10:34:36 UTC (rev 41) @@ -26,7 +26,9 @@ import android.content.Context; import android.util.AttributeSet; +import android.util.Log; import android.view.View; +import android.widget.AdapterView; import android.widget.AutoCompleteTextView; /** @@ -35,8 +37,12 @@ */ public class WloAutoCompleteTextView extends AutoCompleteTextView { - private int myThreshold; + private static final String TAG = "WloAutoCompleteTextView"; + protected int myThreshold; + + protected boolean popupShown; + public WloAutoCompleteTextView(Context context) { super(context); init(); @@ -53,27 +59,42 @@ } protected void init() { -// setOnFocusChangeListener(new OnFocusChangeListener() { -// @Override -// public void onFocusChange(View v, boolean hasFocus) { -// if (hasFocus) { -// showDropDown(); -// } else { -// dismissDropDown(); -// } -// } -// }); + setOnFocusChangeListener(new OnFocusChangeListener() { + @Override + public void onFocusChange(View v, boolean hasFocus) { + if (!hasFocus) { + popupShown = false; + } + } + }); setOnClickListener(new OnClickListener() { @Override public void onClick(View v) { - if (getAdapter() != null && !getAdapter().isEmpty()) { + Log.d(TAG, "onClick " + isPopupShowing()); + if (getAdapter() != null && !getAdapter().isEmpty() && !popupShown) { showDropDown(); + popupShown = true; + } else { + dismissDropDown(); + popupShown = false; } } }); } @Override + public void setOnItemClickListener(final AdapterView.OnItemClickListener l) { + AdapterView.OnItemClickListener listener = new AdapterView.OnItemClickListener() { + @Override + public void onItemClick(AdapterView<?> parent, View view, int position, long id) { + l.onItemClick(parent, view, position, id); + popupShown = false; + } + }; + super.setOnItemClickListener(listener); + } + + @Override public void setThreshold(int threshold) { if (threshold < 0) { threshold = 0; Modified: trunk/src/fr/ifremer/wlo/utils/WloAutoCompleteTextViewWithFavorites.java =================================================================== --- trunk/src/fr/ifremer/wlo/utils/WloAutoCompleteTextViewWithFavorites.java 2014-01-29 18:51:33 UTC (rev 40) +++ trunk/src/fr/ifremer/wlo/utils/WloAutoCompleteTextViewWithFavorites.java 2014-01-30 10:34:36 UTC (rev 41) @@ -50,11 +50,14 @@ @Override public void onCheckedChanged(CompoundButton buttonView, boolean isChecked) { Log.d(TAG, "onCheckedChanged " + isChecked); + String s = autoCompleteTextView.getText().toString(); + autoCompleteTextView.setText(null); Adapter adapter = autoCompleteTextView.getAdapter(); if (FavoriteAdapter.class.isAssignableFrom(adapter.getClass())) { FavoriteAdapter favoriteAdapter = (FavoriteAdapter) autoCompleteTextView.getAdapter(); favoriteAdapter.useFavorites(isChecked); } + autoCompleteTextView.setText(s); } }); } @@ -63,6 +66,10 @@ return autoCompleteTextView; } + public void useFavorites(boolean useFavorites) { + toggleButton.setChecked(useFavorites); + } + public static class FavoriteAdapter<M> extends ArrayAdapter<M> { protected Collection<M> allData; @@ -76,7 +83,7 @@ } } - public void useFavorites(boolean favorites) { + protected void useFavorites(boolean favorites) { if (CollectionUtils.isNotEmpty(favoriteData)) { Log.d(TAG, "useFavorites " + favorites); clear();

1 0

r40 - in trunk: . res/drawable res/layout res/values res/values-fr res/xml src src/fr/ifremer/wlo src/fr/ifremer/wlo/preferences src/fr/ifremer/wlo/storage src/fr/ifremer/wlo/utils
by kmorin＠users.forge.codelutin.com 29 Jan '14

29 Jan '14

Author: kmorin Date: 2014-01-29 19:51:33 +0100 (Wed, 29 Jan 2014) New Revision: 40 Url: http://forge.codelutin.com/projects/wlo/repository/revisions/40 Log: refs #4183 Liste de favoris Added: trunk/res/drawable/favorite_toggle.xml trunk/res/layout/autocomplete_text_view_with_favorites.xml trunk/src/android/ trunk/src/fr/ifremer/wlo/preferences/MultiSelectItemPreference.java trunk/src/fr/ifremer/wlo/preferences/WloMultiSelectListPreference.java trunk/src/fr/ifremer/wlo/utils/WloAutoCompleteTextViewWithFavorites.java Modified: trunk/AndroidManifest.xml trunk/res/layout/scientific_species_form.xml trunk/res/values-fr/strings.xml trunk/res/values/strings.xml trunk/res/xml/preferences.xml trunk/src/fr/ifremer/wlo/BigFinCommunicationService.java trunk/src/fr/ifremer/wlo/ScientificSpeciesFormActivity.java trunk/src/fr/ifremer/wlo/WloModelEditionActivity.java trunk/src/fr/ifremer/wlo/preferences/SettingsActivity.java trunk/src/fr/ifremer/wlo/storage/DataCache.java Modified: trunk/AndroidManifest.xml =================================================================== --- trunk/AndroidManifest.xml 2014-01-29 13:38:23 UTC (rev 39) +++ trunk/AndroidManifest.xml 2014-01-29 18:51:33 UTC (rev 40) @@ -18,7 +18,7 @@ android:versionCode="1" android:versionName="1.0"> - <uses-sdk minSdkVersion="7" + <uses-sdk minSdkVersion="15" android:targetSdkVersion="15"/> <uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE" android:maxSdkVersion="18"/> <uses-permission android:name="android.permission.BLUETOOTH_ADMIN" /> Added: trunk/res/drawable/favorite_toggle.xml =================================================================== --- trunk/res/drawable/favorite_toggle.xml (rev 0) +++ trunk/res/drawable/favorite_toggle.xml 2014-01-29 18:51:33 UTC (rev 40) @@ -0,0 +1,11 @@ +<?xml version="1.0" encoding="utf-8"?> + +<selector xmlns:android="http://schemas.android.com/apk/res/android"> +  + <item android:drawable="@android:drawable/btn_star_big_on" + android:state_checked="true" /> +  + <item android:drawable="@android:drawable/btn_star_big_off" + android:state_checked="false"/> + +</selector> \ No newline at end of file Added: trunk/res/layout/autocomplete_text_view_with_favorites.xml =================================================================== --- trunk/res/layout/autocomplete_text_view_with_favorites.xml (rev 0) +++ trunk/res/layout/autocomplete_text_view_with_favorites.xml 2014-01-29 18:51:33 UTC (rev 40) @@ -0,0 +1,22 @@ +<?xml version="1.0" encoding="utf-8"?> + +<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android" + android:orientation="horizontal" + android:layout_width="match_parent" + android:layout_height="match_parent"> + + <fr.ifremer.wlo.utils.WloAutoCompleteTextView + android:id="@+id/autocomplete_text_view" + android:layout_width="0dp" + android:layout_height="wrap_content" + android:layout_weight="1" + android:singleLine="true" + android:hint="@string/undefined"/> + + <ToggleButton android:id="@+id/favorite_button" + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:background="@drawable/favorite_toggle" + android:textOff="" + android:textOn=""/> +</LinearLayout> \ No newline at end of file Modified: trunk/res/layout/scientific_species_form.xml =================================================================== --- trunk/res/layout/scientific_species_form.xml 2014-01-29 13:38:23 UTC (rev 39) +++ trunk/res/layout/scientific_species_form.xml 2014-01-29 18:51:33 UTC (rev 40) @@ -19,12 +19,10 @@ android:layout_width="match_parent" android:layout_height="wrap_content"/> - <fr.ifremer.wlo.utils.WloAutoCompleteTextView + <fr.ifremer.wlo.utils.WloAutoCompleteTextViewWithFavorites android:id="@+id/scientific_species_form_name" android:layout_width="match_parent" - android:layout_height="wrap_content" - android:singleLine="true" - android:hint="@string/undefined"/> + android:layout_height="wrap_content"/> <CheckBox android:id="@+id/scientific_species_form_takingActivation" android:text="@string/scientific_species_form_taking_activation" Modified: trunk/res/values/strings.xml =================================================================== --- trunk/res/values/strings.xml 2014-01-29 13:38:23 UTC (rev 39) +++ trunk/res/values/strings.xml 2014-01-29 18:51:33 UTC (rev 40) @@ -85,6 +85,7 @@ <string name="preferences_ichtyometer">Ichtyometer</string> <string name="preferences_referentials">Referentials</string> <string name="preferences_imports">Imports</string> + <string name="preferences_imports">Favorites</string> <string name="preferences_import_summary">%s items currently</string> <string name="preferences_import_ages">Import ages</string> @@ -102,6 +103,9 @@ <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> + <string name="preferences_favorites_commercial_species">Commercial species</string> + <string name="preferences_favorites_scientific_species">Scientific species</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-01-29 13:38:23 UTC (rev 39) +++ trunk/res/values-fr/strings.xml 2014-01-29 18:51:33 UTC (rev 40) @@ -80,6 +80,7 @@ <string name="preferences_use_place">Lieu d\'utilisation</string> <string name="preferences_referentials">Référentiels</string> <string name="preferences_imports">Imports</string> + <string name="preferences_favorites">Favoris</string> <string name="preferences_import_summary">%s éléments actuellement</string> <string name="preferences_import_ages">Importer des âges</string> @@ -100,6 +101,9 @@ <string name="import_new_element_number">%s nouveaux éléments importés</string> <string name="import_error">Une erreur s\'est produite durant l\'import.\nVérifiez que les entêtes du fichier que vous avez choisi sont corrects.</string> + <string name="preferences_favorites_commercial_species">Espèces commerciales</string> + <string name="preferences_favorites_scientific_species">Espèces scientifiques</string> +  <string name="add_context">Créer un nouveau contexte</string> <string name="contexts_title">Contextes</string> Modified: trunk/res/xml/preferences.xml =================================================================== --- trunk/res/xml/preferences.xml 2014-01-29 13:38:23 UTC (rev 39) +++ trunk/res/xml/preferences.xml 2014-01-29 18:51:33 UTC (rev 40) @@ -66,6 +66,20 @@ </PreferenceScreen> + <PreferenceScreen + 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"/> + + <fr.ifremer.wlo.preferences.WloMultiSelectListPreference + android:key="preferences_favorites_scientific_species" + android:title="@string/preferences_favorites_scientific_species"/> + + </PreferenceScreen> + </PreferenceCategory> </PreferenceScreen> \ No newline at end of file Modified: trunk/src/fr/ifremer/wlo/BigFinCommunicationService.java =================================================================== --- trunk/src/fr/ifremer/wlo/BigFinCommunicationService.java 2014-01-29 13:38:23 UTC (rev 39) +++ trunk/src/fr/ifremer/wlo/BigFinCommunicationService.java 2014-01-29 18:51:33 UTC (rev 40) @@ -19,8 +19,8 @@ /* * #%L * WLO - * $Id:$ - * $HeadURL:$ + * $Id$ + * $HeadURL$ * %% * Copyright (C) 2013 - 2014 Ifremer * %% @@ -554,7 +554,9 @@ // Read from the InputStream bytes = mmInStream.read(buffer); + Log.d(TAG, "received " + new String(buffer, 0, bytes)); // Send the obtained bytes to the UI Activity + sendMessage(MESSAGE_READ, bytes, -1, buffer); } catch (IOException e) { Modified: trunk/src/fr/ifremer/wlo/ScientificSpeciesFormActivity.java =================================================================== --- trunk/src/fr/ifremer/wlo/ScientificSpeciesFormActivity.java 2014-01-29 13:38:23 UTC (rev 39) +++ trunk/src/fr/ifremer/wlo/ScientificSpeciesFormActivity.java 2014-01-29 18:51:33 UTC (rev 40) @@ -25,19 +25,28 @@ */ import android.content.Intent; +import android.content.SharedPreferences; import android.os.Bundle; +import android.preference.PreferenceManager; import android.util.Log; import android.view.View; import android.widget.CheckBox; import android.widget.CompoundButton; +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.measurement.MeasurementActivity; import fr.ifremer.wlo.models.ScientificSpeciesModel; import fr.ifremer.wlo.models.referentials.ScientificSpecies; +import fr.ifremer.wlo.preferences.MultiSelectItemPreference; import fr.ifremer.wlo.storage.DataCache; import fr.ifremer.wlo.storage.WloSqlOpenHelper; +import fr.ifremer.wlo.utils.WloAutoCompleteTextViewWithFavorites; +import java.util.Collection; import java.util.List; +import java.util.Set; /** * @author kmorin <kmorin(a)codelutin.com> @@ -76,8 +85,20 @@ // init editors List<ScientificSpecies> scientificSpecies = Lists.newArrayList(DataCache.getAllScientificSpecies(this)); - initAutoCompleteTextView(R.id.scientific_species_form_name, ScientificSpeciesModel.COLUMN_NAME, scientificSpecies); + SharedPreferences sharedPref = PreferenceManager.getDefaultSharedPreferences(this); + final Set<String> favoriteIds = sharedPref.getStringSet(MultiSelectItemPreference.SCIENTIFIC_SPECIES_FAVORITES.getKey(), + Sets.<String>newHashSet()); + Collection<ScientificSpecies> favorites = Collections2.filter(scientificSpecies, new Predicate<ScientificSpecies>() { + @Override + public boolean apply(ScientificSpecies input) { + return favoriteIds.contains(input.getId()); + } + }); + + WloAutoCompleteTextViewWithFavorites actvwf = (WloAutoCompleteTextViewWithFavorites) findViewById(R.id.scientific_species_form_name); + initAutoCompleteTextView(actvwf.getAutoCompleteTextView(), ScientificSpeciesModel.COLUMN_NAME, scientificSpecies, favorites); + CheckBox takingActivationEditor = (CheckBox) findViewById(R.id.scientific_species_form_takingActivation); takingActivationEditor.setChecked(model.isTakingActivation()); takingActivationEditor.setOnCheckedChangeListener(new CompoundButton.OnCheckedChangeListener() { Modified: trunk/src/fr/ifremer/wlo/WloModelEditionActivity.java =================================================================== --- trunk/src/fr/ifremer/wlo/WloModelEditionActivity.java 2014-01-29 13:38:23 UTC (rev 39) +++ trunk/src/fr/ifremer/wlo/WloModelEditionActivity.java 2014-01-29 18:51:33 UTC (rev 40) @@ -46,6 +46,7 @@ import fr.ifremer.wlo.storage.WloSqlOpenHelper; import fr.ifremer.wlo.utils.BaseTextWatcher; import fr.ifremer.wlo.utils.UIUtils; +import fr.ifremer.wlo.utils.WloAutoCompleteTextViewWithFavorites; import org.apache.commons.lang3.ObjectUtils; import java.beans.PropertyChangeEvent; @@ -246,18 +247,28 @@ } protected <R> AutoCompleteTextView initAutoCompleteTextView(int autoCompleteTextViewId, final String attribute, Collection<R> data) { + return initAutoCompleteTextView(autoCompleteTextViewId, attribute, data, null); + } + + protected <R> AutoCompleteTextView initAutoCompleteTextView(int autoCompleteTextViewId, final String attribute, + Collection<R> data, Collection<R> favorites) { AutoCompleteTextView autoCompleteTextView = (AutoCompleteTextView) findViewById(autoCompleteTextViewId); - initAutoCompleteTextView(autoCompleteTextView, attribute, data); + initAutoCompleteTextView(autoCompleteTextView, attribute, data, favorites); return autoCompleteTextView; } protected <R> void initAutoCompleteTextView(final AutoCompleteTextView autoCompleteTextView, final String attribute, Collection<R> data) { + initAutoCompleteTextView(autoCompleteTextView, attribute, data, null); + } + + protected <R> void initAutoCompleteTextView(final AutoCompleteTextView autoCompleteTextView, final String attribute, + Collection<R> data, Collection<R> favorites) { final Class clazz = model.getClass(); final String firtsLetterUpperCaseAttribute = attribute.substring(0, 1).toUpperCase() + attribute.substring(1); if (!data.isEmpty()) { - ArrayAdapter<R> adapter = new ArrayAdapter(this, android.R.layout.simple_dropdown_item_1line, Lists.newArrayList(data)); + ArrayAdapter<R> adapter = new WloAutoCompleteTextViewWithFavorites.FavoriteAdapter<R>(this, data, favorites); autoCompleteTextView.setAdapter(adapter); } Copied: trunk/src/fr/ifremer/wlo/preferences/MultiSelectItemPreference.java (from rev 29, trunk/src/fr/ifremer/wlo/preferences/StringPreference.java) =================================================================== --- trunk/src/fr/ifremer/wlo/preferences/MultiSelectItemPreference.java (rev 0) +++ trunk/src/fr/ifremer/wlo/preferences/MultiSelectItemPreference.java 2014-01-29 18:51:33 UTC (rev 40) @@ -0,0 +1,46 @@ +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% + */ + +/** + * @author kmorin <kmorin(a)codelutin.com> + * @since 0.1 + */ +public enum MultiSelectItemPreference { + + COMMERCIAL_SPECIES_FAVORITES("preferences_favorites_commercial_species"), + SCIENTIFIC_SPECIES_FAVORITES("preferences_favorites_scientific_species"); + + private String key; + + private MultiSelectItemPreference(String key) { + this.key = key; + } + + public String getKey() { + return key; + } + +} Modified: trunk/src/fr/ifremer/wlo/preferences/SettingsActivity.java =================================================================== --- trunk/src/fr/ifremer/wlo/preferences/SettingsActivity.java 2014-01-29 13:38:23 UTC (rev 39) +++ trunk/src/fr/ifremer/wlo/preferences/SettingsActivity.java 2014-01-29 18:51:33 UTC (rev 40) @@ -32,17 +32,24 @@ import android.content.SharedPreferences; import android.os.Bundle; import android.os.Environment; +import android.preference.MultiSelectListPreference; import android.preference.Preference; import android.preference.PreferenceFragment; import android.text.format.DateFormat; import android.util.Log; 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.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; @@ -55,8 +62,12 @@ import java.io.File; 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; +import java.util.Set; /** * @author kmorin <kmorin(a)codelutin.com> @@ -157,12 +168,14 @@ } }); } + } @Override public void onSharedPreferenceChanged(SharedPreferences sharedPreferences, String key) { + Log.d(TAG, "onSharedPreferenceChanged " + key); - Preference connectionPref = findPreference(key); + Preference preference = findPreference(key); String summary = null; ListItemPreference pref = ListItemPreference.getListItemPreference(key); @@ -171,10 +184,14 @@ summary = pref.getEntryForValue(getActivity(), entry); } else { - summary = sharedPreferences.getString(key, ""); + try { + summary = sharedPreferences.getString(key, ""); + } catch (ClassCastException e) { + // ok, that's normal, it is a list so we do not want to have a summary + } } // Set summary to be the user-description for the selected value - connectionPref.setSummary(summary); + preference.setSummary(summary); } @Override @@ -184,24 +201,32 @@ for (StringPreference pref : StringPreference.values()) { String key = pref.getKey(); - Preference connectionPref = findPreference(key); - connectionPref.setSummary(sharedPreferences.getString(key, "")); + Preference preference = findPreference(key); + preference.setSummary(sharedPreferences.getString(key, "")); } for (ListItemPreference pref : ListItemPreference.values()) { String key = pref.getKey(); - Preference connectionPref = findPreference(key); + Preference preference = findPreference(key); String entry = sharedPreferences.getString(key, ""); String summary = pref.getEntryForValue(getActivity(), entry); - connectionPref.setSummary(summary); + 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); } @Override public void onPause() { super.onPause(); + Log.d(TAG, "unregisterOnSharedPreferenceChangeListener"); getPreferenceScreen().getSharedPreferences() .unregisterOnSharedPreferenceChangeListener(this); } @@ -346,6 +371,24 @@ } }).start(); } + + protected <M extends BaseModel> void initMultiSelectListPreference(MultiSelectItemPreference pref, Collection<M> refData) { + Log.d(TAG, "initMultiSelectListPreference " + pref.getKey()); + + SharedPreferences sharedPreferences = getPreferenceScreen().getSharedPreferences(); + Set<String> data = sharedPreferences.getStringSet(pref.getKey(), new HashSet<String>()); + Log.d(TAG, "data " + data); + + 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.setValues(data); + + } } } \ No newline at end of file Added: trunk/src/fr/ifremer/wlo/preferences/WloMultiSelectListPreference.java =================================================================== --- trunk/src/fr/ifremer/wlo/preferences/WloMultiSelectListPreference.java (rev 0) +++ trunk/src/fr/ifremer/wlo/preferences/WloMultiSelectListPreference.java 2014-01-29 18:51:33 UTC (rev 40) @@ -0,0 +1,59 @@ +package fr.ifremer.wlo.preferences; + +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(); + } + + } + +} Modified: trunk/src/fr/ifremer/wlo/storage/DataCache.java =================================================================== --- trunk/src/fr/ifremer/wlo/storage/DataCache.java 2014-01-29 13:38:23 UTC (rev 39) +++ trunk/src/fr/ifremer/wlo/storage/DataCache.java 2014-01-29 18:51:33 UTC (rev 40) @@ -92,7 +92,9 @@ public static Collection<CommercialSpecies> getAllCommercialSpecies(Context context) { initCommercialSpecies(context); - return commercialSpecies.values(); + List<CommercialSpecies> result = Lists.newArrayList(commercialSpecies.values()); + Collections.sort(result, HasCode.GET_CODE_COMPARATOR); + return result; } public static CommercialSpecies getCommercialSpeciesById(Context context, String id) { Added: trunk/src/fr/ifremer/wlo/utils/WloAutoCompleteTextViewWithFavorites.java =================================================================== --- trunk/src/fr/ifremer/wlo/utils/WloAutoCompleteTextViewWithFavorites.java (rev 0) +++ trunk/src/fr/ifremer/wlo/utils/WloAutoCompleteTextViewWithFavorites.java 2014-01-29 18:51:33 UTC (rev 40) @@ -0,0 +1,92 @@ +package fr.ifremer.wlo.utils; + +import android.content.Context; +import android.util.AttributeSet; +import android.util.Log; +import android.widget.Adapter; +import android.widget.ArrayAdapter; +import android.widget.CompoundButton; +import android.widget.FrameLayout; +import android.widget.ToggleButton; +import com.google.common.collect.Lists; +import fr.ifremer.wlo.R; +import org.apache.commons.collections.CollectionUtils; + +import java.util.Collection; +import java.util.Collections; + +/** + * @author kmorin <kmorin(a)codelutin.com> + * @since 0.2 + */ +public class WloAutoCompleteTextViewWithFavorites extends FrameLayout { + + private static final String TAG = "WloAutoCompleteTextViewWithFavorites"; + + protected WloAutoCompleteTextView autoCompleteTextView; + protected ToggleButton toggleButton; + + public WloAutoCompleteTextViewWithFavorites(Context context) { + super(context); + init(context); + } + + public WloAutoCompleteTextViewWithFavorites(Context context, AttributeSet attrs) { + super(context, attrs); + init(context); + } + + public WloAutoCompleteTextViewWithFavorites(Context context, AttributeSet attrs, int defStyle) { + super(context, attrs, defStyle); + init(context); + } + + protected void init(Context context) { + inflate(context, R.layout.autocomplete_text_view_with_favorites, this); + autoCompleteTextView = (WloAutoCompleteTextView) findViewById(R.id.autocomplete_text_view); + toggleButton = (ToggleButton) findViewById(R.id.favorite_button); + toggleButton.setChecked(false); + toggleButton.setOnCheckedChangeListener(new CompoundButton.OnCheckedChangeListener() { + @Override + public void onCheckedChanged(CompoundButton buttonView, boolean isChecked) { + Log.d(TAG, "onCheckedChanged " + isChecked); + Adapter adapter = autoCompleteTextView.getAdapter(); + if (FavoriteAdapter.class.isAssignableFrom(adapter.getClass())) { + FavoriteAdapter favoriteAdapter = (FavoriteAdapter) autoCompleteTextView.getAdapter(); + favoriteAdapter.useFavorites(isChecked); + } + } + }); + } + + public WloAutoCompleteTextView getAutoCompleteTextView() { + return autoCompleteTextView; + } + + public static class FavoriteAdapter<M> extends ArrayAdapter<M> { + + protected Collection<M> allData; + protected Collection<M> favoriteData; + + public FavoriteAdapter(Context context, Collection<M> allData, Collection<M> favoriteData) { + super(context, android.R.layout.simple_dropdown_item_1line, Lists.newArrayList(allData)); + this.allData = Lists.newArrayList(allData); + if (favoriteData != null) { + this.favoriteData = Lists.newArrayList(favoriteData); + } + } + + public void useFavorites(boolean favorites) { + if (CollectionUtils.isNotEmpty(favoriteData)) { + Log.d(TAG, "useFavorites " + favorites); + clear(); + if (favorites) { + addAll(favoriteData); + } else { + addAll(allData); + } + notifyDataSetInvalidated(); + } + } + } +}

1 0

r39 - trunk/src/fr/ifremer/wlo
by kmorin＠users.forge.codelutin.com 29 Jan '14

29 Jan '14

Author: kmorin Date: 2014-01-29 14:38:23 +0100 (Wed, 29 Jan 2014) New Revision: 39 Url: http://forge.codelutin.com/projects/wlo/repository/revisions/39 Log: fixes #4252 D?\195?\169sactiver la case coch?\195?\169e "m?\195?\169lange d'esp?\195?\168ces" si il existe au moins deux fils enregistr?\195?\169s Modified: trunk/src/fr/ifremer/wlo/CommercialSpeciesFormActivity.java Modified: trunk/src/fr/ifremer/wlo/CommercialSpeciesFormActivity.java =================================================================== --- trunk/src/fr/ifremer/wlo/CommercialSpeciesFormActivity.java 2014-01-28 21:37:56 UTC (rev 38) +++ trunk/src/fr/ifremer/wlo/CommercialSpeciesFormActivity.java 2014-01-29 13:38:23 UTC (rev 39) @@ -24,6 +24,7 @@ * #L% */ +import android.database.Cursor; import android.os.Bundle; import android.util.Log; import android.view.View; @@ -125,6 +126,14 @@ model.setSpeciesMix(b); } }); + boolean speciesMixEnabled = model.isNew() || !model.isSpeciesMix(); + if (!speciesMixEnabled) { + WloSqlOpenHelper soh = new WloSqlOpenHelper(this); + Cursor cursor = soh.getAllScientificSpecies(model.getId()); + int scientificSpeciesNb = cursor.getCount(); + speciesMixEnabled = scientificSpeciesNb < 2; + } + speciesMixEditor.setEnabled(speciesMixEnabled); initEditText(R.id.form_comment, CommercialSpeciesModel.COLUMN_COMMENT);

1 0

r38 - in trunk: . res/layout res/values res/values-fr src/fr/ifremer/wlo src/fr/ifremer/wlo/measurement
by kmorin＠users.forge.codelutin.com 28 Jan '14

28 Jan '14

Author: kmorin Date: 2014-01-28 22:37:56 +0100 (Tue, 28 Jan 2014) New Revision: 38 Url: http://forge.codelutin.com/projects/wlo/repository/revisions/38 Log: fixes #4241 ?\195?\169cran des tailles, ajouter le nombre total d'individus mesur?\195?\169 Modified: trunk/AndroidManifest.xml trunk/res/layout/measurement.xml trunk/res/values-fr/strings.xml trunk/res/values/strings.xml trunk/src/fr/ifremer/wlo/WloModelEditionActivity.java trunk/src/fr/ifremer/wlo/measurement/MeasurementActivity.java Modified: trunk/AndroidManifest.xml =================================================================== --- trunk/AndroidManifest.xml 2014-01-28 21:06:06 UTC (rev 37) +++ trunk/AndroidManifest.xml 2014-01-28 21:37:56 UTC (rev 38) @@ -51,7 +51,8 @@ <activity android:name=".MainActivity" android:label="@string/app_name" - android:configChanges="orientation|keyboardHidden"> + android:configChanges="orientation|keyboardHidden" + android:launchMode="singleInstance"> <intent-filter> <action android:name="android.intent.action.MAIN"/> <category android:name="android.intent.category.LAUNCHER"/> Modified: trunk/res/layout/measurement.xml =================================================================== --- trunk/res/layout/measurement.xml 2014-01-28 21:06:06 UTC (rev 37) +++ trunk/res/layout/measurement.xml 2014-01-28 21:37:56 UTC (rev 38) @@ -126,6 +126,31 @@ </FrameLayout> + <View android:layout_width="match_parent" + android:layout_height="2px" + android:background="@android:color/holo_blue_light"/> + + <LinearLayout android:id="@+id/fragment_placeholder" + android:layout_width="match_parent" + android:layout_height="wrap_content" + android:orientation="horizontal" + android:padding="2dp"> + + <TextView android:text="@string/observed_number" + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:textStyle="italic" + android:paddingLeft="5dp" + android:paddingRight="5dp"/> + + <TextView android:id="@+id/observed_number" + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:textStyle="bold" + android:text='0'/> + + </LinearLayout> + </LinearLayout> </TabHost> Modified: trunk/res/values/strings.xml =================================================================== --- trunk/res/values/strings.xml 2014-01-28 21:06:06 UTC (rev 37) +++ trunk/res/values/strings.xml 2014-01-28 21:37:56 UTC (rev 38) @@ -65,6 +65,8 @@ <string name="undefined">Undefined</string> + <string name="observed_number">Number of individuals observed:</string> +  <string name="main_open_contexts">Watch/Input data</string> <string name="main_export_data">Export data</string> Modified: trunk/res/values-fr/strings.xml =================================================================== --- trunk/res/values-fr/strings.xml 2014-01-28 21:06:06 UTC (rev 37) +++ trunk/res/values-fr/strings.xml 2014-01-28 21:37:56 UTC (rev 38) @@ -61,6 +61,8 @@ <string name="undefined">Non défini</string> + <string name="observed_number">Nombre d\'individus observés :</string> +  <string name="main_open_contexts">Voir / saisir des données</string> <string name="main_export_data">Export des données</string> Modified: trunk/src/fr/ifremer/wlo/WloModelEditionActivity.java =================================================================== --- trunk/src/fr/ifremer/wlo/WloModelEditionActivity.java 2014-01-28 21:06:06 UTC (rev 37) +++ trunk/src/fr/ifremer/wlo/WloModelEditionActivity.java 2014-01-28 21:37:56 UTC (rev 38) @@ -160,6 +160,7 @@ saveModel(); if (newModel) { + Intent intent = new Intent(this, getNextEditionActivity()); intent.putExtra(WloModelEditionActivity.INTENT_EXTRA_PARENT_MODEL, model); startActivity(intent); Modified: trunk/src/fr/ifremer/wlo/measurement/MeasurementActivity.java =================================================================== --- trunk/src/fr/ifremer/wlo/measurement/MeasurementActivity.java 2014-01-28 21:06:06 UTC (rev 37) +++ trunk/src/fr/ifremer/wlo/measurement/MeasurementActivity.java 2014-01-28 21:37:56 UTC (rev 38) @@ -101,6 +101,7 @@ protected TabHost tabs; protected EditText sizeText; protected ActionBarDrawerToggle mDrawerToggle; + protected TextView observedNumberText; protected MeasurementModel measurement; protected MeasurementsModel measurements; @@ -152,11 +153,15 @@ measurements.addMeasurementsListener(new MeasurementsModel.MeasurementsListener() { @Override public void onMeasurementAdded(MeasurementsModel source, MeasurementModel measurement) { + int size = source.getMeasurements().size(); + observedNumberText.setText(String.valueOf(size)); } @Override public void onMeasurementRemoved(MeasurementsModel source, MeasurementModel measurement) { soh.deleteMeasurement(measurement); + int size = source.getMeasurements().size(); + observedNumberText.setText(String.valueOf(size)); } }); @@ -203,21 +208,27 @@ } }); + 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<Gender> genders = Lists.newArrayList(DataCache.getAllGenders(this)); + genders.add(0, null); ArrayAdapter<Gender> gendersAdapter = new ArrayAdapter<>(this, android.R.layout.simple_spinner_item, genders); genderSpinner.setAdapter(gendersAdapter); Spinner maturitySpinner = (Spinner) findViewById(R.id.maturity_spinner); maturitySpinner.setOnItemSelectedListener(this); List<Maturity> maturities = Lists.newArrayList(DataCache.getAllMaturities(this)); + maturities.add(0, null); ArrayAdapter<Maturity> 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<Age> ages = Lists.newArrayList(DataCache.getAllAges(this)); + ages.add(0, null); ArrayAdapter<Age> agesAdapter = new ArrayAdapter<>(this, android.R.layout.simple_spinner_item, ages); ageSpinner.setAdapter(agesAdapter); @@ -310,15 +321,16 @@ @Override public void onItemSelected(AdapterView<?> adapterView, View view, int i, long l) { BaseModel selected = (BaseModel) adapterView.getItemAtPosition(i); + String id = selected != null ? selected.getId() : null; switch(adapterView.getId()) { case R.id.gender_spinner: - measurement.setCategory1(selected.getId()); + measurement.setCategory1(id); break; case R.id.maturity_spinner: - measurement.setCategory2(selected.getId()); + measurement.setCategory2(id); break; case R.id.age_spinner: - measurement.setCategory3(selected.getId()); + measurement.setCategory3(id); break; } }

1 0

r37 - in trunk: res/values res/values-fr src/fr/ifremer/wlo/models/referentials/imports src/fr/ifremer/wlo/preferences
by kmorin＠users.forge.codelutin.com 28 Jan '14

28 Jan '14

Author: kmorin Date: 2014-01-28 22:06:06 +0100 (Tue, 28 Jan 2014) New Revision: 37 Url: http://forge.codelutin.com/projects/wlo/repository/revisions/37 Log: fixes #4205 G?\195?\169rer les erreurs lors des imports de r?\195?\169f?\195?\169rentiels Modified: trunk/res/values-fr/strings.xml trunk/res/values/strings.xml trunk/src/fr/ifremer/wlo/models/referentials/imports/ImportUtil.java trunk/src/fr/ifremer/wlo/preferences/SettingsActivity.java Modified: trunk/res/values/strings.xml =================================================================== --- trunk/res/values/strings.xml 2014-01-28 18:42:42 UTC (rev 36) +++ trunk/res/values/strings.xml 2014-01-28 21:06:06 UTC (rev 37) @@ -101,6 +101,7 @@ <string name="preferences_importing_referential">Importing referential data</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>  <string name="add_context">Create a new context</string> Modified: trunk/res/values-fr/strings.xml =================================================================== --- trunk/res/values-fr/strings.xml 2014-01-28 18:42:42 UTC (rev 36) +++ trunk/res/values-fr/strings.xml 2014-01-28 21:06:06 UTC (rev 37) @@ -96,6 +96,7 @@ <string name="preferences_importing_referential">Import des données du référentiel en cours</string> <string name="import_new_element_number">%s nouveaux éléments importés</string> + <string name="import_error">Une erreur s\'est produite durant l\'import.\nVérifiez que les entêtes du fichier que vous avez choisi sont corrects.</string>  <string name="add_context">Créer un nouveau contexte</string> Modified: trunk/src/fr/ifremer/wlo/models/referentials/imports/ImportUtil.java =================================================================== --- trunk/src/fr/ifremer/wlo/models/referentials/imports/ImportUtil.java 2014-01-28 18:42:42 UTC (rev 36) +++ trunk/src/fr/ifremer/wlo/models/referentials/imports/ImportUtil.java 2014-01-28 21:06:06 UTC (rev 37) @@ -24,19 +24,20 @@ * #L% */ +import android.app.AlertDialog; import android.content.Context; import android.util.Log; -import android.widget.Toast; 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.referentials.HasCode; import fr.ifremer.wlo.storage.DataCache; import fr.ifremer.wlo.storage.WloSqlOpenHelper; -import fr.ifremer.wlo.models.BaseModel; +import org.apache.commons.collections.CollectionUtils; import org.nuiton.csv.Import; import org.nuiton.csv.ImportModel; @@ -44,7 +45,6 @@ import java.io.FileNotFoundException; import java.io.InputStream; import java.util.Collection; -import java.util.List; /** * @author kmorin <kmorin(a)codelutin.com> @@ -238,7 +238,23 @@ Import<M> importer = Import.newImport(importModel, inputStream); Collection<M> models = Lists.newArrayList(importer.iterator()); - if (!models.isEmpty()) { + 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(); + } + } + + if (CollectionUtils.isNotEmpty(models)) { Predicate<M> filter; //if the models have a code attribute, check M first = models.iterator().next(); @@ -272,7 +288,6 @@ soh.close(); } - importer.close(); return models.size(); } } Modified: trunk/src/fr/ifremer/wlo/preferences/SettingsActivity.java =================================================================== --- trunk/src/fr/ifremer/wlo/preferences/SettingsActivity.java 2014-01-28 18:42:42 UTC (rev 36) +++ trunk/src/fr/ifremer/wlo/preferences/SettingsActivity.java 2014-01-28 21:06:06 UTC (rev 37) @@ -250,80 +250,99 @@ Log.d(TAG, path); final int updatedNb; final int newNb; - 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(); - 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; - default: - newNb = 0; - updatedNb = 0; - } - dialog.setOnDismissListener(new DialogInterface.OnDismissListener() { - @Override - public void onDismiss(DialogInterface dialog) { - String key = requestCodeByPrefKey.inverse().get(requestCode); - Preference filePicker = findPreference(key); - filePicker.setSummary(getString(R.string.preferences_import_summary, updatedNb)); + 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(); + 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; + default: + newNb = 0; + updatedNb = 0; + } - Toast.makeText(context, context.getString(R.string.import_new_element_number, newNb), Toast.LENGTH_SHORT).show(); + 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); + } } - }); - 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(); + 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(); + } + }); + } - dialog.dismiss(); } }).start(); }

1 0

r36 - in trunk: res/layout res/values res/values-fr src/fr/ifremer/wlo src/fr/ifremer/wlo/measurement src/fr/ifremer/wlo/models src/fr/ifremer/wlo/storage
by kmorin＠users.forge.codelutin.com 28 Jan '14

28 Jan '14

Author: kmorin Date: 2014-01-28 19:42:42 +0100 (Tue, 28 Jan 2014) New Revision: 36 Url: http://forge.codelutin.com/projects/wlo/repository/revisions/36 Log: fixes #4248 Ajouter un champ commentaire ?\195?\160 chaque ?\195?\169tape Modified: trunk/res/layout/commercial_species_form.xml trunk/res/layout/context_form.xml trunk/res/layout/location_form.xml trunk/res/layout/metier_form.xml trunk/res/layout/scientific_species_form.xml trunk/res/layout/vessel_form.xml trunk/res/values-fr/strings.xml trunk/res/values/strings.xml trunk/src/fr/ifremer/wlo/CommercialSpeciesFormActivity.java trunk/src/fr/ifremer/wlo/ContextFormActivity.java trunk/src/fr/ifremer/wlo/LocationFormActivity.java trunk/src/fr/ifremer/wlo/MetierFormActivity.java trunk/src/fr/ifremer/wlo/ScientificSpeciesFormActivity.java trunk/src/fr/ifremer/wlo/VesselFormActivity.java trunk/src/fr/ifremer/wlo/WloModelEditionActivity.java trunk/src/fr/ifremer/wlo/measurement/MeasurementActivity.java trunk/src/fr/ifremer/wlo/models/CommercialSpeciesModel.java trunk/src/fr/ifremer/wlo/models/ContextModel.java trunk/src/fr/ifremer/wlo/models/LocationModel.java trunk/src/fr/ifremer/wlo/models/MetierModel.java trunk/src/fr/ifremer/wlo/models/ScientificSpeciesModel.java trunk/src/fr/ifremer/wlo/models/VesselModel.java trunk/src/fr/ifremer/wlo/storage/WloSqlOpenHelper.java Modified: trunk/res/layout/commercial_species_form.xml =================================================================== --- trunk/res/layout/commercial_species_form.xml 2014-01-28 17:58:49 UTC (rev 35) +++ trunk/res/layout/commercial_species_form.xml 2014-01-28 18:42:42 UTC (rev 36) @@ -1,6 +1,5 @@ <?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" @@ -85,6 +84,16 @@ android:singleLine="true" android:hint="@string/undefined"/> + <TextView android:text="@string/form_comment" + android:layout_width="match_parent" + android:layout_height="wrap_content"/> + + <EditText android:id="@+id/form_comment" + android:layout_width="match_parent" + android:layout_height="wrap_content" + android:gravity="top" + android:minLines="5"/> + </LinearLayout> </ScrollView> Modified: trunk/res/layout/context_form.xml =================================================================== --- trunk/res/layout/context_form.xml 2014-01-28 17:58:49 UTC (rev 35) +++ trunk/res/layout/context_form.xml 2014-01-28 18:42:42 UTC (rev 36) @@ -1,44 +1,61 @@ <?xml version="1.0" encoding="utf-8"?> -<ScrollView xmlns:android="http://schemas.android.com/apk/res/android" - android:layout_width="match_parent" - android:layout_height="match_parent" - android:fillViewport="true"> - - <LinearLayout android:orientation="vertical" - android:layout_width="match_parent" - android:layout_height="wrap_content"> - - <TextView android:text="@string/context_form_name" +<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android" + android:orientation="vertical" android:layout_width="match_parent" - android:layout_height="wrap_content"/> + android:layout_height="match_parent"> - <EditText android:id="@+id/context_form_name" - android:layout_width="match_parent" - android:layout_height="wrap_content" - android:singleLine="true" - android:hint="@string/undefined"/> + <ScrollView android:layout_width="match_parent" + android:layout_height="0dp" + android:layout_weight="1" + android:fillViewport="true"> - <LinearLayout android:orientation="horizontal" + <LinearLayout android:orientation="vertical" android:layout_width="match_parent" - android:layout_height="0dp" - android:layout_weight="1" - android:gravity="bottom"> + android:layout_height="wrap_content"> - <Button android:layout_width="wrap_content" - android:layout_height="wrap_content" - android:layout_weight="1" - android:text="@android:string/cancel" - android:onClick="cancel" /> + <TextView android:text="@string/context_form_name" + android:layout_width="match_parent" + android:layout_height="wrap_content"/> - <Button android:layout_width="wrap_content" - android:layout_height="wrap_content" - android:layout_weight="1" - android:text="@android:string/ok" - android:onClick="validate" /> + <EditText android:id="@+id/context_form_name" + android:layout_width="match_parent" + android:layout_height="wrap_content" + android:singleLine="true" + android:hint="@string/undefined"/> + <TextView android:text="@string/form_comment" + android:layout_width="match_parent" + android:layout_height="wrap_content"/> + + <EditText android:id="@+id/form_comment" + android:layout_width="match_parent" + android:layout_height="wrap_content" + android:gravity="top" + android:minLines="5"/> + </LinearLayout> + </ScrollView> + + <LinearLayout android:orientation="horizontal" + android:layout_width="match_parent" + android:layout_height="0dp" + android:layout_weight="1" + 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> -</ScrollView> \ No newline at end of file +</LinearLayout> \ No newline at end of file Modified: trunk/res/layout/location_form.xml =================================================================== --- trunk/res/layout/location_form.xml 2014-01-28 17:58:49 UTC (rev 35) +++ trunk/res/layout/location_form.xml 2014-01-28 18:42:42 UTC (rev 36) @@ -87,6 +87,16 @@ android:singleLine="true" android:hint="@string/undefined"/> + <TextView android:text="@string/form_comment" + android:layout_width="match_parent" + android:layout_height="wrap_content"/> + + <EditText android:id="@+id/form_comment" + android:layout_width="match_parent" + android:layout_height="wrap_content" + android:gravity="top" + android:minLines="5"/> + </LinearLayout> </ScrollView> Modified: trunk/res/layout/metier_form.xml =================================================================== --- trunk/res/layout/metier_form.xml 2014-01-28 17:58:49 UTC (rev 35) +++ trunk/res/layout/metier_form.xml 2014-01-28 18:42:42 UTC (rev 36) @@ -46,6 +46,16 @@ android:layout_height="wrap_content" android:singleLine="true"/> + <TextView android:text="@string/form_comment" + android:layout_width="match_parent" + android:layout_height="wrap_content"/> + + <EditText android:id="@+id/form_comment" + android:layout_width="match_parent" + android:layout_height="wrap_content" + android:gravity="top" + android:minLines="5"/> + </LinearLayout> </ScrollView> Modified: trunk/res/layout/scientific_species_form.xml =================================================================== --- trunk/res/layout/scientific_species_form.xml 2014-01-28 17:58:49 UTC (rev 35) +++ trunk/res/layout/scientific_species_form.xml 2014-01-28 18:42:42 UTC (rev 36) @@ -31,6 +31,16 @@ android:layout_width="match_parent" android:layout_height="wrap_content"/> + <TextView android:text="@string/form_comment" + android:layout_width="match_parent" + android:layout_height="wrap_content"/> + + <EditText android:id="@+id/form_comment" + android:layout_width="match_parent" + android:layout_height="wrap_content" + android:gravity="top" + android:minLines="5"/> + </LinearLayout> </ScrollView> Modified: trunk/res/layout/vessel_form.xml =================================================================== --- trunk/res/layout/vessel_form.xml 2014-01-28 17:58:49 UTC (rev 35) +++ trunk/res/layout/vessel_form.xml 2014-01-28 18:42:42 UTC (rev 36) @@ -59,6 +59,16 @@ android:layout_height="wrap_content" android:singleLine="true"/> + <TextView android:text="@string/form_comment" + android:layout_width="match_parent" + android:layout_height="wrap_content"/> + + <EditText android:id="@+id/form_comment" + android:layout_width="match_parent" + android:layout_height="wrap_content" + android:gravity="top" + android:minLines="5"/> + </LinearLayout> </ScrollView> Modified: trunk/res/values/strings.xml =================================================================== --- trunk/res/values/strings.xml 2014-01-28 17:58:49 UTC (rev 35) +++ trunk/res/values/strings.xml 2014-01-28 18:42:42 UTC (rev 36) @@ -24,6 +24,7 @@ <string name="one_required_field_error_message">At least one these fields is required</string> <string name="delete">Delete</string> <string name="edit">Edit</string> + <string name="form_comment">Comment</string>  <string name="bigfin_no_ichtyometer_connected_title">No ichtyometer connected</string> Modified: trunk/res/values-fr/strings.xml =================================================================== --- trunk/res/values-fr/strings.xml 2014-01-28 17:58:49 UTC (rev 35) +++ trunk/res/values-fr/strings.xml 2014-01-28 18:42:42 UTC (rev 36) @@ -24,6 +24,7 @@ <string name="one_required_field_error_message">Au moins un de ces champs doit être saisi</string> <string name="delete">Supprimer</string> <string name="edit">Éditer</string> + <string name="form_comment">Commentaire</string>  <string name="bigfin_no_ichtyometer_connected_title">Aucun ichtyomètre connecté</string> Modified: trunk/src/fr/ifremer/wlo/CommercialSpeciesFormActivity.java =================================================================== --- trunk/src/fr/ifremer/wlo/CommercialSpeciesFormActivity.java 2014-01-28 17:58:49 UTC (rev 35) +++ trunk/src/fr/ifremer/wlo/CommercialSpeciesFormActivity.java 2014-01-28 18:42:42 UTC (rev 36) @@ -126,6 +126,8 @@ } }); + initEditText(R.id.form_comment, CommercialSpeciesModel.COLUMN_COMMENT); + } @Override Modified: trunk/src/fr/ifremer/wlo/ContextFormActivity.java =================================================================== --- trunk/src/fr/ifremer/wlo/ContextFormActivity.java 2014-01-28 17:58:49 UTC (rev 35) +++ trunk/src/fr/ifremer/wlo/ContextFormActivity.java 2014-01-28 18:42:42 UTC (rev 36) @@ -62,6 +62,7 @@ super.onCreate(savedInstanceState); initEditText(R.id.context_form_name, ContextModel.COLUMN_NAME); + initEditText(R.id.form_comment, ContextModel.COLUMN_COMMENT); } Modified: trunk/src/fr/ifremer/wlo/LocationFormActivity.java =================================================================== --- trunk/src/fr/ifremer/wlo/LocationFormActivity.java 2014-01-28 17:58:49 UTC (rev 35) +++ trunk/src/fr/ifremer/wlo/LocationFormActivity.java 2014-01-28 18:42:42 UTC (rev 36) @@ -107,6 +107,7 @@ endTimeTextView.setText(getString(R.string.time_format, endDate.getTime())); } + initEditText(R.id.form_comment, LocationModel.COLUMN_COMMENT); } public void pickDate(View v) { Modified: trunk/src/fr/ifremer/wlo/MetierFormActivity.java =================================================================== --- trunk/src/fr/ifremer/wlo/MetierFormActivity.java 2014-01-28 17:58:49 UTC (rev 35) +++ trunk/src/fr/ifremer/wlo/MetierFormActivity.java 2014-01-28 18:42:42 UTC (rev 36) @@ -75,6 +75,7 @@ initEditText(R.id.metier_form_zone, MetierModel.COLUMN_ZONE); initEditText(R.id.metier_form_sample_row_code, MetierModel.COLUMN_SAMPLE_ROW_CODE); + initEditText(R.id.form_comment, MetierModel.COLUMN_COMMENT); } } Modified: trunk/src/fr/ifremer/wlo/ScientificSpeciesFormActivity.java =================================================================== --- trunk/src/fr/ifremer/wlo/ScientificSpeciesFormActivity.java 2014-01-28 17:58:49 UTC (rev 35) +++ trunk/src/fr/ifremer/wlo/ScientificSpeciesFormActivity.java 2014-01-28 18:42:42 UTC (rev 36) @@ -86,6 +86,8 @@ model.setTakingActivation(b); } }); + + initEditText(R.id.form_comment, ScientificSpeciesModel.COLUMN_COMMENT); } @Override Modified: trunk/src/fr/ifremer/wlo/VesselFormActivity.java =================================================================== --- trunk/src/fr/ifremer/wlo/VesselFormActivity.java 2014-01-28 17:58:49 UTC (rev 35) +++ trunk/src/fr/ifremer/wlo/VesselFormActivity.java 2014-01-28 18:42:42 UTC (rev 36) @@ -98,6 +98,8 @@ String dateFormat = UIUtils.getDateFormat(this); landingDateEditor.setText(String.format(dateFormat, landingDate.getTime())); } + + initEditText(R.id.form_comment, VesselModel.COLUMN_COMMENT); } /* Method called by the view */ Modified: trunk/src/fr/ifremer/wlo/WloModelEditionActivity.java =================================================================== --- trunk/src/fr/ifremer/wlo/WloModelEditionActivity.java 2014-01-28 17:58:49 UTC (rev 35) +++ trunk/src/fr/ifremer/wlo/WloModelEditionActivity.java 2014-01-28 18:42:42 UTC (rev 36) @@ -235,13 +235,10 @@ } catch (IllegalAccessException | InvocationTargetException | NoSuchMethodException e) { Log.e(TAG, "Error on set" + firtsLetterUpperCaseAttribute + " for class " + clazz, e); } + editText.setError(null); + editText.setSelection(start + count); } - @Override - public void afterTextChanged(Editable s) { - editText.setError(null); - editText.setSelection(s.length()); - } }); addModelPropertyChangeListener(editText, attribute, true); @@ -253,7 +250,7 @@ return autoCompleteTextView; } - protected <R> void initAutoCompleteTextView(AutoCompleteTextView autoCompleteTextView, final String attribute, Collection<R> data) { + protected <R> void initAutoCompleteTextView(final AutoCompleteTextView autoCompleteTextView, final String attribute, Collection<R> data) { final Class clazz = model.getClass(); final String firtsLetterUpperCaseAttribute = attribute.substring(0, 1).toUpperCase() + attribute.substring(1); @@ -265,14 +262,19 @@ autoCompleteTextView.setThreshold(0); autoCompleteTextView.setTag(attribute); + autoCompleteTextView.addTextChangedListener(new BaseTextWatcher() { + @Override + public void onTextChanged(CharSequence s, int start, int before, int count) { + autoCompleteTextView.setError(null); + autoCompleteTextView.setSelection(start + count); + } + }); try { R value = (R) clazz.getMethod("get" + firtsLetterUpperCaseAttribute).invoke(model); if (value != null) { String text = value.toString(); autoCompleteTextView.setText(text); - autoCompleteTextView.setSelection(text.length()); - autoCompleteTextView.setError(null); autoCompleteTextView.dismissDropDown(); } @@ -305,7 +307,6 @@ Object newValue = event.getNewValue(); String text = newValue != null ? newValue.toString() : getString(fr.ifremer.wlo.R.string.undefined); editText.setText(text); - editText.setSelection(text.length()); } } }); Modified: trunk/src/fr/ifremer/wlo/measurement/MeasurementActivity.java =================================================================== --- trunk/src/fr/ifremer/wlo/measurement/MeasurementActivity.java 2014-01-28 17:58:49 UTC (rev 35) +++ trunk/src/fr/ifremer/wlo/measurement/MeasurementActivity.java 2014-01-28 18:42:42 UTC (rev 36) @@ -182,6 +182,11 @@ sizeText.addTextChangedListener(new BaseTextWatcher() { @Override public void onTextChanged(CharSequence s, int start, int before, int count) { + sizeText.setSelection(start + count); + } + + @Override + public void afterTextChanged(Editable s) { Mensuration.Precision precision = measurements.getPrecision(); int multiplier = precision.getUnitDivider(); try { @@ -196,11 +201,6 @@ measurement.setSize(null); } } - - @Override - public void afterTextChanged(Editable s) { - sizeText.setSelection(s.length()); - } }); Spinner genderSpinner = (Spinner) findViewById(R.id.gender_spinner); Modified: trunk/src/fr/ifremer/wlo/models/CommercialSpeciesModel.java =================================================================== --- trunk/src/fr/ifremer/wlo/models/CommercialSpeciesModel.java 2014-01-28 17:58:49 UTC (rev 35) +++ trunk/src/fr/ifremer/wlo/models/CommercialSpeciesModel.java 2014-01-28 18:42:42 UTC (rev 36) @@ -53,6 +53,7 @@ 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_COMMENT = "comment"; public static final String COLUMN_METIER_ID = "metierId"; public static final String[] ALL_COLUMNS = new String[] { _ID, @@ -63,6 +64,7 @@ COLUMN_SORT_CATEGORY, COLUMN_STATE, COLUMN_PRESENTATION, + COLUMN_COMMENT, COLUMN_METIER_ID }; @@ -73,6 +75,7 @@ protected String sortCategory; protected State state; protected Presentation presentation; + protected String comment; public CommercialSpeciesModel() { } @@ -92,6 +95,7 @@ state = DataCache.getStateById(context, stateId); String presentationId = cursor.getString(7); presentation = DataCache.getPresentationById(context, presentationId); + comment = cursor.getString(8); } public CommercialSpecies getFaoCode() { @@ -165,6 +169,16 @@ firePropertyChange(_ID, oldValue, id); } + public String getComment() { + return comment; + } + + public void setComment(String comment) { + Object oldValue = this.comment; + this.comment = comment; + firePropertyChange(COLUMN_COMMENT, oldValue, comment); + } + @Override public String getTableName() { return TABLE_NAME; @@ -185,6 +199,7 @@ 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_COMMENT, comment); putValue(value, COLUMN_METIER_ID, getParentId()); return value; } Modified: trunk/src/fr/ifremer/wlo/models/ContextModel.java =================================================================== --- trunk/src/fr/ifremer/wlo/models/ContextModel.java 2014-01-28 17:58:49 UTC (rev 35) +++ trunk/src/fr/ifremer/wlo/models/ContextModel.java 2014-01-28 18:42:42 UTC (rev 36) @@ -41,12 +41,15 @@ public static final String TABLE_NAME = "contexts"; public static final String COLUMN_NAME = "name"; + public static final String COLUMN_COMMENT = "comment"; public static final String[] ALL_COLUMNS = new String[] { _ID, - COLUMN_NAME + COLUMN_NAME, + COLUMN_COMMENT }; protected String name; + protected String comment; public ContextModel() { } @@ -54,6 +57,7 @@ public ContextModel(Cursor cursor) { super(cursor); name = cursor.getString(1); + comment = cursor.getString(2); } public String getName() { @@ -66,6 +70,16 @@ firePropertyChange(COLUMN_NAME, oldValue, name); } + public String getComment() { + return comment; + } + + public void setComment(String comment) { + Object oldValue = this.comment; + this.comment = comment; + firePropertyChange(COLUMN_COMMENT, oldValue, comment); + } + @Override public String getTableName() { return TABLE_NAME; @@ -80,6 +94,7 @@ public ContentValues convertIntoContentValues() { ContentValues value = super.convertIntoContentValues(); putValue(value, COLUMN_NAME, name); + putValue(value, COLUMN_COMMENT, comment); return value; } Modified: trunk/src/fr/ifremer/wlo/models/LocationModel.java =================================================================== --- trunk/src/fr/ifremer/wlo/models/LocationModel.java 2014-01-28 17:58:49 UTC (rev 35) +++ trunk/src/fr/ifremer/wlo/models/LocationModel.java 2014-01-28 18:42:42 UTC (rev 36) @@ -47,6 +47,7 @@ public static final String COLUMN_START_DATE = "startDate"; public static final String COLUMN_END_DATE = "endDate"; public static final String COLUMN_LOCATION = "location"; + public static final String COLUMN_COMMENT = "comment"; public static final String COLUMN_CONTEXT_ID = "contextId"; public static final String[] ALL_COLUMNS = new String[] { _ID, @@ -54,6 +55,7 @@ COLUMN_START_DATE, COLUMN_END_DATE, COLUMN_LOCATION, + COLUMN_COMMENT, COLUMN_CONTEXT_ID }; @@ -61,6 +63,7 @@ protected Calendar startDate; protected Calendar endDate; protected Location location; + protected String comment; public LocationModel() { } @@ -72,6 +75,7 @@ endDate = UIUtils.getCalendarFromCursor(cursor, 3); String locationId = cursor.getString(4); location = DataCache.getLocationById(context, locationId); + comment = cursor.getString(5); } public String getOperator() { @@ -114,6 +118,16 @@ firePropertyChange(COLUMN_LOCATION, oldValue, location); } + public String getComment() { + return comment; + } + + public void setComment(String comment) { + Object oldValue = this.comment; + this.comment = comment; + firePropertyChange(COLUMN_COMMENT, oldValue, comment); + } + @Override public String getTableName() { return TABLE_NAME; @@ -131,6 +145,7 @@ putValue(value, COLUMN_START_DATE, startDate != null ? startDate.getTimeInMillis() : null); putValue(value, COLUMN_END_DATE, endDate != null ? endDate.getTimeInMillis() : null); putValue(value, COLUMN_LOCATION, location != null ? location.getId() : null); + putValue(value, COLUMN_COMMENT, comment); putValue(value, COLUMN_CONTEXT_ID, getParentId()); return value; } Modified: trunk/src/fr/ifremer/wlo/models/MetierModel.java =================================================================== --- trunk/src/fr/ifremer/wlo/models/MetierModel.java 2014-01-28 17:58:49 UTC (rev 35) +++ trunk/src/fr/ifremer/wlo/models/MetierModel.java 2014-01-28 18:42:42 UTC (rev 36) @@ -43,18 +43,21 @@ public static final String COLUMN_GEAR_SPECIES = "gearSpecies"; public static final String COLUMN_ZONE = "zone"; public static final String COLUMN_SAMPLE_ROW_CODE = "sampleRowCode"; + public static final String COLUMN_COMMENT = "comment"; public static final String COLUMN_VESSEL_ID = "vesselId"; public static final String[] ALL_COLUMNS = new String[] { _ID, COLUMN_GEAR_SPECIES, COLUMN_ZONE, COLUMN_SAMPLE_ROW_CODE, + COLUMN_COMMENT, COLUMN_VESSEL_ID }; protected Metier gearSpecies; protected String zone; protected String sampleRowCode; + protected String comment; public MetierModel() { } @@ -65,6 +68,7 @@ gearSpecies = DataCache.getMetierById(context, gearSpeciesId); zone = cursor.getString(2); sampleRowCode = cursor.getString(3); + comment = cursor.getString(4); } public Metier getGearSpecies() { @@ -97,6 +101,16 @@ firePropertyChange(COLUMN_SAMPLE_ROW_CODE, oldValue, sampleRowCode); } + public String getComment() { + return comment; + } + + public void setComment(String comment) { + Object oldValue = this.comment; + this.comment = comment; + firePropertyChange(COLUMN_COMMENT, oldValue, comment); + } + @Override public String getTableName() { return TABLE_NAME; @@ -113,6 +127,7 @@ putValue(value, COLUMN_GEAR_SPECIES, gearSpecies != null ? gearSpecies.getId() : null); putValue(value, COLUMN_ZONE, zone); putValue(value, COLUMN_SAMPLE_ROW_CODE, sampleRowCode); + putValue(value, COLUMN_COMMENT, comment); putValue(value, COLUMN_VESSEL_ID, getParentId()); return value; } Modified: trunk/src/fr/ifremer/wlo/models/ScientificSpeciesModel.java =================================================================== --- trunk/src/fr/ifremer/wlo/models/ScientificSpeciesModel.java 2014-01-28 17:58:49 UTC (rev 35) +++ trunk/src/fr/ifremer/wlo/models/ScientificSpeciesModel.java 2014-01-28 18:42:42 UTC (rev 36) @@ -43,16 +43,19 @@ public static final String TABLE_NAME = "scientific_species"; public static final String COLUMN_NAME = "name"; public static final String COLUMN_TAKING_ACTIVATION = "takingActivation"; + public static final String COLUMN_COMMENT = "comment"; public static final String COLUMN_COMMERCIAL_SPECIES_ID = "commercialSpeciesId"; public static final String[] ALL_COLUMNS = new String[] { _ID, COLUMN_NAME, COLUMN_TAKING_ACTIVATION, + COLUMN_COMMENT, COLUMN_COMMERCIAL_SPECIES_ID }; protected ScientificSpecies name; protected boolean takingActivation; + protected String comment; public ScientificSpeciesModel() { } @@ -62,6 +65,7 @@ String nameId = cursor.getString(1); name = DataCache.getScientificSpeciesById(context, nameId); takingActivation = cursor.getShort(2) > 0; + comment = cursor.getString(3); } public ScientificSpecies getName() { @@ -84,6 +88,16 @@ firePropertyChange(COLUMN_TAKING_ACTIVATION, oldValue, takingActivation); } + public String getComment() { + return comment; + } + + public void setComment(String comment) { + Object oldValue = this.comment; + this.comment = comment; + firePropertyChange(COLUMN_COMMENT, oldValue, comment); + } + @Override public String getTableName() { return TABLE_NAME; @@ -99,6 +113,7 @@ ContentValues value = super.convertIntoContentValues(); putValue(value, COLUMN_NAME, name != null ? name.getId() : null); putValue(value, COLUMN_TAKING_ACTIVATION, takingActivation ? 1 : 0); + putValue(value, COLUMN_COMMENT, comment); putValue(value, COLUMN_COMMERCIAL_SPECIES_ID, getParentId()); return value; } Modified: trunk/src/fr/ifremer/wlo/models/VesselModel.java =================================================================== --- trunk/src/fr/ifremer/wlo/models/VesselModel.java 2014-01-28 17:58:49 UTC (rev 35) +++ trunk/src/fr/ifremer/wlo/models/VesselModel.java 2014-01-28 18:42:42 UTC (rev 36) @@ -51,6 +51,7 @@ public static final String COLUMN_NAME = "name"; public static final String COLUMN_LANDING_DATE = "landingDate"; public static final String COLUMN_LANDING_LOCATION = "landingLocation"; + public static final String COLUMN_COMMENT = "comment"; public static final String COLUMN_LOCATION_ID = "location_id"; public static final String[] ALL_COLUMNS = new String[] { _ID, @@ -58,6 +59,7 @@ COLUMN_NAME, COLUMN_LANDING_DATE, COLUMN_LANDING_LOCATION, + COLUMN_COMMENT, COLUMN_LOCATION_ID }; @@ -65,6 +67,7 @@ protected String name; protected Calendar landingDate; protected Location landingLocation; + protected String comment; public VesselModel() { } @@ -76,6 +79,7 @@ landingDate = UIUtils.getCalendarFromCursor(cursor, 3); String landingLocationId = cursor.getString(4); landingLocation = DataCache.getLocationById(context, landingLocationId); + comment = cursor.getString(5); } public String getRegistrationNumber() { @@ -130,6 +134,16 @@ firePropertyChange(COLUMN_LANDING_LOCATION, oldValue, landingLocation); } + public String getComment() { + return comment; + } + + public void setComment(String comment) { + Object oldValue = this.comment; + this.comment = comment; + firePropertyChange(COLUMN_COMMENT, oldValue, comment); + } + @Override public String getTableName() { return TABLE_NAME; @@ -148,6 +162,7 @@ putValue(value, COLUMN_NAME, name); putValue(value, COLUMN_LANDING_DATE, landingDate != null ? landingDate.getTimeInMillis() : null); putValue(value, COLUMN_LANDING_LOCATION, landingLocation != null ? landingLocation.getId() : null); + putValue(value, COLUMN_COMMENT, comment); putValue(value, COLUMN_LOCATION_ID, getParentId()); return value; } Modified: trunk/src/fr/ifremer/wlo/storage/WloSqlOpenHelper.java =================================================================== --- trunk/src/fr/ifremer/wlo/storage/WloSqlOpenHelper.java 2014-01-28 17:58:49 UTC (rev 35) +++ trunk/src/fr/ifremer/wlo/storage/WloSqlOpenHelper.java 2014-01-28 18:42:42 UTC (rev 36) @@ -66,7 +66,7 @@ private static final String TAG = "WloOpenHelper"; public static final String DATABASE_NAME = "wlo.db"; - public static final int DATABASE_VERSION = 13; + public static final int DATABASE_VERSION = 14; public static final String TEXT_TYPE = " TEXT"; public static final String BIGINT_TYPE = " BIGINT"; @@ -78,7 +78,8 @@ protected static final String SQL_CREATE_CONTEXTS = "CREATE TABLE " + ContextModel.TABLE_NAME + " (" + ContextModel._ID + TEXT_TYPE + " PRIMARY KEY" + COMMA_SEP + - ContextModel.COLUMN_NAME + TEXT_TYPE + NOT_NULL + + ContextModel.COLUMN_NAME + TEXT_TYPE + NOT_NULL + COMMA_SEP + + ContextModel.COLUMN_COMMENT + TEXT_TYPE + " )"; protected static final String SQL_DELETE_CONTEXTS = @@ -93,6 +94,7 @@ LocationModel.COLUMN_START_DATE + BIGINT_TYPE + COMMA_SEP + LocationModel.COLUMN_END_DATE + BIGINT_TYPE + COMMA_SEP + LocationModel.COLUMN_LOCATION + TEXT_TYPE + NOT_NULL + COMMA_SEP + + LocationModel.COLUMN_COMMENT + TEXT_TYPE + COMMA_SEP + LocationModel.COLUMN_CONTEXT_ID + TEXT_TYPE + NOT_NULL + COMMA_SEP + "FOREIGN KEY(" + LocationModel.COLUMN_CONTEXT_ID + ") REFERENCES " + ContextModel.TABLE_NAME + "(" + ContextModel._ID + ") ON DELETE CASCADE" + COMMA_SEP + @@ -111,6 +113,7 @@ VesselModel.COLUMN_NAME + TEXT_TYPE + COMMA_SEP + VesselModel.COLUMN_LANDING_DATE + BIGINT_TYPE + COMMA_SEP + VesselModel.COLUMN_LANDING_LOCATION + TEXT_TYPE + COMMA_SEP + + VesselModel.COLUMN_COMMENT + TEXT_TYPE + COMMA_SEP + VesselModel.COLUMN_LOCATION_ID + TEXT_TYPE + NOT_NULL + COMMA_SEP + "FOREIGN KEY(" + VesselModel.COLUMN_LOCATION_ID + ") REFERENCES " + LocationModel.TABLE_NAME + "(" + LocationModel._ID + ") ON DELETE CASCADE" + COMMA_SEP + @@ -128,6 +131,7 @@ MetierModel.COLUMN_GEAR_SPECIES + TEXT_TYPE + COMMA_SEP + MetierModel.COLUMN_ZONE + TEXT_TYPE + COMMA_SEP + MetierModel.COLUMN_SAMPLE_ROW_CODE + TEXT_TYPE + COMMA_SEP + + MetierModel.COLUMN_COMMENT + TEXT_TYPE + COMMA_SEP + MetierModel.COLUMN_VESSEL_ID + TEXT_TYPE + NOT_NULL + COMMA_SEP + "FOREIGN KEY(" + MetierModel.COLUMN_VESSEL_ID + ") REFERENCES " + VesselModel.TABLE_NAME + "(" + VesselModel._ID + ") ON DELETE CASCADE" + COMMA_SEP + @@ -149,6 +153,7 @@ CommercialSpeciesModel.COLUMN_SORT_CATEGORY + TEXT_TYPE + COMMA_SEP + CommercialSpeciesModel.COLUMN_STATE + TEXT_TYPE + COMMA_SEP + CommercialSpeciesModel.COLUMN_PRESENTATION + TEXT_TYPE + COMMA_SEP + + CommercialSpeciesModel.COLUMN_COMMENT + TEXT_TYPE + COMMA_SEP + CommercialSpeciesModel.COLUMN_METIER_ID + TEXT_TYPE + NOT_NULL + COMMA_SEP + "FOREIGN KEY(" + CommercialSpeciesModel.COLUMN_METIER_ID + ") REFERENCES " + MetierModel.TABLE_NAME + "(" + MetierModel._ID + ") ON DELETE CASCADE" + COMMA_SEP + @@ -171,6 +176,7 @@ ScientificSpeciesModel._ID + TEXT_TYPE + " PRIMARY KEY" + COMMA_SEP + ScientificSpeciesModel.COLUMN_NAME + TEXT_TYPE + COMMA_SEP + ScientificSpeciesModel.COLUMN_TAKING_ACTIVATION + BYTE_TYPE + COMMA_SEP + + ScientificSpeciesModel.COLUMN_COMMENT + TEXT_TYPE + COMMA_SEP + ScientificSpeciesModel.COLUMN_COMMERCIAL_SPECIES_ID + TEXT_TYPE + NOT_NULL + COMMA_SEP + "FOREIGN KEY(" + ScientificSpeciesModel.COLUMN_COMMERCIAL_SPECIES_ID + ") REFERENCES " + CommercialSpeciesModel.TABLE_NAME + "(" + CommercialSpeciesModel._ID + ") ON DELETE CASCADE" + COMMA_SEP +

1 0

r35 - in trunk/src/fr/ifremer/wlo: . measurement models models/referentials utils
by kmorin＠users.forge.codelutin.com 28 Jan '14

28 Jan '14

Author: kmorin Date: 2014-01-28 18:58:49 +0100 (Tue, 28 Jan 2014) New Revision: 35 Url: http://forge.codelutin.com/projects/wlo/repository/revisions/35 Log: fixes #4238 NAVIRE : proposer la recherche par l'immatriculation ou nom bref combiner les deux champs Modified: trunk/src/fr/ifremer/wlo/VesselFormActivity.java trunk/src/fr/ifremer/wlo/WloModelEditionActivity.java trunk/src/fr/ifremer/wlo/measurement/MeasurementActivity.java trunk/src/fr/ifremer/wlo/models/VesselModel.java trunk/src/fr/ifremer/wlo/models/referentials/Vessel.java trunk/src/fr/ifremer/wlo/utils/BaseTextWatcher.java Modified: trunk/src/fr/ifremer/wlo/VesselFormActivity.java =================================================================== --- trunk/src/fr/ifremer/wlo/VesselFormActivity.java 2014-01-28 16:18:29 UTC (rev 34) +++ trunk/src/fr/ifremer/wlo/VesselFormActivity.java 2014-01-28 17:58:49 UTC (rev 35) @@ -84,9 +84,7 @@ // init editors Collection<Vessel> vessels = DataCache.getAllVessels(this); - List<String> vesselCodes = Lists.newArrayList(Collections2.transform(vessels, HasCode.GET_CODE_FUNCTION)); - final Map<String, Vessel> vesselsByCode = Maps.uniqueIndex(vessels, HasCode.GET_CODE_FUNCTION); - initAutoCompleteTextView(R.id.vessel_form_registration_number, VesselModel.COLUMN_REGISTRATION_NUMBER, vesselCodes); + initAutoCompleteTextView(R.id.vessel_form_registration_number, VesselModel.COLUMN_REGISTRATION_NUMBER, vessels); initEditText(R.id.vessel_form_name, VesselModel.COLUMN_NAME); @@ -100,21 +98,6 @@ String dateFormat = UIUtils.getDateFormat(this); landingDateEditor.setText(String.format(dateFormat, landingDate.getTime())); } - - model.addPropertyChangeListener(VesselModel.COLUMN_REGISTRATION_NUMBER, new PropertyChangeListener() { - @Override - public void propertyChange(PropertyChangeEvent event) { - Log.d(TAG, "registration number changed ! " + event.getNewValue()); - VesselModel vesselModel = (VesselModel) event.getSource(); - Log.d(TAG, "name " + vesselModel.getName()); - if (StringUtils.isEmpty(vesselModel.getName())) { - String newCode = (String) event.getNewValue(); - Vessel vessel = vesselsByCode.get(newCode); - vesselModel.setName(vessel != null ? vessel.getName() : getString(R.string.undefined)); - } - } - }); - } /* Method called by the view */ Modified: trunk/src/fr/ifremer/wlo/WloModelEditionActivity.java =================================================================== --- trunk/src/fr/ifremer/wlo/WloModelEditionActivity.java 2014-01-28 16:18:29 UTC (rev 34) +++ trunk/src/fr/ifremer/wlo/WloModelEditionActivity.java 2014-01-28 17:58:49 UTC (rev 35) @@ -28,6 +28,7 @@ import android.content.DialogInterface; import android.content.Intent; import android.os.Bundle; +import android.text.Editable; import android.util.Log; import android.view.Menu; import android.view.MenuInflater; @@ -234,20 +235,16 @@ } catch (IllegalAccessException | InvocationTargetException | NoSuchMethodException e) { Log.e(TAG, "Error on set" + firtsLetterUpperCaseAttribute + " for class " + clazz, e); } - editText.setError(null); } - }); - model.addPropertyChangeListener(attribute, new PropertyChangeListener() { @Override - public void propertyChange(PropertyChangeEvent event) { - Object newValue = event.getNewValue(); - if (!editText.isFocused()) { - editText.setText(newValue != null ? newValue.toString() : getString(R.string.undefined)); - editText.setError(null); - } + public void afterTextChanged(Editable s) { + editText.setError(null); + editText.setSelection(s.length()); } }); + + addModelPropertyChangeListener(editText, attribute, true); } protected <R> AutoCompleteTextView initAutoCompleteTextView(int autoCompleteTextViewId, final String attribute, Collection<R> data) { @@ -272,8 +269,11 @@ try { R value = (R) clazz.getMethod("get" + firtsLetterUpperCaseAttribute).invoke(model); if (value != null) { - autoCompleteTextView.setText(value.toString()); + String text = value.toString(); + autoCompleteTextView.setText(text); + autoCompleteTextView.setSelection(text.length()); autoCompleteTextView.setError(null); + autoCompleteTextView.dismissDropDown(); } } catch (IllegalAccessException | InvocationTargetException | NoSuchMethodException e) { @@ -284,6 +284,7 @@ @Override public void onItemClick(AdapterView<?> parent, View view, int position, long id) { R selectedData = (R) parent.getItemAtPosition(position); + Log.d(TAG, "selectedData.getClass() " + selectedData.getClass()); try { clazz.getMethod("set" + firtsLetterUpperCaseAttribute, selectedData.getClass()).invoke(model, selectedData); @@ -293,8 +294,23 @@ } }); + addModelPropertyChangeListener(autoCompleteTextView, attribute, false); } + protected void addModelPropertyChangeListener(final EditText editText, String property, final boolean checkFocus) { + model.addPropertyChangeListener(property, new PropertyChangeListener() { + @Override + public void propertyChange(PropertyChangeEvent event) { + if (!checkFocus || !editText.isFocused()) { + Object newValue = event.getNewValue(); + String text = newValue != null ? newValue.toString() : getString(fr.ifremer.wlo.R.string.undefined); + editText.setText(text); + editText.setSelection(text.length()); + } + } + }); + } + protected void openNewModelEdition() { Intent intent = new Intent(WloModelEditionActivity.this, WloModelEditionActivity.this.getClass()); if (HierarchicalModel.class.isAssignableFrom(model.getClass())) { Modified: trunk/src/fr/ifremer/wlo/measurement/MeasurementActivity.java =================================================================== --- trunk/src/fr/ifremer/wlo/measurement/MeasurementActivity.java 2014-01-28 16:18:29 UTC (rev 34) +++ trunk/src/fr/ifremer/wlo/measurement/MeasurementActivity.java 2014-01-28 17:58:49 UTC (rev 35) @@ -3,8 +3,8 @@ /* * #%L * WLO - * $Id:$ - * $HeadURL:$ + * $Id$ + * $HeadURL$ * %% * Copyright (C) 2013 - 2014 Ifremer * %% @@ -31,6 +31,7 @@ import android.os.Bundle; import android.support.v4.app.ActionBarDrawerToggle; import android.support.v4.widget.DrawerLayout; +import android.text.Editable; import android.text.InputType; import android.util.Log; import android.view.LayoutInflater; @@ -180,11 +181,6 @@ sizeText.setRawInputType(inputType); sizeText.addTextChangedListener(new BaseTextWatcher() { @Override - public void beforeTextChanged(CharSequence s, int start, int count, int after) { - Log.d(TAG, "beforetextchnage " + s); - } - - @Override public void onTextChanged(CharSequence s, int start, int before, int count) { Mensuration.Precision precision = measurements.getPrecision(); int multiplier = precision.getUnitDivider(); @@ -200,6 +196,11 @@ measurement.setSize(null); } } + + @Override + public void afterTextChanged(Editable s) { + sizeText.setSelection(s.length()); + } }); Spinner genderSpinner = (Spinner) findViewById(R.id.gender_spinner); Modified: trunk/src/fr/ifremer/wlo/models/VesselModel.java =================================================================== --- trunk/src/fr/ifremer/wlo/models/VesselModel.java 2014-01-28 16:18:29 UTC (rev 34) +++ trunk/src/fr/ifremer/wlo/models/VesselModel.java 2014-01-28 17:58:49 UTC (rev 35) @@ -30,8 +30,10 @@ import android.util.Log; import com.google.common.collect.Sets; import fr.ifremer.wlo.models.referentials.Location; +import fr.ifremer.wlo.models.referentials.Vessel; import fr.ifremer.wlo.storage.DataCache; import fr.ifremer.wlo.utils.UIUtils; +import org.apache.commons.lang3.StringUtils; import java.util.Calendar; import java.util.Set; @@ -81,16 +83,28 @@ } public void setRegistrationNumber(String registrationNumber) { + Log.d(TAG, "setRegistrationNumber string " + registrationNumber); Object oldValue = this.registrationNumber; this.registrationNumber = registrationNumber; firePropertyChange(COLUMN_REGISTRATION_NUMBER, oldValue, registrationNumber); } + public void setRegistrationNumber(Vessel vessel) { + Log.d(TAG, "setRegistrationNumber vessel " + vessel.getCode()); + if (vessel != null) { + setRegistrationNumber(vessel.getCode()); + if (StringUtils.isEmpty(name)) { + setName(vessel.getName()); + } + } + } + public String getName() { return name; } public void setName(String name) { + Log.d(TAG, "setName " + name); Object oldValue = this.name; this.name = name; firePropertyChange(COLUMN_NAME, oldValue, name); Modified: trunk/src/fr/ifremer/wlo/models/referentials/Vessel.java =================================================================== --- trunk/src/fr/ifremer/wlo/models/referentials/Vessel.java 2014-01-28 16:18:29 UTC (rev 34) +++ trunk/src/fr/ifremer/wlo/models/referentials/Vessel.java 2014-01-28 17:58:49 UTC (rev 35) @@ -25,6 +25,7 @@ */ import android.content.ContentValues; +import android.content.Context; import android.database.Cursor; import fr.ifremer.wlo.models.BaseModel; import fr.ifremer.wlo.utils.UIUtils; @@ -92,7 +93,12 @@ } @Override - public String toString(android.content.Context context) { + public String toString() { + return code + " - " + name; + } + + @Override + public String toString(Context context) { return UIUtils.getStringOrUndefined(code, context) + " - " + UIUtils.getStringOrUndefined(name, context); } Modified: trunk/src/fr/ifremer/wlo/utils/BaseTextWatcher.java =================================================================== --- trunk/src/fr/ifremer/wlo/utils/BaseTextWatcher.java 2014-01-28 16:18:29 UTC (rev 34) +++ trunk/src/fr/ifremer/wlo/utils/BaseTextWatcher.java 2014-01-28 17:58:49 UTC (rev 35) @@ -43,5 +43,6 @@ @Override public void afterTextChanged(Editable s) { + } }

1 0

r34 - in trunk: res/values res/values-fr src/fr/ifremer/wlo src/fr/ifremer/wlo/measurement src/fr/ifremer/wlo/storage
by kmorin＠users.forge.codelutin.com 28 Jan '14

28 Jan '14

Author: kmorin Date: 2014-01-28 17:18:29 +0100 (Tue, 28 Jan 2014) New Revision: 34 Url: http://forge.codelutin.com/projects/wlo/repository/revisions/34 Log: fixes #4251 Pouvoir supprimer une ?\195?\169tape et ses fils de fait Modified: trunk/res/values-fr/strings.xml trunk/res/values/strings.xml trunk/src/fr/ifremer/wlo/WloBaseListActivity.java trunk/src/fr/ifremer/wlo/measurement/LogsFragment.java trunk/src/fr/ifremer/wlo/storage/WloSqlOpenHelper.java Modified: trunk/res/values/strings.xml =================================================================== --- trunk/res/values/strings.xml 2014-01-28 15:00:21 UTC (rev 33) +++ trunk/res/values/strings.xml 2014-01-28 16:18:29 UTC (rev 34) @@ -22,6 +22,8 @@ <string name="no">No</string> <string name="required_field_error_message">Required field</string> <string name="one_required_field_error_message">At least one these fields is required</string> + <string name="delete">Delete</string> + <string name="edit">Edit</string>  <string name="bigfin_no_ichtyometer_connected_title">No ichtyometer connected</string> @@ -52,9 +54,10 @@ <string name="measurement_graph_title">Observations</string> - <string name="delete">Delete</string> - <string name="deletion_confirmation_title">Delete an input</string> - <string name="deletion_confirmation_message">Êtes vous sûr de vouloir\nsupprimer la saisie\n%s ?</string> + <string name="deletion">Delete</string> + <string name="input_deletion_confirmation_title">Delete an input</string> + <string name="input_deletion_confirmation_message">Are you sure you want\nto delete the input\n%s ?</string> + <string name="item_deletion_confirmation_message">Are you sure you want\nto delete the item\n%s ?</string> <string name="fulltime_format">%1$tH:%1$tM:%1$tS</string> <string name="time_format">%1$tH:%1$tM</string> Modified: trunk/res/values-fr/strings.xml =================================================================== --- trunk/res/values-fr/strings.xml 2014-01-28 15:00:21 UTC (rev 33) +++ trunk/res/values-fr/strings.xml 2014-01-28 16:18:29 UTC (rev 34) @@ -22,6 +22,8 @@ <string name="no">Non</string> <string name="required_field_error_message">Champs obligatoire</string> <string name="one_required_field_error_message">Au moins un de ces champs doit être saisi</string> + <string name="delete">Supprimer</string> + <string name="edit">Éditer</string>  <string name="bigfin_no_ichtyometer_connected_title">Aucun ichtyomètre connecté</string> @@ -51,9 +53,10 @@ <string name="measurement_graph_title">Observations</string> - <string name="delete">Suppression</string> - <string name="deletion_confirmation_title">Supprimer une mesure</string> - <string name="deletion_confirmation_message">Êtes vous sûr de vouloir\nsupprimer la saisie\n%s ?</string> + <string name="deletion">Suppression</string> + <string name="input_deletion_confirmation_title">Supprimer une mesure</string> + <string name="input_deletion_confirmation_message">Êtes vous sûr de vouloir\nsupprimer la saisie\n%s ?</string> + <string name="item_deletion_confirmation_message">Êtes vous sûr de vouloir\nsupprimer l\'élément\n%s ?</string> <string name="undefined">Non défini</string> Modified: trunk/src/fr/ifremer/wlo/WloBaseListActivity.java =================================================================== --- trunk/src/fr/ifremer/wlo/WloBaseListActivity.java 2014-01-28 15:00:21 UTC (rev 33) +++ trunk/src/fr/ifremer/wlo/WloBaseListActivity.java 2014-01-28 16:18:29 UTC (rev 34) @@ -39,12 +39,15 @@ * #L% */ +import android.app.AlertDialog; +import android.content.DialogInterface; import android.content.Intent; import android.database.Cursor; import android.os.Bundle; import android.os.Handler; import android.support.v4.widget.SimpleCursorAdapter; import android.util.Log; +import android.view.ContextMenu; import android.view.Menu; import android.view.MenuInflater; import android.view.MenuItem; @@ -55,6 +58,7 @@ import fr.ifremer.wlo.models.BaseModel; import fr.ifremer.wlo.models.HierarchicalModel; import fr.ifremer.wlo.storage.WloSqlOpenHelper; +import fr.ifremer.wlo.utils.UIUtils; import fr.ifremer.wlo.utils.WloItemListViewBinder; /** @@ -209,7 +213,7 @@ * @author kmorin <kmorin(a)codelutin.com> * @since 0.1 */ -public abstract class WloBaseListActivity<M extends BaseModel> extends WloBaseActivity implements AdapterView.OnItemLongClickListener { +public abstract class WloBaseListActivity<M extends BaseModel> extends WloBaseActivity { private static final String TAG = "WloBaseListActivity"; @@ -276,7 +280,7 @@ adapter.setViewBinder(getAdapterBinder()); setListAdapter(adapter); - getListView().setOnItemLongClickListener(this); + registerForContextMenu(mList); } @Override @@ -354,13 +358,49 @@ } @Override - public boolean onItemLongClick(AdapterView<?> parent, View view, int position, long id) { - M model = createNewModel(parent, position); + public void onCreateContextMenu(ContextMenu menu, View v, + ContextMenu.ContextMenuInfo menuInfo) { + if (mList.equals(v)) { + int[] menuItems = new int[]{R.string.edit, R.string.delete}; + for (int i = 0; i<menuItems.length; i++) { + menu.add(Menu.NONE, i, i, menuItems[i]); + } + } + } - Log.d(TAG, model.toString(this) + " long clicked"); - Intent intent = new Intent(this, getEditionActivity()); - intent.putExtra(WloModelEditionActivity.INTENT_EXTRA_MODEL, model); - startActivity(intent); + @Override + public boolean onContextItemSelected(MenuItem item) { + AdapterView.AdapterContextMenuInfo info = + (AdapterView.AdapterContextMenuInfo) item.getMenuInfo(); + + AdapterView<?> parent = (AdapterView<?>) info.targetView.getParent(); + final M model = createNewModel(parent, info.position); + + switch (item.getItemId()) { + case 0: + Intent intent = new Intent(this, getEditionActivity()); + intent.putExtra(WloModelEditionActivity.INTENT_EXTRA_MODEL, model); + startActivity(intent); + break; + + case 1: + new AlertDialog.Builder(this).setTitle(R.string.deletion) + .setMessage(getString(R.string.item_deletion_confirmation_message, model.toString(this))) + .setPositiveButton(R.string.delete, new DialogInterface.OnClickListener() { + public void onClick(DialogInterface dialog, int which) { + WloSqlOpenHelper soh = new WloSqlOpenHelper(WloBaseListActivity.this); + soh.deleteData(model); + soh.close(); + Cursor cursor = getAllData(); + adapter.swapCursor(cursor); + } + }) + .setNegativeButton(android.R.string.cancel, UIUtils.getCancelClickListener()) + .create() + .show(); + + break; + } return true; } Modified: trunk/src/fr/ifremer/wlo/measurement/LogsFragment.java =================================================================== --- trunk/src/fr/ifremer/wlo/measurement/LogsFragment.java 2014-01-28 15:00:21 UTC (rev 33) +++ trunk/src/fr/ifremer/wlo/measurement/LogsFragment.java 2014-01-28 16:18:29 UTC (rev 34) @@ -3,8 +3,8 @@ /* * #%L * WLO - * $Id:$ - * $HeadURL:$ + * $Id$ + * $HeadURL$ * %% * Copyright (C) 2013 - 2014 Ifremer * %% @@ -36,7 +36,6 @@ import android.widget.ArrayAdapter; import android.widget.ListView; import com.google.common.base.Function; -import com.google.common.base.Preconditions; import com.google.common.collect.Lists; import fr.ifremer.wlo.R; import fr.ifremer.wlo.models.MeasurementModel; @@ -48,7 +47,6 @@ import org.apache.commons.lang3.StringUtils; import java.util.Comparator; -import java.util.Date; import java.util.List; /** @@ -102,7 +100,7 @@ }); dialogBuilder = new AlertDialog.Builder(activity) - .setTitle(R.string.deletion_confirmation_title) + .setTitle(R.string.input_deletion_confirmation_title) .setNegativeButton(android.R.string.cancel, UIUtils.getCancelClickListener()); // Find and set up the ListView for paired devices @@ -113,7 +111,7 @@ public boolean onItemLongClick(AdapterView<?> parent, View view, int position, long id) { final MeasurementModel measurement = (MeasurementModel) parent.getItemAtPosition(position); - dialogBuilder.setMessage(getString(R.string.deletion_confirmation_message, + dialogBuilder.setMessage(getString(R.string.input_deletion_confirmation_message, measurement.toString(getActivity(), measurements.getPrecision()))) .setPositiveButton(R.string.delete, new DialogInterface.OnClickListener() { public void onClick(DialogInterface dialog, int which) { Modified: trunk/src/fr/ifremer/wlo/storage/WloSqlOpenHelper.java =================================================================== --- trunk/src/fr/ifremer/wlo/storage/WloSqlOpenHelper.java 2014-01-28 15:00:21 UTC (rev 33) +++ trunk/src/fr/ifremer/wlo/storage/WloSqlOpenHelper.java 2014-01-28 16:18:29 UTC (rev 34) @@ -66,7 +66,7 @@ private static final String TAG = "WloOpenHelper"; public static final String DATABASE_NAME = "wlo.db"; - public static final int DATABASE_VERSION = 10; + public static final int DATABASE_VERSION = 13; public static final String TEXT_TYPE = " TEXT"; public static final String BIGINT_TYPE = " BIGINT"; @@ -95,7 +95,7 @@ LocationModel.COLUMN_LOCATION + TEXT_TYPE + NOT_NULL + COMMA_SEP + LocationModel.COLUMN_CONTEXT_ID + TEXT_TYPE + NOT_NULL + COMMA_SEP + "FOREIGN KEY(" + LocationModel.COLUMN_CONTEXT_ID + ") REFERENCES " + - ContextModel.TABLE_NAME + "(" + ContextModel._ID + ")" + COMMA_SEP + + ContextModel.TABLE_NAME + "(" + ContextModel._ID + ") ON DELETE CASCADE" + COMMA_SEP + "FOREIGN KEY(" + LocationModel.COLUMN_LOCATION + ") REFERENCES " + Location.TABLE_NAME + "(" + Location._ID + ")" + " )"; @@ -113,7 +113,7 @@ VesselModel.COLUMN_LANDING_LOCATION + TEXT_TYPE + COMMA_SEP + VesselModel.COLUMN_LOCATION_ID + TEXT_TYPE + NOT_NULL + COMMA_SEP + "FOREIGN KEY(" + VesselModel.COLUMN_LOCATION_ID + ") REFERENCES " + - LocationModel.TABLE_NAME + "(" + LocationModel._ID + ")" + COMMA_SEP + + LocationModel.TABLE_NAME + "(" + LocationModel._ID + ") ON DELETE CASCADE" + COMMA_SEP + "FOREIGN KEY(" + VesselModel.COLUMN_LANDING_LOCATION + ") REFERENCES " + Location.TABLE_NAME + "(" + Location._ID + ")" + " )"; @@ -130,7 +130,7 @@ MetierModel.COLUMN_SAMPLE_ROW_CODE + TEXT_TYPE + COMMA_SEP + MetierModel.COLUMN_VESSEL_ID + TEXT_TYPE + NOT_NULL + COMMA_SEP + "FOREIGN KEY(" + MetierModel.COLUMN_VESSEL_ID + ") REFERENCES " + - VesselModel.TABLE_NAME + "(" + VesselModel._ID + ")" + COMMA_SEP + + VesselModel.TABLE_NAME + "(" + VesselModel._ID + ") ON DELETE CASCADE" + COMMA_SEP + "FOREIGN KEY(" + MetierModel.COLUMN_GEAR_SPECIES + ") REFERENCES " + Metier.TABLE_NAME + "(" + Metier._ID + ")" + " )"; @@ -151,7 +151,7 @@ CommercialSpeciesModel.COLUMN_PRESENTATION + TEXT_TYPE + COMMA_SEP + CommercialSpeciesModel.COLUMN_METIER_ID + TEXT_TYPE + NOT_NULL + COMMA_SEP + "FOREIGN KEY(" + CommercialSpeciesModel.COLUMN_METIER_ID + ") REFERENCES " + - MetierModel.TABLE_NAME + "(" + MetierModel._ID + ")" + COMMA_SEP + + MetierModel.TABLE_NAME + "(" + MetierModel._ID + ") ON DELETE CASCADE" + COMMA_SEP + "FOREIGN KEY(" + CommercialSpeciesModel.COLUMN_FAO_CODE + ") REFERENCES " + CommercialSpecies.TABLE_NAME + "(" + CommercialSpecies._ID + ")" + COMMA_SEP + "FOREIGN KEY(" + CommercialSpeciesModel.COLUMN_MEASUREMENT_METHOD + ") REFERENCES " + @@ -173,7 +173,7 @@ ScientificSpeciesModel.COLUMN_TAKING_ACTIVATION + BYTE_TYPE + COMMA_SEP + ScientificSpeciesModel.COLUMN_COMMERCIAL_SPECIES_ID + TEXT_TYPE + NOT_NULL + COMMA_SEP + "FOREIGN KEY(" + ScientificSpeciesModel.COLUMN_COMMERCIAL_SPECIES_ID + ") REFERENCES " + - CommercialSpeciesModel.TABLE_NAME + "(" + CommercialSpeciesModel._ID + ")" + COMMA_SEP + + CommercialSpeciesModel.TABLE_NAME + "(" + CommercialSpeciesModel._ID + ") ON DELETE CASCADE" + COMMA_SEP + "FOREIGN KEY(" + ScientificSpeciesModel.COLUMN_NAME + ") REFERENCES " + ScientificSpecies.TABLE_NAME + "(" + ScientificSpecies._ID + ")" + " )"; @@ -192,7 +192,7 @@ MeasurementModel.COLUMN_CATEGORY_3 + TEXT_TYPE + COMMA_SEP + MeasurementModel.COLUMN_SCIENTIFIC_SPECIES_ID + TEXT_TYPE + NOT_NULL + COMMA_SEP + "FOREIGN KEY(" + MeasurementModel.COLUMN_SCIENTIFIC_SPECIES_ID + ") REFERENCES " + - ScientificSpeciesModel.TABLE_NAME + "(" + ScientificSpeciesModel._ID + ")" + + ScientificSpeciesModel.TABLE_NAME + "(" + ScientificSpeciesModel._ID + ") ON DELETE CASCADE" + " )"; protected static final String SQL_DELETE_MEASUREMENTS = @@ -399,6 +399,15 @@ } @Override + public void onOpen(SQLiteDatabase db) { + super.onOpen(db); + if (!db.isReadOnly()) { + // Enable foreign key constraints + db.execSQL("PRAGMA foreign_keys=ON;"); + } + } + + @Override public synchronized void close() { super.close(); getReadableDatabase().close(); @@ -619,6 +628,15 @@ db.endTransaction(); } + public <M extends BaseModel> void deleteData(M model) { + Preconditions.checkNotNull(model); + if (model.isNew()) { + return; + } + SQLiteDatabase db = getWritableDatabase(); + db.delete(model.getTableName(), BaseModel._ID + " = ?", new String[]{ model.getId() }); + } + public static <E> List<E> transformCursorIntoCollection(Cursor cursor, Function<Cursor, E> function) {

1 0

r33 - in trunk: . src/fr/ifremer/wlo src/fr/ifremer/wlo/models src/fr/ifremer/wlo/storage src/fr/ifremer/wlo/utils
by kmorin＠users.forge.codelutin.com 28 Jan '14

28 Jan '14

Author: kmorin Date: 2014-01-28 16:00:21 +0100 (Tue, 28 Jan 2014) New Revision: 33 Url: http://forge.codelutin.com/projects/wlo/repository/revisions/33 Log: fixes #4242 ajout esp?\195?\168ce commerciale : ne pas demander l'enregistrement fixes #4239 ?\195?\160 l'arriv?\195?\169e sur un nouvel ?\195?\169cran ne pas ?\195?\169tendre les listes d?\195?\169roulante du champ s?\195?\169lectionn?\195?\169 car cela cache les autres champs refs #4083 Principe d'ergonomie Modified: trunk/pom.xml trunk/src/fr/ifremer/wlo/WloModelEditionActivity.java trunk/src/fr/ifremer/wlo/models/BaseModel.java trunk/src/fr/ifremer/wlo/models/CommercialSpeciesModel.java trunk/src/fr/ifremer/wlo/models/ContextModel.java trunk/src/fr/ifremer/wlo/models/LocationModel.java trunk/src/fr/ifremer/wlo/models/MeasurementModel.java trunk/src/fr/ifremer/wlo/models/MetierModel.java trunk/src/fr/ifremer/wlo/models/ScientificSpeciesModel.java trunk/src/fr/ifremer/wlo/models/VesselModel.java trunk/src/fr/ifremer/wlo/storage/WloSqlOpenHelper.java trunk/src/fr/ifremer/wlo/utils/WloAutoCompleteTextView.java Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2014-01-28 13:32:42 UTC (rev 32) +++ trunk/pom.xml 2014-01-28 15:00:21 UTC (rev 33) @@ -251,7 +251,7 @@ </executions> <configuration> <sdk> - <path>${env.ANDROID_HOME}</path> +  <platform>15</platform> </sdk>  Modified: trunk/src/fr/ifremer/wlo/WloModelEditionActivity.java =================================================================== --- trunk/src/fr/ifremer/wlo/WloModelEditionActivity.java 2014-01-28 13:32:42 UTC (rev 32) +++ trunk/src/fr/ifremer/wlo/WloModelEditionActivity.java 2014-01-28 15:00:21 UTC (rev 33) @@ -33,6 +33,7 @@ import android.view.MenuInflater; import android.view.MenuItem; import android.view.View; +import android.view.WindowManager; import android.widget.AdapterView; import android.widget.ArrayAdapter; import android.widget.AutoCompleteTextView; @@ -88,6 +89,15 @@ } else { setTitle(model.toString(this)); } + model.addPropertyChangeListener(new PropertyChangeListener() { + @Override + public void propertyChange(PropertyChangeEvent event) { + Log.d(TAG, "modified !"); + model.setModified(true); + } + }); + getWindow().setSoftInputMode( + WindowManager.LayoutParams.SOFT_INPUT_STATE_ALWAYS_HIDDEN); } @Override @@ -111,34 +121,33 @@ public boolean onOptionsItemSelected(MenuItem item) { switch (item.getItemId()) { case R.id.new_item: - AlertDialog.Builder builder = new AlertDialog.Builder(this); - DialogInterface.OnClickListener listener = new DialogInterface.OnClickListener() { - @Override - public void onClick(DialogInterface dialog, int which) { - if (which == AlertDialog.BUTTON_POSITIVE) { - saveModel(); + if (model.isModified()) { + AlertDialog.Builder builder = new AlertDialog.Builder(this); + DialogInterface.OnClickListener listener = new DialogInterface.OnClickListener() { + @Override + public void onClick(DialogInterface dialog, int which) { + if (which == AlertDialog.BUTTON_POSITIVE) { + saveModel(); + } + openNewModelEdition(); + } - Intent intent = new Intent(WloModelEditionActivity.this, WloModelEditionActivity.this.getClass()); - if (HierarchicalModel.class.isAssignableFrom(model.getClass())) { - HierarchicalModel hModel = (HierarchicalModel) model; - BaseModel parentModel = hModel.getParent(); - intent.putExtra(WloModelEditionActivity.INTENT_EXTRA_PARENT_MODEL, parentModel); - } - startActivity(intent); - } - }; - builder.setMessage(R.string.exit_form_confirmation) - .setNegativeButton(android.R.string.cancel, UIUtils.getCancelClickListener()) - .setNeutralButton(R.string.no, listener) - .setPositiveButton(R.string.yes, listener) - .create() - .show(); + }; + builder.setMessage(R.string.exit_form_confirmation) + .setNegativeButton(android.R.string.cancel, UIUtils.getCancelClickListener()) + .setNeutralButton(R.string.no, listener) + .setPositiveButton(R.string.yes, listener) + .create() + .show(); + + } else { + openNewModelEdition(); + } return true; } return super.onOptionsItemSelected(item); } - /* Method called by the view */ public void validate(View view) { @@ -252,8 +261,10 @@ final String firtsLetterUpperCaseAttribute = attribute.substring(0, 1).toUpperCase() + attribute.substring(1); - ArrayAdapter<R> adapter = new ArrayAdapter(this, android.R.layout.simple_dropdown_item_1line, Lists.newArrayList(data)); - autoCompleteTextView.setAdapter(adapter); + if (!data.isEmpty()) { + ArrayAdapter<R> adapter = new ArrayAdapter(this, android.R.layout.simple_dropdown_item_1line, Lists.newArrayList(data)); + autoCompleteTextView.setAdapter(adapter); + } autoCompleteTextView.setThreshold(0); autoCompleteTextView.setTag(attribute); @@ -283,4 +294,14 @@ }); } + + protected void openNewModelEdition() { + Intent intent = new Intent(WloModelEditionActivity.this, WloModelEditionActivity.this.getClass()); + if (HierarchicalModel.class.isAssignableFrom(model.getClass())) { + HierarchicalModel hModel = (HierarchicalModel) model; + BaseModel parentModel = hModel.getParent(); + intent.putExtra(WloModelEditionActivity.INTENT_EXTRA_PARENT_MODEL, parentModel); + } + startActivity(intent); + } } Modified: trunk/src/fr/ifremer/wlo/models/BaseModel.java =================================================================== --- trunk/src/fr/ifremer/wlo/models/BaseModel.java 2014-01-28 13:32:42 UTC (rev 32) +++ trunk/src/fr/ifremer/wlo/models/BaseModel.java 2014-01-28 15:00:21 UTC (rev 33) @@ -33,10 +33,13 @@ import com.google.common.collect.HashMultimap; import com.google.common.collect.Multimap; import com.google.common.collect.Sets; +import org.apache.commons.lang3.ObjectUtils; +import java.beans.PropertyChangeEvent; import java.beans.PropertyChangeListener; import java.beans.PropertyChangeSupport; import java.io.Serializable; +import java.util.Objects; import java.util.Set; /** @@ -63,8 +66,11 @@ protected String id; - public BaseModel() {} + protected boolean modified; + public BaseModel() { + } + public BaseModel(Cursor cursor) { id = cursor.getString(0); } @@ -74,13 +80,23 @@ } public void setId(String id) { + String oldValue = this.id; this.id = id; + firePropertyChange(_ID, oldValue, id); } public boolean isNew() { return id == null; } + public boolean isModified() { + return modified; + } + + public void setModified(boolean modified) { + this.modified = modified; + } + public abstract String getTableName(); public String toString(android.content.Context context) { @@ -101,6 +117,12 @@ changeSupport.addPropertyChangeListener(property, listener); } + public void firePropertyChange(String property, Object oldValue, Object newValue) { + Log.d(TAG, "fire " + property + " " + oldValue + " " + newValue); + Log.d(TAG, "equals ? " + ObjectUtils.equals(oldValue, newValue)); + changeSupport.firePropertyChange(property, oldValue, newValue); + } + public Set<String> getRequiredFields() { return Sets.newHashSet(); } Modified: trunk/src/fr/ifremer/wlo/models/CommercialSpeciesModel.java =================================================================== --- trunk/src/fr/ifremer/wlo/models/CommercialSpeciesModel.java 2014-01-28 13:32:42 UTC (rev 32) +++ trunk/src/fr/ifremer/wlo/models/CommercialSpeciesModel.java 2014-01-28 15:00:21 UTC (rev 33) @@ -99,7 +99,9 @@ } public void setFaoCode(CommercialSpecies faoCode) { + CommercialSpecies oldValue = this.faoCode; this.faoCode = faoCode; + firePropertyChange(COLUMN_FAO_CODE, oldValue, faoCode); } public Mensuration getMeasurementMethod() { @@ -107,7 +109,9 @@ } public void setMeasurementMethod(Mensuration measurementMethod) { + Mensuration oldValue = this.measurementMethod; this.measurementMethod = measurementMethod; + firePropertyChange(COLUMN_MEASUREMENT_METHOD, oldValue, measurementMethod); } public Mensuration.Precision getPrecision() { @@ -115,7 +119,9 @@ } public void setPrecision(Mensuration.Precision precision) { + Mensuration.Precision oldValue = this.precision; this.precision = precision; + firePropertyChange(COLUMN_PRECISION, oldValue, precision); } public boolean isSpeciesMix() { @@ -123,7 +129,10 @@ } public void setSpeciesMix(boolean speciesMix) { + boolean oldValue = this.speciesMix; this.speciesMix = speciesMix; + Log.d(TAG, "species mix change"); + firePropertyChange(COLUMN_SPECIES_MIX, oldValue, speciesMix); } public String getSortCategory() { @@ -131,7 +140,9 @@ } public void setSortCategory(String sortCategory) { + String oldValue = this.sortCategory; this.sortCategory = sortCategory; + firePropertyChange(COLUMN_SORT_CATEGORY, oldValue, sortCategory); } public State getState() { @@ -139,7 +150,9 @@ } public void setState(State state) { + State oldValue = this.state; this.state = state; + firePropertyChange(COLUMN_STATE, oldValue, state); } public Presentation getPresentation() { @@ -147,7 +160,9 @@ } public void setPresentation(Presentation presentation) { + String oldValue = this.id; this.presentation = presentation; + firePropertyChange(_ID, oldValue, id); } @Override Modified: trunk/src/fr/ifremer/wlo/models/ContextModel.java =================================================================== --- trunk/src/fr/ifremer/wlo/models/ContextModel.java 2014-01-28 13:32:42 UTC (rev 32) +++ trunk/src/fr/ifremer/wlo/models/ContextModel.java 2014-01-28 15:00:21 UTC (rev 33) @@ -26,6 +26,7 @@ import android.content.ContentValues; import android.database.Cursor; +import android.util.Log; import com.google.common.collect.Multimap; import java.util.Set; @@ -60,7 +61,9 @@ } public void setName(String name) { + String oldValue = this.name; this.name = name; + firePropertyChange(COLUMN_NAME, oldValue, name); } @Override Modified: trunk/src/fr/ifremer/wlo/models/LocationModel.java =================================================================== --- trunk/src/fr/ifremer/wlo/models/LocationModel.java 2014-01-28 13:32:42 UTC (rev 32) +++ trunk/src/fr/ifremer/wlo/models/LocationModel.java 2014-01-28 15:00:21 UTC (rev 33) @@ -79,7 +79,9 @@ } public void setOperator(String operator) { + Object oldValue = this.operator; this.operator = operator; + firePropertyChange(COLUMN_OPERATOR, oldValue, operator); } public Calendar getStartDate() { @@ -87,7 +89,9 @@ } public void setStartDate(Calendar startDate) { + Object oldValue = this.startDate; this.startDate = startDate; + firePropertyChange(COLUMN_START_DATE, oldValue, startDate); } public Calendar getEndDate() { @@ -95,7 +99,9 @@ } public void setEndDate(Calendar endDate) { + Object oldValue = this.endDate; this.endDate = endDate; + firePropertyChange(COLUMN_END_DATE, oldValue, endDate); } public Location getLocation() { @@ -103,7 +109,9 @@ } public void setLocation(Location location) { + Object oldValue = this.location; this.location = location; + firePropertyChange(COLUMN_LOCATION, oldValue, location); } @Override Modified: trunk/src/fr/ifremer/wlo/models/MeasurementModel.java =================================================================== --- trunk/src/fr/ifremer/wlo/models/MeasurementModel.java 2014-01-28 13:32:42 UTC (rev 32) +++ trunk/src/fr/ifremer/wlo/models/MeasurementModel.java 2014-01-28 15:00:21 UTC (rev 33) @@ -3,8 +3,8 @@ /* * #%L * WLO - * $Id:$ - * $HeadURL:$ + * $Id$ + * $HeadURL$ * %% * Copyright (C) 2013 - 2014 Ifremer * %% @@ -94,7 +94,7 @@ Integer oldValue = this.size; this.size = size; Log.d(TAG, size + " " + oldValue + " " + size.equals(oldValue)); - changeSupport.firePropertyChange(COLUMN_SIZE, oldValue, size); + firePropertyChange(COLUMN_SIZE, oldValue, size); } public void incSize(int inc) { @@ -123,7 +123,9 @@ } public void setDate(Calendar date) { + Object oldValue = this.date; this.date = date; + firePropertyChange(COLUMN_DATE, oldValue, date); } public String getCategory1() { @@ -131,7 +133,9 @@ } public void setCategory1(String category1) { + Object oldValue = this.category1; this.category1 = category1; + firePropertyChange(COLUMN_CATEGORY_1, oldValue, category1); } public String getCategory2() { @@ -139,7 +143,9 @@ } public void setCategory2(String category2) { + Object oldValue = this.category2; this.category2 = category2; + firePropertyChange(COLUMN_CATEGORY_2, oldValue, category2); } public String getCategory3() { @@ -147,7 +153,9 @@ } public void setCategory3(String category3) { + Object oldValue = this.category3; this.category3 = category3; + firePropertyChange(COLUMN_CATEGORY_3, oldValue, category3); } public String toString(Context context, Mensuration.Precision precision) { Modified: trunk/src/fr/ifremer/wlo/models/MetierModel.java =================================================================== --- trunk/src/fr/ifremer/wlo/models/MetierModel.java 2014-01-28 13:32:42 UTC (rev 32) +++ trunk/src/fr/ifremer/wlo/models/MetierModel.java 2014-01-28 15:00:21 UTC (rev 33) @@ -72,7 +72,9 @@ } public void setGearSpecies(Metier gearSpecies) { + Object oldValue = this.gearSpecies; this.gearSpecies = gearSpecies; + firePropertyChange(COLUMN_GEAR_SPECIES, oldValue, gearSpecies); } public String getZone() { @@ -80,7 +82,9 @@ } public void setZone(String zone) { + Object oldValue = this.zone; this.zone = zone; + firePropertyChange(COLUMN_ZONE, oldValue, zone); } public String getSampleRowCode() { @@ -88,7 +92,9 @@ } public void setSampleRowCode(String sampleRowCode) { + Object oldValue = this.sampleRowCode; this.sampleRowCode = sampleRowCode; + firePropertyChange(COLUMN_SAMPLE_ROW_CODE, oldValue, sampleRowCode); } @Override Modified: trunk/src/fr/ifremer/wlo/models/ScientificSpeciesModel.java =================================================================== --- trunk/src/fr/ifremer/wlo/models/ScientificSpeciesModel.java 2014-01-28 13:32:42 UTC (rev 32) +++ trunk/src/fr/ifremer/wlo/models/ScientificSpeciesModel.java 2014-01-28 15:00:21 UTC (rev 33) @@ -69,7 +69,9 @@ } public void setName(ScientificSpecies name) { + Object oldValue = this.name; this.name = name; + firePropertyChange(COLUMN_NAME, oldValue, name); } public boolean isTakingActivation() { @@ -77,7 +79,9 @@ } public void setTakingActivation(boolean takingActivation) { + Object oldValue = this.takingActivation; this.takingActivation = takingActivation; + firePropertyChange(COLUMN_TAKING_ACTIVATION, oldValue, takingActivation); } @Override Modified: trunk/src/fr/ifremer/wlo/models/VesselModel.java =================================================================== --- trunk/src/fr/ifremer/wlo/models/VesselModel.java 2014-01-28 13:32:42 UTC (rev 32) +++ trunk/src/fr/ifremer/wlo/models/VesselModel.java 2014-01-28 15:00:21 UTC (rev 33) @@ -3,8 +3,8 @@ /* * #%L * WLO - * $Id:$ - * $HeadURL:$ + * $Id$ + * $HeadURL$ * %% * Copyright (C) 2013 - 2014 Ifremer * %% @@ -83,7 +83,7 @@ public void setRegistrationNumber(String registrationNumber) { Object oldValue = this.registrationNumber; this.registrationNumber = registrationNumber; - changeSupport.firePropertyChange(COLUMN_REGISTRATION_NUMBER, oldValue, registrationNumber); + firePropertyChange(COLUMN_REGISTRATION_NUMBER, oldValue, registrationNumber); } public String getName() { @@ -93,7 +93,7 @@ public void setName(String name) { Object oldValue = this.name; this.name = name; - changeSupport.firePropertyChange(COLUMN_NAME, oldValue, name); + firePropertyChange(COLUMN_NAME, oldValue, name); } public Calendar getLandingDate() { @@ -101,7 +101,9 @@ } public void setLandingDate(Calendar landingDate) { + Object oldValue = this.landingDate; this.landingDate = landingDate; + firePropertyChange(COLUMN_LANDING_DATE, oldValue, landingDate); } public Location getLandingLocation() { @@ -109,7 +111,9 @@ } public void setLandingLocation(Location landingLocation) { + Object oldValue = this.landingLocation; this.landingLocation = landingLocation; + firePropertyChange(COLUMN_LANDING_LOCATION, oldValue, landingLocation); } @Override Modified: trunk/src/fr/ifremer/wlo/storage/WloSqlOpenHelper.java =================================================================== --- trunk/src/fr/ifremer/wlo/storage/WloSqlOpenHelper.java 2014-01-28 13:32:42 UTC (rev 32) +++ trunk/src/fr/ifremer/wlo/storage/WloSqlOpenHelper.java 2014-01-28 15:00:21 UTC (rev 33) @@ -612,6 +612,7 @@ } else { db.update(tableName, values, BaseModel._ID + " = ?", new String[]{ model.getId() }); } + model.setModified(false); } db.setTransactionSuccessful(); Modified: trunk/src/fr/ifremer/wlo/utils/WloAutoCompleteTextView.java =================================================================== --- trunk/src/fr/ifremer/wlo/utils/WloAutoCompleteTextView.java 2014-01-28 13:32:42 UTC (rev 32) +++ trunk/src/fr/ifremer/wlo/utils/WloAutoCompleteTextView.java 2014-01-28 15:00:21 UTC (rev 33) @@ -53,22 +53,24 @@ } protected void init() { - setOnFocusChangeListener(new OnFocusChangeListener() { +// setOnFocusChangeListener(new OnFocusChangeListener() { +// @Override +// public void onFocusChange(View v, boolean hasFocus) { +// if (hasFocus) { +// showDropDown(); +// } else { +// dismissDropDown(); +// } +// } +// }); + setOnClickListener(new OnClickListener() { @Override - public void onFocusChange(View v, boolean hasFocus) { - if (hasFocus) { + public void onClick(View v) { + if (getAdapter() != null && !getAdapter().isEmpty()) { showDropDown(); - } else { - dismissDropDown(); } } }); - setOnClickListener(new OnClickListener() { - @Override - public void onClick(View v) { - showDropDown(); - } - }); } @Override

1 0

Build failed in Jenkins: wlo #1
by admin+ci-forge.codelutin.com＠codelutin.com 28 Jan '14

28 Jan '14

See <http://ci-ng.forge.codelutin.com/jenkins/job/wlo/1/> ------------------------------------------ [...truncated 597 lines...] [INFO] Downloading: http://repo.maven.apache.org/maven2/javax/enterprise/cdi-api/1.0/cdi-api-1.… [INFO] Downloaded: http://repo.maven.apache.org/maven2/org/bouncycastle/bcprov-jdk15on/1.48/bc… (2264 KB at 20033.9 KB/sec) [INFO] Downloading: http://repo.maven.apache.org/maven2/javax/annotation/jsr250-api/1.0/jsr250-… [INFO] Downloaded: http://repo.maven.apache.org/maven2/org/ow2/asm/asm-analysis/4.0/asm-analys… (20 KB at 766.2 KB/sec) [INFO] Downloading: http://repo.maven.apache.org/maven2/javax/inject/javax.inject/1/javax.injec… [INFO] Downloaded: http://repo.maven.apache.org/maven2/javax/enterprise/cdi-api/1.0/cdi-api-1.… (44 KB at 1686.7 KB/sec) [INFO] Downloading: http://repo.maven.apache.org/maven2/org/eclipse/sisu/org.eclipse.sisu.injec… [INFO] Downloaded: http://repo.maven.apache.org/maven2/com/android/tools/external/lombok/lombo… (1036 KB at 15009.0 KB/sec) [INFO] Downloading: http://repo.maven.apache.org/maven2/org/codehaus/plexus/plexus-interpolatio… [INFO] Downloaded: http://repo.maven.apache.org/maven2/com/android/tools/lint/lint-checks/22.4… (460 KB at 6858.6 KB/sec) [INFO] Downloading: http://repo.maven.apache.org/maven2/emma/emma/2.0.5312/emma-2.0.5312.jar [INFO] Downloaded: http://repo.maven.apache.org/maven2/javax/annotation/jsr250-api/1.0/jsr250-… (6 KB at 228.4 KB/sec) [INFO] Downloading: http://repo.maven.apache.org/maven2/org/eclipse/aether/aether-connector-wag… [INFO] Downloaded: http://repo.maven.apache.org/maven2/javax/inject/javax.inject/1/javax.injec… (3 KB at 97.5 KB/sec) [INFO] Downloading: http://repo.maven.apache.org/maven2/com/github/rtyley/android-screenshot-pa… [INFO] Downloaded: http://repo.maven.apache.org/maven2/org/codehaus/plexus/plexus-interpolatio… (61 KB at 2410.0 KB/sec) [INFO] Downloading: http://repo.maven.apache.org/maven2/com/madgag/animated-gif-lib/1.0/animate… [INFO] Downloaded: http://repo.maven.apache.org/maven2/org/eclipse/aether/aether-connector-wag… (34 KB at 1332.7 KB/sec) [INFO] Downloading: http://repo.maven.apache.org/maven2/com/github/rtyley/android-screenshot-ce… [INFO] Downloaded: http://repo.maven.apache.org/maven2/org/eclipse/sisu/org.eclipse.sisu.injec… (285 KB at 6054.6 KB/sec) [INFO] Downloaded: http://repo.maven.apache.org/maven2/com/github/rtyley/android-screenshot-pa… (15 KB at 564.5 KB/sec) [INFO] Downloaded: http://repo.maven.apache.org/maven2/emma/emma/2.0.5312/emma-2.0.5312.jar (419 KB at 8712.1 KB/sec) [INFO] Downloaded: http://repo.maven.apache.org/maven2/com/madgag/animated-gif-lib/1.0/animate… (20 KB at 823.3 KB/sec) [INFO] Downloaded: http://repo.maven.apache.org/maven2/com/github/rtyley/android-screenshot-ce… (4 KB at 136.8 KB/sec) [INFO] Downloading: http://repository.jboss.org/maven2/javax/annotation/jsr250-api/1.0/jsr250-a… [INFO] Downloading: http://repository.jboss.org/maven2/javax/inject/javax.inject/1/javax.inject… [INFO] [INFO] ------------------------------------------------------------------------ [INFO] Building WLO 0.2-SNAPSHOT [INFO] ------------------------------------------------------------------------ [INFO] Downloading: http://nexus.nuiton.org/nexus/content/repositories/central-releases/com/goo… [INFO] Downloading: http://nexus.nuiton.org/nexus/content/groups/wlo-group/com/google/android/a… [INFO] Downloading: http://repo.maven.apache.org/maven2/com/google/android/android/4.1.1.4/andr… [INFO] Downloaded: http://repo.maven.apache.org/maven2/com/google/android/android/4.1.1.4/andr… (3 KB at 53.2 KB/sec) [INFO] Downloading: http://nexus.nuiton.org/nexus/content/repositories/central-releases/org/apa… [INFO] Downloading: http://nexus.nuiton.org/nexus/content/groups/wlo-group/org/apache/httpcompo… [INFO] Downloading: http://repo.maven.apache.org/maven2/org/apache/httpcomponents/httpclient/4.… [INFO] Downloaded: http://repo.maven.apache.org/maven2/org/apache/httpcomponents/httpclient/4.… (6 KB at 203.5 KB/sec) [INFO] Downloading: http://nexus.nuiton.org/nexus/content/repositories/central-releases/org/apa… [INFO] Downloading: http://nexus.nuiton.org/nexus/content/groups/wlo-group/org/apache/httpcompo… [INFO] Downloading: http://repo.maven.apache.org/maven2/org/apache/httpcomponents/httpcomponent… [INFO] Downloaded: http://repo.maven.apache.org/maven2/org/apache/httpcomponents/httpcomponent… (16 KB at 580.5 KB/sec) [INFO] Downloading: http://nexus.nuiton.org/nexus/content/repositories/central-releases/org/apa… [INFO] Downloading: http://nexus.nuiton.org/nexus/content/groups/wlo-group/org/apache/httpcompo… [INFO] Downloading: http://repo.maven.apache.org/maven2/org/apache/httpcomponents/httpcore/4.3.… [INFO] Downloaded: http://repo.maven.apache.org/maven2/org/apache/httpcomponents/httpcore/4.3.… (5 KB at 179.6 KB/sec) [INFO] Downloading: http://files.couchbase.com/maven2/org/apache/httpcomponents/httpcore/4.3.1/… [INFO] Downloading: http://nexus.nuiton.org/nexus/content/repositories/central-releases/org/apa… [INFO] Downloading: http://nexus.nuiton.org/nexus/content/groups/wlo-group/org/apache/httpcompo… [INFO] Downloading: http://repo.maven.apache.org/maven2/org/apache/httpcomponents/httpcomponent… [INFO] Downloaded: http://repo.maven.apache.org/maven2/org/apache/httpcomponents/httpcomponent… (12 KB at 456.5 KB/sec) [INFO] Downloading: http://files.couchbase.com/maven2/org/apache/httpcomponents/httpcomponents-… [INFO] Downloading: http://nexus.nuiton.org/nexus/content/repositories/central-releases/org/khr… [INFO] Downloading: http://nexus.nuiton.org/nexus/content/groups/wlo-group/org/khronos/opengl-a… [INFO] Downloading: http://repo.maven.apache.org/maven2/org/khronos/opengl-api/gl1.1-android-2.… [INFO] Downloaded: http://repo.maven.apache.org/maven2/org/khronos/opengl-api/gl1.1-android-2.… (2 KB at 59.0 KB/sec) [INFO] Downloading: http://nexus.nuiton.org/nexus/content/repositories/central-releases/xerces/… [INFO] Downloading: http://nexus.nuiton.org/nexus/content/groups/wlo-group/xerces/xmlParserAPIs… [INFO] Downloading: http://repo.maven.apache.org/maven2/xerces/xmlParserAPIs/2.6.2/xmlParserAPI… [INFO] Downloaded: http://repo.maven.apache.org/maven2/xerces/xmlParserAPIs/2.6.2/xmlParserAPI… (153 B at 6.0 KB/sec) [INFO] Downloading: http://nexus.nuiton.org/nexus/content/repositories/central-releases/xpp3/xp… [INFO] Downloading: http://nexus.nuiton.org/nexus/content/groups/wlo-group/xpp3/xpp3/1.1.4c/xpp… [INFO] Downloading: http://repo.maven.apache.org/maven2/xpp3/xpp3/1.1.4c/xpp3-1.1.4c.pom [INFO] Downloaded: http://repo.maven.apache.org/maven2/xpp3/xpp3/1.1.4c/xpp3-1.1.4c.pom (3 KB at 79.1 KB/sec) [INFO] Downloading: http://nexus.nuiton.org/nexus/content/repositories/central-releases/org/jso… [INFO] Downloading: http://nexus.nuiton.org/nexus/content/groups/wlo-group/org/json/json/200807… [INFO] Downloading: http://repo.maven.apache.org/maven2/org/json/json/20080701/json-20080701.pom [INFO] Downloaded: http://repo.maven.apache.org/maven2/org/json/json/20080701/json-20080701.pom (2 KB at 62.8 KB/sec) [INFO] Downloading: http://nexus.nuiton.org/nexus/content/repositories/central-releases/com/goo… [INFO] Downloading: http://nexus.nuiton.org/nexus/content/groups/wlo-group/com/google/android/a… [INFO] Downloading: http://repo.maven.apache.org/maven2/com/google/android/android-test/4.1.1.4… [INFO] Downloaded: http://repo.maven.apache.org/maven2/com/google/android/android-test/4.1.1.4… (3 KB at 81.3 KB/sec) [INFO] Downloading: http://nexus.nuiton.org/nexus/content/repositories/central-releases/android… [INFO] Downloading: http://nexus.nuiton.org/nexus/content/groups/wlo-group/android/support/comp… [INFO] Downloaded: http://nexus.nuiton.org/nexus/content/groups/wlo-group/android/support/comp… (447 B at 5.6 KB/sec) [INFO] Downloading: http://repo.maven.apache.org/maven2/android/support/compatibility-v7-appcom… [INFO] Downloading: http://nexus.nuiton.org/nexus/content/repositories/central-releases/android… [INFO] Downloading: http://nexus.nuiton.org/nexus/content/groups/wlo-group/android/support/comp… [INFO] Downloaded: http://nexus.nuiton.org/nexus/content/groups/wlo-group/android/support/comp… (405 B at 10.1 KB/sec) [INFO] Downloading: http://repo.maven.apache.org/maven2/android/support/compatibility-v4/19.0.1… [INFO] Downloading: http://nexus.nuiton.org/nexus/content/repositories/central-releases/com/goo… [INFO] Downloading: http://nexus.nuiton.org/nexus/content/groups/wlo-group/com/google/code/gson… [INFO] Downloading: http://repo.maven.apache.org/maven2/com/google/code/gson/gson/2.2.4/gson-2.… [INFO] Downloaded: http://repo.maven.apache.org/maven2/com/google/code/gson/gson/2.2.4/gson-2.… (8 KB at 261.7 KB/sec) [INFO] Downloading: http://nexus.nuiton.org/nexus/content/repositories/central-releases/org/ach… [INFO] Downloading: http://nexus.nuiton.org/nexus/content/groups/wlo-group/org/achartengine/ach… [INFO] Downloaded: http://nexus.nuiton.org/nexus/content/groups/wlo-group/org/achartengine/ach… (2 KB at 19.8 KB/sec) [INFO] Downloading: http://repo.maven.apache.org/maven2/org/achartengine/achartengine/1.1.0/ach… [INFO] Downloading: http://nexus.nuiton.org/nexus/content/repositories/central-releases/com/goo… [INFO] Downloading: http://nexus.nuiton.org/nexus/content/repositories/central-releases/org/apa… [INFO] Downloading: http://nexus.nuiton.org/nexus/content/repositories/central-releases/org/apa… [INFO] Downloading: http://nexus.nuiton.org/nexus/content/repositories/central-releases/org/khr… [INFO] Downloading: http://nexus.nuiton.org/nexus/content/repositories/central-releases/xerces/… [INFO] Downloading: http://nexus.nuiton.org/nexus/content/repositories/central-releases/xpp3/xp… [INFO] Downloading: http://nexus.nuiton.org/nexus/content/repositories/central-releases/org/jso… [INFO] Downloading: http://nexus.nuiton.org/nexus/content/repositories/central-releases/com/goo… [INFO] Downloading: http://nexus.nuiton.org/nexus/content/repositories/central-releases/android… [INFO] Downloading: http://nexus.nuiton.org/nexus/content/repositories/central-releases/android… [INFO] Downloading: http://nexus.nuiton.org/nexus/content/repositories/central-releases/android… [INFO] Downloading: http://nexus.nuiton.org/nexus/content/repositories/central-releases/com/goo… [INFO] Downloading: http://nexus.nuiton.org/nexus/content/repositories/central-releases/org/ach… [INFO] Downloading: http://nexus.nuiton.org/nexus/content/groups/wlo-group/com/google/android/a… [INFO] Downloading: http://nexus.nuiton.org/nexus/content/groups/wlo-group/org/apache/httpcompo… [INFO] Downloading: http://nexus.nuiton.org/nexus/content/groups/wlo-group/org/apache/httpcompo… [INFO] Downloading: http://nexus.nuiton.org/nexus/content/groups/wlo-group/org/khronos/opengl-a… [INFO] Downloading: http://nexus.nuiton.org/nexus/content/groups/wlo-group/xerces/xmlParserAPIs… [INFO] Downloading: http://nexus.nuiton.org/nexus/content/groups/wlo-group/xpp3/xpp3/1.1.4c/xpp… [INFO] Downloading: http://nexus.nuiton.org/nexus/content/groups/wlo-group/org/json/json/200807… [INFO] Downloading: http://nexus.nuiton.org/nexus/content/groups/wlo-group/com/google/android/a… [INFO] Downloading: http://nexus.nuiton.org/nexus/content/groups/wlo-group/android/support/comp… [INFO] Downloading: http://nexus.nuiton.org/nexus/content/groups/wlo-group/android/support/comp… [INFO] Downloading: http://nexus.nuiton.org/nexus/content/groups/wlo-group/android/support/comp… [INFO] Downloading: http://nexus.nuiton.org/nexus/content/groups/wlo-group/com/google/code/gson… [INFO] Downloading: http://nexus.nuiton.org/nexus/content/groups/wlo-group/org/achartengine/ach… [INFO] Downloaded: http://nexus.nuiton.org/nexus/content/groups/wlo-group/android/support/comp… (613 KB at 2049.7 KB/sec) [INFO] Downloaded: http://nexus.nuiton.org/nexus/content/groups/wlo-group/android/support/comp… (296 KB at 924.6 KB/sec) [INFO] Downloaded: http://nexus.nuiton.org/nexus/content/groups/wlo-group/android/support/comp… (336 KB at 996.1 KB/sec) [INFO] Downloaded: http://nexus.nuiton.org/nexus/content/groups/wlo-group/org/achartengine/ach… (120 KB at 112.3 KB/sec) [INFO] Downloading: http://repo.maven.apache.org/maven2/com/google/android/android/4.1.1.4/andr… [INFO] Downloading: http://repo.maven.apache.org/maven2/org/apache/httpcomponents/httpclient/4.… [INFO] Downloading: http://repo.maven.apache.org/maven2/org/apache/httpcomponents/httpcore/4.3.… [INFO] Downloading: http://repo.maven.apache.org/maven2/org/khronos/opengl-api/gl1.1-android-2.… [INFO] Downloading: http://repo.maven.apache.org/maven2/xerces/xmlParserAPIs/2.6.2/xmlParserAPI… [INFO] Downloaded: http://repo.maven.apache.org/maven2/org/khronos/opengl-api/gl1.1-android-2.… (19 KB at 384.2 KB/sec) [INFO] Downloading: http://repo.maven.apache.org/maven2/xpp3/xpp3/1.1.4c/xpp3-1.1.4c.jar [INFO] Downloaded: http://repo.maven.apache.org/maven2/org/apache/httpcomponents/httpclient/4.… (572 KB at 7833.9 KB/sec) [INFO] Downloading: http://repo.maven.apache.org/maven2/org/json/json/20080701/json-20080701.jar [INFO] Downloaded: http://repo.maven.apache.org/maven2/xerces/xmlParserAPIs/2.6.2/xmlParserAPI… (122 KB at 1416.3 KB/sec) [INFO] Downloading: http://repo.maven.apache.org/maven2/com/google/android/android-test/4.1.1.4… [INFO] Downloaded: http://repo.maven.apache.org/maven2/org/json/json/20080701/json-20080701.jar (37 KB at 1056.8 KB/sec) [INFO] Downloading: http://repo.maven.apache.org/maven2/android/support/compatibility-v7-appcom… [INFO] Downloaded: http://repo.maven.apache.org/maven2/com/google/android/android-test/4.1.1.4… (40 KB at 1205.9 KB/sec) [INFO] Downloading: http://repo.maven.apache.org/maven2/android/support/compatibility-v7-appcom… [INFO] Downloaded: http://repo.maven.apache.org/maven2/xpp3/xpp3/1.1.4c/xpp3-1.1.4c.jar (118 KB at 1584.5 KB/sec) [INFO] Downloading: http://repo.maven.apache.org/maven2/android/support/compatibility-v4/19.0.1… [INFO] Downloading: http://repo.maven.apache.org/maven2/com/google/code/gson/gson/2.2.4/gson-2.… [INFO] Downloaded: http://repo.maven.apache.org/maven2/org/apache/httpcomponents/httpcore/4.3.… (276 KB at 2187.8 KB/sec) [INFO] Downloading: http://repo.maven.apache.org/maven2/org/achartengine/achartengine/1.1.0/ach… [INFO] Downloaded: http://repo.maven.apache.org/maven2/com/google/code/gson/gson/2.2.4/gson-2.… (186 KB at 2043.6 KB/sec) [INFO] Downloaded: http://repo.maven.apache.org/maven2/com/google/android/android/4.1.1.4/andr… (12645 KB at 34266.4 KB/sec) [INFO] Downloading: http://files.couchbase.com/maven2/org/apache/httpcomponents/httpcore/4.3.1/… [INFO] [INFO] --- maven-clean-plugin:2.5:clean (default-clean) @ wlo --- [INFO] [INFO] --- maven-enforcer-plugin:1.3.1:enforce (check-project-files) @ wlo --- [INFO] [INFO] --- android-maven-plugin:3.8.2:generate-sources (default-generate-sources) @ wlo --- [DEBUG] Expanding: /var/local/forge/data/forge.codelutin.com/maven/repository/android/support/compatibility-v7-appcompat/19.0.1/compatibility-v7-appcompat-19.0.1.apklib into <http://ci-ng.forge.codelutin.com/jenkins/job/wlo/ws/trunk/target/unpacked-l…> [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 [INFO] ------------------------------------------------------------------------ [INFO] BUILD FAILURE [INFO] ------------------------------------------------------------------------ [INFO] Total time: 16.256s [INFO] Finished at: Mon Jan 27 12:56:55 CET 2014 [JENKINS] Archiving disabled [INFO] Final Memory: 17M/237M [INFO] ------------------------------------------------------------------------ [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 Waiting for Jenkins to finish collecting data Sending e-mails to: wlo-commits(a)list.forge.codelutin.com channel stopped

1 1