From 9e05cfeb29e965173636740deb3a706e6257c9fa Mon Sep 17 00:00:00 2001 From: Kevin Ruland Date: Wed, 1 Feb 2012 02:44:37 +0000 Subject: [PATCH] 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. --- .../sf/openrocket/android/Application.java | 3 +- .../net/sf/openrocket/android/LogHelper.java | 37 ------------------ .../android/MotorDatabaseAdapter.java | 13 +++---- .../sf/openrocket/android/db/DbAdapter.java | 4 +- .../sf/openrocket/android/db/MotorDao.java | 6 +-- .../android/motor/BurnPlotFragment.java | 21 +++++----- .../android/motor/MotorDetailsActivity.java | 6 +-- .../rocket/OpenRocketLoaderActivity.java | 11 +++--- .../android/rocket/OpenRocketLoaderTask.java | 8 ++-- .../android/rocket/OpenRocketViewer.java | 6 +-- .../openrocket/android/rocket/Overview.java | 8 ++-- .../android/rocket/Simulations.java | 4 +- .../android/simulation/SimulationChart.java | 6 +-- .../thrustcurve/DownloadResponseParser.java | 11 +++--- .../android/thrustcurve/TCQueryAction.java | 10 ++--- .../android/thrustcurve/TCQueryActivity.java | 18 +++------ .../android/thrustcurve/ThrustCurveAPI.java | 12 +++--- .../android/util/AndroidLogWrapper.java | 39 ++++++++++++++++++- .../src/pl/polidea/treeview/TreeBuilder.java | 7 ++-- 19 files changed, 101 insertions(+), 129 deletions(-) delete mode 100644 android/src/net/sf/openrocket/android/LogHelper.java diff --git a/android/src/net/sf/openrocket/android/Application.java b/android/src/net/sf/openrocket/android/Application.java index 5c34da432..6a13a7bf5 100644 --- a/android/src/net/sf/openrocket/android/Application.java +++ b/android/src/net/sf/openrocket/android/Application.java @@ -2,6 +2,7 @@ package net.sf.openrocket.android; import java.util.Locale; +import net.sf.openrocket.android.util.AndroidLogWrapper; import net.sf.openrocket.document.OpenRocketDocument; import net.sf.openrocket.l10n.DebugTranslator; 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. 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() ); diff --git a/android/src/net/sf/openrocket/android/LogHelper.java b/android/src/net/sf/openrocket/android/LogHelper.java deleted file mode 100644 index ae10d8b45..000000000 --- a/android/src/net/sf/openrocket/android/LogHelper.java +++ /dev/null @@ -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()); - } - } - - -} diff --git a/android/src/net/sf/openrocket/android/MotorDatabaseAdapter.java b/android/src/net/sf/openrocket/android/MotorDatabaseAdapter.java index 6470e06c4..0d64ca605 100644 --- a/android/src/net/sf/openrocket/android/MotorDatabaseAdapter.java +++ b/android/src/net/sf/openrocket/android/MotorDatabaseAdapter.java @@ -5,15 +5,14 @@ import java.util.List; import net.sf.openrocket.android.db.DbAdapter; import net.sf.openrocket.android.motor.ExtendedThrustCurveMotor; +import net.sf.openrocket.android.util.AndroidLogWrapper; import net.sf.openrocket.database.MotorDatabase; import net.sf.openrocket.motor.Motor; import net.sf.openrocket.motor.Motor.Type; import android.content.Context; -import android.util.Log; public class MotorDatabaseAdapter implements MotorDatabase { - private final static String TAG = "MotorDatabaseAdapter"; private DbAdapter mDbHelper; public MotorDatabaseAdapter( Context ctx ) { @@ -25,11 +24,11 @@ public class MotorDatabaseAdapter implements MotorDatabase { public List findMotors(Type type, String manufacturer, String designation, double diameter, double length) { - Log.d(TAG,"find motor: type="+ type.toString()); - Log.d(TAG,"find motor: manu="+ manufacturer); - Log.d(TAG,"find motor: designation="+ designation); - Log.d(TAG,"find motor: diameter=" +diameter); - Log.d(TAG,"find motor: length="+ length); + AndroidLogWrapper.d(MotorDatabaseAdapter.class,"find motor: type="+ type.toString()); + AndroidLogWrapper.d(MotorDatabaseAdapter.class,"find motor: manu="+ manufacturer); + AndroidLogWrapper.d(MotorDatabaseAdapter.class,"find motor: designation="+ designation); + AndroidLogWrapper.d(MotorDatabaseAdapter.class,"find motor: diameter=" +diameter); + AndroidLogWrapper.d(MotorDatabaseAdapter.class,"find motor: length="+ length); try { ExtendedThrustCurveMotor m = mDbHelper.getMotorDao().fetchMotor(manufacturer, designation); diff --git a/android/src/net/sf/openrocket/android/db/DbAdapter.java b/android/src/net/sf/openrocket/android/db/DbAdapter.java index 216f47a1e..36d066383 100644 --- a/android/src/net/sf/openrocket/android/db/DbAdapter.java +++ b/android/src/net/sf/openrocket/android/db/DbAdapter.java @@ -1,10 +1,10 @@ package net.sf.openrocket.android.db; +import net.sf.openrocket.android.util.AndroidLogWrapper; import android.content.Context; import android.database.SQLException; import android.database.sqlite.SQLiteDatabase; import android.database.sqlite.SQLiteOpenHelper; -import android.util.Log; public class DbAdapter { @@ -35,7 +35,7 @@ public class DbAdapter { @Override 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"); executeSQL(db, MotorDao.update(oldVersion, newVersion)); } diff --git a/android/src/net/sf/openrocket/android/db/MotorDao.java b/android/src/net/sf/openrocket/android/db/MotorDao.java index f371f4a74..5ea8caec1 100644 --- a/android/src/net/sf/openrocket/android/db/MotorDao.java +++ b/android/src/net/sf/openrocket/android/db/MotorDao.java @@ -1,6 +1,7 @@ package net.sf.openrocket.android.db; 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.Motor; import net.sf.openrocket.motor.ThrustCurveMotor; @@ -8,12 +9,9 @@ import net.sf.openrocket.util.Coordinate; import android.content.ContentValues; import android.database.Cursor; import android.database.sqlite.SQLiteDatabase; -import android.util.Log; public class MotorDao { - private static final String TAG = "MotorDao"; - private SQLiteDatabase mDb; private final static String DATABASE_TABLE = "motor"; @@ -115,7 +113,7 @@ public class MotorDao { initialValues.put(TIME_DATA, ConversionUtils.serializeArrayOfDouble(tcm.getTimePoints())); 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); return rv; } diff --git a/android/src/net/sf/openrocket/android/motor/BurnPlotFragment.java b/android/src/net/sf/openrocket/android/motor/BurnPlotFragment.java index 493737627..5f777dc14 100644 --- a/android/src/net/sf/openrocket/android/motor/BurnPlotFragment.java +++ b/android/src/net/sf/openrocket/android/motor/BurnPlotFragment.java @@ -5,12 +5,11 @@ import java.util.List; import java.util.Vector; import net.sf.openrocket.R; -import android.app.Activity; +import net.sf.openrocket.android.util.AndroidLogWrapper; import android.graphics.Color; import android.graphics.PointF; import android.os.Bundle; import android.support.v4.app.Fragment; -import android.util.Log; import android.view.LayoutInflater; import android.view.MotionEvent; import android.view.ScaleGestureDetector; @@ -27,8 +26,6 @@ import com.androidplot.xy.YValueMarker; public class BurnPlotFragment extends Fragment implements OnTouchListener { - private final static String TAG = "BurnPlotFragment"; - private ExtendedThrustCurveMotor motor; private XYPlot mySimpleXYPlot; @@ -44,14 +41,14 @@ public class BurnPlotFragment extends Fragment implements OnTouchListener { @Override public void onCreate(Bundle savedInstanceState) { - Log.d(TAG,"onCreate"); + AndroidLogWrapper.d(BurnPlotFragment.class,"onCreate"); super.onCreate(savedInstanceState); } @Override public View onCreateView(LayoutInflater inflater, ViewGroup container, Bundle savedInstanceState) { - Log.d(TAG,"onCreateView"); + AndroidLogWrapper.d(BurnPlotFragment.class,"onCreateView"); View v = inflater.inflate(R.layout.motor_burn, container, false); mySimpleXYPlot = (XYPlot) v.findViewById(R.id.xyplot); mySimpleXYPlot.setOnTouchListener(this); @@ -180,17 +177,17 @@ public class BurnPlotFragment extends Fragment implements OnTouchListener { } private void zoom(float scale) { - Log.d(TAG,"zoom by " + scale); + AndroidLogWrapper.d(BurnPlotFragment.class,"zoom by " + scale); float domainSpan = absMaxX - absMinX; - Log.d(TAG,"domainSpan = " + domainSpan); + AndroidLogWrapper.d(BurnPlotFragment.class,"domainSpan = " + domainSpan); float domainMidPoint = absMaxX - domainSpan / 2.0f; - Log.d(TAG,"domainMidPoint = " + domainMidPoint); + AndroidLogWrapper.d(BurnPlotFragment.class,"domainMidPoint = " + domainMidPoint); float offset = domainSpan / scale; - Log.d(TAG,"offset " + offset); + AndroidLogWrapper.d(BurnPlotFragment.class,"offset " + offset); minXY.x=domainMidPoint- offset; - Log.d(TAG,"min X " + minXY.x); + AndroidLogWrapper.d(BurnPlotFragment.class,"min X " + minXY.x); maxXY.x=domainMidPoint+offset; - Log.d(TAG,"max X " + maxXY.x); + AndroidLogWrapper.d(BurnPlotFragment.class,"max X " + maxXY.x); checkBoundaries(); mySimpleXYPlot.setDomainBoundaries(minXY.x, maxXY.x, BoundaryMode.AUTO); mySimpleXYPlot.redraw(); diff --git a/android/src/net/sf/openrocket/android/motor/MotorDetailsActivity.java b/android/src/net/sf/openrocket/android/motor/MotorDetailsActivity.java index ed97b837a..684ebc463 100644 --- a/android/src/net/sf/openrocket/android/motor/MotorDetailsActivity.java +++ b/android/src/net/sf/openrocket/android/motor/MotorDetailsActivity.java @@ -2,10 +2,10 @@ package net.sf.openrocket.android.motor; import net.sf.openrocket.R; import net.sf.openrocket.android.db.DbAdapter; +import net.sf.openrocket.android.util.AndroidLogWrapper; import android.content.Intent; import android.os.Bundle; import android.support.v4.app.FragmentActivity; -import android.util.Log; import android.view.Menu; import android.view.MenuInflater; import android.view.MenuItem; @@ -15,8 +15,6 @@ import android.widget.SlidingDrawer; public class MotorDetailsActivity extends FragmentActivity implements SlidingDrawer.OnDrawerCloseListener, SlidingDrawer.OnDrawerOpenListener { - private final static String TAG = "MotorDetails"; - private SlidingDrawer slidingDrawer; private ImageView handle; @@ -25,7 +23,7 @@ implements SlidingDrawer.OnDrawerCloseListener, SlidingDrawer.OnDrawerOpenListen @Override public void onCreate(Bundle 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); Intent i = getIntent(); diff --git a/android/src/net/sf/openrocket/android/rocket/OpenRocketLoaderActivity.java b/android/src/net/sf/openrocket/android/rocket/OpenRocketLoaderActivity.java index 366581407..caf3a5f99 100644 --- a/android/src/net/sf/openrocket/android/rocket/OpenRocketLoaderActivity.java +++ b/android/src/net/sf/openrocket/android/rocket/OpenRocketLoaderActivity.java @@ -5,6 +5,7 @@ import java.io.File; import net.sf.openrocket.R; import net.sf.openrocket.aerodynamics.WarningSet; import net.sf.openrocket.android.Application; +import net.sf.openrocket.android.util.AndroidLogWrapper; import android.app.AlertDialog; import android.app.Dialog; import android.app.ProgressDialog; @@ -14,10 +15,8 @@ import android.net.Uri; import android.os.Bundle; import android.support.v4.app.DialogFragment; import android.support.v4.app.FragmentActivity; -import android.util.Log; public class OpenRocketLoaderActivity extends FragmentActivity { - private static final String TAG = "OpenRocketLoader"; private ProgressDialog progress; @@ -42,7 +41,7 @@ public class OpenRocketLoaderActivity extends FragmentActivity { } private void loadOrkFile( Uri file ) { - Log.d(TAG,"Use ork file: " + file); + AndroidLogWrapper.d(OpenRocketLoaderActivity.class,"Use ork file: " + file); String path = file.getPath(); File orkFile = new File(path); progress = ProgressDialog.show(this, "Loading file", ""); @@ -55,7 +54,7 @@ public class OpenRocketLoaderActivity extends FragmentActivity { @Override protected void onPostExecute(OpenRocketLoaderResult result) { super.onPostExecute(result); - Log.d(TAG,"Finished loading " + OpenRocketLoaderActivity.this); + AndroidLogWrapper.d(OpenRocketLoaderActivity.class,"Finished loading " + OpenRocketLoaderActivity.this); finishedLoading(result); } @@ -85,13 +84,13 @@ public class OpenRocketLoaderActivity extends FragmentActivity { public void doPositiveClick() { // Do stuff here. - Log.i("FragmentAlertDialog", "Positive click!"); + AndroidLogWrapper.i(OpenRocketLoaderActivity.class, "Positive click!"); finish(); } public void doNegativeClick() { // Do stuff here. - Log.i("FragmentAlertDialog", "Negative click!"); + AndroidLogWrapper.i(OpenRocketLoaderActivity.class, "Negative click!"); finish(); } diff --git a/android/src/net/sf/openrocket/android/rocket/OpenRocketLoaderTask.java b/android/src/net/sf/openrocket/android/rocket/OpenRocketLoaderTask.java index eaca73628..ccacf94d9 100644 --- a/android/src/net/sf/openrocket/android/rocket/OpenRocketLoaderTask.java +++ b/android/src/net/sf/openrocket/android/rocket/OpenRocketLoaderTask.java @@ -2,23 +2,21 @@ package net.sf.openrocket.android.rocket; import java.io.File; +import net.sf.openrocket.android.util.AndroidLogWrapper; import net.sf.openrocket.document.OpenRocketDocument; import net.sf.openrocket.file.DatabaseMotorFinder; import net.sf.openrocket.file.RocketLoadException; import net.sf.openrocket.file.openrocket.importt.OpenRocketLoader; import android.os.AsyncTask; -import android.util.Log; public class OpenRocketLoaderTask extends AsyncTask { - private final static String TAG = "OpenRocketLoaderTask"; - /* (non-Javadoc) * @see android.os.AsyncTask#doInBackground(Params[]) */ @Override protected OpenRocketLoaderResult doInBackground(File... arg0) { - Log.d(TAG, "doInBackgroud"); + AndroidLogWrapper.d(OpenRocketLoaderTask.class, "doInBackgroud"); OpenRocketLoader rocketLoader = new OpenRocketLoader(); try { @@ -28,7 +26,7 @@ public class OpenRocketLoaderTask extends AsyncTask sims = new ArrayAdapter(this.getActivity(),android.R.layout.simple_list_item_2,rocketDocument.getSimulations()) { diff --git a/android/src/net/sf/openrocket/android/simulation/SimulationChart.java b/android/src/net/sf/openrocket/android/simulation/SimulationChart.java index 00209457b..807c58a77 100644 --- a/android/src/net/sf/openrocket/android/simulation/SimulationChart.java +++ b/android/src/net/sf/openrocket/android/simulation/SimulationChart.java @@ -19,6 +19,7 @@ import java.io.Serializable; import java.util.ArrayList; import java.util.List; +import net.sf.openrocket.android.util.AndroidLogWrapper; import net.sf.openrocket.document.OpenRocketDocument; import net.sf.openrocket.document.Simulation; import net.sf.openrocket.simulation.FlightDataBranch; @@ -35,7 +36,6 @@ import org.achartengine.renderer.XYSeriesRenderer; import android.graphics.Color; import android.graphics.Paint.Align; -import android.util.Log; /** * This is really a flyweight object so we can serialize the @@ -52,8 +52,6 @@ import android.util.Log; */ public class SimulationChart implements Serializable { - private final static String TAG = "SimulationChart"; - private final int simulationIndex; private transient FlightDataType series1; private transient FlightDataType series2; @@ -175,7 +173,7 @@ public class SimulationChart implements Serializable { double ymax = computeMaxValueWithPadding( series1values ); double xmax = Math.ceil( timevalues.get( timevalues.size()-1)); - Log.d(TAG,"ymax = " + ymax); + AndroidLogWrapper.d(SimulationChart.class,"ymax = " + ymax); renderer.setXAxisMax(xmax); renderer.setYAxisMax(ymax); diff --git a/android/src/net/sf/openrocket/android/thrustcurve/DownloadResponseParser.java b/android/src/net/sf/openrocket/android/thrustcurve/DownloadResponseParser.java index 82997829f..a38a4e042 100644 --- a/android/src/net/sf/openrocket/android/thrustcurve/DownloadResponseParser.java +++ b/android/src/net/sf/openrocket/android/thrustcurve/DownloadResponseParser.java @@ -2,6 +2,8 @@ package net.sf.openrocket.android.thrustcurve; import java.io.InputStream; +import net.sf.openrocket.android.util.AndroidLogWrapper; + import org.xml.sax.Attributes; import android.sax.Element; @@ -9,13 +11,10 @@ import android.sax.EndElementListener; import android.sax.EndTextElementListener; import android.sax.RootElement; import android.sax.StartElementListener; -import android.util.Log; import android.util.Xml; public class DownloadResponseParser { - private static final String TAG = "DownloadResponseParser"; - private static final String thrustcurveURI = "http://www.thrustcurve.org/2009/DownloadResponse"; private static final String root_tag = "download-response"; @@ -45,7 +44,7 @@ public class DownloadResponseParser { rootEl.setStartElementListener( new StartElementListener() { public void start(Attributes arg0) { - Log.d(TAG,"Start Element error"); + AndroidLogWrapper.d(TAG,"Start Element error"); ret.setError("IsError"); } } @@ -57,7 +56,7 @@ public class DownloadResponseParser { new StartElementListener() { @Override public void start(Attributes arg0) { - Log.d(TAG,"Start Element result"); + AndroidLogWrapper.d(DownloadResponseParser.class,"Start Element result"); currentMotor.init(); } } @@ -73,7 +72,7 @@ public class DownloadResponseParser { try { s = Base64Decoder.decodeData(current_data.s); } catch ( Exception ex ) { - Log.d(TAG,"base64: " + ex.getMessage()); + AndroidLogWrapper.d(DownloadResponseParser.class,"base64: " + ex.getMessage()); } currentMotor.decodeFile( s ); } diff --git a/android/src/net/sf/openrocket/android/thrustcurve/TCQueryAction.java b/android/src/net/sf/openrocket/android/thrustcurve/TCQueryAction.java index 70dc4b79b..69714cbdc 100644 --- a/android/src/net/sf/openrocket/android/thrustcurve/TCQueryAction.java +++ b/android/src/net/sf/openrocket/android/thrustcurve/TCQueryAction.java @@ -2,12 +2,12 @@ package net.sf.openrocket.android.thrustcurve; import net.sf.openrocket.android.db.DbAdapter; import net.sf.openrocket.android.motor.ExtendedThrustCurveMotor; +import net.sf.openrocket.android.util.AndroidLogWrapper; import android.app.Activity; import android.app.AlertDialog; import android.app.ProgressDialog; import android.content.DialogInterface; import android.os.Handler; -import android.util.Log; /** * TCQueryAction is a class which provides all the functionality required @@ -33,8 +33,6 @@ public class TCQueryAction { public void onComplete(); } - private final static String TAG = "TCQueryAction"; - private DbAdapter mDbHelper; private ProgressDialog progress; @@ -157,7 +155,7 @@ public class TCQueryAction { MotorBurnFile b = new ThrustCurveAPI().downloadData(mi.getMotor_id()); - Log.d(TAG, mi.toString()); + AndroidLogWrapper.d(TCQueryAction.class, mi.toString()); ExtendedThrustCurveMotor m = new ExtendedThrustCurveMotor(); @@ -184,7 +182,7 @@ public class TCQueryAction { m.setCaseInfo(mi.getCase_info()); } - Log.d(TAG,"adding motor " + m.toString()); + AndroidLogWrapper.d(TCQueryAction.class,"adding motor " + m.toString()); // Write motor. mDbHelper.getMotorDao().insertOrUpdateMotor(m); } @@ -195,7 +193,7 @@ public class TCQueryAction { } } catch( Exception ex){ - Log.d(TAG,ex.toString()); + AndroidLogWrapper.d(TCQueryAction.class,ex.toString()); handler.post( new Error(ex.toString()) ); } diff --git a/android/src/net/sf/openrocket/android/thrustcurve/TCQueryActivity.java b/android/src/net/sf/openrocket/android/thrustcurve/TCQueryActivity.java index df45897f2..6c5e4c896 100644 --- a/android/src/net/sf/openrocket/android/thrustcurve/TCQueryActivity.java +++ b/android/src/net/sf/openrocket/android/thrustcurve/TCQueryActivity.java @@ -1,15 +1,9 @@ package net.sf.openrocket.android.thrustcurve; import net.sf.openrocket.R; -import net.sf.openrocket.android.db.DbAdapter; -import net.sf.openrocket.android.motor.ExtendedThrustCurveMotor; +import net.sf.openrocket.android.util.AndroidLogWrapper; import android.app.Activity; -import android.app.AlertDialog; -import android.app.ProgressDialog; -import android.content.DialogInterface; import android.os.Bundle; -import android.os.Handler; -import android.util.Log; import android.view.View; import android.widget.Button; import android.widget.EditText; @@ -19,8 +13,6 @@ public class TCQueryActivity extends Activity implements TCQueryAction.OnComplete { - private static final String TAG = "ThrustCurveQueryActivity"; - private TCQueryAction queryAction; @Override @@ -40,24 +32,24 @@ implements TCQueryAction.OnComplete new View.OnClickListener() { @Override public void onClick( View v ) { - Log.d(TAG,"submit button clicked"); + AndroidLogWrapper.d(TCQueryActivity.class,"submit button clicked"); String commonName = commonNameField.getText().toString(); SearchRequest r = new SearchRequest(); if ( manufacturerField.getSelectedItemPosition() != 0) { String m = (String) manufacturerField.getSelectedItem(); - Log.d(TAG,"manufacturer = " + m); + AndroidLogWrapper.d(TCQueryActivity.class,"manufacturer = " + m); r.setManufacturer(m); } if ( impulseField.getSelectedItemPosition() != 0 ) { String impulse = (String) impulseField.getSelectedItem(); - Log.d(TAG,"impulse = " + impulse); + AndroidLogWrapper.d(TCQueryActivity.class,"impulse = " + impulse); r.setImpulse_class(impulse); } if ( diameterField.getSelectedItemPosition() != 0 ) { String diameter = (String)diameterField.getSelectedItem(); - Log.d(TAG,"diameter = " + diameter); + AndroidLogWrapper.d(TCQueryActivity.class,"diameter = " + diameter); r.setDiameter(diameter); } r.setCommon_name(commonName); diff --git a/android/src/net/sf/openrocket/android/thrustcurve/ThrustCurveAPI.java b/android/src/net/sf/openrocket/android/thrustcurve/ThrustCurveAPI.java index 9241228bc..2f38a4224 100644 --- a/android/src/net/sf/openrocket/android/thrustcurve/ThrustCurveAPI.java +++ b/android/src/net/sf/openrocket/android/thrustcurve/ThrustCurveAPI.java @@ -7,20 +7,18 @@ import java.net.MalformedURLException; import java.net.URL; import java.net.URLConnection; -import android.util.Log; +import net.sf.openrocket.android.util.AndroidLogWrapper; public class ThrustCurveAPI { - private final static String TAG = "ThrustCurveAPI"; - private String url_base = "http://www.thrustcurve.org/servlets/"; public SearchResponse doSearch( SearchRequest request ) throws MalformedURLException, IOException { String requestString = request.toString(); - Log.d(TAG, "doSearch: " + requestString); + AndroidLogWrapper.d(ThrustCurveAPI.class, "doSearch: " + requestString); URL url = new URL(url_base + "search"); OutputStream stream; @@ -38,7 +36,7 @@ public class ThrustCurveAPI { InputStream is = conn.getInputStream(); SearchResponse result = SearchResponseParser.parse(is); - Log.d(TAG,result.toString()); + AndroidLogWrapper.d(ThrustCurveAPI.class,result.toString()); return result; } @@ -53,7 +51,7 @@ public class ThrustCurveAPI { String requestString = dr.toString(); - Log.d(TAG, "downloadData: " + requestString); + AndroidLogWrapper.d(ThrustCurveAPI.class, "downloadData: " + requestString); URL url = new URL(url_base + "download"); OutputStream stream; @@ -70,7 +68,7 @@ public class ThrustCurveAPI { InputStream is = conn.getInputStream(); DownloadResponse downloadResponse = DownloadResponseParser.parse(is); - Log.d(TAG,downloadResponse.toString()); + AndroidLogWrapper.d(ThrustCurveAPI.class,downloadResponse.toString()); MotorBurnFile mbf = downloadResponse.getData(motor_id); diff --git a/android/src/net/sf/openrocket/android/util/AndroidLogWrapper.java b/android/src/net/sf/openrocket/android/util/AndroidLogWrapper.java index 456136a16..28ca0023b 100644 --- a/android/src/net/sf/openrocket/android/util/AndroidLogWrapper.java +++ b/android/src/net/sf/openrocket/android/util/AndroidLogWrapper.java @@ -2,6 +2,9 @@ package net.sf.openrocket.android.util; import java.text.MessageFormat; +import net.sf.openrocket.logging.LogLevel; +import net.sf.openrocket.logging.LogLine; + import android.util.Log; public class AndroidLogWrapper { @@ -51,5 +54,39 @@ public class AndroidLogWrapper { String s = clzz.getSimpleName(); 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()); + } + } + + } + } diff --git a/android/src/pl/polidea/treeview/TreeBuilder.java b/android/src/pl/polidea/treeview/TreeBuilder.java index 13b499c47..cfb6d0077 100644 --- a/android/src/pl/polidea/treeview/TreeBuilder.java +++ b/android/src/pl/polidea/treeview/TreeBuilder.java @@ -1,6 +1,6 @@ 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 @@ -10,7 +10,6 @@ import android.util.Log; * @param */ public class TreeBuilder { - private static final String TAG = TreeBuilder.class.getSimpleName(); private final TreeStateManager manager; @@ -38,7 +37,7 @@ public class TreeBuilder { * child id */ 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); lastAddedId = child; lastLevel = manager.getLevel(child); @@ -58,7 +57,7 @@ public class TreeBuilder { * its 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) { addNodeToParentOneLevelDown(null, id, level); } else {