commit 8da6bef9919ce7d4ccc791e782e9b78f5fcb2622
author Chandni Singh <chandni@datatorrent.com> Sun Aug 31 11:25:36 2014 -0700
committer Chandni Singh <chandni@datatorrent.com> Sun Aug 31 11:25:36 2014 -0700
tree 514d849564b31f0b92306b76311b630cfcf256b1
parent 7d417150a2d4341573760429f8a037d064b17c23

Refactored property names

demos/mobile/src/main/java/com/datatorrent/demos/mobile/Application.java

diff --git a/demos/mobile/src/main/java/com/datatorrent/demos/mobile/Application.java b/demos/mobile/src/main/java/com/datatorrent/demos/mobile/Application.java
index 8fac9ff..fd0983d 100644
--- a/demos/mobile/src/main/java/com/datatorrent/demos/mobile/Application.java
+++ b/demos/mobile/src/main/java/com/datatorrent/demos/mobile/Application.java
@@ -159,7 +159,7 @@
     for (int i = phonesToDisplay; i-- > 0; ) {
       int phoneNo = phoneRange.getMinimum() + random.nextInt(maxPhone + 1);
       LOG.info("seed no: " + phoneNo);
-      movementGen.phone_register.add(phoneNo);
+      movementGen.phoneRegister.add(phoneNo);
     }
 
     // done generating data
@@ -183,8 +183,8 @@
     }
     else {
       // for testing purposes without server
-      movementGen.phone_register.add(5554995);
-      movementGen.phone_register.add(5556101);
+      movementGen.phoneRegister.add(5554995);
+      movementGen.phoneRegister.add(5556101);
       ConsoleOutputOperator out = dag.addOperator("phoneLocationQueryResult", new ConsoleOutputOperator());
       out.setStringFormat("phoneLocationQueryResult" + ": %s");
       dag.addStream("consoledata", movementGen.locationQueryResult, out.input);

demos/mobile/src/main/java/com/datatorrent/demos/mobile/PhoneMovementGenerator.java

diff --git a/demos/mobile/src/main/java/com/datatorrent/demos/mobile/PhoneMovementGenerator.java b/demos/mobile/src/main/java/com/datatorrent/demos/mobile/PhoneMovementGenerator.java
index ee92fe6..33ada0b 100644
--- a/demos/mobile/src/main/java/com/datatorrent/demos/mobile/PhoneMovementGenerator.java
+++ b/demos/mobile/src/main/java/com/datatorrent/demos/mobile/PhoneMovementGenerator.java
@@ -66,8 +66,8 @@
         loc = new HighLow<Integer>(random.nextInt(range), random.nextInt(range));
         gps.put(tuple, loc);
       }
-      int xloc = loc.getHigh().intValue();
-      int yloc = loc.getLow().intValue();
+      int xloc = loc.getHigh();
+      int yloc = loc.getLow();
       int state = rotate % 4;
 
       // Compute new location
@@ -154,7 +154,7 @@
   public static final String COMMAND_DELETE = "del";
   public static final String COMMAND_CLEAR = "clear";
 
-  final Set<Integer> phone_register = Sets.newHashSet();
+  final Set<Integer> phoneRegister = Sets.newHashSet();
 
   private final transient HashMap<Integer, HighLow<Integer>> gps = new HashMap<Integer, HighLow<Integer>>();
   private final Random random = new Random();
@@ -244,7 +244,7 @@
 
   private void registerSinglePhone(int phone)
   {
-    phone_register.add(phone);
+    phoneRegister.add(phone);
     log.debug(String.format("Registered query id with phonenum \"%s\"", phone));
     emitQueryResult(phone);
   }
@@ -257,8 +257,8 @@
     try {
       Integer phone = new Integer(phoneStr);
       // simply remove the channel
-      if (phone_register.contains(phone)) {
-        phone_register.remove(phone);
+      if (phoneRegister.contains(phone)) {
+        phoneRegister.remove(phone);
         log.debug(String.format("Removing query id \"%s\"", phone));
         emitPhoneRemoved(phone);
       }
@@ -268,7 +268,7 @@
   }
 
   private void clearPhones() {
-    phone_register.clear();
+    phoneRegister.clear();
     log.info("Clearing phones");
   }
 
@@ -311,7 +311,7 @@
       }
     }
     boolean found = false;
-    for (Integer phone: phone_register) {
+    for (Integer phone: phoneRegister) {
       emitQueryResult( phone);
       found = true;
     }