Changeset 302

Timestamp:

Jul 21, 2004, 10:13:14 AM (19 years ago)

Author:

per

Message:

element_type (String) null test in DataConnection?.getElement.

Location:

trunk/src/org/proteios

Files:

• core/DataConnection.java (modified) (1 diff)
• test/ProteiosTester.java (modified) (3 diffs)

trunk/src/org/proteios/core/DataConnection.java

@@ -237 +237 @@
     Element retval = null;
 
-    // Element does, of course, not have to be root, but this is how to fetch.
-    List elts = getRootElements(element_type);
-    boolean got_it = false;
-
-    for (int i = 0; !(got_it) && (i < elts.size()); ++i)
-    {
-      // If the attribute map is empty, any element of the right type matches
-      got_it = true;
-      Element elt = (Element) elts.get(i);
-      List entity_names = elt.getEntityNames();
-      for (int j = 0; j < entity_names.size(); ++j)
-      {
-        String entity_name = (String) entity_names.get(j);
-        String value = (String) attributes.get(entity_name);
-        // Only if this is an attribute we are to check
-        if (value != null)
-        {
-          got_it = (elt.getEntityValue(entity_name).toString().equals(value)) && got_it;
-        }
-      }
-
-      if (got_it)
-      {
-        retval = elt;
-      }
-    }
+    if (element_type != null)
+    {
+      // Element does, of course, not have to be root, but this is how to fetch.
+      List elts = getRootElements(element_type);
+      boolean got_it = false;
+  
+      for (int i = 0; !(got_it) && (i < elts.size()); ++i)
+      {
+        // If the attribute map is empty, any element of the right type matches
+        got_it = true;
+        Element elt = (Element) elts.get(i);
+        List entity_names = elt.getEntityNames();
+        for (int j = 0; j < entity_names.size(); ++j)
+        {
+          String entity_name = (String) entity_names.get(j);
+          String value = (String) attributes.get(entity_name);
+          // Only if this is an attribute we are to check
+          if (value != null)
+          {
+            got_it = (elt.getEntityValue(entity_name).toString().equals(value)) && got_it;
+          }
+        }
+  
+        if (got_it)
+        {
+          retval = elt;
+        }
+      }
+    }
 
     return retval;

trunk/src/org/proteios/test/ProteiosTester.java

@@ -634 +634 @@
 
       // If we're exporting from root, parent is null
-      Element parent = null;
-      String parent_type = exp.getParentType();
-      if (parent_type != null)
-      {
-        attributes = exp.getParentAttributes();
-        parent = dc.getElement(exp.getParentType(), attributes);
-      }
+      attributes = exp.getParentAttributes();
+      Element parent = dc.getElement(exp.getParentType(), attributes);
       exporter.doExport(element, parent, exp.getFileName());
     }
@@ -676 +671 @@
       attributes = dls.getParentAttributes();
       // Parent might be null <=> we want to delete from the root
-      Element parent = null;
-      String parent_type = dls.getParentType();
-      if (parent_type != null)
-      {
-        parent = dc.getElement(dls.getParentType(), attributes);
-      }
+      Element parent = dc.getElement(dls.getParentType(), attributes);
       element.delete(parent);
     }
@@ -731 +721 @@
       List added_children = new ArrayList();
       // Target may be null
-      Element target_element = null;
-      Element parent_element = null;
-      String target_type = drs.getTargetType();
-      String parent_type = drs.getParentType();
-
-      if (target_type != null)
-      {
-        target_element = tc.getElement(drs.getTargetType(), target_attributes);
-      }
-      if (parent_type != null)
-      {
-        parent_element = tc.getElement(drs.getParentType(), parent_attributes);
-      }
+      Element target_element = tc.getElement(drs.getTargetType(), target_attributes);
+      Element parent_element = tc.getElement(drs.getParentType(), parent_attributes);
 
       // Our target is an element