Changeset 615 for DCWoRMS/trunk/src/test

Timestamp:

11/14/12 14:04:48 (12 years ago)

Author:

gosiaw

Message:

Bug connected with taking file names from args[] corrected

File:

• DCWoRMS/trunk/src/test/DEBBTranslator/src/test/DEBBTranslator/src/DEBB2DCWoRMSTranslator.java (modified) (5 diffs)

DCWoRMS/trunk/src/test/DEBBTranslator/src/test/DEBBTranslator/src/DEBB2DCWoRMSTranslator.java

@@ -80 +80 @@
                 if (args != null && args.length > 0) {
                         inputFileName = args[0];
-                        if (inputFileName != null && inputFileName.isEmpty() == false) {
+                        if (inputFileName == null || (inputFileName != null && inputFileName.isEmpty() == true)) {
                                 inputFileName = DEFAULT_PLMXML_INPUT_FILE_NAME;
                         }
 
-                        outputFileName = args[1];
-                        if (outputFileName != null && outputFileName.isEmpty() == false) {
-                                outputFileName = DEFAULT_DCWORMS_OUTPUT_FILE_NAME;
+                        if (args.length > 1) {
+                                outputFileName = args[1];
+                                if (outputFileName == null || (outputFileName != null && outputFileName.isEmpty() == true)) {
+                                        outputFileName = DEFAULT_DCWORMS_OUTPUT_FILE_NAME;
+                                }
                         }
                 }
@@ -115 +117 @@
                         Element rootElement = dcwormsDocument.createElement("environment");
 
-                        //      Information about namespaces and schema validating output xml
-                        //      Should be:
-                        //      <environment xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-                //           xsi:noNamespaceSchemaLocation="DCWormsResSchema.xsd">
-                        
+                        // Information about namespaces and schema validating output xml
+                        // Should be:
+                        // <environment
+                        // xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+                        // xsi:noNamespaceSchemaLocation="DCWormsResSchema.xsd">
+
                         Attr schemaAttribute = dcwormsDocument
-                        .createAttribute("xsi:noNamespaceSchemaLocation");
+                                        .createAttribute("xsi:noNamespaceSchemaLocation");
                         schemaAttribute.setValue(DEFAULT_SCHEMA_NAME);
                         Attr namespaceAttribute = dcwormsDocument
-                        .createAttribute("xmlns:xsi");
+                                        .createAttribute("xmlns:xsi");
                         namespaceAttribute.setValue(DEFAULT_NAMESPACE);
                         rootElement.setAttributeNode(schemaAttribute);
                         rootElement.setAttributeNode(namespaceAttribute);
-                        
-                        
+
                         dcwormsDocument.appendChild(rootElement);
                         Comment comment = dcwormsDocument
                                         .createComment("CoolEmAll testbed description");
                         rootElement.appendChild(comment);
-                        // rootElement.setAttributeNS("http://www.w3.org/2001/XMLSchema-instance",
-                        // "xmlns:xsi", "value");
 
                         // Creating resources element
@@ -408 +408 @@
                                                 + debbComponentNode.getNodeName());
                         }
-                        
+
                         // DOMSource/DOMResult
                         try {
-//                              DOMSource domSource = new DOMSource(debbParentElement);
+                                // DOMSource domSource = new DOMSource(debbParentElement);
                                 DOMSource domSource = new DOMSource(debbComponentNode);
                                 Source xsltSource = new StreamSource(
                                                 DEFAULT_DEBB_COMPONENT_TRANSFORMATION_FILE_NAME);
                                 DOMResult domResult = new DOMResult(computingResourceElement);
-//                              StreamResult systemOutResult = new StreamResult(System.out);
+                                // StreamResult systemOutResult = new StreamResult(System.out);
                                 // create an instance of TransformerFactory
                                 TransformerFactory transFact = TransformerFactory.newInstance();
@@ -424 +424 @@
 
                                 trans.transform(domSource, domResult);
-                                System.out.println("result node=" + domResult.getNode().getNodeName());
+                                System.out.println("result node="
+                                                + domResult.getNode().getNodeName());
                         } catch (NullPointerException npEx) {
                                 System.out.println("NullPointerException on debb "
                                                 + debbComponentIdNode.getNodeValue());
                         }
-                        
+
                         if (debbHostNameNode != null) {
                                 Element parameterElement = dcwormsDocument
@@ -491 +492 @@
 
                         // *****************************************************************
-
 
                         // Find component