fix argument mismatch exception

Ali96kz · Ali96kz · commit 2830e31ba190 · 2016-08-12T13:07:38.000+06:00
diff --git a/src/main/java/com/epam/az/xml/Main.java b/src/main/java/com/epam/az/xml/Main.java
@@ -1,19 +1,16 @@
 package com.epam.az.xml;
 
+import com.epam.az.xml.entity.AliveFlower;
 import com.epam.az.xml.entity.GreenHouse;
-import com.epam.az.xml.parser.FlowerStaxParser;
 import com.epam.az.xml.parser.FlowersSaxParser;
-import com.epam.az.xml.parser.FlowersXmlParser;
 
 import java.lang.reflect.InvocationTargetException;
 
 public class Main {
     public static void main(String[] args) throws IllegalAccessException, InstantiationException, NoSuchMethodException, InvocationTargetException {
         FlowersSaxParser flowerSaxParser = new FlowersSaxParser();
         GreenHouse greenHouse = flowerSaxParser.parseXml("./src/main/resources/greenhouse.xml");
-        Class aclass = GreenHouse.class;
-        FlowersXmlParser parser = new FlowerStaxParser();
-        greenHouse = parser.parseXml("./src/main/resources/greenhouse.xml");
+        AliveFlower aliveFlower = (AliveFlower) greenHouse.get(0);
     }
 }
 
diff --git a/src/main/java/com/epam/az/xml/entity/PresentFlower.java b/src/main/java/com/epam/az/xml/entity/PresentFlower.java
@@ -1,7 +1,7 @@
 package com.epam.az.xml.entity;
 public abstract class PresentFlower extends Flower {
     private int height;
-    private FlowerVisualParameters visualParameters;
+    private VisualParameters visualParameters;
     public int getHeight() {
         return height;
     }
@@ -10,11 +10,11 @@ public void setHeight(int height) {
         this.height = height;
     }
 
-    public FlowerVisualParameters getVisualParameters() {
+    public VisualParameters getVisualParameters() {
         return visualParameters;
     }
 
-    public void setVisualParameters(FlowerVisualParameters visualParameters) {
+    public void setVisualParameters(VisualParameters visualParameters) {
         this.visualParameters = visualParameters;
     }
 }
diff --git a/src/main/java/com/epam/az/xml/entity/VisualParameters.java b/src/main/java/com/epam/az/xml/entity/VisualParameters.java
@@ -2,37 +2,33 @@
 
 import javax.xml.bind.annotation.XmlElement;
 
-public class FlowerVisualParameters {
-    //TODO add Color object
+public class VisualParameters {
     private String colorSteam;
     private String colorLeaves;
     private int averageHeight;
 
 
-    public FlowerVisualParameters(){
+    public VisualParameters(){
     }
 
     public String getColorSteam() {
         return colorSteam;
     }
 
-    @XmlElement(name = "color-steam")
     public void setColorSteam(String colorSteam) {
         this.colorSteam = colorSteam;
     }
 
     public String getColorLeaves() {
         return colorLeaves;
     }
-    @XmlElement(name = "color-leaves")
     public void setColorLeaves(String colorLeaves) {
         this.colorLeaves = colorLeaves;
     }
 
     public int getAverageHeight() {
         return averageHeight;
     }
-    @XmlElement(name = "average-height")
     public void setAverageHeight(int averageHeight) {
         this.averageHeight = averageHeight;
     }
diff --git a/src/main/java/com/epam/az/xml/parser/FlowerDomParser.java b/src/main/java/com/epam/az/xml/parser/FlowerDomParser.java
@@ -12,7 +12,7 @@
 import java.lang.reflect.Method;
 
 
-public class FlowerDomParser implements XmlParser {
+public class FlowerDomParser extends FlowersXmlParser{
 
     @Override
     public GreenHouse parseXml(String path) {
@@ -25,18 +25,22 @@ public GreenHouse parseXml(String path) {
             doc.getDocumentElement().normalize();
 
             NodeList nList = doc.getElementsByTagName("flowers");
-            for (int temp = 0; temp < nList.getLength(); temp++) {
-                Node nNode = nList.item(temp);
-                if (nNode.getNodeType() == Node.ELEMENT_NODE) {
-                    Element eElement = (Element) nNode;
-                    eElement.getElementsByTagName("").item(0).getTextContent();
-                }
-            }
 
+            extractFromNodeList(nList);
         } catch (Exception e) {
             e.printStackTrace();
         }
         return greenHouse;
     }
+    public void extractFromNodeList(NodeList nodeList){
+
+        for (int temp = 0; temp < nodeList.getLength(); temp++) {
+            Node nNode = nodeList.item(temp);
+            if (nNode.getNodeType() == Node.ELEMENT_NODE) {
+                Element eElement = (Element) nNode;
+            }
+        }
+
+    }
 
 }
diff --git a/src/main/java/com/epam/az/xml/parser/FlowersXmlParser.java b/src/main/java/com/epam/az/xml/parser/FlowersXmlParser.java
@@ -1,7 +1,6 @@
 package com.epam.az.xml.parser;
 
 import com.epam.az.xml.entity.AliveFlower;
-import com.epam.az.xml.entity.Flower;
 import com.epam.az.xml.entity.FlowerStack;
 import com.epam.az.xml.entity.GreenHouse;
 
@@ -55,13 +54,20 @@ protected void elementEnd(FlowerStack flowerStack, String qName, GreenHouse gree
     }
 
     public Object stringToObjectType(String str, Class aclass) {
-        if (aclass.getName() == "int") {
+        if (aclass.getSimpleName() == "int") {
             try {
                 int result = Integer.parseInt(str);
                 return result;
             } catch (NumberFormatException e) {
             }
         }
+        if(aclass.getSimpleName() == "boolean"){
+            if(str.charAt(0) == 't'){
+                return true;
+            }else {
+                return false;
+            }
+        }
         return stringBuilder.toString();
     }
 

Original file line number	Diff line number	Diff line change
`@@ -1,7 +1,7 @@`
`1`	`1`	`package com.epam.az.xml.entity;`
`2`	`2`	`public abstract class PresentFlower extends Flower {`
`3`	`3`	`private int height;`
`4`		`- private FlowerVisualParameters visualParameters;`
	`4`	`+ private VisualParameters visualParameters;`
`5`	`5`	`public int getHeight() {`
`6`	`6`	`return height;`
`7`	`7`	`}`
`@@ -10,11 +10,11 @@ public void setHeight(int height) {`
`10`	`10`	`this.height = height;`
`11`	`11`	`}`
`12`	`12`
`13`		`- public FlowerVisualParameters getVisualParameters() {`
	`13`	`+ public VisualParameters getVisualParameters() {`
`14`	`14`	`return visualParameters;`
`15`	`15`	`}`
`16`	`16`
`17`		`- public void setVisualParameters(FlowerVisualParameters visualParameters) {`
	`17`	`+ public void setVisualParameters(VisualParameters visualParameters) {`
`18`	`18`	`this.visualParameters = visualParameters;`
`19`	`19`	`}`
`20`	`20`	`}`
Original file line number	Diff line number	Diff line change
`@@ -2,37 +2,33 @@`
`2`	`2`
`3`	`3`	`import javax.xml.bind.annotation.XmlElement;`
`4`	`4`
`5`		`-public class FlowerVisualParameters {`
`6`		`- //TODO add Color object`
	`5`	`+public class VisualParameters {`
`7`	`6`	`private String colorSteam;`
`8`	`7`	`private String colorLeaves;`
`9`	`8`	`private int averageHeight;`
`10`	`9`
`11`	`10`
`12`		`- public FlowerVisualParameters(){`
	`11`	`+ public VisualParameters(){`
`13`	`12`	`}`
`14`	`13`
`15`	`14`	`public String getColorSteam() {`
`16`	`15`	`return colorSteam;`
`17`	`16`	`}`
`18`	`17`
`19`		`- @XmlElement(name = "color-steam")`
`20`	`18`	`public void setColorSteam(String colorSteam) {`
`21`	`19`	`this.colorSteam = colorSteam;`
`22`	`20`	`}`
`23`	`21`
`24`	`22`	`public String getColorLeaves() {`
`25`	`23`	`return colorLeaves;`
`26`	`24`	`}`
`27`		`- @XmlElement(name = "color-leaves")`
`28`	`25`	`public void setColorLeaves(String colorLeaves) {`
`29`	`26`	`this.colorLeaves = colorLeaves;`
`30`	`27`	`}`
`31`	`28`
`32`	`29`	`public int getAverageHeight() {`
`33`	`30`	`return averageHeight;`
`34`	`31`	`}`
`35`		`- @XmlElement(name = "average-height")`
`36`	`32`	`public void setAverageHeight(int averageHeight) {`
`37`	`33`	`this.averageHeight = averageHeight;`
`38`	`34`	`}`