SORMAS-Foundation#2673 Minor refactorings from the review

Author: HolgerReiseVSys

sormas-ui/src/main/java/de/symeda/sormas/ui/caze/CaseDataView.java

@@ -79,7 +79,7 @@ protected void initView(String params) {
 			LayoutUtil.fluidColumnLoc(4, 0, 6, 0, SAMPLES_LOC),
 			LayoutUtil.fluidColumnLoc(4, 0, 6, 0, EVENTS_LOC),
 			LayoutUtil.fluidColumnLoc(4, 0, 6, 0, SORMAS_TO_SORMAS_LOC),
-			SurvnetGateway.layoutFragment());
+			LayoutUtil.fluidColumnLoc(4, 0, 6, 0, SurvnetGateway.SURVNET_GATEWAY_LOC));
 
 		DetailSubComponentWrapper container = new DetailSubComponentWrapper(() -> editComponent);
 		container.setWidth(100, Unit.PERCENTAGE);

sormas-ui/src/main/java/de/symeda/sormas/ui/survnet/SurvnetGateway.java

@@ -3,7 +3,10 @@
 import java.util.List;
 import java.util.function.Supplier;
 
+import javax.servlet.http.HttpServletResponse;
+
 import com.vaadin.icons.VaadinIcons;
+import com.vaadin.server.Sizeable.Unit;
 import com.vaadin.ui.Alignment;
 import com.vaadin.ui.Button;
 import com.vaadin.ui.CustomLayout;
@@ -18,25 +21,18 @@
 import de.symeda.sormas.api.i18n.Strings;
 import de.symeda.sormas.ui.utils.ButtonHelper;
 import de.symeda.sormas.ui.utils.CssStyles;
-import de.symeda.sormas.ui.utils.LayoutUtil;
-import de.symeda.sormas.ui.utils.LayoutUtil.FluidColumn;
 
 /**
  * Provides UI components to integrate with the SurvNet gateway
  */
 public class SurvnetGateway {
 
-	private static final String SURVNET_GATEWAY_LOC = "survnetGateway";
+	public static final String SURVNET_GATEWAY_LOC = "survnetGateway";
 
 	private SurvnetGateway() {
 		//NOOP
 	}
 
-	public static FluidColumn layoutFragment() {
-		//TODO only add it if the feature is active? Then LayoutUtil.fluidRow would have to ignore null values.
-		return LayoutUtil.fluidColumnLoc(4, 0, 6, 0, SURVNET_GATEWAY_LOC);
-	}
-
 	public static void addComponentToLayout(CustomLayout targetLayout, Supplier<List<String>> caseUuids) {
 		if (!FacadeProvider.getSurvnetGatewayFacade().isFeatureEnabled()) {
 			return;
@@ -48,14 +44,14 @@ public static void addComponentToLayout(CustomLayout targetLayout, Supplier<List
 		Button button = ButtonHelper
 			.createIconButton(Captions.SurvnetGateway_send, VaadinIcons.OUTBOX, e -> sendToSurvnet(caseUuids.get()), ValoTheme.BUTTON_PRIMARY);
 
-		HorizontalLayout l = new HorizontalLayout(header, button);
-		l.setExpandRatio(button, 1);
-		l.setComponentAlignment(header, Alignment.MIDDLE_LEFT);
-		l.setComponentAlignment(button, Alignment.MIDDLE_RIGHT);
-		l.setSizeFull();
+		HorizontalLayout layout = new HorizontalLayout(header, button);
+		layout.setExpandRatio(button, 1);
+		layout.setComponentAlignment(header, Alignment.MIDDLE_LEFT);
+		layout.setComponentAlignment(button, Alignment.MIDDLE_RIGHT);
+		layout.setWidth(100, Unit.PERCENTAGE);
 
-		l.addStyleNames(CssStyles.SIDE_COMPONENT);
-		targetLayout.addComponent(l, SURVNET_GATEWAY_LOC);
+		layout.addStyleNames(CssStyles.SIDE_COMPONENT);
+		targetLayout.addComponent(layout, SURVNET_GATEWAY_LOC);
 	}
 
 	private static void sendToSurvnet(List<String> caseUuids) {
@@ -66,16 +62,16 @@ private static void sendToSurvnet(List<String> caseUuids) {
 		String message;
 
 		switch (statusCode) {
-		case 200://HttpStatus.OK:
-		case 204://HttpStatus.SC_NO_CONTENT:
+		case HttpServletResponse.SC_OK:
+		case HttpServletResponse.SC_NO_CONTENT:
 			type = Notification.Type.HUMANIZED_MESSAGE;
 			message = I18nProperties.getString(Strings.SurvnetGateway_notificationEntrySent);
 			break;
-		case 400://HttpStatus.SC_BAD_REQUEST
+		case HttpServletResponse.SC_BAD_REQUEST:
 			type = Notification.Type.ERROR_MESSAGE;
 			message = I18nProperties.getString(Strings.SurvnetGateway_notificationEntryNotSent);
 			break;
-		default://HttpStatus.SC_BAD_REQUEST
+		default:
 			type = Notification.Type.ERROR_MESSAGE;
 			message = I18nProperties.getString(Strings.SurvnetGateway_notificationErrorSending);
 		}