Skip to content
Snippets Groups Projects
Commit 6478b11f authored by Nils Christian Ehmke's avatar Nils Christian Ehmke
Browse files

Renamed some of the beans.

parent 90348fb9
No related branches found
No related tags found
No related merge requests found
Show whitespace changes
Inline Side-by-side
Showing
with 129 additions and 129 deletions
Kieker.WebGUI/src/main/java/kieker/webgui/beans/session/CurrentWorkSpaceProjectBean.java → Kieker.WebGUI/src/main/java/kieker/webgui/beans/session/CurrentAnalysisEditorBean.java
+ 45
− 45
View file @ 6478b11f
......@@ -83,11 +83,11 @@ import org.eclipse.emf.ecore.EObject;
*/
@ManagedBean
@SessionScoped
public final class CurrentWorkSpaceProjectBean {
public final class CurrentAnalysisEditorBean {
/**
* This is the log for errors, exceptions etc.
*/
private static final Log LOG = LogFactory.getLog(CurrentWorkSpaceProjectBean.class);
private static final Log LOG = LogFactory.getLog(CurrentAnalysisEditorBean.class);
/**
* This is the factory which will be used to create new components for the project.
*/
......@@ -152,7 +152,7 @@ public final class CurrentWorkSpaceProjectBean {
/**
* Creates a new instance of this class.
*/
public CurrentWorkSpaceProjectBean() {
public CurrentAnalysisEditorBean() {
// No code necessary
}
......@@ -416,7 +416,7 @@ public final class CurrentWorkSpaceProjectBean {
final MIDependency lib;
synchronized (this) {
lib = FSManager.getInstance().uploadLibrary(file, this.projectName);
CurrentWorkSpaceProjectBean.showMessage(FacesMessage.SEVERITY_INFO, "Libary uploaded.");
CurrentAnalysisEditorBean.showMessage(FacesMessage.SEVERITY_INFO, "Libary uploaded.");
// As it seem to have worked, we can add the library to our model.
this.project.getDependencies().add(lib);
}
......@@ -424,11 +424,11 @@ public final class CurrentWorkSpaceProjectBean {
this.reloadClassLoader();
this.addToToolPalette(lib);
} catch (final LibraryAlreadyExistingException ex) {
CurrentWorkSpaceProjectBean.LOG.info("A library with the same name exists already.", ex);
CurrentWorkSpaceProjectBean.showMessage(FacesMessage.SEVERITY_WARN, "A library with the same name exists already.");
CurrentAnalysisEditorBean.LOG.info("A library with the same name exists already.", ex);
CurrentAnalysisEditorBean.showMessage(FacesMessage.SEVERITY_WARN, "A library with the same name exists already.");
} catch (final IOException ex) {
CurrentWorkSpaceProjectBean.LOG.error("An error occured while uploading the library.", ex);
CurrentWorkSpaceProjectBean.showMessage(FacesMessage.SEVERITY_ERROR, "An error occured while uploading the library.");
CurrentAnalysisEditorBean.LOG.error("An error occured while uploading the library.", ex);
CurrentAnalysisEditorBean.showMessage(FacesMessage.SEVERITY_ERROR, "An error occured while uploading the library.");
}
}
......@@ -481,16 +481,16 @@ public final class CurrentWorkSpaceProjectBean {
synchronized (this) {
try {
FSManager.getInstance().saveProject(this.projectName, this.project, this.timeStamp, overwriteNewerProject);
CurrentWorkSpaceProjectBean.showMessage(FacesMessage.SEVERITY_INFO, "Project saved.");
CurrentAnalysisEditorBean.showMessage(FacesMessage.SEVERITY_INFO, "Project saved.");
// Update the time stamp!
this.resetTimeStamp();
} catch (final IOException ex) {
ex.printStackTrace();
CurrentWorkSpaceProjectBean.LOG.error("An error occured while saving the project.", ex);
CurrentWorkSpaceProjectBean.showMessage(FacesMessage.SEVERITY_ERROR, "An error occured while saving the project.");
CurrentAnalysisEditorBean.LOG.error("An error occured while saving the project.", ex);
CurrentAnalysisEditorBean.showMessage(FacesMessage.SEVERITY_ERROR, "An error occured while saving the project.");
} catch (final NewerProjectException ex) {
CurrentWorkSpaceProjectBean.LOG.info("The project has been modified externally in the meanwhile.", ex);
CurrentWorkSpaceProjectBean.showMessage(FacesMessage.SEVERITY_WARN, "The project has been modified externally in the meanwhile.");
CurrentAnalysisEditorBean.LOG.info("The project has been modified externally in the meanwhile.", ex);
CurrentAnalysisEditorBean.showMessage(FacesMessage.SEVERITY_WARN, "The project has been modified externally in the meanwhile.");
}
}
}
......@@ -517,17 +517,17 @@ public final class CurrentWorkSpaceProjectBean {
plugin.getDisplays().add(mDisplay);
}
} catch (final InstantiationException ex) {
CurrentWorkSpaceProjectBean.LOG.error("An errcor occured while loading the displays of the plugin.", ex);
CurrentWorkSpaceProjectBean.showMessage(FacesMessage.SEVERITY_ERROR, "An errcor occured while loading the displays of the plugin.");
CurrentAnalysisEditorBean.LOG.error("An errcor occured while loading the displays of the plugin.", ex);
CurrentAnalysisEditorBean.showMessage(FacesMessage.SEVERITY_ERROR, "An errcor occured while loading the displays of the plugin.");
} catch (final IllegalAccessException ex) {
CurrentWorkSpaceProjectBean.LOG.error("An errcor occured while loading the displays of the plugin.", ex);
CurrentWorkSpaceProjectBean.showMessage(FacesMessage.SEVERITY_ERROR, "An errcor occured while loading the displays of the plugin.");
CurrentAnalysisEditorBean.LOG.error("An errcor occured while loading the displays of the plugin.", ex);
CurrentAnalysisEditorBean.showMessage(FacesMessage.SEVERITY_ERROR, "An errcor occured while loading the displays of the plugin.");
} catch (final InvocationTargetException ex) {
CurrentWorkSpaceProjectBean.LOG.error("An errcor occured while loading the displays of the plugin.", ex);
CurrentWorkSpaceProjectBean.showMessage(FacesMessage.SEVERITY_ERROR, "An errcor occured while loading the displays of the plugin.");
CurrentAnalysisEditorBean.LOG.error("An errcor occured while loading the displays of the plugin.", ex);
CurrentAnalysisEditorBean.showMessage(FacesMessage.SEVERITY_ERROR, "An errcor occured while loading the displays of the plugin.");
} catch (final NoSuchMethodException ex) {
CurrentWorkSpaceProjectBean.LOG.error("An errcor occured while loading the displays of the plugin.", ex);
CurrentWorkSpaceProjectBean.showMessage(FacesMessage.SEVERITY_ERROR, "An errcor occured while loading the displays of the plugin.");
CurrentAnalysisEditorBean.LOG.error("An errcor occured while loading the displays of the plugin.", ex);
CurrentAnalysisEditorBean.showMessage(FacesMessage.SEVERITY_ERROR, "An errcor occured while loading the displays of the plugin.");
}
}
}
......@@ -577,17 +577,17 @@ public final class CurrentWorkSpaceProjectBean {
}
} catch (final InstantiationException ex) {
CurrentWorkSpaceProjectBean.LOG.error("An errcor occured while loading the ports of the plugin.", ex);
CurrentWorkSpaceProjectBean.showMessage(FacesMessage.SEVERITY_ERROR, "An errcor occured while loading the ports of the plugin.");
CurrentAnalysisEditorBean.LOG.error("An errcor occured while loading the ports of the plugin.", ex);
CurrentAnalysisEditorBean.showMessage(FacesMessage.SEVERITY_ERROR, "An errcor occured while loading the ports of the plugin.");
} catch (final IllegalAccessException ex) {
CurrentWorkSpaceProjectBean.LOG.error("An errcor occured while loading the ports of the plugin.", ex);
CurrentWorkSpaceProjectBean.showMessage(FacesMessage.SEVERITY_ERROR, "An errcor occured while loading the ports of the plugin.");
CurrentAnalysisEditorBean.LOG.error("An errcor occured while loading the ports of the plugin.", ex);
CurrentAnalysisEditorBean.showMessage(FacesMessage.SEVERITY_ERROR, "An errcor occured while loading the ports of the plugin.");
} catch (final InvocationTargetException ex) {
CurrentWorkSpaceProjectBean.LOG.error("An errcor occured while loading the ports of the plugin.", ex);
CurrentWorkSpaceProjectBean.showMessage(FacesMessage.SEVERITY_ERROR, "An errcor occured while loading the ports of the plugin.");
CurrentAnalysisEditorBean.LOG.error("An errcor occured while loading the ports of the plugin.", ex);
CurrentAnalysisEditorBean.showMessage(FacesMessage.SEVERITY_ERROR, "An errcor occured while loading the ports of the plugin.");
} catch (final NoSuchMethodException ex) {
CurrentWorkSpaceProjectBean.LOG.error("An errcor occured while loading the ports of the plugin.", ex);
CurrentWorkSpaceProjectBean.showMessage(FacesMessage.SEVERITY_ERROR, "An errcor occured while loading the ports of the plugin.");
CurrentAnalysisEditorBean.LOG.error("An errcor occured while loading the ports of the plugin.", ex);
CurrentAnalysisEditorBean.showMessage(FacesMessage.SEVERITY_ERROR, "An errcor occured while loading the ports of the plugin.");
}
}
}
......@@ -611,17 +611,17 @@ public final class CurrentWorkSpaceProjectBean {
repository.getProperties().addAll(this.extractProperties(configuration));
} catch (final InstantiationException ex) {
CurrentWorkSpaceProjectBean.LOG.error("An errcor occured while loading the properties of the repository.", ex);
CurrentWorkSpaceProjectBean.showMessage(FacesMessage.SEVERITY_ERROR, "An errcor occured while loading the properties of the repository.");
CurrentAnalysisEditorBean.LOG.error("An errcor occured while loading the properties of the repository.", ex);
CurrentAnalysisEditorBean.showMessage(FacesMessage.SEVERITY_ERROR, "An errcor occured while loading the properties of the repository.");
} catch (final IllegalAccessException ex) {
CurrentWorkSpaceProjectBean.LOG.error("An errcor occured while loading the properties of the repository.", ex);
CurrentWorkSpaceProjectBean.showMessage(FacesMessage.SEVERITY_ERROR, "An errcor occured while loading the properties of the repository.");
CurrentAnalysisEditorBean.LOG.error("An errcor occured while loading the properties of the repository.", ex);
CurrentAnalysisEditorBean.showMessage(FacesMessage.SEVERITY_ERROR, "An errcor occured while loading the properties of the repository.");
} catch (final InvocationTargetException ex) {
CurrentWorkSpaceProjectBean.LOG.error("An errcor occured while loading the properties of the repository.", ex);
CurrentWorkSpaceProjectBean.showMessage(FacesMessage.SEVERITY_ERROR, "An errcor occured while loading the properties of the repository.");
CurrentAnalysisEditorBean.LOG.error("An errcor occured while loading the properties of the repository.", ex);
CurrentAnalysisEditorBean.showMessage(FacesMessage.SEVERITY_ERROR, "An errcor occured while loading the properties of the repository.");
} catch (final NoSuchMethodException ex) {
CurrentWorkSpaceProjectBean.LOG.error("An errcor occured while loading the properties of the repository.", ex);
CurrentWorkSpaceProjectBean.showMessage(FacesMessage.SEVERITY_ERROR, "An errcor occured while loading the properties of the repository.");
CurrentAnalysisEditorBean.LOG.error("An errcor occured while loading the properties of the repository.", ex);
CurrentAnalysisEditorBean.showMessage(FacesMessage.SEVERITY_ERROR, "An errcor occured while loading the properties of the repository.");
}
}
......@@ -644,17 +644,17 @@ public final class CurrentWorkSpaceProjectBean {
plugin.getProperties().addAll(this.extractProperties(configuration));
} catch (final InstantiationException ex) {
CurrentWorkSpaceProjectBean.LOG.error("An errcor occured while loading the properties of the plugin.", ex);
CurrentWorkSpaceProjectBean.showMessage(FacesMessage.SEVERITY_ERROR, "An errcor occured while loading the properties of the plugin.");
CurrentAnalysisEditorBean.LOG.error("An errcor occured while loading the properties of the plugin.", ex);
CurrentAnalysisEditorBean.showMessage(FacesMessage.SEVERITY_ERROR, "An errcor occured while loading the properties of the plugin.");
} catch (final IllegalAccessException ex) {
CurrentWorkSpaceProjectBean.LOG.error("An errcor occured while loading the properties of the plugin.", ex);
CurrentWorkSpaceProjectBean.showMessage(FacesMessage.SEVERITY_ERROR, "An errcor occured while loading the properties of the plugin.");
CurrentAnalysisEditorBean.LOG.error("An errcor occured while loading the properties of the plugin.", ex);
CurrentAnalysisEditorBean.showMessage(FacesMessage.SEVERITY_ERROR, "An errcor occured while loading the properties of the plugin.");
} catch (final InvocationTargetException ex) {
CurrentWorkSpaceProjectBean.LOG.error("An errcor occured while loading the properties of the plugin.", ex);
CurrentWorkSpaceProjectBean.showMessage(FacesMessage.SEVERITY_ERROR, "An errcor occured while loading the properties of the plugin.");
CurrentAnalysisEditorBean.LOG.error("An errcor occured while loading the properties of the plugin.", ex);
CurrentAnalysisEditorBean.showMessage(FacesMessage.SEVERITY_ERROR, "An errcor occured while loading the properties of the plugin.");
} catch (final NoSuchMethodException ex) {
CurrentWorkSpaceProjectBean.LOG.error("An errcor occured while loading the properties of the plugin.", ex);
CurrentWorkSpaceProjectBean.showMessage(FacesMessage.SEVERITY_ERROR, "An errcor occured while loading the properties of the plugin.");
CurrentAnalysisEditorBean.LOG.error("An errcor occured while loading the properties of the plugin.", ex);
CurrentAnalysisEditorBean.showMessage(FacesMessage.SEVERITY_ERROR, "An errcor occured while loading the properties of the plugin.");
}
}
......
Kieker.WebGUI/src/main/java/kieker/webgui/beans/session/CurrentAnalysisCockpitProjectBean.java → Kieker.WebGUI/src/main/java/kieker/webgui/beans/session/CurrentCockpitBean.java
+ 2
− 2
View file @ 6478b11f
......@@ -41,7 +41,7 @@ import kieker.webgui.common.Global;
*/
@ManagedBean
@SessionScoped
public class CurrentAnalysisCockpitProjectBean {
public class CurrentCockpitBean {
/**
* This is the name of the stored project. It can be used as an identifier within the FS-Manager
......@@ -59,7 +59,7 @@ public class CurrentAnalysisCockpitProjectBean {
/**
* Creates a new instance of this class.
*/
public CurrentAnalysisCockpitProjectBean() {
public CurrentCockpitBean() {
// No code necessary
}
......
Kieker.WebGUI/src/main/java/kieker/webgui/converter/MIPluginStringConverter.java
+ 5
− 5
View file @ 6478b11f
......@@ -27,7 +27,7 @@ import javax.faces.convert.Converter;
import javax.faces.convert.FacesConverter;
import kieker.analysis.model.analysisMetaModel.MIPlugin;
import kieker.webgui.beans.session.CurrentWorkSpaceProjectBean;
import kieker.webgui.beans.session.CurrentAnalysisEditorBean;
/**
* This converter can be used to convert a given plugin model instance to a string and vice versa (It uses the object's toString-method).
......@@ -52,8 +52,8 @@ public class MIPluginStringConverter implements Converter {
@Override
public Object getAsObject(final FacesContext fc, final UIComponent uic, final String string) {
final ELResolver el = FacesContext.getCurrentInstance().getApplication().getELResolver();
final CurrentWorkSpaceProjectBean bean = (CurrentWorkSpaceProjectBean) el.getValue(FacesContext.getCurrentInstance().getELContext(), null,
"currentWorkSpaceProjectBean");
final CurrentAnalysisEditorBean bean = (CurrentAnalysisEditorBean) el.getValue(FacesContext.getCurrentInstance().getELContext(), null,
"currentAnalysisEditorBean");
return bean.getPluginByID(string);
}
......@@ -61,8 +61,8 @@ public class MIPluginStringConverter implements Converter {
@Override
public String getAsString(final FacesContext fc, final UIComponent uic, final Object o) {
final ELResolver el = FacesContext.getCurrentInstance().getApplication().getELResolver();
final CurrentWorkSpaceProjectBean bean = (CurrentWorkSpaceProjectBean) el.getValue(FacesContext.getCurrentInstance().getELContext(), null,
"currentWorkSpaceProjectBean");
final CurrentAnalysisEditorBean bean = (CurrentAnalysisEditorBean) el.getValue(FacesContext.getCurrentInstance().getELContext(), null,
"currentAnalysisEditorBean");
if (o == null) {
return "";
......
Kieker.WebGUI/src/main/java/kieker/webgui/converter/MIPortStringConverter.java
+ 5
− 5
View file @ 6478b11f
......@@ -27,7 +27,7 @@ import javax.faces.convert.Converter;
import javax.faces.convert.FacesConverter;
import kieker.analysis.model.analysisMetaModel.MIPort;
import kieker.webgui.beans.session.CurrentWorkSpaceProjectBean;
import kieker.webgui.beans.session.CurrentAnalysisEditorBean;
/**
* This converter can be used to convert a given port model instance to a string and vice versa (It uses the object's toString-method).
......@@ -52,8 +52,8 @@ public class MIPortStringConverter implements Converter {
@Override
public Object getAsObject(final FacesContext fc, final UIComponent uic, final String string) {
final ELResolver el = FacesContext.getCurrentInstance().getApplication().getELResolver();
final CurrentWorkSpaceProjectBean bean = (CurrentWorkSpaceProjectBean) el.getValue(FacesContext.getCurrentInstance()
.getELContext(), null, "currentWorkSpaceProjectBean");
final CurrentAnalysisEditorBean bean = (CurrentAnalysisEditorBean) el.getValue(FacesContext.getCurrentInstance()
.getELContext(), null, "currentAnalysisEditorBean");
return bean.getPortByID(string);
}
......@@ -61,8 +61,8 @@ public class MIPortStringConverter implements Converter {
@Override
public String getAsString(final FacesContext fc, final UIComponent uic, final Object o) {
final ELResolver el = FacesContext.getCurrentInstance().getApplication().getELResolver();
final CurrentWorkSpaceProjectBean bean = (CurrentWorkSpaceProjectBean) el.getValue(FacesContext.getCurrentInstance().getELContext(), null,
"currentWorkSpaceProjectBean");
final CurrentAnalysisEditorBean bean = (CurrentAnalysisEditorBean) el.getValue(FacesContext.getCurrentInstance().getELContext(), null,
"currentAnalysisEditorBean");
if (o == null) {
return "";
......
Kieker.WebGUI/src/main/java/kieker/webgui/converter/MIRepositoryStringConverter.java
+ 5
− 5
View file @ 6478b11f
......@@ -27,7 +27,7 @@ import javax.faces.convert.Converter;
import javax.faces.convert.FacesConverter;
import kieker.analysis.model.analysisMetaModel.MIRepository;
import kieker.webgui.beans.session.CurrentWorkSpaceProjectBean;
import kieker.webgui.beans.session.CurrentAnalysisEditorBean;
/**
* This converter can be used to convert a given repository model instance to a string and vice versa (It uses the object's toString-method).
......@@ -52,8 +52,8 @@ public class MIRepositoryStringConverter implements Converter {
@Override
public Object getAsObject(final FacesContext fc, final UIComponent uic, final String string) {
final ELResolver el = FacesContext.getCurrentInstance().getApplication().getELResolver();
final CurrentWorkSpaceProjectBean bean = (CurrentWorkSpaceProjectBean) el.getValue(FacesContext.getCurrentInstance()
.getELContext(), null, "currentWorkSpaceProjectBean");
final CurrentAnalysisEditorBean bean = (CurrentAnalysisEditorBean) el.getValue(FacesContext.getCurrentInstance()
.getELContext(), null, "currentAnalysisEditorBean");
return bean.getRepositoryByID(string);
}
......@@ -61,8 +61,8 @@ public class MIRepositoryStringConverter implements Converter {
@Override
public String getAsString(final FacesContext fc, final UIComponent uic, final Object o) {
final ELResolver el = FacesContext.getCurrentInstance().getApplication().getELResolver();
final CurrentWorkSpaceProjectBean bean = (CurrentWorkSpaceProjectBean) el.getValue(FacesContext.getCurrentInstance().getELContext(), null,
"currentWorkSpaceProjectBean");
final CurrentAnalysisEditorBean bean = (CurrentAnalysisEditorBean) el.getValue(FacesContext.getCurrentInstance().getELContext(), null,
"currentAnalysisEditorBean");
if (o == null) {
return "";
......
Kieker.WebGUI/src/main/webapp/AnalysisEditor.xhtml
+ 36
− 36
View file @ 6478b11f
......@@ -30,33 +30,33 @@
<h:form>
<p:toolbar>
<p:toolbarGroup align="left">
<h:outputText styleClass="kieker-title" value="Kieker &raquo; #{stringBean.shortenLongName(currentWorkSpaceProjectBean.projectName, 30)}"/>
<h:outputText styleClass="kieker-title" value="Kieker &raquo; #{stringBean.shortenLongName(currentAnalysisEditorBean.projectName, 30)}"/>
</p:toolbarGroup>
<p:toolbarGroup align="right">
<p:commandButton styleClass="perspective-button" icon="ui-icon-home" action="ProjectOverview.xhtml" />
<p:separator/>
<p:commandButton styleClass="perspective-button" icon="ui-icon-wrench" value="Analysis Editor" style="white-space: none" disabled="true" ajax="false"/>
<p:commandButton styleClass="perspective-button" icon="ui-icon-circle-triangle-e" value="Analysis" ajax="false" action="#{currentControllerBean.setProject(currentWorkSpaceProjectBean.projectName)}" />
<p:commandButton styleClass="perspective-button" icon="ui-icon-circle-triangle-e" value="Analysis" ajax="false" action="#{currentControllerBean.setProject(currentAnalysisEditorBean.projectName)}" />
<p:separator/>
<p:commandButton styleClass="perspective-button" icon="ui-icon-wrench" value="Cockpit Editor" ajax="false" action="#{currentCockpitEditorBean.setProject(currentWorkSpaceProjectBean.projectName)}" />
<p:commandButton styleClass="perspective-button" icon="ui-icon-image" value="Cockpit" ajax="false" action="#{currentAnalysisCockpitProjectBean.setProject(currentWorkSpaceProjectBean.projectName)}" />
<p:commandButton styleClass="perspective-button" icon="ui-icon-wrench" value="Cockpit Editor" ajax="false" action="#{currentCockpitEditorBean.setProject(currentAnalysisEditorBean.projectName)}" />
<p:commandButton styleClass="perspective-button" icon="ui-icon-image" value="Cockpit" ajax="false" action="#{currentCockpitBean.setProject(currentAnalysisEditorBean.projectName)}" />
</p:toolbarGroup>
</p:toolbar>
<p:menubar>
<p:submenu label="File">
<p:menuitem styleClass="element-with-whitespace" icon="ui-icon-disk" value=" Save Project" update=":messages" ajax="true" action="#{currentWorkSpaceProjectBean.saveProject(false)}" disabled="#{empty currentWorkSpaceProjectBean.project}"/>
<p:menuitem styleClass="element-with-whitespace" icon="ui-icon-disk" value=" Save Project As" update=":messages" ajax="true" disabled="#{empty currentWorkSpaceProjectBean.project}"/>
<p:menuitem styleClass="element-with-whitespace Force-Save-Project-Button" icon="ui-icon-alert" value=" Force Save Project" update=":messages" ajax="true" action="#{currentWorkSpaceProjectBean.saveProject(true)}" disabled="#{empty currentWorkSpaceProjectBean.project}"/>
<p:menuitem styleClass="element-with-whitespace" icon="ui-icon-disk" value=" Save Project" update=":messages" ajax="true" action="#{currentAnalysisEditorBean.saveProject(false)}" disabled="#{empty currentAnalysisEditorBean.project}"/>
<p:menuitem styleClass="element-with-whitespace" icon="ui-icon-disk" value=" Save Project As" update=":messages" ajax="true" disabled="#{empty currentAnalysisEditorBean.project}"/>
<p:menuitem styleClass="element-with-whitespace Force-Save-Project-Button" icon="ui-icon-alert" value=" Force Save Project" update=":messages" ajax="true" action="#{currentAnalysisEditorBean.saveProject(true)}" disabled="#{empty currentAnalysisEditorBean.project}"/>
<p:separator />
<p:menuitem styleClass="element-with-whitespace" icon="ui-icon-refresh" value=" Reload Project" ajax="true" disabled="#{empty currentWorkSpaceProjectBean.project or true}" />
<p:menuitem styleClass="element-with-whitespace" icon="ui-icon-refresh" value=" Reload Project" ajax="true" disabled="#{empty currentAnalysisEditorBean.project or true}" />
<p:separator/>
<p:menuitem styleClass="element-with-whitespace" icon="ui-icon-bookmark" value=" Manage Libraries" onclick="manageLibrariesDialog.show()" ajax="true" disabled="#{empty currentWorkSpaceProjectBean.project}"/>
<p:menuitem styleClass="element-with-whitespace" icon="ui-icon-shuffle" ajax="true" value=" Edit Connections" update=":connectionDialogForm" onclick="connectionDialog.show();" disabled="#{empty currentWorkSpaceProjectBean.project}"/>
<p:menuitem styleClass="element-with-whitespace" icon="ui-icon-bookmark" value=" Manage Libraries" onclick="manageLibrariesDialog.show()" ajax="true" disabled="#{empty currentAnalysisEditorBean.project}"/>
<p:menuitem styleClass="element-with-whitespace" icon="ui-icon-shuffle" ajax="true" value=" Edit Connections" update=":connectionDialogForm" onclick="connectionDialog.show();" disabled="#{empty currentAnalysisEditorBean.project}"/>
<p:separator />
<p:menuitem styleClass="element-with-whitespace" icon="ui-icon-gear" value=" Settings" onclick="settingsDlg.show()" ajax="true"/>
<p:separator />
<p:menuitem styleClass="element-with-whitespace" icon="ui-icon-circle-close" value=" Close Project" action="#{currentWorkSpaceProjectBean.clearProject()}" ajax="false"/>
<p:menuitem styleClass="element-with-whitespace" icon="ui-icon-circle-close" value=" Close Project" action="#{currentAnalysisEditorBean.clearProject()}" ajax="false"/>
</p:submenu>
<p:submenu label="Help">
......@@ -71,39 +71,39 @@
</p:layoutUnit>
<p:layoutUnit style="font-size: 12px" position="center" id="centerLayout">
<h:form id="centerForm" style="height: 100%" rendered="#{not empty currentWorkSpaceProjectBean.project}">
<h:form id="centerForm" style="height: 100%" rendered="#{not empty currentAnalysisEditorBean.project}">
<div class="canvas" id="mainCanvas" style="width : 100%;height: 100%">
<ui:repeat value="#{currentWorkSpaceProjectBean.project.plugins}" var="plugin" varStatus="counter">
<p:remoteCommand name="setPlugin#{counter.index}" action="#{currentWorkSpaceProjectBean.setSelectedPlugin(plugin)}" update=":propertiesForm"/>
<ui:repeat value="#{currentAnalysisEditorBean.project.plugins}" var="plugin" varStatus="counter">
<p:remoteCommand name="setPlugin#{counter.index}" action="#{currentAnalysisEditorBean.setSelectedPlugin(plugin)}" update=":propertiesForm"/>
<!-- Netbeans reports an error here, but the code does still work though... -->
<div onclick="setPlugin#{counter.index}();" style="left: #{counter.index * 90}px; top: #{counter.index * 70}px; position: absolute" class="ui-panel ui-widget ui-widget-content ui-corner-all block draggable" id="plugin#{currentWorkSpaceProjectBean.getPluginID(plugin)}" >
<div onclick="setPlugin#{counter.index}();" style="left: #{counter.index * 90}px; top: #{counter.index * 70}px; position: absolute" class="ui-panel ui-widget ui-widget-content ui-corner-all block draggable" id="plugin#{currentAnalysisEditorBean.getPluginID(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="Remove" action="#{currentWorkSpaceProjectBean.removePlugin(plugin)}" update=":propertiesForm :centerForm"/>
<p:commandLink ajax="true" value="Remove" action="#{currentAnalysisEditorBean.removePlugin(plugin)}" update=":propertiesForm :centerForm"/>
</div>
</ui:repeat>
<ui:repeat value="#{currentWorkSpaceProjectBean.project.repositories}" var="repository" varStatus="counter">
<p:remoteCommand name="setRepository#{counter.index}" action="#{currentWorkSpaceProjectBean.setSelectedRepository(repository)}" update=":propertiesForm"/>
<ui:repeat value="#{currentAnalysisEditorBean.project.repositories}" var="repository" varStatus="counter">
<p:remoteCommand name="setRepository#{counter.index}" action="#{currentAnalysisEditorBean.setSelectedRepository(repository)}" update=":propertiesForm"/>
<!-- Netbeans reports an error here, but the code does still work though... -->
<div onclick="setRepository#{counter.index}();" style="left: #{(currentWorkSpaceProjectBean.project.plugins.size() + counter.index) * 90}px; top: #{counter.index * 70}px; position: absolute" class="ui-panel ui-widget ui-widget-content ui-corner-all block draggable" id="repository#{currentWorkSpaceProjectBean.getRepositoryID(repository)}" >
<div onclick="setRepository#{counter.index}();" style="left: #{(currentAnalysisEditorBean.project.plugins.size() + counter.index) * 90}px; top: #{counter.index * 70}px; position: absolute" class="ui-panel ui-widget ui-widget-content ui-corner-all block draggable" id="repository#{currentAnalysisEditorBean.getRepositoryID(repository)}" >
<div class="ui-panel-titlebar ui-widget-header ui-corner-all">
<h:outputText style="font-weight: bold" value="#{repository.getName()}"/>
</div>
<p:commandLink ajax="true" value="Remove" action="#{currentWorkSpaceProjectBean.removeRepository(repository)}" update=":propertiesForm :centerForm"/>
<p:commandLink ajax="true" value="Remove" action="#{currentAnalysisEditorBean.removeRepository(repository)}" update=":propertiesForm :centerForm"/>
</div>
</ui:repeat>
<ui:repeat value="#{currentWorkSpaceProjectBean.filterConnections}" var="connection">
<div class="connector plugin#{currentWorkSpaceProjectBean.getPluginID(connection.source)} plugin#{currentWorkSpaceProjectBean.getPluginID(connection.destination)}">
<ui:repeat value="#{currentAnalysisEditorBean.filterConnections}" var="connection">
<div class="connector plugin#{currentAnalysisEditorBean.getPluginID(connection.source)} plugin#{currentAnalysisEditorBean.getPluginID(connection.destination)}">
<label class="source-label"><h:outputText value="#{connection.outputPort.getName()}"/></label>
<label class="destination-label"><h:outputText value="#{connection.inputPort.getName()}"/></label>
<img src="../img/arrow.gif" class="connector-end"/>
</div>
</ui:repeat>
<ui:repeat value="#{currentWorkSpaceProjectBean.repoConnections}" var="connection">
<div class="connector plugin#{currentWorkSpaceProjectBean.getPluginID(connection.source)} repository#{currentWorkSpaceProjectBean.getRepositoryID(connection.destination)}">
<ui:repeat value="#{currentAnalysisEditorBean.repoConnections}" var="connection">
<div class="connector plugin#{currentAnalysisEditorBean.getPluginID(connection.source)} repository#{currentAnalysisEditorBean.getRepositoryID(connection.destination)}">
<label class="source-label"><h:outputText value="#{connection.outputPort.getName()}"/></label>
<img src="../img/arrow.gif" class="connector-end"/>
</div>
......@@ -114,7 +114,7 @@
<p:layoutUnit style="font-size: 12px" position="south" size="150" header="Properties" resizable="true" collapsible="true">
<h:form id="propertiesForm" >
<p:dataTable editable="true" value="#{currentWorkSpaceProjectBean.advancedPluginProperties}" var="property" emptyMessage="No properties available" rendered="#{not empty currentWorkSpaceProjectBean.selectedPlugin}">
<p:dataTable editable="true" value="#{currentAnalysisEditorBean.advancedPluginProperties}" var="property" emptyMessage="No properties available" rendered="#{not empty currentAnalysisEditorBean.selectedPlugin}">
<p:column headerText="Key" style="width:125px">
<h:outputText value="#{property.name}" rendered="#{not stringBean.checkString(property)}"/>
<h:outputText value="Name" rendered="#{stringBean.checkString(property)}"/>
......@@ -124,11 +124,11 @@
<p:cellEditor>
<f:facet name="output">
<h:outputText value="#{property.value}" rendered="#{not stringBean.checkString(property)}"/>
<h:outputText value="#{currentWorkSpaceProjectBean.selectedPlugin.name}" rendered="#{stringBean.checkString(property)}"/>
<h:outputText value="#{currentAnalysisEditorBean.selectedPlugin.name}" rendered="#{stringBean.checkString(property)}"/>
</f:facet>
<f:facet name="input">
<h:inputText value="#{property.value}" rendered="#{not stringBean.checkString(property)}"/>
<h:inputText value="#{currentWorkSpaceProjectBean.selectedPlugin.name}" rendered="#{stringBean.checkString(property)}"/>
<h:inputText value="#{currentAnalysisEditorBean.selectedPlugin.name}" rendered="#{stringBean.checkString(property)}"/>
</f:facet>
</p:cellEditor>
</p:column>
......@@ -149,21 +149,21 @@
<h:form id="toolpalette">
<p:accordionPanel style="font-size: 12px" multiple="true" activeIndex="">
<p:tab title="Reader">
<ui:repeat value="#{currentWorkSpaceProjectBean.availableReaders}" var="reader">
<p:commandLink id="readerLink" value="#{reader.simpleName}" action="#{currentWorkSpaceProjectBean.addPlugin(reader)}" update=":centerForm :messages" /><br/>
<p:tooltip style="font-size: 15px" for="readerLink" value="#{currentWorkSpaceProjectBean.getDescription(reader)}"/>
<ui:repeat value="#{currentAnalysisEditorBean.availableReaders}" var="reader">
<p:commandLink id="readerLink" value="#{reader.simpleName}" action="#{currentAnalysisEditorBean.addPlugin(reader)}" update=":centerForm :messages" /><br/>
<p:tooltip style="font-size: 15px" for="readerLink" value="#{currentAnalysisEditorBean.getDescription(reader)}"/>
</ui:repeat>
</p:tab>
<p:tab title="Filter">
<ui:repeat value="#{currentWorkSpaceProjectBean.availableFilters}" var="filter">
<p:commandLink id="filterLink" value="#{filter.simpleName}" action="#{currentWorkSpaceProjectBean.addPlugin(filter)}" update=":centerForm :messages"/><br/>
<p:tooltip style="font-size: 15px" for="filterLink" value="#{currentWorkSpaceProjectBean.getDescription(filter)}"/>
<ui:repeat value="#{currentAnalysisEditorBean.availableFilters}" var="filter">
<p:commandLink id="filterLink" value="#{filter.simpleName}" action="#{currentAnalysisEditorBean.addPlugin(filter)}" update=":centerForm :messages"/><br/>
<p:tooltip style="font-size: 15px" for="filterLink" value="#{currentAnalysisEditorBean.getDescription(filter)}"/>
</ui:repeat>
</p:tab>
<p:tab title="Repositories">
<ui:repeat value="#{currentWorkSpaceProjectBean.availableRepositories}" var="repository">
<p:commandLink id="repositoryLink" value="#{repository.simpleName}" action="#{currentWorkSpaceProjectBean.addRepository(repository)}" update=":centerForm :messages"/><br/>
<p:tooltip style="font-size: 15px" for="repositoryLink" value="#{currentWorkSpaceProjectBean.getDescription(repository)}"/>
<ui:repeat value="#{currentAnalysisEditorBean.availableRepositories}" var="repository">
<p:commandLink id="repositoryLink" value="#{repository.simpleName}" action="#{currentAnalysisEditorBean.addRepository(repository)}" update=":centerForm :messages"/><br/>
<p:tooltip style="font-size: 15px" for="repositoryLink" value="#{currentAnalysisEditorBean.getDescription(repository)}"/>
</ui:repeat>
</p:tab>
</p:accordionPanel>
......
Kieker.WebGUI/src/main/webapp/Cockpit.xhtml
+ 10
− 10
View file @ 6478b11f
......@@ -22,23 +22,23 @@
<h:form>
<p:toolbar>
<p:toolbarGroup align="left">
<h:outputText styleClass="kieker-title" value="Kieker &raquo; #{stringBean.shortenLongName(currentWorkSpaceProjectBean.projectName, 30)}"/>
<h:outputText styleClass="kieker-title" value="Kieker &raquo; #{stringBean.shortenLongName(currentAnalysisEditorBean.projectName, 30)}"/>
</p:toolbarGroup>
<p:toolbarGroup align="right">
<p:commandButton styleClass="perspective-button" icon="ui-icon-home" action="ProjectOverview.xhtml" />
<p:separator/>
<p:commandButton styleClass="perspective-button" icon="ui-icon-wrench" value="Analysis Editor" style="white-space: none" ajax="false" action="#{currentWorkSpaceProjectBean.setProject(currentAnalysisCockpitProjectBean.projectName)}"/>
<p:commandButton styleClass="perspective-button" icon="ui-icon-circle-triangle-e" value="Analysis" ajax="false" action="#{currentControllerBean.setProject(currentAnalysisCockpitProjectBean.projectName)}" />
<p:commandButton styleClass="perspective-button" icon="ui-icon-wrench" value="Analysis Editor" style="white-space: none" ajax="false" action="#{currentAnalysisEditorBean.setProject(currentCockpitBean.projectName)}"/>
<p:commandButton styleClass="perspective-button" icon="ui-icon-circle-triangle-e" value="Analysis" ajax="false" action="#{currentControllerBean.setProject(currentCockpitBean.projectName)}" />
<p:separator/>
<p:commandButton styleClass="perspective-button" icon="ui-icon-wrench" value="Cockpit Editor" ajax="false" action="#{currentCockpitEditorBean.setProject(currentAnalysisCockpitProjectBean.projectName)}" />
<p:commandButton styleClass="perspective-button" icon="ui-icon-image" value="Cockpit" ajax="false" disabled="true" action="#{currentAnalysisCockpitProjectBean.setProject(currentAnalysisCockpitProjectBean.projectName)}" />
<p:commandButton styleClass="perspective-button" icon="ui-icon-wrench" value="Cockpit Editor" ajax="false" action="#{currentCockpitEditorBean.setProject(currentCockpitBean.projectName)}" />
<p:commandButton styleClass="perspective-button" icon="ui-icon-image" value="Cockpit" ajax="false" disabled="true" action="#{currentCockpitBean.setProject(currentCockpitBean.projectName)}" />
</p:toolbarGroup>
</p:toolbar>
<p:menubar>
<p:submenu label="File">
<p:menuitem styleClass="element-with-whitespace" icon="ui-icon-gear" value=" Settings" onclick="settingsDlg.show()" ajax="true"/>
<p:separator/>
<p:menuitem styleClass="element-with-whitespace" icon="ui-icon-circle-close" value=" Close Project" action="#{currentAnalysisCockpitProjectBean.clearProject()}" ajax="false"/>
<p:menuitem styleClass="element-with-whitespace" icon="ui-icon-circle-close" value=" Close Project" action="#{currentCockpitBean.clearProject()}" ajax="false"/>
</p:submenu>
<p:submenu label="Help">
......@@ -56,9 +56,9 @@
<p:layoutUnit position="center" id="centerLayout">
<h:form id="centerForm">
<ui:repeat value="#{currentAnalysisCockpitProjectBean.activeView.displays}" var="display">
<ui:repeat value="#{currentCockpitBean.activeView.displays}" var="display">
<p:panel header="#{display.name}">
<h:outputText value="#{currentAnalysisCockpitProjectBean.updatePlainTextDisplay(display.name)}"/>
<h:outputText value="#{currentCockpitBean.updatePlainTextDisplay(display.name)}"/>
</p:panel>
</ui:repeat>
</h:form>
......@@ -67,12 +67,12 @@
<p:layoutUnit position="west" size="300" header="Views" resizable="true" collapsible="true">
<h:form id="viewsForm">
<p:poll interval="1" update=":centerForm"/>
<p:accordionPanel multiple="true" activeIndex="" value="#{currentAnalysisCockpitProjectBean.project.views}" var="currView">
<p:accordionPanel multiple="true" activeIndex="" value="#{currentCockpitBean.project.views}" var="currView">
<p:tab title="#{currView.name}">
<h:outputText value="#{currView.description}" rendered="#{not empty currView.description}"/>
<h:outputText value="No description available." rendered="#{empty currView.description}"/>
<hr/>
Click <h:commandLink value="here" action="#{currentAnalysisCockpitProjectBean.setActiveView(currView)}"/> to activate this view.
Click <h:commandLink value="here" action="#{currentCockpitBean.setActiveView(currView)}"/> to activate this view.
</p:tab>
</p:accordionPanel>
</h:form>
......
Kieker.WebGUI/src/main/webapp/CockpitEditor.xhtml
+ 4
− 4
View file @ 6478b11f
......@@ -20,16 +20,16 @@
<h:form>
<p:toolbar>
<p:toolbarGroup align="left">
<h:outputText styleClass="kieker-title" value="Kieker &raquo; #{stringBean.shortenLongName(currentWorkSpaceProjectBean.projectName, 30)}"/>
<h:outputText styleClass="kieker-title" value="Kieker &raquo; #{stringBean.shortenLongName(currentAnalysisEditorBean.projectName, 30)}"/>
</p:toolbarGroup>
<p:toolbarGroup align="right">
<p:commandButton styleClass="perspective-button" icon="ui-icon-home" action="ProjectOverview.xhtml" />
<p:separator/>
<p:commandButton styleClass="perspective-button" icon="ui-icon-wrench" value="Analysis Editor" style="white-space: none" ajax="false" action="#{currentWorkSpaceProjectBean.setProject(currentCockpitEditorBean.projectName)}"/>
<p:commandButton styleClass="perspective-button" icon="ui-icon-wrench" value="Analysis Editor" style="white-space: none" ajax="false" action="#{currentAnalysisEditorBean.setProject(currentCockpitEditorBean.projectName)}"/>
<p:commandButton styleClass="perspective-button" icon="ui-icon-circle-triangle-e" value="Analysis" ajax="false" action="#{currentControllerBean.setProject(currentCockpitEditorBean.projectName)}" />
<p:separator/>
<p:commandButton styleClass="perspective-button" icon="ui-icon-wrench" value="Cockpit Editor" ajax="false" disabled="true" action="#{currentCockpitEditorBean.setProject(currentCockpitEditorBean.projectName)}" />
<p:commandButton styleClass="perspective-button" icon="ui-icon-image" value="Cockpit" ajax="false" action="#{currentAnalysisCockpitProjectBean.setProject(currentCockpitEditorBean.projectName)}" />
<p:commandButton styleClass="perspective-button" icon="ui-icon-image" value="Cockpit" ajax="false" action="#{currentCockpitBean.setProject(currentCockpitEditorBean.projectName)}" />
</p:toolbarGroup>
</p:toolbar>
<p:menubar>
......@@ -37,7 +37,7 @@
<p:menuitem styleClass="element-with-whitespace" icon="ui-icon-document" value=" New View" onclick="newViewDialog.show()" ajax="true"/>
<p:separator/>
<p:menuitem styleClass="element-with-whitespace" icon="ui-icon-disk" value=" Save Project" update=":messages" ajax="true" action="#{currentCockpitEditorBean.saveProject(false)}" disabled="#{empty currentCockpitEditorBean.project}"/>
<p:menuitem styleClass="element-with-whitespace" icon="ui-icon-disk" value=" Save Project As" update=":messages" ajax="true" disabled="#{empty currentWorkSpaceProjectBean.project}"/>
<p:menuitem styleClass="element-with-whitespace" icon="ui-icon-disk" value=" Save Project As" update=":messages" ajax="true" disabled="#{empty currentAnalysisEditorBean.project}"/>
<p:menuitem styleClass="element-with-whitespace Force-Save-Project-Button" icon="ui-icon-alert" value=" Force Save Project" update=":messages" ajax="true" action="#{currentCockpitEditorBean.saveProject(true)}" disabled="#{empty currentCockpitEditorBean.project}"/>
<p:separator/>
<p:menuitem styleClass="element-with-whitespace" icon="ui-icon-refresh" value=" Reload Project" ajax="true" disabled="#{empty currentCockpitEditorBean.project or true}"/>
......
Kieker.WebGUI/src/main/webapp/Controller.xhtml
+ 3
− 3
View file @ 6478b11f
......@@ -22,16 +22,16 @@
<h:form>
<p:toolbar>
<p:toolbarGroup align="left">
<h:outputText styleClass="kieker-title" value="Kieker &raquo; #{stringBean.shortenLongName(currentWorkSpaceProjectBean.projectName, 30)}"/>
<h:outputText styleClass="kieker-title" value="Kieker &raquo; #{stringBean.shortenLongName(currentAnalysisEditorBean.projectName, 30)}"/>
</p:toolbarGroup>
<p:toolbarGroup align="right">
<p:commandButton styleClass="perspective-button" icon="ui-icon-home" action="ProjectOverview.xhtml"/>
<p:separator/>
<p:commandButton styleClass="perspective-button" icon="ui-icon-wrench" value="Analysis Editor" style="white-space: none" ajax="false" action="#{currentWorkSpaceProjectBean.setProject(currentControllerBean.projectName)}"/>
<p:commandButton styleClass="perspective-button" icon="ui-icon-wrench" value="Analysis Editor" style="white-space: none" ajax="false" action="#{currentAnalysisEditorBean.setProject(currentControllerBean.projectName)}"/>
<p:commandButton styleClass="perspective-button" icon="ui-icon-circle-triangle-e" value="Analysis" ajax="false" disabled="true" />
<p:separator/>
<p:commandButton styleClass="perspective-button" icon="ui-icon-wrench" value="Cockpit Editor" ajax="false" action="#{currentCockpitEditorBean.setProject(currentControllerBean.projectName)}" />
<p:commandButton styleClass="perspective-button" icon="ui-icon-image" value="Cockpit" ajax="false" action="#{currentAnalysisCockpitProjectBean.setProject(currentControllerBean.projectName)}" />
<p:commandButton styleClass="perspective-button" icon="ui-icon-image" value="Cockpit" ajax="false" action="#{currentCockpitBean.setProject(currentControllerBean.projectName)}" />
</p:toolbarGroup>
</p:toolbar>
......
Kieker.WebGUI/src/main/webapp/ProjectOverview.xhtml
+ 4
− 4
View file @ 6478b11f
......@@ -22,11 +22,11 @@
<p:toolbarGroup align="right">
<p:commandButton styleClass="perspective-button" icon="ui-icon-home" disabled="true" action="ProjectOverview.xhtml" />
<p:separator/>
<p:commandButton styleClass="perspective-button" icon="ui-icon-wrench" value="Analysis Editor" style="white-space: none" ajax="false" action="#{currentWorkSpaceProjectBean.setProject(currentProjectOverviewBean.projectName)}"/>
<p:commandButton styleClass="perspective-button" icon="ui-icon-wrench" value="Analysis Editor" style="white-space: none" ajax="false" action="#{currentAnalysisEditorBean.setProject(currentProjectOverviewBean.projectName)}"/>
<p:commandButton styleClass="perspective-button" icon="ui-icon-circle-triangle-e" value="Analysis" ajax="false" action="#{currentControllerBean.setProject(currentProjectOverviewBean.projectName)}" />
<p:separator/>
<p:commandButton styleClass="perspective-button" icon="ui-icon-wrench" value="Cockpit Editor" ajax="false" action="#{currentCockpitEditorBean.setProject(currentProjectOverviewBean.projectName)}" />
<p:commandButton styleClass="perspective-button" icon="ui-icon-image" value="Cockpit" ajax="false" action="#{currentAnalysisCockpitProjectBean.setProject(currentProjectOverviewBean.projectName)}" />
<p:commandButton styleClass="perspective-button" icon="ui-icon-image" value="Cockpit" ajax="false" action="#{currentCockpitBean.setProject(currentProjectOverviewBean.projectName)}" />
</p:toolbarGroup>
</p:toolbar>
......@@ -59,12 +59,12 @@
<p:commandLink id="dynaButton" value="#{project}"/>
<p:menu overlay="true" trigger="dynaButton" my="left top" at="left bottom" style="width:210px">
<p:menuitem icon="ui-icon-wrench" id="openButton" value=" Analysis Editor" styleClass="element-with-whitespace" ajax="false" action="#{currentWorkSpaceProjectBean.setProject(project)}"/>
<p:menuitem icon="ui-icon-wrench" id="openButton" value=" Analysis Editor" styleClass="element-with-whitespace" ajax="false" action="#{currentAnalysisEditorBean.setProject(project)}"/>
<p:menuitem icon="ui-icon-circle-triangle-e" id="controlAnalysis" styleClass="element-with-whitespace" value=" Analysis" ajax="false" action="#{currentControllerBean.setProject(project)}" />
<p:separator/>
<p:menuitem icon="ui-icon-wrench" id="editAnalysisViews" styleClass="element-with-whitespace" value=" Cockpit Editor" ajax="false" action="#{currentCockpitEditorBean.setProject(project)}" />
<p:menuitem icon="ui-icon-image" id="showAnalysis" styleClass="element-with-whitespace" value=" Cockpit" ajax="false" action="#{currentAnalysisCockpitProjectBean.setProject(project)}" />
<p:menuitem icon="ui-icon-image" id="showAnalysis" styleClass="element-with-whitespace" value=" Cockpit" ajax="false" action="#{currentCockpitBean.setProject(project)}" />
<p:separator/>
<p:menuitem id="copyButton" icon="ui-icon-copy" styleClass="element-with-whitespace" value=" Copy Project" action="#{currentProjectOverviewBean.setProjectName(project)}" onclick="copyProjectDialog.show()" disabled="true"/>
<p:menuitem id="renameButton" icon="ui-icon-pencil" styleClass="element-with-whitespace" value=" Rename Project" action="#{currentProjectOverviewBean.setProjectName(project)}" onclick="renameProjectDialog.show()" disabled="true"/>
......
Kieker.WebGUI/src/main/webapp/dialogs/connectionDialog.xhtml
+ 8
− 8
View file @ 6478b11f
......@@ -8,17 +8,17 @@
<p:dialog id="connectionDlg" header="Manage Connections"
resizable="false" modal="true" widgetVar="connectionDialog">
<h:form id="connectionDialogForm"
rendered="#{not empty currentWorkSpaceProjectBean.project}">
rendered="#{not empty currentAnalysisEditorBean.project}">
<p:tabView>
<p:tab title="Plugin -> Plugin Connections">
<p:commandButton value="Add Connection" ajax="true"
action="#{currentWorkSpaceProjectBean.addConnection()}"
action="#{currentAnalysisEditorBean.addConnection()}"
update=":connectionDialogForm" />
<br />
<br />
<p:dataTable editable="true"
value="#{currentWorkSpaceProjectBean.filterConnections}"
value="#{currentAnalysisEditorBean.filterConnections}"
var="connection" paginator="true" rows="10"
paginatorTemplate="{CurrentPageReport} {FirstPageLink} {PreviousPageLink} {PageLinks} {NextPageLink} {LastPageLink} {RowsPerPageDropdown}">
......@@ -33,7 +33,7 @@
value="#{connection.source}" effectDuration="100">
<f:selectItem value="#{null}" itemLabel="N/A" itemValue="#{null}" />
<f:selectItems
value="#{currentWorkSpaceProjectBean.project.plugins}"
value="#{currentAnalysisEditorBean.project.plugins}"
var="plugin" itemLabel="#{plugin.name}" itemValue="#{plugin}" />
<p:ajax event="change" update="outputPortsList" />
</p:selectOneMenu>
......@@ -73,7 +73,7 @@
value="#{connection.destination}" effectDuration="100">
<f:selectItem value="#{null}" itemLabel="N/A"
itemValue="#{null}" />
<f:selectItems value="#{currentWorkSpaceProjectBean.filters}"
<f:selectItems value="#{currentAnalysisEditorBean.filters}"
var="plugin" itemLabel="#{plugin.name}" itemValue="#{plugin}" />
<p:ajax event="change" update="inputPortsList" />
</p:selectOneMenu>
......@@ -114,7 +114,7 @@
<p:tab title="Plugin -> Repository Connections">
<p:dataTable editable="true"
value="#{currentWorkSpaceProjectBean.repoConnections}"
value="#{currentAnalysisEditorBean.repoConnections}"
var="connection" paginator="true" rows="10"
paginatorTemplate="{CurrentPageReport} {FirstPageLink} {PreviousPageLink} {PageLinks} {NextPageLink} {LastPageLink} {RowsPerPageDropdown}">
......@@ -136,7 +136,7 @@
value="#{connection.destination}" effectDuration="100">
<f:selectItem value="#{null}" itemLabel="N/A"
itemValue="#{null}" />
<f:selectItems value="#{currentWorkSpaceProjectBean.repositories}"
<f:selectItems value="#{currentAnalysisEditorBean.repositories}"
var="repo" itemLabel="#{repo.name}" itemValue="#{repo}" />
<p:ajax event="change" />
</p:selectOneMenu>
......@@ -157,7 +157,7 @@
<br />
<hr />
<div style="text-align: right">
<p:commandButton value="Ok" action="#{currentWorkSpaceProjectBean.submitConnections()}" oncomplete="connectionDialog.hide();" />
<p:commandButton value="Ok" action="#{currentAnalysisEditorBean.submitConnections()}" oncomplete="connectionDialog.hide();" />
</div>
</h:form>
</p:dialog>
......
Kieker.WebGUI/src/main/webapp/dialogs/manageLibrariesDialog.xhtml
+ 2
− 2
View file @ 6478b11f
......@@ -9,7 +9,7 @@
modal="true" widgetVar="manageLibrariesDialog">
<h:form id="dependenciesForm">
<p:dataTable id="currentDependencies" value="#{currentWorkSpaceProjectBean.libraries}" var="dependency" paginator="true" rows="10" paginatorTemplate="{CurrentPageReport} {FirstPageLink} {PreviousPageLink} {PageLinks} {NextPageLink} {LastPageLink} {RowsPerPageDropdown}" >
<p:dataTable id="currentDependencies" value="#{currentAnalysisEditorBean.libraries}" var="dependency" paginator="true" rows="10" paginatorTemplate="{CurrentPageReport} {FirstPageLink} {PreviousPageLink} {PageLinks} {NextPageLink} {LastPageLink} {RowsPerPageDropdown}" >
<p:column headerText="Filename">
<h:outputText value="#{dependency.fst}"/>
......@@ -33,7 +33,7 @@
<br />
<br />
<h:form enctype="multipart/form-data">
<p:fileUpload auto="true" allowTypes="/(\.|\/)(jar)$/" sizeLimit="104857600" mode="advanced" fileUploadListener="#{currentWorkSpaceProjectBean.handleFileUpload}" update=":dependenciesForm :messages :toolpalette"/>
<p:fileUpload auto="true" allowTypes="/(\.|\/)(jar)$/" sizeLimit="104857600" mode="advanced" fileUploadListener="#{currentAnalysisEditorBean.handleFileUpload}" update=":dependenciesForm :messages :toolpalette"/>
</h:form>
</div>
<hr/>
......
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment