More message tweaking

1 files changed, 27 insertions, 24 deletions

diff --git a/bundles/org.eclipse.e4.tools.css.spy/src/org/eclipse/e4/tools/css/spy/CssSpyDialog.java b/bundles/org.eclipse.e4.tools.css.spy/src/org/eclipse/e4/tools/css/spy/CssSpyDialog.java
index 66329bed..4dd2ff7b 100644
--- a/bundles/org.eclipse.e4.tools.css.spy/src/org/eclipse/e4/tools/css/spy/CssSpyDialog.java
+++ b/bundles/org.eclipse.e4.tools.css.spy/src/org/eclipse/e4/tools/css/spy/CssSpyDialog.java
@@ -188,43 +188,46 @@ public class CssSpyDialog extends Dialog {
 		cssPropertiesViewer.setInput(selected);
 
 		StringBuilder sb = new StringBuilder();
-		sb.append("CSS Element: ").append(element.getClass().getName());
+		CSSEngine engine = getCSSEngine(element);
+		CSSStyleDeclaration decl = engine.getViewCSS().getComputedStyle(
+				element, null);
+
 		if (element.getCSSStyle() != null) {
-			sb.append("\nCSS Inline Style(s):\n ");
-			Activator.join(sb, element.getCSSStyle().split(";"), ";\n ");
+			sb.append("\nCSS Inline Style(s):\n  ");
+			Activator.join(sb, element.getCSSStyle().split(";"), ";\n  ");
 		}
 
+		if (decl != null) {
+			sb.append("\n\nCSS Properties:\n");
+			try {
+				if (decl != null) {
+					sb.append(decl.getCssText());
+				}
+			} catch (Throwable e) {
+				sb.append(e);
+			}
+		}
 		if (element.getStaticPseudoInstances().length > 0) {
-			sb.append("\nStatic Pseudoinstances:\n ");
-			Activator.join(sb, element.getStaticPseudoInstances(), "\n ");
+			sb.append("\nStatic Pseudoinstances:\n  ");
+			Activator.join(sb, element.getStaticPseudoInstances(), "\n  ");
 		}
 
 		if (element.getCSSClass() != null) {
-			sb.append("\n\nCSS Classes:\n ");
-			Activator.join(sb, element.getCSSClass().split(" +"), "\n ");
+			sb.append("\n\nCSS Classes:\n  ");
+			Activator.join(sb, element.getCSSClass().split(" +"), "\n  ");
 		}
 
 		// FIXME: shouldn't this be getCSSStyle?
 		if (element.getAttribute("style") != null) {
-			sb.append("\n\nSWT Style Bits:\n ");
-			Activator
-					.join(sb, element.getAttribute("style").split(" +"), "\n ");
+			sb.append("\n\nSWT Style Bits:\n  ");
+			Activator.join(sb, element.getAttribute("style").split(" +"),
+					"\n  ");
 		}
 
-		CSSEngine engine = getCSSEngine(element);
-		CSSStyleDeclaration decl = engine.getViewCSS().getComputedStyle(
-				element, null);
-		if (decl != null) {
-			sb.append("\n\nCSS Rules:\n");
-			try {
-				if (decl != null) {
-					sb.append(decl.getCssText());
-				}
-			} catch (Throwable e) {
-				sb.append(e);
-			}
-		}
-		cssRules.setText(sb.toString());
+		sb.append("\n\nCSS Class Element:\n  ").append(
+				element.getClass().getName());
+
+		cssRules.setText(sb.toString().trim());
 
 		disposeHighlights();
 		highlightWidget(selected);