Fixed label and text of outline view nodes referring to options.
diff --git a/com.google.eclipse.protobuf.ui/src/com/google/eclipse/protobuf/ui/labeling/Images.java b/com.google.eclipse.protobuf.ui/src/com/google/eclipse/protobuf/ui/labeling/Images.java
index 95ca2e7..4c9b794 100644
--- a/com.google.eclipse.protobuf.ui/src/com/google/eclipse/protobuf/ui/labeling/Images.java
+++ b/com.google.eclipse.protobuf.ui/src/com/google/eclipse/protobuf/ui/labeling/Images.java
@@ -67,6 +67,9 @@
if (o instanceof String) {
return o + GIF_EXTENSION;
}
+ if (o instanceof Option) {
+ return imageFor(Option.class);
+ }
return imageFor(o.getClass());
}
@@ -76,7 +79,7 @@
return image;
}
Class<?>[] interfaces = type.getInterfaces();
- if (interfaces == null || interfaces.length != 1) {
+ if (interfaces == null || interfaces.length == 0) {
return DEFAULT_IMAGE;
}
return imageFor(interfaces[0]);
diff --git a/com.google.eclipse.protobuf.ui/src/com/google/eclipse/protobuf/ui/labeling/Labels.java b/com.google.eclipse.protobuf.ui/src/com/google/eclipse/protobuf/ui/labeling/Labels.java
index cca5f28..adf8288 100644
--- a/com.google.eclipse.protobuf.ui/src/com/google/eclipse/protobuf/ui/labeling/Labels.java
+++ b/com.google.eclipse.protobuf.ui/src/com/google/eclipse/protobuf/ui/labeling/Labels.java
@@ -129,12 +129,13 @@
private Object labelFor(AbstractOption option) {
IndexedElement e = options.rootSourceOf(option);
String name = options.nameForOption(e);
- StringBuilder b = new StringBuilder();
if (option instanceof AbstractCustomOption) {
+ StringBuilder b = new StringBuilder();
b.append(formatCustomOptionName(name));
appendFields(b, options.fieldsOf((AbstractCustomOption) option));
+ return b.toString();
}
- return b.toString();
+ return name;
}
private String formatCustomOptionName(String name) {
