Changeset 4750

Timestamp:

02/09/07 15:05:24 (22 months ago)

Author:

jburel

Message:

Fixed bug collection problem cf ticket#238

Location:

trunk

Files:

• SRC/org/openmicroscopy/shoola/env/LookupNames.java (modified) (1 diff)
• SRC/org/openmicroscopy/shoola/env/ui/UserNotifierManager.java (modified) (3 diffs)
• SRC/org/openmicroscopy/shoola/svc/proxy/CommunicatorProxy.java (modified) (2 diffs)
• SRC/org/openmicroscopy/shoola/svc/proxy/MessengerReply.java (modified) (2 diffs)
• SRC/org/openmicroscopy/shoola/svc/proxy/MessengerRequest.java (modified) (2 diffs)
• SRC/org/openmicroscopy/shoola/svc/proxy/Reply.java (modified) (2 diffs)
• SRC/org/openmicroscopy/shoola/util/ui/MessengerDialog.java (modified) (3 diffs)
• config/container.xml (modified) (2 diffs)

trunk/SRC/org/openmicroscopy/shoola/env/LookupNames.java

@@ -117 +117 @@
                                          "/services/LOGIN/omeds/retry-interval";
     
+    /** Field to access the url of the server where to post comments. */
+    public static final String DEBUG_URL_COMMENT = 
+                                                        "/services/DEBUGGER/hostnameComment";
+    
     /** Field to access the url of the server where to post error messages. */
-    public static final String DEBUG_URL = "/services/DEBUGGER/hostname";
+    public static final String DEBUG_URL_BUG = "/services/DEBUGGER/hostnameBug";
     
     /** Field to access the e-mail address used to collect comments. */

trunk/SRC/org/openmicroscopy/shoola/env/ui/UserNotifierManager.java

@@ -79 +79 @@
         private static final String     COMMENT_MSG = "comment.";
         
-        /** The reply to a messenger request. */
-        private static final String REPLY = "Comments have been successfully " +
-                                                                                "posted";
+        /** Reply when sending the comments. */
+        private static final String     COMMENT_REPLY = "Thanks, your comments have " +
+                                                                                        "been successfully posted.";
+        
+        /** Reply when sending the error message. */
+        private static final String     ERROR_REPLY = "Thnaks, the error message " +
+                                                                                "has been successfully posted.";
         
     /** Reference to the container. */
@@ -96 +100 @@
         {
                 Registry reg = container.getRegistry();
-                String url = (String) reg.lookup(LookupNames.DEBUG_URL);
+                String url;
+                boolean bug = true;
+                String error = details.getError();
+                if (error == null || error.length() == 0) bug = false;
+                if (bug) url = (String) reg.lookup(LookupNames.DEBUG_URL_BUG);
+                else url = (String) reg.lookup(LookupNames.DEBUG_URL_COMMENT);
+                
                 String teamAddress = (String) reg.lookup(LookupNames.DEBUG_EMAIL);
                 CommunicatorDescriptor desc = new CommunicatorDescriptor
@@ -102 +112 @@
                 try {
                         Communicator c = SvcRegistry.getCommunicator(desc);
-                        String error = details.getError();
+                        
                         String reply = "";
-                        if (error == null || error.length() == 0)
+                        if (!bug)
                                 c.submitComment(details.getEmail(), details.getComment(), 
                                                                 details.getExtra(), reply);
                         else c.submitError(details.getEmail(), details.getComment(), 
                                         details.getExtra(), error, reply);
+                        if (bug) reply += COMMENT_REPLY;
+                        else reply += ERROR_REPLY;
                         
-                        JOptionPane.showMessageDialog(source, REPLY);
+                        JOptionPane.showMessageDialog(source, reply);
                 } catch (Exception e) {
-                        e.printStackTrace();
                         String s = MESSAGE_START;
                         if (source.getDialogType() == MessengerDialog.ERROR_TYPE)

trunk/SRC/org/openmicroscopy/shoola/svc/proxy/CommunicatorProxy.java

@@ -54 +54 @@
 
         /** The tool invoking the service. */
-        private static final String INVOKER_ERROR = "insight_bug";
+        private static final String INVOKER_ERROR = "insight_bugs";
         
         /** The tool invoking the service. */
@@ -107 +107 @@
                     "Couldn't communicate with server (I/O error).", ioe);
         }
-                
         }
         

trunk/SRC/org/openmicroscopy/shoola/svc/proxy/MessengerReply.java

@@ -50 +50 @@
         extends Reply
 {
-
-        /** The reply to a messenger request. */
-        private static final String REPLY = "Comments have been successfully " +
-                                                                                "posted.";
         
         /** The reply to send to the user. */
@@ -75 +71 @@
                 throws TransportException
         {
-                checkStatusCode(response);
-                this.reply += REPLY;
+                reply += checkStatusCode(response);
         }
 

trunk/SRC/org/openmicroscopy/shoola/svc/proxy/MessengerRequest.java

@@ -113 +113 @@
                 this.extra = extra;
                 this.invoker = invoker;
-                
         }
         
@@ -127 +126 @@
         
         //Marshal.
-        if (email != null)
-                request.addParameter(EMAIL, email);
-        if (comment != null)
-                request.addParameter(COMMENT, comment);
-        if (error != null)
-                request.addParameter(ERROR, error);
-        if (extra != null)
-                request.addParameter(EXTRA, extra);
+        if (email != null) request.addParameter(EMAIL, email);
+        if (comment != null) request.addParameter(COMMENT, comment);
+        if (error != null) request.addParameter(ERROR, error);
+                
+        if (extra != null) request.addParameter(EXTRA, extra);
         request.addParameter(INVOKER, invoker);
         request.addParameter(JAVA_VERSION, 

trunk/SRC/org/openmicroscopy/shoola/svc/proxy/Reply.java

@@ -56 +56 @@
          * 
          * @param response      The response to handle.
+         * @return The message from server.
          * @throws TransportException If an error occured while transferring data.
          */
-    protected static void checkStatusCode(HttpMethod response)
+    protected static String checkStatusCode(HttpMethod response)
         throws TransportException
         {
@@ -70 +71 @@
                     for (int n; (n = reader.read(buf)) != -1;)
                         str.append(buf, 0, n);
-                    throw new TransportException("Couldn't handle request: "+
-                                str.toString());
+                    return str.toString();
                         } catch (Exception e) {
                                 throw new TransportException("Couldn't handle request: "+
                                                 HttpStatus.getStatusText(status)+".");
                         }
-                
             }
-            
+                return null;  
         }
     

trunk/SRC/org/openmicroscopy/shoola/util/ui/MessengerDialog.java

@@ -34 +34 @@
 import java.io.StringWriter;
 import java.util.ArrayList;
+import java.util.List;
+
 import javax.swing.BorderFactory;
 import javax.swing.Icon;
@@ -266 +268 @@
 
         // Create one of each type of tab stop
-        java.util.List list = new ArrayList();
+        List<TabStop> list = new ArrayList<TabStop>();
         
         // Create a left-aligned tab stop at 100 pixels from the left margin
@@ -297 +299 @@
         
         // Create a tab set from the tab stops
-        TabStop[] tstops = (TabStop[]) list.toArray(new TabStop[0]);
-        TabSet tabs = new TabSet(tstops);
+        TabSet tabs = new TabSet(list.toArray(new TabStop[0]));
         
         // Add the tab set to the logical style;

trunk/config/container.xml

@@ -42 +42 @@
     </structuredEntry>
     
-    <!-- Login Service configuration.
-    -->
     <!-- The maximum number of times that the Login Service should attempt
          to restore a valid link to OMERO server in the background. 
@@ -106 +104 @@
          and e-mail address to submit comment.
     -->
-<entry name="/services/DEBUGGER/hostname">http://users.openmicroscopy.org.uk/~brain/omero/commentcollector.php</entry>
-    <entry name="/services/DEBUGGER/email">comments@openmicroscopy.org.uk</entry>
+<entry name="/services/DEBUGGER/hostnameComment">http://users.openmicroscopy.org.uk/~brain/omero/commentcollector.php</entry>
+<entry name="/services/DEBUGGER/hostnameBug">http://users.openmicroscopy.org.uk/~brain/omero/bugcollector.php</entry>
+<entry name="/services/DEBUGGER/email">comments@openmicroscopy.org.uk</entry>
   </services>