change relation.appendMember to use the undo system, and update various places as...

diff --git a/net/systemeD/halcyon/connection/Relation.as b/net/systemeD/halcyon/connection/Relation.as
index 46688b0c39a9fc58178d3a64dd70280011eea1f0..4d0d6cbc2b3aaa490edfe09043ac2f08f3634e36 100644 (file)
--- a/net/systemeD/halcyon/connection/Relation.as
+++ b/net/systemeD/halcyon/connection/Relation.as
@@ -79,13 +79,9 @@ package net.systemeD.halcyon.connection {
             performAction(new AddMemberToRelationAction(this, index, member, members));
         }
 
             performAction(new AddMemberToRelationAction(this, index, member, members));
         }
 

-        public function appendMember(member:RelationMember):uint {
-            members.push(member);
-                       member.entity.addParent(this);
-                       markDirty();
-
-                       dispatchEvent(new RelationMemberEvent(Connection.RELATION_MEMBER_ADDED, member.entity, this, members.length-1));
-            return members.length;
+        public function appendMember(member:RelationMember, performAction:Function):uint {
+            performAction(new AddMemberToRelationAction(this, -1, member, members));
+            return members.length + 1;

         }
 
                public function removeMember(entity:Entity, performAction:Function):void {
         }
 
                public function removeMember(entity:Entity, performAction:Function):void {

diff --git a/net/systemeD/halcyon/connection/actions/AddMemberToRelationAction.as b/net/systemeD/halcyon/connection/actions/AddMemberToRelationAction.as
index 7312038a50decdff6fdb4c7cd1e100f7a66a37f6..b41cfde8409e15f199c489c5c681371aa4f31399 100644 (file)
--- a/net/systemeD/halcyon/connection/actions/AddMemberToRelationAction.as
+++ b/net/systemeD/halcyon/connection/actions/AddMemberToRelationAction.as
@@ -8,7 +8,7 @@ package net.systemeD.halcyon.connection.actions {
         private var member:RelationMember;
         private var memberList:Array;
         
         private var member:RelationMember;
         private var memberList:Array;
         

-        public function AddMemberToRelationAction(rel:Relation, index:uint, member:RelationMember, memberList:Array) {
+        public function AddMemberToRelationAction(rel:Relation, index:int, member:RelationMember, memberList:Array) {

             super(rel, "Add " + member.entity.getType() + " " + member.entity.id + " at position " + index + " to ");
             this.rel = rel;
             this.index = index;
             super(rel, "Add " + member.entity.getType() + " " + member.entity.id + " at position " + index + " to ");
             this.rel = rel;
             this.index = index;

diff --git a/net/systemeD/halcyon/connection/actions/MergeWaysAction.as b/net/systemeD/halcyon/connection/actions/MergeWaysAction.as
index da2117db47557cfce74bbe5ef0c19f63cc2b6cca..104362fc14f2ce0f705a8dd869dff31720213114 100644 (file)
--- a/net/systemeD/halcyon/connection/actions/MergeWaysAction.as
+++ b/net/systemeD/halcyon/connection/actions/MergeWaysAction.as
@@ -46,7 +46,7 @@ package net.systemeD.halcyon.connection.actions {
                        for each (var r:Relation in way2.parentRelations) {
                                // ** needs to copy roles as well
                                if (r.findEntityMemberIndex(way1)==-1) {
                        for each (var r:Relation in way2.parentRelations) {
                                // ** needs to copy roles as well
                                if (r.findEntityMemberIndex(way1)==-1) {

-                                       r.appendMember(new RelationMember(way1, ''));
+                                       r.appendMember(new RelationMember(way1, ''), push);

                                }
                        }
         }
                                }
                        }
         }

diff --git a/net/systemeD/potlatch2/RelationSelectPanel.mxml b/net/systemeD/potlatch2/RelationSelectPanel.mxml
index ea3712a87e542a13129adbcf3675125a207d7a33..574ba41acc096dcb8b05ac25ea5193b3384d7240 100644 (file)
--- a/net/systemeD/potlatch2/RelationSelectPanel.mxml
+++ b/net/systemeD/potlatch2/RelationSelectPanel.mxml
@@ -41,7 +41,7 @@
         
         public function updateEntityAndClose():void {
           var relation:Relation = conn.getRelation(relationSelector.selectedItem.relId);
         
         public function updateEntityAndClose():void {
           var relation:Relation = conn.getRelation(relationSelector.selectedItem.relId);

-          relation.appendMember(new RelationMember(entity, ''));
+          relation.appendMember(new RelationMember(entity, ''), MainUndoStack.getGlobalStack().addAction);

           PopUpManager.removePopUp(this);
         }
         
           PopUpManager.removePopUp(this);
         }
         

diff --git a/net/systemeD/potlatch2/TagViewer.mxml b/net/systemeD/potlatch2/TagViewer.mxml
index 2b9b29359bbbc66c3f16c0b76854b2f152beb1cc..d40a1d59a1fd3232e762c178cc6400b579476cac 100644 (file)
--- a/net/systemeD/potlatch2/TagViewer.mxml
+++ b/net/systemeD/potlatch2/TagViewer.mxml
@@ -537,6 +537,7 @@
           
           var conn:Connection = Connection.getConnectionInstance();
           var rel:Relation = selectedEntity as Relation
           
           var conn:Connection = Connection.getConnectionInstance();
           var rel:Relation = selectedEntity as Relation

+          var action:CompositeUndoableAction = new CompositeUndoableAction("Rearrange relation members for "+rel);

           
           // drop members
           for (var i:int=rel.length-1 ; i>=0; i--) {
           
           // drop members
           for (var i:int=rel.length-1 ; i>=0; i--) {


@@ -554,8 +555,9 @@
             } else if (memberObject.type == 'relation') {
               e = conn.getRelation(id);
             }
             } else if (memberObject.type == 'relation') {
               e = conn.getRelation(id);
             }

-            rel.appendMember(new RelationMember(e, memberObject.role));
+            rel.appendMember(new RelationMember(e, memberObject.role), action.push);

           }
           }

+          MainUndoStack.getGlobalStack().addAction(action);

       }
       
       private function editRelation(id:Number):void {
       }
       
       private function editRelation(id:Number):void {

diff --git a/net/systemeD/potlatch2/mapfeatures/editors/RelationMemberEditor.as b/net/systemeD/potlatch2/mapfeatures/editors/RelationMemberEditor.as
index 92ce619a84695db9f56f54c98397482ef6579a6a..9b350528a4ba8ad4ff7df8a71ab21fe490b1ba73 100644 (file)
--- a/net/systemeD/potlatch2/mapfeatures/editors/RelationMemberEditor.as
+++ b/net/systemeD/potlatch2/mapfeatures/editors/RelationMemberEditor.as
@@ -53,7 +53,7 @@ package net.systemeD.potlatch2.mapfeatures.editors {
       
       public function addMember(relation:Relation, role:String):void {
           if (_entity != null && !_entity.hasParent(relation))
       
       public function addMember(relation:Relation, role:String):void {
           if (_entity != null && !_entity.hasParent(relation))

-              relation.appendMember(new RelationMember(_entity, role));
+              relation.appendMember(new RelationMember(_entity, role), MainUndoStack.getGlobalStack().addAction);

       }
 
       public function set factory(factory:RelationMemberEditorFactory):void {
       }
 
       public function set factory(factory:RelationMemberEditorFactory):void {

diff --git a/net/systemeD/potlatch2/mapfeatures/editors/TurnRestrictionIcon.mxml b/net/systemeD/potlatch2/mapfeatures/editors/TurnRestrictionIcon.mxml
index 378d89b7cdec22e76a5030e09c607b015af5e2d9..943a41c9c6080738697a9f9bf2e44e4c586c5ad1 100644 (file)
--- a/net/systemeD/potlatch2/mapfeatures/editors/TurnRestrictionIcon.mxml
+++ b/net/systemeD/potlatch2/mapfeatures/editors/TurnRestrictionIcon.mxml
@@ -106,11 +106,11 @@
                for each (var memberEntity:Entity in old) {
                        rel.removeMember(memberEntity, undo.push);
                }
                for each (var memberEntity:Entity in old) {
                        rel.removeMember(memberEntity, undo.push);
                }

-               undo.doAction();

 
                // now add new entity
 
                // now add new entity

-               // ** FIXME - appendMember should be undoable
-               rel.appendMember(new RelationMember(entity,role))
+               rel.appendMember(new RelationMember(entity,role), undo.push);
+
+        undo.doAction();

 
                if (show.label=='Hide') { setHighlights(true); }
        }
 
                if (show.label=='Hide') { setHighlights(true); }
        }