Updated the order of imports in the source files of simulator plugins.

[platform/upstream/iotivity.git] / service / simulator / java / eclipse-plugin / ClientControllerPlugin / src / oic / simulator / logger / LogLabelProvider.java

diff --git a/service/simulator/java/eclipse-plugin/ClientControllerPlugin/src/oic/simulator/logger/LogLabelProvider.java b/service/simulator/java/eclipse-plugin/ClientControllerPlugin/src/oic/simulator/logger/LogLabelProvider.java
index ca80ad1..f7c40c3 100644 (file)
--- a/service/simulator/java/eclipse-plugin/ClientControllerPlugin/src/oic/simulator/logger/LogLabelProvider.java
+++ b/service/simulator/java/eclipse-plugin/ClientControllerPlugin/src/oic/simulator/logger/LogLabelProvider.java
@@ -16,15 +16,15 @@
 
 package oic.simulator.logger;
 
+import org.eclipse.jface.viewers.ITableLabelProvider;
+import org.eclipse.jface.viewers.LabelProvider;
+import org.eclipse.swt.graphics.Image;
+
 import java.text.DateFormat;
 import java.text.SimpleDateFormat;
 
 import oic.simulator.clientcontroller.manager.LogManager;
 
-import org.eclipse.jface.viewers.ITableLabelProvider;
-import org.eclipse.jface.viewers.LabelProvider;
-import org.eclipse.swt.graphics.Image;
-
 /**
  * Label provider which determines what data has to be shown in the log view.
  */
@@ -50,7 +50,14 @@ public class LogLabelProvider extends LabelProvider implements
         } else if (columnIndex == 1) {
             return dateFormat.format(entry.getDate());
         } else {
-            return entry.getMessage();
+            String msg = entry.getMessage();
+            if (null != msg) {
+                int pos = msg.indexOf('\n');
+                if (pos != -1) {
+                    msg = msg.substring(0, pos);
+                }
+            }
+            return msg;
         }
     }