Updated a-frame to v1.03. Added getNodeName method to Gulper. Updated…

… Vaadin addon version to 1.0.4
Liskokuningas · Jan 2, 2020 · 664aac6 · 664aac6
1 parent d5c0bd3
commit 664aac6
Show file tree

Hide file tree

Showing 38 changed files with 177 additions and 136 deletions.
diff --git a/package-lock.json b/package-lock.json
diff --git a/pom.xml b/pom.xml
@@ -3,7 +3,7 @@
 
     <groupId>com.tsc.aframe</groupId>
     <artifactId>aframe</artifactId>
-    <version>1.0.3</version>
+    <version>1.0.4</version>
     <name>a-frame-vaadin</name>
     <description>Integration of A-Frame for Vaadin platform</description>
 

diff --git a/src/main/java/com/tsc/aframe/Aentity.java b/src/main/java/com/tsc/aframe/Aentity.java
@@ -6,7 +6,7 @@
 import com.vaadin.flow.component.dependency.NpmPackage;
 
 @Tag("a-entity")
-@JsModule("aframe/dist/aframe-v1.0.0.min.js")
+@JsModule("aframe/dist/aframe-v1.0.3.min.js")
 @NpmPackage(value = "aframe", version = "^1.0.0")
 public class Aentity extends AFrameBase {
 

diff --git a/src/main/java/com/tsc/aframe/Ascene.java b/src/main/java/com/tsc/aframe/Ascene.java
@@ -9,7 +9,7 @@
 import com.vaadin.flow.component.dependency.NpmPackage;
 
 @Tag("a-scene")
-@JsModule("aframe/dist/aframe-v1.0.0.min.js")
+@JsModule("aframe/dist/aframe-v1.0.3.min.js")
 @NpmPackage(value = "aframe", version = "^1.0.0")
 /*
  If you wish to include your own JS modules in the add-on jar, add the module

diff --git a/src/main/java/com/tsc/aframe/assets/Aassetitem.java b/src/main/java/com/tsc/aframe/assets/Aassetitem.java
@@ -6,7 +6,7 @@
 import com.vaadin.flow.component.dependency.NpmPackage;
 
 @Tag("a-asset-item")
-@JsModule("aframe/dist/aframe-v1.0.0.min.js")
+@JsModule("aframe/dist/aframe-v1.0.3.min.js")
 @NpmPackage(value = "aframe", version = "^1.0.0")
 public class Aassetitem extends AFrameBase {
 	public Aassetitem() {

diff --git a/src/main/java/com/tsc/aframe/assets/Aassets.java b/src/main/java/com/tsc/aframe/assets/Aassets.java
@@ -6,7 +6,7 @@
 import com.vaadin.flow.component.dependency.NpmPackage;
 
 @Tag("a-assets")
-@JsModule("aframe/dist/aframe-v1.0.0.min.js")
+@JsModule("aframe/dist/aframe-v1.0.3.min.js")
 @NpmPackage(value = "aframe", version = "^1.0.0")
 /*
  If you wish to include your own JS modules in the add-on jar, add the module

diff --git a/src/main/java/com/tsc/aframe/assets/Audio.java b/src/main/java/com/tsc/aframe/assets/Audio.java
@@ -6,7 +6,7 @@
 import com.vaadin.flow.component.dependency.NpmPackage;
 
 @Tag("audio")
-@JsModule("aframe/dist/aframe-v1.0.0.min.js")
+@JsModule("aframe/dist/aframe-v1.0.3.min.js")
 @NpmPackage(value = "aframe", version = "^1.0.0")
 public class Audio extends AFrameBase {
 

diff --git a/src/main/java/com/tsc/aframe/assets/Img.java b/src/main/java/com/tsc/aframe/assets/Img.java
@@ -8,7 +8,7 @@
 import com.vaadin.flow.component.dependency.NpmPackage;
 
 @Tag("img")
-@JsModule("aframe/dist/aframe-v1.0.0.min.js")
+@JsModule("aframe/dist/aframe-v1.0.3.min.js")
 @NpmPackage(value = "aframe", version = "^1.0.0")
 public class Img extends AFrameBase implements IAframeBase {
 	public Img() {

diff --git a/src/main/java/com/tsc/aframe/assets/Video.java b/src/main/java/com/tsc/aframe/assets/Video.java
@@ -6,7 +6,7 @@
 import com.vaadin.flow.component.dependency.NpmPackage;
 
 @Tag("video")
-@JsModule("aframe/dist/aframe-v1.0.0.min.js")
+@JsModule("aframe/dist/aframe-v1.0.3.min.js")
 @NpmPackage(value = "aframe", version = "^1.0.0")
 public class Video extends AFrameBase {
 

diff --git a/src/main/java/com/tsc/aframe/base/AFrameBase.java b/src/main/java/com/tsc/aframe/base/AFrameBase.java
@@ -42,7 +42,7 @@ public AFrameBase addXml(String elementXml) {
 		AFrameBase aFrameBaseObj = Gulper.aFrameFactory(elementXml);
 		if ( aFrameBaseObj != null ) {
 			this.add(aFrameBaseObj);
-		}
+		}		
 		return aFrameBaseObj;
 	}
 }
diff --git a/src/main/java/com/tsc/aframe/camera/Acamera.java b/src/main/java/com/tsc/aframe/camera/Acamera.java
@@ -8,7 +8,7 @@
 import com.vaadin.flow.component.dependency.NpmPackage;
 
 @Tag("a-camera")
-@JsModule("aframe/dist/aframe-v1.0.0.min.js")
+@JsModule("aframe/dist/aframe-v1.0.3.min.js")
 @NpmPackage(value = "aframe", version = "^1.0.0")
 public class Acamera extends AFrameBase {
 

diff --git a/src/main/java/com/tsc/aframe/camera/Acursor.java b/src/main/java/com/tsc/aframe/camera/Acursor.java
@@ -8,7 +8,7 @@
 import com.vaadin.flow.component.dependency.NpmPackage;
 
 @Tag("a-cursor")
-@JsModule("aframe/dist/aframe-v1.0.0.min.js")
+@JsModule("aframe/dist/aframe-v1.0.3.min.js")
 @NpmPackage(value = "aframe", version = "^1.0.0")
 public class Acursor extends AFrameBase {
 

diff --git a/src/main/java/com/tsc/aframe/primitives/Abox.java b/src/main/java/com/tsc/aframe/primitives/Abox.java
@@ -7,7 +7,7 @@
 import com.vaadin.flow.component.dependency.NpmPackage;
 
 @Tag("a-box")
-@JsModule("aframe/dist/aframe-v1.0.0.min.js")
+@JsModule("aframe/dist/aframe-v1.0.3.min.js")
 @NpmPackage(value = "aframe", version = "^1.0.0")
 public class Abox extends AFramePrimitiveBase {	
 

diff --git a/src/main/java/com/tsc/aframe/primitives/Acircle.java b/src/main/java/com/tsc/aframe/primitives/Acircle.java
@@ -7,7 +7,7 @@
 import com.vaadin.flow.component.dependency.NpmPackage;
 
 @Tag("a-circle")
-@JsModule("aframe/dist/aframe-v1.0.0.min.js")
+@JsModule("aframe/dist/aframe-v1.0.3.min.js")
 @NpmPackage(value = "aframe", version = "^1.0.0")
 public class Acircle extends AFramePrimitiveBase {
 

diff --git a/src/main/java/com/tsc/aframe/primitives/Acone.java b/src/main/java/com/tsc/aframe/primitives/Acone.java
@@ -7,7 +7,7 @@
 import com.vaadin.flow.component.dependency.NpmPackage;
 
 @Tag("a-cone")
-@JsModule("aframe/dist/aframe-v1.0.0.min.js")
+@JsModule("aframe/dist/aframe-v1.0.3.min.js")
 @NpmPackage(value = "aframe", version = "^1.0.0")
 
 public class Acone extends AFramePrimitiveComplexBase {

diff --git a/src/main/java/com/tsc/aframe/primitives/Acurvedimage.java b/src/main/java/com/tsc/aframe/primitives/Acurvedimage.java
@@ -6,7 +6,7 @@
 import com.vaadin.flow.component.dependency.NpmPackage;
 
 @Tag("a-curvedimage")
-@JsModule("aframe/dist/aframe-v1.0.0.min.js")
+@JsModule("aframe/dist/aframe-v1.0.3.min.js")
 @NpmPackage(value = "aframe", version = "^1.0.0")
 public class Acurvedimage extends AFrameMediaBase {
 

diff --git a/src/main/java/com/tsc/aframe/primitives/Acylinder.java b/src/main/java/com/tsc/aframe/primitives/Acylinder.java
@@ -6,7 +6,7 @@
 import com.vaadin.flow.component.dependency.NpmPackage;
 
 @Tag("a-cylinder")
-@JsModule("aframe/dist/aframe-v1.0.0.min.js")
+@JsModule("aframe/dist/aframe-v1.0.3.min.js")
 @NpmPackage(value = "aframe", version = "^1.0.0")
 public class Acylinder extends AFramePrimitiveComplexBase {
 

diff --git a/src/main/java/com/tsc/aframe/primitives/Adodecahedron.java b/src/main/java/com/tsc/aframe/primitives/Adodecahedron.java
@@ -7,7 +7,7 @@
 import com.vaadin.flow.component.dependency.NpmPackage;
 
 @Tag("a-dodecahedron")
-@JsModule("aframe/dist/aframe-v1.0.0.min.js")
+@JsModule("aframe/dist/aframe-v1.0.3.min.js")
 @NpmPackage(value = "aframe", version = "^1.0.0")
 public class Adodecahedron extends AFramePrimitiveComplexBase {
 

diff --git a/src/main/java/com/tsc/aframe/primitives/Agltfmodel.java b/src/main/java/com/tsc/aframe/primitives/Agltfmodel.java
@@ -7,7 +7,7 @@
 import com.vaadin.flow.component.dependency.NpmPackage;
 
 @Tag("a-gltf-model")
-@JsModule("aframe/dist/aframe-v1.0.0.min.js")
+@JsModule("aframe/dist/aframe-v1.0.3.min.js")
 @NpmPackage(value = "aframe", version = "^1.0.0")
 
 public class Agltfmodel extends AFrameBase {

diff --git a/src/main/java/com/tsc/aframe/primitives/Aicosahedron.java b/src/main/java/com/tsc/aframe/primitives/Aicosahedron.java
@@ -6,7 +6,7 @@
 import com.vaadin.flow.component.dependency.NpmPackage;
 
 @Tag("a-icosahedron")
-@JsModule("aframe/dist/aframe-v1.0.0.min.js")
+@JsModule("aframe/dist/aframe-v1.0.3.min.js")
 @NpmPackage(value = "aframe", version = "^1.0.0")
 public class Aicosahedron extends AFramePrimitiveBase {
 

diff --git a/src/main/java/com/tsc/aframe/primitives/Aimage.java b/src/main/java/com/tsc/aframe/primitives/Aimage.java
@@ -6,7 +6,7 @@
 import com.vaadin.flow.component.dependency.NpmPackage;
 
 @Tag("a-image")
-@JsModule("aframe/dist/aframe-v1.0.0.min.js")
+@JsModule("aframe/dist/aframe-v1.0.3.min.js")
 @NpmPackage(value = "aframe", version = "^1.0.0")
 public class Aimage extends AFrameMediaBase {
 

diff --git a/src/main/java/com/tsc/aframe/primitives/Alight.java b/src/main/java/com/tsc/aframe/primitives/Alight.java
@@ -10,7 +10,7 @@
 import com.vaadin.flow.component.dependency.NpmPackage;
 
 @Tag("a-light")
-@JsModule("aframe/dist/aframe-v1.0.0.min.js")
+@JsModule("aframe/dist/aframe-v1.0.3.min.js")
 @NpmPackage(value = "aframe", version = "^1.0.0")
 public class Alight extends AFrameBase {
 

diff --git a/src/main/java/com/tsc/aframe/primitives/Alink.java b/src/main/java/com/tsc/aframe/primitives/Alink.java
@@ -8,7 +8,7 @@
 import com.vaadin.flow.component.dependency.NpmPackage;
 
 @Tag("a-link")
-@JsModule("aframe/dist/aframe-v1.0.0.min.js")
+@JsModule("aframe/dist/aframe-v1.0.3.min.js")
 @NpmPackage(value = "aframe", version = "^1.0.0")
 public class Alink extends AFrameBase {
 

diff --git a/src/main/java/com/tsc/aframe/primitives/Aobjmodel.java b/src/main/java/com/tsc/aframe/primitives/Aobjmodel.java
@@ -8,7 +8,7 @@
 import com.vaadin.flow.component.dependency.NpmPackage;
 
 @Tag("a-obj-model")
-@JsModule("aframe/dist/aframe-v1.0.0.min.js")
+@JsModule("aframe/dist/aframe-v1.0.3.min.js")
 @NpmPackage(value = "aframe", version = "^1.0.0")
 public class Aobjmodel extends AFrameBase {
 

diff --git a/src/main/java/com/tsc/aframe/primitives/Aoctahedron.java b/src/main/java/com/tsc/aframe/primitives/Aoctahedron.java
@@ -6,7 +6,7 @@
 import com.vaadin.flow.component.dependency.NpmPackage;
 
 @Tag("a-octahedron")
-@JsModule("aframe/dist/aframe-v1.0.0.min.js")
+@JsModule("aframe/dist/aframe-v1.0.3.min.js")
 @NpmPackage(value = "aframe", version = "^1.0.0")
 public class Aoctahedron extends AFramePrimitiveBase {
 

diff --git a/src/main/java/com/tsc/aframe/primitives/Aplane.java b/src/main/java/com/tsc/aframe/primitives/Aplane.java
@@ -7,7 +7,7 @@
 import com.vaadin.flow.component.dependency.NpmPackage;
 
 @Tag("a-plane")
-@JsModule("aframe/dist/aframe-v1.0.0.min.js")
+@JsModule("aframe/dist/aframe-v1.0.3.min.js")
 @NpmPackage(value = "aframe", version = "^1.0.0")
 /*
  If you wish to include your own JS modules in the add-on jar, add the module

diff --git a/src/main/java/com/tsc/aframe/primitives/Aring.java b/src/main/java/com/tsc/aframe/primitives/Aring.java
@@ -9,7 +9,7 @@
 import com.vaadin.flow.component.dependency.NpmPackage;
 
 @Tag("a-ring")
-@JsModule("aframe/dist/aframe-v1.0.0.min.js")
+@JsModule("aframe/dist/aframe-v1.0.3.min.js")
 @NpmPackage(value = "aframe", version = "^1.0.0")
 /*
  If you wish to include your own JS modules in the add-on jar, add the module

diff --git a/src/main/java/com/tsc/aframe/primitives/Asky.java b/src/main/java/com/tsc/aframe/primitives/Asky.java
@@ -10,7 +10,7 @@
 import com.vaadin.flow.component.dependency.NpmPackage;
 
 @Tag("a-sky")
-@JsModule("aframe/dist/aframe-v1.0.0.min.js")
+@JsModule("aframe/dist/aframe-v1.0.3.min.js")
 @NpmPackage(value = "aframe", version = "^1.0.0")
 /*
  If you wish to include your own JS modules in the add-on jar, add the module

diff --git a/src/main/java/com/tsc/aframe/primitives/Asound.java b/src/main/java/com/tsc/aframe/primitives/Asound.java
@@ -7,7 +7,7 @@
 import com.vaadin.flow.component.dependency.NpmPackage;
 
 @Tag("a-sound")
-@JsModule("aframe/dist/aframe-v1.0.0.min.js")
+@JsModule("aframe/dist/aframe-v1.0.3.min.js")
 @NpmPackage(value = "aframe", version = "^1.0.0")
 public class Asound extends AFrameBase implements IAframeBase {
 

diff --git a/src/main/java/com/tsc/aframe/primitives/Asphere.java b/src/main/java/com/tsc/aframe/primitives/Asphere.java
@@ -6,7 +6,7 @@
 import com.vaadin.flow.component.dependency.NpmPackage;
 
 @Tag("a-sphere")
-@JsModule("aframe/dist/aframe-v1.0.0.min.js")
+@JsModule("aframe/dist/aframe-v1.0.3.min.js")
 @NpmPackage(value = "aframe", version = "^1.0.0")
 /*
  If you wish to include your own JS modules in the add-on jar, add the module

diff --git a/src/main/java/com/tsc/aframe/primitives/Atetrahedron.java b/src/main/java/com/tsc/aframe/primitives/Atetrahedron.java
@@ -6,7 +6,7 @@
 import com.vaadin.flow.component.dependency.NpmPackage;
 
 @Tag("a-tetrahedron")
-@JsModule("aframe/dist/aframe-v1.0.0.min.js")
+@JsModule("aframe/dist/aframe-v1.0.3.min.js")
 @NpmPackage(value = "aframe", version = "^1.0.0")
 public class Atetrahedron extends AFramePrimitiveBase {
 

diff --git a/src/main/java/com/tsc/aframe/primitives/Atext.java b/src/main/java/com/tsc/aframe/primitives/Atext.java
@@ -6,7 +6,7 @@
 import com.vaadin.flow.component.dependency.NpmPackage;
 
 @Tag("a-text")
-@JsModule("aframe/dist/aframe-v1.0.0.min.js")
+@JsModule("aframe/dist/aframe-v1.0.3.min.js")
 @NpmPackage(value = "aframe", version = "^1.0.0")
 public class Atext extends AFrameBase {
 

diff --git a/src/main/java/com/tsc/aframe/primitives/Atorus.java b/src/main/java/com/tsc/aframe/primitives/Atorus.java
@@ -6,7 +6,7 @@
 import com.vaadin.flow.component.dependency.NpmPackage;
 
 @Tag("a-torus")
-@JsModule("aframe/dist/aframe-v1.0.0.min.js")
+@JsModule("aframe/dist/aframe-v1.0.3.min.js")
 @NpmPackage(value = "aframe", version = "^1.0.0")
 public class Atorus extends AFramePrimitiveBase {
 

diff --git a/src/main/java/com/tsc/aframe/primitives/Atorusknot.java b/src/main/java/com/tsc/aframe/primitives/Atorusknot.java
@@ -6,7 +6,7 @@
 import com.vaadin.flow.component.dependency.NpmPackage;
 
 @Tag("a-torus-knot")
-@JsModule("aframe/dist/aframe-v1.0.0.min.js")
+@JsModule("aframe/dist/aframe-v1.0.3.min.js")
 @NpmPackage(value = "aframe", version = "^1.0.0")
 public class Atorusknot extends AFramePrimitiveBase {
 

diff --git a/src/main/java/com/tsc/aframe/primitives/Atriangle.java b/src/main/java/com/tsc/aframe/primitives/Atriangle.java
@@ -6,7 +6,7 @@
 import com.vaadin.flow.component.dependency.NpmPackage;
 
 @Tag("a-triangle")
-@JsModule("aframe/dist/aframe-v1.0.0.min.js")
+@JsModule("aframe/dist/aframe-v1.0.3.min.js")
 @NpmPackage(value = "aframe", version = "^1.0.0")
 public class Atriangle extends AFramePrimitiveBase {
 

diff --git a/src/main/java/com/tsc/aframe/primitives/Avideo.java b/src/main/java/com/tsc/aframe/primitives/Avideo.java
@@ -6,7 +6,7 @@
 import com.vaadin.flow.component.dependency.NpmPackage;
 
 @Tag("a-video")
-@JsModule("aframe/dist/aframe-v1.0.0.min.js")
+@JsModule("aframe/dist/aframe-v1.0.3.min.js")
 @NpmPackage(value = "aframe", version = "^1.0.0")
 public class Avideo extends AFrameMediaBase {
 

diff --git a/src/main/java/com/tsc/aframe/primitives/Avideosphere.java b/src/main/java/com/tsc/aframe/primitives/Avideosphere.java
@@ -7,7 +7,7 @@
 import com.vaadin.flow.component.dependency.NpmPackage;
 
 @Tag("a-videosphere")
-@JsModule("aframe/dist/aframe-v1.0.0.min.js")
+@JsModule("aframe/dist/aframe-v1.0.3.min.js")
 @NpmPackage(value = "aframe", version = "^1.0.0")
 public class Avideosphere extends AFrameBase {
 

diff --git a/src/main/java/com/tsc/aframe/utils/Gulper.java b/src/main/java/com/tsc/aframe/utils/Gulper.java
@@ -121,6 +121,21 @@ private static Document convertStringToXMLDocument(String xmlString) {
         return null;
     }
 
+	public static String getNodeName( String xmlString ) {
+		String nodeName = "unknown";	
+
+		Document document = convertStringToXMLDocument(xmlString);
+
+	    if ( document != null ) {
+	    	//Normalize the XML Structure; It's just too important !!
+		    document.getDocumentElement().normalize();		       
+		    //Here comes the root node
+		    nodeName = document.getDocumentElement().getNodeName();
+	    }
+
+		return nodeName;    		
+	}
+
 	public static AFrameBase aFrameFactory( String xmlString ) {
 
 		// Get root name