tmf: lttngControl: mi: add machine interface related messages

Fix style issues at the same time.

Change-Id: I0fc3649d1145e0116bbdf6a3c655343fae8ef604
Signed-off-by: Jonathan Rajotte Julien <jonathan.rajotte-julien@ericsson.com>
Reviewed-on: https://git.eclipse.org/r/31068
Tested-by: Hudson CI
Reviewed-by: Bernd Hufmann <bernd.hufmann@ericsson.com>
Tested-by: Bernd Hufmann <bernd.hufmann@ericsson.com>
Reviewed-by: Matthew Khouzam <matthew.khouzam@ericsson.com>

diff --git a/org.eclipse.linuxtools.lttng2.control.ui/src/org/eclipse/linuxtools/internal/lttng2/control/ui/views/messages/Messages.java b/org.eclipse.linuxtools.lttng2.control.ui/src/org/eclipse/linuxtools/internal/lttng2/control/ui/views/messages/Messages.java
index 6486d3b8d8b82aa9152209afa256c9f583a4b29d..512fafe485938fd7dd298f89db1637412bc41107 100644 (file)
--- a/org.eclipse.linuxtools.lttng2.control.ui/src/org/eclipse/linuxtools/internal/lttng2/control/ui/views/messages/Messages.java
+++ b/org.eclipse.linuxtools.lttng2.control.ui/src/org/eclipse/linuxtools/internal/lttng2/control/ui/views/messages/Messages.java
@@ -1,5 +1,5 @@
 /*******************************************************************************
- * Copyright (c) 2012, 2013 Ericsson
+ * Copyright (c) 2012, 2014 Ericsson
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v1.0 which
@@ -9,15 +9,15 @@
  * Contributors:
  *   Bernd Hufmann - Initial API and implementation
  *   Bernd Hufmann - Updated for support of LTTng Tools 2.1
+ *   Jonathan Rajotte - Updated for basic support of LTTng 2.6 machine interface
  *******************************************************************************/
+
 package org.eclipse.linuxtools.internal.lttng2.control.ui.views.messages;
 
 import org.eclipse.osgi.util.NLS;
 
 /**
- * <p>
  * Messages file for the trace control package.
- * </p>
  *
  * @author Bernd Hufmann
  */
@@ -60,6 +60,8 @@ public final class Messages extends NLS {
     public static String TraceControl_MiInvalidNumberOfElementError;
     public static String TraceControl_MiInvalidProviderError;
     public static String TraceControl_MiMissingRequiredError;
+    public static String TraceControl_MiInvalidElementError;
+    public static String TraceControl_MiIllegalValueError;
 
     // Commands
     public static String TraceControl_ErrorTitle;
@@ -260,6 +262,7 @@ public final class Messages extends NLS {
     public static String TraceControl_KernelDomainDisplayName;
     public static String TraceControl_UstDisplayName;
     public static String TraceControl_UstGlobalDomainDisplayName;
+    public static String TraceControl_JULDomainDisplayName;
     public static String TraceControl_AllSessionsDisplayName;
     public static String TraceControl_SessionDisplayName;
     public static String TraceControl_DomainDisplayName;

diff --git a/org.eclipse.linuxtools.lttng2.control.ui/src/org/eclipse/linuxtools/internal/lttng2/control/ui/views/messages/messages.properties b/org.eclipse.linuxtools.lttng2.control.ui/src/org/eclipse/linuxtools/internal/lttng2/control/ui/views/messages/messages.properties
index edccc586ed01889f785141d7083a982aedf5525c..41617a882a2d415466eb81d4c1f47912493f06dc 100644 (file)
--- a/org.eclipse.linuxtools.lttng2.control.ui/src/org/eclipse/linuxtools/internal/lttng2/control/ui/views/messages/messages.properties
+++ b/org.eclipse.linuxtools.lttng2.control.ui/src/org/eclipse/linuxtools/internal/lttng2/control/ui/views/messages/messages.properties
@@ -1,6 +1,6 @@
 ###############################################################################
-# Copyright (c) 2012, 2013 Ericsson.
-# 
+# Copyright (c) 2012, 2014 Ericsson.
+#
 # All rights reserved. This program and the accompanying materials
 # are made available under the terms of the Eclipse Public License v1.0
 # which accompanies this distribution, and is available at
@@ -8,6 +8,7 @@
 #
 # Contributors:
 # Bernd Hufmann - initial API and implementation
+# Jonathan Rajotte - updated for basic support of LTTng 2.6 machine interface
 ###############################################################################
 
 EnableChannelDialog_DefaultMessage=Default
@@ -39,8 +40,11 @@ TraceControl_XmlValidationWarning=Xml validation warning
 TraceControl_MiInvalidNumberOfElementError=Invalid number of element
 TraceControl_MiInvalidProviderError=Invalid provider data
 TraceControl_MiMissingRequiredError=Missing required data
+TraceControl_MiIllegalValueError=Invalid value
 
 # Commands
+TraceControl_MiInvalidElementError=Invalid xml data
+
 TraceControl_ErrorTitle=Error
 TraceControl_ListSessionFailure=List sessions failed
 TraceControl_RetrieveNodeConfigurationJob=Retrieving Target Node Configuration...
@@ -64,7 +68,7 @@ TraceControl_ChangeSessionStateFailure=Command to change session state failed...
 
 TraceControl_CreateChannelStateJob=Enabling (creating) channel... 
 TraceControl_CreateChannelStateFailure=Command to enable channel failed
-    
+
 TraceControl_ChangeChannelStateJob=Changing State of Channels...
 TraceControl_ChangeChannelStateFailure=Command to change state of channels failed
 TraceControl_ChangeEventStateJob=Changing State of Events...
@@ -244,6 +248,7 @@ TraceControl_ImportDialog_DeselectAll=Deselect All
 
 # Tree structure strings
 TraceControl_KernelDomainDisplayName=Kernel
+TraceControl_JULDomainDisplayName=JUL
 TraceControl_UstGlobalDomainDisplayName=UST global
 TraceControl_UstDisplayName=UST
 TraceControl_AllSessionsDisplayName=Sessions