From 529073d0e255ac520d56552496554be3de46cc53 Mon Sep 17 00:00:00 2001 From: Manuel Bentele Date: Fri, 30 Jul 2021 13:49:41 +0200 Subject: Remove the SDL graphics in the Libvirt XML domain representation --- .../java/org/openslx/libvirt/domain/Domain.java | 11 ----- .../openslx/libvirt/domain/device/Graphics.java | 9 +--- .../openslx/libvirt/domain/device/GraphicsSdl.java | 54 ---------------------- 3 files changed, 1 insertion(+), 73 deletions(-) delete mode 100644 src/main/java/org/openslx/libvirt/domain/device/GraphicsSdl.java diff --git a/src/main/java/org/openslx/libvirt/domain/Domain.java b/src/main/java/org/openslx/libvirt/domain/Domain.java index e0a90e5..2925ef1 100644 --- a/src/main/java/org/openslx/libvirt/domain/Domain.java +++ b/src/main/java/org/openslx/libvirt/domain/Domain.java @@ -22,7 +22,6 @@ import org.openslx.libvirt.domain.device.DiskFloppy; import org.openslx.libvirt.domain.device.DiskStorage; import org.openslx.libvirt.domain.device.FileSystem; import org.openslx.libvirt.domain.device.Graphics; -import org.openslx.libvirt.domain.device.GraphicsSdl; import org.openslx.libvirt.domain.device.GraphicsSpice; import org.openslx.libvirt.domain.device.GraphicsVnc; import org.openslx.libvirt.domain.device.Hostdev; @@ -1231,16 +1230,6 @@ public class Domain extends LibvirtXmlDocument return Graphics.class.cast( this.addDevice( new Graphics() ) ); } - /** - * Adds a virtual machine SDL graphics device to the Libvirt domain XML document. - * - * @return reference to the added SDL graphics device if creation was successful. - */ - public GraphicsSdl addGraphicsSdlDevice() - { - return GraphicsSdl.class.cast( this.addDevice( new GraphicsSdl() ) ); - } - /** * Adds a virtual machine SPICE graphics device to the Libvirt domain XML document. * diff --git a/src/main/java/org/openslx/libvirt/domain/device/Graphics.java b/src/main/java/org/openslx/libvirt/domain/device/Graphics.java index 314dba2..02c8b01 100644 --- a/src/main/java/org/openslx/libvirt/domain/device/Graphics.java +++ b/src/main/java/org/openslx/libvirt/domain/device/Graphics.java @@ -39,10 +39,7 @@ public class Graphics extends Device { Graphics addedGraphics = null; - if ( graphics instanceof GraphicsSdl ) { - xmlNode.setXmlElementAttributeValue( "type", Type.SDL.toString() ); - addedGraphics = GraphicsSdl.createInstance( xmlNode ); - } else if ( graphics instanceof GraphicsSpice ) { + if ( graphics instanceof GraphicsSpice ) { xmlNode.setXmlElementAttributeValue( "type", Type.SPICE.toString() ); addedGraphics = GraphicsSpice.createInstance( xmlNode ); } else if ( graphics instanceof GraphicsVnc ) { @@ -69,9 +66,6 @@ public class Graphics extends Device } switch ( type ) { - case SDL: - deviceGraphics = GraphicsSdl.newInstance( xmlNode ); - break; case SPICE: deviceGraphics = GraphicsSpice.newInstance( xmlNode ); break; @@ -92,7 +86,6 @@ public class Graphics extends Device enum Type { // @formatter:off - SDL ( "sdl" ), SPICE( "spice" ), VNC ( "vnc" ); // @formatter:on diff --git a/src/main/java/org/openslx/libvirt/domain/device/GraphicsSdl.java b/src/main/java/org/openslx/libvirt/domain/device/GraphicsSdl.java deleted file mode 100644 index c77f56d..0000000 --- a/src/main/java/org/openslx/libvirt/domain/device/GraphicsSdl.java +++ /dev/null @@ -1,54 +0,0 @@ -package org.openslx.libvirt.domain.device; - -import org.openslx.libvirt.xml.LibvirtXmlNode; - -/** - * A graphics SDL device node in a Libvirt domain XML document. - * - * @author Manuel Bentele - * @version 1.0 - */ -public class GraphicsSdl extends Graphics -{ - /** - * Creates an empty graphics SDL device. - */ - public GraphicsSdl() - { - super(); - } - - /** - * Creates a graphics SDL device representing an existing Libvirt XML graphics SDL device - * element. - * - * @param xmlNode existing Libvirt XML graphics SDL device element. - */ - public GraphicsSdl( LibvirtXmlNode xmlNode ) - { - super( xmlNode ); - } - - /** - * Creates a non-existent graphics SDL device as Libvirt XML device element. - * - * @param xmlNode Libvirt XML node of the Libvirt XML device that is created. - * @return created graphics SDL device instance. - */ - public static GraphicsSdl createInstance( LibvirtXmlNode xmlNode ) - { - return GraphicsSdl.newInstance( xmlNode ); - } - - /** - * Creates a graphics SDL device representing an existing Libvirt XML graphics SDL device - * element. - * - * @param xmlNode existing Libvirt XML graphics SDL device element. - * @return graphics SDL device instance. - */ - public static GraphicsSdl newInstance( LibvirtXmlNode xmlNode ) - { - return new GraphicsSdl( xmlNode ); - } -} -- cgit v1.2.3-55-g7522