Changeset 1112 for trunk/src/org/expeditee/gui/DisplayController.java

Timestamp:

09/06/18 12:01:26 (6 years ago)

Author:

bln4

Message:

org.expeditee.gio.EcosystemManager ->
org.expeditee.gui.DisplayController ->

A less heavy handed solution to previously fixed exceptions on startup.

File:

• trunk/src/org/expeditee/gui/DisplayController.java (modified) (5 diffs)

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

@@ -676 +676 @@
         public static TwinFramesSide getCurrentSide()
         {
+                
                 // If the mouse is over the right side of the window and there's a valid frame,
                 // we are on the right side.
-                int mouseX = EcosystemManager.getInputManager().getCursorPosition().x;
-                if (isTwinFramesOn() && mouseX >= getTwinFramesSeparatorX() && sideHasFrame(RIGHT)) {
-                        return RIGHT;
+                if(isTwinFramesOn()) {
+                        int mouseX = EcosystemManager.getInputManager().getCursorPosition().x;
+                        if(mouseX >= getTwinFramesSeparatorX() && sideHasFrame(RIGHT)) {
+                                return RIGHT;
+                        }
                 }
                 
@@ -1222 +1225 @@
         private static void refresh(boolean useInvalidation)
         {
+                Frame currentFrame = getCurrentFrame();
+                if(currentFrame == null) {
+                        System.err.println("currentFrame == null");
+                        return;
+                }
+                
                 // Always get the clip as it clears at the same time
                 Clip clip = _damagedAreas.getClip();
@@ -1260 +1269 @@
                         
                         Image image = null;
-                        if (!useInvalidation || !frameClip.isFullyClipped()) {
-                                image = FrameGraphics.getFrameImage(getCurrentFrame(), frameClip, getFramePaintArea().getSize());
+                        if (currentFrame != null && (!useInvalidation || !frameClip.isFullyClipped())) {
+                                image = FrameGraphics.getFrameImage(currentFrame, frameClip, getFramePaintArea().getSize());
                         }
 
@@ -1271 +1280 @@
                         Clip messageBayClip = null;
                         
+                        AxisAlignedBoxBounds messageBayPaintArea = getMessageBayPaintArea();
                         if (useInvalidation) {
-                                messageBayClip = clip.clone().intersectWith(getMessageBayPaintArea());
-                                if (!messageBayClip.isFullyClipped()) messageBayClip = new Clip(messageBayClip.getBounds().translate(0, -getMessageBayPaintArea().getMinY()));
+                                messageBayClip = clip.clone().intersectWith(messageBayPaintArea);
+                                if (!messageBayClip.isFullyClipped()) messageBayClip = new Clip(messageBayClip.getBounds().translate(0, -messageBayPaintArea.getMinY()));
                         }
                         
                         Image image = null;
                         if (!useInvalidation || !messageBayClip.isFullyClipped()) {
-                                image = MessageBay.getImage(messageBayClip, getMessageBayPaintArea().getSize());
+                                image = MessageBay.getImage(messageBayClip, messageBayPaintArea.getSize());
                         }
                         
                         if (image != null) {
-                                g.drawImage(image, getMessageBayPaintArea().getTopLeft(), getMessageBayPaintArea().getSize());
+                                g.drawImage(image, messageBayPaintArea.getTopLeft(), messageBayPaintArea.getSize());
                         }
                 }
@@ -1405 +1415 @@
                 {
                         try {
-                                if(EcosystemManager.IsEcosystemReady()) refresh(_useInvalidation);
+                                refresh(_useInvalidation);
                         } catch (Throwable e) {
                                 e.printStackTrace();