This is an automated email from the ASF dual-hosted git repository.
doebele pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/empire-db.git
The following commit(s) were added to refs/heads/master by this push:
new a02d9f2 EMPIREDB-304 code optimization
a02d9f2 is described below
commit a02d9f20ab94718160d4fa273c973924da3e041e
Author: Rainer Döbele <[email protected]>
AuthorDate: Fri Nov 22 11:56:33 2019 +0100
EMPIREDB-304
code optimization
---
.../org/apache/empire/jsf2/controls/RadioInputControl.java | 5 +++--
.../org/apache/empire/jsf2/controls/SelectInputControl.java | 12 +++++++-----
.../java/org/apache/empire/jsf2/utils/TagEncodingHelper.java | 6 ------
empire-db/src/main/java/org/apache/empire/data/Column.java | 7 -------
.../main/java/org/apache/empire/data/bean/BeanProperty.java | 11 -----------
empire-db/src/main/java/org/apache/empire/db/DBColumn.java | 3 +--
6 files changed, 11 insertions(+), 33 deletions(-)
diff --git
a/empire-db-jsf2/src/main/java/org/apache/empire/jsf2/controls/RadioInputControl.java
b/empire-db-jsf2/src/main/java/org/apache/empire/jsf2/controls/RadioInputControl.java
index b43fbdc..de2ad93 100644
---
a/empire-db-jsf2/src/main/java/org/apache/empire/jsf2/controls/RadioInputControl.java
+++
b/empire-db-jsf2/src/main/java/org/apache/empire/jsf2/controls/RadioInputControl.java
@@ -326,9 +326,10 @@ public class RadioInputControl extends InputControl
@Override
protected Object parseInputValue(String value, InputInfo ii)
{
- if (ii.getColumn().isEnum())
+ Class<Enum<?>> enumType = ii.getColumn().getEnumType();
+ if (enumType!=null)
{ // convert to enum
- return ObjectUtils.getEnum(ii.getColumn().getEnumType(), value);
+ return ObjectUtils.getEnum(enumType, value);
}
return value;
}
diff --git
a/empire-db-jsf2/src/main/java/org/apache/empire/jsf2/controls/SelectInputControl.java
b/empire-db-jsf2/src/main/java/org/apache/empire/jsf2/controls/SelectInputControl.java
index 91a89e1..1e1ee54 100644
---
a/empire-db-jsf2/src/main/java/org/apache/empire/jsf2/controls/SelectInputControl.java
+++
b/empire-db-jsf2/src/main/java/org/apache/empire/jsf2/controls/SelectInputControl.java
@@ -325,9 +325,10 @@ public class SelectInputControl extends InputControl
{
if ((value instanceof Number))
{ // Check whether it's an Enum
- if (ii.getColumn().isEnum())
- { // Convert ordinal value to Enum-name
- Enum<?> enumVal =
ObjectUtils.getEnum(ii.getColumn().getEnumType(), value);
+ Class<Enum<?>> enumType = ii.getColumn().getEnumType();
+ if (enumType!=null)
+ { // Convert ordinal to name
+ Enum<?> enumVal = ObjectUtils.getEnum(enumType, value);
value = enumVal.name();
}
}
@@ -349,9 +350,10 @@ public class SelectInputControl extends InputControl
@Override
protected Object parseInputValue(String value, InputInfo ii)
{
- if (ii.getColumn().isEnum())
+ Class<Enum<?>> enumType = ii.getColumn().getEnumType();
+ if (enumType!=null)
{ // convert to enum
- return ObjectUtils.getEnum(ii.getColumn().getEnumType(), value);
+ return ObjectUtils.getEnum(enumType, value);
}
return value;
}
diff --git
a/empire-db-jsf2/src/main/java/org/apache/empire/jsf2/utils/TagEncodingHelper.java
b/empire-db-jsf2/src/main/java/org/apache/empire/jsf2/utils/TagEncodingHelper.java
index a8b6429..ae83f15 100644
---
a/empire-db-jsf2/src/main/java/org/apache/empire/jsf2/utils/TagEncodingHelper.java
+++
b/empire-db-jsf2/src/main/java/org/apache/empire/jsf2/utils/TagEncodingHelper.java
@@ -170,12 +170,6 @@ public class TagEncodingHelper implements NamingContainer
}
@Override
- public boolean isEnum()
- {
- return getSourceColumn().isEnum();
- }
-
- @Override
public Class<Enum<?>> getEnumType()
{
return getSourceColumn().getEnumType();
diff --git a/empire-db/src/main/java/org/apache/empire/data/Column.java
b/empire-db/src/main/java/org/apache/empire/data/Column.java
index 58e6e0d..fa92525 100644
--- a/empire-db/src/main/java/org/apache/empire/data/Column.java
+++ b/empire-db/src/main/java/org/apache/empire/data/Column.java
@@ -81,13 +81,6 @@ public interface Column extends ColumnExpr
boolean isReadOnly();
/**
- * Returns true if an enum type has been set for this column
- * <P>
- * @return true if an enum type has been set for this column
- */
- boolean isEnum();
-
- /**
* Returns the enum type for this column
* <P>
* @return the enum type
diff --git
a/empire-db/src/main/java/org/apache/empire/data/bean/BeanProperty.java
b/empire-db/src/main/java/org/apache/empire/data/bean/BeanProperty.java
index ccbac58..63690b0 100644
--- a/empire-db/src/main/java/org/apache/empire/data/bean/BeanProperty.java
+++ b/empire-db/src/main/java/org/apache/empire/data/bean/BeanProperty.java
@@ -166,17 +166,6 @@ public class BeanProperty implements Column
}
/**
- * Returns true if an enum type has been set for this column
- * <P>
- * @return eturns true if an enum type has been set for this column
- */
- @Override
- public boolean isEnum()
- {
- return (getEnumType()!=null);
- }
-
- /**
* Returns the enum type for this column
* <P>
* @return the enum type
diff --git a/empire-db/src/main/java/org/apache/empire/db/DBColumn.java
b/empire-db/src/main/java/org/apache/empire/db/DBColumn.java
index c05632a..95b88b5 100644
--- a/empire-db/src/main/java/org/apache/empire/db/DBColumn.java
+++ b/empire-db/src/main/java/org/apache/empire/db/DBColumn.java
@@ -389,8 +389,7 @@ public abstract class DBColumn extends DBColumnExpr
* <P>
* @return eturns true if an enum type has been set for this column
*/
- @Override
- public boolean isEnum()
+ public final boolean isEnum()
{
return (getEnumType()!=null);
}
