OSDN -- Desenvolver e Download de Software Open Source
Estado tradução de Português translation status for pt
  • R/O
  • SSH
  • HTTPS

fuel-checker: Commit


Commit MetaInfo

Revisão58 (tree)
Hora2011-10-03 17:06:08
Autorkmotoki

Mensagem de Log

若干のリファクタリング

Mudança Sumário

Diff

--- jp.ne.motoki.android.fuelchecker/src/jp/ne/motoki/android/fuelchecker/FuelListActivity.java (revision 57)
+++ jp.ne.motoki.android.fuelchecker/src/jp/ne/motoki/android/fuelchecker/FuelListActivity.java (revision 58)
@@ -75,9 +75,9 @@
7575 AlertDialog.Builder builder =
7676 new AlertDialog.Builder(FuelListActivity.this);
7777 builder.setTitle(R.string.title_confirm_dialog);
78- builder.setPositiveButton("編集", listener);
79- builder.setNeutralButton("削除", listener);
80- builder.setNegativeButton("キャンセル", null);
78+ builder.setPositiveButton(R.string.text_button_update, listener);
79+ builder.setNeutralButton(R.string.text_button_delete, listener);
80+ builder.setNegativeButton(R.string.text_button_cancel, null);
8181 builder.show();
8282 }
8383
@@ -140,9 +140,6 @@
140140
141141 private void confirmDelete(long datetime) {
142142 Cursor cursor = adapter.fetchData(datetime);
143- if (!cursor.moveToNext()) {
144- throw new AssertionError("duplicate data");
145- }
146143 FuelData data = FuelData.Factory.createInstance(cursor);
147144 ConfirmDialog.Builder builder = new ConfirmDialog.Builder(this);
148145 builder.setMessageHeader(R.string.text_confirm_dialog_delete);
--- jp.ne.motoki.android.fuelchecker/src/jp/ne/motoki/android/fuelchecker/FuelData.java (revision 57)
+++ jp.ne.motoki.android.fuelchecker/src/jp/ne/motoki/android/fuelchecker/FuelData.java (revision 58)
@@ -75,7 +75,7 @@
7575
7676 public void setQuantity(int integralValue, int decimalValue) {
7777 deciQuantity =
78- Factory.toDecaNumber(new int[] {integralValue, decimalValue});
78+ Factory.toDeciNumber(new int[] {integralValue, decimalValue});
7979 }
8080
8181 public float getDistance() {
@@ -84,7 +84,7 @@
8484
8585 public void setDistance(int integralValue, int decimalValue) {
8686 deciDistance =
87- Factory.toDecaNumber(new int[] {integralValue, decimalValue});
87+ Factory.toDeciNumber(new int[] {integralValue, decimalValue});
8888 }
8989
9090 public float getFuelEfficiency() {
@@ -122,8 +122,6 @@
122122 return hash;
123123 }
124124
125-
126-
127125 @Override
128126 protected FuelData clone() {
129127 try {
@@ -133,8 +131,6 @@
133131 }
134132 }
135133
136-
137-
138134 public static class Factory {
139135
140136 private Factory() {
@@ -141,15 +137,10 @@
141137 throw new AssertionError("Factory cannot be instantiated.");
142138 }
143139
144- public static FuelData createInstance(
145- int[] date, int[] time, int[] quantity, int[] distance) {
146- long milliDatetime = toMilliDatetime(date, time);
147- int decaQuantity = toDecaNumber(quantity);
148- int decaDistance = toDecaNumber(distance);
149- return new FuelData(milliDatetime, decaQuantity, decaDistance);
150- }
151-
152140 public static FuelData createInstance(Cursor cursor) {
141+ if (!cursor.moveToNext()) {
142+ throw new IllegalStateException("cursor is empty");
143+ }
153144 return new FuelData(
154145 cursor.getLong(Column.DATETIME.ordinal()),
155146 cursor.getInt(Column.QUANTITY.ordinal()),
@@ -156,7 +147,7 @@
156147 cursor.getInt(Column.DISTANCE.ordinal()));
157148 }
158149
159- public static List<FuelData> createDataListFromDB(Context context) {
150+ public static List<FuelData> fetchAllData(Context context) {
160151 FuelDbAdapter adapter = new FuelDbAdapter(context);
161152 adapter.open();
162153 Cursor cursor = adapter.fetchAllData();
@@ -179,14 +170,7 @@
179170 return list;
180171 }
181172
182- private static long toMilliDatetime(int[] date, int[] time) {
183- Calendar cal = Calendar.getInstance();
184- cal.set(date[0], date[1], date[2], time[0], time[1], 0);
185- cal.set(Calendar.MILLISECOND, 0);
186- return cal.getTime().getTime();
187- }
188-
189- private static int toDecaNumber(int[] numeric) {
173+ private static int toDeciNumber(int[] numeric) {
190174 return Integer.parseInt("" + numeric[0] + numeric[1]);
191175 }
192176
--- jp.ne.motoki.android.fuelchecker/src/jp/ne/motoki/android/fuelchecker/DatePickerDialogPreference.java (revision 57)
+++ jp.ne.motoki.android.fuelchecker/src/jp/ne/motoki/android/fuelchecker/DatePickerDialogPreference.java (revision 58)
@@ -16,10 +16,10 @@
1616 */
1717 package jp.ne.motoki.android.fuelchecker;
1818
19-import java.text.DateFormat;
2019 import java.util.Calendar;
2120
2221 import android.content.Context;
22+import android.text.format.DateFormat;
2323 import android.util.AttributeSet;
2424 import android.view.View;
2525 import android.widget.DatePicker;
@@ -27,8 +27,7 @@
2727 public class DatePickerDialogPreference
2828 extends ValueDisplayableDialogPreference<DatePicker> {
2929
30- private static final DateFormat FORMATTER =
31- DateFormat.getDateInstance(DateFormat.MEDIUM);
30+ private final java.text.DateFormat FORMATTER;
3231
3332 private final Calendar CALENDAR = Calendar.getInstance();
3433
@@ -36,11 +35,13 @@
3635
3736 public DatePickerDialogPreference(Context context, AttributeSet attrs) {
3837 super(context, attrs, new DatePicker(context));
38+ FORMATTER = DateFormat.getMediumDateFormat(context);
3939 }
4040
4141 public DatePickerDialogPreference(
4242 Context context, AttributeSet attrs, int defStyle) {
4343 super(context, attrs, defStyle, new DatePicker(context));
44+ FORMATTER = DateFormat.getMediumDateFormat(context);
4445 }
4546
4647 public void setOnDateChangedListener(OnDateChangedListener listener) {
--- jp.ne.motoki.android.fuelchecker/src/jp/ne/motoki/android/fuelchecker/TimePickerDialogPreference.java (revision 57)
+++ jp.ne.motoki.android.fuelchecker/src/jp/ne/motoki/android/fuelchecker/TimePickerDialogPreference.java (revision 58)
@@ -14,12 +14,12 @@
1414 * You should have received a copy of the GNU General Public License
1515 * along with this program. If not, see <http://www.gnu.org/licenses/>.
1616 */
17- package jp.ne.motoki.android.fuelchecker;
17+package jp.ne.motoki.android.fuelchecker;
1818
19-import java.text.DateFormat;
2019 import java.util.Calendar;
2120
2221 import android.content.Context;
22+import android.text.format.DateFormat;
2323 import android.util.AttributeSet;
2424 import android.view.View;
2525 import android.widget.TimePicker;
@@ -27,8 +27,7 @@
2727 public class TimePickerDialogPreference
2828 extends ValueDisplayableDialogPreference<TimePicker> {
2929
30- private static final DateFormat FORMATTER =
31- DateFormat.getTimeInstance(DateFormat.SHORT);
30+ private final java.text.DateFormat FORMATTER;
3231
3332 private final Calendar CALENDAR = Calendar.getInstance();
3433
@@ -36,11 +35,13 @@
3635
3736 public TimePickerDialogPreference(Context context, AttributeSet attrs) {
3837 super(context, attrs, createTimePicker(context));
38+ FORMATTER = DateFormat.getTimeFormat(context);
3939 }
4040
4141 public TimePickerDialogPreference(
4242 Context context, AttributeSet attrs, int defStyle) {
4343 super(context, attrs, defStyle, createTimePicker(context));
44+ FORMATTER = DateFormat.getTimeFormat(context);
4445 }
4546
4647 public void setOnTimeChangedListener(OnTimeChangedListener listener) {
@@ -80,7 +81,7 @@
8081
8182 private static TimePicker createTimePicker(Context context) {
8283 TimePicker picker = new TimePicker(context);
83- picker.setIs24HourView(false);
84+ picker.setIs24HourView(DateFormat.is24HourFormat(context));
8485 return picker;
8586 }
8687
--- jp.ne.motoki.android.fuelchecker/src/jp/ne/motoki/android/fuelchecker/ConfirmDialog.java (revision 57)
+++ jp.ne.motoki.android.fuelchecker/src/jp/ne/motoki/android/fuelchecker/ConfirmDialog.java (revision 58)
@@ -36,7 +36,7 @@
3636 private static final String NUMERIC_FORMAT = "% 3.1f";
3737
3838 private CharSequence header = null;
39- private FuelData data = null;
39+ private FuelData fuelData = null;
4040
4141 /**
4242 * @param context
@@ -45,7 +45,6 @@
4545 super(context);
4646 }
4747
48-
4948
5049 @Override
5150 protected void onCreate(Bundle savedInstanceState) {
@@ -60,7 +59,7 @@
6059 DateFormat.getMediumDateFormat(context);
6160 java.text.DateFormat timeFormatter =
6261 DateFormat.getTimeFormat(context);
63- Date datetime = data.getDatetime().getTime();
62+ Date datetime = fuelData.getDatetime().getTime();
6463 TextView dateView = (TextView) view.findViewById(R.id.date);
6564 dateView.setText(dateFormatter.format(datetime));
6665 TextView timeView = (TextView) view.findViewById(R.id.time);
@@ -69,11 +68,11 @@
6968 TextView quantityView =
7069 (TextView) view.findViewById(R.id.quantity);
7170 quantityView.setText(
72- String.format(NUMERIC_FORMAT, data.getQuantity()));
71+ String.format(NUMERIC_FORMAT, fuelData.getQuantity()));
7372 TextView distanceView =
7473 (TextView) view.findViewById(R.id.distance);
7574 distanceView.setText(
76- String.format(NUMERIC_FORMAT, data.getDistance()));
75+ String.format(NUMERIC_FORMAT, fuelData.getDistance()));
7776 setView(view);
7877
7978 super.onCreate(savedInstanceState);
@@ -83,15 +82,15 @@
8382 this.header = header;
8483 }
8584
86- public void setFuelData(FuelData data) {
87- if (data == null) {
88- throw new NullPointerException("data == null");
85+ public void setFuelData(FuelData fuelData) {
86+ if (fuelData == null) {
87+ throw new NullPointerException("fuelData == null");
8988 }
90- this.data = data;
89+ this.fuelData = fuelData;
9190 }
9291
9392 public FuelData getFuelData() {
94- return data.clone();
93+ return fuelData.clone();
9594 }
9695
9796
--- jp.ne.motoki.android.fuelchecker/src/jp/ne/motoki/android/fuelchecker/FuelCheckerActivity.java (revision 57)
+++ jp.ne.motoki.android.fuelchecker/src/jp/ne/motoki/android/fuelchecker/FuelCheckerActivity.java (revision 58)
@@ -158,12 +158,11 @@
158158 int itemId = item.getItemId();
159159 switch (itemId) {
160160 case R.id.id_graph:
161- List<FuelData> dataList = FuelData.Factory.createDataListFromDB(this);
162-
161+ List<FuelData> dataList = FuelData.Factory.fetchAllData(this);
163162 if (dataList.isEmpty()) {
164163 Toast.makeText(
165164 this,
166- getString(R.string.message_no_data),
165+ R.string.message_no_data,
167166 Toast.LENGTH_LONG).show();
168167 } else {
169168 showChart(dataList);
@@ -218,8 +217,7 @@
218217 }
219218
220219 private long insertFuelData() {
221- FuelDbAdapter adapter =
222- new FuelDbAdapter(FuelCheckerActivity.this);
220+ FuelDbAdapter adapter = new FuelDbAdapter(this);
223221 try {
224222 adapter.open();
225223 return adapter.insert(FUEL_DATA);
@@ -232,7 +230,8 @@
232230 ConfirmDialog.Builder confirmDialog = new ConfirmDialog.Builder(this);
233231 confirmDialog.setMessageHeader(R.string.text_confirm_dialog_insert);
234232 confirmDialog.setFuelData(FUEL_DATA);
235- confirmDialog.setPositiveButton(R.string.text_button_ok, CONFIRM_REGISTER_LISTENER);
233+ confirmDialog.setPositiveButton(
234+ R.string.text_button_ok, CONFIRM_REGISTER_LISTENER);
236235 confirmDialog.setNegativeButton(R.string.text_button_cancel, null);
237236 confirmDialog.show();
238237 }
@@ -241,13 +240,13 @@
241240 AlertDialog.Builder builder = new AlertDialog.Builder(this);
242241 builder.setTitle(R.string.title_confirm_dialog);
243242 builder.setMessage(getString(R.string.text_confirm_connect_market));
244- builder.setPositiveButton(R.string.text_button_connect, CONFIRM_CONNECT_LISTENER);
243+ builder.setPositiveButton(
244+ R.string.text_button_connect, CONFIRM_CONNECT_LISTENER);
245245 builder.setNegativeButton(R.string.text_button_cancel, null);
246246 builder.create().show();
247247 }
248248
249249 private void showChart(List<FuelData> dataList) {
250- // TODO Ugly code.
251250 DataObject dataObject =
252251 new DataObject(getString(R.string.key_fuel_efficiency));
253252 for (FuelData fuelData : dataList) {
Show on old repository browser