Added some more JUnit tests

[deliverable/tracecompass.git] / org.eclipse.linuxtools.lttng.ui / src / org / eclipse / linuxtools / lttng / ui / views / control / dialogs / CreateChannelDialog.java

diff --git a/org.eclipse.linuxtools.lttng.ui/src/org/eclipse/linuxtools/lttng/ui/views/control/dialogs/CreateChannelDialog.java b/org.eclipse.linuxtools.lttng.ui/src/org/eclipse/linuxtools/lttng/ui/views/control/dialogs/CreateChannelDialog.java
index a27af8513ed577ecb5cd725028f8ffa6be0d561a..27dee19ee65e38715a132cf24b8233ad5a41defa 100644 (file)
--- a/org.eclipse.linuxtools.lttng.ui/src/org/eclipse/linuxtools/lttng/ui/views/control/dialogs/CreateChannelDialog.java
+++ b/org.eclipse.linuxtools.lttng.ui/src/org/eclipse/linuxtools/lttng/ui/views/control/dialogs/CreateChannelDialog.java
@@ -119,23 +119,8 @@ public class CreateChannelDialog extends Dialog implements ICreateChannelOnSessi
      * @param shell - a shell for the display of the dialog
      */
     public CreateChannelDialog(Shell shell) {
-        this(shell, null);
-    }
-
-    
-    /**
-     * Constructor
-     * @param shell - a shell for the display of the dialog
-     * @param domain - a domain to create channel on. Use null for creating a channel on session level.
-     */
-    public CreateChannelDialog(Shell shell, TraceDomainComponent domain) {
-        super(shell);
-        fDomain = domain;
-        if (fDomain != null) {
-            fIsKernel = fDomain.isKernel();
-        } else {
-            fIsKernel = true;
-        }
+       super(shell);
+       fIsKernel = true;
 
         // Common verify listener
         fVerifyListener = new VerifyListener() {
@@ -159,6 +144,20 @@ public class CreateChannelDialog extends Dialog implements ICreateChannelOnSessi
         return fChannelInfo;
     }
 
+    /*
+     * (non-Javadoc)
+     * @see org.eclipse.linuxtools.lttng.ui.views.control.dialogs.ICreateChannelDialog#setDomainComponent(org.eclipse.linuxtools.lttng.ui.views.control.model.impl.TraceDomainComponent)
+     */
+    @Override
+    public void setDomainComponent(TraceDomainComponent domain) {
+        fDomain = domain;
+        if (fDomain != null) {
+            fIsKernel = fDomain.isKernel();
+        } else {
+            fIsKernel = true;
+        }
+    }
+
     /*
      * (non-Javadoc)
      * @see org.eclipse.linuxtools.lttng.ui.views.control.dialogs.ICreateChannelOnSessionDialog#isKernel()
@@ -197,7 +196,7 @@ public class CreateChannelDialog extends Dialog implements ICreateChannelOnSessi
         Label channelNameLabel = new Label(fDialogComposite, SWT.RIGHT);
         channelNameLabel.setText(Messages.TraceControl_EnableChannelNameLabel);
         fChannelNameText = new Text(fDialogComposite, SWT.NONE);
-        fChannelNameText.setToolTipText(Messages.TraceControl_EnableChannelNameLabelTooltip);
+        fChannelNameText.setToolTipText(Messages.TraceControl_EnableChannelNameTooltip);
         
         Label subBufferSizeLabel = new Label(fDialogComposite, SWT.RIGHT);
         subBufferSizeLabel.setText(Messages.TraceControl_SubBufferSizePropertyName);
@@ -303,7 +302,7 @@ public class CreateChannelDialog extends Dialog implements ICreateChannelOnSessi
         }
 
         // Check for invalid names
-        if (!fChannelInfo.getName().matches("^[a-zA-Z0-9\\-\\_]{2,}$")) { //$NON-NLS-1$
+        if (!fChannelInfo.getName().matches("^[a-zA-Z0-9\\-\\_]{1,}$")) { //$NON-NLS-1$
             MessageDialog.openError(getShell(),
                   Messages.TraceControl_EnableChannelDialogTitle,
                   Messages.TraceControl_InvalidChannelNameError + " (" + fChannelInfo.getName() + ") \n");  //$NON-NLS-1$ //$NON-NLS-2$