Changeset 1954

Timestamp:

08/17/07 06:56:35 (1 year ago)

Author:

arj..@yirdis.nl

Message:

added create/delete package option to tree view.

Files:

• gaphor/trunk/gaphor/UML/properties.py (modified) (5 diffs)
• gaphor/trunk/gaphor/ui/mainwindow.py (modified) (7 diffs)
• gaphor/trunk/gaphor/ui/tests/test_namespace.py (modified) (5 diffs)

gaphor/trunk/gaphor/UML/properties.py

@@ -451 +451 @@
-        raise ValueError, 'Derivedunion: Properties should not be loaded in a derived union %s: %s' % (self.name, value)
-
+
-    def save(self, obj, save_func):
-        pass
-
+
-    def __str__(self):
-        return '<derivedunion %s: %s>' % (self.name, str(map(str, self.subsets))[1:-1])
+
-
-    def _get(self, obj):
@@ -481 +484 @@
-                return u and u[0] or None
-
+
-    def _set(self, obj, value):
-        raise AttributeError, 'Can not set values on a union'
-
+
-    def _del(self, obj, value=None):
-        raise AttributeError, 'Can not delete values on a union'
+
-
-    @component.adapter(IAssociationChangeEvent)
@@ -521 +527 @@
-    lower = property(lambda s: s.original.lower)
-
+
-    def load(self, obj, value):
-        if self.original.name == self.name:
-            self.original.load(obj, value)
-
+
-    def save(self, obj, save_func):
-        if self.original.name == self.name:
-            self.original.save(obj, save_func)
-
+
-    def __str__(self):
-        return '<redefine %s: %s = %s>' % (self.name, self.type.__name__, str(self.original))
+
-
-    def __get__(self, obj, class_=None):
@@ -538 +548 @@
-        return self.original.__get__(obj, class_)
-
+
-    def __set__(self, obj, value):
-        # No longer needed
@@ -544 +555 @@
-        self.original.__set__(obj, value)
-
+
-    def __delete__(self, obj, value=None):
-        # No longer needed
-        self.original.__delete__(obj, value)
-
+
-    def _get(self, obj):
-        return self.original._get(obj)
-
+
-    def _set(self, obj, value, from_opposite=False):
-        return self.original._set(obj, value, from_opposite)
-
+
-    def _del(self, obj, value, from_opposite=False):
-        return self.original._del(obj, value, from_opposite)
+
-
-    @component.adapter(IAssociationChangeEvent)

gaphor/trunk/gaphor/ui/mainwindow.py

@@ -10 +10 @@
-
-from gaphor import UML
-
+, transactional
-from namespace import NamespaceModel, NamespaceView
-from diagramtab import DiagramTab
@@ -63 +63 @@
-          <menu action="diagram">
-            <menuitem action="tree-view-create-diagram" />
+            <menuitem action="tree-view-create-package" />
+            <separator />
-            <menuitem action="tree-view-delete-diagram" />
+            <menuitem action="tree-view-delete-package" />
-            <separator />
-            <placeholder name="primary" />
@@ -94 +97 @@
-          <separator />
-          <menuitem action="tree-view-create-diagram" />
+          <menuitem action="tree-view-create-package" />
+          <separator />
-          <menuitem action="tree-view-delete-diagram" />
+          <menuitem action="tree-view-delete-package" />
-          <separator />
-          <menuitem action="tree-view-refresh" />
@@ -403 +409 @@
-        element = view.get_selected_element()
-        self.action_group.get_action('tree-view-create-diagram').props.sensitive = isinstance(element, UML.Package)
+        self.action_group.get_action('tree-view-create-package').props.sensitive = isinstance(element, UML.Package)
+
+        self.action_group.get_action('tree-view-delete-diagram').props.visible = isinstance(element, UML.Diagram)
+        self.action_group.get_action('tree-view-delete-package').props.visible = isinstance(element, UML.Package) and not element.presentation
+
-        self.action_group.get_action('tree-view-open').props.sensitive = isinstance(element, UML.Diagram)
-
@@ -480 +491 @@
-
-    @action(name='tree-view-create-diagram', label=_('_New diagram'), stock_id='gaphor-diagram')
+    @transactional
-    def tree_view_create_diagram(self):
-        element = self._tree_view.get_selected_element()
@@ -492 +504 @@
-
-    @action(name='tree-view-delete-diagram', label=_('_Delete diagram'), stock_id='gtk-delete')
+    @transactional
-    def tree_view_delete_diagram(self):
-        diagram = self._tree_view.get_selected_element()
@@ -506 +519 @@
-        m.destroy()
-
+    @action(name='tree-view-create-package', label=_('New _package'), stock_id='gaphor-package')
+    @transactional
+    def tree_view_create_package(self):
+        element = self._tree_view.get_selected_element()
+        package = self.element_factory.create(UML.Package)
+        package.package = element
+
+        package.name = '%s package' % element.name
+
+        self.select_element(package)
+        self.tree_view_rename_selected()
+
+    @action(name='tree-view-delete-package', label=_('Delete pac_kage'), stock_id='gtk-delete')
+    @transactional
+    def tree_view_delete_package(self):
+        package = self._tree_view.get_selected_element()
+        assert isinstance(package, UML.Package)
+        package.unlink()
+
-    @action(name='tree-view-refresh', label=_('_Refresh'))
-    def tree_view_refresh(self):

gaphor/trunk/gaphor/ui/tests/test_namespace.py

@@ -1 +1 @@
-# vim:sw=4:et:ai
-
-
+
-import gaphor.UML as UML
-from gaphor.ui.namespace import NamespaceModel
+from gaphor.application import Application
-
-
+
+
+
-
-    def test_all(self):
-
+
+
+
-
-        m = factory.create(UML.Package)
@@ -42 +47 @@
-        assert e.namespace is b
-
-
-
-
-
+
+
-
-        print '---'
+        print ns.root
-        ns.dump()
-        assert ns.path_from_element(m) == (0,)
@@ -56 +60 @@
-        assert ns.path_from_element(e) == (0, 0, 0, 1)
-
+        return
+
+
-        print '--- del.b.ownedClassifier[c]'
-        del b.ownedClassifier[c]
@@ -63 +70 @@
-        assert ns.path_from_element(b) == (0, 0, 0)
-        assert ns.path_from_element(d) == (0, 0, 1)
-
+, ns.path_from_element(e)
-        try:
-            ns.path_from_element(c)
@@ -110 +117 @@
-        print UML.Package.ownedClassifier
-
+if __name__ == '__main__':
+    import unittest
+    unittest.main()