[jboss-svn-commits] JBL Code SVN: r24955 - labs/jbossrules/branches/salaboy_VariablePersistenceStrategy/drools-process/drools-process-enterprise/src/main/java/org/drools/persistence/processinstance.

[jboss-svn-commits at lists.jboss.org]

Author: salaboy21
Date: 2009-01-27 13:15:38 -0500 (Tue, 27 Jan 2009)
New Revision: 24955

Modified:
   labs/jbossrules/branches/salaboy_VariablePersistenceStrategy/drools-process/drools-process-enterprise/src/main/java/org/drools/persistence/processinstance/ProcessInstanceInfo.java
Log:
now the variables are handled outside the processInstanceInfo

Modified: labs/jbossrules/branches/salaboy_VariablePersistenceStrategy/drools-process/drools-process-enterprise/src/main/java/org/drools/persistence/processinstance/ProcessInstanceInfo.java
===================================================================
--- labs/jbossrules/branches/salaboy_VariablePersistenceStrategy/drools-process/drools-process-enterprise/src/main/java/org/drools/persistence/processinstance/ProcessInstanceInfo.java	2009-01-27 18:13:45 UTC (rev 24954)
+++ labs/jbossrules/branches/salaboy_VariablePersistenceStrategy/drools-process/drools-process-enterprise/src/main/java/org/drools/persistence/processinstance/ProcessInstanceInfo.java	2009-01-27 18:15:38 UTC (rev 24955)
@@ -53,7 +53,7 @@
 
     @OneToMany(cascade=CascadeType.ALL)
     @JoinColumn(name="process_instance")
-    private List<PersistedVariable> variables = new ArrayList<PersistedVariable>();
+    private List<VariableInstanceInfo> variables = new ArrayList<VariableInstanceInfo>();
 
 
 	ProcessInstanceInfo() {
@@ -63,25 +63,8 @@
 		this.processInstance = processInstance;
 		this.processId = processInstance.getProcessId();
 		startDate = new Date();
-        VariableScopeInstance variableScopeInstance = (VariableScopeInstance) ((RuleFlowProcessInstance)processInstance).getContextInstance( VariableScope.VARIABLE_SCOPE );
-        Map<String, Object> processVariables = variableScopeInstance.getVariables();
+       
 
-        List<String> keys = new ArrayList<String>( processVariables.keySet() );
-            Collections.sort( keys,
-                              new Comparator<String>() {
-                                  public int compare(String o1,
-                                                     String o2) {
-                                      return o1.compareTo( o2 );
-                                  }
-                              } );
-        VariablePersistenceStrategy persistenceStrategy = VariablePersistenceStrategyFactory.getVariablePersistenceStrategyFactory();
-        clearVariables();
-        for ( String key : keys ) {
-            PersistedVariable variable = persistenceStrategy.persistVariable(key, processVariables.get( key ));
-
-            addVariables(variable);
-        }
-
 	}
 	
 	public long getId() {
@@ -124,6 +107,8 @@
 				throw new IllegalArgumentException(
 					"IOException while loading process instance: " + e.getMessage());
 			}
+            //resolveInputVariables();
+
 		}
 		return processInstance;
 	}
@@ -139,7 +124,7 @@
 			throw new IllegalArgumentException(
 				"IOException while storing process instance " + processInstance.getId() + ": " + e.getMessage());
 		} 
-		byte[] newByteArray = baos.toByteArray();
+        byte[] newByteArray = baos.toByteArray();
 		if (!Arrays.equals(newByteArray, processInstanceByteArray)) {
 			this.state = processInstance.getState();
 			this.lastModificationDate = new Date();
@@ -154,23 +139,23 @@
     /**
      * @return the variables
      */
-    public List<PersistedVariable> getVariables() {
+    public List<VariableInstanceInfo> getVariables() {
         return variables;
     }
 
     /**
      * @param variables the variables to set
      */
-    public void setVariables(List<PersistedVariable> variables) {
+    public void setVariables(List<VariableInstanceInfo> variables) {
         this.variables = variables;
     }
 
-    public void addVariables(PersistedVariable variable){
+    public void addVariables(VariableInstanceInfo variable){
         this.getVariables().add(variable);
     }
     public void clearVariables(){
         this.getVariables().clear();
     }
 
-	
+  
 }