Update of
/var/cvs/contributions/CMSContainer/cmsc/sitemanagement/src/java/com/finalist/cmsc/navigation
In directory
james.mmbase.org:/tmp/cvs-serv19747/cmsc/sitemanagement/src/java/com/finalist/cmsc/navigation
Modified Files:
ServerUtil.java NavigationManager.java
Log Message:
CMSC-907 Code Quality with PMD
PMD error fixes
See also:
http://cvs.mmbase.org/viewcvs/contributions/CMSContainer/cmsc/sitemanagement/src/java/com/finalist/cmsc/navigation
See also: http://www.mmbase.org/jira/browse/CMSC-907
Index: ServerUtil.java
===================================================================
RCS file:
/var/cvs/contributions/CMSContainer/cmsc/sitemanagement/src/java/com/finalist/cmsc/navigation/ServerUtil.java,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -b -r1.8 -r1.9
--- ServerUtil.java 16 May 2008 11:46:32 -0000 1.8
+++ ServerUtil.java 9 Jun 2008 21:23:23 -0000 1.9
@@ -4,30 +4,31 @@
*/
package com.finalist.cmsc.navigation;
+import javax.naming.*;
+
import org.mmbase.util.logging.Logger;
import org.mmbase.util.logging.Logging;
-import javax.naming.Context;
-import javax.naming.InitialContext;
-import javax.naming.NamingException;
-
/**
- * Utility methods to check wether we are running in staging or live.
+ * Utility methods to check whether we are running in staging, live or single.
*
* @author Edwin van der Elst, Finalist IT-Group - Date :Nov 14, 2003
*/
-public class ServerUtil {
+public final class ServerUtil {
/** MMBase logging system */
private static final Logger log =
Logging.getLoggerInstance(ServerUtil.class.getName());
private static boolean live;
private static boolean single;
- private static boolean useServerName = false;
+ private static boolean useSvrName = false;
private static boolean production = false;
private static boolean loaded;
+ private ServerUtil() {
+ // Utility
+ }
public static boolean isSingle(){
getSetting();
@@ -54,7 +55,7 @@
public static boolean useServerName() {
getSetting();
- return useServerName;
+ return useSvrName;
}
@@ -67,9 +68,9 @@
String liveOrStaging = (String) env.lookup("server/LiveOrStaging");
live = "live".equals(liveOrStaging);
single = "single".equals(liveOrStaging);
- String useServerNameStr = (String)
env.lookup("server/useServerName");
+ String useServerNameStr = (String) env.lookup("server/useSvrName");
if (useServerNameStr != null && useServerNameStr.length() > 0) {
- useServerName = Boolean.valueOf(useServerNameStr);
+ useSvrName = Boolean.valueOf(useServerNameStr);
}
String productionStr = (String) env.lookup("server/production");
Index: NavigationManager.java
===================================================================
RCS file:
/var/cvs/contributions/CMSContainer/cmsc/sitemanagement/src/java/com/finalist/cmsc/navigation/NavigationManager.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -b -r1.3 -r1.4
--- NavigationManager.java 30 Nov 2007 10:58:31 -0000 1.3
+++ NavigationManager.java 9 Jun 2008 21:23:23 -0000 1.4
@@ -13,10 +13,13 @@
*
* @author freek
*/
-public class NavigationManager {
+public final class NavigationManager {
- private static ArrayList<NavigationItemManager> managers = new
ArrayList<NavigationItemManager>();
+ private static List<NavigationItemManager> managers = new
ArrayList<NavigationItemManager>();
+ private NavigationManager() {
+ // Access object for navigation managers
+ }
public static void registerNavigationManager(NavigationItemManager manager)
{
if (manager.isRoot()) {
_______________________________________________
Cvs mailing list
[email protected]
http://lists.mmbase.org/mailman/listinfo/cvs
