Changeset 247 for trunk/src/org/expeditee/gui/Frame.java

Timestamp:

08/22/08 10:54:44 (16 years ago)

Author:

ra33

Message:

Added more import and mail stuff... including text importer

File:

• trunk/src/org/expeditee/gui/Frame.java (modified) (8 diffs)

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

@@ -584 +584 @@
 
                 if (_body.size() > 0)
-                        refreshItemPermissions();
+                        refreshItemPermissions(permission);
         }
 
@@ -658 +658 @@
          *            The Item to add to this Frame.
          */
-        public void addItem(Item item){
+        public void addItem(Item item) {
                 addItem(item, true);
         }
-        
+
         public void addItem(Item item, boolean recalculate) {
                 if (item == null || item.equals(_frameName) || _body.contains(item))
@@ -756 +756 @@
         }
 
-        public void removeItem(Item item){
+        public void removeItem(Item item) {
                 removeItem(item, true);
         }
-        
+
         public void removeItem(Item item, boolean recalculate) {
                 // If an annotation is being deleted clear the annotation list
@@ -1279 +1279 @@
                                         ItemParentStateChangedEvent.EVENT_TYPE_ADDED_VIA_OVERLAY,
                                         permission));
-                        i.setPermission(permission);
+                        //i.setPermission(permission);
                         _overlayItems.add(i);
                 }
@@ -1421 +1421 @@
                                 getNextItemID());
 
-                Item template = getTemplate(UserSettings.LineTemplate,
-                                ItemUtils.TAG_LINE_TEMPLATE);
+                Item template = getTemplate(UserSettings.DotTemplate,
+                                ItemUtils.TAG_DOT_TEMPLATE);
                 float thickness = template.getThickness();
                 if (thickness > 0)
@@ -1429 +1429 @@
                         dot.setLinePattern(template.getLinePattern());
                 dot.setColor(template.getColor());
+                dot.setFillColor(template.getFillColor());
                 // reset attributes
                 dot.setParent(this);
@@ -1640 +1641 @@
          * 
          */
-        public void refreshItemPermissions() {
-                Permission permission = getPermission();
+        public void refreshItemPermissions(Permission maxPermission) {
+                Permission permission = Permission.min(maxPermission, getPermission());
                 _frameName.setPermission(permission);
 
@@ -1665 +1666 @@
                 }
 
+                for (Overlay o : getOverlays())
+                        o.Frame.refreshItemPermissions(o.permission);
+                
+                //Only update the permissions if we have to
+                if (_body.size() > 0 && permission.equals(_body.get(0)._permission))
+                        return;
+
                 for (Item i : _body) {
-                        i.setPermission(_permission);
-                }
+                        i.setPermission(permission);
+                }
+                
+
         }