You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@beehive.apache.org by ek...@apache.org on 2005/08/31 23:54:39 UTC
svn commit: r265592 - in /beehive/trunk/netui/src:
pageflow/org/apache/beehive/netui/script/
tags-html/org/apache/beehive/netui/tags/
tags-html/org/apache/beehive/netui/tags/rendering/
Author: ekoneil
Date: Wed Aug 31 14:54:36 2005
New Revision: 265592
URL: http://svn.apache.org/viewcvs?rev=265592&view=rev
Log:
Switch the JspTagConfig and ExpressionLanguagesConfig objects from XMLBeans to JavaBeans.
BB: self
DRT: NetUI pass
Modified:
beehive/trunk/netui/src/pageflow/org/apache/beehive/netui/script/ExpressionEngineFactory.java
beehive/trunk/netui/src/pageflow/org/apache/beehive/netui/script/ExpressionEvaluatorFactory.java
beehive/trunk/netui/src/tags-html/org/apache/beehive/netui/tags/TagConfig.java
beehive/trunk/netui/src/tags-html/org/apache/beehive/netui/tags/rendering/TagRenderingBase.java
Modified: beehive/trunk/netui/src/pageflow/org/apache/beehive/netui/script/ExpressionEngineFactory.java
URL: http://svn.apache.org/viewcvs/beehive/trunk/netui/src/pageflow/org/apache/beehive/netui/script/ExpressionEngineFactory.java?rev=265592&r1=265591&r2=265592&view=diff
==============================================================================
--- beehive/trunk/netui/src/pageflow/org/apache/beehive/netui/script/ExpressionEngineFactory.java (original)
+++ beehive/trunk/netui/src/pageflow/org/apache/beehive/netui/script/ExpressionEngineFactory.java Wed Aug 31 14:54:36 2005
@@ -23,5 +23,4 @@
public abstract class ExpressionEngineFactory {
public abstract ExpressionEvaluator getInstance();
-}
-
+}
\ No newline at end of file
Modified: beehive/trunk/netui/src/pageflow/org/apache/beehive/netui/script/ExpressionEvaluatorFactory.java
URL: http://svn.apache.org/viewcvs/beehive/trunk/netui/src/pageflow/org/apache/beehive/netui/script/ExpressionEvaluatorFactory.java?rev=265592&r1=265591&r2=265592&view=diff
==============================================================================
--- beehive/trunk/netui/src/pageflow/org/apache/beehive/netui/script/ExpressionEvaluatorFactory.java (original)
+++ beehive/trunk/netui/src/pageflow/org/apache/beehive/netui/script/ExpressionEvaluatorFactory.java Wed Aug 31 14:54:36 2005
@@ -21,6 +21,9 @@
import java.util.Map;
import org.apache.beehive.netui.util.config.ConfigUtil;
+import org.apache.beehive.netui.util.config.bean.NetUIConfig;
+import org.apache.beehive.netui.util.config.bean.ExpressionLanguagesConfig;
+import org.apache.beehive.netui.util.config.bean.ExpressionLanguageConfig;
import org.apache.beehive.netui.util.config.internal.xmlbean.generated.NetuiConfigDocument.NetuiConfig;
import org.apache.beehive.netui.util.config.internal.xmlbean.generated.ExpressionLanguages;
import org.apache.beehive.netui.util.config.internal.xmlbean.generated.ExpressionLanguages.ExpressionLanguage;
@@ -31,7 +34,7 @@
*/
public class ExpressionEvaluatorFactory {
- private static final Logger _logger = Logger.getInstance(ExpressionEvaluatorFactory.class);
+ private static final Logger LOGGER = Logger.getInstance(ExpressionEvaluatorFactory.class);
private static final HashMap FACTORY_MAP = new HashMap();
private static ExpressionEngineFactory DEFAULT_FACTORY;
@@ -42,8 +45,8 @@
} catch(Exception e) {
DEFAULT_FACTORY = null;
- if(_logger.isErrorEnabled())
- _logger.error("An exception occurred loading the expression evaluator configuration. Cause: " + e, e);
+ if(LOGGER.isErrorEnabled())
+ LOGGER.error("An exception occurred loading the expression evaluator configuration. Cause: " + e, e);
}
}
@@ -72,8 +75,8 @@
return ((ExpressionEngineFactory)FACTORY_MAP.get(name)).getInstance();
String msg = "An ExpressionEvaluator named \"" + name + "\" is not available.";
- if(_logger.isErrorEnabled())
- _logger.error(msg);
+ if(LOGGER.isErrorEnabled())
+ LOGGER.error(msg);
throw new IllegalArgumentException(msg);
}
@@ -81,65 +84,66 @@
private static final ExpressionEngineFactory initialize(Map factoryMap) {
assert factoryMap != null;
- NetuiConfig config = ConfigUtil.getConfig();
- assert config != null;
+ NetUIConfig config = ConfigUtil.getNewConfig();
- ExpressionLanguages languages = config.getExpressionLanguages();
- assert languages != null;
+ ExpressionLanguagesConfig elConfig = config.getExpressionLanguages();
+ assert elConfig != null;
- ExpressionLanguage[] array = languages.getExpressionLanguageArray();
- assert array != null;
+ ExpressionLanguageConfig[] els = elConfig.getExpressionLanguages();
+ assert els != null;
+
+ if(els != null) {
+ for(int i = 0; i < els.length; i++) {
+ String name = els[i].getName();
+ String className = els[i].getFactoryClass();
+
+ ExpressionEngineFactory factory = null;
+ try {
+ Class type = Class.forName(className);
+ factory = (ExpressionEngineFactory)type.newInstance();
+ } catch(ClassNotFoundException cnf) {
+ if(LOGGER.isWarnEnabled())
+ LOGGER.warn("Could not create an ExpressionEngineFactory for type \"" + className +
+ "\" because the implementation class could not be found.");
+
+ continue;
+ } catch(Exception ex) {
+ assert ex instanceof IllegalAccessException || ex instanceof InstantiationException;
+
+ if(LOGGER.isWarnEnabled())
+ LOGGER.warn("Could not create an ExpressionEngineFactory for type \"" + className +
+ "\" because an error occurred creating the factory. Cause: " + ex, ex);
+ continue;
+ }
+
+ if(factoryMap.containsKey(name))
+ if(LOGGER.isWarnEnabled())
+ LOGGER.warn("Overwriting a previously defined ExpressionEngineFactory named \"" + name +
+ "\" with a new ExpressionEngineFactory of type \"" + className + "\"");
+ else
+ LOGGER.info("Adding an ExpressionEngineFactory named \"" + name + "\" with implementation \"" + className + "\"");
- for(int i = 0; i < array.length; i++) {
- String name = array[i].getName();
- String className = array[i].getFactoryClass();
-
- ExpressionEngineFactory factory = null;
- try {
- Class type = Class.forName(className);
- factory = (ExpressionEngineFactory)type.newInstance();
- } catch(ClassNotFoundException cnf) {
- if(_logger.isWarnEnabled())
- _logger.warn("Could not create an ExpressionEngineFactory for type \"" + className +
- "\" because the implementation class could not be found.");
-
- continue;
- } catch(Exception ex) {
- assert ex instanceof IllegalAccessException || ex instanceof InstantiationException;
-
- if(_logger.isWarnEnabled())
- _logger.warn("Could not create an ExpressionEngineFactory for type \"" + className +
- "\" because an error occurred creating the factory. Cause: " + ex, ex);
- continue;
+ factoryMap.put(name, factory);
}
-
- if(factoryMap.containsKey(name))
- if(_logger.isWarnEnabled())
- _logger.warn("Overwriting a previously defined ExpressionEngineFactory named \"" + name +
- "\" with a new ExpressionEngineFactory of type \"" + className + "\"");
- else
- _logger.info("Adding an ExpressionEngineFactory named \"" + name + "\" with implementation \"" + className + "\"");
-
- factoryMap.put(name, factory);
}
ExpressionEngineFactory defaultEngineFactory = null;
- String defaultLanguage = languages.getDefaultLanguage();
+ String defaultLanguage = elConfig.getDefaultLanguage();
if(defaultLanguage != null) {
defaultEngineFactory = (ExpressionEngineFactory)factoryMap.get(defaultLanguage);
if(defaultEngineFactory != null) {
- if(_logger.isInfoEnabled())
- _logger.info("Using a default expression evaluator of type \"" + factoryMap.get(defaultLanguage).getClass().getName() + "\"");
+ if(LOGGER.isInfoEnabled())
+ LOGGER.info("Using a default expression evaluator of type \"" + factoryMap.get(defaultLanguage).getClass().getName() + "\"");
} else {
String msg =
"The default ExpressionEvaluator named \"" + defaultLanguage + "\" was specified, but the ExpressionEngineFactory could not be found.";
- if(_logger.isWarnEnabled()) _logger.warn(msg);
+ if(LOGGER.isWarnEnabled()) LOGGER.warn(msg);
throw new RuntimeException(msg);
}
} else {
String msg = "There is no default expression engine specified.";
- if(_logger.isErrorEnabled()) _logger.error(msg);
+ if(LOGGER.isErrorEnabled()) LOGGER.error(msg);
throw new RuntimeException(msg);
}
Modified: beehive/trunk/netui/src/tags-html/org/apache/beehive/netui/tags/TagConfig.java
URL: http://svn.apache.org/viewcvs/beehive/trunk/netui/src/tags-html/org/apache/beehive/netui/tags/TagConfig.java?rev=265592&r1=265591&r2=265592&view=diff
==============================================================================
--- beehive/trunk/netui/src/tags-html/org/apache/beehive/netui/tags/TagConfig.java (original)
+++ beehive/trunk/netui/src/tags-html/org/apache/beehive/netui/tags/TagConfig.java Wed Aug 31 14:54:36 2005
@@ -19,8 +19,8 @@
import org.apache.beehive.netui.tags.tree.InheritableState;
import org.apache.beehive.netui.util.config.ConfigUtil;
-import org.apache.beehive.netui.util.config.internal.xmlbean.generated.JspTagConfig;
-
+import org.apache.beehive.netui.util.config.bean.JspTagConfig;
+import org.apache.beehive.netui.util.config.bean.IdJavascript;
/**
* This class implements a series of static method that will return configuration information. The
@@ -47,8 +47,8 @@
setLegacyJavaScriptMode();
}
assert(javascriptMode != -1);
- return (javascriptMode == JspTagConfig.IdJavascript.INT_LEGACY
- || javascriptMode == JspTagConfig.IdJavascript.INT_LEGACY_ONLY);
+ return (javascriptMode == IdJavascript.INT_LEGACY
+ || javascriptMode == IdJavascript.INT_LEGACY_ONLY);
}
/**
@@ -61,8 +61,8 @@
setLegacyJavaScriptMode();
}
assert(javascriptMode != -1);
- return (javascriptMode == JspTagConfig.IdJavascript.INT_DEFAULT
- || javascriptMode == JspTagConfig.IdJavascript.INT_LEGACY);
+ return (javascriptMode == IdJavascript.INT_DEFAULT
+ || javascriptMode == IdJavascript.INT_LEGACY);
}
/**
@@ -77,7 +77,7 @@
public static String getTreeImageLocation()
{
if (defaultTreeImageLocation == null) {
- JspTagConfig tagConfig = ConfigUtil.getConfig().getJspTagConfig();
+ JspTagConfig tagConfig = ConfigUtil.getNewConfig().getJspTagConfig();
if (tagConfig != null) {
String s = tagConfig.getTreeImageLocation();
defaultTreeImageLocation = (s != null) ? s : InheritableState.DEFAULT_IMAGES;
@@ -94,12 +94,12 @@
*/
private static void setLegacyJavaScriptMode()
{
- JspTagConfig tagConfig = ConfigUtil.getConfig().getJspTagConfig();
+ JspTagConfig tagConfig = ConfigUtil.getNewConfig().getJspTagConfig();
if (tagConfig != null) {
- javascriptMode = tagConfig.getIdJavascript().intValue();
+ javascriptMode = tagConfig.getIdJavascript().getValue();
}
else {
- javascriptMode = JspTagConfig.IdJavascript.INT_DEFAULT;
+ javascriptMode = IdJavascript.INT_DEFAULT;
}
}
}
Modified: beehive/trunk/netui/src/tags-html/org/apache/beehive/netui/tags/rendering/TagRenderingBase.java
URL: http://svn.apache.org/viewcvs/beehive/trunk/netui/src/tags-html/org/apache/beehive/netui/tags/rendering/TagRenderingBase.java?rev=265592&r1=265591&r2=265592&view=diff
==============================================================================
--- beehive/trunk/netui/src/tags-html/org/apache/beehive/netui/tags/rendering/TagRenderingBase.java (original)
+++ beehive/trunk/netui/src/tags-html/org/apache/beehive/netui/tags/rendering/TagRenderingBase.java Wed Aug 31 14:54:36 2005
@@ -17,12 +17,11 @@
*/
package org.apache.beehive.netui.tags.rendering;
-import org.apache.beehive.netui.util.internal.InternalStringBuilder;
-
import org.apache.beehive.netui.tags.html.Html;
import org.apache.beehive.netui.util.Bundle;
import org.apache.beehive.netui.util.config.ConfigUtil;
-import org.apache.beehive.netui.util.config.internal.xmlbean.generated.JspTagConfig;
+import org.apache.beehive.netui.util.config.bean.DocType;
+import org.apache.beehive.netui.util.config.bean.JspTagConfig;
import org.apache.beehive.netui.util.logging.Logger;
import org.apache.struts.util.ResponseUtils;
@@ -71,9 +70,9 @@
static
{
_defaultDocType = HTML_RENDERING_QUIRKS;
- JspTagConfig tagConfig = ConfigUtil.getConfig().getJspTagConfig();
+ JspTagConfig tagConfig = ConfigUtil.getNewConfig().getJspTagConfig();
if (tagConfig != null) {
- JspTagConfig.Doctype.Enum docType = tagConfig.getDoctype();
+ DocType docType = tagConfig.getDocType();
setDefaultDocType(docType);
}
}
@@ -83,14 +82,14 @@
return _defaultDocType;
}
- public static void setDefaultDocType(JspTagConfig.Doctype.Enum docType)
+ public static void setDefaultDocType(DocType docType)
{
if (docType != null) {
- if (docType == JspTagConfig.Doctype.HTML_4_LOOSE)
+ if (docType == DocType.HTML4_LOOSE)
_defaultDocType = TagRenderingBase.HTML_RENDERING;
- else if (docType == JspTagConfig.Doctype.HTML_4_LOOSE_QUIRKS)
+ else if (docType == DocType.HTML4_LOOSE_QUIRKS)
_defaultDocType = TagRenderingBase.HTML_RENDERING_QUIRKS;
- else if (docType== JspTagConfig.Doctype.XHTML_1_TRANSITIONAL)
+ else if (docType== DocType.XHTML1_TRANSITIONAL)
_defaultDocType = TagRenderingBase.XHTML_RENDERING;
}
}