Changed names and removed unused variables

1 files changed, 15 insertions, 16 deletions

diff --git a/src/main/java/com/it_jaros/networkScanner/PortRange.java b/src/main/java/com/it_jaros/networkScanner/PortRange.java
index cdef5cf..6f1c529 100644
--- a/src/main/java/com/it_jaros/networkScanner/PortRange.java
+++ b/src/main/java/com/it_jaros/networkScanner/PortRange.java
@@ -7,44 +7,43 @@ public class PortRange {
 
     private static final int MIN_PORT = 1;
     private static final int MAX_PORT = 65535;
-    private final BitSet portsRange = new BitSet(MAX_PORT);
-    private final BitSet available = new BitSet(MAX_PORT);
+    private final BitSet specifiedPorts = new BitSet(MAX_PORT);
+    private final BitSet availablePorts = new BitSet(MAX_PORT);
 
     private int cursor;
     private int done = 0;
-    private int total = 0;
 
     public PortRange(String ports) {
         if (ports == null || "".equals(ports)) {
             // keep defaults
-            portsRange.set(1, 1024 + 1);
+            specifiedPorts.set(1, 1024 + 1);
             return;
         }
 
         String[] splitComma = ports.split(",");
         for (String commaValue: splitComma) {
             if (commaValue.contains("-")) {
-                String[] splitRange = commaValue.split("-");
-                if (splitRange.length > 2) {
+                String[] rangeValue = commaValue.split("-");
+                if (rangeValue.length > 2) {
                     throw new IllegalArgumentException(String.format("Argument contains too many '-'' %s", commaValue));
                 }
                 
-                int start = Integer.parseInt(splitRange[0]);
-                int end = Integer.parseInt(splitRange[1]);
-                portsRange.set(start, end + 1);
+                int start = Integer.parseInt(rangeValue[0]);
+                int end = Integer.parseInt(rangeValue[1]);
+                specifiedPorts.set(start, end + 1);
             } else {
-                portsRange.set(Integer.parseInt(commaValue));
+                specifiedPorts.set(Integer.parseInt(commaValue));
             }
         }
         
-        available.or(portsRange);
-        cursor = available.nextSetBit(MIN_PORT);
+        availablePorts.or(specifiedPorts);
+        cursor = availablePorts.nextSetBit(MIN_PORT);
     }
 
     public synchronized int next() {
-        int p = available.nextSetBit(cursor);
+        int p = availablePorts.nextSetBit(cursor);
         if (p > 0) {
-            available.clear(p);
+            availablePorts.clear(p);
             cursor = p + 1;
             done++;
             return p;
@@ -54,11 +53,11 @@ public class PortRange {
     }
 
     public synchronized boolean hasNext() {
-        return available.nextSetBit(cursor) > 0;
+        return availablePorts.nextSetBit(cursor) > 0;
     }
 
     public int getTotal() {
-        return portsRange.cardinality();
+        return specifiedPorts.cardinality();
     }
 
     public int getDone() {