Commit 8fcfc163 authored by Christos Tranoris's avatar Christos Tranoris
Browse files

Merge branch 'parent-child-characteristics' into 'develop' 

Parent child characteristics

See merge request !5
parents 440a6b7f bcf3f8fc

src/main/java/org/etsi/osl/tmf/sim638/model/Service.java

+1 −0
Original line number Original line Diff line number Diff line
@@ -853,5 +853,6 @@ public class Service extends BaseRootNamedEntity { 
	  

	  

      }

      }

      return nextState;      

      return nextState;      

      

	}

	}

}
 
}

src/main/java/org/etsi/osl/tmf/sim638/model/ServiceActionQueueAction.java

+3 −1
Original line number Original line Diff line number Diff line
@@ -29,5 +29,7 @@ public enum ServiceActionQueueAction { 
	EVALUATE_STATE_CHANGE_TOACTIVE,

	EVALUATE_STATE_CHANGE_TOACTIVE,

	EVALUATE_STATE_CHANGE_TOINACTIVE,

	EVALUATE_STATE_CHANGE_TOINACTIVE,

	EVALUATE_CHARACTERISTIC_CHANGED,

	EVALUATE_CHARACTERISTIC_CHANGED,

	EVALUATE_CHARACTERISTIC_CHANGED_MANODAY2

	EVALUATE_CHARACTERISTIC_CHANGED_MANODAY2,

    EVALUATE_CHILD_STATE_CHANGE,

    EVALUATE_CHILD_CHARACTERISTIC_CHANGED

}
 
}