Projects >> osate2-plugins >>52c8cdadf518a1f122f6cd67105209f8d0da7273

Chunk
Conflicting content 
				if (val > 0)
				{
					if (totalLatency > val) {
<<<<<<< HEAD
						reportError(etef, "End-to-end flow "+etef.getName()+getSynchronousLabel()+" calculated latency "
=======
						reportError(etef, "End-to-end flow "+etef.getName()+" calculated latency "+getSynchronousLabel()
>>>>>>> c25529453fde4460e90011efacfc86e6854b95a5
								+ convertUStoOutputUnit(totalLatency)
								+ " exceeds expected latency "
								+ convertUStoOutputUnit(val) );
Solution content 
				if (val > 0)
				{
					if (totalLatency > val) {
						logError(etef, "End-to-end flow "+etef.getName()+" calculated latency "+isSynchronousLabel()
								+ convertUStoOutputUnit(totalLatency)
								+ " exceeds expected latency "
								+ convertUStoOutputUnit(val) );
File
FlowLatencyAnalysisSwitch.java
Developer's decision
Manual
Kind of conflict
Method invocation
Chunk
Conflicting content 
								+ convertUStoOutputUnit(val) );
					} else
					if (totalLatency < val) {
<<<<<<< HEAD
						logInfo(etef, "End-to-end flow "+etef.getName()+getSynchronousLabel()+" calculated latency "
=======
						logInfo(etef, "End-to-end flow "+etef.getName()+" calculated latency "+getSynchronousLabel()
>>>>>>> c25529453fde4460e90011efacfc86e6854b95a5
								+ convertUStoOutputUnit(totalLatency)
								+ " is less than expected latency "
								+ convertUStoOutputUnit(val));
Solution content 
								+ convertUStoOutputUnit(val) );
					} else
					if (totalLatency < val) {
						logInfo(etef, "End-to-end flow "+etef.getName()+" calculated latency "+isSynchronousLabel()
								+ convertUStoOutputUnit(totalLatency)
								+ " is less than expected latency "
								+ convertUStoOutputUnit(val));
File
FlowLatencyAnalysisSwitch.java
Developer's decision
Manual
Kind of conflict
Method invocation
Chunk
Conflicting content 
								+ " is less than expected latency "
								+ convertUStoOutputUnit(val));
					} else {
<<<<<<< HEAD
						logInfo(etef,"End-to-end flow "+etef.getName()+getSynchronousLabel()+" calculated latency "
								+ convertUStoOutputUnit(totalLatency) + " matches expected latency "+ convertUStoOutputUnit(val));
					}
				} else {
					logInfo(etef,"End-to-end flow "+etef.getName()+getSynchronousLabel()+" calculated latency "
							+ convertUStoOutputUnit(totalLatency) + " but no expected latency is specified." );
=======
						logInfo(etef,"End-to-end flow "+etef.getName()+" calculated latency "+getSynchronousLabel()
								+ convertUStoOutputUnit(totalLatency) + " matches expected latency");
					}
				} else {
					logInfo(etef,"Calculated latency"+getSynchronousLabel()+"for end-to-end flow "+etef.getName()+" is "
							+ convertUStoOutputUnit(totalLatency) );
>>>>>>> c25529453fde4460e90011efacfc86e6854b95a5
				}
				if (monitor.isCanceled()) {
					cancelTraversal();
Solution content 
								+ " is less than expected latency "
								+ convertUStoOutputUnit(val));
					} else {
						logInfo(etef,"End-to-end flow "+etef.getName()+" calculated latency "+isSynchronousLabel()
								+ convertUStoOutputUnit(totalLatency) + " matches expected latency");
					}
				} else {
					logInfo(etef,"Calculated latency"+isSynchronousLabel()+" for end-to-end flow "+etef.getName()+" is "
							+ convertUStoOutputUnit(totalLatency) );
				}
				if (monitor.isCanceled()) {
					cancelTraversal();
File
FlowLatencyAnalysisSwitch.java
Developer's decision
Manual
Kind of conflict
Method invocation