cvs commit: jahia/core/src/java/org/jahia/views/engines/versioning/revisionsdetail/actions RevisionEntrySetDetailAction.java

[Thomas Draier]

tdraier     2004/12/09 12:21:59 CET

  Modified files:
    core/src/java/org/jahia/views/engines/versioning/revisionsdetail/actions 
                                                                             
RevisionEntrySetDetailAction.java 
  Log:
  -updated modification check for containers and fields, do not save if not 
modified
  -included deleted object in workflow groups
  
  Revision  Changes    Path
  1.2       +14 -17    
jahia/core/src/java/org/jahia/views/engines/versioning/revisionsdetail/actions/RevisionEntrySetDetailAction.java
http://jahia.mine.nu:8080/cgi-bin/cvsweb.cgi/jahia/core/src/java/org/jahia/views/engines/versioning/revisionsdetail/actions/RevisionEntrySetDetailAction.java.diff?r1=1.1&r2=1.2&f=h
  
  
  
  Index: RevisionEntrySetDetailAction.java
  ===================================================================
  RCS file: 
/home/cvs/repository/jahia/core/src/java/org/jahia/views/engines/versioning/revisionsdetail/actions/RevisionEntrySetDetailAction.java,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- RevisionEntrySetDetailAction.java 30 Mar 2004 14:13:17 -0000      1.1
  +++ RevisionEntrySetDetailAction.java 9 Dec 2004 11:21:59 -0000       1.2
  @@ -1,22 +1,8 @@
   package org.jahia.views.engines.versioning.revisionsdetail.actions;
   
  -import java.io.IOException;
  -import java.util.ArrayList;
  -import java.util.Properties;
  -import java.util.Set;
  -
  -import javax.servlet.ServletException;
  -import javax.servlet.http.HttpServletRequest;
  -import javax.servlet.http.HttpServletResponse;
  -import javax.swing.JTree;
  -import javax.swing.tree.DefaultMutableTreeNode;
  -
  -import org.apache.struts.action.ActionError;
  -import org.apache.struts.action.ActionErrors;
  -import org.apache.struts.action.ActionForm;
  -import org.apache.struts.action.ActionForward;
  -import org.apache.struts.action.ActionMapping;
  +import org.apache.struts.action.*;
   import org.jahia.content.ContentObject;
  +import org.jahia.content.JahiaObject;
   import org.jahia.data.fields.JahiaField;
   import org.jahia.data.fields.LoadFlags;
   import org.jahia.exceptions.JahiaException;
  @@ -33,7 +19,16 @@
   import org.jahia.views.engines.JahiaEngineButtonsHelper;
   import org.jahia.views.engines.JahiaEngineCommonData;
   import org.jahia.views.engines.JahiaEngineViewHelper;
  -import org.jahia.content.JahiaObject;
  +
  +import javax.servlet.ServletException;
  +import javax.servlet.http.HttpServletRequest;
  +import javax.servlet.http.HttpServletResponse;
  +import javax.swing.*;
  +import javax.swing.tree.DefaultMutableTreeNode;
  +import java.io.IOException;
  +import java.util.ArrayList;
  +import java.util.Properties;
  +import java.util.Set;
   
   /**
    *
  @@ -251,6 +246,7 @@
                           // load field value
                           jParams.setSubstituteEntryLoadRequest(loadRequest);
                           jahiaField.load(LoadFlags.ALL,jParams);
  +                        jahiaField.setHasChanged(false);
                           oldValue = jahiaField.getValue();
                       }
   
  @@ -269,6 +265,7 @@
                           // load field value
                           jParams.setSubstituteEntryLoadRequest(loadRequest);
                           jahiaField.load(LoadFlags.ALL,jParams);
  +                        jahiaField.setHasChanged(false);
                           newValue = jahiaField.getValue();
                       }