Changeset 374

Timestamp:

10/26/08 17:03:51 (16 years ago)

Author:

bjn8

Message:

Refactor names... minor improvements made during evaluation study

Location:

trunk/src/org/expeditee/items/widgets

Files:

• HeavyDutyInteractiveWidget.java (modified) (18 diffs)
• InteractiveWidget.java (modified) (3 diffs)
• SampledHDWidget1.java (modified) (1 diff)

trunk/src/org/expeditee/items/widgets/HeavyDutyInteractiveWidget.java

@@ -4 +4 @@
 import java.awt.Font;
 import java.awt.FontMetrics;
+import java.awt.GradientPaint;
 import java.awt.Graphics;
 import java.awt.Graphics2D;
@@ -71 +72 @@
         private static final String PENDING_MESSAGE = "Pending";
         
+        private static final Color LOAD_BAR_PROGRESS_COLOR = new Color(103, 171, 203);
+        private static final Color LOAD_BAR_INDETERM_COLOR = Color.ORANGE;
+        private static final Color LOAD_BAR_HIGHLIGHT_COLOR = new Color(240, 240, 240);
         private static final Color LOAD_SCREEN_COLOR = Color.LIGHT_GRAY;
         private static final Color LOAD_SCREEN_COLOR_FREESPACE = FREESPACE_BACKCOLOR;
@@ -81 +85 @@
         
         /** Unifies state transitions to a single thread. */
-        private LoadStateManager stateProccessor = null;
-        private LinkedList<HDWTask> queuedTasks = new LinkedList<HDWTask>();
+        private HDWEventDispatcher eventDispatcher = null;
+        private LinkedList<HDWEvent> queuedEvents = new LinkedList<HDWEvent>();
         
         // Model data
@@ -165 +169 @@
                 
                 else if (!isInLoadProgress() ||
-                                stateProccessor == null ||
-                                !stateProccessor.isAlive()) 
+                                eventDispatcher == null ||
+                                !eventDispatcher.isAlive()) 
                         throw new IllegalStateException("Load is not in progress");
                 
-                // Assuming that this is called from stateProccessor.
-                stateProccessor.setLoadState(percent, false);
+                // Assuming that this is called from eventDispatcher.
+                eventDispatcher.setLoadState(percent, false);
         }
         
@@ -277 +281 @@
                 if (loadState < 0.0f) { // indeterminant
 
-                        g.setColor(Color.ORANGE);
+                        GradientPaint gp = new GradientPaint(
+                                        0, barY + (int)(BAR_HEIGHT * 0.8), LOAD_BAR_INDETERM_COLOR,
+                                        0, barY, LOAD_BAR_HIGHLIGHT_COLOR);
+                        ((Graphics2D)g).setPaint(gp);
+                
                         g.fillRect(barX, barY, barWidth, BAR_HEIGHT);
                         
@@ -284 +292 @@
                         int progBarWidth = (int)(barWidth * loadState);
                         
-                        g.setColor(new Color(200, 200, 255));
+                        GradientPaint gp = new GradientPaint(
+                                        0, barY + (int)(BAR_HEIGHT * 0.8), LOAD_BAR_PROGRESS_COLOR,
+                                        0, barY, LOAD_BAR_HIGHLIGHT_COLOR);
+                        ((Graphics2D)g).setPaint(gp);
+                        
                         g.fillRect(barX, barY, progBarWidth, BAR_HEIGHT);
                         
@@ -313 +325 @@
                 
                 try {
-                        doTaskAndWait(HDWTask.Load);
+                        runEventAndWait(HDWEvent.Load);
                 } catch (InterruptedException e) {
                         loadState = LOAD_STATE_INCOMPLETED; // safety
@@ -348 +360 @@
                 return this.loadState == LOAD_STATE_COMPLETED;
         }
-        
-        
-
-/*      @Override
-        public final InteractiveWidget deletedCopy() throws InteractiveWidgetNotAvailableException, InteractiveWidgetInitialisationFailedException {
-
-                queueTask(HDWTask.UnloadTMP);
-                
-                
-        }*/
 
         /**
@@ -366 +368 @@
                 super.onDelete();
                 // Evenetually - unload the data - with the intention of possible recovery, but not saving...
-                queueTask(HDWTask.UnloadTMP);
+                queueEvent(HDWEvent.UnloadTMP);
         }
 
@@ -387 +389 @@
          *                      <li>LOAD_STATE_INCOMPLETED
          *              </ul>
-         *              If not, then LOAD_STATE_COMPLETED is assumed - but an exception trace will be printed.
+         *              If not, then LOAD_STATE_FAILED is assumed - and an exception trace will be printed.
          */
         protected abstract float loadWidgetData();
@@ -471 +473 @@
         public final void performSave() {
                 try {
-                        doTaskAndWait(HDWTask.Save);
+                        runEventAndWait(HDWEvent.Save);
                 } catch (InterruptedException e) {
                         e.printStackTrace();
@@ -491 +493 @@
          */
         void expire() {
-                doTaskLater(HDWTask.Unload);
+                runEventLater(HDWEvent.Unload);
         }
         
@@ -537 +539 @@
         }
 
-        private synchronized void doTaskAndWait(HDWTask task) throws InterruptedException {
-                queueTask(task);
-                stateProccessor.join();
-        }
-        
-        private void doTaskLater(HDWTask task) {
-                queueTask(task);
-        }
-        
-        private void queueTask(HDWTask task) {
-                
-                synchronized(queuedTasks) {
-                        
-                        if (!queuedTasks.contains(task))
-                                queuedTasks.add(task);
-                
-        
-                        if (stateProccessor == null || !stateProccessor.isAlive()) {
-                                stateProccessor = new LoadStateManager();
-                                stateProccessor.start();
+        private synchronized void runEventAndWait(HDWEvent event) throws InterruptedException {
+                queueEvent(event);
+                eventDispatcher.join();
+        }
+        
+        private void runEventLater(HDWEvent event) {
+                queueEvent(event);
+        }
+        
+        private void queueEvent(HDWEvent event) {
+                
+                synchronized(queuedEvents) {
+                        
+                        if (!queuedEvents.contains(event))
+                                queuedEvents.add(event);
+                
+        
+                        if (eventDispatcher == null || !eventDispatcher.isAlive()) {
+                                eventDispatcher = new HDWEventDispatcher();
+                                eventDispatcher.start();
                         }
                 
@@ -571 +573 @@
          *
          */
-        private class LoadStateManager extends Thread {
+        private class HDWEventDispatcher extends Thread {
                 
                 /**
@@ -630 +632 @@
                         while (true) { // keep proccessing tasks
                                 
-                                HDWTask task = null;
-
-                                synchronized(queuedTasks) {
-                                        if (queuedTasks.isEmpty()) return;
-                                        task = queuedTasks.remove();
+                                HDWEvent event = null;
+
+                                synchronized(queuedEvents) {
+                                        if (queuedEvents.isEmpty()) return;
+                                        event = queuedEvents.remove();
                                 }
 
-                                if (task == HDWTask.Load) {
+                                if (event == HDWEvent.Load) {
                                         doLoad();
-                                } else if (task == HDWTask.Save) {
+                                } else if (event == HDWEvent.Save) {
                                         doSave(); // does not change state
-                                } else if (task == HDWTask.Unload){
+                                } else if (event == HDWEvent.Unload){
                                         doUnload();
                                 } else {
-                                        assert(task == HDWTask.UnloadTMP);
+                                        assert(event == HDWEvent.UnloadTMP);
                                         doTempUnload();
                                 }
@@ -655 +657 @@
 
                         // Check that not already loaded.
-                        if (loadState == LOAD_STATE_COMPLETED ||
-                                        loadState == LOAD_STATE_FAILED) return;
+                //      if (loadState == LOAD_STATE_COMPLETED ||
+                //                      loadState == LOAD_STATE_FAILED) return;
+                        if (loadState == LOAD_STATE_COMPLETED) return;
                         
                         // Only load if in view
@@ -685 +688 @@
                         } catch (Exception e) {
                                 e.printStackTrace();
-                                finalState = LOAD_STATE_COMPLETED;
+                                finalState = LOAD_STATE_FAILED;
                         }
                         
@@ -724 +727 @@
         }
         
-        private enum HDWTask {
+        private enum HDWEvent {
                 Save,
                 Load,

trunk/src/org/expeditee/items/widgets/InteractiveWidget.java

@@ -923 +923 @@
                 // Because widgets are comprised of four corners - they all report this
                 // event one after the
-                // other. So must filter out redunant notifications like so:
+                // other. So must filter out redundant notifications like so:
                 if (_lastParentStateChangedEvent != null
                                 && _lastParentStateChangedEvent.getEventType() == e
@@ -934 +934 @@
                 _lastParentStateChangedMouseEvent = MouseEventRouter
                                 .getCurrentMouseEvent();
-
+                
                 switch (e.getEventType()) {
 
@@ -995 +995 @@
                                                 || e.getEventType() == ItemParentStateChangedEvent.EVENT_TYPE_SHOWN_VIA_OVERLAY
                                                 || e.getSource() == DisplayIO.getCurrentFrame()) {
-
+        
                                         onBoundsChanged();
                                         Browser._theBrowser.getContentPane().add(_swingComponent);

trunk/src/org/expeditee/items/widgets/SampledHDWidget1.java

@@ -59 +59 @@
                 // fail some of them
                 if ((rand.nextInt() % 4) == 0) {
-                        setLoadScreenMessage("Failed");
+                        setLoadScreenMessage("Failed to load metadata");
                         return LOAD_STATE_FAILED;
                 }