Random whitespace fixes (tabs vs. spaces).

diff --git a/ant/src/org/sigrok/androidutils/ant/CopyLibsTask.java b/ant/src/org/sigrok/androidutils/ant/CopyLibsTask.java
index abf9c36b738f9f3f646707556e3864cf0e25e461..5412167022908e2147e4601ba9d2f347c609b24c 100644 (file)
--- a/ant/src/org/sigrok/androidutils/ant/CopyLibsTask.java
+++ b/ant/src/org/sigrok/androidutils/ant/CopyLibsTask.java
@@ -48,9 +48,9 @@ public class CopyLibsTask extends Task
        private static final HashMap<String,String> blacklist;
 
        static {
-           HashMap bl = new HashMap<String,String>();
-           bl.put("libpcre.so", "libercp.so");
-           blacklist = bl;
+               HashMap bl = new HashMap<String,String>();
+               bl.put("libpcre.so", "libercp.so");
+               blacklist = bl;
        }
 
        private static BuildException buildException(Exception e)
@@ -82,7 +82,7 @@ public class CopyLibsTask extends Task
 
                String bl = blacklist.get(s);
                if (bl != null)
-                   s = bl;
+                       s = bl;
 
                return s;
        }
@@ -172,7 +172,7 @@ public class CopyLibsTask extends Task
                                                offs + name.length()));
                                }
                                if (!fix.equals(name.substring(0, fix.length()))) {
-                                       fixups.add(new Range(offs, offs + fix.length(), fix.getBytes("US-ASCII")));
+                                       fixups.add(new Range(offs, offs + fix.length(), fix.getBytes("US-ASCII")));
                                }
                        }
                        return name;
@@ -247,9 +247,9 @@ public class CopyLibsTask extends Task
                                                                break outer;
                                                        if (r > 0) {
                                                                if (rg.replacement == null)
-                                                                   Arrays.fill(buf, 0, r, (byte)0);
+                                                                       Arrays.fill(buf, 0, r, (byte)0);
                                                                else
-                                                                   System.arraycopy(rg.replacement, (int)(offs-rg.start), buf, 0, r);
+                                                                       System.arraycopy(rg.replacement, (int)(offs-rg.start), buf, 0, r);
                                                                os.write(buf, 0, r);
                                                                chunk -= r;
                                                        }
@@ -472,7 +472,7 @@ public class CopyLibsTask extends Task
 
        };
 
-       protected File destDir = null;  // The destination directory.
+       protected File destDir = null; // The destination directory.
        protected Vector<ResourceCollection> rcs = new Vector<ResourceCollection>();
        protected PatternSet patterns = new PatternSet();
        protected String property = null;

diff --git a/src/org/sigrok/androidutils/UsbHelper.java b/src/org/sigrok/androidutils/UsbHelper.java
index cfa2aa992155e82746ae65aa0c12a3821638b1fb..58079fd8efd63fd1b4b7284de381af99b9c225a1 100644 (file)
--- a/src/org/sigrok/androidutils/UsbHelper.java
+++ b/src/org/sigrok/androidutils/UsbHelper.java
@@ -60,8 +60,8 @@ public final class UsbHelper
        private static synchronized void startEventMonitor(Context context, UsbManager manager, UsbEventListener listener)
        {
                if (eventMonitor != null) {
-                   eventMonitor.stop();
-                   eventMonitor = null;
+                       eventMonitor.stop();
+                       eventMonitor = null;
                }
                if (context == null) {
                        Log.w("UsbHelper", "no context");
@@ -78,8 +78,8 @@ public final class UsbHelper
        private static synchronized void stopEventMonitor(Context context)
        {
                if (eventMonitor != null) {
-                   eventMonitor.stop();
-                   eventMonitor = null;
+                       eventMonitor.stop();
+                       eventMonitor = null;
                }
        }