Subversion Repositories ES

Compare Revisions

Last modification

Ignore whitespace Rev 12 → Rev 13

/trunk/src/de/pointedears/converter/app/CurrenciesActivity.java
10,9 → 10,11
import android.view.MenuInflater;
import android.view.MenuItem;
import android.view.View;
import android.view.View.OnClickListener;
import android.view.View.OnKeyListener;
import android.widget.AdapterView;
import android.widget.AdapterView.OnItemSelectedListener;
import android.widget.Button;
import android.widget.EditText;
import android.widget.Spinner;
import de.pointedears.converter.R;
165,6 → 167,19
/* no-op */
}
});
 
Button buttonClear =
(Button) this.findViewById(R.id.currencies_button_clear);
buttonClear.setOnClickListener(new OnClickListener() {
 
@SuppressWarnings("nls")
@Override
public void onClick(View v)
{
editValue1.setText("");
editValue2.setText("");
}
});
}
 
/**
/trunk/src/de/pointedears/converter/app/LengthsActivity.java
7,9 → 7,11
import android.text.Editable;
import android.view.KeyEvent;
import android.view.View;
import android.view.View.OnClickListener;
import android.view.View.OnKeyListener;
import android.widget.AdapterView;
import android.widget.AdapterView.OnItemSelectedListener;
import android.widget.Button;
import android.widget.EditText;
import android.widget.Spinner;
import de.pointedears.converter.R;
158,6 → 160,19
/* no-op */
}
});
 
Button buttonClear =
(Button) this.findViewById(R.id.lengths_button_clear);
buttonClear.setOnClickListener(new OnClickListener() {
 
@SuppressWarnings("nls")
@Override
public void onClick(View v)
{
editValue1.setText("");
editValue2.setText("");
}
});
}
 
/**
/trunk/src/de/pointedears/converter/app/TemperaturesActivity.java
7,9 → 7,11
import android.text.Editable;
import android.view.KeyEvent;
import android.view.View;
import android.view.View.OnClickListener;
import android.view.View.OnKeyListener;
import android.widget.AdapterView;
import android.widget.AdapterView.OnItemSelectedListener;
import android.widget.Button;
import android.widget.EditText;
import android.widget.Spinner;
import android.widget.TextView;
166,6 → 168,19
/* no-op */
}
});
 
Button buttonClear =
(Button) this.findViewById(R.id.temperatures_button_clear);
buttonClear.setOnClickListener(new OnClickListener() {
 
@SuppressWarnings("nls")
@Override
public void onClick(View v)
{
editValue1.setText("");
editValue2.setText("");
}
});
}
 
/**
/trunk/src/de/pointedears/converter/db/CurrenciesDatabase.java
27,7 → 27,7
private static final String COLUMN_CURRENCY2 = "currency2"; //$NON-NLS-1$
private static final String COLUMN_FACTOR = "factor"; //$NON-NLS-1$
 
private static HashMap<String, HashMap<String, Double>> currencyConversions =
private static HashMap<String, HashMap<String, Double>> conversionRates =
new HashMap<String, HashMap<String, Double>>();
static
{
34,19 → 34,19
HashMap<String, Double> conversionFactors = new HashMap<String, Double>();
conversionFactors.put(CurrenciesActivity.VALUE_EUR, 0.767842293);
conversionFactors.put(CurrenciesActivity.VALUE_USD, 1.03413);
CurrenciesDatabase.currencyConversions.put(CurrenciesActivity.VALUE_CHF,
CurrenciesDatabase.conversionRates.put(CurrenciesActivity.VALUE_CHF,
conversionFactors);
 
conversionFactors = new HashMap<String, Double>();
conversionFactors.put(CurrenciesActivity.VALUE_CHF, 1.30235077);
conversionFactors.put(CurrenciesActivity.VALUE_USD, 1.3468);
CurrenciesDatabase.currencyConversions.put(CurrenciesActivity.VALUE_EUR,
CurrenciesDatabase.conversionRates.put(CurrenciesActivity.VALUE_EUR,
conversionFactors);
 
conversionFactors = new HashMap<String, Double>();
conversionFactors.put(CurrenciesActivity.VALUE_CHF, 0.966996412);
conversionFactors.put(CurrenciesActivity.VALUE_EUR, 0.742500743);
CurrenciesDatabase.currencyConversions.put(CurrenciesActivity.VALUE_USD,
CurrenciesDatabase.conversionRates.put(CurrenciesActivity.VALUE_USD,
conversionFactors);
}
private final CurrenciesActivity context;
111,7 → 111,7
@Override
public void onUpgrade(SQLiteDatabase db, int oldVersion, int newVersion)
{
/* NOTE: Should migrate database instead */
/* NOTE: We should migrate an existing database instead */
db.execSQL("DROP TABLE IF EXISTS " + CurrenciesDatabase.TABLE);
this.onCreate(db);
}
121,7 → 121,7
*/
public HashMap<String, HashMap<String, Double>> getConversionRates()
{
return CurrenciesDatabase.currencyConversions;
return CurrenciesDatabase.conversionRates;
}
 
/**
209,7 → 209,7
*/
newCurrencyConversions.put(currency1Str, mapForCurrency);
 
CurrenciesDatabase.currencyConversions = newCurrencyConversions;
CurrenciesDatabase.conversionRates = newCurrencyConversions;
}
}
catch (IllegalArgumentException e)