X-Git-Url: http://drtracing.org/?a=blobdiff_plain;f=org.eclipse.linuxtools.lttng.ui%2Fsrc%2Forg%2Feclipse%2Flinuxtools%2Flttng%2Fui%2Fviews%2Fcontrol%2Fmodel%2Fimpl%2FChannelInfo.java;h=b2f0035d41467fe4761813bcee47ce94359d783c;hb=d132bcc71fa0ff07cf2a3f0b6258f38abb546fb7;hp=468952971dda45979db7e478b238b729ad1e58b5;hpb=f1e23c542e9b00f6dab15b7aa2960315a22d9bc4;p=deliverable%2Ftracecompass.git

diff --git a/org.eclipse.linuxtools.lttng.ui/src/org/eclipse/linuxtools/lttng/ui/views/control/model/impl/ChannelInfo.java b/org.eclipse.linuxtools.lttng.ui/src/org/eclipse/linuxtools/lttng/ui/views/control/model/impl/ChannelInfo.java
index 468952971d..b2f0035d41 100644
--- a/org.eclipse.linuxtools.lttng.ui/src/org/eclipse/linuxtools/lttng/ui/views/control/model/impl/ChannelInfo.java
+++ b/org.eclipse.linuxtools.lttng.ui/src/org/eclipse/linuxtools/lttng/ui/views/control/model/impl/ChannelInfo.java
@@ -273,71 +273,122 @@ public class ChannelInfo extends TraceInfo implements IChannelInfo {
         fEvents.add(channel);
     }
     
+    /*
+     * (non-Javadoc)
+     * @see org.eclipse.linuxtools.lttng.ui.views.control.model.ITraceInfo#formatString()
+     */
+    @SuppressWarnings("nls")
+    @Override
+    public String formatString() {
+        StringBuffer output = new StringBuffer();
+        //- channel0: [enabled]
+        output.append("\n- ");
+        output.append(getName());
+        output.append(": [");
+        output.append(getState().getInName());
+        output.append("]\n");
+        //     Attributes:
+        output.append("\n    Attributes:\n");
+        //     overwrite mode: 0
+        output.append("      overwrite mode: ");
+        output.append(isOverwriteMode() ? "1" : "0");
+        //         subbufers size: 262144
+        output.append("\n      subbufers size: ");
+        output.append(getSubBufferSize());
+        //         number of subbufers: 4
+        output.append("\n      number of subbufers: ");
+        output.append(getNumberOfSubBuffers());
+        //        switch timer interval: 0
+        output.append("\n      switch timer interval: ");
+        output.append(getSwitchTimer());
+        //         read timer interval: 200
+        output.append("\n      read timer interval: ");
+        output.append(getReadTimer());
+        //         output: splice()
+        output.append("\n      output: ");
+        output.append(getOutputType());
+        output.append("\n\n");
+
+        output.append("    Events:");
+        if (fEvents.isEmpty()) {
+            output.append("\n      None");
+        } else {
+            for (Iterator<IEventInfo> iterator = fEvents.iterator(); iterator.hasNext();) {
+                IEventInfo event = (IEventInfo) iterator.next();
+                output.append(event.formatString());
+            }
+        }
+        output.append("\n");
+
+        return output.toString();
+    }
+    
     /*
      * (non-Javadoc)
      * @see org.eclipse.linuxtools.lttng.ui.views.control.model.impl.TraceInfo#hashCode()
      */
     @Override
     public int hashCode() {
-        int result = 17;
-        result = 37 * result + super.hashCode();
-        result = 37 * result + Boolean.valueOf(fOverwriteMode).hashCode();
-        result = 37 * result + Long.valueOf(fSubBufferSize).hashCode();
-        result = 37 * result + fNumberOfSubBuffers;
-        result = 37 * result + Long.valueOf(fSwitchTimer).hashCode();
-        result = 37 * result + Long.valueOf(fReadTimer).hashCode();
-        result = 37 * result + (fOutputType != null ? fOutputType.hashCode() : 0);
-        result = 37 * result + fState.ordinal();
-        for (Iterator<IEventInfo> iterator = fEvents.iterator(); iterator.hasNext();) {
-            IEventInfo event = (IEventInfo) iterator.next();
-            result = 37 * result + event.hashCode();
-        }
+        final int prime = 31;
+        int result = super.hashCode();
+        result = prime * result + ((fEvents == null) ? 0 : fEvents.hashCode());
+        result = prime * result + fNumberOfSubBuffers;
+        result = prime * result + ((fOutputType == null) ? 0 : fOutputType.hashCode());
+        result = prime * result + (fOverwriteMode ? 1231 : 1237);
+        result = prime * result + (int) (fReadTimer ^ (fReadTimer >>> 32));
+        result = prime * result + ((fState == null) ? 0 : (fState.ordinal() + 1));
+        result = prime * result + (int) (fSubBufferSize ^ (fSubBufferSize >>> 32));
+        result = prime * result + (int) (fSwitchTimer ^ (fSwitchTimer >>> 32));
         return result;
-    }
+    }  
 
     /*
      * (non-Javadoc)
      * @see org.eclipse.linuxtools.lttng.ui.views.control.model.impl.TraceInfo#equals(java.lang.Object)
      */
     @Override
-    public boolean equals(Object other) {
-        if (!(other instanceof ChannelInfo)) {
-            return false;
+    public boolean equals(Object obj) {
+        if (this == obj) {
+            return true;
         }
-
-        ChannelInfo otherInfo = (ChannelInfo) other;
-        if (!super.equals(otherInfo)) {
+        if (!super.equals(obj)) {
             return false;
         }
-
-        if (fOverwriteMode != otherInfo.fOverwriteMode) {
+        if (getClass() != obj.getClass()) {
             return false;
         }
-        if (fSubBufferSize != otherInfo.fSubBufferSize) {
+        ChannelInfo other = (ChannelInfo) obj;
+        if (fEvents == null) {
+            if (other.fEvents != null) {
+                return false;
+            }
+        } else if (!fEvents.equals(other.fEvents)) {
             return false;
         }
-        if (fNumberOfSubBuffers != otherInfo.fNumberOfSubBuffers) {
+        if (fNumberOfSubBuffers != other.fNumberOfSubBuffers) {
             return false;
         }
-        if (fSwitchTimer != otherInfo.fSwitchTimer) {
+        if (fOutputType == null) {
+            if (other.fOutputType != null) {
+                return false;
+            }
+        } else if (!fOutputType.equals(other.fOutputType)) {
             return false;
         }
-        if (fReadTimer != otherInfo.fReadTimer) {
+        if (fOverwriteMode != other.fOverwriteMode) {
             return false;
         }
-        if (fState.ordinal() != otherInfo.fState.ordinal()) {
+        if (fReadTimer != other.fReadTimer) {
             return false;
         }
-        if (!fOutputType.equals(otherInfo.fOutputType)) {
+        if (fState != other.fState) {
             return false;
         }
-        if (fEvents.size() != otherInfo.fEvents.size()) {
+        if (fSubBufferSize != other.fSubBufferSize) {
             return false;
         }
-        for (int i = 0; i < fEvents.size(); i++) {
-            if (!fEvents.get(i).equals(otherInfo.fEvents.get(i))) {
-                return false;
-            }
+        if (fSwitchTimer != other.fSwitchTimer) {
+            return false;
         }
         return true;
     }
@@ -378,4 +429,6 @@ public class ChannelInfo extends TraceInfo implements IChannelInfo {
             output.append(")]");
             return output.toString();
     }
+
+
 }
\ No newline at end of file