Ticket #2174: hourgalss.patch

modules/org.sophie2.core.mvc/src/main/java/org/sophie2/core/mvc/LogicR3.java

@@ -15 +15 @@
         private LogicR3() {
                 // Hidden constructor since this is an utility class.
         }
+        
+//      private static List<Long> timeStack = Collections.synchronizedList(new LinkedList<Long>());
+        
+        private static Long startedTime = null;
+
+        /**
+         * Gets the value at the bottom of the time stack with the fire calls.
+         * 
+         * @return
+         *              The time at the bottom.
+         */
+        public static synchronized Long getTimeStackBottom() {
+//              if (!timeStack.isEmpty()) {
+//                      return timeStack.get(0);
+//              }
+//              return null;
+                return startedTime;
+        }
 
         private static StringBuffer indentBuffer = new StringBuffer();
 
@@ -28 +46 @@
          */
         public static boolean fire(EventR3 event) {
                 // TODO finding the correct operation can and should be optimized!
-
+                
+                boolean shouldSetTime = startedTime == null;
+                if (shouldSetTime) {
+                        synchronized (LogicR3.class) {
+                                startedTime = System.currentTimeMillis();
+                        }
+                }
                 SophieLog.debug(indentBuffer + "Processing event: " + event);
                 try {
                         // for the indentation
@@ -52 +76 @@
                         return handled;
 
                 } finally {
+                        if (shouldSetTime) {
+                                synchronized (LogicR3.class) {
+                                        startedTime = null;
+                                }
+                        }
                         indentBuffer.delete(indentBuffer.length() - 1, indentBuffer.length());
                 }
 

modules/org.sophie2.main.layout.mydoggy/src/main/java/org/sophie2/main/layout/mydoggy/MDFrameWindow.java

@@ -1 +1 @@
 package org.sophie2.main.layout.mydoggy;
 
 import java.awt.BorderLayout;
+import java.awt.Component;
 import java.awt.Dimension;
 import java.awt.Frame;
 import java.awt.Toolkit;
@@ -9 +10 @@
 import java.awt.event.KeyListener;
 import java.awt.event.WindowAdapter;
 import java.awt.event.WindowEvent;
+import java.util.Timer;
+import java.util.TimerTask;
 
 import javax.swing.AbstractAction;
 import javax.swing.JComponent;
+import javax.swing.JDialog;
 import javax.swing.JFrame;
+import javax.swing.JLabel;
 import javax.swing.JPanel;
 import javax.swing.KeyStroke;
 import javax.swing.WindowConstants;
@@ -71 +76 @@
         public Prop<JFrame> globalContainer() {
                 class globalContainer extends ResourceProperty<JFrame> {
 
+                        private static final long LONG_OP_INTERVAL = 500;
+
                         @Override
                         protected JFrame create() {
                                 final JFrame gcf = new JFrame();
+                                
+                                new Timer().schedule(new TimerTask() {
+                                        private Component comp = gcf;
+                                        private Long lastSetTime = null;
+                                        private JDialog workingDialog = null;
+                                        
+                                        private JDialog getDialog() {
+                                                if (this.workingDialog == null) {
+                                                        this.workingDialog = new JDialog(gcf);
+                                                        JLabel working = new JLabel("Working...");
+                                                        this.workingDialog.add(working);
+                                                        this.workingDialog.setLocationRelativeTo(this.comp);
+                                                        this.workingDialog.setUndecorated(true);
+                                                        this.workingDialog.setSize(60, 15);
+                                                }
+                                                return this.workingDialog;
+                                        }
+
+                                        @Override
+                                        public void run() {
+                                                Long lastOpStart = LogicR3.getTimeStackBottom();
+                                                if (lastOpStart != this.lastSetTime) {
+                                                        long current = System.currentTimeMillis();
+                                                        
+                                                        if (lastOpStart != null ) {
+                                                                if ((current-lastOpStart) > LONG_OP_INTERVAL) {
+                                                                        this.lastSetTime = lastOpStart;
+                                                                        getDialog().setVisible(true);
+                                                                } 
+                                                        } else {
+                                                                this.lastSetTime = lastOpStart;
+                                                                getDialog().setVisible(false);
+                                                        }
+                                                }
+                                        }
+                                }, 0, 100);
 
                                 gcf.addWindowListener(new WindowAdapter() {
                                         @Override