diff --git a/src/UMLClass.java b/src/UMLClass.java index 58bcc24..6a7587f 100644 --- a/src/UMLClass.java +++ b/src/UMLClass.java @@ -15,7 +15,7 @@ public class UMLClass { String[] lines = classDiagram.split("\n"); String[] linesBeheaded = new String[lines.length-1]; - this.name = lines[0]; + this.name = lines[0].split(" ")[0]; System.arraycopy(lines, 1, linesBeheaded, 0, linesBeheaded.length); diff --git a/src/UMLClassView.form b/src/UMLClassView.form index a6f8f28..2059419 100644 --- a/src/UMLClassView.form +++ b/src/UMLClassView.form @@ -17,7 +17,7 @@ - + @@ -33,11 +33,6 @@ - - - - - @@ -48,7 +43,7 @@ - + @@ -59,6 +54,7 @@ + @@ -70,6 +66,11 @@ + + + + + diff --git a/src/UMLConverterMain.java b/src/UMLConverterMain.java index f1ee0f4..c50da39 100644 --- a/src/UMLConverterMain.java +++ b/src/UMLConverterMain.java @@ -9,8 +9,7 @@ public class UMLConverterMain { new UMLManager(view); frame.setContentPane(view.getPanel1()); frame.setDefaultCloseOperation(WindowConstants.EXIT_ON_CLOSE); - frame.pack(); - //frame.setExtendedState(Frame.MAXIMIZED_BOTH); + frame.setSize(700, 500); frame.setVisible(true); } diff --git a/src/XMLParser.java b/src/XMLParser.java index e8bf16a..ae2fbdd 100644 --- a/src/XMLParser.java +++ b/src/XMLParser.java @@ -14,6 +14,7 @@ import java.util.ArrayList; public class XMLParser { private Document doc; + private boolean valid; public XMLParser(String path) { try { @@ -21,8 +22,8 @@ public class XMLParser { DocumentBuilderFactory factory = DocumentBuilderFactory.newInstance(); DocumentBuilder builder = factory.newDocumentBuilder(); doc = builder.parse(inputFile); - } catch (ParserConfigurationException | SAXException | IOException e){ - e.printStackTrace(); + valid = true; + } catch (ParserConfigurationException | SAXException | IOException ignored){ } } @@ -30,20 +31,23 @@ public class XMLParser { ArrayList classes = new ArrayList<>(); - NodeList nList = doc.getDocumentElement().getElementsByTagName("element"); + if(valid) { - for (int i = 0; i < nList.getLength(); i++) { - Node node = nList.item(i); + NodeList nList = doc.getDocumentElement().getElementsByTagName("element"); - if (node.getNodeType() == Node.ELEMENT_NODE){ + for (int i = 0; i < nList.getLength(); i++) { + Node node = nList.item(i); - Element element = (Element) node; + if (node.getNodeType() == Node.ELEMENT_NODE) { - if(element.getElementsByTagName("id").item(0).getTextContent().equals("UMLClass")){ + Element element = (Element) node; - String classBody = element.getElementsByTagName("panel_attributes").item(0).getTextContent(); - classes.add(classBody); + if (element.getElementsByTagName("id").item(0).getTextContent().equals("UMLClass")) { + String classBody = element.getElementsByTagName("panel_attributes").item(0).getTextContent(); + classes.add(classBody); + + } } } }