Changeset 158

Timestamp:

06/28/11 10:17:40 (12 years ago)

Author:

merek

Message:

Code cleanup #2

Location:

trunk/src/com/bowman/cardserv

Files:

• rmi/RemoteHandler.java (modified) (1 diff)
• rmi/UserStatus.java (modified) (1 diff)
• session/CspSession.java (modified) (1 diff)
• session/ExtNewcamdSession.java (modified) (1 diff)
• session/NewcamdSession.java (modified) (2 diffs)

trunk/src/com/bowman/cardserv/rmi/RemoteHandler.java

@@ -175 +175 @@
       } else {
         String displayName = session.isTempUser()?session.getLoginName():um.getDisplayName(name);
-          user = new UserStatus(name, displayName,um.getStartDate(name),um.getExpireDate(name), um.getMaxConnections(name), false);
+        user = new UserStatus(name, displayName,um.getStartDate(name),um.getExpireDate(name), um.getMaxConnections(name), false);
         user.addSession(session);
         users.put(name, user);

trunk/src/com/bowman/cardserv/rmi/UserStatus.java

@@ -44 +44 @@
     return admin;
   }
-    public String getStartDate() {
-      return start;
-    }
-    public String getExpireDate()
-    {
-        return expire;
-    }
+
+  public String getStartDate() {
+    return start;
+  }
+
+  public String getExpireDate() {
+      return expire;
+  }
 
   public int getSessionCount(String profileName) {

trunk/src/com/bowman/cardserv/session/CspSession.java

@@ -264 +264 @@
   }
 
-   public String getstartMsg() {
-      return startMsg;
-    }
+  public String getstartMsg() {
+    return startMsg;
+  }
 
   public void close() {

trunk/src/com/bowman/cardserv/session/ExtNewcamdSession.java

@@ -260 +260 @@
   }
 
-    public String getstartMsg()
-    {
-        return startMsg;
-    }
+  public String getstartMsg() {
+    return startMsg;
+  }
     
-
   public void cwsConnectionFailed(CwsConnector cws, String message) {}
   public void cwsEcmTimeout(CwsConnector cws, String message, int failureCount) {}

trunk/src/com/bowman/cardserv/session/NewcamdSession.java

@@ -226 +226 @@
     try {
       String startDateStr = um.getStartDate(user);
-                DateFormat df = new SimpleDateFormat("dd-MM-yyyy");
-                if (startDateStr == null) startDateDt = null;
-                else startDateDt = df.parse(startDateStr);
-        }
-        catch(ParseException ignored) {}
-        long currDateMs = System.currentTimeMillis();
-        long startDateMs = 0;
-        if (startDateDt != null) startDateMs = startDateDt.getTime();
-
-        return (startDateMs != 0) && (currDateMs < startDateMs);
+      DateFormat df = new SimpleDateFormat("dd-MM-yyyy");
+      if (startDateStr == null)
+        startDateDt = null;
+      else
+        startDateDt = df.parse(startDateStr);
+    }
+    catch(ParseException ignored) {}
+    long currDateMs = System.currentTimeMillis();
+    long startDateMs = 0;
+
+    if (startDateDt != null)
+      startDateMs = startDateDt.getTime();
+
+    return (startDateMs != 0) && (currDateMs < startDateMs);
   }
 
@@ -395 +399 @@
 
         fireCamdMessage(cardDataMsg, true);
-        if (this.getstartMsg()!= null) {
-        sendOsdMessage(this.getstartMsg());
-        }        break;
+
+        if (this.getstartMsg() != null) 
+          sendOsdMessage(this.getstartMsg());
+
+        break;
     }
     return true;