Changeset 336

Timestamp:

06/03/04 14:27:07 (5 years ago)

Author:

wrobell

Message:

- added support for moving up/down operations and attributes

Files:

• trunk/gaphor/gaphor/UML/collection.py (modified) (3 diffs)
• trunk/gaphor/gaphor/diagram/attribute.py (modified) (2 diffs)
• trunk/gaphor/gaphor/diagram/itemactions.py (modified) (1 diff)
• trunk/gaphor/gaphor/diagram/klass.py (modified) (6 diffs)
• trunk/gaphor/gaphor/diagram/operation.py (modified) (1 diff)

trunk/gaphor/gaphor/UML/collection.py

@@ -61 +61 @@
-            raise AttributeError, '%s not in collection' % value
-
-    def moveUp(self, value):
-        items = self.items
-        i = items.index(value)
-        i = i - 1
-        if i >= 0:
-            items.remove(value)
-            items.insert(i, value)
-        # Send a notification that this list has changed
-        print self.property, value
-        self.property.notify(self.object)
-        #self.owner.notify(self.property.name, pspec=self.property)
-
-    def index(self, key):
@@ -77 +66 @@
-        collection."""
-        return self.items.index(key)
-
+
+
-    # OCL members (from SMW by Ivan Porres, http://www.abo.fi/~iporres/smw)
-
@@ -200 +190 @@
-                    c=c-1
-        return False
+
+
+    def moveUp(self, value):
+        """
+        Move element up. Owner is notified about the change.
+        """
+        i1 = self.items.index(value)
+        i2 = i1 - 1
+        if i2 >= 0:
+            self.items[i1], self.items[i2] = self.items[i2], self.items[i1]
+            self.property.notify(self.object) # send a notification that this list has changed
+        else:
+            log.warning('Cannot move up first element')
+
+
+    def moveDown(self, value):
+        """
+        Move element down. Owner is notified about the change.
+        """
+        i1 = self.items.index(value)
+        i2 = i1 + 1
+        if i2 < len(self.items):
+            self.items[i1], self.items[i2] = self.items[i2], self.items[i1]
+            self.property.notify(self.object) # send a notification that this list has changed
+        else:
+            log.warning('Cannot move down last element')

trunk/gaphor/gaphor/diagram/attribute.py

@@ -15 +15 @@
-        'DeleteAttribute',
-        'MoveUp',
+        'MoveDown',
-        'separator',
-
+,
-    )
-
@@ -45 +46 @@
-    on_subject_notify__taggedValue_value = on_subject_notify__name
-
+
-initialize_item(AttributeItem)

trunk/gaphor/gaphor/diagram/itemactions.py

@@ -616 +616 @@
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-    id = 'MoveUp'
-    label = 'Move Up'
-    tooltip = 'Move Up'
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
-
-register_action(MoveUpAction, 'ItemFocus')
+            
+
+class MoveDownAction(MoveAction):
+    id = 'MoveDown'
+    label = 'Move Down'
+    tooltip = 'Move Down'
+    move_action = 'moveDown' # name of method to move the element
+
+    def _isSensitive(self, cls, item):
+        collection = self._getElements(cls, item)
+        return len(collection) > 0 and collection[-1] != item.subject
+
+register_action(MoveDownAction, 'ItemFocus')

trunk/gaphor/gaphor/diagram/klass.py

@@ -41 +41 @@
-            save_func(None, item)
-
-    def reorder(self, features):
-        """Reorder the items in this compartment so they have the same
-        order as the items in the features list.
-        """
-        items = list(self)
-        tmp = [(item.subject, item) for item in self]
-        newlist = []
-        for f in features:
-            for t in tmp:
-                if t[0] is f:
-                    newlist.append(t[1])
-                    tmp.remove(t)
-                    break
-        if newlist != items:
-            print self[:]
-            print 'new list', newlist
-            self[:] = newlist
-            self.owner.request_update()
-
-    def pre_update(self, width, height, affine):
@@ -137 +119 @@
-        self._stereotype.set_text(STEREOTYPE_OPEN + 'stereotype' + STEREOTYPE_CLOSE)
-
+
-    def save(self, save_func):
-        # Store the show- properties *before* the width/height properties,
@@ -184 +167 @@
-        self.add(new)
-        
-features(self, feature
+uml_elements(self, element
-        """Common function for on_subject_notify__ownedAttribute() and
-        on_subject_notify__ownedOperation().
-feature
+element
-        - compartment: our local representation
-        - creator: factory method for creating new attr. or oper.'s
-        """
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
-    def sync_attributes(self):
@@ -212 +207 @@
-        """
-        owned_attributes = [a for a in self.subject.ownedAttribute if not a.association]
-feature
+uml_element
-                           self._create_attribute)
-
@@ -219 +214 @@
-        in self.subject.
-        """
-feature
+uml_element
-                           self._create_operation)
-
-    def on_subject_notify(self, pspec, notifiers=()):
-#
+
-        NamedItem.on_subject_notify(self, pspec, ('ownedAttribute', 'ownedOperation', 'isAbstract'))
-        # Create already existing attributes and operations:
@@ -240 +235 @@
-        """Called when the ownedAttribute property of our subject changes.
-        """
-#
+
-        # Filter attributes that are connected to an association:
-        self.sync_attributes()

trunk/gaphor/gaphor/diagram/operation.py

@@ -16 +16 @@
-        'DeleteOperation',
-        'MoveUp',
+        'MoveDown',
-        'separator',
-        'CreateOperation'