From: Uwe Hermann <redacted>
Date: Sat, 3 Dec 2016 18:48:17 +0000 (+0100)
Subject: Random whitespace fixes (tabs vs. spaces).
X-Git-Url: http://sigrok.org/gitweb/?p=sigrok-androidutils.git;a=commitdiff_plain;h=fcfb967961e35fd2ff6c293ce22ecec9af499fc4

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 abf9c36..5412167 100644
--- 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 cfa2aa9..58079fd 100644
--- 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;
 		}
 	}