From c1c95e9e469913703bcfab7328a8a2f43686d641 Mon Sep 17 00:00:00 2001
From: Nils Christian Ehmke <nie@informatik.uni-kiel.de>
Date: Sat, 19 May 2012 22:19:51 +0200
Subject: [PATCH] Some minor code modifications for checkstyle.
---
.../beans/application/ProjectsBean.java | 13 +++++++++--
.../beans/application/ThemeSwitcherBean.java | 2 +-
.../CurrentAnalysisCockpitProjectBean.java | 2 +-
.../CurrentAnalysisControllerProjectBean.java | 2 +-
...rrentAnalysisViewWorkSpaceProjectBean.java | 2 +-
.../beans/session/CurrentThemeBean.java | 2 +-
.../session/CurrentWorkSpaceProjectBean.java | 10 +++++++--
.../kieker/webgui/beans/session/UserBean.java | 2 +-
.../java/kieker/webgui/common/FSManager.java | 18 ++++++++++-----
.../main/java/kieker/webgui/common/Pair.java | 22 +++++++++----------
.../ProjectAlreadyExistingException.java | 6 +++++
11 files changed, 54 insertions(+), 27 deletions(-)
diff --git a/Kieker.WebGUI/src/main/java/kieker/webgui/beans/application/ProjectsBean.java b/Kieker.WebGUI/src/main/java/kieker/webgui/beans/application/ProjectsBean.java
index 42808161..9c5bb7cf 100644
--- a/Kieker.WebGUI/src/main/java/kieker/webgui/beans/application/ProjectsBean.java
+++ b/Kieker.WebGUI/src/main/java/kieker/webgui/beans/application/ProjectsBean.java
@@ -2,7 +2,7 @@
* Copyright 2012 by
* + Christian-Albrechts-University of Kiel
* + Department of Computer Science
- * + Software Engineering Group
+ * + Software Engineering Group
* and others.
*
* Licensed under the Apache License, Version 2.0 (the "License");
@@ -66,6 +66,9 @@ public final class ProjectsBean {
// No code necessary
}
+ /**
+ * Initializes this bean.
+ */
@SuppressWarnings("unused")
@PostConstruct
private void init() {
@@ -158,7 +161,13 @@ public final class ProjectsBean {
public String getAnalysisControllerState(final String project) {
final AnalysisController controller = this.analysisController.get(project);
- return (controller == null) ? "N/A" : controller.getState().toString();
+ final String controllerState;
+ if (controller == null) {
+ controllerState = "N/A";
+ } else {
+ controllerState = controller.getState().toString();
+ }
+ return controllerState;
}
/**
diff --git a/Kieker.WebGUI/src/main/java/kieker/webgui/beans/application/ThemeSwitcherBean.java b/Kieker.WebGUI/src/main/java/kieker/webgui/beans/application/ThemeSwitcherBean.java
index e4144671..dbf06cc3 100644
--- a/Kieker.WebGUI/src/main/java/kieker/webgui/beans/application/ThemeSwitcherBean.java
+++ b/Kieker.WebGUI/src/main/java/kieker/webgui/beans/application/ThemeSwitcherBean.java
@@ -2,7 +2,7 @@
* Copyright 2012 by
* + Christian-Albrechts-University of Kiel
* + Department of Computer Science
- * + Software Engineering Group
+ * + Software Engineering Group
* and others.
*
* Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/Kieker.WebGUI/src/main/java/kieker/webgui/beans/session/CurrentAnalysisCockpitProjectBean.java b/Kieker.WebGUI/src/main/java/kieker/webgui/beans/session/CurrentAnalysisCockpitProjectBean.java
index 1b5db7db..dccd1e79 100644
--- a/Kieker.WebGUI/src/main/java/kieker/webgui/beans/session/CurrentAnalysisCockpitProjectBean.java
+++ b/Kieker.WebGUI/src/main/java/kieker/webgui/beans/session/CurrentAnalysisCockpitProjectBean.java
@@ -2,7 +2,7 @@
* Copyright 2012 by
* + Christian-Albrechts-University of Kiel
* + Department of Computer Science
- * + Software Engineering Group
+ * + Software Engineering Group
* and others.
*
* Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/Kieker.WebGUI/src/main/java/kieker/webgui/beans/session/CurrentAnalysisControllerProjectBean.java b/Kieker.WebGUI/src/main/java/kieker/webgui/beans/session/CurrentAnalysisControllerProjectBean.java
index f0cd345d..31e42b77 100644
--- a/Kieker.WebGUI/src/main/java/kieker/webgui/beans/session/CurrentAnalysisControllerProjectBean.java
+++ b/Kieker.WebGUI/src/main/java/kieker/webgui/beans/session/CurrentAnalysisControllerProjectBean.java
@@ -2,7 +2,7 @@
* Copyright 2012 by
* + Christian-Albrechts-University of Kiel
* + Department of Computer Science
- * + Software Engineering Group
+ * + Software Engineering Group
* and others.
*
* Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/Kieker.WebGUI/src/main/java/kieker/webgui/beans/session/CurrentAnalysisViewWorkSpaceProjectBean.java b/Kieker.WebGUI/src/main/java/kieker/webgui/beans/session/CurrentAnalysisViewWorkSpaceProjectBean.java
index c1c3d27e..0c00c4ef 100644
--- a/Kieker.WebGUI/src/main/java/kieker/webgui/beans/session/CurrentAnalysisViewWorkSpaceProjectBean.java
+++ b/Kieker.WebGUI/src/main/java/kieker/webgui/beans/session/CurrentAnalysisViewWorkSpaceProjectBean.java
@@ -2,7 +2,7 @@
* Copyright 2012 by
* + Christian-Albrechts-University of Kiel
* + Department of Computer Science
- * + Software Engineering Group
+ * + Software Engineering Group
* and others.
*
* Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/Kieker.WebGUI/src/main/java/kieker/webgui/beans/session/CurrentThemeBean.java b/Kieker.WebGUI/src/main/java/kieker/webgui/beans/session/CurrentThemeBean.java
index 23881d9e..827a0966 100644
--- a/Kieker.WebGUI/src/main/java/kieker/webgui/beans/session/CurrentThemeBean.java
+++ b/Kieker.WebGUI/src/main/java/kieker/webgui/beans/session/CurrentThemeBean.java
@@ -2,7 +2,7 @@
* Copyright 2012 by
* + Christian-Albrechts-University of Kiel
* + Department of Computer Science
- * + Software Engineering Group
+ * + Software Engineering Group
* and others.
*
* Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/Kieker.WebGUI/src/main/java/kieker/webgui/beans/session/CurrentWorkSpaceProjectBean.java b/Kieker.WebGUI/src/main/java/kieker/webgui/beans/session/CurrentWorkSpaceProjectBean.java
index 618cdab9..9b2188a2 100644
--- a/Kieker.WebGUI/src/main/java/kieker/webgui/beans/session/CurrentWorkSpaceProjectBean.java
+++ b/Kieker.WebGUI/src/main/java/kieker/webgui/beans/session/CurrentWorkSpaceProjectBean.java
@@ -2,7 +2,7 @@
* Copyright 2012 by
* + Christian-Albrechts-University of Kiel
* + Department of Computer Science
- * + Software Engineering Group
+ * + Software Engineering Group
* and others.
*
* Licensed under the Apache License, Version 2.0 (the "License");
@@ -155,7 +155,13 @@ public final class CurrentWorkSpaceProjectBean {
}
// Now deliver the correct navigation page
- return (this.project != null) ? CurrentWorkSpaceProjectBean.PAGE_PROJECT_WORK_SPACE : "";
+ final String navigationPage;
+ if (this.project != null) {
+ navigationPage = CurrentWorkSpaceProjectBean.PAGE_PROJECT_WORK_SPACE;
+ } else {
+ navigationPage = "";
+ }
+ return navigationPage;
}
/**
diff --git a/Kieker.WebGUI/src/main/java/kieker/webgui/beans/session/UserBean.java b/Kieker.WebGUI/src/main/java/kieker/webgui/beans/session/UserBean.java
index 91895aad..0d87d930 100644
--- a/Kieker.WebGUI/src/main/java/kieker/webgui/beans/session/UserBean.java
+++ b/Kieker.WebGUI/src/main/java/kieker/webgui/beans/session/UserBean.java
@@ -2,7 +2,7 @@
* Copyright 2012 by
* + Christian-Albrechts-University of Kiel
* + Department of Computer Science
- * + Software Engineering Group
+ * + Software Engineering Group
* and others.
*
* Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/Kieker.WebGUI/src/main/java/kieker/webgui/common/FSManager.java b/Kieker.WebGUI/src/main/java/kieker/webgui/common/FSManager.java
index f03b8dde..e41dbd36 100644
--- a/Kieker.WebGUI/src/main/java/kieker/webgui/common/FSManager.java
+++ b/Kieker.WebGUI/src/main/java/kieker/webgui/common/FSManager.java
@@ -2,7 +2,7 @@
* Copyright 2012 by
* + Christian-Albrechts-University of Kiel
* + Department of Computer Science
- * + Software Engineering Group
+ * + Software Engineering Group
* and others.
*
* Licensed under the Apache License, Version 2.0 (the "License");
@@ -251,7 +251,7 @@ public final class FSManager {
final List<String> result = new ArrayList<String>();
// Get all directories within our root-dir
- final File files[] = new File(FSManager.ROOT_DIRECTORY).listFiles();
+ final File[] files = new File(FSManager.ROOT_DIRECTORY).listFiles();
for (final File file : files) {
if (file.isDirectory()) {
result.add(file.getName());
@@ -298,7 +298,13 @@ public final class FSManager {
final Object newLock = new Object();
final Object existLock = this.projectLocksMap.putIfAbsent(project, newLock);
- return (existLock != null) ? existLock : newLock;
+ final Object lock;
+ if (existLock != null) {
+ lock = existLock;
+ } else {
+ lock = newLock;
+ }
+ return lock;
}
/**
@@ -375,7 +381,7 @@ public final class FSManager {
synchronized (lock) {
// Run through the libs and put them into our list.
final File libDir = new File(FSManager.ROOT_DIRECTORY + File.separator + projectName + File.separator + FSManager.LIB_DIRECTORY);
- final File files[] = libDir.listFiles();
+ final File[] files = libDir.listFiles();
if (files != null) {
for (final File file : files) {
if (file.getName().endsWith("." + FSManager.LIB_EXTENSION)) {
@@ -409,7 +415,7 @@ public final class FSManager {
synchronized (lock) {
// Run through the libs and put them into our list.
final File libDir = new File(FSManager.ROOT_DIRECTORY + File.separator + projectName + File.separator + FSManager.LIB_DIRECTORY);
- final File files[] = libDir.listFiles();
+ final File[] files = libDir.listFiles();
if (files != null) {
for (final File file : files) {
if (file.getName().endsWith("." + FSManager.LIB_EXTENSION)) {
@@ -465,7 +471,7 @@ public final class FSManager {
synchronized (lock) {
// Run through the libs and put them into our list.
final File libDir = new File(FSManager.ROOT_DIRECTORY + File.separator + projectName + File.separator + FSManager.LIB_DIRECTORY);
- final File files[] = libDir.listFiles();
+ final File[] files = libDir.listFiles();
if (files != null) {
for (final File file : files) {
if (file.getName().endsWith("." + FSManager.LIB_EXTENSION)) {
diff --git a/Kieker.WebGUI/src/main/java/kieker/webgui/common/Pair.java b/Kieker.WebGUI/src/main/java/kieker/webgui/common/Pair.java
index 23aebdd2..b885bc7c 100644
--- a/Kieker.WebGUI/src/main/java/kieker/webgui/common/Pair.java
+++ b/Kieker.WebGUI/src/main/java/kieker/webgui/common/Pair.java
@@ -2,7 +2,7 @@
* Copyright 2012 by
* + Christian-Albrechts-University of Kiel
* + Department of Computer Science
- * + Software Engineering Group
+ * + Software Engineering Group
* and others.
*
* Licensed under the Apache License, Version 2.0 (the "License");
@@ -26,21 +26,21 @@ package kieker.webgui.common;
* @author Nils Christian Ehmke
* @version 1.0
*
- * @param <FST>
+ * @param <F>
* The type of the first element.
- * @param <SND>
+ * @param <S>
* The type of the second element.
*/
-public class Pair<FST, SND> {
+public class Pair<F, S> {
/**
* This is the first element.
*/
- private FST fst;
+ private F fst;
/**
* This is the second element.
*/
- private SND snd;
+ private S snd;
/**
* Creates a new instance of this class with null values stored for the elements.
@@ -57,7 +57,7 @@ public class Pair<FST, SND> {
* @param snd
* The second element to be stored in this object.
*/
- public Pair(final FST fst, final SND snd) {
+ public Pair(final F fst, final S snd) {
this.fst = fst;
this.snd = snd;
}
@@ -67,7 +67,7 @@ public class Pair<FST, SND> {
*
* @return The first element.
*/
- public FST getFst() {
+ public F getFst() {
return this.fst;
}
@@ -77,7 +77,7 @@ public class Pair<FST, SND> {
* @param fst
* The new first element.
*/
- public void setFst(final FST fst) {
+ public void setFst(final F fst) {
this.fst = fst;
}
@@ -86,7 +86,7 @@ public class Pair<FST, SND> {
*
* @return The second element.
*/
- public SND getSnd() {
+ public S getSnd() {
return this.snd;
}
@@ -96,7 +96,7 @@ public class Pair<FST, SND> {
* @param snd
* The new second element.
*/
- public void setSnd(final SND snd) {
+ public void setSnd(final S snd) {
this.snd = snd;
}
diff --git a/Kieker.WebGUI/src/main/java/kieker/webgui/common/exception/ProjectAlreadyExistingException.java b/Kieker.WebGUI/src/main/java/kieker/webgui/common/exception/ProjectAlreadyExistingException.java
index 09fe5242..785740ce 100644
--- a/Kieker.WebGUI/src/main/java/kieker/webgui/common/exception/ProjectAlreadyExistingException.java
+++ b/Kieker.WebGUI/src/main/java/kieker/webgui/common/exception/ProjectAlreadyExistingException.java
@@ -20,6 +20,12 @@
package kieker.webgui.common.exception;
+/**
+ * This exception shows that an project with the same name exists already.
+ *
+ * @author Nils Christian Ehmke
+ * @version 1.0
+ */
public class ProjectAlreadyExistingException extends Exception {
private static final long serialVersionUID = 1L;
--
GitLab