Changeset 1314 for trunk

Timestamp:

04/16/19 09:52:23 (5 years ago)

Author:

bln4

Message:

Feedback is now provided during account creation. In order to achieve this a forced refresh for the message bay area has been added.
Upon login the existing preview area for messages is now cleared.

Location:

trunk/src/org/expeditee

Files:

• auth/Actions.java (modified) (8 diffs)
• auth/account/Authenticate.java (modified) (1 diff)
• gui/DisplayController.java (modified) (3 diffs)
• gui/MessageBay.java (modified) (1 diff)

trunk/src/org/expeditee/auth/Actions.java

@@ -50 +50 @@
 import org.expeditee.gui.FrameIO;
 import org.expeditee.gui.MessageBay;
+import org.expeditee.gui.MessageBay.Progress;
 import org.expeditee.io.ExpReader;
 import org.expeditee.items.Item;
@@ -378 +379 @@
                 // Track progress
                 String message = "Creating new user account...";
+                int progress = 0;
+                int step = 20;
 
                 // Extract user details
@@ -384 +387 @@
                 String email = userdata.get(AuthenticationTag.Email);
                 
-                System.out.println(message + "Generating Keys.");
+                Progress progressBar = MessageBay.displayProgress(message);
+                try {
+                        progressBar.UpdateMessage(message + "Generating Keys.", progress += step);
+                } catch (Exception e) {
+                        e.printStackTrace();
+                }
+                DisplayController.refreshBayArea();
 
                 // Generate keys
@@ -401 +410 @@
                 String privateKey = Base64.getEncoder().encodeToString(keyPair.getPrivate().getEncoded());
                 
-                System.out.println(message + "Creating Profile Frameset.");
+                try {
+                        progressBar.UpdateMessage(message + "Creating Profile Frameset.", progress += step);
+                } catch (Exception e) {
+                        e.printStackTrace();
+                }
+                DisplayController.refreshBayArea();
                 
                 // Update in memory settings
@@ -470 +484 @@
                 }
                 
-                System.out.println(message + "Establishing user credentials.");
+                try {
+                        progressBar.UpdateMessage(message + "Establishing user credentials.", progress += step);
+                } catch (Exception e) {
+                        e.printStackTrace();
+                }
+                DisplayController.refreshBayArea();
                                 
                 // Create credentials
@@ -489 +508 @@
                 FrameIO.migrateFrame(credentialsFrame, destinationFile);
                 
-                System.out.println(message + "Creating Individual Space.");
+                MessageBay.displayMessage(message + "Creating Individual Space.");
+                DisplayController.refreshBayArea();
                 
                 // Copy private resources to personal area
@@ -496 +516 @@
                 File contactsDir = new File(personalResources.resolve("contacts").toAbsolutePath().toString());
                 contactsDir.mkdir();
-                
-                System.out.println(message + "Creating Space For Dead Drops");
+
+                try {
+                        progressBar.UpdateMessage(message + "Creating Space For Dead Drops.", progress += step);
+                } catch (Exception e) {
+                        e.printStackTrace();
+                }
+                DisplayController.refreshBayArea();
                 
                 File deadDropsDir = new File(personalResources.resolve("deaddrops").toAbsolutePath().toString());
@@ -505 +530 @@
                 AudioPathManager.activateAndScanAudioDir(); // ****
                 
-                System.out.println(message + "Done.");
+                try {
+                        progressBar.UpdateMessage(message + "Done.", progress += step);
+                } catch (Exception e) {
+                        e.printStackTrace();
+                }
+                DisplayController.refreshBayArea();
+                
         }
 

trunk/src/org/expeditee/auth/account/Authenticate.java

@@ -81 +81 @@
                         // Update were we get our frames.
                         UserSettings.setupDefaultFolders();
+                        MessageBay.clear();
                         MessageBay.updateFramesetLocation();
                         MailBay.disconnect();

trunk/src/org/expeditee/gui/DisplayController.java

@@ -1375 +1375 @@
         }
         
-        /*
-         * 
-         * Thread-safe rendering.
-         * 
-         */
-
+        public static void refreshBayArea() {
+                // Always get the clip as it clears at the same time
+                Clip clip = _damagedAreas.getClip();
+                GraphicsManager g = EcosystemManager.getGraphicsManager();
+                pushBayAreaUpdate(true, clip, g);
+        }
+        
         /**
          * Redraws the entire window. Shouldn't be called directly, instead use
@@ -1441 +1442 @@
                 }
 
+                pushBayAreaUpdate(useInvalidation, clip, g);
+                
+                // Draw any separator lines
+                g.drawLine(getMessageBaySeparatorLine(), SEPARATOR_COLOUR, SEPARATOR_STROKE);
+                g.drawLine(getTwinFramesSeparatorLine(), SEPARATOR_COLOUR, SEPARATOR_STROKE);
+                
+                // Paint any popups
+                if (PopupManager.getInstance() != null) {
+                        PopupManager.getInstance().paint();
+                }
+                
+                g.popDrawingSurface();
+                g.drawImage(_refreshBuffer, Point.ORIGIN);
+                return true;
+        }
+
+        private static void pushBayAreaUpdate(boolean useInvalidation, Clip clip, GraphicsManager g) {
                 if (!isAudienceMode()) {
                         if (!isMailMode()) {
@@ -1450 +1468 @@
                         }
                 }
-                
-                // Draw any separator lines
-                g.drawLine(getMessageBaySeparatorLine(), SEPARATOR_COLOUR, SEPARATOR_STROKE);
-                g.drawLine(getTwinFramesSeparatorLine(), SEPARATOR_COLOUR, SEPARATOR_STROKE);
-                
-                // Paint any popups
-                if (PopupManager.getInstance() != null) {
-                        PopupManager.getInstance().paint();
-                }
-                
-                g.popDrawingSurface();
-                g.drawImage(_refreshBuffer, Point.ORIGIN);
-                return true;
-        }
-
+        }
+        
         private static void paintMessageBay(boolean useInvalidation, Clip clip, GraphicsManager g) {
                 Clip messageBayClip = null;

trunk/src/org/expeditee/gui/MessageBay.java

@@ -165 +165 @@
                 return _messageBuffer;
         }
+        
+        public static void clear() {
+                MessageBay._messageCount = 0;
+                MessageBay._messages.clear();
+        }
 
         /** Updates the image buffer to reflect the current state of the message bay. */