Changeset 5250

Timestamp:

08/25/08 05:59:54 (3 months ago)

Author:

artur.signell@…

Message:

Made #1642 fix more generic by moving implementation to AbstractComponent?

Location:

trunk/src/com/itmill/toolkit

Files:

• Application.java (modified) (2 diffs)
• terminal/gwt/server/ChangeVariablesErrorEvent.java (modified) (1 diff)
• ui/AbstractComponent.java (modified) (3 diffs)
• ui/AbstractField.java (modified) (4 diffs)

trunk/src/com/itmill/toolkit/Application.java

@@ -1089 +1089 @@
                     .println("Warning: SocketException in CommunicationManager."
                             + " Most likely client (browser) closed socket.");
-
-        } else {
-            // throw it to standard error stream too
-            t.printStackTrace();
+            return;
         }
 
@@ -1116 +1113 @@
                         .setComponentError(new SystemError(e));
             }
+        } else {
+            /*
+             * Can't show it to the user in any way so we print to standard
+             * error
+             */
+            t.printStackTrace();
+
         }
     }

trunk/src/com/itmill/toolkit/terminal/gwt/server/ChangeVariablesErrorEvent.java

@@ -4 +4 @@
 
 import com.itmill.toolkit.ui.Component;
-import com.itmill.toolkit.ui.AbstractField.ComponentErrorEvent;
+import com.itmill.toolkit.ui.AbstractComponent.ComponentErrorEvent;
 
 public class ChangeVariablesErrorEvent implements ComponentErrorEvent {

trunk/src/com/itmill/toolkit/ui/AbstractComponent.java

@@ -20 +20 @@
 import com.itmill.toolkit.terminal.PaintTarget;
 import com.itmill.toolkit.terminal.Resource;
+import com.itmill.toolkit.terminal.Terminal;
 
 /**
@@ -121 +122 @@
     private int widthUnit = UNITS_PIXELS;
     private int heightUnit = UNITS_PIXELS;
+
+    private ComponentErrorHandler errorHandler = null;
 
     /* Constructor */
@@ -1171 +1174 @@
     }
 
+    public interface ComponentErrorEvent extends Terminal.ErrorEvent {
+    }
+
+    public interface ComponentErrorHandler {
+        /**
+         * Handle the component error
+         * 
+         * @param event
+         * @return True if the error has been handled False, otherwise
+         */
+        public boolean handleComponentError(ComponentErrorEvent event);
+    }
+
+    /**
+     * Gets the error handler for the component.
+     * 
+     * The error handler is dispatched whenever there is an error processing the
+     * data coming from the client.
+     * 
+     * @return
+     */
+    public ComponentErrorHandler getErrorHandler() {
+        return errorHandler;
+    }
+
+    /**
+     * Sets the error handler for the component.
+     * 
+     * The error handler is dispatched whenever there is an error processing the
+     * data coming from the client.
+     * 
+     * If the error handler is not set, the application error handler is used to
+     * handle the exception.
+     * 
+     * @param errorHandler
+     *                AbstractField specific error handler
+     */
+    public void setErrorHandler(ComponentErrorHandler errorHandler) {
+        this.errorHandler = errorHandler;
+    }
+
+    public boolean handleError(ComponentErrorEvent error) {
+        if (errorHandler != null) {
+            return errorHandler.handleComponentError(error);
+        }
+        return false;
+
+    }
+
 }

trunk/src/com/itmill/toolkit/ui/AbstractField.java

@@ -22 +22 @@
 import com.itmill.toolkit.terminal.PaintException;
 import com.itmill.toolkit.terminal.PaintTarget;
-import com.itmill.toolkit.terminal.Terminal;
 
 /**
@@ -123 +122 @@
     private boolean validationVisible = true;
 
-    private ComponentErrorHandler errorHandler = null;
-
     /* Component basics ************************************************ */
 
@@ -1086 +1083 @@
     }
 
-    public interface ComponentErrorHandler {
-        /**
-         * Handle the component error
-         * 
-         * @param event
-         * @return True if the error has been handled False, otherwise
-         */
-        public boolean handleComponentError(ComponentErrorEvent event);
-    }
-
-    /**
-     * Gets the error handler for the component.
-     * 
-     * The error handler is dispatched whenever there is an error processing the
-     * data coming from the client.
-     * 
-     * @return
-     */
-    public ComponentErrorHandler getErrorHandler() {
-        return errorHandler;
-    }
-
-    /**
-     * Sets the error handler for the component.
-     * 
-     * The error handler is dispatched whenever there is an error processing the
-     * data coming from the client.
-     * 
-     * If the error handler is not set, the application error handler is used to
-     * handle the exception.
-     * 
-     * @param errorHandler
-     *                AbstractField specific error handler
-     */
-    public void setErrorHandler(ComponentErrorHandler errorHandler) {
-        this.errorHandler = errorHandler;
-    }
-
-    public boolean handleError(ComponentErrorEvent error) {
-        if (errorHandler != null) {
-            return errorHandler.handleComponentError(error);
-        }
-        return false;
-
-    }
-
     /**
      * Sets the current buffered source exception.
@@ -1143 +1094 @@
     }
 
-    public interface ComponentErrorEvent extends Terminal.ErrorEvent {
-    }
-
 }