From 13371ed921d1c98d85d9c516cdc566b53266ef23 Mon Sep 17 00:00:00 2001
From: Nils Christian Ehmke <nie@informatik.uni-kiel.de>
Date: Wed, 25 Apr 2012 17:37:08 +0200
Subject: [PATCH] Modified the updating within the connection dialog.
---
Kieker.WebGUI/pom.xml | 5 +++--
.../webgui/beans/request/StringBean.java | 6 +++---
.../beans/session/SelectedMainProjectBean.java | 6 +++---
.../beans/session/SelectedPluginBean.java | 18 +++++++++---------
.../beans/session/SelectedProjectBean.java | 12 ++++++++----
Kieker.WebGUI/src/main/webapp/main.css | 4 ++++
Kieker.WebGUI/src/main/webapp/main.xhtml | 8 ++++----
7 files changed, 34 insertions(+), 25 deletions(-)
diff --git a/Kieker.WebGUI/pom.xml b/Kieker.WebGUI/pom.xml
index ea3f1acf..88232b47 100644
--- a/Kieker.WebGUI/pom.xml
+++ b/Kieker.WebGUI/pom.xml
@@ -13,6 +13,7 @@
<properties>
<endorsed.dir>${project.build.directory}/endorsed</endorsed.dir>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
+ <kieker.jar>kieker-1.6-SNAPSHOT_emf.jar</kieker.jar>
</properties>
<dependencies>
@@ -202,7 +203,7 @@
<artifactId>kieker</artifactId>
<version>1.5-SNAPSHOT</version>
<scope>system</scope>
- <systemPath>${project.basedir}/lib/kieker-1.6-SNAPSHOT_emf.jar</systemPath>
+ <systemPath>${project.basedir}/lib/${kieker.jar}</systemPath>
</dependency>
<dependency>
<groupId>commons-io</groupId>
@@ -320,7 +321,7 @@
</goals>
<configuration>
<tasks>
- <copy file="${project.basedir}/lib/kieker-1.6-SNAPSHOT_emf.jar"
+ <copy file="${project.basedir}/lib/${kieker.jar}"
todir="${project.build.directory}/Kieker.WebGUI-${project.version}/WEB-INF/lib"/>
</tasks>
</configuration>
diff --git a/Kieker.WebGUI/src/main/java/kieker/webgui/beans/request/StringBean.java b/Kieker.WebGUI/src/main/java/kieker/webgui/beans/request/StringBean.java
index 9f2334de..c79d4472 100644
--- a/Kieker.WebGUI/src/main/java/kieker/webgui/beans/request/StringBean.java
+++ b/Kieker.WebGUI/src/main/java/kieker/webgui/beans/request/StringBean.java
@@ -64,7 +64,7 @@ public class StringBean {
this.string = string;
}
- public boolean checkString(final Object object) {
- return object instanceof String;
- }
+ public boolean checkString(final Object object) {
+ return object instanceof String;
+ }
}
diff --git a/Kieker.WebGUI/src/main/java/kieker/webgui/beans/session/SelectedMainProjectBean.java b/Kieker.WebGUI/src/main/java/kieker/webgui/beans/session/SelectedMainProjectBean.java
index 7c49f16e..e1c94c1b 100644
--- a/Kieker.WebGUI/src/main/java/kieker/webgui/beans/session/SelectedMainProjectBean.java
+++ b/Kieker.WebGUI/src/main/java/kieker/webgui/beans/session/SelectedMainProjectBean.java
@@ -119,7 +119,7 @@ public class SelectedMainProjectBean {
*/
public final void setMainProject(final MIProject mainProject) {
this.mainProject = mainProject;
- this.connections = this.getConnectionsFromMainProject();
+ this.connections = this.getConnectionsFromProject();
FacesContext.getCurrentInstance().addMessage(null, new FacesMessage(FacesMessage.SEVERITY_INFO, "", "New main project: " + mainProject.getName()));
}
@@ -360,7 +360,7 @@ public class SelectedMainProjectBean {
*
* @return A list with all connections available.
*/
- private List<Connection> getConnectionsFromMainProject() {
+ private List<Connection> getConnectionsFromProject() {
final List<Connection> result = new ArrayList<Connection>();
if (this.mainProject != null) {
@@ -392,6 +392,7 @@ public class SelectedMainProjectBean {
* This method adds an empty connection to the current main project.
*/
public void addConnection() {
+ System.out.println("new conn.");
this.connections.add(new Connection(null, null, null, null));
}
@@ -405,5 +406,4 @@ public class SelectedMainProjectBean {
}
}
}
-
}
diff --git a/Kieker.WebGUI/src/main/java/kieker/webgui/beans/session/SelectedPluginBean.java b/Kieker.WebGUI/src/main/java/kieker/webgui/beans/session/SelectedPluginBean.java
index 4b4ffa7f..4e6a045b 100644
--- a/Kieker.WebGUI/src/main/java/kieker/webgui/beans/session/SelectedPluginBean.java
+++ b/Kieker.WebGUI/src/main/java/kieker/webgui/beans/session/SelectedPluginBean.java
@@ -67,13 +67,13 @@ public final class SelectedPluginBean {
public void setPlugin(final MIPlugin plugin) {
this.plugin = plugin;
}
-
- public List<Object> getAdvancedProperties() {
- final List<Object> resultList = new ArrayList<Object>();
-
- resultList.add(plugin.getName());
- resultList.addAll(plugin.getProperties());
-
- return resultList;
- }
+
+ public List<Object> getAdvancedProperties() {
+ final List<Object> resultList = new ArrayList<Object>();
+
+ resultList.add(plugin.getName());
+ resultList.addAll(plugin.getProperties());
+
+ return resultList;
+ }
}
diff --git a/Kieker.WebGUI/src/main/java/kieker/webgui/beans/session/SelectedProjectBean.java b/Kieker.WebGUI/src/main/java/kieker/webgui/beans/session/SelectedProjectBean.java
index e490bf8a..7e0875a8 100644
--- a/Kieker.WebGUI/src/main/java/kieker/webgui/beans/session/SelectedProjectBean.java
+++ b/Kieker.WebGUI/src/main/java/kieker/webgui/beans/session/SelectedProjectBean.java
@@ -19,10 +19,17 @@
***************************************************************************/
package kieker.webgui.beans.session;
+import java.util.ArrayList;
+import java.util.List;
import javax.faces.bean.ManagedBean;
import javax.faces.bean.SessionScoped;
+import kieker.analysis.model.analysisMetaModel.MIInputPort;
+import kieker.analysis.model.analysisMetaModel.MIOutputPort;
+import kieker.analysis.model.analysisMetaModel.MIPlugin;
import kieker.analysis.model.analysisMetaModel.MIProject;
+import kieker.webgui.common.Connection;
+import org.eclipse.emf.common.util.EList;
import org.primefaces.event.NodeSelectEvent;
import org.primefaces.model.TreeNode;
@@ -50,9 +57,7 @@ public class SelectedProjectBean {
* Creates a new instance of this class.
*/
public SelectedProjectBean() {
- /*
- * No code necessary.
- */
+ // No code necessary
}
/**
@@ -107,5 +112,4 @@ public class SelectedProjectBean {
this.setSelectedProject(null);
}
}
-
}
diff --git a/Kieker.WebGUI/src/main/webapp/main.css b/Kieker.WebGUI/src/main/webapp/main.css
index 461f83d6..836787cd 100644
--- a/Kieker.WebGUI/src/main/webapp/main.css
+++ b/Kieker.WebGUI/src/main/webapp/main.css
@@ -12,6 +12,10 @@
overflow: visible !important;
}
+.ui-selectonemenu-items {
+ font-size: 15px;
+}
+
.ui-layout-center {
font-size: 15px;
}
diff --git a/Kieker.WebGUI/src/main/webapp/main.xhtml b/Kieker.WebGUI/src/main/webapp/main.xhtml
index 560b45c4..9eb54835 100644
--- a/Kieker.WebGUI/src/main/webapp/main.xhtml
+++ b/Kieker.WebGUI/src/main/webapp/main.xhtml
@@ -48,7 +48,6 @@
<p:menuitem value="Reset Project" ajax="true" onclick="resetProjectDialog.show()" />
<p:separator />
<p:menuitem value="Configure Dependencies" ajax="false" url="/Kieker.WebGUI/projectDependencies" />
- <p:menuitem ajax="true" value="Configure Connections" update=":connectionDialogForm" onclick="connectionDialog.show();"/>
<p:separator />
<p:menuitem value="Analysis" ajax="false" url="/Kieker.WebGUI/handleAnalysis" />
</p:submenu>
@@ -99,7 +98,6 @@
<p:menuitem value="Reset Project" ajax="true" onclick="resetProjectDialog.show()" />
<p:separator />
<p:menuitem value="Configure Dependencies" ajax="false" url="/Kieker.WebGUI/projectDependencies" />
- <p:menuitem ajax="true" value="Configure Connections" update=":connectionDialogForm" onclick="connectionDialog.show();"/>
<p:separator />
<p:menuitem value="Analysis" ajax="false" url="/Kieker.WebGUI/handleAnalysis" />
</p:contextMenu>
@@ -120,11 +118,13 @@
<h:form id="centerForm" style="height: 100%">
<div class="canvas" id="mainCanvas" style="width : #{currentWorkspaceSizeBean.sizeX}px;height: #{currentWorkspaceSizeBean.sizeY}px">
<c:forEach items="#{selectedMainProjectBean.mainProject.plugins}" var="plugin">
- <div class="ui-panel ui-widget ui-widget-content ui-corner-all block draggable" id="#{stringToIDBean.stringToID(plugin)}">
+ <div class="ui-panel ui-widget ui-widget-content ui-corner-all block draggable" id="#{stringToIDBean.stringToID(plugin)}" >
<div class="ui-panel-titlebar ui-widget-header ui-corner-all">
<h:outputText style="font-weight: bold" value="#{plugin.getName()}"/>
</div>
- <p:commandLink ajax="true" value="Configure" action="#{selectedPluginBean.setPlugin(plugin)}" update=":propertiesForm"/>
+ <p:commandLink ajax="true" value="Configure" action="#{selectedPluginBean.setPlugin(plugin)}" update=":propertiesForm"/>
+ <br/>
+ <p:commandLink ajax="true" value="Configure Connections" update=":connectionDialogForm" onclick="connectionDialog.show();"/>
<br/>
<p:commandLink ajax="true" value="Remove" action="#{selectedMainProjectBean.removePlugin(plugin)}" update=":propertiesForm"/>
</div>
--
GitLab