solved many bugs

Author: Mar

Colladia/app/src/main/java/com/ia04nf28/colladia/DrawActivity.java

@@ -105,9 +105,7 @@ public void selectDrawerItem(MenuItem item)
 
             default:
                 Element newElement = ElementFactory.createElement(getApplicationContext(), item.getTitle().toString());
-
                 if (newElement != null) colladiaView.insertNewElement(newElement);
-
                 drawer.closeDrawers();
                 break;
         }

Colladia/app/src/main/java/com/ia04nf28/colladia/DrawColladiaView.java

@@ -369,7 +369,8 @@ private void startTouch(float x, float y)
         // Deselect previous selected element
         if(prevSelected != null)
         {
-            Manager.instance(applicationCtx).deselectElement(prevSelected);
+            if(Manager.instance(applicationCtx).getCurrentDiagram().getListElement().containsKey(prevSelected.getId()))
+                Manager.instance(applicationCtx).deselectElement(prevSelected);
             prevSelected = null;
         }
 
@@ -529,8 +530,8 @@ private void upTouch(float x, float y)
             case LINK:
                 Anchor elemAnchor = getTouchedAnchor(currAbsolutePoint);
 
-                // Valid anchor found
-                if(elemAnchor != null && startAnchor != elemAnchor)
+                // Valid anchor found and cannot connect anchor on same element
+                if(elemAnchor != null && startAnchor != elemAnchor && (!startAnchor.getIdParent().equals(elemAnchor.getIdParent()) || startAnchor.getIdParent().equals(Anchor.NO_PARENT)))
                 {
                     // Remove previous link
                     if(linkedTo != null) //linkedTo.linkTo(null);

Colladia/app/src/main/java/com/ia04nf28/colladia/model/Elements/Anchor.java

@@ -141,20 +141,25 @@ public Anchor(String serializedAnchor, final ObservableMap<String, Element> list
             }
 
             if(!this.getIdParentLink().equals(NO_PARENT) && this.getPositionLink() != NONE && listElement.containsKey(this.getIdParentLink())){//it is an anchor fixed to an element that is referenced
-
                 // Anchor was already connected
                 if(this.getLink() != null && !this.getIdParentLink().equals(this.getLink().getIdParent())){
                     // Remove link to current anchor from the other one
-                    this.getLink().setIdParentLink(NO_PARENT);
-                    this.getLink().setPositionLink(NONE);
-                    this.getLink().setLink(null);
+                    this.getLink().disconnect();
+                }
+
+                //if the anchor to connect to was already connected then ask its old anchor partner to disconnect
+                Anchor linkToThisAnchor = listElement.get(this.getIdParentLink()).getAnchor(this.getPositionLink());
+                if(linkToThisAnchor.getLink()!=null && !linkToThisAnchor.getIdParentLink().equals(NO_PARENT) && linkToThisAnchor.getPositionLink() != NONE) {
+                    linkToThisAnchor.getLink().disconnect();
                 }
 
                 // Connect to new anchor
-                this.setLink(listElement.get(this.getIdParentLink()).getAnchor(this.getPositionLink()));
+                this.setLink(linkToThisAnchor);
 
                 if(this.getLink().getLink() == null || this.getLink().getLink() != this.getLink()){//condition fulfilled if the anchor referenced has to get a reference of this one
-                    this.getLink().setLink(this.getLink());
+                    this.getLink().setIdParentLink(getIdParent());
+                    this.getLink().setPositionLink(getPosition());
+                    this.getLink().setLink(this);
                 }
 
 
@@ -164,15 +169,9 @@ else if(this.getIdParentLink().equals(NO_PARENT) && this.getPositionLink() == NO
 
                 if(this.getLink() != null)
                 {
-                    this.getLink().setPositionLink(NONE);
-                    this.getLink().setIdParentLink(NO_PARENT);
-                    this.getLink().setLink(null);
+                    this.getLink().disconnect();
                 }
-
                 this.setLink(null);
-               /* if(jsonAnchor.has(JSON_LINK) && !jsonAnchor.getString(JSON_LINK).equals("")){//it is a mobile anchor that is referenced
-                    this.setLink(new Anchor(jsonAnchor.getString(JSON_LINK), listElement));
-                }*/
             }
 
         } catch (JSONException e) {
@@ -340,13 +339,21 @@ public void setIdParent(String idParent) {
     }
 
     public void reset() {
-        if(link != null)
+        if(this.getLink() != null)
         {
-            link.setPositionLink(NONE);
-            link.setIdParentLink(NO_PARENT);
-            link.setLink(null);
+            this.getLink().setPositionLink(NONE);
+            this.getLink().setIdParentLink(NO_PARENT);
+            this.getLink().setLink(null);
         }
 
+        this.setPositionLink(NONE);
+        this.setIdParentLink(NO_PARENT);
+        this.setLink(null);
+    }
+
+    private void disconnect(){
+        this.setPositionLink(NONE);
+        this.setIdParentLink(NO_PARENT);
         this.setLink(null);
     }
 }

Colladia/app/src/main/java/com/ia04nf28/colladia/model/Manager.java

@@ -69,7 +69,7 @@ public void run() {
         };
     }
     private final static long delayRequestDiagrams = 1000;
-    private final static long delayRequestElements = 100;
+    private final static long delayRequestElements = 1000;
 
 
     private final static String STATUS_FIELD = "status";
@@ -431,7 +431,7 @@ public void onResponse(String s) {
             }
         });
     }
-    public void removeElement(final Element newElement) {
+    public void removeElement(Element newElement) {
         // get diagrams list
         Requestator.instance(this.context).deleteElement(getCurrentDiagram().getName(), newElement.getId(), lastClock, new Response.Listener<String>() {
             @Override