Changeset 133 for trunk/src/org/expeditee/items/Item.java

Timestamp:

07/10/08 15:50:20 (16 years ago)

Author:

ra33

Message:

Turned search actions into search agents so they are run on a different thread

File:

• trunk/src/org/expeditee/items/Item.java (modified) (4 diffs)

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

@@ -1890 +1890 @@
         }
 
+        public boolean hasAction() {
+                return _actions != null && _actions.size() > 0;
+        }
+        
         public void setAction(String action) {
                 // Want to resize the highlight box for text items if actions are been
@@ -1922 +1926 @@
          */
         protected void paintLink(Graphics2D g) {
-                if (getLink() != null || getAction() != null) {
+                boolean hasLink = getLink() != null;
+                boolean hasAction = hasAction();
+                
+                if (hasLink || hasAction) {
                         g.setStroke(HIGHLIGHT_STROKE);
-                        if (getLink() != null && getAction() != null) {
+                        if (hasLink && hasAction) {
                                 g.setColor(LINK_ACTION_COLOR);
-                        } else if (getLink() != null) {
+                        } else if (hasLink) {
                                 g.setColor(LINK_COLOR);
-                        } else if (getAction() != null) {
+                        } else if (hasAction) {
                                 g.setColor(ACTION_COLOR);
                         }
@@ -1945 +1952 @@
                         }
 
-                        if (getActionMark() && getAction() != null) {
+                        if (getActionMark() && hasAction()) {
                                 g.drawPolygon(getLinkPoly());
                                 g.fillPolygon(getLinkPoly());
@@ -2084 +2091 @@
                 return box.getWidth() * box.getHeight();
         }
-        
-        public int getEnclosureID(){
-                return _enclosure.hashCode();
+
+        public int getEnclosureID() {
+                return _enclosure == null ? 0 : _enclosure.hashCode();
         }