empire-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From doeb...@apache.org
Subject [1/2] empire-db git commit: EMPIREDB-228
Date Thu, 24 Sep 2015 07:59:45 GMT
Repository: empire-db
Updated Branches:
  refs/heads/master fd1adb557 -> cedc9788e


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/c6b77148
Tree: http://git-wip-us.apache.org/repos/asf/empire-db/tree/c6b77148
Diff: http://git-wip-us.apache.org/repos/asf/empire-db/diff/c6b77148

Branch: refs/heads/master
Commit: c6b771489fbf452c57d0955805ea9b70f1ff5c7c
Parents: fd1adb5
Author: Rainer Döbele <doebele@apache.org>
Authored: Thu Sep 24 09:58:34 2015 +0200
Committer: Rainer Döbele <doebele@apache.org>
Committed: Thu Sep 24 09:58:34 2015 +0200

----------------------------------------------------------------------
 .../main/java/org/apache/empire/jsf2/components/InputTag.java    | 2 +-
 .../main/java/org/apache/empire/jsf2/components/LabelTag.java    | 2 +-
 .../src/main/java/org/apache/empire/jsf2/components/LinkTag.java | 2 +-
 .../main/java/org/apache/empire/jsf2/components/MenuItemTag.java | 4 ++--
 .../main/java/org/apache/empire/jsf2/components/MenuListTag.java | 2 +-
 .../main/java/org/apache/empire/jsf2/components/TitleTag.java    | 2 +-
 .../main/java/org/apache/empire/jsf2/components/ValueTag.java    | 4 ++--
 7 files changed, 9 insertions(+), 9 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/empire-db/blob/c6b77148/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 69ab409..4bc5f9a 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
@@ -43,7 +43,7 @@ public class InputTag extends UIInput implements NamingContainer
     // private static final String inputInfoPropName = InputControl.InputInfo.class.getSimpleName();
     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;

http://git-wip-us.apache.org/repos/asf/empire-db/blob/c6b77148/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 68804dd..f276b78 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
@@ -35,7 +35,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");
 
     public LabelTag()
     {

http://git-wip-us.apache.org/repos/asf/empire-db/blob/c6b77148/empire-db-jsf2/src/main/java/org/apache/empire/jsf2/components/LinkTag.java
----------------------------------------------------------------------
diff --git a/empire-db-jsf2/src/main/java/org/apache/empire/jsf2/components/LinkTag.java b/empire-db-jsf2/src/main/java/org/apache/empire/jsf2/components/LinkTag.java
index 038e087..1c04306 100644
--- a/empire-db-jsf2/src/main/java/org/apache/empire/jsf2/components/LinkTag.java
+++ b/empire-db-jsf2/src/main/java/org/apache/empire/jsf2/components/LinkTag.java
@@ -56,7 +56,7 @@ public class LinkTag extends UIOutput // implements NamingContainer
     // Logger
     private static final Logger log = LoggerFactory.getLogger(LinkTag.class);
     
-    private final TagEncodingHelper helper = new TagEncodingHelper(this, "eLink");
+    protected final TagEncodingHelper helper = new TagEncodingHelper(this, "eLink");
 
     public LinkTag()
     {

http://git-wip-us.apache.org/repos/asf/empire-db/blob/c6b77148/empire-db-jsf2/src/main/java/org/apache/empire/jsf2/components/MenuItemTag.java
----------------------------------------------------------------------
diff --git a/empire-db-jsf2/src/main/java/org/apache/empire/jsf2/components/MenuItemTag.java
b/empire-db-jsf2/src/main/java/org/apache/empire/jsf2/components/MenuItemTag.java
index de66876..4b2296e 100644
--- a/empire-db-jsf2/src/main/java/org/apache/empire/jsf2/components/MenuItemTag.java
+++ b/empire-db-jsf2/src/main/java/org/apache/empire/jsf2/components/MenuItemTag.java
@@ -36,8 +36,8 @@ public class MenuItemTag extends LinkTag
     // Logger
     private static final Logger log = LoggerFactory.getLogger(MenuItemTag.class);
     
-    private MenuListTag parentMenu = null;
-    private String menuId;
+    protected MenuListTag parentMenu = null;
+    protected String menuId;
 
     /*
     private static int itemIdSeq = 0;

http://git-wip-us.apache.org/repos/asf/empire-db/blob/c6b77148/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 8382e28..4078ee1 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/c6b77148/empire-db-jsf2/src/main/java/org/apache/empire/jsf2/components/TitleTag.java
----------------------------------------------------------------------
diff --git a/empire-db-jsf2/src/main/java/org/apache/empire/jsf2/components/TitleTag.java
b/empire-db-jsf2/src/main/java/org/apache/empire/jsf2/components/TitleTag.java
index 2372aa7..b1f605f 100644
--- a/empire-db-jsf2/src/main/java/org/apache/empire/jsf2/components/TitleTag.java
+++ b/empire-db-jsf2/src/main/java/org/apache/empire/jsf2/components/TitleTag.java
@@ -37,7 +37,7 @@ public class TitleTag extends UIOutput // implements NamingContainer
     // Logger
     private static final Logger log = LoggerFactory.getLogger(TitleTag.class);
     
-    private TagEncodingHelper helper = new TagEncodingHelper(this, "eTitle");
+    protected final TagEncodingHelper helper = new TagEncodingHelper(this, "eTitle");
 
     public TitleTag()
     {

http://git-wip-us.apache.org/repos/asf/empire-db/blob/c6b77148/empire-db-jsf2/src/main/java/org/apache/empire/jsf2/components/ValueTag.java
----------------------------------------------------------------------
diff --git a/empire-db-jsf2/src/main/java/org/apache/empire/jsf2/components/ValueTag.java
b/empire-db-jsf2/src/main/java/org/apache/empire/jsf2/components/ValueTag.java
index de415e8..762a33f 100644
--- a/empire-db-jsf2/src/main/java/org/apache/empire/jsf2/components/ValueTag.java
+++ b/empire-db-jsf2/src/main/java/org/apache/empire/jsf2/components/ValueTag.java
@@ -38,7 +38,7 @@ public class ValueTag extends UIOutput // implements NamingContainer
     // Logger
     private static final Logger log = LoggerFactory.getLogger(ValueTag.class);
     
-    private TagEncodingHelper helper = new TagEncodingHelper(this, "eVal");
+    protected final TagEncodingHelper helper = new TagEncodingHelper(this, "eVal");
 
     public ValueTag()
     {
@@ -90,7 +90,7 @@ public class ValueTag extends UIOutput // implements NamingContainer
         if (dataType.isNumeric())
         {   try {
                 Object val = helper.getDataValue(true);
-                if (val!=null && ObjectUtils.getInteger(val)<0)
+                if (val!=null && ObjectUtils.getLong(val)<0)
                     addlStyle = "eValNeg";
             } catch(Exception e) {
                 log.warn("Unable to detect sign of numeric value {}. Message is {}!", vi.getColumn().getName(),
e.getMessage());


Mime
View raw message