Skip to main content
aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorHenrik Rentz-Reichert2011-09-30 09:16:00 +0000
committerHenrik Rentz-Reichert2011-09-30 09:16:00 +0000
commit8c34391dfec95d89160d1ba98da6ff5e63f71d0f (patch)
tree9362bd600e7d9570ed5da2d30bb6072ac6bdd405 /plugins
parent74b1914d5e0454f24b80e712c334cc88a1021d69 (diff)
downloadorg.eclipse.etrice-8c34391dfec95d89160d1ba98da6ff5e63f71d0f.tar.gz
org.eclipse.etrice-8c34391dfec95d89160d1ba98da6ff5e63f71d0f.tar.xz
org.eclipse.etrice-8c34391dfec95d89160d1ba98da6ff5e63f71d0f.zip
[core.room.ui] show attribute default value in outline if specified
Diffstat (limited to 'plugins')
-rw-r--r--plugins/org.eclipse.etrice.core.room.ui/src/org/eclipse/etrice/core/ui/labeling/RoomLabelProvider.java4
-rw-r--r--plugins/org.eclipse.etrice.core.room.ui/src/org/eclipse/etrice/core/ui/outline/RoomOutlineTreeProvider.java4
2 files changed, 7 insertions, 1 deletions
diff --git a/plugins/org.eclipse.etrice.core.room.ui/src/org/eclipse/etrice/core/ui/labeling/RoomLabelProvider.java b/plugins/org.eclipse.etrice.core.room.ui/src/org/eclipse/etrice/core/ui/labeling/RoomLabelProvider.java
index d8fc7d371..81de5858a 100644
--- a/plugins/org.eclipse.etrice.core.room.ui/src/org/eclipse/etrice/core/ui/labeling/RoomLabelProvider.java
+++ b/plugins/org.eclipse.etrice.core.room.ui/src/org/eclipse/etrice/core/ui/labeling/RoomLabelProvider.java
@@ -250,7 +250,9 @@ public class RoomLabelProvider extends DefaultEObjectLabelProvider {
String text(Attribute attr) {
String type = attr.getType()!=null? (" : "+getName(attr.getType())):"";
- return "Attr "+attr.getName()+type;
+ String value = (attr.getDefaultValueLiteral()!=null && !attr.getDefaultValueLiteral().isEmpty())?
+ (" = "+attr.getDefaultValueLiteral()) : "";
+ return "Attr "+attr.getName()+type+value;
}
String text(Operation op) {
diff --git a/plugins/org.eclipse.etrice.core.room.ui/src/org/eclipse/etrice/core/ui/outline/RoomOutlineTreeProvider.java b/plugins/org.eclipse.etrice.core.room.ui/src/org/eclipse/etrice/core/ui/outline/RoomOutlineTreeProvider.java
index b07660b36..404e394e0 100644
--- a/plugins/org.eclipse.etrice.core.room.ui/src/org/eclipse/etrice/core/ui/outline/RoomOutlineTreeProvider.java
+++ b/plugins/org.eclipse.etrice.core.room.ui/src/org/eclipse/etrice/core/ui/outline/RoomOutlineTreeProvider.java
@@ -149,4 +149,8 @@ public class RoomOutlineTreeProvider extends DefaultOutlineTreeProvider {
protected boolean _isLeaf(Operation o) {
return true;
}
+
+ protected boolean _isLeaf(Attribute ac) {
+ return true;
+ }
}

Back to the top