Merge branch 'v18.x_dev' into v18.x

integrity-tf · Feb 27, 2019 · 0090599 · 0090599
2 parents d04189d + dbeb0da
commit 0090599
Show file tree

Hide file tree

Showing 2 changed files with 16 additions and 12 deletions.
diff --git a/...dsl.ui/src/de/gebit/integrity/ui/documentation/IntegrityEObjectDocumentationProvider.java b/...dsl.ui/src/de/gebit/integrity/ui/documentation/IntegrityEObjectDocumentationProvider.java
@@ -87,16 +87,17 @@ public String getDocumentation(EObject anObjectOrProxy) {
 					SuiteDefinition tempSuiteDefinition = (SuiteDefinition) anObjectOrProxy;
 					ParsedDocumentationComment tempParsedComment = new ParsedDocumentationComment(
 							tempSuiteDefinition.getDocumentation(),
-							modelSourceExplorer.determineSourceInformation(tempSuiteDefinition.getDocumentation()));
-					return tempParsedComment.getDocumentationText();
+							modelSourceExplorer.determineSourceInformation(tempSuiteDefinition.getDocumentation()),
+							false);
+					return tempParsedComment.getJavadocStyleFullDocumentation();
 				} else if (anObjectOrProxy instanceof VariableEntity) {
 					if (anObjectOrProxy.eContainer() instanceof SuiteParameterDefinition) {
-						SuiteDefinition tempSuiteDefinition = (SuiteDefinition) anObjectOrProxy.eContainer()
-								.eContainer();
+						SuiteDefinition tempSuiteDefinition
+								= (SuiteDefinition) anObjectOrProxy.eContainer().eContainer();
 						if (tempSuiteDefinition.getDocumentation() != null) {
-							ParsedDocumentationComment tempParsedComment = new ParsedDocumentationComment(
-									tempSuiteDefinition.getDocumentation(),
-									modelSourceExplorer.determineSourceInformation(tempSuiteDefinition));
+							ParsedDocumentationComment tempParsedComment
+									= new ParsedDocumentationComment(tempSuiteDefinition.getDocumentation(),
+											modelSourceExplorer.determineSourceInformation(tempSuiteDefinition));
 							return tempParsedComment.getParameterDocumentationTexts()
 									.get(((VariableEntity) anObjectOrProxy).getName());
 						}

diff --git a/...it.integrity.remoting/src/de/gebit/integrity/remoting/server/IntegrityRemotingServer.java b/...it.integrity.remoting/src/de/gebit/integrity/remoting/server/IntegrityRemotingServer.java
@@ -255,7 +255,7 @@ public void sendTestTimeSyncResponse(TimeSyncResultMessage aResultMessage) {
 			serverEndpoint.broadcastMessage(aResultMessage);
 		}
 	}
-	
+
 	/**
 	 * Sends a fork result summary message.
 	 * 
@@ -268,9 +268,11 @@ public void sendTestTimeSyncResponse(TimeSyncResultMessage aResultMessage) {
 	 * @param aCallExceptionCount
 	 *            the number of call exceptions in tests
 	 */
-	public void sendForkResultSummaryMessage(Integer aSuccessCount, Integer aFailureCount, Integer aTestExceptionCount, Integer aCallExceptionCount) {
-		if(serverEndpoint.isActive()) {
-			serverEndpoint.broadcastMessage(new ForkResultSummaryMessage(aSuccessCount, aFailureCount, aTestExceptionCount, aCallExceptionCount));
+	public void sendForkResultSummaryMessage(Integer aSuccessCount, Integer aFailureCount, Integer aTestExceptionCount,
+			Integer aCallExceptionCount) {
+		if (serverEndpoint.isActive()) {
+			serverEndpoint.broadcastMessage(new ForkResultSummaryMessage(aSuccessCount, aFailureCount,
+					aTestExceptionCount, aCallExceptionCount));
 		}
 	}
 
@@ -280,7 +282,8 @@ public void sendForkResultSummaryMessage(Integer aSuccessCount, Integer aFailure
 	 * @return a map of message classes to processors
 	 */
 	protected Map<Class<? extends AbstractMessage>, MessageProcessor<?>> createProcessors() {
-		Map<Class<? extends AbstractMessage>, MessageProcessor<?>> tempMap = new HashMap<Class<? extends AbstractMessage>, MessageProcessor<?>>();
+		Map<Class<? extends AbstractMessage>, MessageProcessor<?>> tempMap
+				= new HashMap<Class<? extends AbstractMessage>, MessageProcessor<?>>();
 
 		tempMap.put(IntegrityRemotingVersionMessage.class, new MessageProcessor<IntegrityRemotingVersionMessage>() {