]> sigrok.org Git - sigrok-androidutils.git/commitdiff
Fix minor typos.
authorUwe Hermann <redacted>
Tue, 26 Aug 2014 18:30:43 +0000 (20:30 +0200)
committerUwe Hermann <redacted>
Tue, 26 Aug 2014 18:55:34 +0000 (20:55 +0200)
ant/src/org/sigrok/androidutils/ant/CopyLibsTask.java
src/org/sigrok/androidutils/UsbSupplicant.java

index f2f93954adfbea32566f30dbde608d250458f1c5..44af50db2c047fcb396e8aa6973e8c8bee26e739 100644 (file)
@@ -299,7 +299,7 @@ public class CopyLibsTask extends Task
 
                protected void setDependency(Library l1, Library l2)
                {
-                       if (l2 == null) // Dependancy on external lib.
+                       if (l2 == null) // Dependency on external lib.
                                return;
                        l1.dependencies.add(l2);
                        l2.dependedUpon = true;
@@ -348,7 +348,7 @@ public class CopyLibsTask extends Task
                protected void process(Library l) throws Exception
                {
                        if (processedLibs.contains(l))
-                               return; // Already processed
+                               return; // Already processed.
                        processedLibs.add(l);
                        addRpath(l.rpath);
                        for (String need : l.needed)
@@ -390,7 +390,7 @@ public class CopyLibsTask extends Task
                        }
                        if (property != null) {
                                Vector<Library> order =
-                                       topoSort(new HashSet<Library>(processedLibs));;
+                                       topoSort(new HashSet<Library>(processedLibs));
                                StringBuilder sb = new StringBuilder();
                                for (Library l : order) {
                                        String name = l.destname;
index 928cdef04f46bec6f596992dd0d6838dad4f30f2..e1d0bbb3e9e251dd46655d167aaa320cbc936973 100644 (file)
@@ -202,7 +202,7 @@ public class UsbSupplicant
                }
        }
 
-       protected boolean interresting(UsbDevice dev)
+       protected boolean interesting(UsbDevice dev)
        {
                if (dev == null)
                        return false;
@@ -226,8 +226,8 @@ public class UsbSupplicant
                context.registerReceiver(hotplugReceiver, hotplugFilter);
                HashMap<String,UsbDevice> devlist = manager.getDeviceList();
                for (UsbDevice dev : devlist.values()) {
-                       if (interresting(dev) && !manager.hasPermission(dev)) {
-                               Log.d("UsbSupplicant", "found interresting device " + dev);
+                       if (interesting(dev) && !manager.hasPermission(dev)) {
+                               Log.d("UsbSupplicant", "found interesting device " + dev);
                                askFor(dev);
                        }
                }
@@ -247,7 +247,7 @@ public class UsbSupplicant
 
        protected void attachCallback(UsbDevice dev)
        {
-               if (interresting(dev) && !manager.hasPermission(dev))
+               if (interesting(dev) && !manager.hasPermission(dev))
                        askFor(dev);
        }