From 76c387fce04329ed98389e87313920739db087c3 Mon Sep 17 00:00:00 2001 From: Rene Schneider Date: Wed, 27 Feb 2019 10:22:40 +0100 Subject: [PATCH 1/2] formatting fixes in IntegrityRemotingServer class --- .../remoting/server/IntegrityRemotingServer.java | 13 ++++++++----- 1 file changed, 8 insertions(+), 5 deletions(-) diff --git a/de.gebit.integrity.remoting/src/de/gebit/integrity/remoting/server/IntegrityRemotingServer.java b/de.gebit.integrity.remoting/src/de/gebit/integrity/remoting/server/IntegrityRemotingServer.java index ec09804e1..99d59f3c8 100644 --- a/de.gebit.integrity.remoting/src/de/gebit/integrity/remoting/server/IntegrityRemotingServer.java +++ b/de.gebit.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, MessageProcessor> createProcessors() { - Map, MessageProcessor> tempMap = new HashMap, MessageProcessor>(); + Map, MessageProcessor> tempMap + = new HashMap, MessageProcessor>(); tempMap.put(IntegrityRemotingVersionMessage.class, new MessageProcessor() { From dbeb0da9d5496b47d130e35c61539ee689d227a0 Mon Sep 17 00:00:00 2001 From: Rene Schneider Date: Wed, 27 Feb 2019 10:43:48 +0100 Subject: [PATCH 2/2] fixes #230: Suite documentation display does not include @params --- .../IntegrityEObjectDocumentationProvider.java | 15 ++++++++------- 1 file changed, 8 insertions(+), 7 deletions(-) diff --git a/de.gebit.integrity.dsl.ui/src/de/gebit/integrity/ui/documentation/IntegrityEObjectDocumentationProvider.java b/de.gebit.integrity.dsl.ui/src/de/gebit/integrity/ui/documentation/IntegrityEObjectDocumentationProvider.java index ab77255fa..a43573f5d 100644 --- a/de.gebit.integrity.dsl.ui/src/de/gebit/integrity/ui/documentation/IntegrityEObjectDocumentationProvider.java +++ b/de.gebit.integrity.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()); }