Skip to content

Commit

Permalink
Some cleanup and fixing some bugs
Browse files Browse the repository at this point in the history
  • Loading branch information
LucaOonk committed Apr 10, 2021
1 parent 43744fb commit 2b725c4
Show file tree
Hide file tree
Showing 6 changed files with 36 additions and 73 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,7 @@
import javax.swing.JFrame;

import src.main.java.com.lucaoonk.virsh_gui.Backend.Processors.VMDOMProcessor;
import src.main.java.com.lucaoonk.virsh_gui.Backend.Processors.VMDOMProcessorThread;
import src.main.java.com.lucaoonk.virsh_gui.Backend.Processors.VMListProcessor;
import src.main.java.com.lucaoonk.virsh_gui.ui.MainContent;
import src.main.java.com.lucaoonk.virsh_gui.ui.ScrollableVMList;
Expand Down Expand Up @@ -41,21 +42,20 @@ public void updateCurrentSelectedVM(VM vm){
}

public void refresh() {
System.out.println("Triggerd Refresh");

VMListProcessor processor = new VMListProcessor(this);
try {
this.vmList = processor.getVMdomainList();
for (VM vm : vmList) {
VMDOMProcessor.getDetails(vm);
// for (VM vm : vmList) {
// VMDOMProcessor.getDetails(vm);

}
// VMDDetailProcessor.startVMDetailthread(this);
// }
VMDOMProcessorThread domThread = new VMDOMProcessorThread(this);

} catch (IOException e) {
// TODO Auto-generated catch block
e.printStackTrace();
}
System.out.println("Updating Content");

mainContent.update();
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -4,9 +4,7 @@
import java.io.IOException;
import java.io.InputStreamReader;
import java.io.StringReader;
import java.util.List;

import javax.swing.SwingWorker;
import javax.xml.parsers.DocumentBuilder;
import javax.xml.parsers.DocumentBuilderFactory;
import javax.xml.parsers.ParserConfigurationException;
Expand All @@ -18,7 +16,7 @@
import org.xml.sax.InputSource;
import org.xml.sax.SAXException;

import src.main.java.com.lucaoonk.virsh_gui.Backend.Objects.Context;
import src.main.java.com.lucaoonk.virsh_gui.Backend.Objects.Device;
import src.main.java.com.lucaoonk.virsh_gui.Backend.Objects.Disk;
import src.main.java.com.lucaoonk.virsh_gui.Backend.Objects.VM;

Expand Down Expand Up @@ -69,7 +67,6 @@ public static void getDetails(VM vm){
disk.type= el.getAttribute("type");
disk.source = el.getElementsByTagName("source").item(0).getAttributes().getNamedItem("file").getTextContent();
disk.driver = el.getElementsByTagName("driver").item(0).getAttributes().getNamedItem("type").getTextContent();

vm.addDevice(disk);


Expand Down Expand Up @@ -108,45 +105,5 @@ public static void getDetails(VM vm){

}

public static void startVMDOMDetailthread(Context context)
{
final Context context2 = context;
SwingWorker sw1 = new SwingWorker()
{

@Override
protected String doInBackground() throws Exception
{
// define what thread will do here

for (VM vm : context2.getVMList()) {
getDetails(vm);
}
return "done";
}

@Override
protected void process(List chunks)
{
// define what the event dispatch thread
// will do with the intermediate results received
// while the thread is executing

}

@Override
protected void done()
{
// this method is called when the background
// thread finishes execution

context2.refresh();

}
};

// executes the swingworker on worker thread
sw1.execute();
}

}
Original file line number Diff line number Diff line change
@@ -0,0 +1,28 @@
package src.main.java.com.lucaoonk.virsh_gui.Backend.Processors;

import javax.swing.SwingWorker;

import src.main.java.com.lucaoonk.virsh_gui.Backend.Objects.Context;
import src.main.java.com.lucaoonk.virsh_gui.Backend.Objects.VM;

public class VMDOMProcessorThread extends SwingWorker{

private Context context;

public VMDOMProcessorThread(Context context){
super();
this.context = context;
this.execute();
}

@Override
protected Object doInBackground() throws Exception {
for (VM vm : context.getVMList()) {
VMDOMProcessor.getDetails(vm);

}

return null;
}

}
22 changes: 0 additions & 22 deletions src/main/java/com/lucaoonk/virsh_gui/Backend/Terminal.java

This file was deleted.

Original file line number Diff line number Diff line change
Expand Up @@ -90,7 +90,7 @@ private JPanel getVMDetailsPanel(){
String disksString = "";
int amountOfDisks = 0;
for (Device dev : vm.getDevices()) {
if(dev.getClass().getName().equals("Backend.Objects.Disk")){
if(dev.getClass().getName().equals("src.main.java.com.lucaoonk.virsh_gui.Backend.Objects.Disk")){
amountOfDisks+=1;
Disk disk = (Disk) dev;
disksString+= disk.device + ":"+"<br>"+"&nbsp;Location: "+ disk.source + "<br>&nbsp;Type: "+ disk.driver + "<br><br>";
Expand Down
Binary file not shown.

0 comments on commit 2b725c4

Please sign in to comment.