Change all calls to android.util.Log to use the AndroidLogWrapper class since it...

git-svn-id: https://openrocket.svn.sourceforge.net/svnroot/openrocket/trunk@382 180e2498-e6e9-4542-8430-84ac67f01cd8

diff --git a/android/src/net/sf/openrocket/android/Application.java b/android/src/net/sf/openrocket/android/Application.java
index 5c34da432ad616ee5b03e56d967af78e9fea186c..6a13a7bf5f5acd70d482b0a3f62a0b3319677d90 100644 (file)
--- 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;
 \r
 import java.util.Locale;\r
 \r
+import net.sf.openrocket.android.util.AndroidLogWrapper;\r
 import net.sf.openrocket.document.OpenRocketDocument;\r
 import net.sf.openrocket.l10n.DebugTranslator;\r
 import net.sf.openrocket.l10n.ResourceBundleTranslator;\r
@@ -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.\r
                        System.setProperty("org.xml.sax.driver","org.xmlpull.v1.sax2.Driver");\r
 \r
-                       net.sf.openrocket.startup.Application.setLogger( new LogHelper() );\r
+                       net.sf.openrocket.startup.Application.setLogger( new AndroidLogWrapper.LogHelper() );\r
                        \r
                        net.sf.openrocket.startup.Application.setPreferences( new PreferencesAdapter() );\r
                        \r

diff --git a/android/src/net/sf/openrocket/android/LogHelper.java b/android/src/net/sf/openrocket/android/LogHelper.java
deleted file mode 100644 (file)
index ae10d8b..0000000
--- a/android/src/net/sf/openrocket/android/LogHelper.java
+++ /dev/null
@@ -1,37 +0,0 @@
-package net.sf.openrocket.android;\r
-\r
-import android.util.Log;\r
-import net.sf.openrocket.logging.LogLevel;\r
-import net.sf.openrocket.logging.LogLine;\r
-\r
-\r
-public class LogHelper extends net.sf.openrocket.logging.LogHelper {\r
-\r
-       /* (non-Javadoc)\r
-        * @see net.sf.openrocket.logging.LogHelper#log(net.sf.openrocket.logging.LogLine)\r
-        */\r
-       @Override\r
-       public void log(LogLine line) {\r
-               \r
-               LogLevel level = line.getLevel();\r
-               \r
-               switch ( level ) {\r
-               case ERROR:\r
-                       Log.e("OpenRocket", line.toString());\r
-                       break;\r
-               case WARN:\r
-                       Log.w("OpenRocket", line.toString());\r
-                       break;\r
-               case INFO:\r
-                       Log.i("OpenRocket", line.toString());\r
-                       break;\r
-               case DEBUG:\r
-                       Log.d("OpenRocket", line.toString());\r
-                       break;\r
-               default:\r
-                       Log.v("OpenRocket", line.toString());\r
-               }\r
-       }\r
-\r
-       \r
-}\r

diff --git a/android/src/net/sf/openrocket/android/MotorDatabaseAdapter.java b/android/src/net/sf/openrocket/android/MotorDatabaseAdapter.java
index 6470e06c41bcdcc918e9ebb464546115f62de534..0d64ca605d88da11221c967b9374f10bcc14e2cf 100644 (file)
--- 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;
 \r
 import net.sf.openrocket.android.db.DbAdapter;\r
 import net.sf.openrocket.android.motor.ExtendedThrustCurveMotor;\r
+import net.sf.openrocket.android.util.AndroidLogWrapper;\r
 import net.sf.openrocket.database.MotorDatabase;\r
 import net.sf.openrocket.motor.Motor;\r
 import net.sf.openrocket.motor.Motor.Type;\r
 import android.content.Context;\r
-import android.util.Log;\r
 \r
 public class MotorDatabaseAdapter implements MotorDatabase {\r
 \r
-       private final static String TAG = "MotorDatabaseAdapter";\r
        private DbAdapter mDbHelper;\r
 \r
        public MotorDatabaseAdapter( Context ctx ) {\r
@@ -25,11 +24,11 @@ public class MotorDatabaseAdapter implements MotorDatabase {
        public List<? extends Motor> findMotors(Type type, String manufacturer,\r
                        String designation, double diameter, double length) {\r
 \r
-               Log.d(TAG,"find motor: type="+ type.toString());\r
-               Log.d(TAG,"find motor: manu="+ manufacturer);\r
-               Log.d(TAG,"find motor: designation="+ designation);\r
-               Log.d(TAG,"find motor: diameter=" +diameter);\r
-               Log.d(TAG,"find motor: length="+ length);\r
+               AndroidLogWrapper.d(MotorDatabaseAdapter.class,"find motor: type="+ type.toString());\r
+               AndroidLogWrapper.d(MotorDatabaseAdapter.class,"find motor: manu="+ manufacturer);\r
+               AndroidLogWrapper.d(MotorDatabaseAdapter.class,"find motor: designation="+ designation);\r
+               AndroidLogWrapper.d(MotorDatabaseAdapter.class,"find motor: diameter=" +diameter);\r
+               AndroidLogWrapper.d(MotorDatabaseAdapter.class,"find motor: length="+ length);\r
 \r
                try {\r
                        ExtendedThrustCurveMotor m = mDbHelper.getMotorDao().fetchMotor(manufacturer, designation);\r

diff --git a/android/src/net/sf/openrocket/android/db/DbAdapter.java b/android/src/net/sf/openrocket/android/db/DbAdapter.java
index 216f47a1ef89ccdd1d99198e1764c9b7d0f85544..36d0663838c66d3ad6a1ab2b15b5ca6d99d61bed 100644 (file)
--- 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;\r
 \r
+import net.sf.openrocket.android.util.AndroidLogWrapper;\r
 import android.content.Context;\r
 import android.database.SQLException;\r
 import android.database.sqlite.SQLiteDatabase;\r
 import android.database.sqlite.SQLiteOpenHelper;\r
-import android.util.Log;\r
 \r
 public class DbAdapter {\r
 \r
@@ -35,7 +35,7 @@ public class DbAdapter {
         \r
         @Override\r
         public void onUpgrade(SQLiteDatabase db, int oldVersion, int newVersion) {\r
-            Log.w(TAG, "Upgrading database from version " + oldVersion + " to "\r
+            AndroidLogWrapper.w(DbAdapter.class, "Upgrading database from version " + oldVersion + " to "\r
                     + newVersion + ", which will destroy all old data");\r
             executeSQL(db, MotorDao.update(oldVersion, newVersion));\r
         }\r

diff --git a/android/src/net/sf/openrocket/android/db/MotorDao.java b/android/src/net/sf/openrocket/android/db/MotorDao.java
index f371f4a74b4e042e16042390e4a803d314640cfb..5ea8caec119477b4c823df30031aae8d30a06ea2 100644 (file)
--- 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;\r
 \r
 import net.sf.openrocket.android.motor.ExtendedThrustCurveMotor;\r
+import net.sf.openrocket.android.util.AndroidLogWrapper;\r
 import net.sf.openrocket.motor.Manufacturer;\r
 import net.sf.openrocket.motor.Motor;\r
 import net.sf.openrocket.motor.ThrustCurveMotor;\r
@@ -8,12 +9,9 @@ import net.sf.openrocket.util.Coordinate;
 import android.content.ContentValues;\r
 import android.database.Cursor;\r
 import android.database.sqlite.SQLiteDatabase;\r
-import android.util.Log;\r
 \r
 public class MotorDao {\r
        \r
-       private static final String TAG = "MotorDao";\r
-       \r
        private SQLiteDatabase mDb;\r
        \r
        private final static String DATABASE_TABLE = "motor";\r
@@ -115,7 +113,7 @@ public class MotorDao {
                initialValues.put(TIME_DATA, ConversionUtils.serializeArrayOfDouble(tcm.getTimePoints()));\r
                initialValues.put(CG_DATA, ConversionUtils.serializeArrayOfCoordinate(tcm.getCGPoints()));\r
                \r
-               Log.d(TAG, "insertOrUpdate Motor");\r
+               AndroidLogWrapper.d(MotorDao.class, "insertOrUpdate Motor");\r
                long rv = mDb.insertWithOnConflict(DATABASE_TABLE, null, initialValues, SQLiteDatabase.CONFLICT_REPLACE);\r
                return rv;\r
        }\r

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

diff --git a/android/src/net/sf/openrocket/android/motor/MotorDetailsActivity.java b/android/src/net/sf/openrocket/android/motor/MotorDetailsActivity.java
index ed97b837a2bce07e5f7ff56c67b321dcd10e41ee..684ebc463930f5a819d4032aa8991a0e504cee7c 100644 (file)
--- 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;
 \r
 import net.sf.openrocket.R;\r
 import net.sf.openrocket.android.db.DbAdapter;\r
+import net.sf.openrocket.android.util.AndroidLogWrapper;\r
 import android.content.Intent;\r
 import android.os.Bundle;\r
 import android.support.v4.app.FragmentActivity;\r
-import android.util.Log;\r
 import android.view.Menu;\r
 import android.view.MenuInflater;\r
 import android.view.MenuItem;\r
@@ -15,8 +15,6 @@ import android.widget.SlidingDrawer;
 public class MotorDetailsActivity extends FragmentActivity\r
 implements SlidingDrawer.OnDrawerCloseListener, SlidingDrawer.OnDrawerOpenListener {\r
 \r
-       private final static String TAG = "MotorDetails";\r
-       \r
        private SlidingDrawer slidingDrawer;\r
        private ImageView handle;\r
        \r
@@ -25,7 +23,7 @@ implements SlidingDrawer.OnDrawerCloseListener, SlidingDrawer.OnDrawerOpenListen
        @Override\r
        public void onCreate(Bundle savedInstanceState) {\r
                super.onCreate(savedInstanceState);\r
-               Log.d(TAG,"onCreate Bundle = "+ String.valueOf(savedInstanceState));\r
+               AndroidLogWrapper.d(MotorDetailsActivity.class,"onCreate Bundle = "+ String.valueOf(savedInstanceState));\r
                setContentView(R.layout.motor_detail);\r
 \r
                Intent i = getIntent();\r

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

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

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

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

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

diff --git a/android/src/net/sf/openrocket/android/simulation/SimulationChart.java b/android/src/net/sf/openrocket/android/simulation/SimulationChart.java
index 00209457bdd31904428f7085a99fe44cca8c6e11..807c58a77a48c74007ca2f9d709e8e7ac1db27b5 100644 (file)
--- 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;\r
 import java.util.List;\r
 \r
+import net.sf.openrocket.android.util.AndroidLogWrapper;\r
 import net.sf.openrocket.document.OpenRocketDocument;\r
 import net.sf.openrocket.document.Simulation;\r
 import net.sf.openrocket.simulation.FlightDataBranch;\r
@@ -35,7 +36,6 @@ import org.achartengine.renderer.XYSeriesRenderer;
 \r
 import android.graphics.Color;\r
 import android.graphics.Paint.Align;\r
-import android.util.Log;\r
 \r
 /**\r
  * This is really a flyweight object so we can serialize the\r
@@ -52,8 +52,6 @@ import android.util.Log;
  */\r
 public class SimulationChart implements Serializable {\r
        \r
-       private final static String TAG = "SimulationChart";\r
-\r
        private final int simulationIndex;\r
        private transient FlightDataType series1;\r
        private transient FlightDataType series2;\r
@@ -175,7 +173,7 @@ public class SimulationChart implements Serializable {
                double ymax = computeMaxValueWithPadding( series1values );\r
                double xmax = Math.ceil( timevalues.get( timevalues.size()-1));\r
                \r
-               Log.d(TAG,"ymax = " + ymax);\r
+               AndroidLogWrapper.d(SimulationChart.class,"ymax = " + ymax);\r
                renderer.setXAxisMax(xmax);\r
                renderer.setYAxisMax(ymax);\r
 \r

diff --git a/android/src/net/sf/openrocket/android/thrustcurve/DownloadResponseParser.java b/android/src/net/sf/openrocket/android/thrustcurve/DownloadResponseParser.java
index 82997829f3fc3bd0f76781711c8b2f5b34475d9a..a38a4e04287b4a628a83bf42b76af20a209e8449 100644 (file)
--- 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;
 \r
 import java.io.InputStream;\r
 \r
+import net.sf.openrocket.android.util.AndroidLogWrapper;\r
+\r
 import org.xml.sax.Attributes;\r
 \r
 import android.sax.Element;\r
@@ -9,13 +11,10 @@ import android.sax.EndElementListener;
 import android.sax.EndTextElementListener;\r
 import android.sax.RootElement;\r
 import android.sax.StartElementListener;\r
-import android.util.Log;\r
 import android.util.Xml;\r
 \r
 public class DownloadResponseParser {\r
 \r
-       private static final String TAG = "DownloadResponseParser";\r
-\r
        private static final String thrustcurveURI = "http://www.thrustcurve.org/2009/DownloadResponse";\r
 \r
        private static final String root_tag = "download-response";\r
@@ -45,7 +44,7 @@ public class DownloadResponseParser {
                rootEl.setStartElementListener(\r
                                new StartElementListener() {\r
                                        public void start(Attributes arg0) {\r
-                                               Log.d(TAG,"Start Element error");\r
+                                               AndroidLogWrapper.d(TAG,"Start Element error");\r
                                                ret.setError("IsError");\r
                                        }\r
                                }\r
@@ -57,7 +56,7 @@ public class DownloadResponseParser {
                                new StartElementListener() {\r
                                        @Override\r
                                        public void start(Attributes arg0) {\r
-                                               Log.d(TAG,"Start Element result");\r
+                                               AndroidLogWrapper.d(DownloadResponseParser.class,"Start Element result");\r
                                                currentMotor.init();\r
                                        }\r
                                }\r
@@ -73,7 +72,7 @@ public class DownloadResponseParser {
                                                        try {\r
                                                                s = Base64Decoder.decodeData(current_data.s);\r
                                                        } catch ( Exception ex ) {\r
-                                                               Log.d(TAG,"base64: " + ex.getMessage());\r
+                                                               AndroidLogWrapper.d(DownloadResponseParser.class,"base64: " + ex.getMessage());\r
                                                        }\r
                                                        currentMotor.decodeFile( s );\r
                                                }\r

diff --git a/android/src/net/sf/openrocket/android/thrustcurve/TCQueryAction.java b/android/src/net/sf/openrocket/android/thrustcurve/TCQueryAction.java
index 70dc4b79be5d41d1ae8c3cdc50437cd9fe145ab7..69714cbdc263eb58ee87b150549f45daf8b34abc 100644 (file)
--- 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;
 \r
 import net.sf.openrocket.android.db.DbAdapter;\r
 import net.sf.openrocket.android.motor.ExtendedThrustCurveMotor;\r
+import net.sf.openrocket.android.util.AndroidLogWrapper;\r
 import android.app.Activity;\r
 import android.app.AlertDialog;\r
 import android.app.ProgressDialog;\r
 import android.content.DialogInterface;\r
 import android.os.Handler;\r
-import android.util.Log;\r
 \r
 /**\r
  * TCQueryAction is a class which provides all the functionality required\r
@@ -33,8 +33,6 @@ public class TCQueryAction {
                public void onComplete();\r
        }\r
 \r
-       private final static String TAG = "TCQueryAction";\r
-\r
        private DbAdapter mDbHelper;\r
 \r
        private ProgressDialog progress;\r
@@ -157,7 +155,7 @@ public class TCQueryAction {
 \r
                                        MotorBurnFile b = new ThrustCurveAPI().downloadData(mi.getMotor_id());\r
 \r
-                                       Log.d(TAG, mi.toString());\r
+                                       AndroidLogWrapper.d(TCQueryAction.class, mi.toString());\r
 \r
                                        ExtendedThrustCurveMotor m = new ExtendedThrustCurveMotor();\r
 \r
@@ -184,7 +182,7 @@ public class TCQueryAction {
                                                m.setCaseInfo(mi.getCase_info());\r
                                        }\r
 \r
-                                       Log.d(TAG,"adding motor " + m.toString());\r
+                                       AndroidLogWrapper.d(TCQueryAction.class,"adding motor " + m.toString());\r
                                        // Write motor.\r
                                        mDbHelper.getMotorDao().insertOrUpdateMotor(m);\r
                                }\r
@@ -195,7 +193,7 @@ public class TCQueryAction {
                                }\r
                        }\r
                        catch( Exception ex){\r
-                               Log.d(TAG,ex.toString());\r
+                               AndroidLogWrapper.d(TCQueryAction.class,ex.toString());\r
                                handler.post( new Error(ex.toString()) );\r
                        }\r
 \r

diff --git a/android/src/net/sf/openrocket/android/thrustcurve/TCQueryActivity.java b/android/src/net/sf/openrocket/android/thrustcurve/TCQueryActivity.java
index df45897f29129aab105655aa050a96b53db1b4f9..6c5e4c8963282654122a126953fa4ef72429aa3e 100644 (file)
--- 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;\r
 \r
 import net.sf.openrocket.R;\r
-import net.sf.openrocket.android.db.DbAdapter;\r
-import net.sf.openrocket.android.motor.ExtendedThrustCurveMotor;\r
+import net.sf.openrocket.android.util.AndroidLogWrapper;\r
 import android.app.Activity;\r
-import android.app.AlertDialog;\r
-import android.app.ProgressDialog;\r
-import android.content.DialogInterface;\r
 import android.os.Bundle;\r
-import android.os.Handler;\r
-import android.util.Log;\r
 import android.view.View;\r
 import android.widget.Button;\r
 import android.widget.EditText;\r
@@ -19,8 +13,6 @@ public class TCQueryActivity extends Activity
 implements TCQueryAction.OnComplete\r
 {\r
 \r
-       private static final String TAG = "ThrustCurveQueryActivity";\r
-\r
        private TCQueryAction queryAction;\r
 \r
        @Override\r
@@ -40,24 +32,24 @@ implements TCQueryAction.OnComplete
                                new View.OnClickListener() {\r
                                        @Override\r
                                        public void onClick( View v ) {\r
-                                               Log.d(TAG,"submit button clicked");\r
+                                               AndroidLogWrapper.d(TCQueryActivity.class,"submit button clicked");\r
 \r
                                                String commonName = commonNameField.getText().toString();\r
 \r
                                                SearchRequest r = new SearchRequest();\r
                                                if ( manufacturerField.getSelectedItemPosition() != 0) {\r
                                                        String m = (String) manufacturerField.getSelectedItem();\r
-                                                       Log.d(TAG,"manufacturer = " + m);\r
+                                                       AndroidLogWrapper.d(TCQueryActivity.class,"manufacturer = " + m);\r
                                                        r.setManufacturer(m);\r
                                                }\r
                                                if ( impulseField.getSelectedItemPosition() != 0  ) {\r
                                                        String impulse = (String) impulseField.getSelectedItem();\r
-                                                       Log.d(TAG,"impulse = " + impulse);\r
+                                                       AndroidLogWrapper.d(TCQueryActivity.class,"impulse = " + impulse);\r
                                                        r.setImpulse_class(impulse);\r
                                                }\r
                                                if ( diameterField.getSelectedItemPosition() != 0 ) {\r
                                                        String diameter = (String)diameterField.getSelectedItem();\r
-                                                       Log.d(TAG,"diameter = " + diameter);\r
+                                                       AndroidLogWrapper.d(TCQueryActivity.class,"diameter = " + diameter);\r
                                                        r.setDiameter(diameter);\r
                                                }\r
                                                r.setCommon_name(commonName);\r

diff --git a/android/src/net/sf/openrocket/android/thrustcurve/ThrustCurveAPI.java b/android/src/net/sf/openrocket/android/thrustcurve/ThrustCurveAPI.java
index 9241228bc8e8d28c2dcea0c5ed28f3d281bf8c2f..2f38a4224f4331920b267ba16e0fd090fdcfe5b2 100644 (file)
--- 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;\r
 import java.net.URLConnection;\r
 \r
-import android.util.Log;\r
+import net.sf.openrocket.android.util.AndroidLogWrapper;\r
 \r
 \r
 public class ThrustCurveAPI {\r
 \r
-       private final static String TAG = "ThrustCurveAPI";\r
-       \r
        private String url_base = "http://www.thrustcurve.org/servlets/";\r
        \r
        public SearchResponse doSearch( SearchRequest request ) throws MalformedURLException, IOException {\r
                \r
                String requestString = request.toString();\r
                \r
-               Log.d(TAG, "doSearch: " + requestString);\r
+               AndroidLogWrapper.d(ThrustCurveAPI.class, "doSearch: " + requestString);\r
                URL url = new URL(url_base + "search");\r
 \r
         OutputStream  stream;\r
@@ -38,7 +36,7 @@ public class ThrustCurveAPI {
         InputStream is = conn.getInputStream();\r
 \r
         SearchResponse result = SearchResponseParser.parse(is);\r
-        Log.d(TAG,result.toString());\r
+        AndroidLogWrapper.d(ThrustCurveAPI.class,result.toString());\r
         \r
         return result;\r
        }\r
@@ -53,7 +51,7 @@ public class ThrustCurveAPI {
 \r
                String requestString = dr.toString();\r
 \r
-               Log.d(TAG, "downloadData: " + requestString);\r
+               AndroidLogWrapper.d(ThrustCurveAPI.class, "downloadData: " + requestString);\r
                URL url = new URL(url_base + "download");\r
 \r
                OutputStream  stream;\r
@@ -70,7 +68,7 @@ public class ThrustCurveAPI {
                InputStream is = conn.getInputStream();\r
 \r
                DownloadResponse downloadResponse = DownloadResponseParser.parse(is);\r
-               Log.d(TAG,downloadResponse.toString());\r
+               AndroidLogWrapper.d(ThrustCurveAPI.class,downloadResponse.toString());\r
 \r
                MotorBurnFile mbf = downloadResponse.getData(motor_id);\r
 \r

diff --git a/android/src/net/sf/openrocket/android/util/AndroidLogWrapper.java b/android/src/net/sf/openrocket/android/util/AndroidLogWrapper.java
index 456136a1623011c47be5f939e807adaaa667aff8..28ca0023bdf271d30203aa38f0c6ec68752a7d24 100644 (file)
--- 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;
 \r
 import java.text.MessageFormat;\r
 \r
+import net.sf.openrocket.logging.LogLevel;\r
+import net.sf.openrocket.logging.LogLine;\r
+\r
 import android.util.Log;\r
 \r
 public class AndroidLogWrapper {\r
@@ -51,5 +54,39 @@ public class AndroidLogWrapper {
                String s = clzz.getSimpleName();\r
                return s;\r
        }\r
-       \r
+\r
+       public static class LogHelper extends net.sf.openrocket.logging.LogHelper {\r
+\r
+               /* (non-Javadoc)\r
+                * @see net.sf.openrocket.logging.LogHelper#log(net.sf.openrocket.logging.LogLine)\r
+                */\r
+               @Override\r
+               public void log(LogLine line) {\r
+                       \r
+                       if ( !logEnabled ) {\r
+                               return;\r
+                       }\r
+                       \r
+                       LogLevel level = line.getLevel();\r
+                       \r
+                       switch ( level ) {\r
+                       case ERROR:\r
+                               Log.e("OpenRocket", line.toString());\r
+                               break;\r
+                       case WARN:\r
+                               Log.w("OpenRocket", line.toString());\r
+                               break;\r
+                       case INFO:\r
+                               Log.i("OpenRocket", line.toString());\r
+                               break;\r
+                       case DEBUG:\r
+                               Log.d("OpenRocket", line.toString());\r
+                               break;\r
+                       default:\r
+                               Log.v("OpenRocket", line.toString());\r
+                       }\r
+               }\r
+\r
+       }\r
+\r
 }\r

diff --git a/android/src/pl/polidea/treeview/TreeBuilder.java b/android/src/pl/polidea/treeview/TreeBuilder.java
index 13b499c47359a105fd03d6303d00eef2e7c4d57e..cfb6d007791977be023f2222417a510aec1bb821 100644 (file)
--- 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 <T>
  */
 public class TreeBuilder<T> {
-    private static final String TAG = TreeBuilder.class.getSimpleName();
 
     private final TreeStateManager<T> manager;
 
@@ -38,7 +37,7 @@ public class TreeBuilder<T> {
      *            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<T> {
      *            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 {