Skip to content
Snippets Groups Projects
Commit 2cc8a47d authored by nie's avatar nie
Browse files

Continued with the page layout; Added the kieker-jar as a dependency and... 

Continued with the page layout; Added the kieker-jar as a dependency and changed from Primefaces 2.2.1 to 3.0.RC1.
parent 8ad67c5f
No related branches found
No related tags found
No related merge requests found
Hide whitespace changes
Inline Side-by-side
Showing
with 108 additions and 81 deletions
Kieker.WebGUI/lib/kieker-1.5-SNAPSHOT.jar 0 → 100644
+ 0
− 0
View file @ 2cc8a47d
File added
Kieker.WebGUI/nbactions.xml
+ 1
− 0
View file @ 2cc8a47d
...@@ -5,6 +5,7 @@ ...@@ -5,6 +5,7 @@
<goals> <goals>
<goal>package</goal> <goal>package</goal>
<goal>jetty:run</goal> <goal>jetty:run</goal>
</goals> </goals>
</action> </action>
</actions> </actions>
Kieker.WebGUI/pom.xml
+ 11
− 1
View file @ 2cc8a47d
...@@ -40,13 +40,20 @@ ...@@ -40,13 +40,20 @@
<dependency> <dependency>
<groupId>org.primefaces</groupId> <groupId>org.primefaces</groupId>
<artifactId>primefaces</artifactId> <artifactId>primefaces</artifactId>
<version>2.2.1</version> <version>3.0.RC1</version>
</dependency> </dependency>
<dependency> <dependency>
<groupId>org.primefaces.themes</groupId> <groupId>org.primefaces.themes</groupId>
<artifactId>ui-darkness</artifactId> <artifactId>ui-darkness</artifactId>
<version>1.0.2</version> <version>1.0.2</version>
</dependency> </dependency>
<dependency>
<groupId>de.kieker</groupId>
<artifactId>kieker</artifactId>
<version>1.5-SNAPSHOT</version>
<scope>system</scope>
<systemPath>${project.basedir}/lib/kieker-1.5-SNAPSHOT.jar</systemPath>
</dependency>
</dependencies> </dependencies>
<repositories> <repositories>
...@@ -64,6 +71,9 @@ ...@@ -64,6 +71,9 @@
<groupId>org.mortbay.jetty</groupId> <groupId>org.mortbay.jetty</groupId>
<artifactId>jetty-maven-plugin</artifactId> <artifactId>jetty-maven-plugin</artifactId>
<version>8.1.0.RC1</version> <version>8.1.0.RC1</version>
<configuration>
<scanIntervalSeconds>5</scanIntervalSeconds>
</configuration>
</plugin> </plugin>
<plugin> <plugin>
<groupId>org.apache.maven.plugins</groupId> <groupId>org.apache.maven.plugins</groupId>
......
Kieker.WebGUI/src/main/java/beans/AvailablePluginsBean.java → Kieker.WebGUI/src/main/java/kieker/beans/AvailablePluginsBean.java
+ 1
− 1
View file @ 2cc8a47d
package beans; package kieker.beans;
import javax.faces.bean.ManagedBean; import javax.faces.bean.ManagedBean;
import javax.faces.bean.RequestScoped; import javax.faces.bean.RequestScoped;
......
Kieker.WebGUI/src/main/java/beans/ComponentBean.java → Kieker.WebGUI/src/main/java/kieker/beans/ComponentBean.java
+ 1
− 1
View file @ 2cc8a47d
package beans; package kieker.beans;
import javax.faces.bean.ApplicationScoped; import javax.faces.bean.ApplicationScoped;
import javax.faces.bean.ManagedBean; import javax.faces.bean.ManagedBean;
......
Kieker.WebGUI/src/main/java/beans/ProjectsBean.java → Kieker.WebGUI/src/main/java/kieker/beans/ProjectsBean.java
+ 3
− 3
View file @ 2cc8a47d
package beans; package kieker.beans;
import common.Project; import kieker.common.Project;
import java.util.ArrayList; import java.util.ArrayList;
import java.util.List; import java.util.List;
import javax.faces.bean.ApplicationScoped; import javax.faces.bean.ApplicationScoped;
...@@ -14,7 +14,7 @@ import org.primefaces.model.TreeNode; ...@@ -14,7 +14,7 @@ import org.primefaces.model.TreeNode;
*/ */
@ManagedBean @ManagedBean
@ApplicationScoped @ApplicationScoped
public final class ProjectsBean { public class ProjectsBean {
private final List<Project> projects; private final List<Project> projects;
......
Kieker.WebGUI/src/main/java/beans/TreeBean.java → Kieker.WebGUI/src/main/java/kieker/beans/TreeBean.java
+ 1
− 1
View file @ 2cc8a47d
package beans; package kieker.beans;
import javax.faces.bean.ApplicationScoped; import javax.faces.bean.ApplicationScoped;
import javax.faces.bean.ManagedBean; import javax.faces.bean.ManagedBean;
......
Kieker.WebGUI/src/main/java/common/Project.java → Kieker.WebGUI/src/main/java/kieker/common/Project.java
+ 4
− 2
View file @ 2cc8a47d
package common; package kieker.common;
import java.util.ArrayList; import java.util.ArrayList;
import java.util.List; import java.util.List;
import kieker.analysis.plugin.port.APlugin;
/** /**
* *
* @author Nils Christian Ehmke * @author Nils Christian Ehmke
*/ */
public final class Project { public class Project {
private String name; private String name;
private List<String> dependencies; private List<String> dependencies;
...@@ -15,6 +16,7 @@ public final class Project { ...@@ -15,6 +16,7 @@ public final class Project {
public Project(final String name) { public Project(final String name) {
this.name = name; this.name = name;
this.dependencies = new ArrayList<String>(); this.dependencies = new ArrayList<String>();
System.out.println(APlugin.class.getName());
} }
public String getName() { public String getName() {
......
Kieker.WebGUI/src/main/webapp/main.xhtml
+ 86
− 72
View file @ 2cc8a47d
...@@ -2,89 +2,103 @@ ...@@ -2,89 +2,103 @@
<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd"> <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
<html xmlns="http://www.w3.org/1999/xhtml" <html xmlns="http://www.w3.org/1999/xhtml"
xmlns:h="http://java.sun.com/jsf/html" xmlns:h="http://java.sun.com/jsf/html"
xmlns:p="http://primefaces.prime.com.tr/ui" > xmlns:f="http://java.sun.com/jsf/core"
<h:head> xmlns:p="http://primefaces.org/ui" >
<title>Kieker.WebGUI</title> <f:view contentType="text/html">
</h:head> <h:head>
<h:body> <title>Kieker.WebGUI</title>
<h:form>
<p:layout fullPage="true">
<p:layoutUnit header="Current Project: n/a" position="top" height="115" collapsible="true">
<div style="padding-top:10px" align="center">
<p:spacer width="60" height="10" />
<p:commandButton value="New Project"/>
<p:spacer width="35" height="10" />
<p:button value="Add Dependency"/>
<p:spacer width="35" height="10" />
<p:button value="Remove Dependency"/>
<p:spacer width="35" height="10" />
<p:button value="Save Project"/>
<p:spacer width="35" height="10" />
<p:button value="Delete Project"/>
</div>
</p:layoutUnit>
<style type="text/css">
.ui-layout-north {
z-index:20 !important;
overflow:visible !important;;
}
<p:layoutUnit header="Projects" collapsible="true" scrollable="true" position="left" width="200" resizable="true" minWidth="100">
<p:tree style="font-size:15px" value="#{projectsBean.projectsRoot}" var="node" expanded="true" > .ui-layout-north .ui-layout-unit-content {
<p:treeNode> overflow:visible !important;
<h:outputText value="#{node}"/> }
</p:treeNode> </style>
</p:tree> </h:head>
<h:body>
<p:layout fullPage="true">
<p:layoutUnit position="north" size="60" collapsible="false">
<h:form>
<p:menubar>
<p:submenu label="Projects">
<p:menuitem value="New Project" action="#{projectsBean.addProject('NewProject')}" ajax="true" update="ProjectsList"/>
<p:menuitem value="Save Project"/>
<p:separator />
<p:menuitem value="Delete Project"/>
</p:submenu>
<p:submenu label="Help">
<p:menuitem value="About..."/>
</p:submenu>
</p:menubar>
</h:form>
</p:layoutUnit>
<p:layoutUnit style="font-size:15px" header="Projects" collapsible="true" position="west" size="200" resizable="true" minSize="100">
<h:form id="ProjectsList">
<p:tree selectionMode="single" value="#{projectsBean.projectsRoot}" var="node" >
<p:treeNode>
<h:outputText value="#{node}"/>
</p:treeNode>
</p:tree>
</h:form>
</p:layoutUnit> </p:layoutUnit>
<p:layoutUnit position="center" scrollable="true"> <p:layoutUnit position="center">
<p:panel style="font-size:15px;width:150px" id="handlepnl" header="FSReader">
<h:outputText style="width: fit-content" value="myReader" />
</p:panel>
<p:draggable for="handlepnl" handle=".ui-panel-titlebar" grid="40,40"/>
<p:resizable for="handlepnl" grid="40" />
<p:panel style="font-size:15px;width:350px" id="handlepn2" header="ResourceUtilizationPlugin">
<h:outputText value="CPU-Utilization" />
</p:panel>
<p:draggable for="handlepn2" handle=".ui-panel-titlebar" grid="40,40"/>
<p:resizable for="handlepn2" grid="40" />
<p:panel style="font-size:15px;width:350px" id="handlepn3" header="TraceReconstructionPlugin">
<h:outputText value="traceReconstruction" />
</p:panel>
<p:draggable for="handlepn3" handle=".ui-panel-titlebar" grid="40,40"/>
<p:resizable for="handlepn3" grid="40" />
<p:panel style="font-size:15px;width:350px" id="handlepn4" header="CPUGraphPlugin">
<h:outputText value="CPUGraphPlugin" />
</p:panel>
<p:draggable for="handlepn4" handle=".ui-panel-titlebar" grid="40,40"/>
<p:resizable for="handlepn4" grid="40" />
<p:panel style="font-size:15px;width:350px" id="handlepn5" header="SequenceDiagrammPlugin">
<h:outputText value="SequenceDiagrammPlugin" />
</p:panel>
<p:draggable for="handlepn5" handle=".ui-panel-titlebar" grid="40,40"/>
<p:resizable for="handlepn5" grid="40" />
<p:panel style="font-size:15px;width:350px" id="handlepn6" header="DependencyGraphPlugin">
<h:outputText value="DependencyGraphPlugin" />
</p:panel>
<p:draggable for="handlepn6" handle=".ui-panel-titlebar" grid="40,40"/>
<p:resizable for="handlepn6" grid="40"/>
</p:layoutUnit> </p:layoutUnit>
<p:layoutUnit position="bottom" height="150" scrollable="true" header="Properties" resizable="true" collapsible="true"> <p:layoutUnit style="font-size:15px" position="south" size="150" header="Properties" resizable="true" collapsible="true">
<p:dataTable id="carList">
<p:column headerText="Key" style="width:125px">
<p:cellEditor>
<f:facet name="output">
<h:outputText value="" />
</f:facet>
<f:facet name="input">
<p:inputText value="" style="width:100%"/>
</f:facet>
</p:cellEditor>
</p:column>
<p:column headerText="Value" style="width:125px">
<p:cellEditor>
<f:facet name="output">
<h:outputText value="" />
</f:facet>
<f:facet name="input">
<p:inputText value="" style="width:100%" label="Year"/>
</f:facet>
</p:cellEditor>
</p:column>
<p:column headerText="Options" style="width:50px">
<p:rowEditor />
</p:column>
</p:dataTable>
</p:layoutUnit> </p:layoutUnit>
<p:layoutUnit position="right" width="200" scrollable="true" header="Tool Palette" resizable="true" collapsible="true"> <p:layoutUnit style="font-size:15px" position="east" size="200" header="Tool Palette" resizable="true" collapsible="true">
<p:tree style="font-size:15px" value="#{availablePluginsBean.availablePluginsRoot}" var="node" expanded="true" > <p:tree value="#{availablePluginsBean.availablePluginsRoot}" var="node" >
<p:treeNode> <p:treeNode>
<h:outputText value="#{node}"/> <h:outputText value="#{node}"/>
</p:treeNode> </p:treeNode>
</p:tree> </p:tree>
</p:layoutUnit> </p:layoutUnit>
</p:layout> </p:layout>
</h:form>
</h:body> </h:body>
</f:view>
</html> </html>
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment