knguyen 2006/01/04 17:57:30 CET
Modified files:
core/src/java/org/jahia/services/metadata/core/listeners
ContentLastContributorListener.java
ContentLastModificationDateListener.java
Log:
- creator is first contributor too
Revision Changes Path
1.14 +23 -0
jahia/core/src/java/org/jahia/services/metadata/core/listeners/ContentLastContributorListener.java
http://jahia.mine.nu:8080/cgi-bin/cvsweb.cgi/jahia/core/src/java/org/jahia/services/metadata/core/listeners/ContentLastContributorListener.java.diff?r1=1.13&r2=1.14&f=h
1.17 +18 -0
jahia/core/src/java/org/jahia/services/metadata/core/listeners/ContentLastModificationDateListener.java
http://jahia.mine.nu:8080/cgi-bin/cvsweb.cgi/jahia/core/src/java/org/jahia/services/metadata/core/listeners/ContentLastModificationDateListener.java.diff?r1=1.16&r2=1.17&f=h
Index: ContentLastContributorListener.java
===================================================================
RCS file:
/home/cvs/repository/jahia/core/src/java/org/jahia/services/metadata/core/listeners/ContentLastContributorListener.java,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- ContentLastContributorListener.java 4 Jan 2006 12:44:33 -0000
1.13
+++ ContentLastContributorListener.java 4 Jan 2006 16:57:30 -0000
1.14
@@ -76,6 +76,16 @@
map.put(key,time);
}
+ public void resetLastUpdateTime(ObjectKey key) {
+ if ( lastUpdateTimeThreadLocal == null ){
+ return;
+ }
+ HashMap map = (HashMap)lastUpdateTimeThreadLocal.get();
+ if ( map != null ){
+ map.remove(key);
+ }
+ }
+
public Long getUpdateTimeMinInterval() {
if ( updateTimeMinInterval == null ){
updateTimeMinInterval = new Long(300);
@@ -121,6 +131,19 @@
handleObjectChanged(theEvent);
}
+ public void contentObjectCreated(JahiaEvent theEvent){
+ ContentObject contentObject = (ContentObject)theEvent.getObject();
+ if ( contentObject == null ){
+ return;
+ }
+ this.resetLastUpdateTime(contentObject.getObjectKey());
+ handleObjectChanged(theEvent);
+ }
+
+ public void contentObjectUpdated(JahiaEvent theEvent){
+ handleObjectChanged(theEvent);
+ }
+
protected synchronized void handleObjectChanged (JahiaEvent theEvent) {
ContentObject contentObject = (ContentObject)theEvent.getObject();
if ( contentObject == null ){
Index: ContentLastModificationDateListener.java
===================================================================
RCS file:
/home/cvs/repository/jahia/core/src/java/org/jahia/services/metadata/core/listeners/ContentLastModificationDateListener.java,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -r1.16 -r1.17
--- ContentLastModificationDateListener.java 23 Dec 2005 16:52:39 -0000
1.16
+++ ContentLastModificationDateListener.java 4 Jan 2006 16:57:30 -0000
1.17
@@ -4,6 +4,7 @@
import org.jahia.content.ContentObject;
import org.jahia.content.JahiaObject;
import org.jahia.content.PageReferenceableInterface;
+import org.jahia.content.ObjectKey;
import org.jahia.content.events.ContentUndoStagingEvent;
import org.jahia.content.events.ContentObjectDeleteEvent;
import org.jahia.content.events.ContentObjectRestoreVersionEvent;
@@ -67,6 +68,10 @@
this.updateTimeMinInterval = updateTimeMinInterval;
}
+ public void resetLastUpdateTime(ObjectKey key) {
+ this.lastUpdateTimeMap.remove(key);
+ }
+
public void metadataEngineAfterInit (JahiaEvent theEvent) {
processEvent("metadataEngineAfterInit",theEvent);
}
@@ -101,6 +106,19 @@
handleObjectChanged(theEvent);
}
+ public void contentObjectCreated(JahiaEvent theEvent){
+ ContentObject contentObject = (ContentObject)theEvent.getObject();
+ if ( contentObject == null ){
+ return;
+ }
+ this.resetLastUpdateTime(contentObject.getObjectKey());
+ handleObjectChanged(theEvent);
+ }
+
+ public void contentObjectUpdated(JahiaEvent theEvent){
+ handleObjectChanged(theEvent);
+ }
+
public void handleObjectChanged (JahiaEvent theEvent) {
ContentObject contentObject = (ContentObject)theEvent.getObject();
if ( contentObject == null ){
