Changeset 59 in tmcsimulator for trunk/src/tmcsim/client/cadclientgui/screens/Login.java

Timestamp:

03/15/2017 10:20:21 AM (9 years ago)

Author:

jdalbey

Message:

Merge CAD Client updates for multiple incident view windows.

File:

• trunk/src/tmcsim/client/cadclientgui/screens/Login.java (modified) (8 diffs)

trunk/src/tmcsim/client/cadclientgui/screens/Login.java

@@ -2 +2 @@
 
 import java.awt.Color;
+import static java.awt.Component.LEFT_ALIGNMENT;
 import java.awt.Dimension;
 import java.awt.Font;
 import java.awt.event.ActionEvent;
 import java.awt.event.ActionListener;
-
 import javax.swing.Box;
 import javax.swing.BoxLayout;
@@ -16 +16 @@
 import javax.swing.SwingConstants;
 
-
 /**
- * This class contains the view and controller for the Login screen. The view was not built using a GUI builder plug-in
- * (but may want to consider doing so in the future), and the controller uses listeners to control how the view and data act. 
- * 
+ * This class contains the view and controller for the Login screen. The view
+ * was not built using a GUI builder plug-in (but may want to consider doing so
+ * in the future), and the controller uses listeners to control how the view and
+ * data act.
+ *
  * @author Vincent
  */
-
-public class Login extends JFrame {
-
+public class Login extends JFrame
+{
     private Box login;
     private JTextField userNameField;
     private JTextField passwordField;
-
-    public Login() {
+    public static String kNamePrompt = "Enter your name";
+
+    public Login()
+    {
         initView();
     }
-    
-    private ActionListener newEnterActionListener(){
-        return new ActionListener() {
-            public void actionPerformed(ActionEvent e) {
+
+    private ActionListener newEnterActionListener()
+    {
+        return new ActionListener()
+        {
+            public void actionPerformed(ActionEvent e)
+            {
                 setVisible(false);
-                ScreenManager.setUserName(userNameField.getText());
+                // Check if user provided a username JD
+                String userEntry = userNameField.getText();
+                if (userEntry.equals(kNamePrompt))
+                {
+                    ScreenManager.setUserName("Anonymous Trainee");
+                }
+                else
+                {
+                    ScreenManager.setUserName(userEntry);
+                }
                 ScreenManager.openCADMenu();
                 ScreenManager.openAssignedIncidents();
@@ -44 +58 @@
                 ScreenManager.openPendingIncidents();
                 ScreenManager.openPowerlineUI();
-                if (!passwordField.getText().equals("Dispatcher")) {
+                if (!passwordField.getText().equals("Dispatcher"))
+                {
                     ScreenManager.setDispatcherAuthority(false);
                 }
@@ -50 +65 @@
         };
     }
-    
-    private ActionListener newExitActionListener(){
-        return new ActionListener() {
-            public void actionPerformed(ActionEvent e) {
+
+    private ActionListener newExitActionListener()
+    {
+        return new ActionListener()
+        {
+            public void actionPerformed(ActionEvent e)
+            {
                 System.exit(0);
             }
         };
     }
-    
-    private void initView(){
+
+    private void initView()
+    {
         login = new Box(BoxLayout.Y_AXIS);
         login.setAlignmentX(LEFT_ALIGNMENT);
@@ -78 +97 @@
 
         JLabel title = new JLabel();
-        title.setText("Inform CAD 5.3 Patch 5");
+        // Check if we are running from a jar to put message from manifest into title
+        Package clientpkg = Login.class.getPackage();
+        String builddate = clientpkg.getImplementationVersion();
+        String version = "";
+        if (builddate != null)
+        {
+            version = "          (build " + builddate + ")";
+        }
+        else // We're running from a dev environment
+        {
+            version = "           00-00-00 00:00";
+        }
+
+        title.setText("Inform CAD 5.3 Patch 5 ");
         title.setHorizontalAlignment(SwingConstants.CENTER);
         title.setFont(new Font("Arial", Font.PLAIN, 22));
@@ -87 +119 @@
         blueBackground.add(title);
 
+        JLabel builddateLabel = new JLabel(version);
+        builddateLabel.setForeground(Color.WHITE);
+        builddateLabel.setHorizontalAlignment(SwingConstants.CENTER);
+        blueBackground.add(builddateLabel);
+
         Box leftBox = new Box(BoxLayout.Y_AXIS);
         leftBox.setMaximumSize(new Dimension(350, 50));
@@ -95 +132 @@
         JLabel userNameLabel = new JLabel("User name ");
         userNameLabel.setForeground(Color.WHITE);
-        userNameField = new JTextField("Enter your name");
+        userNameField = new JTextField(kNamePrompt);
         Box userNameBox = new Box(BoxLayout.X_AXIS);
         userNameBox.setAlignmentX(LEFT_ALIGNMENT);
@@ -105 +142 @@
         JLabel passwordLabel = new JLabel("Password  ");
         passwordLabel.setForeground(Color.WHITE);
-        passwordField = new JTextField("Does not matter");
+        passwordField = new JTextField("Not required");
         Box passwordBox = new Box(BoxLayout.X_AXIS);
         passwordBox.setAlignmentX(LEFT_ALIGNMENT);