diff options
| author | Andy Jury | 2014-10-08 17:56:58 +0000 |
|---|---|---|
| committer | Andy Jury | 2014-10-08 17:56:58 +0000 |
| commit | 053513c4b8f6823aff64c10c0151dac88993ff5b (patch) | |
| tree | 710af35af00e26ea434f0c7e25af1c469e4f8559 | |
| parent | 38b94ec3620d1515acdbce638383b03f633f6256 (diff) | |
| parent | ebe54a1d64a3cf29924fec7afc8afc79a3a16ee0 (diff) | |
| download | org.eclipse.ote-053513c4b8f6823aff64c10c0151dac88993ff5b.tar.gz org.eclipse.ote-053513c4b8f6823aff64c10c0151dac88993ff5b.tar.xz org.eclipse.ote-053513c4b8f6823aff64c10c0151dac88993ff5b.zip | |
Merge branch 'sprint64'OTE_MINIBUILD_67OTE_MINIBUILD_66OTE_MINIBUILD_65OTE_MINIBUILD_6411_05_2014sprint67sprint66sprint65
| -rw-r--r-- | org.eclipse.ote.mavenbuild/pom.xml | 29 | ||||
| -rw-r--r-- | org.eclipse.ote.ui.message/src/org/eclipse/ote/ui/message/tree/WatchedMessageNode.java | 7 |
2 files changed, 11 insertions, 25 deletions
diff --git a/org.eclipse.ote.mavenbuild/pom.xml b/org.eclipse.ote.mavenbuild/pom.xml index 50bffe3f6..e37c34344 100644 --- a/org.eclipse.ote.mavenbuild/pom.xml +++ b/org.eclipse.ote.mavenbuild/pom.xml @@ -32,41 +32,22 @@ <javadoc-version>2.8</javadoc-version> <build-helper-maven-plugin-version>1.7</build-helper-maven-plugin-version> <maven-resources-version>2.5</maven-resources-version> - <gitRepoRoot>file:../../../</gitRepoRoot> - + <gitRepoRoot>file:../../../</gitRepoRoot> </properties> - <repositories> - <repository> - <id>eclipse</id> - <layout>p2</layout> - <url>${eclipse-site}</url> - </repository> - <repository> - <id>orbit</id> - <layout>p2</layout> - <url>${orbit-site}</url> - </repository> - <repository> - <id>osee</id> - <layout>p2</layout> - <url>${osee-site}</url> - </repository> - </repositories> - <profiles> <profile> - <id>org.eclipse.ip.p2</id> + <id>ote.runtime.p2</id> <activation> <property> - <name>org.eclipse.ip.p2</name> + <name>ote.runtime.p2</name> </property> </activation> <repositories> <repository> - <id>org.eclipse.ip.p2</id> + <id>ote-runtime</id> <layout>p2</layout> - <url>${org.eclipse.ip.p2}</url> + <url>${ote.runtime.p2}</url> </repository> </repositories> </profile> diff --git a/org.eclipse.ote.ui.message/src/org/eclipse/ote/ui/message/tree/WatchedMessageNode.java b/org.eclipse.ote.ui.message/src/org/eclipse/ote/ui/message/tree/WatchedMessageNode.java index c0e8a7493..5f3394b5a 100644 --- a/org.eclipse.ote.ui.message/src/org/eclipse/ote/ui/message/tree/WatchedMessageNode.java +++ b/org.eclipse.ote.ui.message/src/org/eclipse/ote/ui/message/tree/WatchedMessageNode.java @@ -17,6 +17,7 @@ import java.util.Collection; import java.util.HashMap; import java.util.List; import java.util.Map; +import java.util.Set; import java.util.concurrent.atomic.AtomicLong; import org.eclipse.nebula.widgets.xviewer.XViewerColumn; @@ -50,6 +51,7 @@ public class WatchedMessageNode extends MessageNode { private volatile long lastUpdateNumber = -1; private Map<ElementPath, String> valueMap; + private Set<DataType> availableTypes; public WatchedMessageNode(IMessageSubscription subscription) { super(subscription.getMessageClassName()); @@ -100,6 +102,9 @@ public class WatchedMessageNode extends MessageNode { WatchedElementNode elementNode = (WatchedElementNode) child; elementNode.setResolved(isResolved); } + if(isResolved){ + availableTypes = getSubscription().getAvailableTypes(); + } } @Override @@ -193,7 +198,7 @@ public class WatchedMessageNode extends MessageNode { return MessageNode.errorImg; } boolean isWriter = subscription.getMessageMode() == MessageMode.WRITER; - boolean hasOptions = getSubscription().getAvailableTypes().size() > 1; + boolean hasOptions = availableTypes != null && availableTypes.size() > 1; return getMessageIcon(getSubscription().getMemType().name(), isWriter, hasOptions); } |