removed Winregatta example files from Barbados branch; use common way to identify boatclassName parameter

java/com.sap.sailing.barbados.resultimport.test/src/com/sap/sailing/barbados/resultimport/test/BarbadosResultImportTest.java

@@ -0,0 +1,69 @@
+package com.sap.sailing.barbados.resultimport.test;
+
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertNotNull;
+
+import java.io.File;
+import java.io.FileInputStream;
+import java.io.FileNotFoundException;
+import java.io.IOException;
+import java.io.InputStream;
+import java.util.Collections;
+import java.util.Map;
+import java.util.Map.Entry;
+import java.util.Set;
+
+import org.junit.Before;
+import org.junit.Test;
+
+import com.sap.sailing.barbados.resultimport.impl.BarbadosResultSpreadsheet;
+import com.sap.sailing.barbados.resultimport.impl.ScoreCorrectionProviderImpl;
+import com.sap.sailing.domain.base.impl.MillisecondsTimePoint;
+import com.sap.sailing.domain.common.TimePoint;
+import com.sap.sailing.domain.common.impl.Util.Pair;
+import com.sap.sailing.domain.common.impl.Util.Triple;
+import com.sap.sailing.resultimport.RegattaResults;
+import com.sap.sailing.resultimport.ResultDocumentProvider;
+
+public class BarbadosResultImportTest {
+    private static final String SAMPLE_INPUT_NAME_EMPTY_RESULTS = "RESULTS-505Barbados.xlsx";
+    private static final String RESOURCES = "resources/";
+    private BarbadosResultSpreadsheet spreadsheet;
+
+    private InputStream getInputStream(String filename) throws FileNotFoundException, IOException {
+        return new FileInputStream(getFile(filename));
+    }
+
+    private File getFile(String filename) {
+        return new File(RESOURCES + filename);
+    }
+
+    @Before
+    public void setUp() throws FileNotFoundException, IOException, Exception {
+        spreadsheet = new BarbadosResultSpreadsheet(getInputStream(SAMPLE_INPUT_NAME_EMPTY_RESULTS));
+    }
+    
+    @Test
+    public void testOpenDocument() {
+        assertNotNull(spreadsheet);
+        RegattaResults regattaResults = spreadsheet.getRegattaResults();
+        assertNotNull(regattaResults);
+        assertEquals("505", regattaResults.getMetadata().get(ScoreCorrectionProviderImpl.BOATCLASS_NAME_METADATA_PROPERTY));
+    }
+    
+    @Test
+    public void testResultsThroughScoreCorrectionProvider() throws Exception {
+        ScoreCorrectionProviderImpl scp = new ScoreCorrectionProviderImpl(new ResultDocumentProvider() {
+            @Override
+            public Iterable<Triple<InputStream, String, TimePoint>> getDocumentsAndNamesAndLastModified() throws IOException {
+                return Collections.singleton(new Triple<InputStream, String, TimePoint>(getInputStream(SAMPLE_INPUT_NAME_EMPTY_RESULTS),
+                        SAMPLE_INPUT_NAME_EMPTY_RESULTS, MillisecondsTimePoint.now()));
+            }
+        });
+        Map<String, Set<Pair<String, TimePoint>>> hasResultsFor = scp.getHasResultsForBoatClassFromDateByEventName();
+        assertNotNull(hasResultsFor);
+        assertEquals(1, hasResultsFor.size());
+        Entry<String, Set<Pair<String, TimePoint>>> entry = hasResultsFor.entrySet().iterator().next();
+        assertEquals("505", entry.getKey());
+    }
+}

java/com.sap.sailing.barbados.resultimport.test/src/com/sap/sailing/winregatta/resultimport/test/BarbadosResultImportTest.java

@@ -1,43 +0,0 @@
-package com.sap.sailing.winregatta.resultimport.test;
-
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertNotNull;
-
-import java.io.File;
-import java.io.FileInputStream;
-import java.io.FileNotFoundException;
-import java.io.IOException;
-import java.io.InputStream;
-
-import org.junit.Before;
-import org.junit.Test;
-
-import com.sap.sailing.resultimport.RegattaResults;
-import com.sap.sailing.winregatta.resultimport.impl.BarbadosResultSpreadsheet;
-
-public class BarbadosResultImportTest {
-    private static final String SAMPLE_INPUT_NAME_EMPTY_RESULTS = "RESULTS-505Barbados.xlsx";
-    private static final String RESOURCES = "resources/";
-    private BarbadosResultSpreadsheet spreadsheet;
-
-    private InputStream getInputStream(String filename) throws FileNotFoundException, IOException {
-        return new FileInputStream(getFile(filename));
-    }
-
-    private File getFile(String filename) {
-        return new File(RESOURCES + filename);
-    }
-
-    @Before
-    public void setUp() throws FileNotFoundException, IOException, Exception {
-        spreadsheet = new BarbadosResultSpreadsheet(getInputStream(SAMPLE_INPUT_NAME_EMPTY_RESULTS));
-    }
-    
-    @Test
-    public void testOpenDocument() {
-        assertNotNull(spreadsheet);
-        RegattaResults regattaResults = spreadsheet.getRegattaResults();
-        assertNotNull(regattaResults);
-        assertEquals("505", regattaResults.getMetadata().get("boatclassName"));
-    }
-}

java/com.sap.sailing.barbados.resultimport/META-INF/MANIFEST.MF

@@ -3,7 +3,7 @@ Bundle-ManifestVersion: 2
 Bundle-Name: WinRegatta result import
 Bundle-SymbolicName: com.sap.sailing.barbados.resultimport
 Bundle-Version: 1.0.0.qualifier
-Bundle-Activator: com.sap.sailing.winregatta.resultimport.impl.Activator
+Bundle-Activator: com.sap.sailing.barbados.resultimport.impl.Activator
 Bundle-Vendor: SAP
 Bundle-RequiredExecutionEnvironment: JavaSE-1.7
 Import-Package: javax.xml.parsers,
@@ -27,4 +27,4 @@ Bundle-ClassPath: lib/com.springsource.org.apache.commons.beanutils-1.8.0.jar,
  lib/xml-apis-1.0.b2.jar,
  lib/xmlbeans-2.4.0.jar,
  lib/dom4j-1.6.1.jar
-Export-Package: com.sap.sailing.winregatta.resultimport.impl;x-friends:="com.sap.sailing.barbados.resultimport.test"
+Export-Package: com.sap.sailing.barbados.resultimport.impl;x-friends:="com.sap.sailing.barbados.resultimport.test"

java/com.sap.sailing.barbados.resultimport/src/com/sap/sailing/barbados/resultimport/impl/Activator.java

@@ -1,4 +1,4 @@
-package com.sap.sailing.winregatta.resultimport.impl;
+package com.sap.sailing.barbados.resultimport.impl;
 
 import java.io.File;
 

java/com.sap.sailing.barbados.resultimport/src/com/sap/sailing/barbados/resultimport/impl/BarbadosResultSpreadsheet.java

@@ -1,4 +1,4 @@
-package com.sap.sailing.winregatta.resultimport.impl;
+package com.sap.sailing.barbados.resultimport.impl;
 
 import java.io.InputStream;
 import java.util.ArrayList;
@@ -75,7 +75,7 @@ public class BarbadosResultSpreadsheet {
             @Override
             public Map<String, String> getMetadata() {
                 Map<String, String> result = new HashMap<>();
-                result.put("boatclassName", "505");
+                result.put(ScoreCorrectionProviderImpl.BOATCLASS_NAME_METADATA_PROPERTY, "505");
                 return result;
             }
             

java/com.sap.sailing.barbados.resultimport/src/com/sap/sailing/barbados/resultimport/impl/CompetitorRowImpl.java

@@ -1,4 +1,4 @@
-package com.sap.sailing.winregatta.resultimport.impl;
+package com.sap.sailing.barbados.resultimport.impl;
 
 import java.util.ArrayList;
 import java.util.LinkedHashMap;

java/com.sap.sailing.barbados.resultimport/src/com/sap/sailing/barbados/resultimport/impl/RegattaInfo.java

@@ -1,4 +1,4 @@
-package com.sap.sailing.winregatta.resultimport.impl;
+package com.sap.sailing.barbados.resultimport.impl;
 
 import java.util.HashMap;
 import java.util.Map;

java/com.sap.sailing.barbados.resultimport/src/com/sap/sailing/barbados/resultimport/impl/ScoreCorrectionProviderImpl.java

@@ -1,4 +1,4 @@
-package com.sap.sailing.winregatta.resultimport.impl;
+package com.sap.sailing.barbados.resultimport.impl;
 
 import java.io.InputStream;
 import java.util.Collections;
@@ -16,6 +16,8 @@ import com.sap.sailing.resultimport.impl.AbstractDocumentBasedScoreCorrectionPro
 import com.sap.sailing.resultimport.impl.RegattaScoreCorrectionsImpl;
 
 public class ScoreCorrectionProviderImpl extends AbstractDocumentBasedScoreCorrectionProvider {
+    public static final String BOATCLASS_NAME_METADATA_PROPERTY = "boatclassName";
+
     private static final long serialVersionUID = -5501186796881875686L;
 
     private static final String name = "Barbados 2013 505 Worlds Excel Result Importer";
@@ -43,7 +45,7 @@ public class ScoreCorrectionProviderImpl extends AbstractDocumentBasedScoreCorre
 
     private String getBoatClassName(RegattaResults regattaResult) {
         Map<String, String> metadata = regattaResult.getMetadata();
-        return metadata.get("boatClass");
+        return metadata.get(BOATCLASS_NAME_METADATA_PROPERTY);
     }
 
     @Override

java/com.sap.sailing.resultimport/src/com/sap/sailing/resultimport/impl/AbstractDocumentBasedScoreCorrectionProvider.java

@@ -1,12 +1,6 @@
 package com.sap.sailing.resultimport.impl;
 
-import java.util.Map;
-import java.util.Set;
-
-import com.sap.sailing.domain.common.RegattaScoreCorrections;
 import com.sap.sailing.domain.common.ScoreCorrectionProvider;
-import com.sap.sailing.domain.common.TimePoint;
-import com.sap.sailing.domain.common.impl.Util.Pair;
 import com.sap.sailing.resultimport.ResultDocumentProvider;
 
 public abstract class AbstractDocumentBasedScoreCorrectionProvider implements ScoreCorrectionProvider {
@@ -17,19 +11,6 @@ public abstract class AbstractDocumentBasedScoreCorrectionProvider implements Sc
         this.resultDocumentProvider = resultDocumentProvider;
     }
 
-    @Override
-    public Map<String, Set<Pair<String, TimePoint>>> getHasResultsForBoatClassFromDateByEventName() throws Exception {
-        // TODO Auto-generated method stub
-        return null;
-    }
-
-    @Override
-    public RegattaScoreCorrections getScoreCorrections(String eventName, String boatClassName, TimePoint timePoint)
-            throws Exception {
-        // TODO Auto-generated method stub
-        return null;
-    }
-
     protected ResultDocumentProvider getResultDocumentProvider() {
         return resultDocumentProvider;
     }