tdraier 2005/10/18 15:40:05 CEST
Modified files:
core/src/java/org/jahia/content ContentObject.java
core/src/java/org/jahia/services/fields ContentField.java
core/src/java/org/jahia/services/workflow
WorkflowEventListener.java
Log:
few optimisations
Revision Changes Path
1.22 +0 -7 jahia/core/src/java/org/jahia/content/ContentObject.java
http://jahia.mine.nu:8080/cgi-bin/cvsweb.cgi/jahia/core/src/java/org/jahia/content/ContentObject.java.diff?r1=1.21&r2=1.22&f=h
1.33 +29 -14
jahia/core/src/java/org/jahia/services/fields/ContentField.java
http://jahia.mine.nu:8080/cgi-bin/cvsweb.cgi/jahia/core/src/java/org/jahia/services/fields/ContentField.java.diff?r1=1.32&r2=1.33&f=h
1.11 +0 -0
jahia/core/src/java/org/jahia/services/workflow/WorkflowEventListener.java
http://jahia.mine.nu:8080/cgi-bin/cvsweb.cgi/jahia/core/src/java/org/jahia/services/workflow/WorkflowEventListener.java.diff?r1=1.10&r2=1.11&f=h
Index: ContentObject.java
===================================================================
RCS file:
/home/cvs/repository/jahia/core/src/java/org/jahia/content/ContentObject.java,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -r1.21 -r1.22
--- ContentObject.java 30 Sep 2005 15:33:56 -0000 1.21
+++ ContentObject.java 18 Oct 2005 13:40:04 -0000 1.22
@@ -1415,13 +1415,6 @@
new HashMap (),
new HashMap (),
new HashMap ());
- // must recall event, cause metadata link was not present at creation
- try {
- WorkflowEvent theEvent = new WorkflowEvent (obj,
ContentObject.getContentObjectInstance(metadata.getObjectKey()), user, lang,
false);
- ServicesRegistry.getInstance ().getJahiaEventService
().fireObjectChanged(theEvent);
- } catch (ClassNotFoundException e) {
- // ...?
- }
}
Index: ContentField.java
===================================================================
RCS file:
/home/cvs/repository/jahia/core/src/java/org/jahia/services/fields/ContentField.java,v
retrieving revision 1.32
retrieving revision 1.33
diff -u -r1.32 -r1.33
--- ContentField.java 7 Oct 2005 12:45:29 -0000 1.32
+++ ContentField.java 18 Oct 2005 13:40:04 -0000 1.33
@@ -360,8 +360,10 @@
ContentObjectEntryState.WORKFLOW_STATE_START_STAGING, languageCode);
*/
- WorkflowEvent theEvent = new WorkflowEvent (this, this, user,
languageCode, true);
- ServicesRegistry.getInstance ().getJahiaEventService
().fireObjectChanged(theEvent);
+ if (!isMetadata()) {
+ WorkflowEvent theEvent = new WorkflowEvent (this, this,
user, languageCode, true);
+ ServicesRegistry.getInstance ().getJahiaEventService
().fireObjectChanged(theEvent);
+ }
notifyFieldUpdate();
@@ -412,9 +414,10 @@
deleteStagingEntries (tempLanguageCodes);
}
- WorkflowEvent theEvent = new WorkflowEvent (this, this, user,
curLanguageCode, true);
- ServicesRegistry.getInstance ().getJahiaEventService
().fireObjectChanged(theEvent);
-
+ if (!isMetadata()) {
+ WorkflowEvent theEvent = new WorkflowEvent (this, this,
user, curLanguageCode, true);
+ ServicesRegistry.getInstance ().getJahiaEventService
().fireObjectChanged(theEvent);
+ }
}
if (stateModified) {
@@ -699,13 +702,15 @@
JahiaSaveVersion saveVersion = new JahiaSaveVersion (true,
versioningEnabled, newVersionID);
- fireContentActivationEvent(languageCodes,
- versioningEnabled,
- saveVersion,
- jParams,
- stateModifContext,
- activationResults);
-
+ if (!isMetadata()) {
+ fireContentActivationEvent(languageCodes,
+ versioningEnabled,
+ saveVersion,
+ jParams,
+ stateModifContext,
+ activationResults);
+ }
+
// let's inform the cache server that we have updated this object,
// so that other nodes in the cluster can update their values.
ContentFieldTools.getInstance ().updateCache(this);
@@ -1333,8 +1338,10 @@
}
public void postSet(EntrySaveRequest saveRequest) throws JahiaException{
- WorkflowEvent theEvent = new WorkflowEvent(this, this,
saveRequest.getUser(), saveRequest.getLanguageCode(), false);
- ServicesRegistry.getInstance ().getJahiaEventService
().fireObjectChanged(theEvent);
+ if (!isMetadata()) {
+ WorkflowEvent theEvent = new WorkflowEvent(this, this,
saveRequest.getUser(), saveRequest.getLanguageCode(), false);
+ ServicesRegistry.getInstance ().getJahiaEventService
().fireObjectChanged(theEvent);
+ }
}
/**
@@ -1979,6 +1986,14 @@
return versionID;
}
+ public boolean isMetadata() {
+ try {
+ return
ServicesRegistry.getInstance().getJahiaFieldService().loadFieldDefinition(getFieldDefID()).getJahiaID()
== 0;
+ } catch (Exception e) {
+ }
+ return false;
+ }
+
public String toString() {
final StringBuffer buff = new StringBuffer();
buff.append("ContentField: ID = ").
