Changeset 286 for trunk/src/org/expeditee/items

Timestamp:

08/29/08 08:17:54 (16 years ago)

Author:

ra33

Message:

 

Location:

trunk/src/org/expeditee/items

Files:

• Item.java (modified) (5 diffs)
• ItemUtils.java (modified) (1 diff)
• Text.java (modified) (1 diff)
• widgets/DataFrameWidget.java (modified) (2 diffs)
• widgets/InteractiveWidget.java (modified) (2 diffs)
• widgets/charts/TimeSeries.java (modified) (1 diff)

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

@@ -192 +192 @@
                 dest._overlay = source._overlay;
                 dest._mode = source._mode;// SelectedMode.None;
+                //dest._highlightColor = source._highlightColor;
+                //dest.setHighlight(source.getHighlight());
+                
                 dest._visible = source._visible;
                 Frame parent = source.getParentOrCurrentFrame();
@@ -234 +237 @@
 
         private int _id;
+
+        private Item _editTarget = this;
 
         private String _creationDate = null;
@@ -1831 +1836 @@
 
         public int setHighlightColor(Color c) {
+                if (!this.isVisible() && this.hasVector()) {
+                        for (Item i : this.getParentOrCurrentFrame().getVectorItems()) {
+                                if (i.getEditTarget() == this) {
+                                        i.setHighlightColor(c);
+                                }
+                        }
+                }
 
                 _highlightThickness = DEFAULT_HIGHLIGHT_THICKNESS;
@@ -1890 +1902 @@
         public void setHighlightMode(HighlightMode mode, Color color) {
                 setHighlightColor(color);
-                if (hasPermission(Permission.followLinks)) {
+                if (hasPermission(Permission.followLinks)
+                                || getEditTarget().hasPermission(Permission.followLinks)) {
                         if (_mode != mode) {
                                 _mode = mode;
@@ -2666 +2679 @@
                 }
         }
+
+        /**
+         * Sets the item to be pickup when the user attempts to pick this item up.
+         * EditTarget has a value of 'this' by default but may be set to other
+         * values if this item is on a vector.
+         * 
+         * @param target
+         *            the item to be copied or picked up when the user attempts to
+         *            edit this item.
+         */
+        public void setEditTarget(Item target) {
+                _editTarget = target;
+        }
+
+        public Item getEditTarget() {
+                return _editTarget;
+        }
 }

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

@@ -457 +457 @@
 
                 for (Item i : toCopy) {
-
+                        //Dont copy parts of a vector
+                        if(!i.hasPermission(Permission.copy))
+                                continue;
+                        
                         // BROOK
                         if (i instanceof WidgetCorner) { // dont add these

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

@@ -275 +275 @@
 
         public void setAttributeValue(String value) {
-
+                AttributeValuePair avp = new AttributeValuePair(getText(),false);
+                avp.setValue(value);
+                setText(avp.toString());
         }
 

trunk/src/org/expeditee/items/widgets/DataFrameWidget.java

@@ -1 +1 @@
 package org.expeditee.items.widgets;
 
+import java.awt.Color;
+import java.awt.Graphics;
 import java.util.Collection;
 import java.util.HashSet;
 
 import javax.swing.JComponent;
-import javax.swing.JPanel;
 
 import org.expeditee.gui.Frame;
@@ -131 +132 @@
                 }
         }
-        
-        //STUFF FROM HEAVY_DUTY_INTERACTIVE_WIDGET CLASS
-        
-//      @Override
-//      public int getLoadDelayTime() {
-//              // TODO Auto-generated method stub
-//              return 0;
-//      }
-//
-//      @Override
-//      protected float loadWidgetData() {
-//              // TODO Auto-generated method stub
-//              return 0;
-//      }
-//
-//      @Override
-//      protected void saveWidgetData() {
-//              // TODO Auto-generated method stub
-//              
-//      }
-//
-//      @Override
-//      protected void tempUnloadWidgetData() {
-//              // TODO Auto-generated method stub
-//              
-//      }
-//
-//      @Override
-//      protected void unloadWidgetData() {
-//              // TODO Auto-generated method stub
-//              
-//      }
-//
-//      public boolean doesNeedSaving() {
-//              // TODO Auto-generated method stub
-//              return false;
-//      }
-//
-//      public String getSaveName() {
-//              // TODO Auto-generated method stub
-//              return null;
-//      }
+
+        protected void paintInFreeSpace(Graphics g) {
+                super.paintInFreeSpace(g);
+                g.setFont(((Text)getSource()).getFont());
+                g.setColor(Color.WHITE);
+                g.drawString(this.getClass().getSimpleName(), getX() + 10, getY() + 20);
+
+        }
 }

trunk/src/org/expeditee/items/widgets/InteractiveWidget.java

@@ -19 +19 @@
 import javax.swing.SwingUtilities;
 
-import org.expeditee.gui.AttributeUtils;
+import org.expeditee.actions.Actions;
 import org.expeditee.gui.Browser;
 import org.expeditee.gui.DisplayIO;
@@ -184 +184 @@
                 String classname = tokens[0];
                 if (classname.charAt(0) == '$')
-                        classname = "org.expeditee.items.widgets." + classname.substring(1);
+                        classname = Actions.getClassName(classname.substring(1));
                 // Attempt to locate the class using reflection
                 Class<?> iwclass = findIWidgetClass(classname);

trunk/src/org/expeditee/items/widgets/charts/TimeSeries.java

@@ -211 +211 @@
                                 .length()) {
                         df = new SimpleDateFormat(FrameKeyboardActions.LONG_DATE_FORMAT);
-                } else {
+                } else if (dateString.length() <= FrameKeyboardActions.TIME_DATE_FORMAT.length()) {
+                        df = new SimpleDateFormat(FrameKeyboardActions.TIME_DATE_FORMAT);
+                }else {
                         df = new SimpleDateFormat(FrameKeyboardActions.SHORT_DATE_FORMAT);
                 }