lttng: Add clear() call before add elements to list

In various LTTng Tracer Control core model classes, the relevant
array list is not cleared when the setter is being called. For
example, the method DomainInfo.setChannels(List chans) doesn't
clear the channel list before filling the channel list with the
new channels passed as parameter.

Change-Id: I0e5c8c4f0bd84a6de1c383131255b61c7ca94406
Signed-off-by: Bernd Hufmann <bhufmann@gmail.com>
Reviewed-on: https://git.eclipse.org/r/10731
Tested-by: Hudson CI
Reviewed-by: Alexandre Montplaisir <alexmonthy@voxpopuli.im>
IP-Clean: Alexandre Montplaisir <alexmonthy@voxpopuli.im>

diff --git a/org.eclipse.linuxtools.lttng2.core/src/org/eclipse/linuxtools/internal/lttng2/core/control/model/impl/BaseEventInfo.java b/org.eclipse.linuxtools.lttng2.core/src/org/eclipse/linuxtools/internal/lttng2/core/control/model/impl/BaseEventInfo.java
index 094d73e7c4faf4733abc3abc79544d328424febf..e14c5ec6313b5660c9ee7296c8bba82d7916207d 100644 (file)
--- a/org.eclipse.linuxtools.lttng2.core/src/org/eclipse/linuxtools/internal/lttng2/core/control/model/impl/BaseEventInfo.java
+++ b/org.eclipse.linuxtools.lttng2.core/src/org/eclipse/linuxtools/internal/lttng2/core/control/model/impl/BaseEventInfo.java
@@ -202,6 +202,7 @@ public class BaseEventInfo extends TraceInfo implements IBaseEventInfo {
      */
     @Override
     public void setFields(List<IFieldInfo> fields) {
+        fFields.clear();
         for (Iterator<IFieldInfo> iterator = fields.iterator(); iterator.hasNext();) {
             IFieldInfo fieldInfo = iterator.next();
             fFields.add(fieldInfo);
@@ -305,4 +306,4 @@ public class BaseEventInfo extends TraceInfo implements IBaseEventInfo {
             output.append(")]");
             return output.toString();
     }
-}
\ No newline at end of file
+}

diff --git a/org.eclipse.linuxtools.lttng2.core/src/org/eclipse/linuxtools/internal/lttng2/core/control/model/impl/ChannelInfo.java b/org.eclipse.linuxtools.lttng2.core/src/org/eclipse/linuxtools/internal/lttng2/core/control/model/impl/ChannelInfo.java
index 72f096aaf2d7ef314e4b1feefc1de0bcff35d4bc..8f873fe3547dc666f2cc8fcc7ee31f0bf1756160 100644 (file)
--- a/org.eclipse.linuxtools.lttng2.core/src/org/eclipse/linuxtools/internal/lttng2/core/control/model/impl/ChannelInfo.java
+++ b/org.eclipse.linuxtools.lttng2.core/src/org/eclipse/linuxtools/internal/lttng2/core/control/model/impl/ChannelInfo.java
@@ -259,6 +259,7 @@ public class ChannelInfo extends TraceInfo implements IChannelInfo {
      */
     @Override
     public void setEvents(List<IEventInfo> events) {
+        fEvents.clear();
         for (Iterator<IEventInfo> iterator = events.iterator(); iterator.hasNext();) {
             IEventInfo eventInfo = iterator.next();
             fEvents.add(eventInfo);
@@ -378,4 +379,4 @@ public class ChannelInfo extends TraceInfo implements IChannelInfo {
     }
 
 
-}
\ No newline at end of file
+}

diff --git a/org.eclipse.linuxtools.lttng2.core/src/org/eclipse/linuxtools/internal/lttng2/core/control/model/impl/DomainInfo.java b/org.eclipse.linuxtools.lttng2.core/src/org/eclipse/linuxtools/internal/lttng2/core/control/model/impl/DomainInfo.java
index 0c2feaa20fb74826de337d7991bdb43048ab98b7..fda6fc9e1155e8b1ee6eb6ce318f4e77c2dccd57 100644 (file)
--- a/org.eclipse.linuxtools.lttng2.core/src/org/eclipse/linuxtools/internal/lttng2/core/control/model/impl/DomainInfo.java
+++ b/org.eclipse.linuxtools.lttng2.core/src/org/eclipse/linuxtools/internal/lttng2/core/control/model/impl/DomainInfo.java
@@ -100,6 +100,7 @@ public class DomainInfo extends TraceInfo implements IDomainInfo {
      */
     @Override
     public void setChannels(List<IChannelInfo> channels) {
+        fChannels.clear();
         for (Iterator<IChannelInfo> iterator = channels.iterator(); iterator.hasNext();) {
             IChannelInfo channelInfo = iterator.next();
             fChannels.add(channelInfo);

diff --git a/org.eclipse.linuxtools.lttng2.core/src/org/eclipse/linuxtools/internal/lttng2/core/control/model/impl/SessionInfo.java b/org.eclipse.linuxtools.lttng2.core/src/org/eclipse/linuxtools/internal/lttng2/core/control/model/impl/SessionInfo.java
index 6778532f6ac9b3932233bdfb0a1291a93fbb7a0c..87fb4ea8628025ac7c1a156407f085366f0651e4 100644 (file)
--- a/org.eclipse.linuxtools.lttng2.core/src/org/eclipse/linuxtools/internal/lttng2/core/control/model/impl/SessionInfo.java
+++ b/org.eclipse.linuxtools.lttng2.core/src/org/eclipse/linuxtools/internal/lttng2/core/control/model/impl/SessionInfo.java
@@ -148,6 +148,7 @@ public class SessionInfo extends TraceInfo implements ISessionInfo {
      */
     @Override
     public void setDomains(List<IDomainInfo> domains) {
+        fDomains.clear();
         for (Iterator<IDomainInfo> iterator = domains.iterator(); iterator.hasNext();) {
             IDomainInfo domainInfo = iterator.next();
             fDomains.add(domainInfo);

diff --git a/org.eclipse.linuxtools.lttng2.core/src/org/eclipse/linuxtools/internal/lttng2/core/control/model/impl/UstProviderInfo.java b/org.eclipse.linuxtools.lttng2.core/src/org/eclipse/linuxtools/internal/lttng2/core/control/model/impl/UstProviderInfo.java
index ffe0e980371c996dcd553eed7e1d16eec866a3c4..23d76e0fe269f43e0c48690995d63bffdb887b5a 100644 (file)
--- a/org.eclipse.linuxtools.lttng2.core/src/org/eclipse/linuxtools/internal/lttng2/core/control/model/impl/UstProviderInfo.java
+++ b/org.eclipse.linuxtools.lttng2.core/src/org/eclipse/linuxtools/internal/lttng2/core/control/model/impl/UstProviderInfo.java
@@ -105,6 +105,7 @@ public class UstProviderInfo extends TraceInfo implements IUstProviderInfo {
      */
     @Override
     public void setEvents(List<IBaseEventInfo> events) {
+        fEvents.clear();
         for (Iterator<IBaseEventInfo> iterator = events.iterator(); iterator.hasNext();) {
             IBaseEventInfo eventInfo = iterator.next();
             fEvents.add(eventInfo);