Author: bpapez
Date: Thu Nov 29 08:57:51 2007
New Revision: 19310
URL: https://svndev.jahia.net/websvn/listing.php?sc=3D1&rev=3D19310&repname=
=3Djahia
Log:
fix code formating
Modified:
trunk/core/src/java/org/jahia/hibernate/dao/JahiaAuditLogDAO.java
trunk/core/src/java/org/jahia/hibernate/manager/JahiaAuditLogManager.ja=
va
Modified: trunk/core/src/java/org/jahia/hibernate/dao/JahiaAuditLogDAO.java
URL: https://svndev.jahia.net/websvn/diff.php?path=3D/trunk/core/src/java/o=
rg/jahia/hibernate/dao/JahiaAuditLogDAO.java&rev=3D19310&repname=3Djahia
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D
--- trunk/core/src/java/org/jahia/hibernate/dao/JahiaAuditLogDAO.java (orig=
inal)
+++ trunk/core/src/java/org/jahia/hibernate/dao/JahiaAuditLogDAO.java Thu N=
ov 29 08:57:51 2007
@@ -61,23 +61,24 @@
});
}
=
- public List getLogs(Integer objectType, Integer objectID, List childre=
nObjectList) {
+ public List getLogs(Integer objectType, Integer objectID,
+ List childrenObjectList) {
List retList =3D null;
=
if (objectType !=3D null && objectID !=3D null) {
- Set objectIds =3D new
HashSet(childrenObjectList.size());
- objectIds.add(objectID); =
- for (Iterator it =3D childrenObjectList.iterator(); it.hasNext=
(); ) {
+ Set objectIds =3D new HashSet(childrenObjectList.size());
+ objectIds.add(objectID);
+ for (Iterator it =3D childrenObjectList.iterator(); it.hasNext=
();) {
Integer[] integers =3D (Integer[]) it.next();
objectIds.add(integers[1]);
- } =
+ }
=
- Query query =3D this.getSession().createQuery(
- "from JahiaAuditLog l "
- + "where l.objectid in
(:objectIDs)");
- query.setParameterList("objectIDs", objectIds);
- retList =3D query.list();
- }
+ Query query =3D this.getSession().createQuery(
+ "from JahiaAuditLog l "
+ + "where l.objectid in (:objectIDs)");
+ query.setParameterList("objectIDs", objectIds);
+ retList =3D query.list();
+ }
return retList;
}
=
@@ -93,40 +94,39 @@
return retList;
}
=
- public int flushLogs(Integer objectType, Integer objectID, List childr=
enObjectList) {
+ public int flushLogs(Integer objectType, Integer objectID,
+ List childrenObjectList) {
int retList =3D 0;
- =
+
if (objectType !=3D null && objectID !=3D null) {
- Set objectIds =3D new
HashSet(childrenObjectList.size());
- objectIds.add(objectID); =
- for (Iterator it =3D childrenObjectList.iterator(); it.hasNext=
(); ) {
+ Set objectIds =3D new HashSet(childrenObjectList.size());
+ objectIds.add(objectID);
+ for (Iterator it =3D childrenObjectList.iterator(); it.hasNext=
();) {
Integer[] integers =3D (Integer[]) it.next();
objectIds.add(integers[1]);
- } =
+ }
=
- Query query =3D this.getSession().createQuery(
- "delete from JahiaAuditLog "
- + "where objectid in
(:objectIDs)");
- query.setParameterList("objectIDs", objectIds);
+ Query query =3D this.getSession().createQuery(
+ "delete from JahiaAuditLog "
+ + "where objectid in (:objectIDs)");
+ query.setParameterList("objectIDs", objectIds);
retList =3D query.executeUpdate();
}
return retList;
}
=
public void flushLogs(final Long oldestEntryTime) {
- Query query =3D this.getSession().createQuery(
- "delete from JahiaAuditLog "
- + "where time < ?");
- query.setParameter(0, oldestEntryTime);
+ Query query =3D this.getSession().createQuery(
+ "delete from JahiaAuditLog " + "where time < ?");
+ query.setParameter(0, oldestEntryTime);
query.executeUpdate();
}
=
public void flushSiteLogs(String siteKey) {
- Query query =3D this.getSession().createQuery(
- "delete from JahiaAuditLog "
- + "where site =3D ?");
- query.setParameter(0, siteKey);
- query.executeUpdate(); =
+ Query query =3D this.getSession().createQuery(
+ "delete from JahiaAuditLog " + "where site =3D ?");
+ query.setParameter(0, siteKey);
+ query.executeUpdate();
}
=
public int enforceMaxLogs(int maxLogs) {
@@ -145,13 +145,12 @@
}
=
public int deleteAllLogs() {
- return this.getSession().createQuery(
- "delete from JahiaAuditLog ").executeUpdate();
=
+ return this.getSession().createQuery("delete from JahiaAuditLog ")
+ .executeUpdate();
}
=
public void deleteOldestRow() {
- this.getSession().createQuery(
- "delete from JahiaAuditLog where id =3D
min(id)")
- .executeUpdate();
+ this.getSession().createQuery(
+ "delete from JahiaAuditLog where id =3D min(id)").executeU=
pdate();
}
}
Modified: trunk/core/src/java/org/jahia/hibernate/manager/JahiaAuditLogMana=
ger.java
URL: https://svndev.jahia.net/websvn/diff.php?path=3D/trunk/core/src/java/o=
rg/jahia/hibernate/manager/JahiaAuditLogManager.java&rev=3D19310&repname=3D=
jahia
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D
--- trunk/core/src/java/org/jahia/hibernate/manager/JahiaAuditLogManager.ja=
va (original)
+++ trunk/core/src/java/org/jahia/hibernate/manager/JahiaAuditLogManager.ja=
va Thu Nov 29 08:57:51 2007
@@ -94,19 +94,20 @@
dao.save(log);
return false;
}
-
- public List getAllChildren(int objectType, int objectID, List parents) {
- List fullChildrenList =3D parents =3D=3D null ? new FastArrayList(=
103) : parents;
+ =
+ public List getAllChildren(int objectType, int objectID, List parents)=
{
+ List fullChildrenList =3D parents =3D=3D null ? new FastArrayList(=
103)
+ : parents;
List tempChildrenList =3D getChildrenList(objectType, objectID);
- for (Iterator it =3D tempChildrenList.iterator();
it.hasNext();) {
- Integer[] newChild =3D (Integer[]) it.next();
=
- fullChildrenList.add(newChild);
- Integer newObjType =3D newChild[0];
- Integer newObjID =3D newChild[1];
- getAllChildren(newObjType.intValue(),
newObjID.intValue(),
- fullChildrenList);
- }
- return fullChildrenList;
+ for (Iterator it =3D tempChildrenList.iterator(); it.hasNext();) {
+ Integer[] newChild =3D (Integer[]) it.next();
+ fullChildrenList.add(newChild);
+ Integer newObjType =3D newChild[0];
+ Integer newObjID =3D newChild[1];
+ getAllChildren(newObjType.intValue(), newObjID.intValue(),
+ fullChildrenList);
+ }
+ return fullChildrenList;
}
=
private List getChildrenList(int objectType, int objectID) {
_______________________________________________
cvs_list mailing list
[email protected]
http://lists.jahia.org/cgi-bin/mailman/listinfo/cvs_list
