Continued with the upload-functionality.

Kieker.WebGUI/src/main/java/kieker/webgui/beans/application/AvailableDependenciesBean.java

@@ -9,6 +9,7 @@ import javax.faces.bean.ManagedBean;
 import kieker.analysis.model.analysisMetaModel.MIDependency;
 import kieker.analysis.model.analysisMetaModel.impl.MAnalysisMetaModelFactory;
 import kieker.webgui.common.FileManager;
+import org.primefaces.model.UploadedFile;
 
 @ManagedBean
 @ApplicationScoped
@@ -25,4 +26,16 @@ public class AvailableDependenciesBean {
     public List<MIDependency> getDependencies() {
         return dependencies;
     }
+
+    public void upload(final UploadedFile file) {
+        FileManager.getInstance().uploadDependency(file);
+        this.dependencies.clear();
+        this.dependencies.addAll(FileManager.getInstance().loadAllDependencies());
+    }
+    
+    public void delete(final MIDependency dependency) {
+        FileManager.getInstance().deleteDependency(dependency);
+        this.dependencies.clear();
+        this.dependencies.addAll(FileManager.getInstance().loadAllDependencies());
+    }
 }

Kieker.WebGUI/src/main/java/kieker/webgui/beans/session/DependencyUploadController.java

@@ -28,8 +28,6 @@ public class DependencyUploadController {
     }
 
     public void upload() {
-		FacesMessage msg = new FacesMessage("Succesful", file.getFileName() + " is uploaded.");
-		FacesContext.getCurrentInstance().addMessage(null, msg);
-	//	FileManager.getInstance().uploadDependency(file);
+        FileManager.getInstance().uploadDependency(file);
     }
 }

Kieker.WebGUI/src/main/java/kieker/webgui/common/FileManager.java

@@ -6,6 +6,7 @@ import java.io.IOException;
 import java.io.InputStream;
 import java.io.OutputStream;
 import java.util.ArrayList;
+import java.util.Arrays;
 import java.util.List;
 
 import org.primefaces.model.UploadedFile;
@@ -172,7 +173,6 @@ public final class FileManager {
      * @return true iff the file has been uploaded successfully.
      */
     public boolean uploadDependency(final UploadedFile file) {
-        System.out.println(file);
         final File depFile = new File(LIB_DIR, file.getFileName());
 
         InputStream in = null;
@@ -245,4 +245,11 @@ public final class FileManager {
 
         return resultList;
     }
+
+    public void deleteDependency(final MIDependency dependency) {
+        File file = new File(dependency.getFilePath());
+        if (file.isFile()) {
+            file.delete();
+        }
+    }
 }

Kieker.WebGUI/src/main/webapp/WEB-INF/pretty-config.xml

@@ -5,7 +5,7 @@
                                    		http://ocpsoft.com/xml/ns/prettyfaces/ocpsoft-pretty-faces-3.3.2.xsd">
 
     <url-mapping id="home"> 
-        <pattern value="/Kieker.WebGUI" /> 
+        <pattern value="/Kieker.WebGUI/main" /> 
         <view-id value="/faces/main.xhtml" />
     </url-mapping> 
     

Kieker.WebGUI/src/main/webapp/main.xhtml

@@ -8,7 +8,7 @@
     <f:view contentType="text/html">
         <h:head>
             <title>Kieker.WebGUI</title>
-            <link rel="stylesheet" type="text/css" href="main.css" />
+            <link rel="stylesheet" type="text/css" href="../main.css" />
         </h:head>
 
         <h:body>

Kieker.WebGUI/src/main/webapp/manageDependencies.css

@@ -8,6 +8,19 @@
     font-size: 5px;
 }
 
+.ui-layout-center {
+    font-size: 15px;
+}
+
+.ui-layout-north {
+    font-size: 15px;
+}
+
+.ui-layout-south {
+    font-size: 15px;
+}
+
+
 .ui-datatable {
     font-size: 15px;
 }

Kieker.WebGUI/src/main/webapp/manageDependencies.xhtml

@@ -10,42 +10,26 @@
             <title>Kieker.WebGUI - Dependencies</title>
             <link rel="stylesheet" type="text/css" href="../manageDependencies.css" />
         </h:head>
+
         <h:body>
+
+            <p:layout fullPage="true">
+                <p:layoutUnit header="Navigation" position="north" collapsible="true" resizable="true">
                     <!-- The control panel to get back. -->
-            <p:panel>  
                     <h:form>
-                    <p:commandButton icon="ui-icon-circle-arrow-w" value="Mainmenu"/>
-                </h:form>
-            </p:panel>
-
-            <p:spacer height="20px"/>
-
-            <!-- This is the form for the uploading. -->
-            <p:panel header="Upload Dependencies">  
-                <h:outputText value="Currently only *.jar-Dependencies can be uploaded. The maximal file size is limited to 100 [MiByte]." />
-                <br />
-                 <br />
-                <h:form enctype="multipart/form-data">
-                    <p:fileUpload value="#{dependencyUploadController.file}"
-                                  allowTypes="/(\.|\/)(jar)$/"
-                                  sizeLimit="104857600"
-                                  mode="simple" />
-                    <br />
-                    <br />
-                    <p:commandButton value="Upload" ajax="true"
-                                     actionListener="#{dependencyUploadController.upload}" />
-
+                        Click
+                        <p:commandLink ajax="false" action="/main">  
+                            <h:outputText value="here" />  
+                        </p:commandLink>  
+                        to get back to the main menu.
                     </h:form>
-            </p:panel>
-
-            <p:spacer height="20px"/>
+                </p:layoutUnit>
 
+                <p:layoutUnit header="Currently available Dependencies" position="center" >
                     <!-- This form shows the currently available dependencies. -->
                     <h:form>
-                <p:dataTable  id="currentDependencies" value="#{availableDependenciesBean.dependencies}" var="dependency" paginator="true" rows="10" paginatorTemplate="{CurrentPageReport}  {FirstPageLink} {PreviousPageLink} {PageLinks} {NextPageLink} {LastPageLink} {RowsPerPageDropdown}"   rowsPerPageTemplate="5,10,15">     
-                    <f:facet name="header">  
-                        Currently available Dependencies
-                    </f:facet>  
+                        <p:dataTable  id="currentDependencies" value="#{availableDependenciesBean.dependencies}" var="dependency" paginator="true" rows="10" paginatorTemplate="{CurrentPageReport}  {FirstPageLink} {PreviousPageLink} {PageLinks} {NextPageLink} {LastPageLink} {RowsPerPageDropdown}" >     
+
                             <p:column>  
                                 <f:facet name="header">  
                                     Filename  
@@ -59,20 +43,42 @@
                                 <f:facet name="header">  
                                     Size  
                                 </f:facet>  
-                        <center>
+                                <div align="center">
                                     <h:outputText value="#{dependency}" >  
                                         <f:converter converterId="kieker.webgui.converter.MIDependencyToIntConverter" />
                                     </h:outputText>
-                        </center>
+                                </div>
                             </p:column> 
 
                             <p:column style="width:40px">  
-                        <center>
-                            <p:commandButton icon="ui-icon-trash" title="Delete"/>  
-                        </center>
+                                <div align="center">
+                                    <p:commandButton icon="ui-icon-trash" title="Delete" action="{availableDependenciesBean(dependency)}"/>  
+                                </div>
                             </p:column> 
                         </p:dataTable>  
                     </h:form>
+                </p:layoutUnit>
+
+                <p:layoutUnit header="Upload Dependencies" position="south" collapsible="true" resizable="true">
+                    <!-- This is the form for the uploading. -->
+                    <h:outputText value="Currently only *.jar-Dependencies can be uploaded. The maximal file size is limited to 100 [MiByte]." />
+                    <br />
+                    <br />
+                    <h:form enctype="multipart/form-data">
+                        <p:fileUpload value="#{dependencyUploadController.file}"
+                                      allowTypes="/(\.|\/)(jar)$/"
+                                      sizeLimit="104857600"
+                                      mode="simple" />
+
+                        <p:spacer width ="50px" height="0px"/>
+                        <p:commandLink ajax="false" actionListener="#{dependencyUploadController.upload}">  
+                            <h:outputText value="Upload File" />  
+                        </p:commandLink>  
+                    </h:form>
+
+                </p:layoutUnit>
+
+            </p:layout>
         </h:body>
     </f:view>