andspidclient-commit

[Andspidclient-commit] SF.net SVN: andspidclient:[156] trunk/src/main/java/au/csiro/doiclient/ utils/ConverterUtils.java

[<sbe...@us...>]

Revision: 156
          http://andspidclient.svn.sourceforge.net/andspidclient/?rev=156&view=rev
Author:   sbearcsiro
Date:     2012-05-16 02:26:29 +0000 (Wed, 16 May 2012)
Log Message:
-----------
- Fix FindBugs

Modified Paths:
--------------
    trunk/src/main/java/au/csiro/doiclient/utils/ConverterUtils.java

Modified: trunk/src/main/java/au/csiro/doiclient/utils/ConverterUtils.java
===================================================================
--- trunk/src/main/java/au/csiro/doiclient/utils/ConverterUtils.java	2012-05-16 02:25:34 UTC (rev 155)
+++ trunk/src/main/java/au/csiro/doiclient/utils/ConverterUtils.java	2012-05-16 02:26:29 UTC (rev 156)
@@ -1,5 +1,5 @@
 /**
- * Copyright 2012, CSIRO Australia.
+ * Copyright 2010, CSIRO Australia.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -21,6 +21,7 @@
 import java.io.StringWriter;
 import java.util.Hashtable;
 import java.util.List;
+import java.util.Map;
 
 import org.jdom.Document;
 import org.jdom.Element;
@@ -156,6 +157,7 @@
      */
     private static void detachExistingNodes(XPath xPath, Document document) throws JDOMException
     {
+        @SuppressWarnings("unchecked")
         List<Element> selectNodes = xPath.selectNodes(document);
         for (int counter = 1; counter < selectNodes.size(); counter++)
         {
@@ -425,9 +427,9 @@
     {
         Namespace namespaces[] = new Namespace[namespaceMap.size()];
         int i = 0;
-        for (String prefix : namespaceMap.keySet())
+        for (Map.Entry<String, String> prefixEntry : namespaceMap.entrySet())
         {
-            Namespace ns = Namespace.getNamespace(prefix, namespaceMap.get(prefix));
+            Namespace ns = Namespace.getNamespace(prefixEntry.getKey(), prefixEntry.getValue());
             namespaces[i++] = ns;
         }
         return namespaces;

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

[Andspidclient-commit] SF.net SVN: andspidclient:[205] trunk/src/main/java/au/csiro/doiclient/ utils/ConverterUtils.java

[<chr...@us...>]

Revision: 205
          http://sourceforge.net/p/andspidclient/code/205
Author:   chris-trapani
Date:     2018-11-29 02:41:36 +0000 (Thu, 29 Nov 2018)
Log Message:
-----------
Merge pull request #3 in APPS/ands-pid-client from feature/DMSTECH-9566 to master

* commit '023e97bddb9b0a6e3fd2bb93381cea06afc69130':
  handle null pointer.

Modified Paths:
--------------
    trunk/src/main/java/au/csiro/doiclient/utils/ConverterUtils.java

Modified: trunk/src/main/java/au/csiro/doiclient/utils/ConverterUtils.java
===================================================================
--- trunk/src/main/java/au/csiro/doiclient/utils/ConverterUtils.java	2018-11-22 03:35:49 UTC (rev 204)
+++ trunk/src/main/java/au/csiro/doiclient/utils/ConverterUtils.java	2018-11-29 02:41:36 UTC (rev 205)
@@ -557,8 +557,11 @@
         XPath xPath = XPath.newInstance(element);
         xPath.addNamespace(nameSpace, document.getRootElement().getNamespaceURI());
         Element baseElement = (Element) xPath.selectSingleNode(document);
-        baseElement.removeContent();
-        baseElement.detach();
+        if (baseElement != null)
+        {
+            baseElement.removeContent();
+            baseElement.detach();
+        }
     }
 
     /**

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

[Andspidclient-commit] SF.net SVN: andspidclient:[208] trunk/src/main/java/au/csiro/doiclient/ utils/ConverterUtils.java

[<chr...@us...>]

Revision: 208
          http://sourceforge.net/p/andspidclient/code/208
Author:   chris-trapani
Date:     2018-12-06 23:41:02 +0000 (Thu, 06 Dec 2018)
Log Message:
-----------
revert

Modified Paths:
--------------
    trunk/src/main/java/au/csiro/doiclient/utils/ConverterUtils.java

Modified: trunk/src/main/java/au/csiro/doiclient/utils/ConverterUtils.java
===================================================================
--- trunk/src/main/java/au/csiro/doiclient/utils/ConverterUtils.java	2018-12-06 05:22:46 UTC (rev 207)
+++ trunk/src/main/java/au/csiro/doiclient/utils/ConverterUtils.java	2018-12-06 23:41:02 UTC (rev 208)
@@ -509,7 +509,7 @@
                     baseElement.setAttribute(DoiMetaDataGenerator.DESCRIPTION_TYPE, firstNode.getDescriptionType());
                 }
 
-                baseElement.getParentElement().addContent(counter+1, newNode);
+                baseElement.getParentElement().addContent(1, newNode);
             }
         }
         else
@@ -634,7 +634,7 @@
 
             clonedParentElement.detach();
             Element grandParent = parent.getParentElement();
-            grandParent.addContent(counter+1, clonedParentElement);
+            grandParent.addContent(1, clonedParentElement);
         }
 
     }

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

[Andspidclient-commit] SF.net SVN: andspidclient:[210] trunk/src/main/java/au/csiro/doiclient/ utils/ConverterUtils.java

[<chr...@us...>]

Revision: 210
          http://sourceforge.net/p/andspidclient/code/210
Author:   chris-trapani
Date:     2018-12-11 04:34:28 +0000 (Tue, 11 Dec 2018)
Log Message:
-----------
DMSTECH-9641 fix for nameType attribute

Modified Paths:
--------------
    trunk/src/main/java/au/csiro/doiclient/utils/ConverterUtils.java

Modified: trunk/src/main/java/au/csiro/doiclient/utils/ConverterUtils.java
===================================================================
--- trunk/src/main/java/au/csiro/doiclient/utils/ConverterUtils.java	2018-12-06 23:40:36 UTC (rev 209)
+++ trunk/src/main/java/au/csiro/doiclient/utils/ConverterUtils.java	2018-12-11 04:34:28 UTC (rev 210)
@@ -429,21 +429,14 @@
                     firstNode.getAffiliation());
 
             detachExistingNodes(xPath, document);
-
             for (int counter = 1; counter < creators.size(); counter++)
             {
                 Element newCreatorNode = (Element) immutableclonedParentElement.clone();
                 Element childElement = (Element) newCreatorNode.getChildren().get(0);
 
-                final Creator creator = creators.get(counter);
+                Creator creator = creators.get(counter);
                 childElement.setText(stripNonValidXMLCharacters(creator.getCreatorName()));
 
-                if (StringUtils.isNotEmpty(creator.getNameType()))
-                {
-                    updateAttribute(document, nameSpace, element, DoiMetaDataGenerator.NAME_TYPE,
-                            creator.getNameType());
-                }
-
                 setElementValueForParent(document, newCreatorNode, DoiMetaDataGenerator.GIVEN_NAME,
                         creator.getFirstName());
                 setElementValueForParent(document, newCreatorNode, DoiMetaDataGenerator.FAMILY_NAME,
@@ -452,7 +445,8 @@
                         creator.getNameIdentifier());
                 setElementValueForParent(document, newCreatorNode, DoiMetaDataGenerator.AFFILIATION,
                         creator.getAffiliation());
-
+                newCreatorNode.setAttribute(DoiMetaDataGenerator.NAME_TYPE, creator.getNameType());
+                
                 Element grandParent = baseElement.getParentElement();
                 grandParent.getParentElement().addContent(counter+1, newCreatorNode);
             }

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

[Andspidclient-commit] SF.net SVN: andspidclient:[216] trunk/src/main/java/au/csiro/doiclient/ utils/ConverterUtils.java

[<chr...@us...>]

Revision: 216
          http://sourceforge.net/p/andspidclient/code/216
Author:   chris-trapani
Date:     2019-02-04 03:23:27 +0000 (Mon, 04 Feb 2019)
Log Message:
-----------
EPR-5168 DOI minting fails when creator type is not set update

Modified Paths:
--------------
    trunk/src/main/java/au/csiro/doiclient/utils/ConverterUtils.java

Modified: trunk/src/main/java/au/csiro/doiclient/utils/ConverterUtils.java
===================================================================
--- trunk/src/main/java/au/csiro/doiclient/utils/ConverterUtils.java	2019-02-01 00:34:17 UTC (rev 215)
+++ trunk/src/main/java/au/csiro/doiclient/utils/ConverterUtils.java	2019-02-04 03:23:27 UTC (rev 216)
@@ -439,7 +439,7 @@
                 childElement.setText(stripNonValidXMLCharacters(creator.getCreatorName()));
                 if (StringUtils.isNotEmpty(creator.getNameType()))
                 {
-                	childElement.setAttribute(DoiMetaDataGenerator.NAME_TYPE, firstNode.getNameType());
+                	childElement.setAttribute(DoiMetaDataGenerator.NAME_TYPE, creator.getNameType());
                 }
                 setElementValueForParent(document, newCreatorNode, DoiMetaDataGenerator.GIVEN_NAME,
                         creator.getFirstName());

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.