From 372e022ed17f1d1014d898749baf9cecc07794ff Mon Sep 17 00:00:00 2001
From: Nils Christian Ehmke <nie@informatik.uni-kiel.de>
Date: Mon, 30 Jul 2012 15:16:15 +0200
Subject: [PATCH] Moved the beans into the correct subpackage.
---
.../webgui/beans/application/ForwardBean.java | 66 -------------------
.../CurrentAnalysisEditorBean.java | 2 +-
.../{session => view}/CurrentCockpitBean.java | 2 +-
.../CurrentCockpitEditorBean.java | 2 +-
.../CurrentControllerBean.java | 2 +-
.../converter/MIPluginStringConverter.java | 2 +-
.../converter/MIPortStringConverter.java | 2 +-
.../MIRepositoryStringConverter.java | 2 +-
8 files changed, 7 insertions(+), 73 deletions(-)
delete mode 100644 Kieker.WebGUI/src/main/java/kieker/webgui/beans/application/ForwardBean.java
rename Kieker.WebGUI/src/main/java/kieker/webgui/beans/{session => view}/CurrentAnalysisEditorBean.java (99%)
rename Kieker.WebGUI/src/main/java/kieker/webgui/beans/{session => view}/CurrentCockpitBean.java (99%)
rename Kieker.WebGUI/src/main/java/kieker/webgui/beans/{session => view}/CurrentCockpitEditorBean.java (99%)
rename Kieker.WebGUI/src/main/java/kieker/webgui/beans/{session => view}/CurrentControllerBean.java (99%)
diff --git a/Kieker.WebGUI/src/main/java/kieker/webgui/beans/application/ForwardBean.java b/Kieker.WebGUI/src/main/java/kieker/webgui/beans/application/ForwardBean.java
deleted file mode 100644
index 34d6e63a..00000000
--- a/Kieker.WebGUI/src/main/java/kieker/webgui/beans/application/ForwardBean.java
+++ /dev/null
@@ -1,66 +0,0 @@
-/***************************************************************************
- * Copyright 2012 by
- * + Christian-Albrechts-University of Kiel
- * + Department of Computer Science
- * + Software Engineering Group
- * and others.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- ***************************************************************************/
-
-package kieker.webgui.beans.application;
-
-import javax.faces.bean.ApplicationScoped;
-import javax.faces.bean.ManagedBean;
-
-import kieker.webgui.beans.IProjectBean;
-
-/**
- * The {@link ForwardBean} is a helper class for navigation purposes only. It allows to navigate between specific pages in a generic matter and is furthermore the
- * reason for the existence of the interface {@link IProjectBean}. The bean has also no properties or fields which could be modified.<br>
- * The bean is an application scoped bean, as there is in its functionality as a utility bean no reason to have more than one instance.
- *
- * @author Nils Christian Ehmke
- * @version 1.0
- */
-@ManagedBean
-@ApplicationScoped
-public final class ForwardBean {
-
- /**
- * Default constructor. <b>Do not use this constructor. This bean is JSF managed.</b>
- */
- public ForwardBean() {
- // No code necessary.
- }
-
- /**
- * This method allows the navigation from one page to another, by saving the project name of the source bean, cleaning the source bean and then setting the
- * project name of the destination bean. This method then returns the return value of the setter-method of the destination bean. This is usually the next page of
- * the corresponding bean and can be used to redirect the user.
- *
- * @param sourceBean
- * The bean which will be used to get the project name and will be cleared in this method afterwards.
- * @param destinationBean
- * The destination bean whose project name will be set to the saved value and whose return value will be returned.
- * @return The return value of the destination bean.
- */
- public String forward(final IProjectBean sourceBean, final IProjectBean destinationBean) {
- // Remember the project name and clean the source bean
- final String projectName = sourceBean.getProjectName();
- sourceBean.clearProject();
-
- // Set the project of the destination bean and return its return value
- return destinationBean.setProject(projectName);
- }
-}
diff --git a/Kieker.WebGUI/src/main/java/kieker/webgui/beans/session/CurrentAnalysisEditorBean.java b/Kieker.WebGUI/src/main/java/kieker/webgui/beans/view/CurrentAnalysisEditorBean.java
similarity index 99%
rename from Kieker.WebGUI/src/main/java/kieker/webgui/beans/session/CurrentAnalysisEditorBean.java
rename to Kieker.WebGUI/src/main/java/kieker/webgui/beans/view/CurrentAnalysisEditorBean.java
index 9e2977bc..88da8b88 100644
--- a/Kieker.WebGUI/src/main/java/kieker/webgui/beans/session/CurrentAnalysisEditorBean.java
+++ b/Kieker.WebGUI/src/main/java/kieker/webgui/beans/view/CurrentAnalysisEditorBean.java
@@ -18,7 +18,7 @@
* limitations under the License.
***************************************************************************/
-package kieker.webgui.beans.session;
+package kieker.webgui.beans.view;
import java.io.IOException;
import java.lang.reflect.InvocationTargetException;
diff --git a/Kieker.WebGUI/src/main/java/kieker/webgui/beans/session/CurrentCockpitBean.java b/Kieker.WebGUI/src/main/java/kieker/webgui/beans/view/CurrentCockpitBean.java
similarity index 99%
rename from Kieker.WebGUI/src/main/java/kieker/webgui/beans/session/CurrentCockpitBean.java
rename to Kieker.WebGUI/src/main/java/kieker/webgui/beans/view/CurrentCockpitBean.java
index 6ca7d965..9f6a5a67 100644
--- a/Kieker.WebGUI/src/main/java/kieker/webgui/beans/session/CurrentCockpitBean.java
+++ b/Kieker.WebGUI/src/main/java/kieker/webgui/beans/view/CurrentCockpitBean.java
@@ -18,7 +18,7 @@
* limitations under the License.
***************************************************************************/
-package kieker.webgui.beans.session;
+package kieker.webgui.beans.view;
import javax.faces.bean.ManagedBean;
import javax.faces.bean.ViewScoped;
diff --git a/Kieker.WebGUI/src/main/java/kieker/webgui/beans/session/CurrentCockpitEditorBean.java b/Kieker.WebGUI/src/main/java/kieker/webgui/beans/view/CurrentCockpitEditorBean.java
similarity index 99%
rename from Kieker.WebGUI/src/main/java/kieker/webgui/beans/session/CurrentCockpitEditorBean.java
rename to Kieker.WebGUI/src/main/java/kieker/webgui/beans/view/CurrentCockpitEditorBean.java
index 376f61e8..cd496fad 100644
--- a/Kieker.WebGUI/src/main/java/kieker/webgui/beans/session/CurrentCockpitEditorBean.java
+++ b/Kieker.WebGUI/src/main/java/kieker/webgui/beans/view/CurrentCockpitEditorBean.java
@@ -18,7 +18,7 @@
* limitations under the License.
***************************************************************************/
-package kieker.webgui.beans.session;
+package kieker.webgui.beans.view;
import java.io.IOException;
import java.lang.reflect.Method;
diff --git a/Kieker.WebGUI/src/main/java/kieker/webgui/beans/session/CurrentControllerBean.java b/Kieker.WebGUI/src/main/java/kieker/webgui/beans/view/CurrentControllerBean.java
similarity index 99%
rename from Kieker.WebGUI/src/main/java/kieker/webgui/beans/session/CurrentControllerBean.java
rename to Kieker.WebGUI/src/main/java/kieker/webgui/beans/view/CurrentControllerBean.java
index f0102426..508549fa 100644
--- a/Kieker.WebGUI/src/main/java/kieker/webgui/beans/session/CurrentControllerBean.java
+++ b/Kieker.WebGUI/src/main/java/kieker/webgui/beans/view/CurrentControllerBean.java
@@ -18,7 +18,7 @@
* limitations under the License.
***************************************************************************/
-package kieker.webgui.beans.session;
+package kieker.webgui.beans.view;
import java.io.IOException;
diff --git a/Kieker.WebGUI/src/main/java/kieker/webgui/converter/MIPluginStringConverter.java b/Kieker.WebGUI/src/main/java/kieker/webgui/converter/MIPluginStringConverter.java
index c6d46790..615c4c27 100644
--- a/Kieker.WebGUI/src/main/java/kieker/webgui/converter/MIPluginStringConverter.java
+++ b/Kieker.WebGUI/src/main/java/kieker/webgui/converter/MIPluginStringConverter.java
@@ -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.CurrentAnalysisEditorBean;
+import kieker.webgui.beans.view.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).
diff --git a/Kieker.WebGUI/src/main/java/kieker/webgui/converter/MIPortStringConverter.java b/Kieker.WebGUI/src/main/java/kieker/webgui/converter/MIPortStringConverter.java
index 18bc2536..e8370eb7 100644
--- a/Kieker.WebGUI/src/main/java/kieker/webgui/converter/MIPortStringConverter.java
+++ b/Kieker.WebGUI/src/main/java/kieker/webgui/converter/MIPortStringConverter.java
@@ -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.CurrentAnalysisEditorBean;
+import kieker.webgui.beans.view.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).
diff --git a/Kieker.WebGUI/src/main/java/kieker/webgui/converter/MIRepositoryStringConverter.java b/Kieker.WebGUI/src/main/java/kieker/webgui/converter/MIRepositoryStringConverter.java
index 895b4a3c..865b57ff 100644
--- a/Kieker.WebGUI/src/main/java/kieker/webgui/converter/MIRepositoryStringConverter.java
+++ b/Kieker.WebGUI/src/main/java/kieker/webgui/converter/MIRepositoryStringConverter.java
@@ -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.CurrentAnalysisEditorBean;
+import kieker.webgui.beans.view.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).
--
GitLab