Changeset 707

Timestamp:

01/16/14 15:31:50 (10 years ago)

Author:

jts21

Message:

Implement setting tooltip attributes

Location:

trunk/src/org/expeditee

Files:

• gui/AttributeUtils.java (modified) (4 diffs)
• gui/AttributeValuePair.java (modified) (2 diffs)
• io/DefaultFrameWriter.java (modified) (2 diffs)
• items/Item.java (modified) (6 diffs)
• items/XRayable.java (modified) (2 diffs)

trunk/src/org/expeditee/gui/AttributeUtils.java

@@ -266 +266 @@
                                                             Item.class.getMethod("setY", pFloat));
                         _Attrib.put("Tooltip",              Item.class.getMethod("getTooltip"),
-                                                            Item.class.getMethod("setTooltip", pString));
+                                                            Item.class.getMethod("setTooltips", pList));
                         
                         // Text Items
@@ -285 +285 @@
                         _Attrib.alias("d",                  "data");
                         _Attrib.alias("f",                  "formula");
+                        _Attrib.alias("font",               "family");
                         _Attrib.alias("s",                  "size");
                         _Attrib.alias("l",                  "link");
@@ -363 +364 @@
                                 try {
                                         String s = getValue(prop, a, toExtract, true);
-
                                         if (s == null)
                                                 continue;
@@ -573 +573 @@
                                         if (nextAvp.getAttribute().equals(avp.getAttribute())) {
                                                 // strip the attribute from next
-                                                avp.appendValue(nextAvp.getValue());
+                                                avp.appendValue(nextAvp.getValue() + "\n");
 
                                                 // if the attribute is not the same, then it may be a

trunk/src/org/expeditee/gui/AttributeValuePair.java

@@ -9 +9 @@
 
         public static final char VALUE_SEPARATOR_CHAR = ' ';
+        
+        public static final char VALUE_DELIM_CHAR = '\n';
 
         public static final String SEPARATOR_STRING = "" + SEPARATOR_CHAR
@@ -165 +167 @@
                         _value = new SString(value.trim());
                 else
-                        _value.parse(_value.stringValue() + VALUE_SEPARATOR_CHAR
+                        _value.parse(_value.stringValue() + VALUE_DELIM_CHAR
                                         + value.trim());
         }

trunk/src/org/expeditee/io/DefaultFrameWriter.java

@@ -69 +69 @@
                         _ItemTags.put("s", Item.class.getMethod("getDateCreated", param));
                         _ItemTags.put("d", Item.class.getMethod("getColor", param));
-                        _ItemTags.put("G", Item.class
-                                        .getMethod("getBackgroundColor", param));
+                        _ItemTags.put("G", Item.class.getMethod("getBackgroundColor", param));
                         _ItemTags.put("K", Item.class.getMethod("getBorderColor", param));
                         _ItemTags.put("H", Item.class.getMethod("getAnchorRight", param));
@@ -114 +113 @@
                         _ItemTags.put("a", Text.class.getMethod("getWordSpacing", param));
                         _ItemTags.put("b", Text.class.getMethod("getLetterSpacing", param));
-                        _ItemTags
-                                        .put("m", Text.class.getMethod("getInitialSpacing", param));
+                        _ItemTags.put("m", Text.class.getMethod("getInitialSpacing", param));
                         _ItemTags.put("w", Text.class.getMethod("getWidthToSave", param));
                         _ItemTags.put("k", Text.class.getMethod("getJustification", param));

trunk/src/org/expeditee/items/Item.java

@@ -16 +16 @@
 import java.awt.geom.Rectangle2D;
 import java.util.ArrayList;
+import java.util.Arrays;
 import java.util.Collection;
 import java.util.ConcurrentModificationException;
@@ -28 +29 @@
 import org.expeditee.actions.Misc;
 import org.expeditee.actions.Simple;
+import org.expeditee.gui.AttributeUtils;
 import org.expeditee.gui.AttributeValuePair;
 import org.expeditee.gui.DisplayIO;
@@ -158 +160 @@
         protected boolean _filled = true;
         
-        private String _tooltip = null;
+        private List<String> _tooltip = null;
         private static Text _tooltipItem = null;
         private static Item _tooltipOwner = null;
@@ -178 +180 @@
                 dest.setBorderColor(source.getBorderColor());
 
-                dest.setTooltip(source.getTooltip());
+                dest.setTooltips(source.getTooltip());
                 dest.setData(source.getData());
                 dest.setTag(source.getTag());
@@ -1130 +1132 @@
         public abstract void paint(Graphics2D g);
         
+        public void setTooltips(List<String> tooltips) {
+                if (tooltips == null || tooltips.size() == 0) {
+                        _tooltip = null;
+                } else {
+                        _tooltip = new LinkedList<String>(tooltips);
+                }
+        }
+        
         public void setTooltip(String tooltip) {
-                _tooltip = tooltip;
+                if(_tooltip == null || _tooltip.size() == 0) {
+                        _tooltip = new LinkedList<String>();
+                }
+                if(tooltip != null && tooltip.trim().length() > 0) {
+                        _tooltip.add(tooltip);
+                }
         }
         
-        public String getTooltip() {
+        public List<String> getTooltip() {
                 return _tooltip;
         }
@@ -1149 +1164 @@
                 // generate tooltip item
                 if(_tooltipItem == null) {
-                        String tooltip = getTooltip();
-                        if(tooltip != null && tooltip.trim().length() != 0) {
-                                _tooltipItem = (Text) getParentOrCurrentFrame().getTooltipTextItem(tooltip);
-                                _tooltipItem.setWidth(300);
+                        if(_tooltip != null && _tooltip.size() > 0) {
+                                StringBuffer tooltip = new StringBuffer();
+                                for(String t : _tooltip) {
+                                        tooltip.append(t).append("\n");
+                                }
+                                if(tooltip.length() > 0) {
+                                        tooltip.deleteCharAt(tooltip.length() - 1);
+                                }
+                                _tooltipItem = (Text) getParentOrCurrentFrame().getTooltipTextItem("");
+                                for(String s : _tooltip) {
+                                        // set text
+                                        if(s.trim().toLowerCase().startsWith("text") && s.contains(":")) {
+                                                _tooltipItem.appendLine(s.substring(s.indexOf(':') + 1).trim());
+                                        } else {
+                                                AttributeUtils.setAttribute(_tooltipItem, new Text(s));
+                                        }
+                                }
                         } else {
                                 return;

trunk/src/org/expeditee/items/XRayable.java

@@ -115 +115 @@
         
         @Override
+        public void setTooltips(List<String> tooltips) {
+                _source.setTooltips(tooltips);
+        }
+        
+        @Override
         public void setTooltip(String tooltip) {
                 _source.setTooltip(tooltip);
@@ -120 +125 @@
         
         @Override
-        public String getTooltip() {
+        public List<String> getTooltip() {
                 return _source.getTooltip();
         }