From 462b0c4ea4be62720c05363c82f5a327ad57dfc9 Mon Sep 17 00:00:00 2001 From: Ilia Kurtov Date: Mon, 18 Apr 2016 16:06:24 +0300 Subject: [PATCH 1/3] storable rename --- .../JsonPreferenceStorable.java} | 12 ++++++------ .../{storeables => storables}/PreferenceStore.java | 2 +- .../StringPreferenceStorable.java} | 10 +++++----- 3 files changed, 12 insertions(+), 12 deletions(-) rename src/main/java/ru/touchin/roboswag/components/{storeables/JsonPreferenceStoreable.java => storables/JsonPreferenceStorable.java} (89%) rename src/main/java/ru/touchin/roboswag/components/{storeables => storables}/PreferenceStore.java (98%) rename src/main/java/ru/touchin/roboswag/components/{storeables/StringPreferenceStoreable.java => storables/StringPreferenceStorable.java} (58%) diff --git a/src/main/java/ru/touchin/roboswag/components/storeables/JsonPreferenceStoreable.java b/src/main/java/ru/touchin/roboswag/components/storables/JsonPreferenceStorable.java similarity index 89% rename from src/main/java/ru/touchin/roboswag/components/storeables/JsonPreferenceStoreable.java rename to src/main/java/ru/touchin/roboswag/components/storables/JsonPreferenceStorable.java index f579752..13e5cc1 100644 --- a/src/main/java/ru/touchin/roboswag/components/storeables/JsonPreferenceStoreable.java +++ b/src/main/java/ru/touchin/roboswag/components/storables/JsonPreferenceStorable.java @@ -17,7 +17,7 @@ * */ -package ru.touchin.roboswag.components.storeables; +package ru.touchin.roboswag.components.storables; import android.content.SharedPreferences; import android.support.annotation.NonNull; @@ -41,14 +41,14 @@ import ru.touchin.roboswag.core.log.Lc; * Created by Gavriil Sitnikov on 18/03/16. * TODO: description */ -public class JsonPreferenceStoreable extends Storeable { +public class JsonPreferenceStorable extends Storeable { private static final JsonFactory DEFAULT_JSON_FACTORY = new JacksonFactory(); - public JsonPreferenceStoreable(@NonNull final String name, - @NonNull final Class objectClass, - @NonNull final SharedPreferences preferences, - @Nullable final T defaultValue) { + public JsonPreferenceStorable(@NonNull final String name, + @NonNull final Class objectClass, + @NonNull final SharedPreferences preferences, + @Nullable final T defaultValue) { super(name, name, objectClass, String.class, new PreferenceStore<>(preferences), new JsonConverter<>(), false, null, null, defaultValue); } diff --git a/src/main/java/ru/touchin/roboswag/components/storeables/PreferenceStore.java b/src/main/java/ru/touchin/roboswag/components/storables/PreferenceStore.java similarity index 98% rename from src/main/java/ru/touchin/roboswag/components/storeables/PreferenceStore.java rename to src/main/java/ru/touchin/roboswag/components/storables/PreferenceStore.java index 297a1f1..eb70218 100644 --- a/src/main/java/ru/touchin/roboswag/components/storeables/PreferenceStore.java +++ b/src/main/java/ru/touchin/roboswag/components/storables/PreferenceStore.java @@ -17,7 +17,7 @@ * */ -package ru.touchin.roboswag.components.storeables; +package ru.touchin.roboswag.components.storables; import android.content.SharedPreferences; import android.support.annotation.NonNull; diff --git a/src/main/java/ru/touchin/roboswag/components/storeables/StringPreferenceStoreable.java b/src/main/java/ru/touchin/roboswag/components/storables/StringPreferenceStorable.java similarity index 58% rename from src/main/java/ru/touchin/roboswag/components/storeables/StringPreferenceStoreable.java rename to src/main/java/ru/touchin/roboswag/components/storables/StringPreferenceStorable.java index 6d027cd..4c96cf2 100644 --- a/src/main/java/ru/touchin/roboswag/components/storeables/StringPreferenceStoreable.java +++ b/src/main/java/ru/touchin/roboswag/components/storables/StringPreferenceStorable.java @@ -1,4 +1,4 @@ -package ru.touchin.roboswag.components.storeables; +package ru.touchin.roboswag.components.storables; import android.content.SharedPreferences; import android.support.annotation.NonNull; @@ -11,11 +11,11 @@ import ru.touchin.roboswag.core.data.storeable.Storeable; * Created by Gavriil Sitnikov on 12/04/16. * TODO: description */ -public class StringPreferenceStoreable extends Storeable { +public class StringPreferenceStorable extends Storeable { - public StringPreferenceStoreable(@NonNull final String name, - @NonNull final SharedPreferences preferences, - @Nullable final String defaultValue) { + public StringPreferenceStorable(@NonNull final String name, + @NonNull final SharedPreferences preferences, + @Nullable final String defaultValue) { super(name, name, String.class, String.class, new PreferenceStore<>(preferences), new SameTypesConverter<>(), false, null, null, defaultValue); } From e8f2900bdda822718a2e81c50641bebe23cf1be1 Mon Sep 17 00:00:00 2001 From: Ilia Kurtov Date: Mon, 18 Apr 2016 16:08:49 +0300 Subject: [PATCH 2/3] core renames too --- .../components/storables/JsonPreferenceStorable.java | 6 +++--- .../roboswag/components/storables/PreferenceStore.java | 2 +- .../components/storables/StringPreferenceStorable.java | 6 +++--- 3 files changed, 7 insertions(+), 7 deletions(-) diff --git a/src/main/java/ru/touchin/roboswag/components/storables/JsonPreferenceStorable.java b/src/main/java/ru/touchin/roboswag/components/storables/JsonPreferenceStorable.java index 13e5cc1..d18c514 100644 --- a/src/main/java/ru/touchin/roboswag/components/storables/JsonPreferenceStorable.java +++ b/src/main/java/ru/touchin/roboswag/components/storables/JsonPreferenceStorable.java @@ -32,8 +32,8 @@ import java.io.ByteArrayInputStream; import java.io.IOException; import java.io.StringWriter; -import ru.touchin.roboswag.core.data.storeable.Converter; -import ru.touchin.roboswag.core.data.storeable.Storeable; +import ru.touchin.roboswag.core.data.storable.Converter; +import ru.touchin.roboswag.core.data.storable.Storable; import ru.touchin.roboswag.core.data.exceptions.ConversionException; import ru.touchin.roboswag.core.log.Lc; @@ -41,7 +41,7 @@ import ru.touchin.roboswag.core.log.Lc; * Created by Gavriil Sitnikov on 18/03/16. * TODO: description */ -public class JsonPreferenceStorable extends Storeable { +public class JsonPreferenceStorable extends Storable { private static final JsonFactory DEFAULT_JSON_FACTORY = new JacksonFactory(); diff --git a/src/main/java/ru/touchin/roboswag/components/storables/PreferenceStore.java b/src/main/java/ru/touchin/roboswag/components/storables/PreferenceStore.java index eb70218..bf9d190 100644 --- a/src/main/java/ru/touchin/roboswag/components/storables/PreferenceStore.java +++ b/src/main/java/ru/touchin/roboswag/components/storables/PreferenceStore.java @@ -23,7 +23,7 @@ import android.content.SharedPreferences; import android.support.annotation.NonNull; import android.support.annotation.Nullable; -import ru.touchin.roboswag.core.data.storeable.Store; +import ru.touchin.roboswag.core.data.storable.Store; import ru.touchin.roboswag.core.data.exceptions.StoreException; /** diff --git a/src/main/java/ru/touchin/roboswag/components/storables/StringPreferenceStorable.java b/src/main/java/ru/touchin/roboswag/components/storables/StringPreferenceStorable.java index 4c96cf2..ea37b05 100644 --- a/src/main/java/ru/touchin/roboswag/components/storables/StringPreferenceStorable.java +++ b/src/main/java/ru/touchin/roboswag/components/storables/StringPreferenceStorable.java @@ -4,14 +4,14 @@ import android.content.SharedPreferences; import android.support.annotation.NonNull; import android.support.annotation.Nullable; -import ru.touchin.roboswag.core.data.storeable.SameTypesConverter; -import ru.touchin.roboswag.core.data.storeable.Storeable; +import ru.touchin.roboswag.core.data.storable.SameTypesConverter; +import ru.touchin.roboswag.core.data.storable.Storable; /** * Created by Gavriil Sitnikov on 12/04/16. * TODO: description */ -public class StringPreferenceStorable extends Storeable { +public class StringPreferenceStorable extends Storable { public StringPreferenceStorable(@NonNull final String name, @NonNull final SharedPreferences preferences, From 095fc27d8d4e6a7a950adeb1f0545dde0977925e Mon Sep 17 00:00:00 2001 From: Ilia Kurtov Date: Mon, 18 Apr 2016 16:11:37 +0300 Subject: [PATCH 3/3] storables last fix --- .../roboswag/components/storables/JsonPreferenceStorable.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/main/java/ru/touchin/roboswag/components/storables/JsonPreferenceStorable.java b/src/main/java/ru/touchin/roboswag/components/storables/JsonPreferenceStorable.java index d18c514..76a281d 100644 --- a/src/main/java/ru/touchin/roboswag/components/storables/JsonPreferenceStorable.java +++ b/src/main/java/ru/touchin/roboswag/components/storables/JsonPreferenceStorable.java @@ -32,9 +32,9 @@ import java.io.ByteArrayInputStream; import java.io.IOException; import java.io.StringWriter; +import ru.touchin.roboswag.core.data.exceptions.ConversionException; import ru.touchin.roboswag.core.data.storable.Converter; import ru.touchin.roboswag.core.data.storable.Storable; -import ru.touchin.roboswag.core.data.exceptions.ConversionException; import ru.touchin.roboswag.core.log.Lc; /**