You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@myfaces.apache.org by lo...@apache.org on 2013/11/15 18:11:10 UTC
svn commit: r1542331 [6/28] - in /myfaces/tobago/trunk:
tobago-core/src/main/java/org/apache/myfaces/tobago/ajax/
tobago-core/src/main/java/org/apache/myfaces/tobago/application/
tobago-core/src/main/java/org/apache/myfaces/tobago/compat/ tobago-core/s...
Modified: myfaces/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/component/AbstractUITree.java
URL: http://svn.apache.org/viewvc/myfaces/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/component/AbstractUITree.java?rev=1542331&r1=1542330&r2=1542331&view=diff
==============================================================================
--- myfaces/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/component/AbstractUITree.java (original)
+++ myfaces/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/component/AbstractUITree.java Fri Nov 15 17:10:58 2013
@@ -64,14 +64,14 @@ public abstract class AbstractUITree ext
private TreeState state;
@Override
- public void processValidators(FacesContext facesContext) {
+ public void processValidators(final FacesContext facesContext) {
final int last = hasRows() ? getFirst() + getRows() : Integer.MAX_VALUE;
for (int rowIndex = getFirst(); rowIndex < last; rowIndex++) {
setRowIndex(rowIndex);
if (!isRowAvailable()) {
break;
}
- for (UIComponent child : getChildren()) {
+ for (final UIComponent child : getChildren()) {
child.processValidators(facesContext);
}
}
@@ -79,14 +79,14 @@ public abstract class AbstractUITree ext
}
@Override
- public void processUpdates(FacesContext facesContext) {
+ public void processUpdates(final FacesContext facesContext) {
final int last = hasRows() ? getFirst() + getRows() : Integer.MAX_VALUE;
for (int rowIndex = getFirst(); rowIndex < last; rowIndex++) {
setRowIndex(rowIndex);
if (!isRowAvailable()) {
break;
}
- for (UIComponent child : getChildren()) {
+ for (final UIComponent child : getChildren()) {
child.processUpdates(facesContext);
}
}
@@ -99,7 +99,7 @@ public abstract class AbstractUITree ext
@Deprecated
public UIComponent getRoot() {
// find the UITreeNode in the children.
- for (UIComponent child : getChildren()) {
+ for (final UIComponent child : getChildren()) {
if (child instanceof AbstractUITreeNode) {
return child;
}
@@ -125,7 +125,7 @@ public abstract class AbstractUITree ext
}
@Override
- public void processDecodes(FacesContext facesContext) {
+ public void processDecodes(final FacesContext facesContext) {
if (!isRendered()) {
return;
@@ -137,7 +137,7 @@ public abstract class AbstractUITree ext
if (!isRowAvailable()) {
break;
}
- for (UIComponent child : getChildren()) {
+ for (final UIComponent child : getChildren()) {
child.processDecodes(facesContext);
}
}
@@ -201,7 +201,7 @@ public abstract class AbstractUITree ext
// TODO: updating the model here and *NOT* in the decode phase
}
*/
- public void setState(TreeState state) {
+ public void setState(final TreeState state) {
this.state = state;
}
@@ -237,15 +237,15 @@ public abstract class AbstractUITree ext
}
@Override
- public void restoreState(FacesContext context, Object componentState) {
- Object[] values = (Object[]) componentState;
+ public void restoreState(final FacesContext context, final Object componentState) {
+ final Object[] values = (Object[]) componentState;
super.restoreState(context, values[0]);
state = (TreeState) values[1];
}
@Override
- public Object saveState(FacesContext context) {
- Object[] values = new Object[2];
+ public Object saveState(final FacesContext context) {
+ final Object[] values = new Object[2];
values[0] = super.saveState(context);
values[1] = state;
return values;
Modified: myfaces/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/component/AbstractUITreeData.java
URL: http://svn.apache.org/viewvc/myfaces/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/component/AbstractUITreeData.java?rev=1542331&r1=1542330&r2=1542331&view=diff
==============================================================================
--- myfaces/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/component/AbstractUITreeData.java (original)
+++ myfaces/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/component/AbstractUITreeData.java Fri Nov 15 17:10:58 2013
@@ -43,10 +43,10 @@ public abstract class AbstractUITreeData
/**
* Patch for backward compatibility.
*/
- public void onComponentCreated(FacesContext facesContext, UIComponent parent) {
+ public void onComponentCreated(final FacesContext facesContext, final UIComponent parent) {
Deprecation.LOG.warn("Please not use the <tc:treeData> tag.");
if (parent instanceof AbstractUITree) {
- ValueExpression ve = getValueExpression("var");
+ final ValueExpression ve = getValueExpression("var");
if (ve != null) {
parent.setValueExpression("var", ve);
} else {
@@ -55,7 +55,7 @@ public abstract class AbstractUITreeData
}
if (parent instanceof AbstractUITree) {
- ValueExpression ve = getValueExpression("value");
+ final ValueExpression ve = getValueExpression("value");
if (ve != null) {
parent.setValueExpression("value", ve);
} else {
@@ -68,18 +68,18 @@ public abstract class AbstractUITreeData
return var;
}
- public void setVar(String var) {
+ public void setVar(final String var) {
this.var = var;
}
- public void restoreState(FacesContext context, Object componentState) {
- Object[] values = (Object[]) componentState;
+ public void restoreState(final FacesContext context, final Object componentState) {
+ final Object[] values = (Object[]) componentState;
super.restoreState(context, values[0]);
var = (String) values[1];
}
- public Object saveState(FacesContext context) {
- Object[] values = new Object[2];
+ public Object saveState(final FacesContext context) {
+ final Object[] values = new Object[2];
values[0] = super.saveState(context);
values[1] = var;
return values;
@@ -89,7 +89,7 @@ public abstract class AbstractUITreeData
* @deprecated since 2.0.0
*/
@Deprecated
- public void buildTreeModelBegin(FacesContext facesContext, MixedTreeModel model) {
+ public void buildTreeModelBegin(final FacesContext facesContext, final MixedTreeModel model) {
Deprecation.LOG.error("Doesn't work anymore.");
}
@@ -97,7 +97,7 @@ public abstract class AbstractUITreeData
* @deprecated since 2.0.0
*/
@Deprecated
- public void buildTreeModelChildren(FacesContext facesContext, MixedTreeModel model) {
+ public void buildTreeModelChildren(final FacesContext facesContext, final MixedTreeModel model) {
Deprecation.LOG.error("Doesn't work anymore.");
}
@@ -105,7 +105,7 @@ public abstract class AbstractUITreeData
* @deprecated since 2.0.0
*/
@Deprecated
- public void buildTreeModelEnd(FacesContext facesContext, MixedTreeModel model) {
+ public void buildTreeModelEnd(final FacesContext facesContext, final MixedTreeModel model) {
Deprecation.LOG.error("Doesn't work anymore.");
}
}
Modified: myfaces/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/component/AbstractUITreeNode.java
URL: http://svn.apache.org/viewvc/myfaces/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/component/AbstractUITreeNode.java?rev=1542331&r1=1542330&r2=1542331&view=diff
==============================================================================
--- myfaces/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/component/AbstractUITreeNode.java (original)
+++ myfaces/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/component/AbstractUITreeNode.java Fri Nov 15 17:10:58 2013
@@ -41,7 +41,7 @@ public abstract class AbstractUITreeNode
extends AbstractUIColumn implements SupportsMarkup, TreeModelBuilder, Configurable {
@Override
- public void encodeBegin(FacesContext facesContext) throws IOException {
+ public void encodeBegin(final FacesContext facesContext) throws IOException {
final TreeDataModel model = ComponentUtils.findAncestor(this, AbstractUIData.class).getTreeDataModel();
model.setRowClientId(getClientId(facesContext));
@@ -72,10 +72,10 @@ public abstract class AbstractUITreeNode
return model.getPath();
}
- public String nodeStateId(FacesContext facesContext) {
+ public String nodeStateId(final FacesContext facesContext) {
final String clientId = getClientId(facesContext);
final UIData data = ComponentUtils.findAncestor(this, UIData.class);
- String dataId = data.getClientId(facesContext);
+ final String dataId = data.getClientId(facesContext);
return clientId.substring(dataId.length() + 1);
}
@@ -96,7 +96,7 @@ public abstract class AbstractUITreeNode
* @deprecated since 2.0.0
*/
@Deprecated
- public void buildTreeModelBegin(FacesContext facesContext, MixedTreeModel model) {
+ public void buildTreeModelBegin(final FacesContext facesContext, final MixedTreeModel model) {
Deprecation.LOG.error("Doesn't work anymore.");
}
@@ -104,7 +104,7 @@ public abstract class AbstractUITreeNode
* @deprecated since 2.0.0
*/
@Deprecated
- public void buildTreeModelChildren(FacesContext facesContext, MixedTreeModel model) {
+ public void buildTreeModelChildren(final FacesContext facesContext, final MixedTreeModel model) {
Deprecation.LOG.error("Doesn't work anymore.");
}
@@ -112,7 +112,7 @@ public abstract class AbstractUITreeNode
* @deprecated since 2.0.0
*/
@Deprecated
- public void buildTreeModelEnd(FacesContext facesContext, MixedTreeModel model) {
+ public void buildTreeModelEnd(final FacesContext facesContext, final MixedTreeModel model) {
Deprecation.LOG.error("Doesn't work anymore.");
}
@@ -129,7 +129,7 @@ public abstract class AbstractUITreeNode
* @deprecated since 2.0.0
*/
@Deprecated
- public void setDepth(int depth) {
+ public void setDepth(final int depth) {
Deprecation.LOG.error("Doesn't work anymore.");
}
@@ -137,7 +137,7 @@ public abstract class AbstractUITreeNode
* @deprecated since 2.0.0
*/
@Deprecated
- public void setFolder(boolean folder) {
+ public void setFolder(final boolean folder) {
Deprecation.LOG.error("Doesn't work anymore.");
}
@@ -145,7 +145,7 @@ public abstract class AbstractUITreeNode
* @deprecated since 2.0.0
*/
@Deprecated
- public void setPath(TreePath path) {
+ public void setPath(final TreePath path) {
Deprecation.LOG.error("Doesn't work anymore.");
}
@@ -153,7 +153,7 @@ public abstract class AbstractUITreeNode
* @deprecated since 2.0.0
*/
@Deprecated
- public void setJunctions(List<Boolean> junctions) {
+ public void setJunctions(final List<Boolean> junctions) {
Deprecation.LOG.error("Doesn't work anymore.");
}
@@ -170,7 +170,7 @@ public abstract class AbstractUITreeNode
* @deprecated since 2.0.0
*/
@Deprecated
- public void setHasNextSibling(boolean hasNextSibling) {
+ public void setHasNextSibling(final boolean hasNextSibling) {
Deprecation.LOG.error("Doesn't work anymore.");
}
@@ -187,7 +187,7 @@ public abstract class AbstractUITreeNode
* @deprecated since 2.0.0
*/
@Deprecated
- public void setTreeExpansionListener(MethodBinding treeExpansionListener){
+ public void setTreeExpansionListener(final MethodBinding treeExpansionListener){
Deprecation.LOG.error("treeExpansionListener!");
}
@@ -195,7 +195,7 @@ public abstract class AbstractUITreeNode
* @deprecated since 2.0.0
*/
@Deprecated
- public void addTreeExpansionListener(TreeExpansionListener listener) {
+ public void addTreeExpansionListener(final TreeExpansionListener listener) {
Deprecation.LOG.error("treeExpansionListener!");
}
@@ -212,7 +212,7 @@ public abstract class AbstractUITreeNode
* @deprecated since 2.0.0
*/
@Deprecated
- public void removeStateChangeListener(TreeExpansionListener listener) {
+ public void removeStateChangeListener(final TreeExpansionListener listener) {
Deprecation.LOG.error("treeExpansionListener!");
}
@@ -229,7 +229,7 @@ public abstract class AbstractUITreeNode
* @deprecated since 2.0.0
*/
@Deprecated
- public void setTreeMarkedListener(MethodBinding treeMarkedListener){
+ public void setTreeMarkedListener(final MethodBinding treeMarkedListener){
Deprecation.LOG.error("treeMarkedListener!");
}
@@ -237,7 +237,7 @@ public abstract class AbstractUITreeNode
* @deprecated since 2.0.0
*/
@Deprecated
- public void addTreeMarkedListener(TreeMarkedListener listener) {
+ public void addTreeMarkedListener(final TreeMarkedListener listener) {
Deprecation.LOG.error("treeMarkedListener!");
}
@@ -254,7 +254,7 @@ public abstract class AbstractUITreeNode
* @deprecated since 2.0.0
*/
@Deprecated
- public void removeStateChangeListener(TreeMarkedListener listener) {
+ public void removeStateChangeListener(final TreeMarkedListener listener) {
Deprecation.LOG.error("treeMarkedListener!");
}
@@ -271,7 +271,7 @@ public abstract class AbstractUITreeNode
* @deprecated since 2.0.0
*/
@Deprecated
- public void setMarked(boolean b) {
+ public void setMarked(final boolean b) {
Deprecation.LOG.error("The marked attribute is no longer supported, please use a tree state!");
}
@@ -288,7 +288,7 @@ public abstract class AbstractUITreeNode
* @deprecated since 2.0.0
*/
@Deprecated
- public void setExpanded(boolean expanded) {
+ public void setExpanded(final boolean expanded) {
Deprecation.LOG.error("The expanded attribute is no longer supported, please use a tree state!");
}
@@ -305,7 +305,7 @@ public abstract class AbstractUITreeNode
* @deprecated since 2.0.0
*/
@Deprecated
- public void setSelected(boolean selected) {
+ public void setSelected(final boolean selected) {
Deprecation.LOG.error("The selected attribute is no longer supported, please use a tree select!");
}
}
Modified: myfaces/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/component/AbstractUITreeSelect.java
URL: http://svn.apache.org/viewvc/myfaces/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/component/AbstractUITreeSelect.java?rev=1542331&r1=1542330&r2=1542331&view=diff
==============================================================================
--- myfaces/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/component/AbstractUITreeSelect.java (original)
+++ myfaces/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/component/AbstractUITreeSelect.java Fri Nov 15 17:10:58 2013
@@ -29,7 +29,7 @@ import javax.faces.context.FacesContext;
public abstract class AbstractUITreeSelect extends UISelectBoolean implements Configurable {
@Override
- public void updateModel(FacesContext context) {
+ public void updateModel(final FacesContext context) {
super.updateModel(context);
}
Modified: myfaces/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/component/AbstractUIWizard.java
URL: http://svn.apache.org/viewvc/myfaces/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/component/AbstractUIWizard.java?rev=1542331&r1=1542330&r2=1542331&view=diff
==============================================================================
--- myfaces/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/component/AbstractUIWizard.java (original)
+++ myfaces/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/component/AbstractUIWizard.java Fri Nov 15 17:10:58 2013
@@ -44,7 +44,7 @@ public abstract class AbstractUIWizard e
private Boolean allowJumpForward;
@Override
- public void processDecodes(FacesContext facesContext) {
+ public void processDecodes(final FacesContext facesContext) {
if (var != null) {
facesContext.getExternalContext().getRequestMap().put(var, getController());
}
@@ -52,7 +52,7 @@ public abstract class AbstractUIWizard e
}
@Override
- public void decode(FacesContext facesContext) {
+ public void decode(final FacesContext facesContext) {
super.decode(facesContext);
if (var != null) {
facesContext.getExternalContext().getRequestMap().remove(var);
@@ -60,18 +60,18 @@ public abstract class AbstractUIWizard e
}
@Override
- public void queueEvent(FacesEvent event) {
+ public void queueEvent(final FacesEvent event) {
super.queueEvent(new FacesEventWrapper(event, this));
}
@Override
- public void broadcast(FacesEvent event) throws AbortProcessingException {
+ public void broadcast(final FacesEvent event) throws AbortProcessingException {
if (event instanceof FacesEventWrapper) {
- FacesContext facesContext = FacesContext.getCurrentInstance();
+ final FacesContext facesContext = FacesContext.getCurrentInstance();
if (var != null) {
facesContext.getExternalContext().getRequestMap().put(var, getController());
}
- FacesEvent originalEvent = ((FacesEventWrapper) event).getWrappedFacesEvent();
+ final FacesEvent originalEvent = ((FacesEventWrapper) event).getWrappedFacesEvent();
originalEvent.getComponent().broadcast(originalEvent);
if (var != null) {
facesContext.getExternalContext().getRequestMap().remove(var);
@@ -82,7 +82,7 @@ public abstract class AbstractUIWizard e
}
@Override
- public void encodeBegin(FacesContext facesContext) throws IOException {
+ public void encodeBegin(final FacesContext facesContext) throws IOException {
if (var != null) {
facesContext.getExternalContext().getRequestMap().put(var, getController());
}
@@ -90,15 +90,15 @@ public abstract class AbstractUIWizard e
}
@Override
- public void encodeEnd(FacesContext facesContext) throws IOException {
+ public void encodeEnd(final FacesContext facesContext) throws IOException {
super.encodeEnd(facesContext);
if (var != null) {
facesContext.getExternalContext().getRequestMap().remove(var);
}
}
- public void onComponentCreated(FacesContext context, UIComponent parent) {
- Wizard wizard = getController();
+ public void onComponentCreated(final FacesContext context, final UIComponent parent) {
+ final Wizard wizard = getController();
wizard.register();
if (getOutcome() != null) {
getController().getCurrentStep().setOutcome(getOutcome());
@@ -109,8 +109,8 @@ public abstract class AbstractUIWizard e
}
@Override
- public Object saveState(FacesContext facesContext) {
- Object[] state = new Object[3];
+ public Object saveState(final FacesContext facesContext) {
+ final Object[] state = new Object[3];
state[0] = super.saveState(facesContext);
state[1] = var;
state[2] = controller;
@@ -118,8 +118,8 @@ public abstract class AbstractUIWizard e
}
@Override
- public void restoreState(FacesContext facesContext, Object state) {
- Object[] values = (Object[]) state;
+ public void restoreState(final FacesContext facesContext, final Object state) {
+ final Object[] values = (Object[]) state;
super.restoreState(facesContext, values[0]);
var = (String) values[1];
controller = (Wizard) values[2];
@@ -129,7 +129,7 @@ public abstract class AbstractUIWizard e
if (controller != null) {
return controller;
}
- ValueBinding vb = getValueBinding("controller"); // xxx const
+ final ValueBinding vb = getValueBinding("controller"); // xxx const
if (vb != null) {
return (Wizard) vb.getValue(getFacesContext());
} else {
@@ -137,7 +137,7 @@ public abstract class AbstractUIWizard e
}
}
- public void setController(Wizard controller) {
+ public void setController(final Wizard controller) {
this.controller = controller;
}
@@ -145,7 +145,7 @@ public abstract class AbstractUIWizard e
return var;
}
- public void setVar(String var) {
+ public void setVar(final String var) {
this.var = var;
}
@@ -153,7 +153,7 @@ public abstract class AbstractUIWizard e
if (outcome != null) {
return outcome;
}
- javax.faces.el.ValueBinding vb = getValueBinding("outcome");
+ final javax.faces.el.ValueBinding vb = getValueBinding("outcome");
if (vb != null) {
return (java.lang.String) vb.getValue(getFacesContext());
}
@@ -161,7 +161,7 @@ public abstract class AbstractUIWizard e
}
- public void setOutcome(String outcome) {
+ public void setOutcome(final String outcome) {
this.outcome = outcome;
}
@@ -169,7 +169,7 @@ public abstract class AbstractUIWizard e
if (title != null) {
return title;
}
- javax.faces.el.ValueBinding vb = getValueBinding("title");
+ final javax.faces.el.ValueBinding vb = getValueBinding("title");
if (vb != null) {
return (java.lang.String) vb.getValue(getFacesContext());
}
@@ -177,7 +177,7 @@ public abstract class AbstractUIWizard e
}
- public void setTitle(String title) {
+ public void setTitle(final String title) {
this.title = title;
}
@@ -185,9 +185,9 @@ public abstract class AbstractUIWizard e
if (allowJumpForward != null) {
return allowJumpForward;
}
- javax.faces.el.ValueBinding vb = getValueBinding("allowJumpForward");
+ final javax.faces.el.ValueBinding vb = getValueBinding("allowJumpForward");
if (vb != null) {
- Boolean bool = (Boolean) vb.getValue(getFacesContext());
+ final Boolean bool = (Boolean) vb.getValue(getFacesContext());
if (bool != null) {
return bool;
}
@@ -195,7 +195,7 @@ public abstract class AbstractUIWizard e
return false;
}
- public void setAllowJumpForward(Boolean allowJumpForward) {
+ public void setAllowJumpForward(final Boolean allowJumpForward) {
this.allowJumpForward = allowJumpForward;
// getController().removeForwardSteps();
}
Modified: myfaces/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/config/ContentSecurityPolicy.java
URL: http://svn.apache.org/viewvc/myfaces/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/config/ContentSecurityPolicy.java?rev=1542331&r1=1542330&r2=1542331&view=diff
==============================================================================
--- myfaces/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/config/ContentSecurityPolicy.java (original)
+++ myfaces/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/config/ContentSecurityPolicy.java Fri Nov 15 17:10:58 2013
@@ -27,12 +27,12 @@ public class ContentSecurityPolicy {
private Mode mode;
private List<String> directiveList;
- public ContentSecurityPolicy(String mode) {
+ public ContentSecurityPolicy(final String mode) {
this.mode = Mode.parse(mode);
this.directiveList = new ArrayList<String>();
}
- public void merge(ContentSecurityPolicy other) {
+ public void merge(final ContentSecurityPolicy other) {
directiveList.addAll(other.directiveList);
mode = other.mode;
}
@@ -52,7 +52,7 @@ public class ContentSecurityPolicy {
private final String value;
- private Mode(String value) {
+ private Mode(final String value) {
this.value = value;
}
@@ -60,7 +60,7 @@ public class ContentSecurityPolicy {
return value;
}
- public static Mode parse(String string) {
+ public static Mode parse(final String string) {
if (ON.value.equals(string)) {
return ON;
} else if (OFF.value.equals(string)) {
Modified: myfaces/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/config/RendererConfig.java
URL: http://svn.apache.org/viewvc/myfaces/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/config/RendererConfig.java?rev=1542331&r1=1542330&r2=1542331&view=diff
==============================================================================
--- myfaces/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/config/RendererConfig.java (original)
+++ myfaces/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/config/RendererConfig.java Fri Nov 15 17:10:58 2013
@@ -35,11 +35,11 @@ public class RendererConfig implements S
return name;
}
- public void setName(String name) {
+ public void setName(final String name) {
this.name = StringUtils.uncapitalize(name);
}
- public boolean equals(Object o) {
+ public boolean equals(final Object o) {
if (this == o) {
return true;
}
@@ -52,7 +52,7 @@ public class RendererConfig implements S
return name.equals(that.name);
}
- public boolean contains(String markup) {
+ public boolean contains(final String markup) {
return supportedMarkups.contains(markup);
}
@@ -60,11 +60,11 @@ public class RendererConfig implements S
return name.hashCode();
}
- public void addSupportedMarkup(String markup) {
+ public void addSupportedMarkup(final String markup) {
supportedMarkups = supportedMarkups.add(Markup.valueOf(markup));
}
- public void merge(RendererConfig rendererConfig) {
+ public void merge(final RendererConfig rendererConfig) {
supportedMarkups = supportedMarkups.add(rendererConfig.supportedMarkups);
}
Modified: myfaces/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/config/RenderersConfigImpl.java
URL: http://svn.apache.org/viewvc/myfaces/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/config/RenderersConfigImpl.java?rev=1542331&r1=1542330&r2=1542331&view=diff
==============================================================================
--- myfaces/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/config/RenderersConfigImpl.java (original)
+++ myfaces/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/config/RenderersConfigImpl.java Fri Nov 15 17:10:58 2013
@@ -43,7 +43,7 @@ public class RenderersConfigImpl impleme
return merged;
}
- public void setMerged(boolean merged) {
+ public void setMerged(final boolean merged) {
this.merged = merged;
}
@@ -53,7 +53,7 @@ public class RenderersConfigImpl impleme
return result;
}
- public void addRenderer(RendererConfig rendererConfig) {
+ public void addRenderer(final RendererConfig rendererConfig) {
final String name = rendererConfig.getName();
if (rendererMap.containsKey(name)) {
rendererMap.get(name).merge(rendererConfig);
@@ -62,11 +62,11 @@ public class RenderersConfigImpl impleme
}
}
- public boolean isMarkupSupported(String rendererName, String markup) {
+ public boolean isMarkupSupported(final String rendererName, final String markup) {
if (LOG.isDebugEnabled()) {
LOG.debug("Calling isMarkupSupported('{}', '{}')", rendererName, markup);
}
- RendererConfig rendererConfig = rendererMap.get(rendererName);
+ final RendererConfig rendererConfig = rendererMap.get(rendererName);
if (rendererConfig != null) {
return rendererConfig.contains(markup);
} else {
@@ -75,9 +75,9 @@ public class RenderersConfigImpl impleme
}
}
- public void merge(RenderersConfig renderersConfig, boolean override) {
- Collection<RendererConfig> renderers = renderersConfig.getRendererConfigs();
- for (RendererConfig rendererConfig : renderers) {
+ public void merge(final RenderersConfig renderersConfig, final boolean override) {
+ final Collection<RendererConfig> renderers = renderersConfig.getRendererConfigs();
+ for (final RendererConfig rendererConfig : renderers) {
addRenderer(rendererConfig);
}
}
Modified: myfaces/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/config/TobagoConfigBuilder.java
URL: http://svn.apache.org/viewvc/myfaces/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/config/TobagoConfigBuilder.java?rev=1542331&r1=1542330&r2=1542331&view=diff
==============================================================================
--- myfaces/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/config/TobagoConfigBuilder.java (original)
+++ myfaces/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/config/TobagoConfigBuilder.java Fri Nov 15 17:10:58 2013
@@ -44,7 +44,7 @@ public final class TobagoConfigBuilder {
private List<TobagoConfigFragment> list;
- private TobagoConfigBuilder(ServletContext servletContext)
+ private TobagoConfigBuilder(final ServletContext servletContext)
throws ServletException, IOException, SAXException, ParserConfigurationException, URISyntaxException {
list = new ArrayList<TobagoConfigFragment>();
configFromClasspath();
@@ -65,19 +65,19 @@ public final class TobagoConfigBuilder {
servletContext.setAttribute(TobagoConfig.TOBAGO_CONFIG, tobagoConfig);
}
- public static void init(ServletContext servletContext) {
+ public static void init(final ServletContext servletContext) {
try {
final TobagoConfigBuilder builder = new TobagoConfigBuilder(servletContext);
- } catch (Throwable e) {
+ } catch (final Throwable e) {
if (LOG.isErrorEnabled()) {
- String error = "Error while deploy process. Tobago can't be initialized! Application will not run!";
+ final String error = "Error while deploy process. Tobago can't be initialized! Application will not run!";
LOG.error(error, e);
throw new RuntimeException(error, e);
}
}
}
- private void configFromWebInf(ServletContext servletContext)
+ private void configFromWebInf(final ServletContext servletContext)
throws IOException, SAXException, ParserConfigurationException, URISyntaxException {
final URL url = servletContext.getResource("/" + WEB_INF_TOBAGO_CONFIG_XML);
@@ -109,11 +109,11 @@ public final class TobagoConfigBuilder {
if (!"jar".equals(protocol) && !"zip".equals(protocol) && !"wsjar".equals(protocol)) {
LOG.warn("Unknown protocol '" + themeUrl + "'");
}
- } catch (Exception e) {
+ } catch (final Exception e) {
throw new Exception(e.getClass().getName() + " on themeUrl: " + themeUrl, e);
}
}
- } catch (Exception e) {
+ } catch (final Exception e) {
final String msg = "while loading ";
LOG.error(msg, e);
throw new ServletException(msg, e);
Modified: myfaces/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/config/TobagoConfigFragment.java
URL: http://svn.apache.org/viewvc/myfaces/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/config/TobagoConfigFragment.java?rev=1542331&r1=1542330&r2=1542331&view=diff
==============================================================================
--- myfaces/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/config/TobagoConfigFragment.java (original)
+++ myfaces/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/config/TobagoConfigFragment.java Fri Nov 15 17:10:58 2013
@@ -55,7 +55,7 @@ public class TobagoConfigFragment {
themeDefinitions = new ArrayList<ThemeImpl>();
}
- public void addSupportedThemeName(String name) {
+ public void addSupportedThemeName(final String name) {
supportedThemeNames.add(name);
}
@@ -67,11 +67,11 @@ public class TobagoConfigFragment {
return defaultThemeName;
}
- public void setDefaultThemeName(String defaultThemeName) {
+ public void setDefaultThemeName(final String defaultThemeName) {
this.defaultThemeName = defaultThemeName;
}
- public void addResourceDir(String resourceDir) {
+ public void addResourceDir(final String resourceDir) {
if (!resourceDirs.contains(resourceDir)) {
if (LOG.isInfoEnabled()) {
LOG.info("adding resourceDir = '{}'", resourceDir);
@@ -86,7 +86,7 @@ public class TobagoConfigFragment {
/** @deprecated since 1.5.0 */
@Deprecated
- public void setAjaxEnabled(String value) {
+ public void setAjaxEnabled(final String value) {
Deprecation.LOG.error("Ajax is always enabled!");
}
@@ -94,7 +94,7 @@ public class TobagoConfigFragment {
return renderersConfig;
}
- public void setRenderersConfig(RenderersConfig renderersConfig) {
+ public void setRenderersConfig(final RenderersConfig renderersConfig) {
this.renderersConfig = renderersConfig;
}
@@ -102,7 +102,7 @@ public class TobagoConfigFragment {
return name;
}
- public void setName(String name) {
+ public void setName(final String name) {
this.name = name;
}
@@ -110,7 +110,7 @@ public class TobagoConfigFragment {
return before;
}
- public void addBefore(String name) {
+ public void addBefore(final String name) {
before.add(name);
}
@@ -118,11 +118,11 @@ public class TobagoConfigFragment {
return after;
}
- public void addAfter(String name) {
+ public void addAfter(final String name) {
after.add(name);
}
- public void addThemeDefinition(ThemeImpl theme) {
+ public void addThemeDefinition(final ThemeImpl theme) {
themeDefinitions.add(theme);
}
@@ -134,7 +134,7 @@ public class TobagoConfigFragment {
return createSessionSecret;
}
- public void setCreateSessionSecret(String createSessionSecret) {
+ public void setCreateSessionSecret(final String createSessionSecret) {
this.createSessionSecret = Boolean.valueOf(createSessionSecret);
}
@@ -142,7 +142,7 @@ public class TobagoConfigFragment {
return checkSessionSecret;
}
- public void setCheckSessionSecret(String checkSessionSecret) {
+ public void setCheckSessionSecret(final String checkSessionSecret) {
this.checkSessionSecret = Boolean.valueOf(checkSessionSecret);
}
@@ -150,7 +150,7 @@ public class TobagoConfigFragment {
return preventFrameAttacks;
}
- public void setPreventFrameAttacks(Boolean preventFrameAttacks) {
+ public void setPreventFrameAttacks(final Boolean preventFrameAttacks) {
this.preventFrameAttacks = preventFrameAttacks;
}
@@ -158,19 +158,19 @@ public class TobagoConfigFragment {
return contentSecurityPolicy;
}
- public void setContentSecurityPolicy(ContentSecurityPolicy contentSecurityPolicy) {
+ public void setContentSecurityPolicy(final ContentSecurityPolicy contentSecurityPolicy) {
this.contentSecurityPolicy = contentSecurityPolicy;
}
/** @deprecated since 1.5.0 */
@Deprecated
- public void setFixResourceOrder(String value) {
+ public void setFixResourceOrder(final String value) {
Deprecation.LOG.error("Config fix-resource-order not longer supported. (Is always activated).");
}
/** @deprecated since 1.5.0 */
@Deprecated
- public void setFixLayoutTransparency(String value) {
+ public void setFixLayoutTransparency(final String value) {
Deprecation.LOG.error("Config fix-layout-transparency not longer supported. (Is always activated).");
}
@@ -178,7 +178,7 @@ public class TobagoConfigFragment {
return url;
}
- public void setUrl(URL url) {
+ public void setUrl(final URL url) {
this.url = url;
}
Modified: myfaces/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/config/TobagoConfigImpl.java
URL: http://svn.apache.org/viewvc/myfaces/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/config/TobagoConfigImpl.java?rev=1542331&r1=1542330&r2=1542331&view=diff
==============================================================================
--- myfaces/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/config/TobagoConfigImpl.java (original)
+++ myfaces/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/config/TobagoConfigImpl.java Fri Nov 15 17:10:58 2013
@@ -72,7 +72,7 @@ public class TobagoConfigImpl extends To
contentSecurityPolicy = new ContentSecurityPolicy(ContentSecurityPolicy.Mode.OFF.getValue());
}
- public void addSupportedThemeName(String name) {
+ public void addSupportedThemeName(final String name) {
supportedThemeNames.add(name);
}
// TODO one init method
@@ -86,15 +86,15 @@ public class TobagoConfigImpl extends To
}
} else {
int deep = 0;
- for (Map.Entry<String, Theme> entry : availableThemes.entrySet()) {
- Theme theme = entry.getValue();
+ for (final Map.Entry<String, Theme> entry : availableThemes.entrySet()) {
+ final Theme theme = entry.getValue();
if (theme.getFallbackList().size() > deep) {
defaultTheme = theme;
deep = theme.getFallbackList().size();
}
}
if (defaultTheme == null) {
- String error = "Did not found any theme! "
+ final String error = "Did not found any theme! "
+ "Please ensure you have a tobago-config.xml with a theme-definition in your "
+ "theme JAR. Please add a theme JAR to your WEB-INF/lib";
LOG.error(error);
@@ -106,8 +106,8 @@ public class TobagoConfigImpl extends To
}
}
if (!supportedThemeNames.isEmpty()) {
- for (String name : supportedThemeNames) {
- Theme theme = availableThemes.get(name);
+ for (final String name : supportedThemeNames) {
+ final Theme theme = availableThemes.get(name);
checkThemeIsAvailable(name, theme);
supportedThemes.add(theme);
if (LOG.isDebugEnabled()) {
@@ -118,9 +118,9 @@ public class TobagoConfigImpl extends To
}
}
- private void checkThemeIsAvailable(String name, Theme theme) {
+ private void checkThemeIsAvailable(final String name, final Theme theme) {
if (theme == null) {
- String error = "Theme not found! name: '" + name + "'. "
+ final String error = "Theme not found! name: '" + name + "'. "
+ "Please ensure you have a tobago-config.xml with a theme-definition in your "
+ "theme JAR. Found the following themes: " + availableThemes.keySet();
LOG.error(error);
@@ -128,7 +128,7 @@ public class TobagoConfigImpl extends To
}
}
- public Theme getTheme(String name) {
+ public Theme getTheme(final String name) {
if (name == null) {
LOG.debug("searching theme: null");
return defaultTheme;
@@ -136,7 +136,7 @@ public class TobagoConfigImpl extends To
if (defaultTheme.getName().equals(name)) {
return defaultTheme;
}
- for (Theme theme : supportedThemes) {
+ for (final Theme theme : supportedThemes) {
if (theme.getName().equals(name)) {
return theme;
}
@@ -145,7 +145,7 @@ public class TobagoConfigImpl extends To
return defaultTheme;
}
- public void setDefaultThemeName(String defaultThemeName) {
+ public void setDefaultThemeName(final String defaultThemeName) {
this.defaultThemeName = defaultThemeName;
}
@@ -153,7 +153,7 @@ public class TobagoConfigImpl extends To
return Collections.unmodifiableList(supportedThemes);
}
- public void addResourceDir(String resourceDir) {
+ public void addResourceDir(final String resourceDir) {
if (!resourceDirs.contains(resourceDir)) {
if (LOG.isInfoEnabled()) {
LOG.info("adding resourceDir = '{}'", resourceDir);
@@ -177,9 +177,9 @@ public class TobagoConfigImpl extends To
return defaultTheme;
}
- public void setAvailableThemes(Map<String, Theme> availableThemes) {
+ public void setAvailableThemes(final Map<String, Theme> availableThemes) {
this.availableThemes = availableThemes;
- for (Theme theme : this.availableThemes.values()) {
+ for (final Theme theme : this.availableThemes.values()) {
addResourceDir(theme.getResourcePath());
}
}
@@ -188,7 +188,7 @@ public class TobagoConfigImpl extends To
return renderersConfig;
}
- public void setRenderersConfig(RenderersConfig renderersConfig) {
+ public void setRenderersConfig(final RenderersConfig renderersConfig) {
this.renderersConfig = renderersConfig;
}
@@ -196,11 +196,11 @@ public class TobagoConfigImpl extends To
return projectStage;
}
// TODO one init method
- public void initProjectState(ServletContext servletContext) {
+ public void initProjectState(final ServletContext servletContext) {
String stageName = null;
try {
- Context ctx = new InitialContext();
- Object obj = JndiUtils.getJndiProperty(ctx, "jsf", "ProjectStage");
+ final Context ctx = new InitialContext();
+ final Object obj = JndiUtils.getJndiProperty(ctx, "jsf", "ProjectStage");
if (obj != null) {
if (obj instanceof String) {
stageName = (String) obj;
@@ -209,7 +209,7 @@ public class TobagoConfigImpl extends To
ProjectStage.PROJECT_STAGE_JNDI_NAME);
}
}
- } catch (NamingException e) {
+ } catch (final NamingException e) {
// ignore
}
@@ -224,7 +224,7 @@ public class TobagoConfigImpl extends To
if (stageName != null) {
try {
projectStage = ProjectStage.valueOf(stageName);
- } catch (IllegalArgumentException e) {
+ } catch (final IllegalArgumentException e) {
LOG.error("Couldn't discover the current project stage", e);
}
}
@@ -247,7 +247,7 @@ public class TobagoConfigImpl extends To
} else {
defaultValidatorInfo = Collections.emptyMap();
}
- } catch (Exception e) {
+ } catch (final Exception e) {
LOG.error("Can't initialize default validators (this happens with JBoss GateIn 3.6.0).", e);
defaultValidatorInfo = Collections.emptyMap();
}
@@ -258,7 +258,7 @@ public class TobagoConfigImpl extends To
return createSessionSecret;
}
- public void setCreateSessionSecret(boolean createSessionSecret) {
+ public void setCreateSessionSecret(final boolean createSessionSecret) {
this.createSessionSecret = createSessionSecret;
}
@@ -266,7 +266,7 @@ public class TobagoConfigImpl extends To
return checkSessionSecret;
}
- public void setCheckSessionSecret(boolean checkSessionSecret) {
+ public void setCheckSessionSecret(final boolean checkSessionSecret) {
this.checkSessionSecret = checkSessionSecret;
}
@@ -275,7 +275,7 @@ public class TobagoConfigImpl extends To
return preventFrameAttacks;
}
- public void setPreventFrameAttacks(boolean preventFrameAttacks) {
+ public void setPreventFrameAttacks(final boolean preventFrameAttacks) {
this.preventFrameAttacks = preventFrameAttacks;
}
@@ -297,7 +297,7 @@ public class TobagoConfigImpl extends To
final StringBuilder builder = new StringBuilder();
builder.append("TobagoConfigImpl{");
builder.append("\nsupportedThemes=[");
- for (Theme supportedTheme : supportedThemes) {
+ for (final Theme supportedTheme : supportedThemes) {
builder.append(supportedTheme.getName());
builder.append(", ");
}
@@ -317,7 +317,7 @@ public class TobagoConfigImpl extends To
builder.append(url);
// to see only different (ignore alternative names for the same theme)
builder.append(", \nthemes=");
- Set<Theme> all = new HashSet<Theme>(availableThemes.values());
+ final Set<Theme> all = new HashSet<Theme>(availableThemes.values());
builder.append(all);
builder.append('}');
return builder.toString();
Modified: myfaces/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/config/TobagoConfigParser.java
URL: http://svn.apache.org/viewvc/myfaces/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/config/TobagoConfigParser.java?rev=1542331&r1=1542330&r2=1542331&view=diff
==============================================================================
--- myfaces/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/config/TobagoConfigParser.java (original)
+++ myfaces/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/config/TobagoConfigParser.java Fri Nov 15 17:10:58 2013
@@ -87,7 +87,7 @@ public class TobagoConfigParser extends
public TobagoConfigParser() {
}
- public TobagoConfigFragment parse(URL url)
+ public TobagoConfigFragment parse(final URL url)
throws IOException, SAXException, ParserConfigurationException, URISyntaxException {
if (LOG.isInfoEnabled()) {
@@ -118,7 +118,7 @@ public class TobagoConfigParser extends
}
@Override
- public void ignorableWhitespace(char[] ch, int start, int length) throws SAXException {
+ public void ignorableWhitespace(final char[] ch, final int start, final int length) throws SAXException {
super.ignorableWhitespace(ch, start, length);
}
@@ -136,7 +136,8 @@ public class TobagoConfigParser extends
}
@Override
- public void startElement(String uri, String localName, String qName, Attributes attributes) throws SAXException {
+ public void startElement(final String uri, final String localName, final String qName, final Attributes attributes)
+ throws SAXException {
// No unused content should be collected, specially text mixed with tags.
assert buffer.toString().trim().length() == 0;
@@ -223,12 +224,12 @@ public class TobagoConfigParser extends
}
@Override
- public void characters(char[] ch, int start, int length) throws SAXException {
+ public void characters(final char[] ch, final int start, final int length) throws SAXException {
buffer.append(ch, start, length);
}
@Override
- public void endElement(String uri, String localName, String qName) throws SAXException {
+ public void endElement(final String uri, final String localName, final String qName) throws SAXException {
assert qName.equals(stack.peek());
final String text = buffer.toString().trim();
@@ -348,17 +349,17 @@ public class TobagoConfigParser extends
}
@Override
- public void warning(SAXParseException e) throws SAXException {
+ public void warning(final SAXParseException e) throws SAXException {
throw e;
}
@Override
- public void error(SAXParseException e) throws SAXException {
+ public void error(final SAXParseException e) throws SAXException {
throw e;
}
@Override
- public void fatalError(SAXParseException e) throws SAXException {
+ public void fatalError(final SAXParseException e) throws SAXException {
throw e;
}
Modified: myfaces/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/config/TobagoConfigSorter.java
URL: http://svn.apache.org/viewvc/myfaces/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/config/TobagoConfigSorter.java?rev=1542331&r1=1542330&r2=1542331&view=diff
==============================================================================
--- myfaces/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/config/TobagoConfigSorter.java (original)
+++ myfaces/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/config/TobagoConfigSorter.java Fri Nov 15 17:10:58 2013
@@ -34,7 +34,7 @@ public class TobagoConfigSorter implemen
private List<TobagoConfigFragment> list;
private List<Pair> pairs;
- public TobagoConfigSorter(List<TobagoConfigFragment> list) {
+ public TobagoConfigSorter(final List<TobagoConfigFragment> list) {
this.list = list;
}
@@ -52,7 +52,7 @@ public class TobagoConfigSorter implemen
if (LOG.isInfoEnabled()) {
LOG.info("Order of the Tobago config files:");
- for (TobagoConfigFragment fragment : list) {
+ for (final TobagoConfigFragment fragment : list) {
String name = fragment.getName();
if (name == null) {
name = "<unnamed>";
@@ -68,9 +68,9 @@ public class TobagoConfigSorter implemen
// todo
LOG.warn("Merge implementation in progress...)");
- TobagoConfigImpl result = new TobagoConfigImpl();
+ final TobagoConfigImpl result = new TobagoConfigImpl();
- for (TobagoConfigFragment fragment : list) {
+ for (final TobagoConfigFragment fragment : list) {
// default theme
final String defaultTheme = fragment.getDefaultThemeName();
if (defaultTheme != null) {
@@ -78,12 +78,12 @@ public class TobagoConfigSorter implemen
}
// supported themes
- for (String supported : fragment.getSupportedThemeNames()) {
+ for (final String supported : fragment.getSupportedThemeNames()) {
result.addSupportedThemeName(supported);
}
// resource dirs
- for (String dir : fragment.getResourceDirs()) {
+ for (final String dir : fragment.getResourceDirs()) {
result.addResourceDir(dir);
}
@@ -140,16 +140,16 @@ public class TobagoConfigSorter implemen
}
protected void ensureIrreflexive() {
- for (Pair a : pairs) {
+ for (final Pair a : pairs) {
if (a.getLower() == a.getHigher()) {
- StringBuffer buffer = new StringBuffer();
+ final StringBuffer buffer = new StringBuffer();
buffer.append("Ordering problem. There are conflicting order rules. Not irreflexive. " + "'");
buffer.append(a.getLower());
buffer.append("' < '");
buffer.append(a.getHigher());
buffer.append("'!\nThe reason may be a cycle.\n");
buffer.append("Complete list of rules: \n");
- for (Pair pair : pairs) {
+ for (final Pair pair : pairs) {
buffer.append("'");
buffer.append(pair.getLower());
buffer.append("' < '");
@@ -163,10 +163,10 @@ public class TobagoConfigSorter implemen
}
protected void ensureAntiSymmetric() {
- for (Pair a : pairs) {
- for (Pair b : pairs) {
+ for (final Pair a : pairs) {
+ for (final Pair b : pairs) {
if (a.getLower() == b.getHigher() && a.getHigher() == b.getLower()) {
- StringBuffer buffer = new StringBuffer();
+ final StringBuffer buffer = new StringBuffer();
buffer.append("Ordering problem. There are conflicting order rules. Not antisymmetric. " + "'");
buffer.append(a.getLower());
buffer.append("' < '");
@@ -177,7 +177,7 @@ public class TobagoConfigSorter implemen
buffer.append(a.getHigher());
buffer.append("'!\nThe reason may be a cycle.\n");
buffer.append("Complete list of rules: \n");
- for (Pair pair : pairs) {
+ for (final Pair pair : pairs) {
buffer.append("'");
buffer.append(pair.getLower());
buffer.append("' < '");
@@ -191,7 +191,7 @@ public class TobagoConfigSorter implemen
}
}
- public int compare(TobagoConfigFragment a, TobagoConfigFragment b) {
+ public int compare(final TobagoConfigFragment a, final TobagoConfigFragment b) {
if (isInRelation(a, b)) {
return -1;
}
@@ -206,15 +206,15 @@ public class TobagoConfigSorter implemen
pairs = new ArrayList<Pair>();
// collecting all relations, which are relevant for us. We don't need "before" and "after" of unknown names.
- for (TobagoConfigFragment tobagoConfig : list) {
- for (String befores : tobagoConfig.getBefore()) {
- TobagoConfigFragment before = findByName(befores);
+ for (final TobagoConfigFragment tobagoConfig : list) {
+ for (final String befores : tobagoConfig.getBefore()) {
+ final TobagoConfigFragment before = findByName(befores);
if (before != null) {
pairs.add(new Pair(tobagoConfig, before));
}
}
- for (String afters : tobagoConfig.getAfter()) {
- TobagoConfigFragment after = findByName(afters);
+ for (final String afters : tobagoConfig.getAfter()) {
+ final TobagoConfigFragment after = findByName(afters);
if (after != null) {
pairs.add(new Pair(after, tobagoConfig));
}
@@ -226,8 +226,8 @@ public class TobagoConfigSorter implemen
Collections.sort(list, this);
}
- private boolean isInRelation(TobagoConfigFragment lower, TobagoConfigFragment higher) {
- for (Pair p : pairs) {
+ private boolean isInRelation(final TobagoConfigFragment lower, final TobagoConfigFragment higher) {
+ for (final Pair p : pairs) {
if (p.getLower() == lower && p.getHigher() == higher) {
return true;
}
@@ -235,8 +235,8 @@ public class TobagoConfigSorter implemen
return false;
}
- private TobagoConfigFragment findByName(String name) {
- for (TobagoConfigFragment tobagoConfig : list) {
+ private TobagoConfigFragment findByName(final String name) {
+ for (final TobagoConfigFragment tobagoConfig : list) {
if (name.equals(tobagoConfig.getName())) {
return tobagoConfig;
}
@@ -253,7 +253,7 @@ public class TobagoConfigSorter implemen
private final TobagoConfigFragment lower;
private final TobagoConfigFragment higher;
- private Pair(TobagoConfigFragment lower, TobagoConfigFragment higher) {
+ private Pair(final TobagoConfigFragment lower, final TobagoConfigFragment higher) {
this.lower = lower;
this.higher = higher;
}
Modified: myfaces/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/config/TobagoConfigVersion.java
URL: http://svn.apache.org/viewvc/myfaces/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/config/TobagoConfigVersion.java?rev=1542331&r1=1542330&r2=1542331&view=diff
==============================================================================
--- myfaces/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/config/TobagoConfigVersion.java (original)
+++ myfaces/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/config/TobagoConfigVersion.java Fri Nov 15 17:10:58 2013
@@ -37,14 +37,14 @@ public class TobagoConfigVersion extends
private String version;
- public TobagoConfigVersion(URL url) throws ParserConfigurationException, SAXException, IOException {
+ public TobagoConfigVersion(final URL url) throws ParserConfigurationException, SAXException, IOException {
// simple reading with no validation, at this time
InputStream inputStream = null;
try {
inputStream = url.openStream();
- SAXParserFactory factory = SAXParserFactory.newInstance();
- SAXParser saxParser = factory.newSAXParser();
+ final SAXParserFactory factory = SAXParserFactory.newInstance();
+ final SAXParser saxParser = factory.newSAXParser();
saxParser.parse(inputStream, this);
} finally {
IoUtils.closeQuietly(inputStream);
@@ -52,7 +52,7 @@ public class TobagoConfigVersion extends
}
@Override
- public void startElement(String uri, String localName, String qName, Attributes attributes) {
+ public void startElement(final String uri, final String localName, final String qName, final Attributes attributes) {
if ("tobago-config".equals(qName)) {
version = attributes.getValue("version");
schema = version != null;
Modified: myfaces/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/context/ClientPropertiesKey.java
URL: http://svn.apache.org/viewvc/myfaces/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/context/ClientPropertiesKey.java?rev=1542331&r1=1542330&r2=1542331&view=diff
==============================================================================
--- myfaces/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/context/ClientPropertiesKey.java (original)
+++ myfaces/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/context/ClientPropertiesKey.java Fri Nov 15 17:10:58 2013
@@ -41,12 +41,12 @@ public final class ClientPropertiesKey i
private final int hashCode;
- public static ClientPropertiesKey get(FacesContext facesContext) {
+ public static ClientPropertiesKey get(final FacesContext facesContext) {
// todo later: refactor when having JSF 2.0: using attributes of facesContext
- Map<String, Object> requestMap = facesContext.getExternalContext().getRequestMap();
+ final Map<String, Object> requestMap = facesContext.getExternalContext().getRequestMap();
ClientPropertiesKey key = (ClientPropertiesKey) requestMap.get(KEY_IN_REQUEST);
if (key == null) {
- ClientProperties clientProperties = VariableResolverUtils.resolveClientProperties(facesContext);
+ final ClientProperties clientProperties = VariableResolverUtils.resolveClientProperties(facesContext);
key = new ClientPropertiesKey(clientProperties, facesContext.getViewRoot());
requestMap.put(KEY_IN_REQUEST, key);
}
@@ -54,8 +54,8 @@ public final class ClientPropertiesKey i
return key;
}
- public static void reset(FacesContext facesContext) {
- Map<String, Object> requestMap = facesContext.getExternalContext().getRequestMap();
+ public static void reset(final FacesContext facesContext) {
+ final Map<String, Object> requestMap = facesContext.getExternalContext().getRequestMap();
requestMap.remove(KEY_IN_REQUEST);
}
@@ -68,7 +68,7 @@ public final class ClientPropertiesKey i
}
@Override
- public boolean equals(Object o) {
+ public boolean equals(final Object o) {
if (this == o) {
return true;
}
@@ -76,7 +76,7 @@ public final class ClientPropertiesKey i
return false;
}
- ClientPropertiesKey that = (ClientPropertiesKey) o;
+ final ClientPropertiesKey that = (ClientPropertiesKey) o;
if (!contentType.equals(that.contentType)) {
return false;
Modified: myfaces/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/context/ImageCacheKey.java
URL: http://svn.apache.org/viewvc/myfaces/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/context/ImageCacheKey.java?rev=1542331&r1=1542330&r2=1542331&view=diff
==============================================================================
--- myfaces/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/context/ImageCacheKey.java (original)
+++ myfaces/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/context/ImageCacheKey.java Fri Nov 15 17:10:58 2013
@@ -24,14 +24,14 @@ public final class ImageCacheKey {
private final String name;
private final int hashCode;
- public ImageCacheKey(ClientPropertiesKey clientPropertiesKey, String name) {
+ public ImageCacheKey(final ClientPropertiesKey clientPropertiesKey, final String name) {
this.name = name;
this.clientPropertiesKey = clientPropertiesKey;
hashCode = calcHashCode();
}
@Override
- public boolean equals(Object o) {
+ public boolean equals(final Object o) {
if (this == o) {
return true;
}
@@ -39,7 +39,7 @@ public final class ImageCacheKey {
return false;
}
- ImageCacheKey that = (ImageCacheKey) o;
+ final ImageCacheKey that = (ImageCacheKey) o;
return clientPropertiesKey.equals(that.clientPropertiesKey) && name.equals(that.name);
}
Modified: myfaces/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/context/JspCacheKey.java
URL: http://svn.apache.org/viewvc/myfaces/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/context/JspCacheKey.java?rev=1542331&r1=1542330&r2=1542331&view=diff
==============================================================================
--- myfaces/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/context/JspCacheKey.java (original)
+++ myfaces/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/context/JspCacheKey.java Fri Nov 15 17:10:58 2013
@@ -24,14 +24,14 @@ public final class JspCacheKey {
private final String name;
private final int hashCode;
- public JspCacheKey(ClientPropertiesKey cacheKey, String name) {
+ public JspCacheKey(final ClientPropertiesKey cacheKey, final String name) {
this.cacheKey = cacheKey;
this.name = name;
hashCode = calcHashCode();
}
@Override
- public boolean equals(Object o) {
+ public boolean equals(final Object o) {
if (this == o) {
return true;
}
@@ -39,7 +39,7 @@ public final class JspCacheKey {
return false;
}
- JspCacheKey that = (JspCacheKey) o;
+ final JspCacheKey that = (JspCacheKey) o;
return cacheKey.equals(that.cacheKey) && name.equals(that.name);
Modified: myfaces/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/context/MeasureValue.java
URL: http://svn.apache.org/viewvc/myfaces/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/context/MeasureValue.java?rev=1542331&r1=1542330&r2=1542331&view=diff
==============================================================================
--- myfaces/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/context/MeasureValue.java (original)
+++ myfaces/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/context/MeasureValue.java Fri Nov 15 17:10:58 2013
@@ -30,7 +30,7 @@ public final class MeasureValue {
private Measure value;
- public MeasureValue(Measure value) {
+ public MeasureValue(final Measure value) {
this.value = value;
}
@@ -39,7 +39,7 @@ public final class MeasureValue {
}
@Override
- public boolean equals(Object o) {
+ public boolean equals(final Object o) {
if (this == o) {
return true;
}
@@ -47,7 +47,7 @@ public final class MeasureValue {
return false;
}
- MeasureValue that = (MeasureValue) o;
+ final MeasureValue that = (MeasureValue) o;
if (value != null ? !value.equals(that.value) : that.value != null) {
return false;
Modified: myfaces/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/context/MiscCacheKey.java
URL: http://svn.apache.org/viewvc/myfaces/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/context/MiscCacheKey.java?rev=1542331&r1=1542330&r2=1542331&view=diff
==============================================================================
--- myfaces/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/context/MiscCacheKey.java (original)
+++ myfaces/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/context/MiscCacheKey.java Fri Nov 15 17:10:58 2013
@@ -24,14 +24,14 @@ public final class MiscCacheKey {
private final String name;
private final int hashCode;
- public MiscCacheKey(ClientPropertiesKey cacheKey, String name) {
+ public MiscCacheKey(final ClientPropertiesKey cacheKey, final String name) {
this.cacheKey = cacheKey;
this.name = name;
hashCode = calcHashCode();
}
@Override
- public boolean equals(Object o) {
+ public boolean equals(final Object o) {
if (this == o) {
return true;
}
@@ -39,7 +39,7 @@ public final class MiscCacheKey {
return false;
}
- MiscCacheKey that = (MiscCacheKey) o;
+ final MiscCacheKey that = (MiscCacheKey) o;
return cacheKey.equals(that.cacheKey) && name.equals(that.name);
Modified: myfaces/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/context/PropertyCacheKey.java
URL: http://svn.apache.org/viewvc/myfaces/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/context/PropertyCacheKey.java?rev=1542331&r1=1542330&r2=1542331&view=diff
==============================================================================
--- myfaces/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/context/PropertyCacheKey.java (original)
+++ myfaces/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/context/PropertyCacheKey.java Fri Nov 15 17:10:58 2013
@@ -25,7 +25,7 @@ public final class PropertyCacheKey {
private final String key;
private final int hashCode;
- public PropertyCacheKey(ClientPropertiesKey cacheKey, String name, String key) {
+ public PropertyCacheKey(final ClientPropertiesKey cacheKey, final String name, final String key) {
this.cacheKey = cacheKey;
this.name = name;
this.key = key;
@@ -33,7 +33,7 @@ public final class PropertyCacheKey {
}
@Override
- public boolean equals(Object o) {
+ public boolean equals(final Object o) {
if (this == o) {
return true;
}
@@ -41,7 +41,7 @@ public final class PropertyCacheKey {
return false;
}
- PropertyCacheKey that = (PropertyCacheKey) o;
+ final PropertyCacheKey that = (PropertyCacheKey) o;
return cacheKey.equals(that.cacheKey) && key.equals(that.key) && name.equals(that.name);
Modified: myfaces/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/context/RendererCacheKey.java
URL: http://svn.apache.org/viewvc/myfaces/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/context/RendererCacheKey.java?rev=1542331&r1=1542330&r2=1542331&view=diff
==============================================================================
--- myfaces/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/context/RendererCacheKey.java (original)
+++ myfaces/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/context/RendererCacheKey.java Fri Nov 15 17:10:58 2013
@@ -24,14 +24,14 @@ public final class RendererCacheKey {
private final String name;
private final int hashCode;
- public RendererCacheKey(ClientPropertiesKey cacheKey, String name) {
+ public RendererCacheKey(final ClientPropertiesKey cacheKey, final String name) {
this.cacheKey = cacheKey;
this.name = name;
hashCode = calcHashCode();
}
@Override
- public boolean equals(Object o) {
+ public boolean equals(final Object o) {
if (this == o) {
return true;
}
@@ -39,7 +39,7 @@ public final class RendererCacheKey {
return false;
}
- RendererCacheKey that = (RendererCacheKey) o;
+ final RendererCacheKey that = (RendererCacheKey) o;
return cacheKey.equals(that.cacheKey) && name.equals(that.name);
}
Modified: myfaces/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/context/ResourceLocator.java
URL: http://svn.apache.org/viewvc/myfaces/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/context/ResourceLocator.java?rev=1542331&r1=1542330&r2=1542331&view=diff
==============================================================================
--- myfaces/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/context/ResourceLocator.java (original)
+++ myfaces/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/context/ResourceLocator.java Fri Nov 15 17:10:58 2013
@@ -71,7 +71,7 @@ class ResourceLocator {
private ThemeBuilder themeBuilder;
public ResourceLocator(
- ServletContext servletContext, ResourceManagerImpl resourceManager, ThemeBuilder themeBuilder) {
+ final ServletContext servletContext, final ResourceManagerImpl resourceManager, final ThemeBuilder themeBuilder) {
this.servletContext = servletContext;
this.resourceManager = resourceManager;
this.themeBuilder = themeBuilder;
@@ -86,7 +86,7 @@ class ResourceLocator {
}
private void locateResourcesInWar(
- ServletContext servletContext, ResourceManagerImpl resources, String path)
+ final ServletContext servletContext, final ResourceManagerImpl resources, String path)
throws ServletException {
if (path.startsWith("/WEB-INF/")) {
@@ -96,14 +96,14 @@ class ResourceLocator {
if (path.endsWith("/") && path.length() > 1) {
path = path.substring(0, path.length() - 1);
}
- Set<String> resourcePaths = servletContext.getResourcePaths(path);
+ final Set<String> resourcePaths = servletContext.getResourcePaths(path);
if (resourcePaths == null || resourcePaths.isEmpty()) {
if (LOG.isDebugEnabled()) {
LOG.debug("Skipping empty resource path: path='{}'", path);
}
return;
}
- for (String childPath : resourcePaths) {
+ for (final String childPath : resourcePaths) {
if (childPath.endsWith("/")) {
// ignore, because weblogic puts the path directory itself in the Set
if (!childPath.equals(path)) {
@@ -115,17 +115,17 @@ class ResourceLocator {
} else {
//Log.debug("add resc " + childPath);
if (childPath.endsWith(".properties")) {
- InputStream inputStream = servletContext.getResourceAsStream(childPath);
+ final InputStream inputStream = servletContext.getResourceAsStream(childPath);
try {
addProperties(inputStream, resources, childPath, false, 0);
} finally {
IoUtils.closeQuietly(inputStream);
}
} else if (childPath.endsWith(".properties.xml")) {
- InputStream inputStream = servletContext.getResourceAsStream(childPath);
+ final InputStream inputStream = servletContext.getResourceAsStream(childPath);
try {
addProperties(inputStream, resources, childPath, true, 0);
- } catch (RuntimeException e) {
+ } catch (final RuntimeException e) {
LOG.error("childPath = \"" + childPath + "\" ", e);
throw e;
} finally {
@@ -138,7 +138,7 @@ class ResourceLocator {
}
}
- private void locateResourcesFromClasspath(ResourceManagerImpl resources)
+ private void locateResourcesFromClasspath(final ResourceManagerImpl resources)
throws ServletException {
try {
@@ -149,9 +149,9 @@ class ResourceLocator {
final Enumeration<URL> urls = classLoader.getResources(META_INF_TOBAGO_CONFIG_XML);
while (urls.hasMoreElements()) {
- URL tobagoConfigUrl = urls.nextElement();
- TobagoConfigFragment tobagoConfig = new TobagoConfigParser().parse(tobagoConfigUrl);
- for (ThemeImpl theme : tobagoConfig.getThemeDefinitions()) {
+ final URL tobagoConfigUrl = urls.nextElement();
+ final TobagoConfigFragment tobagoConfig = new TobagoConfigParser().parse(tobagoConfigUrl);
+ for (final ThemeImpl theme : tobagoConfig.getThemeDefinitions()) {
detectThemeVersion(tobagoConfigUrl, theme);
themeBuilder.addTheme(theme);
final String prefix = ensureSlash(theme.getResourcePath());
@@ -163,7 +163,7 @@ class ResourceLocator {
addResources(resources, tobagoConfigUrl, prefix, 0);
}
}
- } catch (Exception e) {
+ } catch (final Exception e) {
if (e instanceof ServletException) {
throw (ServletException) e;
} else {
@@ -179,17 +179,17 @@ class ResourceLocator {
* @param resources Resource Manager which collects all the resources.
* @throws ServletException An error while accessing the resource.
*/
- private void locateResourcesServlet30Alike(ResourceManagerImpl resources) throws ServletException {
+ private void locateResourcesServlet30Alike(final ResourceManagerImpl resources) throws ServletException {
try {
if (LOG.isInfoEnabled()) {
LOG.info("Searching for '" + META_INF_RESOURCES + "'");
}
- ClassLoader classLoader = Thread.currentThread().getContextClassLoader();
- Enumeration<URL> urls = classLoader.getResources(META_INF_RESOURCES);
+ final ClassLoader classLoader = Thread.currentThread().getContextClassLoader();
+ final Enumeration<URL> urls = classLoader.getResources(META_INF_RESOURCES);
while (urls.hasMoreElements()) {
- URL resourcesUrl = urls.nextElement();
+ final URL resourcesUrl = urls.nextElement();
LOG.info("resourcesUrl='" + resourcesUrl + "'");
if (!resourcesUrl.toString().matches(".*/WEB-INF/lib/.*\\.jar\\!.*")) {
@@ -199,7 +199,7 @@ class ResourceLocator {
}
LOG.info("going on ...");
- String protocol = resourcesUrl.getProtocol();
+ final String protocol = resourcesUrl.getProtocol();
// tomcat uses jar
// weblogic uses zip
// IBM WebSphere uses wsjar
@@ -213,8 +213,8 @@ class ResourceLocator {
"/" + META_INF_RESOURCES,
META_INF_RESOURCES.length() + 1);
}
- } catch (IOException e) {
- String msg = "while loading ";
+ } catch (final IOException e) {
+ final String msg = "while loading ";
LOG.error(msg, e);
throw new ServletException(msg, e);
}
@@ -267,7 +267,7 @@ class ResourceLocator {
}
private void addResourcesFromIndexFile(
- ResourceManagerImpl resources, final InputStream indexStream, final int skipPrefix)
+ final ResourceManagerImpl resources, final InputStream indexStream, final int skipPrefix)
throws IOException, ServletException {
final LineNumberReader reader = new LineNumberReader(new InputStreamReader(indexStream));
String name;
@@ -309,7 +309,7 @@ class ResourceLocator {
}
}
jarFile = new URL(fileName);
- } catch (MalformedURLException e) {
+ } catch (final MalformedURLException e) {
// workaround for weblogic on windows
jarFile = new URL("file:" + fileName);
}
@@ -322,7 +322,7 @@ class ResourceLocator {
if (nextEntry.isDirectory()) {
continue;
}
- String name = "/" + nextEntry.getName();
+ final String name = "/" + nextEntry.getName();
if (name.startsWith(prefix)) {
addResource(resources, name, skipPrefix);
}
@@ -333,7 +333,7 @@ class ResourceLocator {
}
}
- private void addResource(ResourceManagerImpl resources, String name, int skipPrefix)
+ private void addResource(final ResourceManagerImpl resources, final String name, final int skipPrefix)
throws ServletException {
if (name.endsWith(".class")) {
@@ -342,7 +342,8 @@ class ResourceLocator {
if (LOG.isInfoEnabled()) {
LOG.info("Adding properties from: '" + name.substring(1) + "'");
}
- InputStream inputStream = Thread.currentThread().getContextClassLoader().getResourceAsStream(name.substring(1));
+ final InputStream inputStream
+ = Thread.currentThread().getContextClassLoader().getResourceAsStream(name.substring(1));
try {
addProperties(inputStream, resources, name, false, skipPrefix);
} finally {
@@ -352,7 +353,8 @@ class ResourceLocator {
if (LOG.isInfoEnabled()) {
LOG.info("Adding properties from: '" + name.substring(1) + "'");
}
- InputStream inputStream = Thread.currentThread().getContextClassLoader().getResourceAsStream(name.substring(1));
+ final InputStream inputStream
+ = Thread.currentThread().getContextClassLoader().getResourceAsStream(name.substring(1));
try {
addProperties(inputStream, resources, name, true, skipPrefix);
} finally {
@@ -374,7 +376,8 @@ class ResourceLocator {
}
private void addProperties(
- InputStream stream, ResourceManagerImpl resources, String childPath, boolean xml, int skipPrefix)
+ final InputStream stream, final ResourceManagerImpl resources, final String childPath, final boolean xml,
+ final int skipPrefix)
throws ServletException {
final String directory = childPath.substring(skipPrefix, childPath.lastIndexOf('/'));
@@ -401,7 +404,7 @@ class ResourceLocator {
LOG.debug(" properties: {}", temp.size());
}
}
- } catch (IOException e) {
+ } catch (final IOException e) {
final String msg = "while loading " + childPath;
LOG.error(msg, e);
throw new ServletException(msg, e);
@@ -432,7 +435,7 @@ class ResourceLocator {
inputStream = url.openStream();
properties.load(inputStream);
version = properties.getProperty("Implementation-Version");
- } catch (FileNotFoundException e) {
+ } catch (final FileNotFoundException e) {
// may happen (e. g. in tests)
LOG.error("No Manifest-File found.");
} finally {
Modified: myfaces/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/context/ResourceManagerFactory.java
URL: http://svn.apache.org/viewvc/myfaces/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/context/ResourceManagerFactory.java?rev=1542331&r1=1542330&r2=1542331&view=diff
==============================================================================
--- myfaces/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/context/ResourceManagerFactory.java (original)
+++ myfaces/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/context/ResourceManagerFactory.java Fri Nov 15 17:10:58 2013
@@ -36,25 +36,25 @@ public final class ResourceManagerFactor
private static boolean initialized;
- public static ResourceManager getResourceManager(FacesContext facesContext) {
+ public static ResourceManager getResourceManager(final FacesContext facesContext) {
assert initialized;
return (ResourceManager) facesContext.getExternalContext()
.getApplicationMap().get(RESOURCE_MANAGER);
}
- public static ResourceManager getResourceManager(ServletContext servletContext) {
+ public static ResourceManager getResourceManager(final ServletContext servletContext) {
assert initialized;
return (ResourceManager) servletContext.getAttribute(RESOURCE_MANAGER);
}
public static void init(
- ServletContext servletContext, TobagoConfigImpl tobagoConfig)
+ final ServletContext servletContext, final TobagoConfigImpl tobagoConfig)
throws ServletException {
assert !initialized;
- ResourceManagerImpl resourceManager= new ResourceManagerImpl(tobagoConfig);
+ final ResourceManagerImpl resourceManager= new ResourceManagerImpl(tobagoConfig);
- ThemeBuilder themeBuilder = new ThemeBuilder(tobagoConfig);
- ResourceLocator resourceLocator = new ResourceLocator(servletContext, resourceManager, themeBuilder);
+ final ThemeBuilder themeBuilder = new ThemeBuilder(tobagoConfig);
+ final ResourceLocator resourceLocator = new ResourceLocator(servletContext, resourceManager, themeBuilder);
resourceLocator.locate();
themeBuilder.resolveThemes();
@@ -63,7 +63,7 @@ public final class ResourceManagerFactor
initialized = true;
}
- public static void release(ServletContext servletContext) {
+ public static void release(final ServletContext servletContext) {
assert initialized;
initialized = false;
servletContext.removeAttribute(RESOURCE_MANAGER);