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 c7ee81b8 EMPIREDB-431 PageElement minor improvments
c7ee81b8 is described below
commit c7ee81b85cd26927b959ec3539366802a762ee8f
Author: Rainer Döbele <[email protected]>
AuthorDate: Tue Dec 17 21:30:17 2024 +0100
EMPIREDB-431
PageElement minor improvments
---
.../jakarta/pageelements/ListPageElement.java | 2 +-
.../jakarta/pageelements/RecordPageElement.java | 6 ++---
.../java/org/apache/empire/jakarta/pages/Page.java | 24 ++++++++---------
.../apache/empire/jakarta/pages/PageElement.java | 31 ++++++++--------------
.../empire/jsf2/pageelements/ListPageElement.java | 2 +-
.../jsf2/pageelements/RecordPageElement.java | 6 ++---
.../java/org/apache/empire/jsf2/pages/Page.java | 24 ++++++++---------
.../org/apache/empire/jsf2/pages/PageElement.java | 31 ++++++++--------------
.../java/org/apache/empire/commons/ArraySet.java | 18 +++++++++++++
9 files changed, 72 insertions(+), 72 deletions(-)
diff --git
a/empire-db-jakarta-faces/src/main/java/org/apache/empire/jakarta/pageelements/ListPageElement.java
b/empire-db-jakarta-faces/src/main/java/org/apache/empire/jakarta/pageelements/ListPageElement.java
index 8e1e50d9..6cfe49e3 100644
---
a/empire-db-jakarta-faces/src/main/java/org/apache/empire/jakarta/pageelements/ListPageElement.java
+++
b/empire-db-jakarta-faces/src/main/java/org/apache/empire/jakarta/pageelements/ListPageElement.java
@@ -38,7 +38,7 @@ import org.apache.empire.jakarta.pages.PageElement;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
-public abstract class ListPageElement<T> extends PageElement
+public abstract class ListPageElement<T> extends PageElement<Page>
{
// *Deprecated* private static final long serialVersionUID = 1L;
diff --git
a/empire-db-jakarta-faces/src/main/java/org/apache/empire/jakarta/pageelements/RecordPageElement.java
b/empire-db-jakarta-faces/src/main/java/org/apache/empire/jakarta/pageelements/RecordPageElement.java
index 56cc9d9b..be97800b 100644
---
a/empire-db-jakarta-faces/src/main/java/org/apache/empire/jakarta/pageelements/RecordPageElement.java
+++
b/empire-db-jakarta-faces/src/main/java/org/apache/empire/jakarta/pageelements/RecordPageElement.java
@@ -30,13 +30,13 @@ import org.apache.empire.jakarta.pages.PageElement;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
-public class RecordPageElement<T extends DBRecord> extends PageElement
+public class RecordPageElement<T extends DBRecord> extends PageElement<Page>
{
// *Deprecated* private static final long serialVersionUID = 1L;
- private static final Logger log =
LoggerFactory.getLogger(RecordPageElement.class);
+ private static final Logger log =
LoggerFactory.getLogger(RecordPageElement.class);
- protected DBRowSet rowset;
+ protected final DBRowSet rowset;
protected T record;
diff --git
a/empire-db-jakarta-faces/src/main/java/org/apache/empire/jakarta/pages/Page.java
b/empire-db-jakarta-faces/src/main/java/org/apache/empire/jakarta/pages/Page.java
index 9ce53cf4..e770a154 100644
---
a/empire-db-jakarta-faces/src/main/java/org/apache/empire/jakarta/pages/Page.java
+++
b/empire-db-jakarta-faces/src/main/java/org/apache/empire/jakarta/pages/Page.java
@@ -46,14 +46,14 @@ public abstract class Page // *Deprecated* implements
Serializable
{
// *Deprecated* private static final long serialVersionUID = 1L;
- public static final String SESSION_MESSAGE = "PAGE_SESSION_MESSAGE";
+ public static final String SESSION_MESSAGE = "PAGE_SESSION_MESSAGE";
- private static final Logger log =
LoggerFactory.getLogger(Page.class);
+ private static final Logger log =
LoggerFactory.getLogger(Page.class);
- private String action = null;
- private short initialized = -1; // -1=not
initialized; 0=pending; 1=initialized
- private PageDefinition pageDefinition = null;
- private List<PageElement> pageElements = null;
+ private String action = null;
+ private short initialized = -1; // -1=not initialized;
0=pending; 1=initialized
+ private PageDefinition pageDefinition = null;
+ private List<PageElement<?>> pageElements = null;
protected Page()
{
@@ -395,10 +395,10 @@ public abstract class Page // *Deprecated* implements
Serializable
*
* @param element
*/
- protected void registerPageElement(PageElement element)
+ protected void registerPageElement(PageElement<?> element)
{
if (pageElements == null)
- pageElements = new ArrayList<PageElement>(1);
+ pageElements = new ArrayList<PageElement<?>>(1);
// register now
if (pageElements.contains(element) == false)
pageElements.add(element);
@@ -525,7 +525,7 @@ public abstract class Page // *Deprecated* implements
Serializable
{
if (pageElements != null)
{ // Init Page Elements
- for (PageElement pe : pageElements)
+ for (PageElement<?> pe : pageElements)
doInitElement(pe);
}
}
@@ -534,7 +534,7 @@ public abstract class Page // *Deprecated* implements
Serializable
{
if (pageElements != null)
{ // Refresh Page Elements
- for (PageElement pe : pageElements)
+ for (PageElement<?> pe : pageElements)
doRefreshElement(pe);
}
}
@@ -543,7 +543,7 @@ public abstract class Page // *Deprecated* implements
Serializable
* called by doInit() to initialize a particular page element
* @param pe the page element to initialize
*/
- protected void doInitElement(PageElement pe)
+ protected void doInitElement(PageElement<?> pe)
{
pe.onInitPage();
}
@@ -552,7 +552,7 @@ public abstract class Page // *Deprecated* implements
Serializable
* called by doRefresh() to refresh a particular page element
* @param pe the page element to refresh
*/
- protected void doRefreshElement(PageElement pe)
+ protected void doRefreshElement(PageElement<?> pe)
{
pe.onRefreshPage();
}
diff --git
a/empire-db-jakarta-faces/src/main/java/org/apache/empire/jakarta/pages/PageElement.java
b/empire-db-jakarta-faces/src/main/java/org/apache/empire/jakarta/pages/PageElement.java
index 8a4c5fcb..085468eb 100644
---
a/empire-db-jakarta-faces/src/main/java/org/apache/empire/jakarta/pages/PageElement.java
+++
b/empire-db-jakarta-faces/src/main/java/org/apache/empire/jakarta/pages/PageElement.java
@@ -27,23 +27,23 @@ import org.apache.empire.db.DBRowSet;
import org.apache.empire.exceptions.InvalidArgumentException;
-public class PageElement // *Deprecated* implements Serializable
+public class PageElement<P extends Page> // *Deprecated* implements
Serializable
{
// *Deprecated* private static final long serialVersionUID = 1L;
- private final Page page;
+ protected final P page;
- private final String propertyName;
+ private final String propertyName;
- protected PageElement(Page page, String propertyName)
+ protected PageElement(P page, String name)
{
if (page==null)
throw new InvalidArgumentException("page", page);
- if (StringUtils.isEmpty(propertyName))
- throw new InvalidArgumentException("propertyName", propertyName);
+ if (StringUtils.isEmpty(name))
+ throw new InvalidArgumentException("name", name);
// set params
this.page = page;
- this.propertyName = propertyName;
+ this.propertyName = name;
// register with page
page.registerPageElement(this);
}
@@ -53,7 +53,7 @@ public class PageElement // *Deprecated* implements
Serializable
return propertyName;
}
- public Page getPage()
+ public P getPage()
{
return page;
}
@@ -73,14 +73,14 @@ public class PageElement // *Deprecated* implements
Serializable
@SuppressWarnings("unchecked")
protected <T> T getSessionObject(Class<T> type)
{
- String beanName = page.getPageName() + "." + propertyName + "." +
type.getSimpleName();
+ String beanName = StringUtils.concat(page.getPageName(), ".",
propertyName, ".", type.getSimpleName());
Map<String, Object> map =
FacesContext.getCurrentInstance().getExternalContext().getSessionMap();
return (T) map.get(beanName);
}
protected <T> void setSessionObject(Class<T> type, T object)
{
- String beanName = page.getPageName() + "." + propertyName + "." +
type.getSimpleName();
+ String beanName = StringUtils.concat(page.getPageName(), ".",
propertyName, ".", type.getSimpleName());
Map<String, Object> map =
FacesContext.getCurrentInstance().getExternalContext().getSessionMap();
if (object != null)
map.put(beanName, object);
@@ -88,7 +88,7 @@ public class PageElement // *Deprecated* implements
Serializable
map.remove(beanName);
}
- protected <T> void removeSessionObject(Class<T> type)
+ protected final <T> void removeSessionObject(Class<T> type)
{
setSessionObject(type, null);
}
@@ -151,13 +151,4 @@ public class PageElement // *Deprecated* implements
Serializable
return res;
}
- /**
- * Javascript Call
- *
- * @param function
- protected void addJavascriptCall(String function)
- {
- page.addJavascriptCall(function);
- }
- */
}
diff --git
a/empire-db-jsf2/src/main/java/org/apache/empire/jsf2/pageelements/ListPageElement.java
b/empire-db-jsf2/src/main/java/org/apache/empire/jsf2/pageelements/ListPageElement.java
index 3a2ea310..b72924e8 100644
---
a/empire-db-jsf2/src/main/java/org/apache/empire/jsf2/pageelements/ListPageElement.java
+++
b/empire-db-jsf2/src/main/java/org/apache/empire/jsf2/pageelements/ListPageElement.java
@@ -38,7 +38,7 @@ import org.apache.empire.jsf2.pages.PageElement;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
-public abstract class ListPageElement<T> extends PageElement
+public abstract class ListPageElement<T> extends PageElement<Page>
{
// *Deprecated* private static final long serialVersionUID = 1L;
diff --git
a/empire-db-jsf2/src/main/java/org/apache/empire/jsf2/pageelements/RecordPageElement.java
b/empire-db-jsf2/src/main/java/org/apache/empire/jsf2/pageelements/RecordPageElement.java
index 44890653..e7256d89 100644
---
a/empire-db-jsf2/src/main/java/org/apache/empire/jsf2/pageelements/RecordPageElement.java
+++
b/empire-db-jsf2/src/main/java/org/apache/empire/jsf2/pageelements/RecordPageElement.java
@@ -30,13 +30,13 @@ import org.apache.empire.jsf2.pages.PageElement;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
-public class RecordPageElement<T extends DBRecord> extends PageElement
+public class RecordPageElement<T extends DBRecord> extends PageElement<Page>
{
// *Deprecated* private static final long serialVersionUID = 1L;
- private static final Logger log =
LoggerFactory.getLogger(RecordPageElement.class);
+ private static final Logger log =
LoggerFactory.getLogger(RecordPageElement.class);
- protected DBRowSet rowset;
+ protected final DBRowSet rowset;
protected T record;
diff --git
a/empire-db-jsf2/src/main/java/org/apache/empire/jsf2/pages/Page.java
b/empire-db-jsf2/src/main/java/org/apache/empire/jsf2/pages/Page.java
index a3cac649..021b3b0e 100644
--- a/empire-db-jsf2/src/main/java/org/apache/empire/jsf2/pages/Page.java
+++ b/empire-db-jsf2/src/main/java/org/apache/empire/jsf2/pages/Page.java
@@ -46,14 +46,14 @@ public abstract class Page // *Deprecated* implements
Serializable
{
// *Deprecated* private static final long serialVersionUID = 1L;
- public static final String SESSION_MESSAGE = "PAGE_SESSION_MESSAGE";
+ public static final String SESSION_MESSAGE = "PAGE_SESSION_MESSAGE";
- private static final Logger log =
LoggerFactory.getLogger(Page.class);
+ private static final Logger log =
LoggerFactory.getLogger(Page.class);
- private String action = null;
- private short initialized = -1; // -1=not
initialized; 0=pending; 1=initialized
- private PageDefinition pageDefinition = null;
- private List<PageElement> pageElements = null;
+ private String action = null;
+ private short initialized = -1; // -1=not initialized;
0=pending; 1=initialized
+ private PageDefinition pageDefinition = null;
+ private List<PageElement<?>> pageElements = null;
protected Page()
{
@@ -395,10 +395,10 @@ public abstract class Page // *Deprecated* implements
Serializable
*
* @param element
*/
- protected void registerPageElement(PageElement element)
+ protected void registerPageElement(PageElement<?> element)
{
if (pageElements == null)
- pageElements = new ArrayList<PageElement>(1);
+ pageElements = new ArrayList<PageElement<?>>(1);
// register now
if (pageElements.contains(element) == false)
pageElements.add(element);
@@ -525,7 +525,7 @@ public abstract class Page // *Deprecated* implements
Serializable
{
if (pageElements != null)
{ // Init Page Elements
- for (PageElement pe : pageElements)
+ for (PageElement<?> pe : pageElements)
doInitElement(pe);
}
}
@@ -534,7 +534,7 @@ public abstract class Page // *Deprecated* implements
Serializable
{
if (pageElements != null)
{ // Refresh Page Elements
- for (PageElement pe : pageElements)
+ for (PageElement<?> pe : pageElements)
doRefreshElement(pe);
}
}
@@ -543,7 +543,7 @@ public abstract class Page // *Deprecated* implements
Serializable
* called by doInit() to initialize a particular page element
* @param pe the page element to initialize
*/
- protected void doInitElement(PageElement pe)
+ protected void doInitElement(PageElement<?> pe)
{
pe.onInitPage();
}
@@ -552,7 +552,7 @@ public abstract class Page // *Deprecated* implements
Serializable
* called by doRefresh() to refresh a particular page element
* @param pe the page element to refresh
*/
- protected void doRefreshElement(PageElement pe)
+ protected void doRefreshElement(PageElement<?> pe)
{
pe.onRefreshPage();
}
diff --git
a/empire-db-jsf2/src/main/java/org/apache/empire/jsf2/pages/PageElement.java
b/empire-db-jsf2/src/main/java/org/apache/empire/jsf2/pages/PageElement.java
index f786801f..17076e36 100644
--- a/empire-db-jsf2/src/main/java/org/apache/empire/jsf2/pages/PageElement.java
+++ b/empire-db-jsf2/src/main/java/org/apache/empire/jsf2/pages/PageElement.java
@@ -27,23 +27,23 @@ import org.apache.empire.db.DBRowSet;
import org.apache.empire.exceptions.InvalidArgumentException;
-public class PageElement // *Deprecated* implements Serializable
+public class PageElement<P extends Page> // *Deprecated* implements
Serializable
{
// *Deprecated* private static final long serialVersionUID = 1L;
- private final Page page;
+ protected final P page;
- private final String propertyName;
+ private final String propertyName;
- protected PageElement(Page page, String propertyName)
+ protected PageElement(P page, String name)
{
if (page==null)
throw new InvalidArgumentException("page", page);
- if (StringUtils.isEmpty(propertyName))
- throw new InvalidArgumentException("propertyName", propertyName);
+ if (StringUtils.isEmpty(name))
+ throw new InvalidArgumentException("name", name);
// set params
this.page = page;
- this.propertyName = propertyName;
+ this.propertyName = name;
// register with page
page.registerPageElement(this);
}
@@ -53,7 +53,7 @@ public class PageElement // *Deprecated* implements
Serializable
return propertyName;
}
- public Page getPage()
+ public P getPage()
{
return page;
}
@@ -73,14 +73,14 @@ public class PageElement // *Deprecated* implements
Serializable
@SuppressWarnings("unchecked")
protected <T> T getSessionObject(Class<T> type)
{
- String beanName = page.getPageName() + "." + propertyName + "." +
type.getSimpleName();
+ String beanName = StringUtils.concat(page.getPageName(), ".",
propertyName, ".", type.getSimpleName());
Map<String, Object> map =
FacesContext.getCurrentInstance().getExternalContext().getSessionMap();
return (T) map.get(beanName);
}
protected <T> void setSessionObject(Class<T> type, T object)
{
- String beanName = page.getPageName() + "." + propertyName + "." +
type.getSimpleName();
+ String beanName = StringUtils.concat(page.getPageName(), ".",
propertyName, ".", type.getSimpleName());
Map<String, Object> map =
FacesContext.getCurrentInstance().getExternalContext().getSessionMap();
if (object != null)
map.put(beanName, object);
@@ -88,7 +88,7 @@ public class PageElement // *Deprecated* implements
Serializable
map.remove(beanName);
}
- protected <T> void removeSessionObject(Class<T> type)
+ protected final <T> void removeSessionObject(Class<T> type)
{
setSessionObject(type, null);
}
@@ -151,13 +151,4 @@ public class PageElement // *Deprecated* implements
Serializable
return res;
}
- /**
- * Javascript Call
- *
- * @param function
- protected void addJavascriptCall(String function)
- {
- page.addJavascriptCall(function);
- }
- */
}
diff --git a/empire-db/src/main/java/org/apache/empire/commons/ArraySet.java
b/empire-db/src/main/java/org/apache/empire/commons/ArraySet.java
index 2f44c643..b22d08f3 100644
--- a/empire-db/src/main/java/org/apache/empire/commons/ArraySet.java
+++ b/empire-db/src/main/java/org/apache/empire/commons/ArraySet.java
@@ -137,6 +137,18 @@ public class ArraySet<E> extends ArrayList<E> implements
Set<E>
{
super(initialCapacity);
}
+
+ /**
+ * Constructor with initial list
+ */
+ @SafeVarargs
+ public ArraySet(E... items)
+ {
+ super(items.length);
+ // add all
+ for (int i=0; i<items.length; i++)
+ add(items[i]);
+ }
/**
* Copy constructor
@@ -205,6 +217,12 @@ public class ArraySet<E> extends ArrayList<E> implements
Set<E>
return super.remove(item);
}
+ @Override
+ public String toString()
+ {
+ return StringUtils.listToString(this, StringUtils.LIST_TEMPLATE);
+ }
+
/*
* internal
*/
