X-Git-Url: https://git.gag.com/?a=blobdiff_plain;f=core%2Fsrc%2Fnet%2Fsf%2Fopenrocket%2Fgui%2Fmain%2Fcomponenttree%2FComponentTreeRenderer.java;h=6fe9fe1d90a5787b0566acc0ef3f5e2233fb18cd;hb=6f7dc96930950de3c64bce6bcbb91a7e8f4903ee;hp=a7e8386ef6b354261a2eb9b69200eab30956de9b;hpb=8352b759283d2be93a5773b1fb4c030fd1e9b074;p=debian%2Fopenrocket
diff --git a/core/src/net/sf/openrocket/gui/main/componenttree/ComponentTreeRenderer.java b/core/src/net/sf/openrocket/gui/main/componenttree/ComponentTreeRenderer.java
index a7e8386e..6fe9fe1d 100644
--- a/core/src/net/sf/openrocket/gui/main/componenttree/ComponentTreeRenderer.java
+++ b/core/src/net/sf/openrocket/gui/main/componenttree/ComponentTreeRenderer.java
@@ -9,6 +9,7 @@ import javax.swing.tree.DefaultTreeCellRenderer;
import net.sf.openrocket.gui.main.ComponentIcons;
import net.sf.openrocket.rocketcomponent.RocketComponent;
+import net.sf.openrocket.unit.UnitGroup;
import net.sf.openrocket.util.TextUtil;
public class ComponentTreeRenderer extends DefaultTreeCellRenderer {
@@ -21,25 +22,38 @@ public class ComponentTreeRenderer extends DefaultTreeCellRenderer {
boolean expanded,
boolean leaf,
int row,
- boolean hasFocus) {
+ boolean hasFocus1) {
- super.getTreeCellRendererComponent(tree, value, sel, expanded, leaf, row, hasFocus);
+ super.getTreeCellRendererComponent(tree, value, sel, expanded, leaf, row, hasFocus1);
// Set icon
setIcon(ComponentIcons.getSmallIcon(value.getClass()));
// Set tooltip
RocketComponent c = (RocketComponent) value;
+ this.setToolTipText(getToolTip(c));
+
+ return this;
+ }
+
+
+ private String getToolTip(RocketComponent c) {
+ StringBuilder sb = new StringBuilder();
+ sb.append("");
+
+ sb.append("").append(c.getName()).append("");
+ if (c.isMassive()) {
+ sb.append(" (").append(UnitGroup.UNITS_MASS.toStringUnit(c.getMass())).append(")");
+ }
+
String comment = c.getComment().trim();
if (comment.length() > 0) {
comment = TextUtil.htmlEncode(comment);
- comment = "" + comment.replace("\n", "
");
- this.setToolTipText(comment);
- } else {
- this.setToolTipText(null);
+ comment = comment.replace("\n", "
");
+ sb.append("
").append(comment);
}
- return this;
+ return sb.toString();
}
}