From b494997a7047805a818ea68c07b25ca8b68cfe31 Mon Sep 17 00:00:00 2001 From: MRSa Date: Mon, 1 May 2023 23:18:11 +0900 Subject: [PATCH] =?utf8?q?CSV=E5=BD=A2=E5=BC=8F=E3=81=A7=E3=82=A4=E3=83=B3?= =?utf8?q?=E3=83=9D=E3=83=BC=E3=83=88=E3=81=99=E3=82=8B=E9=83=A8=E5=88=86?= =?utf8?q?=E3=82=92=E6=94=B9=E4=BF=AE=E3=80=82?= MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit --- app/build.gradle | 1 + app/src/main/AndroidManifest.xml | 3 +- .../memoma/extension/ExtensionActivity.java | 84 +++++-- .../extension/ExtensionActivityListener.java | 252 ++++++++++++--------- .../gokigen/memoma/extension/ExtensionCsvImport.kt | 148 ++++++++++++ .../memoma/io/MeMoMaFileExportCsvProcess.java | 6 +- .../gokigen/memoma/io/MeMoMaFileSavingEngine.java | 2 +- build.gradle | 4 +- 8 files changed, 365 insertions(+), 135 deletions(-) create mode 100644 app/src/main/java/jp/sourceforge/gokigen/memoma/extension/ExtensionCsvImport.kt diff --git a/app/build.gradle b/app/build.gradle index 3ceea63..aae0059 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -1,5 +1,6 @@ apply plugin: 'com.android.application' apply plugin: 'kotlin-android' +apply plugin: 'org.jetbrains.kotlin.android' android { compileSdkVersion 33 diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml index 0fe4f9a..21629a5 100644 --- a/app/src/main/AndroidManifest.xml +++ b/app/src/main/AndroidManifest.xml @@ -13,9 +13,8 @@ diff --git a/app/src/main/java/jp/sourceforge/gokigen/memoma/extension/ExtensionActivity.java b/app/src/main/java/jp/sourceforge/gokigen/memoma/extension/ExtensionActivity.java index 01704a6..5393d8c 100644 --- a/app/src/main/java/jp/sourceforge/gokigen/memoma/extension/ExtensionActivity.java +++ b/app/src/main/java/jp/sourceforge/gokigen/memoma/extension/ExtensionActivity.java @@ -1,25 +1,25 @@ package jp.sourceforge.gokigen.memoma.extension; -import android.app.Activity; import android.app.Dialog; import android.content.Intent; import android.os.Bundle; import android.view.Menu; import android.view.MenuItem; +import androidx.annotation.NonNull; +import androidx.appcompat.app.AppCompatActivity; + import jp.sourceforge.gokigen.memoma.R; /** - * - * @author MRSa * */ -public class ExtensionActivity extends Activity +public class ExtensionActivity extends AppCompatActivity { - /** 起動コード **/ + // 起動コード public static final String MEMOMA_EXTENSION_LAUNCH_ACTIVITY = "jp.sfjp.gokigen.memoma.extension.activity"; - /** データ識別子(表示中データの保存ファイルへのフルパス) **/ + // データ識別子(表示中データの保存ファイルへのフルパス) public static final String MEMOMA_EXTENSION_DATA_FULLPATH = "jp.sfjp.gokigen.memoma.extension.data.fullpath"; public static final String MEMOMA_EXTENSION_DATA_TITLE = "jp.sfjp.gokigen.memoma.extension.data.title"; @@ -31,15 +31,22 @@ public class ExtensionActivity extends Activity { super.onCreate(savedInstanceState); - // リスナクラスを生成する - listener = new ExtensionActivityListener(this); - - // レイアウトを設定する - setContentView(R.layout.extensionview); - - // リスナクラスの準備 - listener.prepareExtraDatas(getIntent()); - listener.prepareListener(); + try + { + // リスナクラスを生成する + listener = new ExtensionActivityListener(this); + + // レイアウトを設定する + setContentView(R.layout.extensionview); + + // リスナクラスの準備 + listener.prepareExtraDatas(getIntent()); + listener.prepareListener(); + } + catch (Exception e) + { + e.printStackTrace(); + } } /** @@ -48,7 +55,14 @@ public class ExtensionActivity extends Activity @Override public boolean onCreateOptionsMenu(Menu menu) { - menu = listener.onCreateOptionsMenu(menu); + try + { + menu = listener.onCreateOptionsMenu(menu); + } + catch (Exception e) + { + e.printStackTrace(); + } return (super.onCreateOptionsMenu(menu)); } @@ -67,7 +81,14 @@ public class ExtensionActivity extends Activity @Override public boolean onPrepareOptionsMenu(Menu menu) { - listener.onPrepareOptionsMenu(menu); + try + { + listener.onPrepareOptionsMenu(menu); + } + catch (Exception e) + { + e.printStackTrace(); + } return (super.onPrepareOptionsMenu(menu)); } @@ -104,6 +125,7 @@ public class ExtensionActivity extends Activity catch (Exception ex) { // なにもしない + ex.printStackTrace(); } } @@ -114,8 +136,15 @@ public class ExtensionActivity extends Activity @Override protected void onDestroy() { - listener.finishListener(); - super.onDestroy(); + try + { + listener.finishListener(); + super.onDestroy(); + } + catch (Exception e) + { + e.printStackTrace(); + } } /** @@ -140,9 +169,9 @@ public class ExtensionActivity extends Activity * */ @Override - protected void onSaveInstanceState(Bundle outState) + protected void onSaveInstanceState(@NonNull Bundle outState) { - super.onSaveInstanceState(outState); + super.onSaveInstanceState(outState); } /** @@ -171,7 +200,14 @@ public class ExtensionActivity extends Activity @Override protected void onPrepareDialog(int id, Dialog dialog) { - listener.onPrepareDialog(id, dialog); + try + { + listener.onPrepareDialog(id, dialog); + } + catch (Exception e) + { + e.printStackTrace(); + } } /** @@ -180,14 +216,16 @@ public class ExtensionActivity extends Activity @Override protected void onActivityResult(int requestCode, int resultCode, Intent data) { + super.onActivityResult(requestCode, resultCode, data); try { // 子画面からもらった情報の応答処理をイベント処理クラスに依頼する - listener.onActivityResult(requestCode, resultCode, data); + listener.onActivityResult(requestCode, resultCode, data); } catch (Exception ex) { // 例外が発生したときには、何もしない。 + ex.printStackTrace(); } } } diff --git a/app/src/main/java/jp/sourceforge/gokigen/memoma/extension/ExtensionActivityListener.java b/app/src/main/java/jp/sourceforge/gokigen/memoma/extension/ExtensionActivityListener.java index f06b465..d9c757a 100644 --- a/app/src/main/java/jp/sourceforge/gokigen/memoma/extension/ExtensionActivityListener.java +++ b/app/src/main/java/jp/sourceforge/gokigen/memoma/extension/ExtensionActivityListener.java @@ -1,5 +1,7 @@ package jp.sourceforge.gokigen.memoma.extension; +import static jp.sourceforge.gokigen.memoma.Main.APP_NAMESPACE; + import java.text.SimpleDateFormat; import java.util.ArrayList; import java.util.Calendar; @@ -7,11 +9,15 @@ import java.util.Enumeration; import java.util.List; import java.util.Locale; -import android.app.ActionBar; import android.app.Activity; import android.app.Dialog; import android.content.Intent; +import android.content.SharedPreferences; import android.net.Uri; +import android.os.Build; +import android.os.Environment; +import android.preference.PreferenceManager; +import android.provider.DocumentsContract; import android.util.Log; import android.view.Menu; import android.view.MenuItem; @@ -23,6 +29,9 @@ import android.widget.ListAdapter; import android.widget.ListView; import android.widget.Toast; +import androidx.appcompat.app.ActionBar; +import androidx.appcompat.app.AppCompatActivity; + import jp.sourceforge.gokigen.memoma.holders.PositionObject; import jp.sourceforge.gokigen.memoma.dialogs.FileSelectionDialog; import jp.sourceforge.gokigen.memoma.io.MeMoMaFileExportCsvProcess; @@ -30,26 +39,22 @@ import jp.sourceforge.gokigen.memoma.io.MeMoMaFileImportCsvProcess; import jp.sourceforge.gokigen.memoma.io.MeMoMaFileLoadingProcess; import jp.sourceforge.gokigen.memoma.holders.MeMoMaObjectHolder; import jp.sourceforge.gokigen.memoma.R; +import jp.sourceforge.gokigen.memoma.io.MeMoMaFileSavingEngine; import jp.sourceforge.gokigen.memoma.io.SharedIntentInvoker; import jp.sourceforge.gokigen.memoma.listitem.SymbolListArrayAdapter; import jp.sourceforge.gokigen.memoma.listitem.SymbolListArrayItem; /** * リスト形式で表示・エクスポート - * - * @author MRSa - * */ public class ExtensionActivityListener implements OnClickListener, MeMoMaFileLoadingProcess.IResultReceiver, MeMoMaFileExportCsvProcess.IResultReceiver, FileSelectionDialog.IResultReceiver, MeMoMaFileImportCsvProcess.IResultReceiver { private final String TAG = toString(); + private static final int PICK_CSV_FILE = 2020; private final int MENU_ID_EXPORT= (Menu.FIRST + 1); private final int MENU_ID_SHARE = (Menu.FIRST + 2); private final int MENU_ID_IMPORT = (Menu.FIRST + 3); - private static final String EXTENSION_DIRECTORY = "/exported"; - - //private ExternalStorageFileUtility fileUtility; private final MeMoMaObjectHolder objectHolder; private FileSelectionDialog fileSelectionDialog = null; @@ -57,33 +62,25 @@ public class ExtensionActivityListener implements OnClickListener, MeMoMaFileLo private List listItems = null; - private final Activity parent; // 親分 - + private final AppCompatActivity parent; // 親分 + /** * コンストラクタ - * @param argument parent activity */ - ExtensionActivityListener(Activity argument) + ExtensionActivityListener(AppCompatActivity argument) { parent = argument; - //fileUtility = new ExternalStorageFileUtility(Main.APP_BASEDIR); objectHolder = new MeMoMaObjectHolder(parent); } /** * 起動時にデータを準備する - * - * @param myIntent intent information */ public void prepareExtraDatas(Intent myIntent) { try { // Intentで拾ったデータを読み出す (初期化データ) - //fullPath = myIntent.getStringExtra(ExtensionActivity.MEMOMA_EXTENSION_DATA_FULLPATH); objectHolder.setDataTitle(myIntent.getStringExtra(ExtensionActivity.MEMOMA_EXTENSION_DATA_TITLE)); - - // Preferenceに記憶されたデータがあればそれを取得する - // SharedPreferences preferences = PreferenceManager.getDefaultSharedPreferences(parent); } catch (Exception ex) { @@ -100,7 +97,6 @@ public class ExtensionActivityListener implements OnClickListener, MeMoMaFileLo // フィルタ設定ボタン final ImageButton filterButton = parent.findViewById(R.id.SetFilterButton); filterButton.setOnClickListener(this); - } /** @@ -116,25 +112,32 @@ public class ExtensionActivityListener implements OnClickListener, MeMoMaFileLo */ public void prepareToStart() { - Log.v(TAG, "ExtensionActivityListener::prepareToStart() : " + objectHolder.getDataTitle()); - - // アクションバーを表示する - ActionBar bar = parent.getActionBar(); - if (bar != null) + try { - bar.show(); - bar.setTitle(objectHolder.getDataTitle()); + Log.v(TAG, "ExtensionActivityListener::prepareToStart() : " + objectHolder.getDataTitle()); + + // アクションバーを表示する + ActionBar bar = parent.getSupportActionBar(); + if (bar != null) + { + bar.setIcon(R.drawable.icon1); + bar.setTitle(objectHolder.getDataTitle()); + bar.show(); + } + + // ファイルをロードする！ + // (AsyncTaskを使ってデータを読み込む) + MeMoMaFileLoadingProcess asyncTask = new MeMoMaFileLoadingProcess(parent, this); + asyncTask.execute(objectHolder); + } + catch (Exception e) + { + e.printStackTrace(); } - - // ファイルをロードする！ - // (AsyncTaskを使ってデータを読み込む) - MeMoMaFileLoadingProcess asyncTask = new MeMoMaFileLoadingProcess(parent, this); - asyncTask.execute(objectHolder); } /** * 詳細データを表示する。 - * */ private void showDetailData(String first, String second, String third) { @@ -151,13 +154,58 @@ public class ExtensionActivityListener implements OnClickListener, MeMoMaFileLo /** * 他画面から戻ってきたとき... - * - * */ - public void onActivityResult(int requestCode, int resultCode, Intent data) + public void onActivityResult(int requestCode, int resultCode, Intent resultData) { - // なにもしない... - Log.v(TAG, "rc: " + requestCode + " rs: " + resultCode + " it: " + data.getDataString()); + try + { + if ((requestCode == PICK_CSV_FILE)&&(resultCode == Activity.RESULT_OK)) + { + if (resultData != null) + { + Uri uri = resultData.getData(); + Log.v(TAG, "========== rc: " + requestCode + " rs: " + resultCode + " uri: " + uri.toString()); + + // Perform operations on the document using its URI. + Thread thread = new Thread(() -> { + ExtensionCsvImport importer = new ExtensionCsvImport(parent, objectHolder, uri); + importer.importFromCsvFile(); + + SharedPreferences preferences = PreferenceManager.getDefaultSharedPreferences(parent); + String backgroundUri = preferences.getString("backgroundUri",""); + String userCheckboxString = preferences.getString("userCheckboxString",""); + + // データの保管メイン + MeMoMaFileSavingEngine savingEngine = new MeMoMaFileSavingEngine(parent, backgroundUri, userCheckboxString); + String result = savingEngine.saveObjects(objectHolder); + + parent.runOnUiThread(() -> { + try + { + onImportedResult(result); + } + catch (Exception e) + { + e.printStackTrace(); + } + }); + }); + try + { + thread.start(); + } + catch (Exception ee) + { + ee.printStackTrace(); + } + } + } + } + catch (Exception e) + { + e.printStackTrace(); + } + // Log.v(TAG, "rc: " + requestCode + " rs: " + resultCode + " it: " + resultData.getDataString()); } /** @@ -172,21 +220,6 @@ public class ExtensionActivityListener implements OnClickListener, MeMoMaFileLo Log.v(TAG, "Selected Filter"); } } - -/* - ** - * 触られたときの処理 - * - * - public boolean onTouch(View v, MotionEvent event) - { - Log.v(Main.APP_IDENTIFIER, " " + v.toString() + " " + event.toString()); - // int id = v.getId(); - // int action = event.getAction(); - - return (false); - } -*/ /** * メニューへのアイテム追加 @@ -194,19 +227,25 @@ public class ExtensionActivityListener implements OnClickListener, MeMoMaFileLo */ public Menu onCreateOptionsMenu(Menu menu) { - MenuItem menuItem = menu.add(Menu.NONE, MENU_ID_SHARE, Menu.NONE, parent.getString(R.string.export_csv)); - menuItem.setShowAsAction(MenuItem.SHOW_AS_ACTION_IF_ROOM); /* for Android 3.1 */ - menuItem.setIcon(android.R.drawable.ic_menu_share); - - menuItem = menu.add(Menu.NONE, MENU_ID_EXPORT, Menu.NONE, parent.getString(R.string.shareContent)); - menuItem.setShowAsAction(MenuItem.SHOW_AS_ACTION_IF_ROOM); /* for Android 3.1 */ - menuItem.setIcon(android.R.drawable.ic_menu_save); + try + { + MenuItem menuItem = menu.add(Menu.NONE, MENU_ID_SHARE, Menu.NONE, parent.getString(R.string.export_csv)); + menuItem.setShowAsAction(MenuItem.SHOW_AS_ACTION_IF_ROOM); + menuItem.setIcon(android.R.drawable.ic_menu_share); - menuItem = menu.add(Menu.NONE, MENU_ID_IMPORT, Menu.NONE, parent.getString(R.string.import_csv)); - menuItem.setShowAsAction(MenuItem.SHOW_AS_ACTION_NEVER); /* for Android 3.1 */ - menuItem.setIcon(android.R.drawable.ic_menu_edit); + menuItem = menu.add(Menu.NONE, MENU_ID_EXPORT, Menu.NONE, parent.getString(R.string.shareContent)); + menuItem.setShowAsAction(MenuItem.SHOW_AS_ACTION_IF_ROOM); + menuItem.setIcon(android.R.drawable.ic_menu_save); - return (menu); + menuItem = menu.add(Menu.NONE, MENU_ID_IMPORT, Menu.NONE, parent.getString(R.string.import_csv)); + menuItem.setShowAsAction(MenuItem.SHOW_AS_ACTION_NEVER); + menuItem.setIcon(android.R.drawable.ic_menu_edit); + } + catch (Exception e) + { + e.printStackTrace(); + } + return (menu); } /** @@ -215,9 +254,16 @@ public class ExtensionActivityListener implements OnClickListener, MeMoMaFileLo */ public void onPrepareOptionsMenu(Menu menu) { - menu.findItem(MENU_ID_SHARE).setVisible(true); - menu.findItem(MENU_ID_EXPORT).setVisible(true); - menu.findItem(MENU_ID_IMPORT).setVisible(true); + try + { + menu.findItem(MENU_ID_SHARE).setVisible(true); + menu.findItem(MENU_ID_EXPORT).setVisible(true); + menu.findItem(MENU_ID_IMPORT).setVisible(true); + } + catch (Exception e) + { + e.printStackTrace(); + } } /** @@ -227,46 +273,57 @@ public class ExtensionActivityListener implements OnClickListener, MeMoMaFileLo public boolean onOptionsItemSelected(MenuItem item) { boolean result; - switch (item.getItemId()) - { - case MENU_ID_EXPORT: - // 表示中データのエクスポート - export_as_csv(false); - result = true; - break; - - case MENU_ID_SHARE: - export_as_csv(true); - result = true; - break; - - case MENU_ID_IMPORT: - // データのインポート - importObjectFromCsv(); - result = true; - break; - - default: - result = false; - break; - } + switch (item.getItemId()) + { + case MENU_ID_EXPORT -> { + // 表示中データのエクスポート + export_as_csv(false); + result = true; + } + case MENU_ID_SHARE -> { + export_as_csv(true); + result = true; + } + case MENU_ID_IMPORT -> { + // データのインポート + importObjectFromCsv(); + result = true; + } + default -> result = false; + } return (result); } /** * CSV形式でデータをインポートする - * */ private void importObjectFromCsv() { - // データのインポート - parent.showDialog(R.id.listdialog); + // ファイル選択のダイアログを取得する + if (android.os.Build.VERSION.SDK_INT >= android.os.Build.VERSION_CODES.KITKAT) + { + Intent intent = new Intent(Intent.ACTION_OPEN_DOCUMENT); + intent.addCategory(Intent.CATEGORY_OPENABLE); + intent.setType("text/*"); + intent.setFlags(Intent.FLAG_GRANT_READ_URI_PERMISSION); + if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.O) + { + String path = Environment.getExternalStoragePublicDirectory(Environment.DIRECTORY_DOWNLOADS).getPath() + "/" + APP_NAMESPACE + "/"; + intent.putExtra(DocumentsContract.EXTRA_INITIAL_URI, path); + } + parent.startActivityForResult(intent, PICK_CSV_FILE); + } + else + { + // 旧バージョンの Android での処理... （File Picker ってあったっけ？） + + + } } /** * データをCSV形式で出力する - * */ private void export_as_csv(boolean isShare) { @@ -279,7 +336,6 @@ public class ExtensionActivityListener implements OnClickListener, MeMoMaFileLo /** * ダイアログの生成 - * */ public Dialog onCreateDialog(int id) { @@ -288,14 +344,6 @@ public class ExtensionActivityListener implements OnClickListener, MeMoMaFileLo fileSelectionDialog = new FileSelectionDialog(parent, parent.getString(R.string.dialogtitle_selectcsv), ".csv", this); return (fileSelectionDialog.getDialog()); } - - /* - if (id == R.id.info_about_gokigen) - { - CreditDialog dialog = new CreditDialog(parent); - return (dialog.getDialog()); - } - */ return (null); } diff --git a/app/src/main/java/jp/sourceforge/gokigen/memoma/extension/ExtensionCsvImport.kt b/app/src/main/java/jp/sourceforge/gokigen/memoma/extension/ExtensionCsvImport.kt new file mode 100644 index 0000000..a1c447e --- /dev/null +++ b/app/src/main/java/jp/sourceforge/gokigen/memoma/extension/ExtensionCsvImport.kt @@ -0,0 +1,148 @@ +package jp.sourceforge.gokigen.memoma.extension + +import android.content.Context +import android.net.Uri +import android.util.Log +import jp.sourceforge.gokigen.memoma.holders.MeMoMaObjectHolder +import java.io.BufferedReader +import java.io.InputStream +import java.io.InputStreamReader + + +class ExtensionCsvImport(private val context: Context, private val objectHolder: MeMoMaObjectHolder, private val importUri: Uri) +{ + fun importFromCsvFile() + { + try + { + val inputStream: InputStream? = context.contentResolver.openInputStream(importUri) + val reader = BufferedReader(InputStreamReader(inputStream)) + + var dataLine: String? = readRecord(reader) + while (dataLine != null) + { + if (dataLine.startsWith(";") != true) + { + // データ行だった。ログに出力する！ + parseRecord(dataLine, objectHolder) + } + // 次のデータ行を読み出す + dataLine = readRecord(reader) + } + inputStream?.close() + } + catch (e: Exception) + { + e.printStackTrace() + } + } + + private fun readRecord(buf: BufferedReader): String? + { + var oneRecord: String? = null + try + { + var oneLine = buf.readLine() + while (oneLine != null) + { + oneRecord = if (oneRecord == null) oneLine else oneRecord + oneLine + if (oneRecord.indexOf(",;!<_$") > 0) + { + // レコード末尾が見つかったので break する。 + break + } + // 次の行を読みだす。 + oneLine = buf.readLine() + } + } + catch (ex: java.lang.Exception) + { + // + Log.v(TAG, "CSV:readRecord() ex : $ex") + oneRecord = null + } + return (oneRecord) + } + private fun parseRecord(dataLine: String, objectHolder: MeMoMaObjectHolder) + { + val detailIndex: Int + val userCheckIndexTrue: Int + val userCheckIndexFalse: Int + val nextIndex: Int + val label: String + val detail: String + val userChecked: Boolean + try + { + detailIndex = dataLine.indexOf("\",\"") + if (detailIndex < 0) + { + Log.v(TAG, "parseRecord() : label wrong : $dataLine") + return + } + label = dataLine.substring(1, detailIndex) + userCheckIndexTrue = dataLine.indexOf("\",True,", detailIndex) + userCheckIndexFalse = dataLine.indexOf("\",False,", detailIndex) + if (userCheckIndexFalse > detailIndex) + { + detail = dataLine.substring(detailIndex + 3, userCheckIndexFalse) + userChecked = false + nextIndex = userCheckIndexFalse + 8 // 8は、 ",False, を足した数 + } + else if (userCheckIndexTrue > detailIndex) + { + detail = dataLine.substring(detailIndex + 3, userCheckIndexTrue) + userChecked = true + nextIndex = userCheckIndexTrue + 7 // 7は、 ",True, を足した数 + } + else // if ((userCheckIndexTrue <= detailIndex)&&(userCheckIndexFalse <= detailIndex)) + { + Log.v(TAG, "parseRecord() : detail wrong : $dataLine") + return + } + + // 残りのデータを切り出す。 + val datas = + dataLine.substring(nextIndex).split(",".toRegex()).dropLastWhile { it.isEmpty() } + .toTypedArray() + if (datas.size < 6) + { + Log.v(TAG, "parseRecord() : data size wrong : " + datas.size) + return + } + val drawStyle = datas[0].toInt() + val paintStyle = datas[1] + val centerX = datas[2].toFloat() + val centerY = datas[3].toFloat() + val width = datas[4].toFloat() + val height = datas[5].toFloat() + val left = centerX - width / 2.0f + val top = centerY - height / 2.0f + + // オブジェクトのデータを作成する + val pos = objectHolder.createPosition(left, top, drawStyle) + if (pos == null) + { + Log.v(TAG, "parseRecord() : object create failure.") + return + } + pos.setRectRight(left + width) + pos.setRectBottom(top + height) + pos.label = label + pos.detail = detail + pos.paintStyle = paintStyle + pos.userChecked = userChecked + Log.v(TAG, "OBJECT CREATED: $label($left,$top) [$drawStyle]") + } + catch (ex: Exception) + { + Log.v(TAG, "parseRecord() $ex") + ex.printStackTrace() + } + } + + companion object { + private val TAG = ExtensionCsvImport::class.java.simpleName + } + +} \ No newline at end of file diff --git a/app/src/main/java/jp/sourceforge/gokigen/memoma/io/MeMoMaFileExportCsvProcess.java b/app/src/main/java/jp/sourceforge/gokigen/memoma/io/MeMoMaFileExportCsvProcess.java index f84e2fa..22dfed6 100644 --- a/app/src/main/java/jp/sourceforge/gokigen/memoma/io/MeMoMaFileExportCsvProcess.java +++ b/app/src/main/java/jp/sourceforge/gokigen/memoma/io/MeMoMaFileExportCsvProcess.java @@ -174,14 +174,10 @@ public class MeMoMaFileExportCsvProcess extends AsyncTask