From d1e455a573ad5ba4d0f0d10d04c041ee67d34161 Mon Sep 17 00:00:00 2001 From: Lukas Furmanek Date: Sun, 8 Nov 2015 15:05:54 +0100 Subject: [PATCH] Bug3199: renamed objekt into object & JavaDoc --- .../domain/test/DomainFactoryImplTest.java | 13 +++++++------ .../impl/DomainFactoryImpl.java | 4 ++-- ...AbstractCompetitorRegistrationsDialog.java | 6 ++++++ ...martphoneTrackingEventManagementPanel.java | 4 +--- ...ktTest.java => GetDominantObjectTest.java} | 19 ++++++++++--------- .../src/com/sap/sse/common/Util.java | 2 +- 6 files changed, 27 insertions(+), 21 deletions(-) rename java/com.sap.sse.common.test/src/com/sap/sse/common/test/{GetDominantObjektTest.java => GetDominantObjectTest.java} (64%) diff --git a/java/com.sap.sailing.domain.test/src/com/sap/sailing/domain/test/DomainFactoryImplTest.java b/java/com.sap.sailing.domain.test/src/com/sap/sailing/domain/test/DomainFactoryImplTest.java index bb86d0cbf45..38e31596dd1 100644 --- a/java/com.sap.sailing.domain.test/src/com/sap/sailing/domain/test/DomainFactoryImplTest.java +++ b/java/com.sap.sailing.domain.test/src/com/sap/sailing/domain/test/DomainFactoryImplTest.java @@ -1,6 +1,7 @@ package com.sap.sailing.domain.test; import java.util.ArrayList; +import java.util.List; import org.junit.Assert; import org.junit.Before; @@ -10,7 +11,7 @@ import com.sap.sailing.domain.base.DomainFactory; import com.sap.sailing.domain.tractracadapter.impl.DomainFactoryImpl; public class DomainFactoryImplTest { - DomainFactoryImpl domainFactory; + private DomainFactoryImpl domainFactory; @Before public void setUp() { @@ -25,19 +26,19 @@ public class DomainFactoryImplTest { @Test public void testGetDominantBoatClass_TestEmptyCollection() { - ArrayList emptyList = new ArrayList(); + List emptyList = new ArrayList(); Assert.assertEquals(null, domainFactory.getDominantBoatClass(emptyList)); } @Test public void testGetDominantBoatClass_TestWithOneObject() { - ArrayList list = new ArrayList(); + List list = new ArrayList(); list.add("LSR"); Assert.assertEquals("Laser Int.", domainFactory.getDominantBoatClass(list).getDisplayName()); } @Test public void testGetDominantBoatClass_TestWithTheSameCount() { - ArrayList list = new ArrayList(); + List list = new ArrayList(); list.add("LSR"); list.add("18.Footer"); String result = domainFactory.getDominantBoatClass(list).getDisplayName(); @@ -48,7 +49,7 @@ public class DomainFactoryImplTest { @Test public void testGetDominantBoatClass_TestWithMoreThanOneObject() { - ArrayList list = new ArrayList(); + List list = new ArrayList(); list.add("LSR"); list.add("18.Footer"); list.add("LSR"); @@ -58,7 +59,7 @@ public class DomainFactoryImplTest { @Test public void testGetDominantBoatClass_TestWithSynonymNames() { - ArrayList list = new ArrayList(); + List list = new ArrayList(); list.add("LSR"); list.add("18.Footer"); list.add("18.Footer"); diff --git a/java/com.sap.sailing.domain.tractracadapter/src/com/sap/sailing/domain/tractracadapter/impl/DomainFactoryImpl.java b/java/com.sap.sailing.domain.tractracadapter/src/com/sap/sailing/domain/tractracadapter/impl/DomainFactoryImpl.java index b9983c0854e..4589b5d3307 100755 --- a/java/com.sap.sailing.domain.tractracadapter/src/com/sap/sailing/domain/tractracadapter/impl/DomainFactoryImpl.java +++ b/java/com.sap.sailing.domain.tractracadapter/src/com/sap/sailing/domain/tractracadapter/impl/DomainFactoryImpl.java @@ -598,13 +598,13 @@ public class DomainFactoryImpl implements DomainFactory { return null; } else { - ArrayList boatClasses = new ArrayList(); + Collection boatClasses = new ArrayList(); for (String competitorClassName : competitorClassNames) { BoatClass boatClass = getOrCreateBoatClass(competitorClassName); boatClasses.add(boatClass); } - return Util.getDominantObjekt(boatClasses); + return Util.getDominantObject(boatClasses); } } diff --git a/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/adminconsole/AbstractCompetitorRegistrationsDialog.java b/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/adminconsole/AbstractCompetitorRegistrationsDialog.java index c9dccd7f90f..d223d6ee02e 100644 --- a/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/adminconsole/AbstractCompetitorRegistrationsDialog.java +++ b/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/adminconsole/AbstractCompetitorRegistrationsDialog.java @@ -35,6 +35,12 @@ public abstract class AbstractCompetitorRegistrationsDialog extends DataEntryDia final ErrorReporter errorReporter; private boolean editable; private String boatClass; + + /** + * @param boatClass + * The boatClass parameter describes the default shown boat class for new competitors. The boatClass parameter is null, + * if you want to edit a competitor or there is no boat class for the new competitor. + */ public AbstractCompetitorRegistrationsDialog(final SailingServiceAsync sailingService, final StringMessages stringMessages, final ErrorReporter errorReporter, boolean editable, diff --git a/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/adminconsole/SmartphoneTrackingEventManagementPanel.java b/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/adminconsole/SmartphoneTrackingEventManagementPanel.java index a8675829954..85485773dce 100644 --- a/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/adminconsole/SmartphoneTrackingEventManagementPanel.java +++ b/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/adminconsole/SmartphoneTrackingEventManagementPanel.java @@ -573,7 +573,6 @@ public class SmartphoneTrackingEventManagementPanel extends AbstractLeaderboardC }).show(); } - private void searchBoatClass(final ShowWithBoatClass showWithBoatClass) { final String result; RegattaDTO regatta = null; @@ -599,7 +598,6 @@ public class SmartphoneTrackingEventManagementPanel extends AbstractLeaderboardC GWT.log("Error while searching BoatClass."); showWithBoatClass.showWithBoatClass(null); } - @Override public void onSuccess(Iterable result) { String boatClass = null; @@ -609,7 +607,7 @@ public class SmartphoneTrackingEventManagementPanel extends AbstractLeaderboardC boatClassen.add(comp.getBoatClass().getName()); } - boatClass = Util.getDominantObjekt(boatClassen); + boatClass = Util.getDominantObject(boatClassen); } showWithBoatClass.showWithBoatClass(boatClass); } diff --git a/java/com.sap.sse.common.test/src/com/sap/sse/common/test/GetDominantObjektTest.java b/java/com.sap.sse.common.test/src/com/sap/sse/common/test/GetDominantObjectTest.java similarity index 64% rename from java/com.sap.sse.common.test/src/com/sap/sse/common/test/GetDominantObjektTest.java rename to java/com.sap.sse.common.test/src/com/sap/sse/common/test/GetDominantObjectTest.java index 6d3ca7f6d7d..81e796051a9 100644 --- a/java/com.sap.sse.common.test/src/com/sap/sse/common/test/GetDominantObjektTest.java +++ b/java/com.sap.sse.common.test/src/com/sap/sse/common/test/GetDominantObjectTest.java @@ -1,41 +1,42 @@ package com.sap.sse.common.test; import java.util.ArrayList; +import java.util.List; import org.junit.Assert; import org.junit.Test; import com.sap.sse.common.Util; -public class GetDominantObjektTest { +public class GetDominantObjectTest { @Test public void testNullCollection() { - Assert.assertArrayEquals(null, Util.getDominantObjekt(null)); + Assert.assertArrayEquals(null, Util.getDominantObject(null)); } @Test public void testEmptyCollection() { Iterable objects = new ArrayList(); - Assert.assertEquals(null, Util.getDominantObjekt(objects)); + Assert.assertEquals(null, Util.getDominantObject(objects)); } @Test public void testCollectionWithOneObject() { - ArrayList objectCollection = new ArrayList(); + List objectCollection = new ArrayList(); String dominant = "Test"; objectCollection.add(dominant); - Assert.assertEquals(dominant, Util.getDominantObjekt(objectCollection)); + Assert.assertEquals(dominant, Util.getDominantObject(objectCollection)); } @Test public void testCollectionWithTheSameCount() { - ArrayList objectCollection = new ArrayList(); + List objectCollection = new ArrayList(); String dominant = "Test"; String dominantTwo = "Test2"; objectCollection.add(dominant); objectCollection.add(dominantTwo); - String result = Util.getDominantObjekt(objectCollection); + String result = Util.getDominantObject(objectCollection); if(!(result == dominant || result == dominantTwo)) { Assert.assertEquals(dominant, result); } @@ -43,11 +44,11 @@ public class GetDominantObjektTest { @Test public void testCollectionWithMoreThenOneObject() { - ArrayList objectCollection = new ArrayList(); + List objectCollection = new ArrayList(); String dominant = "Test"; objectCollection.add("not Dominant"); objectCollection.add(dominant); objectCollection.add(dominant); - Assert.assertEquals(dominant, Util.getDominantObjekt(objectCollection)); + Assert.assertEquals(dominant, Util.getDominantObject(objectCollection)); } } diff --git a/java/com.sap.sse.common/src/com/sap/sse/common/Util.java b/java/com.sap.sse.common/src/com/sap/sse/common/Util.java index 93abf19cb08..08ae8804c0c 100755 --- a/java/com.sap.sse.common/src/com/sap/sse/common/Util.java +++ b/java/com.sap.sse.common/src/com/sap/sse/common/Util.java @@ -416,7 +416,7 @@ public class Util { * return null . */ - public static T getDominantObjekt(Iterable objects) { + public static T getDominantObject(Iterable objects) { T result = null; if (objects != null) { if (objects.iterator().hasNext()) {