Merge lp:~s-mika/financisto/csv_import into lp:~financisto-dev/financisto/trunk

[smika]

Hi,
this is my first release for csv import function.
I am working now for some weeks with this import feature and it works for me.
Got no feedback from function requestor but think its worth for merging review.
Any feedback is welcome.
Regards
Sebastian

=== modified file '.classpath'
--- .classpath	2011-06-29 17:46:15 +0000
+++ .classpath	2011-10-23 17:45:27 +0000
@@ -1,13 +1,14 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<classpath>
-	<classpathentry kind="src" path="gen"/>
-	<classpathentry kind="src" path="src"/>
-	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/Android 2.2 Google APIs"/>
-	<classpathentry kind="con" path="com.android.ide.eclipse.adt.ANDROID_FRAMEWORK"/>
-	<classpathentry kind="lib" path="lib/trace-0.2.0.jar"/>
-	<classpathentry exported="true" kind="lib" path="lib/rfc2445-no-joda.jar" sourcepath="H:/Work/Java/Android/google-rfc-2445-read-only/src"/>
-	<classpathentry kind="lib" path="lib/GDocsAPI.jar"/>
-	<classpathentry kind="lib" path="lib/CWAC-WakefulIntentService.jar"/>
-	<classpathentry kind="con" path="org.eclipse.jdt.USER_LIBRARY/Android 2.2 Google APIs"/>
-	<classpathentry kind="output" path="bin"/>
-</classpath>
+<?xml version="1.0" encoding="UTF-8"?>
+<classpath>
+	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.launching.macosx.MacOSXType/Java SE 6 (MacOS X Default)"/>
+	<classpathentry kind="con" path="com.android.ide.eclipse.adt.ANDROID_FRAMEWORK"/>
+	<classpathentry kind="lib" path="lib/trace-0.2.0.jar"/>
+	<classpathentry exported="true" kind="lib" path="lib/rfc2445-no-joda.jar" sourcepath="H:/Work/Java/Android/google-rfc-2445-read-only/src"/>
+	<classpathentry kind="lib" path="lib/GDocsAPI.jar"/>
+	<classpathentry kind="lib" path="lib/CWAC-WakefulIntentService.jar"/>
+	<classpathentry kind="con" path="org.eclipse.jdt.USER_LIBRARY/Android 2.2 Google APIs"/>
+	<classpathentry kind="src" path="src"/>
+	<classpathentry kind="src" path="gen"/>
+	<classpathentry kind="src" path="GreenDroid_src"/>
+	<classpathentry kind="output" path="bin"/>
+</classpath>

=== modified file '.project'
--- .project	2011-02-20 19:39:08 +0000
+++ .project	2011-10-23 17:45:27 +0000
@@ -1,33 +1,40 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<projectDescription>
-	<name>Financisto</name>
-	<comment></comment>
-	<projects>
-	</projects>
-	<buildSpec>
-		<buildCommand>
-			<name>com.android.ide.eclipse.adt.ResourceManagerBuilder</name>
-			<arguments>
-			</arguments>
-		</buildCommand>
-		<buildCommand>
-			<name>com.android.ide.eclipse.adt.PreCompilerBuilder</name>
-			<arguments>
-			</arguments>
-		</buildCommand>
-		<buildCommand>
-			<name>org.eclipse.jdt.core.javabuilder</name>
-			<arguments>
-			</arguments>
-		</buildCommand>
-		<buildCommand>
-			<name>com.android.ide.eclipse.adt.ApkBuilder</name>
-			<arguments>
-			</arguments>
-		</buildCommand>
-	</buildSpec>
-	<natures>
-		<nature>com.android.ide.eclipse.adt.AndroidNature</nature>
-		<nature>org.eclipse.jdt.core.javanature</nature>
-	</natures>
-</projectDescription>
+<?xml version="1.0" encoding="UTF-8"?>
+<projectDescription>
+	<name>Financisto</name>
+	<comment></comment>
+	<projects>
+	</projects>
+	<buildSpec>
+		<buildCommand>
+			<name>com.android.ide.eclipse.adt.ResourceManagerBuilder</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
+		<buildCommand>
+			<name>com.android.ide.eclipse.adt.PreCompilerBuilder</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
+		<buildCommand>
+			<name>org.eclipse.jdt.core.javabuilder</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
+		<buildCommand>
+			<name>com.android.ide.eclipse.adt.ApkBuilder</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
+	</buildSpec>
+	<natures>
+		<nature>com.android.ide.eclipse.adt.AndroidNature</nature>
+		<nature>org.eclipse.jdt.core.javanature</nature>
+	</natures>
+	<linkedResources>
+		<link>
+			<name>GreenDroid_src</name>
+			<type>2</type>
+			<locationURI>_android_GreenDroid_612cb559/src</locationURI>
+		</link>
+	</linkedResources>
+</projectDescription>

=== modified file 'AndroidManifest.xml'
--- AndroidManifest.xml	2011-09-19 12:45:09 +0000
+++ AndroidManifest.xml	2011-10-23 17:45:27 +0000
@@ -183,7 +183,9 @@
 
         <activity android:name=".activity.SplitTransactionActivity" android:label="@string/split_transaction" />
         <activity android:name=".activity.SplitTransferActivity" android:label="@string/split_transfer"/>
-
+		<activity android:name=".activity.CsvImportActivity" android:label="@string/csv_import" 
+			android:theme="@android:style/Theme.Dialog" android:configChanges="orientation|keyboardHidden"/>
+		
 	</application>
 	
 	<uses-sdk android:minSdkVersion="3" android:targetSdkVersion="5"/>

=== modified file 'default.properties'
--- default.properties	2011-02-20 19:39:08 +0000
+++ default.properties	2011-10-23 17:45:27 +0000
@@ -12,3 +12,5 @@
 # Project target.
 target=Google Inc.:Google APIs:8
 apk-configurations=
+android.library=false
+android.library.reference.1=../../workspace/GreenDroid

=== added file 'res/drawable/ic_launcher_folder_small.png'
Binary files res/drawable/ic_launcher_folder_small.png	1970-01-01 00:00:00 +0000 and res/drawable/ic_launcher_folder_small.png	2011-10-23 17:45:27 +0000 differ
=== added file 'res/layout/csv_import.xml'
--- res/layout/csv_import.xml	1970-01-01 00:00:00 +0000
+++ res/layout/csv_import.xml	2011-10-23 17:45:27 +0000
@@ -0,0 +1,70 @@
+<!--
+  Copyright (c) 2010 Denis Solonenko.
+  All rights reserved. This program and the accompanying materials
+  are made available under the terms of the GNU Public License v2.0
+  which accompanies this distribution, and is available at
+  http://www.gnu.org/licenses/old-licenses/gpl-2.0.html
+  
+  Contributors:
+      Denis Solonenko - initial API and implementation
+-->
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+	android:layout_width="fill_parent" android:layout_height="fill_parent"
+	android:orientation="vertical" android:padding="3dp">
+	<View android:layout_height="1dp" android:background="@drawable/divider_horizontal_dark"
+		android:layout_width="fill_parent" android:layout_marginLeft="10dp"
+		android:layout_marginRight="10dp" />
+	<TextView android:layout_height="wrap_content"
+		android:layout_width="fill_parent" android:layout_marginLeft="3dp" android:text="@string/file_name"/>
+	<LinearLayout android:orientation="horizontal" android:layout_width="fill_parent" android:layout_height="wrap_content">
+		<EditText android:layout_weight="1" android:layout_width="0dip" android:layout_height="wrap_content" android:id="@+id/edFilename">
+			<requestFocus></requestFocus>
+		</EditText>
+		<ImageButton android:layout_width="wrap_content" android:layout_gravity="center_vertical" android:src="@drawable/ic_launcher_folder_small" android:id="@+id/btn_browse" android:layout_height="wrap_content"></ImageButton>
+	</LinearLayout>
+    <TextView android:layout_height="wrap_content"
+        android:layout_width="fill_parent" android:layout_marginLeft="3dp"
+        android:text="@string/accounts"/>
+    <Button android:layout_height="wrap_content" android:id="@+id/bAccounts"
+        android:layout_width="fill_parent" android:text="@string/choose_account"/>
+	<View android:layout_height="1dp" android:background="@drawable/divider_horizontal_dark"
+		android:layout_width="fill_parent" android:layout_marginLeft="10dp"
+		android:layout_marginRight="10dp" />
+
+    <TableLayout android:layout_height="wrap_content"
+        android:layout_width="fill_parent"
+        android:stretchColumns="*">
+        <TableRow>
+            <TextView android:layout_marginLeft="3dp"
+                android:text="@string/decimals"/>
+            <TextView android:layout_marginLeft="3dp"
+                android:text="@string/decimal_separator"/>
+            <TextView android:layout_marginLeft="3dp"
+                android:text="@string/group_separator"/>
+        </TableRow>
+        <TableRow>
+            <Spinner android:id="@+id/spinnerDecimals"
+                android:entries="@array/decimals"/>
+            <Spinner android:id="@+id/spinnerDecimalSeparators"
+                android:entries="@array/decimal_separators"/>
+            <Spinner android:id="@+id/spinnerGroupSeparators"
+                android:entries="@array/group_separators"/>
+        </TableRow>
+        <TableRow>
+            <TextView android:layout_marginLeft="3dp" android:text="@string/field_separator"></TextView>
+        </TableRow>
+        <TableRow>
+            <Spinner android:entries="@array/field_separators" android:id="@+id/spinnerFieldSeparator"></Spinner>
+        </TableRow>
+        <View android:layout_height="1dp" android:background="@drawable/divider_horizontal_dark"
+            android:layout_width="fill_parent" android:layout_marginLeft="10dp"
+            android:layout_marginRight="10dp" />
+    </TableLayout>
+    <TextView android:layout_height="wrap_content"
+        android:layout_width="fill_parent" android:layout_marginLeft="3dp"
+        android:text="@string/date_format"/>
+    <Spinner android:layout_height="wrap_content" android:layout_width="fill_parent"
+             android:id="@+id/spinnerDateFormats" android:entries="@array/date_format_values"/>
+
+	<include layout="@layout/ok_cancel_buttons" />
+</LinearLayout>
\ No newline at end of file

=== modified file 'res/values-de/strings.xml'
--- res/values-de/strings.xml	2011-09-12 22:55:24 +0000
+++ res/values-de/strings.xml	2011-10-23 17:45:27 +0000
@@ -653,6 +653,11 @@
 	<string name="date_format">Datumsformat</string>
 	<string name="pin_protection_lock_transaction">Neue(n) Transaktion\\Transfer sperren</string>
 	<string name="pin_protection_lock_transaction_summary">\'Neue Transaktion\'- und \'Neuer Transfer\'-Bildschirm mit PIN sperren</string>
+	<string name="file_name">Dateiname</string>
+	<string name="chosse_account">Wähle Konto</string>
+	<string name="no_filemanager_installed">Kein Dateimanager installiert</string>
+	<string name="csv_import">CSV Import</string>
+	<string name="csv_import_inprogress">CSV Import in Bearbeitung</string>
 
 	<string name="split">[Split-Buchung...]</string>
 	<string name="split_transaction">[Split-Transaktion]</string>
@@ -670,5 +675,10 @@
 	<string name="unsplit_adjust_last_summary">Letzte Buchung anpassen</string>
 
 	<string name="add_transfer">Transfer hinzufügen</string>
+	<string name="select_filename">Wähle Import Dateiname</string>
+	<string name="import_file_not_found">Import Datei nicht gefunden</string>
+	<string name="import_unknown_category">Unbekannte Kategorie in Importdatei</string>
+	<string name="import_unknown_project">Unbekanntes Projekt in Importdatei</string>
+	<string name="import_wrong_currency">Falsche Währung in Importdatei</string>
 
 </resources>

=== modified file 'res/values/common.xml'
--- res/values/common.xml	2011-07-25 17:44:44 +0000
+++ res/values/common.xml	2011-10-23 17:45:27 +0000
@@ -154,7 +154,8 @@
     <string-array name="date_format_values">
         <item>dd/MM/yyyy</item>
         <item>MM/dd/yyyy</item>
-        <item>yyyy-MM-dd</item>
+        <item>yyyy-MM-dd</item>
+        <item>dd.MM.yyyy</item>
     </string-array>
 
     <string-array name="unsplit_quick_action_items">

=== modified file 'res/values/strings.xml'
--- res/values/strings.xml	2011-07-25 17:44:44 +0000
+++ res/values/strings.xml	2011-10-23 17:45:27 +0000
@@ -659,6 +659,19 @@
     <string name="unsplit_adjust_last">Last</string>
     <string name="unsplit_adjust_last_summary">Adjust last</string>
 
-    <string name="add_transfer">Add Transfer</string>
+    <string name="add_transfer">Add Transfer</string>
+    <string name="file_name">File name</string>
+    <string name="choose_account">Choose account</string>
+    <string name="no_filemanager_installed">No filemanager installed</string>
+    <string name="csv_import">CSV Import</string>
+    <string name="csv_import_inprogress">CSV Import in progress</string>
+    <string name="select_filename">Select Import filename</string>
+    <string name="import_file_not_found">Import file not found</string>
+    <string name="import_unknown_category">Unknown category in import file</string>
+    <string name="import_unknown_project">Unknown project in import file</string>
+    <string name="import_wrong_currency">Wrong currency in import file</string>
+    <string name="import_illegal_argument_exception">Illegal argument exception</string>
+    <string name="import_parse_error">Parsing error in import file</string>
+    <string name="csv_import_error">CSV import error</string>
 
 </resources>

=== added file 'src/ru/orangesoftware/financisto/activity/AbstractImportActivity.java'
--- src/ru/orangesoftware/financisto/activity/AbstractImportActivity.java	1970-01-01 00:00:00 +0000
+++ src/ru/orangesoftware/financisto/activity/AbstractImportActivity.java	2011-10-23 17:45:27 +0000
@@ -0,0 +1,125 @@
+/*******************************************************************************
+ * Copyright (c) 2010 Denis Solonenko.
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the GNU Public License v2.0
+ * which accompanies this distribution, and is available at
+ * http://www.gnu.org/licenses/old-licenses/gpl-2.0.html
+ * 
+ * Contributors:
+ *     Denis Solonenko - initial API and implementation
+ ******************************************************************************/
+package ru.orangesoftware.financisto.activity;
+
+import android.app.Activity;
+import android.content.ActivityNotFoundException;
+import android.content.Intent;
+import android.net.Uri;
+import android.os.Bundle;
+import android.util.Log;
+import android.view.View;
+import android.view.View.OnClickListener;
+import android.widget.Button;
+import android.widget.EditText;
+import android.widget.ImageButton;
+import android.widget.Toast;
+import ru.orangesoftware.financisto.R;
+import ru.orangesoftware.financisto.blotter.WhereFilter;
+import ru.orangesoftware.financisto.blotter.WhereFilter.DateTimeCriteria;
+import ru.orangesoftware.financisto.utils.DateUtils;
+import ru.orangesoftware.financisto.utils.PinProtection;
+import ru.orangesoftware.financisto.utils.DateUtils.Period;
+import ru.orangesoftware.financisto.utils.DateUtils.PeriodType;
+
+import java.text.DateFormat;
+import java.util.Date;
+
+public abstract class AbstractImportActivity extends Activity {
+
+    public static final int IMPORT_FILENAME_REQUESTCODE=0xff;
+    public static final int IMPORT_XSLFILENAME_REQUESTCODE=0xfe;
+    
+    private final int layoutId;
+	private DateFormat df;
+	protected ImageButton bBrowse;
+    protected EditText edFilename;
+
+
+    public AbstractImportActivity(int layoutId) {
+        this.layoutId = layoutId;
+    }
+
+    @Override
+	protected void onCreate(Bundle savedInstanceState) {
+		super.onCreate(savedInstanceState);
+		setContentView(layoutId);
+		
+		df = DateUtils.getShortDateFormat(this);
+		
+        bBrowse = (ImageButton) findViewById(R.id.btn_browse);
+        bBrowse.setOnClickListener(new View.OnClickListener() {
+            @Override
+            public void onClick(View v) {
+                openFile();
+            }
+        });
+        edFilename=(EditText) findViewById(R.id.edFilename);
+
+        internalOnCreate();
+	}
+
+    protected void openFile() {
+    	String filename = edFilename.getText().toString();
+
+        Intent intent = new Intent(Intent.ACTION_GET_CONTENT);
+        intent.addCategory(Intent.CATEGORY_OPENABLE);
+
+        intent.setData(Uri.parse("file://" + filename));
+        intent.setType("*/*");
+
+        try {
+            startActivityForResult(intent,IMPORT_FILENAME_REQUESTCODE);
+        } catch (ActivityNotFoundException e) {
+            // No compatible file manager was found.
+            Toast.makeText(this, R.string.no_filemanager_installed, Toast.LENGTH_SHORT).show();
+        }
+
+	}
+
+      
+    protected abstract void internalOnCreate();
+
+    protected abstract void updateResultIntentFromUi(Intent data);
+
+    
+	@Override
+	protected void onActivityResult(int requestCode, int resultCode, Intent data) {
+		if (requestCode ==IMPORT_FILENAME_REQUESTCODE) {
+			if (resultCode == RESULT_OK && data != null) {
+				String filename = data.getDataString();
+				if (filename != null) {
+					if (filename.startsWith("file://")) {
+						filename = filename.substring(7);
+					}
+					filename = Uri.decode(filename);
+					edFilename.setText(filename);
+					savePreferences();
+				}
+			}
+		}
+
+	}
+	
+	@Override
+	protected void onPause() {
+		super.onPause();
+		PinProtection.lock(this);
+	}
+
+	@Override
+	protected void onResume() {
+		super.onResume();
+		PinProtection.unlock(this);
+	}	
+	
+	abstract void savePreferences();
+}

=== added file 'src/ru/orangesoftware/financisto/activity/CsvImportActivity.java'
--- src/ru/orangesoftware/financisto/activity/CsvImportActivity.java	1970-01-01 00:00:00 +0000
+++ src/ru/orangesoftware/financisto/activity/CsvImportActivity.java	2011-10-23 17:45:27 +0000
@@ -0,0 +1,306 @@
+/*******************************************************************************
+ * Copyright (c) 2010 Denis Solonenko.
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the GNU Public License v2.0
+ * which accompanies this distribution, and is available at
+ * http://www.gnu.org/licenses/old-licenses/gpl-2.0.html
+ * 
+ * Contributors:
+ *     Denis Solonenko - initial API and implementation
+ ******************************************************************************/
+package ru.orangesoftware.financisto.activity;
+
+import java.util.ArrayList;
+import java.util.List;
+
+import ru.orangesoftware.financisto.R;
+import ru.orangesoftware.financisto.db.DatabaseAdapter;
+import ru.orangesoftware.financisto.model.Account;
+import ru.orangesoftware.financisto.model.MultiChoiceItem;
+import ru.orangesoftware.financisto.utils.CurrencyExportPreferences;
+import ru.orangesoftware.financisto.view.NodeInflater;
+import android.app.AlertDialog;
+import android.app.ProgressDialog;
+import android.content.ActivityNotFoundException;
+import android.content.Context;
+import android.content.DialogInterface;
+import android.content.Intent;
+import android.content.SharedPreferences;
+import android.net.Uri;
+import android.text.TextUtils;
+import android.view.LayoutInflater;
+import android.view.View;
+import android.view.View.OnClickListener;
+import android.widget.Button;
+import android.widget.EditText;
+import android.widget.ImageButton;
+import android.widget.ListAdapter;
+import android.widget.Spinner;
+import android.widget.Toast;
+
+
+
+public class CsvImportActivity extends AbstractImportActivity implements ActivityLayoutListener {
+
+    public static final String CSV_IMPORT_SELECTED_ACCOUNT = "CSV_IMPORT_SELECTED_ACCOUNT";
+    public static final String CSV_IMPORT_DATE_FORMAT = "CSV_IMPORT_DATE_FORMAT";
+    public static final String CSV_IMPORT_FILENAME="CSV_IMPORT_FILENAME";
+    public static final String CSV_IMPORT_FIELD_SEPARATOR="CSV_IMPORT_FIELD_SEPARATOR";
+    
+    private final CurrencyExportPreferences currencyPreferences = new CurrencyExportPreferences("csv");
+
+    private DatabaseAdapter db;
+    private ArrayList<Account> accounts;
+    private int checkedAccount=1;
+    private Button bAccounts;
+    
+    
+    public CsvImportActivity() {
+        super(R.layout.csv_import);
+    }
+
+    @Override
+    protected void internalOnCreate() {
+        LayoutInflater layoutInflater = (LayoutInflater)getSystemService(Context.LAYOUT_INFLATER_SERVICE);
+        NodeInflater nodeInflater = new NodeInflater(layoutInflater);
+        final ActivityLayout activityLayout = new ActivityLayout(nodeInflater, this);
+
+        db = new DatabaseAdapter(this);
+        db.open();
+
+        accounts = db.em().getAllAccountsList();
+        
+
+        bAccounts = (Button)findViewById(R.id.bAccounts);
+        bAccounts.setOnClickListener(new View.OnClickListener() {
+            @Override
+            public void onClick(View view) {
+                int count = accounts.size();
+        		String[] accountsTitles = new String[count];
+        		for (int i=0; i<count; i++) {
+        			accountsTitles[i] = accounts.get(i).getTitle();
+        			if (accounts.get(i).isChecked()){
+        				checkedAccount=i;
+        			}
+        		}
+        		
+        		AlertDialog show = new AlertDialog.Builder(CsvImportActivity.this)
+        			.setTitle(R.string.accounts)
+        			.setPositiveButton(R.string.ok, new DialogInterface.OnClickListener(){
+        				public void onClick(DialogInterface dialog, int which) {
+        	        		for (int i=0; i<accounts.size(); i++) {
+        	        			if (i==checkedAccount){
+        	        				accounts.get(i).setChecked(true);
+        	        			}else
+        	        				accounts.get(i).setChecked(false);
+        	        		}
+        	        		bAccounts.setText(accounts.get(checkedAccount).getTitle());
+        	        		savePreferences();
+        				}
+        				
+        			})
+        			.setSingleChoiceItems(accountsTitles, checkedAccount, new DialogInterface.OnClickListener(){
+        				public void onClick(DialogInterface dialog, int which) {
+        					checkedAccount=which;
+        				}
+        			})
+        			.setNegativeButton(R.string.cancel, new DialogInterface.OnClickListener(){
+        				@Override
+        				public void onClick(DialogInterface dialog, int which) {
+				
+        				}
+        			})
+        			.show();
+
+            }
+        });
+      
+        Button bOk = (Button)findViewById(R.id.bOK);
+		bOk.setOnClickListener(new OnClickListener() {
+           public void onClick(View view) {
+           	if (edFilename.getText().toString().equals("")) {
+					Toast.makeText(CsvImportActivity.this, R.string.select_filename, Toast.LENGTH_SHORT).show();
+					return;	
+				}
+           	if (checkedAccount==-1) {
+				Toast.makeText(CsvImportActivity.this, R.string.choose_account, Toast.LENGTH_SHORT).show();
+				return;	
+			}	
+       	
+           		Intent data = new Intent();
+               updateResultIntentFromUi(data);
+               setResult(RESULT_OK, data);
+               finish();
+           }
+       });
+
+		Button bCancel = (Button)findViewById(R.id.bCancel);
+		bCancel.setOnClickListener(new OnClickListener() {
+           public void onClick(View view) {
+               setResult(RESULT_CANCELED);
+               finish();
+           }
+       });
+		
+    }
+
+    
+
+	@Override
+    protected void onDestroy() {
+        db.close();
+        super.onDestroy();
+    }
+
+	@Override
+	public void onSelected(int id, List<? extends MultiChoiceItem> items) {
+	    List<Account> selectedAccounts = getSelectedAccounts();
+        if (selectedAccounts.size() == 0 || selectedAccounts.size() == accounts.size()) {
+            bAccounts.setText(R.string.choose_account);
+            checkedAccount=-1;
+        } else {
+            StringBuilder sb = new StringBuilder();
+            for (Account a : selectedAccounts) {
+                appendItemTo(sb, a.title);
+                checkedAccount=1;
+            }
+            bAccounts.setText(sb.toString());
+        }
+    }
+
+    private ArrayList<Account> getSelectedAccounts() {
+        ArrayList<Account> selected = new ArrayList<Account>();
+        for (MultiChoiceItem i : accounts) {
+            if (i.isChecked()) {
+                selected.add((Account)i);
+            }
+        }
+        return selected;
+    }
+
+    private void appendItemTo(StringBuilder sb, String s) {
+        if (sb.length() > 0) {
+            sb.append(", ");
+        }
+        sb.append(s);
+    }
+
+    @Override
+    public void onSelectedPos(int id, int selectedPos) {
+    }
+
+    @Override
+    public void onSelectedId(int id, long selectedId) {
+    }
+
+    @Override
+    public void onClick(View view) {
+    }
+
+    @Override
+    protected void updateResultIntentFromUi(Intent data) {
+        currencyPreferences.updateIntentFromUI(this, data);
+        long[] selectedIds = getSelectedAccountsIds();
+        if (selectedIds.length > 0) {
+            data.putExtra(CSV_IMPORT_SELECTED_ACCOUNT, selectedIds);
+        }
+        Spinner dateFormats = (Spinner)findViewById(R.id.spinnerDateFormats);
+        data.putExtra(CSV_IMPORT_DATE_FORMAT, dateFormats.getSelectedItem().toString());
+        data.putExtra(CSV_IMPORT_FILENAME, edFilename.getText().toString());
+        Spinner fieldSeparator = (Spinner)findViewById(R.id.spinnerFieldSeparator);
+        data.putExtra(CSV_IMPORT_FIELD_SEPARATOR, fieldSeparator.getSelectedItem().toString().charAt(1));
+        
+    }
+
+    private long[] getSelectedAccountsIds() {
+        List<Long> selectedAccounts = new ArrayList<Long>(accounts.size());
+        for (Account account : accounts) {
+            if (account.isChecked()) {
+                selectedAccounts.add(account.id);
+            }
+        }
+        int count = selectedAccounts.size();
+        long[] ids = new long[count];
+        for (int i=0; i<count; i++) {
+            ids[i] = selectedAccounts.get(i);
+        }
+        return ids;
+    }
+
+    @Override
+	protected void onPause() {
+		super.onPause();
+		savePreferences();
+	}
+
+	@Override
+	protected void onResume() {
+		super.onResume();
+		restorePreferences();
+	}
+
+	void savePreferences() {
+		SharedPreferences.Editor editor = getPreferences(MODE_PRIVATE).edit();
+
+        currencyPreferences.savePreferences(this, editor);
+
+        long[] selectedIds = getSelectedAccountsIds();
+        if (selectedIds.length > 0) {
+            editor.putString(CSV_IMPORT_SELECTED_ACCOUNT, joinSelectedAccounts(selectedIds));
+        }
+
+        Spinner dateFormats = (Spinner)findViewById(R.id.spinnerDateFormats);
+		editor.putInt(CSV_IMPORT_DATE_FORMAT, dateFormats.getSelectedItemPosition());
+		editor.putString(CSV_IMPORT_FILENAME, edFilename.getText().toString());
+		Spinner fieldSeparator = (Spinner)findViewById(R.id.spinnerFieldSeparator);
+        editor.putInt(CSV_IMPORT_FIELD_SEPARATOR, fieldSeparator.getSelectedItemPosition());
+		editor.commit();
+	}
+
+    private String joinSelectedAccounts(long[] selectedIds) {
+        StringBuilder sb = new StringBuilder();
+        for (long selectedId : selectedIds) {
+            if (sb.length() > 0) sb.append(",");
+            sb.append(selectedId);
+        }
+        return sb.toString();
+    }
+
+    private void restorePreferences() {
+		SharedPreferences preferences = getPreferences(MODE_PRIVATE);
+
+        currencyPreferences.restorePreferences(this, preferences);
+
+        String selectedIds = preferences.getString(CSV_IMPORT_SELECTED_ACCOUNT, "");
+        parseSelectedAccounts(selectedIds);
+        onSelected(-1, accounts);
+
+        Spinner dateFormats = (Spinner)findViewById(R.id.spinnerDateFormats);
+        dateFormats.setSelection(preferences.getInt(CSV_IMPORT_DATE_FORMAT, 0));
+        edFilename=(EditText)findViewById(R.id.edFilename);
+        edFilename.setText(preferences.getString(CSV_IMPORT_FILENAME,""));
+        Spinner fieldSeparator = (Spinner)findViewById(R.id.spinnerFieldSeparator);
+        fieldSeparator.setSelection(preferences.getInt(CSV_IMPORT_FIELD_SEPARATOR, 0));
+    }
+
+    private void parseSelectedAccounts(String selectedIds) {
+        try {
+            TextUtils.SimpleStringSplitter splitter = new TextUtils.SimpleStringSplitter(',');
+            splitter.setString(selectedIds);
+            for (String s : splitter) {
+                long id = Long.parseLong(s);
+                for (Account account : accounts) {
+                    if (account.id == id) {
+                        account.setChecked(true);
+                        break;
+                    }
+                }
+            }
+        } catch (Exception ex) {
+            // ignore
+        }
+    }
+
+	
+
+}

=== modified file 'src/ru/orangesoftware/financisto/activity/MainActivity.java'
--- src/ru/orangesoftware/financisto/activity/MainActivity.java	2011-07-25 17:44:44 +0000
+++ src/ru/orangesoftware/financisto/activity/MainActivity.java	2011-10-23 17:45:27 +0000
@@ -57,6 +57,8 @@
 import ru.orangesoftware.financisto.export.csv.CsvExportTask;
 import ru.orangesoftware.financisto.export.qif.QifExportOptions;
 import ru.orangesoftware.financisto.export.qif.QifExportTask;
+import ru.orangesoftware.financisto.imports.csv.CsvImport;
+import ru.orangesoftware.financisto.imports.csv.CsvImportOptions;
 import ru.orangesoftware.financisto.utils.*;
 
 import java.io.IOException;
@@ -68,7 +70,8 @@
 	
 	private static final int ACTIVITY_CSV_EXPORT = 2;
     private static final int ACTIVITY_QIF_EXPORT = 3;
-
+    private static final int ACTIVITY_CSV_IMPORT = 4;
+    
 	private static final int MENU_PREFERENCES = Menu.FIRST+1;
 	private static final int MENU_ABOUT = Menu.FIRST+2;
 	private static final int MENU_BACKUP = Menu.FIRST+3;
@@ -81,7 +84,8 @@
 	private static final int MENU_MASS_OP = Menu.FIRST+10;
     private static final int MENU_DONATE = Menu.FIRST+11;
     private static final int MENU_QIF_EXPORT = Menu.FIRST+12;
-
+    private static final int MENU_CSV_IMPORT = Menu.FIRST+13;
+    
 	private final HashMap<String, Boolean> started = new HashMap<String, Boolean>();
 
 	@Override
@@ -139,7 +143,12 @@
                 QifExportOptions options = QifExportOptions.fromIntent(data);
                 doQifExport(options);
 			}
-		}
+		} else if (requestCode == ACTIVITY_CSV_IMPORT) {
+			if (resultCode == RESULT_OK) {
+                CsvImportOptions options = CsvImportOptions.fromIntent(data);
+                doCsvImport(options);                
+			}
+		}		
 	}
 	
 	private void doCsvExport(CsvExportOptions options) {
@@ -147,6 +156,12 @@
 		new CsvExportTask(this, progressDialog, options).execute();
 	}
 	
+	private void doCsvImport(CsvImportOptions options) {
+        ProgressDialog progressDialog = ProgressDialog.show(this, null, getString(R.string.csv_import_inprogress), true);
+        new CsvImportTask(this, progressDialog, options).execute();
+    }
+
+	
     private void doQifExport(QifExportOptions options) {
         ProgressDialog progressDialog = ProgressDialog.show(this, null, getString(R.string.qif_export_inprogress), true);
         new QifExportTask(this, progressDialog, options).execute();
@@ -246,6 +261,7 @@
 		menu.addSubMenu(0, MENU_BACKUP_GDOCS, 0, R.string.backup_database_gdocs);
 		menu.addSubMenu(0, MENU_RESTORE_GDOCS, 0, R.string.restore_database_gdocs);
 		menu.addSubMenu(0, MENU_CSV_EXPORT, 0, R.string.csv_export);
+		menu.addSubMenu(0, MENU_CSV_IMPORT, 0, R.string.csv_import);
         menu.addSubMenu(0, MENU_QIF_EXPORT, 0, R.string.qif_export);
         menu.addSubMenu(0, MENU_DONATE, 0, R.string.donate);
 		menu.addSubMenu(0, MENU_ABOUT, 0, R.string.about);
@@ -305,6 +321,9 @@
 		case MENU_RESTORE_GDOCS:
 			doImportFromGoogleDocs();
 			break;
+		case MENU_CSV_IMPORT:
+            doCsvImport();
+            break;
 		}
 		return false;
 	}
@@ -394,6 +413,11 @@
 		startActivityForResult(intent, ACTIVITY_CSV_EXPORT);
 	}
 
+	private void doCsvImport() {
+		Intent intent = new Intent(this, CsvImportActivity.class);
+		startActivityForResult(intent, ACTIVITY_CSV_IMPORT);
+	}
+
     private void doQifExport() {
         Intent intent = new Intent(this, QifExportActivity.class);
         startActivityForResult(intent, ACTIVITY_QIF_EXPORT);
@@ -653,6 +677,57 @@
 
 	}
 
+	public class CsvImportTask extends ImportExportAsyncTask {
+
+        private final CsvImportOptions options;
+
+    	public CsvImportTask(Context context, ProgressDialog dialog, CsvImportOptions options) {
+    		
+    		//super(context, dialog, null);
+    		super(MainActivity.this, dialog, new ImportExportAsyncTaskListener(){
+				public void onCompleted() {
+					onTabChanged(getTabHost().getCurrentTabTag());
+				}
+			});
+            
+    		this.options = options;
+    	}
+    	
+
+    	@Override
+    	protected Object work(Context context, DatabaseAdapter db, String...params) throws Exception {
+    		try{
+    			CsvImport csvimport = new CsvImport(db, options,context);
+        		return csvimport.doImport();	
+    		}catch(Exception e)
+    		{
+    			if(e.getMessage().equals("Import file not found"))
+					handler.sendEmptyMessage(R.string.import_file_not_found);
+				else if(e.getMessage().equals("Unknown category in import line"))
+					handler.sendEmptyMessage(R.string.import_unknown_category);
+				else if(e.getMessage().equals("Unknown project in import line"))
+					handler.sendEmptyMessage(R.string.import_unknown_project);
+				else if(e.getMessage().equals("Wrong currency in import line"))
+					handler.sendEmptyMessage(R.string.import_wrong_currency);
+				else if(e.getMessage().equals("IllegalArgumentException"))
+					handler.sendEmptyMessage(R.string.import_illegal_argument_exception);
+				else if(e.getMessage().equals("ParseException"))
+					handler.sendEmptyMessage(R.string.import_parse_error);
+				else
+					handler.sendEmptyMessage(R.string.csv_import_error);
+    			throw e;
+    		}
+    		
+    	}
+
+    	@Override
+    	protected String getSuccessMessage(Object result) {
+    		return String.valueOf(result);
+    	}
+
+    }
+
+	
 	private enum MenuEntities implements EntityEnum {
 		
 		CURRENCIES(R.string.currencies, R.drawable.menu_entities_currencies, CurrencyListActivity.class),

=== modified file 'src/ru/orangesoftware/financisto/db/DatabaseAdapter.java'
--- src/ru/orangesoftware/financisto/db/DatabaseAdapter.java	2011-09-02 18:49:54 +0000
+++ src/ru/orangesoftware/financisto/db/DatabaseAdapter.java	2011-10-23 17:45:27 +0000
@@ -596,6 +596,37 @@
 		}
 	}
 
+	public Category getCategory(String title) {
+		Cursor c = db.query(V_CATEGORY, CategoryViewColumns.NORMAL_PROJECTION, 
+				CategoryViewColumns.title+"=?", new String[]{String.valueOf(title)}, null, null, null);
+		try {
+			if (c.moveToNext()) {				
+				Category cat = new Category();
+				cat.id = c.getInt(CategoryViewColumns._id.ordinal());
+				cat.title = title;
+				cat.level = c.getInt(CategoryViewColumns.level.ordinal());
+				cat.left = c.getInt(CategoryViewColumns.left.ordinal());
+				cat.right = c.getInt(CategoryViewColumns.right.ordinal());
+                cat.type = c.getInt(CategoryViewColumns.type.ordinal());
+				String s = String.valueOf(cat.id);
+				Cursor c2 = db.query(GET_PARENT_SQL, new String[]{CategoryColumns._id.name()}, null, new String[]{s,s},
+						null, null, null, "1");
+				try {
+					if (c2.moveToFirst()) {
+						cat.parent = new Category(c2.getLong(0));
+					}
+				} finally {
+					c2.close();
+				}
+				return cat;
+			} else {
+				return null;
+			}
+		} finally {
+			c.close();
+		}
+	}
+	
 	public Category getCategoryByLeft(long left) {
 		Cursor c = db.query(V_CATEGORY, CategoryViewColumns.NORMAL_PROJECTION, 
 				CategoryViewColumns.left+"=?", new String[]{String.valueOf(left)}, null, null, null);

=== modified file 'src/ru/orangesoftware/financisto/export/ImportExportAsyncTask.java'
--- src/ru/orangesoftware/financisto/export/ImportExportAsyncTask.java	2011-02-20 19:39:08 +0000
+++ src/ru/orangesoftware/financisto/export/ImportExportAsyncTask.java	2011-10-23 17:45:27 +0000
@@ -17,6 +17,7 @@
 import android.content.Context;
 import android.os.AsyncTask;
 import android.util.Log;
+import android.widget.Toast;
 
 public abstract class ImportExportAsyncTask extends AsyncTask<String, Void, Object> {
 	

=== modified file 'src/ru/orangesoftware/financisto/export/csv/Csv.java'
--- src/ru/orangesoftware/financisto/export/csv/Csv.java	2011-02-20 19:39:08 +0000
+++ src/ru/orangesoftware/financisto/export/csv/Csv.java	2011-10-23 17:45:27 +0000
@@ -215,7 +215,7 @@
             return result;
         }
 
-        private String unmarkDoubleQuotes(String s) { return s.replace(impossibleString, "\""); }
+        private String unmarkDoubleQuotes(String s) { return s.replace(impossibleString, "\"\""); }
         private String markDoubleQuotes(String s) { return s.replace("\"\"", impossibleString); }
 
         private String removeLeadingSpaces(String s) { return s.replaceFirst(" +", ""); }

=== added directory 'src/ru/orangesoftware/financisto/imports'
=== added directory 'src/ru/orangesoftware/financisto/imports/csv'
=== added file 'src/ru/orangesoftware/financisto/imports/csv/CsvImport.java'
--- src/ru/orangesoftware/financisto/imports/csv/CsvImport.java	1970-01-01 00:00:00 +0000
+++ src/ru/orangesoftware/financisto/imports/csv/CsvImport.java	2011-10-23 17:45:27 +0000
@@ -0,0 +1,200 @@
+package ru.orangesoftware.financisto.imports.csv;
+
+import static ru.orangesoftware.financisto.db.DatabaseHelper.ACCOUNT_TABLE;
+import static ru.orangesoftware.financisto.db.DatabaseHelper.V_BLOTTER_FOR_ACCOUNT;
+
+import java.io.File;
+import java.io.FileNotFoundException;
+import java.io.FileReader;
+import java.io.IOException;
+import java.lang.reflect.Field;
+import java.text.ParseException;
+import java.text.ParsePosition;
+import java.text.SimpleDateFormat;
+import java.util.Date;
+import java.util.HashMap;
+import java.util.List;
+
+import javax.xml.parsers.ParserConfigurationException;
+import javax.xml.parsers.SAXParser;
+import javax.xml.parsers.SAXParserFactory;
+
+import org.xml.sax.SAXException;
+import org.xml.sax.helpers.DefaultHandler;
+
+import android.app.AlertDialog;
+import android.content.ContentValues;
+import android.content.Context;
+import android.database.Cursor;
+import android.os.Looper;
+import android.util.Log;
+import android.widget.Toast;
+
+import ru.orangesoftware.financisto.R;
+import ru.orangesoftware.financisto.activity.AccountActivity;
+import ru.orangesoftware.financisto.db.DatabaseAdapter;
+import ru.orangesoftware.financisto.db.DatabaseHelper.AccountColumns;
+import ru.orangesoftware.financisto.db.DatabaseHelper.BlotterColumns;
+import ru.orangesoftware.financisto.export.csv.Csv;
+import ru.orangesoftware.financisto.model.Account;
+import ru.orangesoftware.financisto.model.Category;
+import ru.orangesoftware.financisto.model.Project;
+import ru.orangesoftware.financisto.model.Transaction;
+
+public class CsvImport {
+	private final DatabaseAdapter db;
+	private final CsvImportOptions options;
+	private final Account account;
+	private Context context;
+	private char decimalSeparator;
+	private char groupSeparator;
+
+	public CsvImport(DatabaseAdapter db, CsvImportOptions options,
+			Context context) {
+		this.db = db;
+		this.options = options;
+		this.account = db.em().getAccount(options.selectedAccounts[0]);
+		this.context = context;
+		this.decimalSeparator = options.currency.decimalSeparator.charAt(1);
+		this.groupSeparator = options.currency.groupSeparator.charAt(1);
+	}
+
+	public Object doImport() throws Exception {
+		String csvFilename = options.filename;
+		Csv.Reader reader;
+		Boolean isTableHeadLine = false;
+		List<String> tableHeadLine = null;
+		List<Project> projectList = db.em().list(Project.class);
+		try {
+			reader = new Csv.Reader(new FileReader(csvFilename)).delimiter(
+					options.fieldSeparator).ignoreComments(true);
+			List<String> line;
+			int countLine = 0;
+			while ((line = reader.readLine()) != null) {
+				// get table head line
+				countLine = countLine++;
+				if (isTableHeadLine) {
+					Transaction transaction = new Transaction();
+					transaction.dateTime = 0;
+					transaction.fromAccountId=this.account.id;
+					long time = 0;
+
+					int countOfColumns = line.size();
+					for (int i = 0; i < countOfColumns; i++) {
+						String transactionField = tableHeadLine.get(i);
+						/*
+						 * ToDo:workaround needed for reimport of files from CsvExport function - first column (date) in header shows nonprintable 
+						 * Character which is not replaceable by "trim" function. Have to look in CsvExport function
+						 */
+						transactionField = myTrim(transactionField);
+						if (!transactionField.equals("")) {
+							Log.d("CsvImport",
+									transactionField + ":" + line.get(i) + " ");
+							try {
+								String fieldValue = line.get(i);
+								if (!fieldValue.equals("")) {
+
+									if (transactionField.equals("date")) {
+										transaction.dateTime = options.dateFormat
+												.parse(fieldValue).getTime();
+										Log.d("CsvImport", "date:"
+												+ transaction.dateTime);
+									} else if (transactionField.equals("time")) {
+										SimpleDateFormat format = new SimpleDateFormat(
+												"HH:mm:ss");
+										ParsePosition p = new ParsePosition(0);
+										time = format.parse(fieldValue, p)
+												.getTime();
+										Log.d("CsvImport", "time:" + time);
+
+									} else if (transactionField
+											.equals("amount")) {
+										fieldValue = fieldValue.replace(
+												groupSeparator+"", "");
+										fieldValue = fieldValue.replace(
+												decimalSeparator, '.');
+										double fromAmount = Double
+												.parseDouble(fieldValue);
+										Double fromAmountDouble = new Double(
+												fromAmount) * 100.0;
+										long amount = fromAmountDouble
+												.longValue();
+										transaction.fromAmount = amount;
+									} else if (transactionField.equals("payee")) {
+										transaction.payeeId = db
+												.insertPayee(fieldValue);
+									} else if (transactionField
+											.equals("category")) {
+										Category cat = db
+												.getCategory(fieldValue);
+										if (cat != null) {
+											transaction.categoryId = cat.id;
+										} else {
+											throw new Exception(
+													"Unknown category in import line");
+										}
+									} else if (transactionField.equals("note")) {
+										transaction.note = fieldValue;
+									} else if (transactionField
+											.equals("project")) {
+										//Test for "No project" just to be compatible for importing of files from CsvExport function
+										if (!fieldValue.equals("No project")) {
+											for (int i1 = 0; i1 < projectList
+													.size(); i1++) {
+												if (projectList.get(i1)
+														.getTitle()
+														.equals(fieldValue)) {
+													transaction.projectId = projectList
+															.get(i1).getId();
+													break;
+												}
+											}
+											if (transaction.projectId == 0) {
+												throw new Exception(
+														"Unknown project in import line");
+											}
+										}
+
+									} else if (transactionField
+											.equals("currency")) {
+										if (!account.currency.name
+												.equals(fieldValue)) {
+											throw new Exception(
+													"Wrong currency in import line");
+										}
+									}
+								}
+							} catch (IllegalArgumentException e) {
+								throw new Exception("IllegalArgumentException");
+							} catch (ParseException e) {
+								throw new Exception("ParseException");
+							}
+						}
+					}
+					transaction.dateTime = transaction.dateTime + time;
+					long id = db.insertOrUpdate(transaction);
+					Log.d("CsvImport", "Insert transactionId:" + id);
+				} else {
+					// first line of csv-file is table headline
+					isTableHeadLine = true;
+					tableHeadLine = line;
+				}
+			}
+		} catch (FileNotFoundException e) {
+			throw new Exception("Import file not found");
+		}
+
+		return options.filename + " imported!";
+	}
+	
+	//Workaround function which is needed for reimport of CsvExport files
+	public String myTrim(String s) {
+		if (Character.isLetter(s.charAt(0))) {
+			return s;
+		} else {
+			return s.substring(1);
+		}
+			
+	}
+
+}

=== added file 'src/ru/orangesoftware/financisto/imports/csv/CsvImportOptions.java'
--- src/ru/orangesoftware/financisto/imports/csv/CsvImportOptions.java	1970-01-01 00:00:00 +0000
+++ src/ru/orangesoftware/financisto/imports/csv/CsvImportOptions.java	2011-10-23 17:45:27 +0000
@@ -0,0 +1,55 @@
+/*
+ * Copyright (c) 2011 Denis Solonenko.
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the GNU Public License v2.0
+ * which accompanies this distribution, and is available at
+ * http://www.gnu.org/licenses/old-licenses/gpl-2.0.html
+ */
+
+package ru.orangesoftware.financisto.imports.csv;
+
+import android.content.Intent;
+import ru.orangesoftware.financisto.activity.CsvExportActivity;
+import ru.orangesoftware.financisto.activity.CsvImportActivity;
+import ru.orangesoftware.financisto.blotter.WhereFilter;
+import ru.orangesoftware.financisto.model.Currency;
+import ru.orangesoftware.financisto.utils.CurrencyExportPreferences;
+
+import java.text.SimpleDateFormat;
+
+/**
+ * Created by IntelliJ IDEA.
+ * User: Denis Solonenko
+ * Date: 7/10/11 7:01 PM
+ */
+public class CsvImportOptions {
+
+    public static final String DEFAULT_DATE_FORMAT = "dd.MM.yyyy";
+
+    public final Currency currency;
+    public final SimpleDateFormat dateFormat;
+    public final char fieldSeparator;
+    public final WhereFilter filter;
+    public final long[] selectedAccounts;
+    public final String filename;
+
+    public CsvImportOptions(Currency currency, String dateFormat, long[] selectedAccounts, WhereFilter filter,String filename,char fieldSeparator) {
+        this.currency = currency;
+        this.dateFormat = new SimpleDateFormat(dateFormat);
+        this.selectedAccounts = selectedAccounts;
+        this.filter = filter;
+        this.filename=filename;
+        this.fieldSeparator=fieldSeparator;
+    }
+
+    public static CsvImportOptions fromIntent(Intent data) {
+        WhereFilter filter = WhereFilter.fromIntent(data);
+        Currency currency = CurrencyExportPreferences.fromIntent(data, "csv");
+        char fieldSeparator = data.getCharExtra(CsvImportActivity.CSV_IMPORT_FIELD_SEPARATOR, ',');
+        String dateFormat = data.getStringExtra(CsvImportActivity.CSV_IMPORT_DATE_FORMAT);
+        long[] selectedAccounts = data.getLongArrayExtra(CsvImportActivity.CSV_IMPORT_SELECTED_ACCOUNT);
+        String filename =data.getStringExtra(CsvImportActivity.CSV_IMPORT_FILENAME);
+        return new CsvImportOptions(currency, dateFormat, selectedAccounts, filter,filename,fieldSeparator);
+    }
+
+}