Repository: empire-db Updated Branches: refs/heads/master 343ea12dd -> 54ee4d6dc
EMPIREDB-228 Project: http://git-wip-us.apache.org/repos/asf/empire-db/repo Commit: http://git-wip-us.apache.org/repos/asf/empire-db/commit/54ee4d6d Tree: http://git-wip-us.apache.org/repos/asf/empire-db/tree/54ee4d6d Diff: http://git-wip-us.apache.org/repos/asf/empire-db/diff/54ee4d6d Branch: refs/heads/master Commit: 54ee4d6dc9e5c8f758ae3ba3fa29a5629f46e5a3 Parents: 343ea12 Author: Rainer Döbele <[email protected]> Authored: Mon Feb 15 12:12:33 2016 +0100 Committer: Rainer Döbele <[email protected]> Committed: Mon Feb 15 12:12:33 2016 +0100 ---------------------------------------------------------------------- .../apache/empire/jsf2/components/InputTag.java | 32 ++++++++++---------- .../apache/empire/jsf2/components/LabelTag.java | 2 +- .../empire/jsf2/components/MenuListTag.java | 2 +- .../empire/jsf2/components/SelectTag.java | 2 +- .../empire/jsf2/components/TabPageTag.java | 2 +- .../empire/jsf2/components/TabViewTag.java | 20 ++++++------ 6 files changed, 30 insertions(+), 30 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/empire-db/blob/54ee4d6d/empire-db-jsf2/src/main/java/org/apache/empire/jsf2/components/InputTag.java ---------------------------------------------------------------------- diff --git a/empire-db-jsf2/src/main/java/org/apache/empire/jsf2/components/InputTag.java b/empire-db-jsf2/src/main/java/org/apache/empire/jsf2/components/InputTag.java index 3c00ace..4d1111e 100644 --- a/empire-db-jsf2/src/main/java/org/apache/empire/jsf2/components/InputTag.java +++ b/empire-db-jsf2/src/main/java/org/apache/empire/jsf2/components/InputTag.java @@ -40,17 +40,17 @@ import org.slf4j.LoggerFactory; public class InputTag extends UIInput implements NamingContainer { // Logger - private static final Logger log = LoggerFactory.getLogger(InputTag.class); + private static final Logger log = LoggerFactory.getLogger(InputTag.class); // private static final String inpControlPropName = InputControl.class.getSimpleName(); // private static final String inputInfoPropName = InputControl.InputInfo.class.getSimpleName(); - private static final String readOnlyState = "readOnlyState"; + private static final String readOnlyState = "readOnlyState"; - private final TagEncodingHelper helper = new TagEncodingHelper(this, "eInput"); + protected final TagEncodingHelper helper = new TagEncodingHelper(this, "eInput"); - private InputControl control = null; - private InputControl.InputInfo inpInfo = null; - protected boolean hasRequiredFlagSet = false; + protected InputControl control = null; + protected InputControl.InputInfo inpInfo = null; + protected boolean hasRequiredFlagSet = false; /* private static int itemIdSeq = 0; @@ -101,15 +101,15 @@ public class InputTag extends UIInput implements NamingContainer inpInfo = helper.getInputInfo(context); return (control != null && inpInfo != null); } - + /** * remember original clientId * necessary only inside UIData */ private String treeClientId = null; - + @Override - public boolean visitTree(VisitContext visitContext, VisitCallback callback) + public boolean visitTree(VisitContext visitContext, VisitCallback callback) { FacesContext context = visitContext.getFacesContext(); treeClientId = getClientId(context); @@ -120,9 +120,9 @@ public class InputTag extends UIInput implements NamingContainer public String getClientId(FacesContext context) { // Check if dynamic components are being created - if (this.treeClientId!=null && control!=null && control.isCreatingComponents()) - { // return the original tree client id - return treeClientId; + if (this.treeClientId != null && control != null && control.isCreatingComponents()) + { // return the original tree client id + return treeClientId; } // default behavior return super.getClientId(context); @@ -166,9 +166,9 @@ public class InputTag extends UIInput implements NamingContainer } saveState(); } - + @Override - public void setId(String id) + public void setId(String id) { super.setId(id); // reset record @@ -264,9 +264,9 @@ public class InputTag extends UIInput implements NamingContainer // Validate value try - { // Will internally call getSubmittedValue() and validateValue() + { // Will internally call getSubmittedValue() and validateValue() super.validate(context); - + } catch (Exception e) { // Value is not valid if (!(e instanceof EmpireException)) http://git-wip-us.apache.org/repos/asf/empire-db/blob/54ee4d6d/empire-db-jsf2/src/main/java/org/apache/empire/jsf2/components/LabelTag.java ---------------------------------------------------------------------- diff --git a/empire-db-jsf2/src/main/java/org/apache/empire/jsf2/components/LabelTag.java b/empire-db-jsf2/src/main/java/org/apache/empire/jsf2/components/LabelTag.java index 6e93ca3..9ec9d4b 100644 --- a/empire-db-jsf2/src/main/java/org/apache/empire/jsf2/components/LabelTag.java +++ b/empire-db-jsf2/src/main/java/org/apache/empire/jsf2/components/LabelTag.java @@ -38,7 +38,7 @@ public class LabelTag extends UIOutput implements NamingContainer // Logger private static final Logger log = LoggerFactory.getLogger(LabelTag.class); - private final TagEncodingHelper helper = new TagEncodingHelper(this, "eLabel"); + protected final TagEncodingHelper helper = new TagEncodingHelper(this, "eLabel"); private boolean creatingComponents = false; http://git-wip-us.apache.org/repos/asf/empire-db/blob/54ee4d6d/empire-db-jsf2/src/main/java/org/apache/empire/jsf2/components/MenuListTag.java ---------------------------------------------------------------------- diff --git a/empire-db-jsf2/src/main/java/org/apache/empire/jsf2/components/MenuListTag.java b/empire-db-jsf2/src/main/java/org/apache/empire/jsf2/components/MenuListTag.java index a7258db..3350c7e 100644 --- a/empire-db-jsf2/src/main/java/org/apache/empire/jsf2/components/MenuListTag.java +++ b/empire-db-jsf2/src/main/java/org/apache/empire/jsf2/components/MenuListTag.java @@ -35,7 +35,7 @@ public class MenuListTag extends UIOutput implements NamingContainer // Logger // private static final Logger log = LoggerFactory.getLogger(MenuTag.class); - private final TagEncodingHelper helper = new TagEncodingHelper(this, "eMenuList"); + protected final TagEncodingHelper helper = new TagEncodingHelper(this, "eMenuList"); private String currentId = null; private String currentClass = null; http://git-wip-us.apache.org/repos/asf/empire-db/blob/54ee4d6d/empire-db-jsf2/src/main/java/org/apache/empire/jsf2/components/SelectTag.java ---------------------------------------------------------------------- diff --git a/empire-db-jsf2/src/main/java/org/apache/empire/jsf2/components/SelectTag.java b/empire-db-jsf2/src/main/java/org/apache/empire/jsf2/components/SelectTag.java index af07dc3..e75b54f 100644 --- a/empire-db-jsf2/src/main/java/org/apache/empire/jsf2/components/SelectTag.java +++ b/empire-db-jsf2/src/main/java/org/apache/empire/jsf2/components/SelectTag.java @@ -48,7 +48,7 @@ public class SelectTag extends UIInput implements NamingContainer public static final String SELECT_COMPONENT_ID = "select"; - private SelectInputControl control = null; + protected SelectInputControl control = null; public SelectTag() { http://git-wip-us.apache.org/repos/asf/empire-db/blob/54ee4d6d/empire-db-jsf2/src/main/java/org/apache/empire/jsf2/components/TabPageTag.java ---------------------------------------------------------------------- diff --git a/empire-db-jsf2/src/main/java/org/apache/empire/jsf2/components/TabPageTag.java b/empire-db-jsf2/src/main/java/org/apache/empire/jsf2/components/TabPageTag.java index 5d847f0..41a47fe 100644 --- a/empire-db-jsf2/src/main/java/org/apache/empire/jsf2/components/TabPageTag.java +++ b/empire-db-jsf2/src/main/java/org/apache/empire/jsf2/components/TabPageTag.java @@ -34,7 +34,7 @@ public class TabPageTag extends UIOutput implements NamingContainer // Logger // private static final Logger log = LoggerFactory.getLogger(MenuTag.class); - private final TagEncodingHelper helper = new TagEncodingHelper(this, "eTabPage"); + protected final TagEncodingHelper helper = new TagEncodingHelper(this, "eTabPage"); @Override public String getFamily() http://git-wip-us.apache.org/repos/asf/empire-db/blob/54ee4d6d/empire-db-jsf2/src/main/java/org/apache/empire/jsf2/components/TabViewTag.java ---------------------------------------------------------------------- diff --git a/empire-db-jsf2/src/main/java/org/apache/empire/jsf2/components/TabViewTag.java b/empire-db-jsf2/src/main/java/org/apache/empire/jsf2/components/TabViewTag.java index 23046c1..ba5650e 100644 --- a/empire-db-jsf2/src/main/java/org/apache/empire/jsf2/components/TabViewTag.java +++ b/empire-db-jsf2/src/main/java/org/apache/empire/jsf2/components/TabViewTag.java @@ -50,17 +50,17 @@ public class TabViewTag extends UIOutput implements NamingContainer { // Logger // private static final Logger log = LoggerFactory.getLogger(MenuTag.class); - private static final Logger log = LoggerFactory.getLogger(TabViewTag.class); + private static final Logger log = LoggerFactory.getLogger(TabViewTag.class); - private final String TAB_STYLE_CLASS = "eTabView"; + protected final String TAB_STYLE_CLASS = "eTabView"; - private final String TAB_ACTIVE_INDEX = "activeIndex"; + protected final String TAB_ACTIVE_INDEX = "activeIndex"; - private final String TABLINK_ID_PREFIX = "tabLink"; + protected final String TABLINK_ID_PREFIX = "tabLink"; - private final String TAB_RENDERED_ATTRIBUTE = "visible"; + protected final String TAB_RENDERED_ATTRIBUTE = "visible"; - private final TagEncodingHelper helper = new TagEncodingHelper(this, this.TAB_STYLE_CLASS); + protected final TagEncodingHelper helper = new TagEncodingHelper(this, this.TAB_STYLE_CLASS); public static class TabPageActionListener implements ActionListener, StateHolder { @@ -125,7 +125,7 @@ public class TabViewTag extends UIOutput implements NamingContainer return this.isTransient; } } - + public TabViewTag() { log.trace("TabViewTag created"); @@ -232,7 +232,7 @@ public class TabViewTag extends UIOutput implements NamingContainer int activeIndex = getActivePageIndex(); // Patch for MOJARRA: Remove HtmlCommandLinks List<UIComponent> chk = panel.getChildren(); - for (int i = chk.size()-1; i>=0; i--) + for (int i = chk.size() - 1; i >= 0; i--) { if ((chk.get(i) instanceof HtmlCommandLink)) chk.remove(i); @@ -304,7 +304,7 @@ public class TabViewTag extends UIOutput implements NamingContainer } } if (link == null) - { // create the tab-Link + { // create the tab-Link String linkId = this.TABLINK_ID_PREFIX + String.valueOf(index); link = createCommandLink(context, linkId); tabLinks.add(index, link); @@ -365,7 +365,7 @@ public class TabViewTag extends UIOutput implements NamingContainer log.warn("setActiveTab is called for active page!"); return; } - + // set new Page setActivePageIndex(pageIndex);
