You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@roller.apache.org by ag...@apache.org on 2006/10/13 02:24:34 UTC
svn commit: r463525 -
/incubator/roller/trunk/src/org/apache/roller/model/RollerFactory.java
Author: agilliland
Date: Thu Oct 12 17:24:33 2006
New Revision: 463525
URL: http://svn.apache.org/viewvc?view=rev&rev=463525
Log:
code reformatting & cleanup.
Modified:
incubator/roller/trunk/src/org/apache/roller/model/RollerFactory.java
Modified: incubator/roller/trunk/src/org/apache/roller/model/RollerFactory.java
URL: http://svn.apache.org/viewvc/incubator/roller/trunk/src/org/apache/roller/model/RollerFactory.java?view=diff&rev=463525&r1=463524&r2=463525
==============================================================================
--- incubator/roller/trunk/src/org/apache/roller/model/RollerFactory.java (original)
+++ incubator/roller/trunk/src/org/apache/roller/model/RollerFactory.java Thu Oct 12 17:24:33 2006
@@ -1,84 +1,78 @@
/*
-* Licensed to the Apache Software Foundation (ASF) under one or more
-* contributor license agreements. The ASF licenses this file to You
-* 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. For additional information regarding
-* copyright in this work, please see the NOTICE file in the top level
-* directory of this distribution.
-*/
-package org.apache.roller.model;
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. The ASF licenses this file to You
+ * 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. For additional information regarding
+ * copyright in this work, please see the NOTICE file in the top level
+ * directory of this distribution.
+ */
+package org.apache.roller.model;
+import org.apache.commons.lang.StringUtils;
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
-import org.apache.roller.RollerException;
import org.apache.roller.config.RollerConfig;
-import org.apache.commons.lang.StringUtils;
+
/**
- * This is primarily a static holder for whatever Roller implementation is
- * being used. RollerContext should call setRoller(ServletContext) during its
- * initialization so that the Roller implementation can be instantiated.
- * Likewise, RollerContext.getRoller() should be replaced with calls to
- * RollerFactory.getRoller(). This should prevent us any direct ties to
+ * This is primarily a static holder for whatever Roller implementation is
+ * being used. RollerContext should call setRoller(ServletContext) during its
+ * initialization so that the Roller implementation can be instantiated.
+ * Likewise, RollerContext.getRoller() should be replaced with calls to
+ * RollerFactory.getRoller(). This should prevent us any direct ties to
* Castor and permit for experimentation* with other persistence frameworks.
- *
- * @author llavandowska
- * @author Allen Gilliland
*/
-public abstract class RollerFactory
-{
- private static final String DEFAULT_IMPL =
- "org.apache.roller.business.hibernate.HibernateRollerImpl";
+public abstract class RollerFactory {
+
+ private static Log log = LogFactory.getLog(RollerFactory.class);
+
+ private static final String DEFAULT_IMPL =
+ "org.apache.roller.business.hibernate.HibernateRollerImpl";
private static Roller rollerInstance = null;
-
- private static Log mLogger =
- LogFactory.getFactory().getInstance(RollerFactory.class);
-
- /**
- * Let's just be doubling certain this class cannot be instantiated.
- * @see java.lang.Object#Object()
- */
- private RollerFactory()
- {
+
+
+
+ // non-instantiable
+ private RollerFactory() {
// hello all you beautiful people
}
+
/**
* Static accessor for the instance of Roller
* held by this class.
- *
+ *
* @return Roller
*/
- public static Roller getRoller()
- {
+ public static Roller getRoller() {
// check to see if we need to instantiate
if(rollerInstance == null) {
// lookup value for the roller classname to use
- String roller_classname =
+ String roller_classname =
RollerConfig.getProperty("persistence.roller.classname");
// now call setRoller ourselves
RollerFactory.setRoller(roller_classname);
}
-
+
return rollerInstance;
}
/**
* Construct the actual Roller implemenation for this instance.
- *
+ *
* Use reflection to call the implementation's instantiate() method.
* Should this fail (either no implementation is specified or
* instantiate() throws an Exception) then the DEFAULT_IMPL will be tried.
@@ -87,64 +81,54 @@
* @param roller_classname The name of the Roller implementation class
* to instantiate.
*/
- public static void setRoller(String roller_classname)
- {
+ public static void setRoller(String roller_classname) {
if (StringUtils.isEmpty( roller_classname ))
roller_classname = DEFAULT_IMPL;
- try
- {
+ try {
Class rollerClass = Class.forName(roller_classname);
java.lang.reflect.Method instanceMethod =
rollerClass.getMethod("instantiate", (Class[])null);
// do the invocation
rollerInstance = (Roller)
- instanceMethod.invoke(rollerClass, (Object[])null);
+ instanceMethod.invoke(rollerClass, (Object[])null);
- mLogger.info("Using Roller Impl: " + roller_classname);
- }
- catch (Exception e)
- {
+ log.info("Using Roller Impl: " + roller_classname);
+ } catch (Exception e) {
// uh oh
- mLogger.error("Error instantiating " + roller_classname, e);
- try
- {
+ log.error("Error instantiating " + roller_classname, e);
+ try {
// if we didn't already try DEFAULT_IMPL then try it now
- if( ! DEFAULT_IMPL.equals(roller_classname))
- {
- mLogger.info("** Trying DEFAULT_IMPL "+DEFAULT_IMPL+" **");
+ if( ! DEFAULT_IMPL.equals(roller_classname)) {
+ log.info("** Trying DEFAULT_IMPL "+DEFAULT_IMPL+" **");
Class rollerClass = Class.forName(DEFAULT_IMPL);
java.lang.reflect.Method instanceMethod =
rollerClass.getMethod("instantiate", (Class[])null);
// do the invocation
- rollerInstance = (Roller)
- instanceMethod.invoke(rollerClass, (Object[])null);
- }
- else
- {
+ rollerInstance = (Roller)
+ instanceMethod.invoke(rollerClass, (Object[])null);
+ } else {
// we just do this so that the logger gets the message
throw new Exception("Doh! Couldn't instantiate a roller class");
}
- }
- catch (Exception re)
- {
- mLogger.fatal("Failed to instantiate fallback roller impl", re);
+ } catch (Exception re) {
+ log.fatal("Failed to instantiate fallback roller impl", re);
}
}
}
-
- /**
- * Set Roller to be returned by factory.
- */
- public static void setRoller(Roller roller)
- {
- if (roller != null) rollerInstance = roller;
- }
+
+ /**
+ * Set Roller to be returned by factory.
+ */
+ public static void setRoller(Roller roller) {
+ if (roller != null) rollerInstance = roller;
+ }
+
}