hongshaorou/openrocket
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Change all calls to android.util.Log to use the AndroidLogWrapper class since it provides the ability to turn off all logging - which is desirable when making a apk for distribution.

Browse Source
This commit is contained in:
Kevin Ruland 2012-02-01 02:44:37 +00:00
parent d8d9f499b7
commit 9e05cfeb29
19 changed files with 101 additions and 129 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
android/src/net/sf/openrocket/android/Application.java
View File

@ -2,6 +2,7 @@ package net.sf.openrocket.android;
import java.util.Locale; import java.util.Locale;
import net.sf.openrocket.android.util.AndroidLogWrapper;
import net.sf.openrocket.document.OpenRocketDocument; import net.sf.openrocket.document.OpenRocketDocument;
import net.sf.openrocket.l10n.DebugTranslator; import net.sf.openrocket.l10n.DebugTranslator;
import net.sf.openrocket.l10n.ResourceBundleTranslator; import net.sf.openrocket.l10n.ResourceBundleTranslator;
@ -24,7 +25,7 @@ public class Application extends android.app.Application {
// Android does not have a default sax parser set. This needs to be defined first. // Android does not have a default sax parser set. This needs to be defined first.
System.setProperty("org.xml.sax.driver","org.xmlpull.v1.sax2.Driver"); System.setProperty("org.xml.sax.driver","org.xmlpull.v1.sax2.Driver");
net.sf.openrocket.startup.Application.setLogger( new LogHelper() ); net.sf.openrocket.startup.Application.setLogger( new AndroidLogWrapper.LogHelper() );
net.sf.openrocket.startup.Application.setPreferences( new PreferencesAdapter() ); net.sf.openrocket.startup.Application.setPreferences( new PreferencesAdapter() );

37
android/src/net/sf/openrocket/android/LogHelper.java
View File

@ -1,37 +0,0 @@
package net.sf.openrocket.android;
import android.util.Log;
import net.sf.openrocket.logging.LogLevel;
import net.sf.openrocket.logging.LogLine;
public class LogHelper extends net.sf.openrocket.logging.LogHelper {
/* (non-Javadoc)
* @see net.sf.openrocket.logging.LogHelper#log(net.sf.openrocket.logging.LogLine)
*/
@Override
public void log(LogLine line) {
LogLevel level = line.getLevel();
switch ( level ) {
case ERROR:
Log.e("OpenRocket", line.toString());
break;
case WARN:
Log.w("OpenRocket", line.toString());
break;
case INFO:
Log.i("OpenRocket", line.toString());
break;
case DEBUG:
Log.d("OpenRocket", line.toString());
break;
default:
Log.v("OpenRocket", line.toString());
}
}
}

13
android/src/net/sf/openrocket/android/MotorDatabaseAdapter.java
View File

@ -5,15 +5,14 @@ import java.util.List;
import net.sf.openrocket.android.db.DbAdapter; import net.sf.openrocket.android.db.DbAdapter;
import net.sf.openrocket.android.motor.ExtendedThrustCurveMotor; import net.sf.openrocket.android.motor.ExtendedThrustCurveMotor;
import net.sf.openrocket.android.util.AndroidLogWrapper;
import net.sf.openrocket.database.MotorDatabase; import net.sf.openrocket.database.MotorDatabase;
import net.sf.openrocket.motor.Motor; import net.sf.openrocket.motor.Motor;
import net.sf.openrocket.motor.Motor.Type; import net.sf.openrocket.motor.Motor.Type;
import android.content.Context; import android.content.Context;
import android.util.Log;
public class MotorDatabaseAdapter implements MotorDatabase { public class MotorDatabaseAdapter implements MotorDatabase {
private final static String TAG = "MotorDatabaseAdapter";
private DbAdapter mDbHelper; private DbAdapter mDbHelper;
public MotorDatabaseAdapter( Context ctx ) { public MotorDatabaseAdapter( Context ctx ) {
@ -25,11 +24,11 @@ public class MotorDatabaseAdapter implements MotorDatabase {
public List<? extends Motor> findMotors(Type type, String manufacturer, public List<? extends Motor> findMotors(Type type, String manufacturer,
String designation, double diameter, double length) { String designation, double diameter, double length) {
Log.d(TAG,"find motor: type="+ type.toString()); AndroidLogWrapper.d(MotorDatabaseAdapter.class,"find motor: type="+ type.toString());
Log.d(TAG,"find motor: manu="+ manufacturer); AndroidLogWrapper.d(MotorDatabaseAdapter.class,"find motor: manu="+ manufacturer);
Log.d(TAG,"find motor: designation="+ designation); AndroidLogWrapper.d(MotorDatabaseAdapter.class,"find motor: designation="+ designation);
Log.d(TAG,"find motor: diameter=" +diameter); AndroidLogWrapper.d(MotorDatabaseAdapter.class,"find motor: diameter=" +diameter);
Log.d(TAG,"find motor: length="+ length); AndroidLogWrapper.d(MotorDatabaseAdapter.class,"find motor: length="+ length);
try { try {
ExtendedThrustCurveMotor m = mDbHelper.getMotorDao().fetchMotor(manufacturer, designation); ExtendedThrustCurveMotor m = mDbHelper.getMotorDao().fetchMotor(manufacturer, designation);

4
android/src/net/sf/openrocket/android/db/DbAdapter.java
View File

@ -1,10 +1,10 @@
package net.sf.openrocket.android.db; package net.sf.openrocket.android.db;
import net.sf.openrocket.android.util.AndroidLogWrapper;
import android.content.Context; import android.content.Context;
import android.database.SQLException; import android.database.SQLException;
import android.database.sqlite.SQLiteDatabase; import android.database.sqlite.SQLiteDatabase;
import android.database.sqlite.SQLiteOpenHelper; import android.database.sqlite.SQLiteOpenHelper;
import android.util.Log;
public class DbAdapter { public class DbAdapter {
@ -35,7 +35,7 @@ public class DbAdapter {
@Override @Override
public void onUpgrade(SQLiteDatabase db, int oldVersion, int newVersion) { public void onUpgrade(SQLiteDatabase db, int oldVersion, int newVersion) {
Log.w(TAG, "Upgrading database from version " + oldVersion + " to " AndroidLogWrapper.w(DbAdapter.class, "Upgrading database from version " + oldVersion + " to "
+ newVersion + ", which will destroy all old data"); + newVersion + ", which will destroy all old data");
executeSQL(db, MotorDao.update(oldVersion, newVersion)); executeSQL(db, MotorDao.update(oldVersion, newVersion));
} }

6
android/src/net/sf/openrocket/android/db/MotorDao.java
View File

@ -1,6 +1,7 @@
package net.sf.openrocket.android.db; package net.sf.openrocket.android.db;
import net.sf.openrocket.android.motor.ExtendedThrustCurveMotor; import net.sf.openrocket.android.motor.ExtendedThrustCurveMotor;
import net.sf.openrocket.android.util.AndroidLogWrapper;
import net.sf.openrocket.motor.Manufacturer; import net.sf.openrocket.motor.Manufacturer;
import net.sf.openrocket.motor.Motor; import net.sf.openrocket.motor.Motor;
import net.sf.openrocket.motor.ThrustCurveMotor; import net.sf.openrocket.motor.ThrustCurveMotor;
@ -8,12 +9,9 @@ import net.sf.openrocket.util.Coordinate;
import android.content.ContentValues; import android.content.ContentValues;
import android.database.Cursor; import android.database.Cursor;
import android.database.sqlite.SQLiteDatabase; import android.database.sqlite.SQLiteDatabase;
import android.util.Log;
public class MotorDao { public class MotorDao {
private static final String TAG = "MotorDao";
private SQLiteDatabase mDb; private SQLiteDatabase mDb;
private final static String DATABASE_TABLE = "motor"; private final static String DATABASE_TABLE = "motor";
@ -115,7 +113,7 @@ public class MotorDao {
initialValues.put(TIME_DATA, ConversionUtils.serializeArrayOfDouble(tcm.getTimePoints())); initialValues.put(TIME_DATA, ConversionUtils.serializeArrayOfDouble(tcm.getTimePoints()));
initialValues.put(CG_DATA, ConversionUtils.serializeArrayOfCoordinate(tcm.getCGPoints())); initialValues.put(CG_DATA, ConversionUtils.serializeArrayOfCoordinate(tcm.getCGPoints()));
Log.d(TAG, "insertOrUpdate Motor"); AndroidLogWrapper.d(MotorDao.class, "insertOrUpdate Motor");
long rv = mDb.insertWithOnConflict(DATABASE_TABLE, null, initialValues, SQLiteDatabase.CONFLICT_REPLACE); long rv = mDb.insertWithOnConflict(DATABASE_TABLE, null, initialValues, SQLiteDatabase.CONFLICT_REPLACE);
return rv; return rv;
} }

21
android/src/net/sf/openrocket/android/motor/BurnPlotFragment.java
View File

@ -5,12 +5,11 @@ import java.util.List;
import java.util.Vector; import java.util.Vector;
import net.sf.openrocket.R; import net.sf.openrocket.R;
import android.app.Activity; import net.sf.openrocket.android.util.AndroidLogWrapper;
import android.graphics.Color; import android.graphics.Color;
import android.graphics.PointF; import android.graphics.PointF;
import android.os.Bundle; import android.os.Bundle;
import android.support.v4.app.Fragment; import android.support.v4.app.Fragment;
import android.util.Log;
import android.view.LayoutInflater; import android.view.LayoutInflater;
import android.view.MotionEvent; import android.view.MotionEvent;
import android.view.ScaleGestureDetector; import android.view.ScaleGestureDetector;
@ -27,8 +26,6 @@ import com.androidplot.xy.YValueMarker;
public class BurnPlotFragment extends Fragment implements OnTouchListener { public class BurnPlotFragment extends Fragment implements OnTouchListener {
private final static String TAG = "BurnPlotFragment";
private ExtendedThrustCurveMotor motor; private ExtendedThrustCurveMotor motor;
private XYPlot mySimpleXYPlot; private XYPlot mySimpleXYPlot;
@ -44,14 +41,14 @@ public class BurnPlotFragment extends Fragment implements OnTouchListener {
@Override @Override
public void onCreate(Bundle savedInstanceState) { public void onCreate(Bundle savedInstanceState) {
Log.d(TAG,"onCreate"); AndroidLogWrapper.d(BurnPlotFragment.class,"onCreate");
super.onCreate(savedInstanceState); super.onCreate(savedInstanceState);
} }
@Override @Override
public View onCreateView(LayoutInflater inflater, ViewGroup container, public View onCreateView(LayoutInflater inflater, ViewGroup container,
Bundle savedInstanceState) { Bundle savedInstanceState) {
Log.d(TAG,"onCreateView"); AndroidLogWrapper.d(BurnPlotFragment.class,"onCreateView");
View v = inflater.inflate(R.layout.motor_burn, container, false); View v = inflater.inflate(R.layout.motor_burn, container, false);
mySimpleXYPlot = (XYPlot) v.findViewById(R.id.xyplot); mySimpleXYPlot = (XYPlot) v.findViewById(R.id.xyplot);
mySimpleXYPlot.setOnTouchListener(this); mySimpleXYPlot.setOnTouchListener(this);
@ -180,17 +177,17 @@ public class BurnPlotFragment extends Fragment implements OnTouchListener {
} }
private void zoom(float scale) { private void zoom(float scale) {
Log.d(TAG,"zoom by " + scale); AndroidLogWrapper.d(BurnPlotFragment.class,"zoom by " + scale);
float domainSpan = absMaxX - absMinX; float domainSpan = absMaxX - absMinX;
Log.d(TAG,"domainSpan = " + domainSpan); AndroidLogWrapper.d(BurnPlotFragment.class,"domainSpan = " + domainSpan);
float domainMidPoint = absMaxX - domainSpan / 2.0f; float domainMidPoint = absMaxX - domainSpan / 2.0f;
Log.d(TAG,"domainMidPoint = " + domainMidPoint); AndroidLogWrapper.d(BurnPlotFragment.class,"domainMidPoint = " + domainMidPoint);
float offset = domainSpan / scale; float offset = domainSpan / scale;
Log.d(TAG,"offset " + offset); AndroidLogWrapper.d(BurnPlotFragment.class,"offset " + offset);
minXY.x=domainMidPoint- offset; minXY.x=domainMidPoint- offset;
Log.d(TAG,"min X " + minXY.x); AndroidLogWrapper.d(BurnPlotFragment.class,"min X " + minXY.x);
maxXY.x=domainMidPoint+offset; maxXY.x=domainMidPoint+offset;
Log.d(TAG,"max X " + maxXY.x); AndroidLogWrapper.d(BurnPlotFragment.class,"max X " + maxXY.x);
checkBoundaries(); checkBoundaries();
mySimpleXYPlot.setDomainBoundaries(minXY.x, maxXY.x, BoundaryMode.AUTO); mySimpleXYPlot.setDomainBoundaries(minXY.x, maxXY.x, BoundaryMode.AUTO);
mySimpleXYPlot.redraw(); mySimpleXYPlot.redraw();

6
android/src/net/sf/openrocket/android/motor/MotorDetailsActivity.java
View File

@ -2,10 +2,10 @@ package net.sf.openrocket.android.motor;
import net.sf.openrocket.R; import net.sf.openrocket.R;
import net.sf.openrocket.android.db.DbAdapter; import net.sf.openrocket.android.db.DbAdapter;
import net.sf.openrocket.android.util.AndroidLogWrapper;
import android.content.Intent; import android.content.Intent;
import android.os.Bundle; import android.os.Bundle;
import android.support.v4.app.FragmentActivity; import android.support.v4.app.FragmentActivity;
import android.util.Log;
import android.view.Menu; import android.view.Menu;
import android.view.MenuInflater; import android.view.MenuInflater;
import android.view.MenuItem; import android.view.MenuItem;
@ -15,8 +15,6 @@ import android.widget.SlidingDrawer;
public class MotorDetailsActivity extends FragmentActivity public class MotorDetailsActivity extends FragmentActivity
implements SlidingDrawer.OnDrawerCloseListener, SlidingDrawer.OnDrawerOpenListener { implements SlidingDrawer.OnDrawerCloseListener, SlidingDrawer.OnDrawerOpenListener {
private final static String TAG = "MotorDetails";
private SlidingDrawer slidingDrawer; private SlidingDrawer slidingDrawer;
private ImageView handle; private ImageView handle;
@ -25,7 +23,7 @@ implements SlidingDrawer.OnDrawerCloseListener, SlidingDrawer.OnDrawerOpenListen
@Override @Override
public void onCreate(Bundle savedInstanceState) { public void onCreate(Bundle savedInstanceState) {
super.onCreate(savedInstanceState); super.onCreate(savedInstanceState);
Log.d(TAG,"onCreate Bundle = "+ String.valueOf(savedInstanceState)); AndroidLogWrapper.d(MotorDetailsActivity.class,"onCreate Bundle = "+ String.valueOf(savedInstanceState));
setContentView(R.layout.motor_detail); setContentView(R.layout.motor_detail);
Intent i = getIntent(); Intent i = getIntent();

11
android/src/net/sf/openrocket/android/rocket/OpenRocketLoaderActivity.java
View File

@ -5,6 +5,7 @@ import java.io.File;
import net.sf.openrocket.R; import net.sf.openrocket.R;
import net.sf.openrocket.aerodynamics.WarningSet; import net.sf.openrocket.aerodynamics.WarningSet;
import net.sf.openrocket.android.Application; import net.sf.openrocket.android.Application;
import net.sf.openrocket.android.util.AndroidLogWrapper;
import android.app.AlertDialog; import android.app.AlertDialog;
import android.app.Dialog; import android.app.Dialog;
import android.app.ProgressDialog; import android.app.ProgressDialog;
@ -14,10 +15,8 @@ import android.net.Uri;
import android.os.Bundle; import android.os.Bundle;
import android.support.v4.app.DialogFragment; import android.support.v4.app.DialogFragment;
import android.support.v4.app.FragmentActivity; import android.support.v4.app.FragmentActivity;
import android.util.Log;
public class OpenRocketLoaderActivity extends FragmentActivity { public class OpenRocketLoaderActivity extends FragmentActivity {
private static final String TAG = "OpenRocketLoader";
private ProgressDialog progress; private ProgressDialog progress;
@ -42,7 +41,7 @@ public class OpenRocketLoaderActivity extends FragmentActivity {
} }
private void loadOrkFile( Uri file ) { private void loadOrkFile( Uri file ) {
Log.d(TAG,"Use ork file: " + file); AndroidLogWrapper.d(OpenRocketLoaderActivity.class,"Use ork file: " + file);
String path = file.getPath(); String path = file.getPath();
File orkFile = new File(path); File orkFile = new File(path);
progress = ProgressDialog.show(this, "Loading file", ""); progress = ProgressDialog.show(this, "Loading file", "");
@ -55,7 +54,7 @@ public class OpenRocketLoaderActivity extends FragmentActivity {
@Override @Override
protected void onPostExecute(OpenRocketLoaderResult result) { protected void onPostExecute(OpenRocketLoaderResult result) {
super.onPostExecute(result); super.onPostExecute(result);
Log.d(TAG,"Finished loading " + OpenRocketLoaderActivity.this); AndroidLogWrapper.d(OpenRocketLoaderActivity.class,"Finished loading " + OpenRocketLoaderActivity.this);
finishedLoading(result); finishedLoading(result);
} }
@ -85,13 +84,13 @@ public class OpenRocketLoaderActivity extends FragmentActivity {
public void doPositiveClick() { public void doPositiveClick() {
// Do stuff here. // Do stuff here.
Log.i("FragmentAlertDialog", "Positive click!"); AndroidLogWrapper.i(OpenRocketLoaderActivity.class, "Positive click!");
finish(); finish();
} }
public void doNegativeClick() { public void doNegativeClick() {
// Do stuff here. // Do stuff here.
Log.i("FragmentAlertDialog", "Negative click!"); AndroidLogWrapper.i(OpenRocketLoaderActivity.class, "Negative click!");
finish(); finish();
} }

8
android/src/net/sf/openrocket/android/rocket/OpenRocketLoaderTask.java
View File

@ -2,23 +2,21 @@ package net.sf.openrocket.android.rocket;
import java.io.File; import java.io.File;
import net.sf.openrocket.android.util.AndroidLogWrapper;
import net.sf.openrocket.document.OpenRocketDocument; import net.sf.openrocket.document.OpenRocketDocument;
import net.sf.openrocket.file.DatabaseMotorFinder; import net.sf.openrocket.file.DatabaseMotorFinder;
import net.sf.openrocket.file.RocketLoadException; import net.sf.openrocket.file.RocketLoadException;
import net.sf.openrocket.file.openrocket.importt.OpenRocketLoader; import net.sf.openrocket.file.openrocket.importt.OpenRocketLoader;
import android.os.AsyncTask; import android.os.AsyncTask;
import android.util.Log;
public class OpenRocketLoaderTask extends AsyncTask<File, Void, OpenRocketLoaderResult> { public class OpenRocketLoaderTask extends AsyncTask<File, Void, OpenRocketLoaderResult> {
private final static String TAG = "OpenRocketLoaderTask";
/* (non-Javadoc) /* (non-Javadoc)
* @see android.os.AsyncTask#doInBackground(Params[]) * @see android.os.AsyncTask#doInBackground(Params[])
*/ */
@Override @Override
protected OpenRocketLoaderResult doInBackground(File... arg0) { protected OpenRocketLoaderResult doInBackground(File... arg0) {
Log.d(TAG, "doInBackgroud"); AndroidLogWrapper.d(OpenRocketLoaderTask.class, "doInBackgroud");
OpenRocketLoader rocketLoader = new OpenRocketLoader(); OpenRocketLoader rocketLoader = new OpenRocketLoader();
try { try {
@ -28,7 +26,7 @@ public class OpenRocketLoaderTask extends AsyncTask<File, Void, OpenRocketLoader
result.warnings = result.warnings; result.warnings = result.warnings;
return result; return result;
} catch (RocketLoadException ex) { } catch (RocketLoadException ex) {
Log.e(TAG, "doInBackground rocketLaoder.load threw", ex); AndroidLogWrapper.e(OpenRocketLoaderTask.class, "doInBackground rocketLaoder.load threw", ex);
} }
return null; return null;

6
android/src/net/sf/openrocket/android/rocket/OpenRocketViewer.java
View File

@ -7,6 +7,7 @@ import net.sf.openrocket.android.Application;
import net.sf.openrocket.android.simulation.SimulationChart; import net.sf.openrocket.android.simulation.SimulationChart;
import net.sf.openrocket.android.simulation.SimulationFragment; import net.sf.openrocket.android.simulation.SimulationFragment;
import net.sf.openrocket.android.simulation.SimulationViewActivity; import net.sf.openrocket.android.simulation.SimulationViewActivity;
import net.sf.openrocket.android.util.AndroidLogWrapper;
import net.sf.openrocket.android.util.TabsAdapter; import net.sf.openrocket.android.util.TabsAdapter;
import net.sf.openrocket.document.OpenRocketDocument; import net.sf.openrocket.document.OpenRocketDocument;
import net.sf.openrocket.document.Simulation; import net.sf.openrocket.document.Simulation;
@ -19,7 +20,6 @@ import android.support.v4.app.Fragment;
import android.support.v4.app.FragmentActivity; import android.support.v4.app.FragmentActivity;
import android.support.v4.app.FragmentTransaction; import android.support.v4.app.FragmentTransaction;
import android.support.v4.view.ViewPager; import android.support.v4.view.ViewPager;
import android.util.Log;
import android.view.Menu; import android.view.Menu;
import android.view.MenuInflater; import android.view.MenuInflater;
import android.view.MenuItem; import android.view.MenuItem;
@ -31,8 +31,6 @@ implements SharedPreferences.OnSharedPreferenceChangeListener,
Simulations.OnSimulationSelectedListener Simulations.OnSimulationSelectedListener
{ {
private static final String TAG = "OpenRocketViewer";
OpenRocketDocument rocketDocument; OpenRocketDocument rocketDocument;
Configuration rocketConfiguration; Configuration rocketConfiguration;
@ -96,7 +94,7 @@ Simulations.OnSimulationSelectedListener
@Override @Override
public boolean onMenuItemSelected(int featureId, MenuItem item) { public boolean onMenuItemSelected(int featureId, MenuItem item) {
Log.d(TAG,"onMenuItemSelected" + item.getItemId()); AndroidLogWrapper.d(OpenRocketViewer.class,"onMenuItemSelected" + item.getItemId());
switch(item.getItemId()) { switch(item.getItemId()) {
case R.id.motor_list_menu_option: case R.id.motor_list_menu_option:
ActivityHelpers.browseMotors(this); ActivityHelpers.browseMotors(this);

8
android/src/net/sf/openrocket/android/rocket/Overview.java
View File

@ -6,6 +6,7 @@ import net.sf.openrocket.aerodynamics.BarrowmanCalculator;
import net.sf.openrocket.aerodynamics.FlightConditions; import net.sf.openrocket.aerodynamics.FlightConditions;
import net.sf.openrocket.aerodynamics.WarningSet; import net.sf.openrocket.aerodynamics.WarningSet;
import net.sf.openrocket.android.Application; import net.sf.openrocket.android.Application;
import net.sf.openrocket.android.util.AndroidLogWrapper;
import net.sf.openrocket.document.OpenRocketDocument; import net.sf.openrocket.document.OpenRocketDocument;
import net.sf.openrocket.masscalc.BasicMassCalculator; import net.sf.openrocket.masscalc.BasicMassCalculator;
import net.sf.openrocket.masscalc.MassCalculator; import net.sf.openrocket.masscalc.MassCalculator;
@ -18,7 +19,6 @@ import net.sf.openrocket.unit.UnitGroup;
import net.sf.openrocket.util.Coordinate; import net.sf.openrocket.util.Coordinate;
import android.os.Bundle; import android.os.Bundle;
import android.support.v4.app.Fragment; import android.support.v4.app.Fragment;
import android.util.Log;
import android.view.LayoutInflater; import android.view.LayoutInflater;
import android.view.View; import android.view.View;
import android.view.ViewGroup; import android.view.ViewGroup;
@ -39,7 +39,7 @@ public class Overview extends Fragment {
@Override @Override
public View onCreateView(LayoutInflater inflater, ViewGroup container, public View onCreateView(LayoutInflater inflater, ViewGroup container,
Bundle savedInstanceState) { Bundle savedInstanceState) {
Log.d("Overview", "Created View"); AndroidLogWrapper.d(Overview.class, "Created View");
View v = inflater.inflate(R.layout.rocket_overview, container, false); View v = inflater.inflate(R.layout.rocket_overview, container, false);
configurationSpinner = (Spinner) v.findViewById(R.id.openrocketviewerConfigurationSpinner); configurationSpinner = (Spinner) v.findViewById(R.id.openrocketviewerConfigurationSpinner);
@ -61,8 +61,8 @@ public class Overview extends Fragment {
spinnerAdapter.add(rocket.getMotorConfigurationNameOrDescription(config)); spinnerAdapter.add(rocket.getMotorConfigurationNameOrDescription(config));
} }
Log.d("Overview", "spinnerAdapter = " + spinnerAdapter); AndroidLogWrapper.d(Overview.class, "spinnerAdapter = " + spinnerAdapter);
Log.d("Overview", "configurationSpinner = " + configurationSpinner); AndroidLogWrapper.d(Overview.class, "configurationSpinner = " + configurationSpinner);
configurationSpinner.setAdapter(spinnerAdapter); configurationSpinner.setAdapter(spinnerAdapter);
configurationSpinner.setOnItemSelectedListener( new AdapterView.OnItemSelectedListener() { configurationSpinner.setOnItemSelectedListener( new AdapterView.OnItemSelectedListener() {

4
android/src/net/sf/openrocket/android/rocket/Simulations.java
View File

@ -2,6 +2,7 @@ package net.sf.openrocket.android.rocket;
import net.sf.openrocket.R; import net.sf.openrocket.R;
import net.sf.openrocket.android.Application; import net.sf.openrocket.android.Application;
import net.sf.openrocket.android.util.AndroidLogWrapper;
import net.sf.openrocket.document.OpenRocketDocument; import net.sf.openrocket.document.OpenRocketDocument;
import net.sf.openrocket.document.Simulation; import net.sf.openrocket.document.Simulation;
import net.sf.openrocket.unit.Unit; import net.sf.openrocket.unit.Unit;
@ -9,7 +10,6 @@ import net.sf.openrocket.unit.UnitGroup;
import android.app.Activity; import android.app.Activity;
import android.os.Bundle; import android.os.Bundle;
import android.support.v4.app.Fragment; import android.support.v4.app.Fragment;
import android.util.Log;
import android.view.LayoutInflater; import android.view.LayoutInflater;
import android.view.View; import android.view.View;
import android.view.ViewGroup; import android.view.ViewGroup;
@ -55,7 +55,7 @@ public class Simulations extends Fragment {
super.onActivityCreated(savedInstanceState); super.onActivityCreated(savedInstanceState);
final OpenRocketDocument rocketDocument = ((Application)getActivity().getApplication()).getRocketDocument(); final OpenRocketDocument rocketDocument = ((Application)getActivity().getApplication()).getRocketDocument();
Log.d("sim","activity = " + this.getActivity()); AndroidLogWrapper.d(Simulations.class,"activity = {0}", this.getActivity());
ArrayAdapter<Simulation> sims = new ArrayAdapter<Simulation>(this.getActivity(),android.R.layout.simple_list_item_2,rocketDocument.getSimulations()) { ArrayAdapter<Simulation> sims = new ArrayAdapter<Simulation>(this.getActivity(),android.R.layout.simple_list_item_2,rocketDocument.getSimulations()) {

6
android/src/net/sf/openrocket/android/simulation/SimulationChart.java
View File

@ -19,6 +19,7 @@ import java.io.Serializable;
import java.util.ArrayList; import java.util.ArrayList;
import java.util.List; import java.util.List;
import net.sf.openrocket.android.util.AndroidLogWrapper;
import net.sf.openrocket.document.OpenRocketDocument; import net.sf.openrocket.document.OpenRocketDocument;
import net.sf.openrocket.document.Simulation; import net.sf.openrocket.document.Simulation;
import net.sf.openrocket.simulation.FlightDataBranch; import net.sf.openrocket.simulation.FlightDataBranch;
@ -35,7 +36,6 @@ import org.achartengine.renderer.XYSeriesRenderer;
import android.graphics.Color; import android.graphics.Color;
import android.graphics.Paint.Align; import android.graphics.Paint.Align;
import android.util.Log;
/** /**
* This is really a flyweight object so we can serialize the * This is really a flyweight object so we can serialize the
@ -52,8 +52,6 @@ import android.util.Log;
*/ */
public class SimulationChart implements Serializable { public class SimulationChart implements Serializable {
private final static String TAG = "SimulationChart";
private final int simulationIndex; private final int simulationIndex;
private transient FlightDataType series1; private transient FlightDataType series1;
private transient FlightDataType series2; private transient FlightDataType series2;
@ -175,7 +173,7 @@ public class SimulationChart implements Serializable {
double ymax = computeMaxValueWithPadding( series1values ); double ymax = computeMaxValueWithPadding( series1values );
double xmax = Math.ceil( timevalues.get( timevalues.size()-1)); double xmax = Math.ceil( timevalues.get( timevalues.size()-1));
Log.d(TAG,"ymax = " + ymax); AndroidLogWrapper.d(SimulationChart.class,"ymax = " + ymax);
renderer.setXAxisMax(xmax); renderer.setXAxisMax(xmax);
renderer.setYAxisMax(ymax); renderer.setYAxisMax(ymax);

11
android/src/net/sf/openrocket/android/thrustcurve/DownloadResponseParser.java
View File

@ -2,6 +2,8 @@ package net.sf.openrocket.android.thrustcurve;
import java.io.InputStream; import java.io.InputStream;
import net.sf.openrocket.android.util.AndroidLogWrapper;
import org.xml.sax.Attributes; import org.xml.sax.Attributes;
import android.sax.Element; import android.sax.Element;
@ -9,13 +11,10 @@ import android.sax.EndElementListener;
import android.sax.EndTextElementListener; import android.sax.EndTextElementListener;
import android.sax.RootElement; import android.sax.RootElement;
import android.sax.StartElementListener; import android.sax.StartElementListener;
import android.util.Log;
import android.util.Xml; import android.util.Xml;
public class DownloadResponseParser { public class DownloadResponseParser {
private static final String TAG = "DownloadResponseParser";
private static final String thrustcurveURI = "http://www.thrustcurve.org/2009/DownloadResponse"; private static final String thrustcurveURI = "http://www.thrustcurve.org/2009/DownloadResponse";
private static final String root_tag = "download-response"; private static final String root_tag = "download-response";
@ -45,7 +44,7 @@ public class DownloadResponseParser {
rootEl.setStartElementListener( rootEl.setStartElementListener(
new StartElementListener() { new StartElementListener() {
public void start(Attributes arg0) { public void start(Attributes arg0) {
Log.d(TAG,"Start Element error"); AndroidLogWrapper.d(TAG,"Start Element error");
ret.setError("IsError"); ret.setError("IsError");
} }
} }
@ -57,7 +56,7 @@ public class DownloadResponseParser {
new StartElementListener() { new StartElementListener() {
@Override @Override
public void start(Attributes arg0) { public void start(Attributes arg0) {
Log.d(TAG,"Start Element result"); AndroidLogWrapper.d(DownloadResponseParser.class,"Start Element result");
currentMotor.init(); currentMotor.init();
} }
} }
@ -73,7 +72,7 @@ public class DownloadResponseParser {
try { try {
s = Base64Decoder.decodeData(current_data.s); s = Base64Decoder.decodeData(current_data.s);
} catch ( Exception ex ) { } catch ( Exception ex ) {
Log.d(TAG,"base64: " + ex.getMessage()); AndroidLogWrapper.d(DownloadResponseParser.class,"base64: " + ex.getMessage());
} }
currentMotor.decodeFile( s ); currentMotor.decodeFile( s );
} }

10
android/src/net/sf/openrocket/android/thrustcurve/TCQueryAction.java
View File

@ -2,12 +2,12 @@ package net.sf.openrocket.android.thrustcurve;
import net.sf.openrocket.android.db.DbAdapter; import net.sf.openrocket.android.db.DbAdapter;
import net.sf.openrocket.android.motor.ExtendedThrustCurveMotor; import net.sf.openrocket.android.motor.ExtendedThrustCurveMotor;
import net.sf.openrocket.android.util.AndroidLogWrapper;
import android.app.Activity; import android.app.Activity;
import android.app.AlertDialog; import android.app.AlertDialog;
import android.app.ProgressDialog; import android.app.ProgressDialog;
import android.content.DialogInterface; import android.content.DialogInterface;
import android.os.Handler; import android.os.Handler;
import android.util.Log;
/** /**
* TCQueryAction is a class which provides all the functionality required * TCQueryAction is a class which provides all the functionality required
@ -33,8 +33,6 @@ public class TCQueryAction {
public void onComplete(); public void onComplete();
} }
private final static String TAG = "TCQueryAction";
private DbAdapter mDbHelper; private DbAdapter mDbHelper;
private ProgressDialog progress; private ProgressDialog progress;
@ -157,7 +155,7 @@ public class TCQueryAction {
MotorBurnFile b = new ThrustCurveAPI().downloadData(mi.getMotor_id()); MotorBurnFile b = new ThrustCurveAPI().downloadData(mi.getMotor_id());
Log.d(TAG, mi.toString()); AndroidLogWrapper.d(TCQueryAction.class, mi.toString());
ExtendedThrustCurveMotor m = new ExtendedThrustCurveMotor(); ExtendedThrustCurveMotor m = new ExtendedThrustCurveMotor();
@ -184,7 +182,7 @@ public class TCQueryAction {
m.setCaseInfo(mi.getCase_info()); m.setCaseInfo(mi.getCase_info());
} }
Log.d(TAG,"adding motor " + m.toString()); AndroidLogWrapper.d(TCQueryAction.class,"adding motor " + m.toString());
// Write motor. // Write motor.
mDbHelper.getMotorDao().insertOrUpdateMotor(m); mDbHelper.getMotorDao().insertOrUpdateMotor(m);
} }
@ -195,7 +193,7 @@ public class TCQueryAction {
} }
} }
catch( Exception ex){ catch( Exception ex){
Log.d(TAG,ex.toString()); AndroidLogWrapper.d(TCQueryAction.class,ex.toString());
handler.post( new Error(ex.toString()) ); handler.post( new Error(ex.toString()) );
} }

18
android/src/net/sf/openrocket/android/thrustcurve/TCQueryActivity.java
View File

@ -1,15 +1,9 @@
package net.sf.openrocket.android.thrustcurve; package net.sf.openrocket.android.thrustcurve;
import net.sf.openrocket.R; import net.sf.openrocket.R;
import net.sf.openrocket.android.db.DbAdapter; import net.sf.openrocket.android.util.AndroidLogWrapper;
import net.sf.openrocket.android.motor.ExtendedThrustCurveMotor;
import android.app.Activity; import android.app.Activity;
import android.app.AlertDialog;
import android.app.ProgressDialog;
import android.content.DialogInterface;
import android.os.Bundle; import android.os.Bundle;
import android.os.Handler;
import android.util.Log;
import android.view.View; import android.view.View;
import android.widget.Button; import android.widget.Button;
import android.widget.EditText; import android.widget.EditText;
@ -19,8 +13,6 @@ public class TCQueryActivity extends Activity
implements TCQueryAction.OnComplete implements TCQueryAction.OnComplete
{ {
private static final String TAG = "ThrustCurveQueryActivity";
private TCQueryAction queryAction; private TCQueryAction queryAction;
@Override @Override
@ -40,24 +32,24 @@ implements TCQueryAction.OnComplete
new View.OnClickListener() { new View.OnClickListener() {
@Override @Override
public void onClick( View v ) { public void onClick( View v ) {
Log.d(TAG,"submit button clicked"); AndroidLogWrapper.d(TCQueryActivity.class,"submit button clicked");
String commonName = commonNameField.getText().toString(); String commonName = commonNameField.getText().toString();
SearchRequest r = new SearchRequest(); SearchRequest r = new SearchRequest();
if ( manufacturerField.getSelectedItemPosition() != 0) { if ( manufacturerField.getSelectedItemPosition() != 0) {
String m = (String) manufacturerField.getSelectedItem(); String m = (String) manufacturerField.getSelectedItem();
Log.d(TAG,"manufacturer = " + m); AndroidLogWrapper.d(TCQueryActivity.class,"manufacturer = " + m);
r.setManufacturer(m); r.setManufacturer(m);
} }
if ( impulseField.getSelectedItemPosition() != 0 ) { if ( impulseField.getSelectedItemPosition() != 0 ) {
String impulse = (String) impulseField.getSelectedItem(); String impulse = (String) impulseField.getSelectedItem();
Log.d(TAG,"impulse = " + impulse); AndroidLogWrapper.d(TCQueryActivity.class,"impulse = " + impulse);
r.setImpulse_class(impulse); r.setImpulse_class(impulse);
} }
if ( diameterField.getSelectedItemPosition() != 0 ) { if ( diameterField.getSelectedItemPosition() != 0 ) {
String diameter = (String)diameterField.getSelectedItem(); String diameter = (String)diameterField.getSelectedItem();
Log.d(TAG,"diameter = " + diameter); AndroidLogWrapper.d(TCQueryActivity.class,"diameter = " + diameter);
r.setDiameter(diameter); r.setDiameter(diameter);
} }
r.setCommon_name(commonName); r.setCommon_name(commonName);

12
android/src/net/sf/openrocket/android/thrustcurve/ThrustCurveAPI.java
View File

@ -7,20 +7,18 @@ import java.net.MalformedURLException;
import java.net.URL; import java.net.URL;
import java.net.URLConnection; import java.net.URLConnection;
import android.util.Log; import net.sf.openrocket.android.util.AndroidLogWrapper;
public class ThrustCurveAPI { public class ThrustCurveAPI {
private final static String TAG = "ThrustCurveAPI";
private String url_base = "http://www.thrustcurve.org/servlets/"; private String url_base = "http://www.thrustcurve.org/servlets/";
public SearchResponse doSearch( SearchRequest request ) throws MalformedURLException, IOException { public SearchResponse doSearch( SearchRequest request ) throws MalformedURLException, IOException {
String requestString = request.toString(); String requestString = request.toString();
Log.d(TAG, "doSearch: " + requestString); AndroidLogWrapper.d(ThrustCurveAPI.class, "doSearch: " + requestString);
URL url = new URL(url_base + "search"); URL url = new URL(url_base + "search");
OutputStream stream; OutputStream stream;
@ -38,7 +36,7 @@ public class ThrustCurveAPI {
InputStream is = conn.getInputStream(); InputStream is = conn.getInputStream();
SearchResponse result = SearchResponseParser.parse(is); SearchResponse result = SearchResponseParser.parse(is);
Log.d(TAG,result.toString()); AndroidLogWrapper.d(ThrustCurveAPI.class,result.toString());
return result; return result;
} }
@ -53,7 +51,7 @@ public class ThrustCurveAPI {
String requestString = dr.toString(); String requestString = dr.toString();
Log.d(TAG, "downloadData: " + requestString); AndroidLogWrapper.d(ThrustCurveAPI.class, "downloadData: " + requestString);
URL url = new URL(url_base + "download"); URL url = new URL(url_base + "download");
OutputStream stream; OutputStream stream;
@ -70,7 +68,7 @@ public class ThrustCurveAPI {
InputStream is = conn.getInputStream(); InputStream is = conn.getInputStream();
DownloadResponse downloadResponse = DownloadResponseParser.parse(is); DownloadResponse downloadResponse = DownloadResponseParser.parse(is);
Log.d(TAG,downloadResponse.toString()); AndroidLogWrapper.d(ThrustCurveAPI.class,downloadResponse.toString());
MotorBurnFile mbf = downloadResponse.getData(motor_id); MotorBurnFile mbf = downloadResponse.getData(motor_id);

37
android/src/net/sf/openrocket/android/util/AndroidLogWrapper.java
View File

@ -2,6 +2,9 @@ package net.sf.openrocket.android.util;
import java.text.MessageFormat; import java.text.MessageFormat;
import net.sf.openrocket.logging.LogLevel;
import net.sf.openrocket.logging.LogLine;
import android.util.Log; import android.util.Log;
public class AndroidLogWrapper { public class AndroidLogWrapper {
@ -52,4 +55,38 @@ public class AndroidLogWrapper {
return s; return s;
} }
public static class LogHelper extends net.sf.openrocket.logging.LogHelper {
/* (non-Javadoc)
* @see net.sf.openrocket.logging.LogHelper#log(net.sf.openrocket.logging.LogLine)
*/
@Override
public void log(LogLine line) {
if ( !logEnabled ) {
return;
}
LogLevel level = line.getLevel();
switch ( level ) {
case ERROR:
Log.e("OpenRocket", line.toString());
break;
case WARN:
Log.w("OpenRocket", line.toString());
break;
case INFO:
Log.i("OpenRocket", line.toString());
break;
case DEBUG:
Log.d("OpenRocket", line.toString());
break;
default:
Log.v("OpenRocket", line.toString());
}
}
}
} }

7
android/src/pl/polidea/treeview/TreeBuilder.java
View File

@ -1,6 +1,6 @@
package pl.polidea.treeview; package pl.polidea.treeview;
import android.util.Log; import net.sf.openrocket.android.util.AndroidLogWrapper;
/** /**
* Allows to build tree easily in sequential mode (you have to know levels of * Allows to build tree easily in sequential mode (you have to know levels of
@ -10,7 +10,6 @@ import android.util.Log;
* @param <T> * @param <T>
*/ */
public class TreeBuilder<T> { public class TreeBuilder<T> {
private static final String TAG = TreeBuilder.class.getSimpleName();
private final TreeStateManager<T> manager; private final TreeStateManager<T> manager;
@ -38,7 +37,7 @@ public class TreeBuilder<T> {
* child id * child id
*/ */
public synchronized void addRelation(final T parent, final T child) { public synchronized void addRelation(final T parent, final T child) {
Log.d(TAG, "Adding relation parent:" + parent + " -> child: " + child); AndroidLogWrapper.d(TreeBuilder.class, "Adding relation parent:" + parent + " -> child: " + child);
manager.addAfterChild(parent, child, null); manager.addAfterChild(parent, child, null);
lastAddedId = child; lastAddedId = child;
lastLevel = manager.getLevel(child); lastLevel = manager.getLevel(child);
@ -58,7 +57,7 @@ public class TreeBuilder<T> {
* its level * its level
*/ */
public synchronized void sequentiallyAddNextNode(final T id, final int level) { public synchronized void sequentiallyAddNextNode(final T id, final int level) {
Log.d(TAG, "Adding sequentiall node " + id + " at level " + level); AndroidLogWrapper.d(TreeBuilder.class, "Adding sequentiall node " + id + " at level " + level);
if (lastAddedId == null) { if (lastAddedId == null) {
addNodeToParentOneLevelDown(null, id, level); addNodeToParentOneLevelDown(null, id, level);
} else { } else {