8000 Fixed method names · codepressed/Java-CSV2XML@88715df · GitHub
[go: up one dir, main page]

Skip to content

Commit 88715df

Browse files
author
A. Apesteguia
committed
Fixed method names
1 parent a059120 commit 88715df

File tree

4 files changed

+19
-28
lines changed

4 files changed

+19
-28
lines changed
File renamed without changes.

src/main/java/com/codepressed/CSVtoXML/Main.java

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -24,15 +24,16 @@ public static void main(String[] args){
2424
//Vars Initialization
2525
String csvFile = args[0];
2626
String xmlFile = args[1];
27+
String elementName = args[2];
2728

2829
//ArrayList of ArrayStrings Generation with CSV
2930
ArrayList<String[]> elements = null;
3031
elements = new Reader().CSVtoArrayList(csvFile);
3132

3233
//XML Doc Generation with ArrayList
3334
Document xmlDoc = null;
34-
xmlDoc = new Util().docBuilder(elements);
35-
Util.transformDocToFile(xmlDoc,xmlFile);
35+
xmlDoc = new TabularToXMLConverter().docBuilder(elements,elementName);
36+
TabularToXMLConverter.transformDocToFile(xmlDoc,xmlFile);
3637

3738
} catch (IOException e) {
3839
e.printStackTrace();

src/main/java/com/codepressed/CSVtoXML/Reader.java

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -6,9 +6,7 @@
66

77
public class Reader {
88

9-
/*/
10-
ArrayList Generation ArrayStrings with the CSV Data
11-
*/
9+
//ArrayList Generation ArrayStrings with the CSV Data
1210
public ArrayList<String[]> CSVtoArrayList(String csvFile) throws IOException {
1311
ArrayList<String[]> elements = new ArrayList<String[]>();
1412
String csvSplit = ",(?=([^\"]*\"[^\"]*\")*[^\"]*$)";

src/main/java/com/codepressed/CSVtoXML/Util.java renamed to src/main/java/com/codepressed/CSVtoXML/TabularToXMLConverter.java

Lines changed: 15 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -15,31 +15,27 @@
1515
import java.io.FileOutputStream;
1616
import java.util.ArrayList;
1717

18-
public class Util {
18+
public class TabularToXMLConverter {
1919

20-
/*/
21-
DOC Generation -> XML with ArrayList String elements
22-
*/
23-
public Document docBuilder(ArrayList<String[]> elements) throws ParserConfigurationException {
20+
//DOC Generation -> XML with ArrayList String elements
21+
public Document docBuilder(ArrayList<String[]> XMLelements, String elementName) throws ParserConfigurationException {
2422
DocumentBuilderFactory xmlFactory = DocumentBuilderFactory.newInstance();
2523
DocumentBuilder xmlBuilder = xmlFactory.newDocumentBuilder();
2624
Document xmlDoc = xmlBuilder.newDocument();
2725

2826
Element rootElement = xmlDoc.createElement("root");
2927
xmlDoc.appendChild(rootElement);
3028

31-
Element mainElement = xmlDoc.createElement("elements");
29+
Element mainElement = xmlDoc.createElement(elementName+"s");
3230
rootElement.appendChild(mainElement);
3331

3432
boolean headerDefined = false; //First while will be to define header
35-
String[] header = new String[elements.size()]; //Header initialization
33+
String[] header = new String[XMLelements.size()]; //Header initialization
3634

37-
/*/
38-
DOC Generation -> XML Generation of every ELEMENT
39-
*/
40-
for (String[] node : elements) { //FOR every ArrayString
35+
//DOC Generation -> XML Generation of every ELEMENT
36+
for (String[] node : XMLelements) { //FOR every ArrayString
4137
if (headerDefined) {
42-
Element nodesElements = xmlDoc.createElement("element");
38+
Element nodesElements = xmlDoc.createElement(elementName);
4339
mainElement.appendChild(nodesElements);
4440

4541
for (int j = 0; j < node.length; j++) {
@@ -50,17 +46,15 @@ public Document docBuilder(ArrayList<String[]> elements) throws ParserConfigurat
5046
nodesValues.appendChild(nodeTxt);
5147
}
5248
}
53-
/*/
54-
DOC Generation -> Array Generation of every COL Name for NODES
55-
*/
49+
//DOC Generation -> Array Generation of every COL Name for NODES
5650
else {
5751
header = node;
58-
for (int k = 0; k < node.length; k++) {
59-
header[k] = header[k].replaceAll("[^a-zA-Z0-9]", "");
60-
//We want to make sure NODE isn't NUMERIC. If it is, we make a patch
52+
for (int j = 0; j < node.length; j++) {
53+
header[j] = header[j].replaceAll("[^a-zA-Z0-9]", "");
54+
//Avoid a fullint
6155
try {
62-
Integer.parseInt(header[k]);
63-
header[k] = "node" + header[k];
56+
Integer.parseInt(header[j]);
57+
header[j] = "node" + header[j];
6458
} catch (NumberFormatException e) {
6559
}
6660
}
@@ -70,9 +64,7 @@ public Document docBuilder(ArrayList<String[]> elements) throws ParserConfigurat
7064
return (xmlDoc);
7165
}
7266

73-
/*/
74-
XML Generation -> Transform DOC Data to XML Format
75-
*/
67+
//XML Generation -> Transform DOC Data to XML Format
7668
public static void transformDocToFile(Document xmlDoc, String xmlFile) throws TransformerException {
7769
TransformerFactory xmlTransformerFactory = TransformerFactory.newInstance();
7870
Transformer xmlTransformer = xmlTransformerFactory.newTransformer();

0 commit comments

Comments
 (0)
0