Changeset 1839

Timestamp:

11/25/13 23:40:01 (11 years ago)

Author:

masberg

Message:

Move null check before first usage.

File:

• trunk/org.modelica.mdt.ui/src/org/modelica/mdt/ui/hover/ModelicaAnnotationHover.java (modified) (3 diffs)

trunk/org.modelica.mdt.ui/src/org/modelica/mdt/ui/hover/ModelicaAnnotationHover.java

@@ -1 +1 @@
 /*******************************************************************************
- * Copyright (c) 2002-2007 
+ * Copyright (c) 2002-2007
  * @author Adrian Pop [adrpo@ida.liu.se]
- * All rights reserved. 
+ * All rights reserved.
  *******************************************************************************/
 package org.modelica.mdt.ui.hover;
@@ -26 +26 @@
 
 public class ModelicaAnnotationHover extends DefaultAnnotationHover {
-    
+
 //  /*
 //   * Formats a message as HTML text.
@@ -83 +83 @@
             else {
                 List<String> messages = new ArrayList<String>();
-                
+
                 for (IMarker marker : markers) {
                     String message = marker.getAttribute(IMarker.MESSAGE, (String) null);
-                    String trimmedMessage = message.trim();
-                    
-                    if (message != null && trimmedMessage.length() > 0) {
-                        messages.add(trimmedMessage);
+                    if (message != null) {
+                        String trimmedMessage = message.trim();
+
+                        if (trimmedMessage.length() > 0) {
+                            messages.add(trimmedMessage);
+                        }
                     }
-                }
-                if (messages.size() == 1) {
-                    return this.formatSingleMessage(messages.get(0));
-                }
-                if (messages.size() > 1) {
-                    return this.formatMultipleMessages(messages);
+                    if (messages.size() == 1) {
+                        return this.formatSingleMessage(messages.get(0));
+                    }
+                    if (messages.size() > 1) {
+                        return this.formatMultipleMessages(messages);
+                    }
                 }
             }