Back out DataFactory changes

src/uk/co/md87/evetool/ApiFactory.java

@@ -28,7 +28,6 @@ import java.sql.SQLException;
 import java.util.logging.Level;
 import java.util.logging.Logger;
 
-import uk.co.md87.evetool.api.DataFactory;
 import uk.co.md87.evetool.api.EveApi;
 
 /**
@@ -63,7 +62,7 @@ public class ApiFactory {
      * @return An instance of the EVE API.
      */
     public static EveApi getApi() {
-        return new EveApi(createConnection(), new DataFactory());
+        return new EveApi(createConnection());
     }
 
 }

src/uk/co/md87/evetool/api/DataFactory.java

@@ -1,48 +0,0 @@
-/*
- * Copyright (c) 2009 Chris Smith
- *
- * Permission is hereby granted, free of charge, to any person obtaining a copy
- * of this software and associated documentation files (the "Software"), to deal
- * in the Software without restriction, including without limitation the rights
- * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
- * copies of the Software, and to permit persons to whom the Software is
- * furnished to do so, subject to the following conditions:
- *
- * The above copyright notice and this permission notice shall be included in
- * all copies or substantial portions of the Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
- * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
- * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
- * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
- * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
- * SOFTWARE.
- */
-
-package uk.co.md87.evetool.api;
-
-import java.util.List;
-import java.util.Map;
-import uk.co.md87.evetool.api.wrappers.SkillGroup;
-import uk.co.md87.evetool.api.wrappers.data.SkillInfo;
-import uk.co.md87.evetool.api.wrappers.data.SkillRequirement;
-
-/**
- *
- * TODO: Document DataFactory
- * TODO: Add other data classes
- * @author chris
- */
-public class DataFactory {
-
-    public SkillInfo getSkillInfo(final SkillGroup group, final String name,
-            final int id, final String description, final int rank,
-            final List<SkillRequirement> requirements,
-            final String primaryAttribute, final String secondaryAttribute,
-            final Map<String, String> bonuses) {
-        return new SkillInfo(group, name, id, description, rank, requirements,
-                primaryAttribute, secondaryAttribute, bonuses);
-    }
-
-}

src/uk/co/md87/evetool/api/EveApi.java

@@ -62,9 +62,6 @@ public class EveApi {
     /** The database connection to use. */
     private final Connection conn;
 
-    /** The factory to use for constructing data objects. */
-    private final DataFactory df;
-
     /** The downloader to use. */
     private final ApiDownloader downloader;
     
@@ -82,11 +79,9 @@ public class EveApi {
      * connection.
      *
      * @param sqlConnection A connection to a database to use
-     * @param df The factory to use for constructing data objects
      */
-    public EveApi(final Connection sqlConnection, final DataFactory df) {
+    public EveApi(final Connection sqlConnection) {
         this.conn = sqlConnection;
-        this.df = df;
         
         checkTables();
 
@@ -182,8 +177,8 @@ public class EveApi {
         if (result.wasSuccessful()) {
             try {
                 return new ApiResponse<T>(type
-                        .getConstructor(ApiElement.class, DataFactory.class)
-                        .newInstance(result.getResultElement(), df), result);
+                        .getConstructor(ApiElement.class)
+                        .newInstance(result.getResultElement()), result);
             } catch (Exception ex) {
                 LOGGER.log(Level.SEVERE, "Unable to create response object", ex);
             }

src/uk/co/md87/evetool/api/wrappers/CharacterList.java

@@ -25,7 +25,6 @@ package uk.co.md87.evetool.api.wrappers;
 import java.util.ArrayList;
 import java.util.Map;
 
-import uk.co.md87.evetool.api.DataFactory;
 import uk.co.md87.evetool.api.parser.ApiElement;
 import uk.co.md87.evetool.api.wrappers.data.BasicCharInfo;
 import uk.co.md87.evetool.api.wrappers.data.BasicCorpInfo;
@@ -37,7 +36,7 @@ import uk.co.md87.evetool.api.wrappers.data.BasicCorpInfo;
  */
 public class CharacterList extends ArrayList<BasicCharInfo> {
 
-    public CharacterList(final ApiElement resultElement, final DataFactory df) {
+    public CharacterList(final ApiElement resultElement) {
         super();
 
         for (ApiElement child : resultElement.getChild("rowset").getChildren()) {

src/uk/co/md87/evetool/api/wrappers/CharacterSheet.java

@@ -27,7 +27,6 @@ import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
 
-import uk.co.md87.evetool.api.DataFactory;
 import uk.co.md87.evetool.api.parser.ApiElement;
 import uk.co.md87.evetool.api.wrappers.data.Attribute;
 import uk.co.md87.evetool.api.wrappers.data.BasicCharInfo;
@@ -55,7 +54,7 @@ public class CharacterSheet {
 
     private final BasicCharInfo charInfo;
 
-    public CharacterSheet(final ApiElement resultElement, final DataFactory df) {
+    public CharacterSheet(final ApiElement resultElement) {
         super();
 
         this.race = resultElement.getChild("race").getContent();

src/uk/co/md87/evetool/api/wrappers/SkillGroup.java

@@ -22,12 +22,13 @@
 
 package uk.co.md87.evetool.api.wrappers;
 
-import uk.co.md87.evetool.api.wrappers.data.*;
 import java.util.ArrayList;
 import java.util.List;
 import java.util.Map;
-import uk.co.md87.evetool.api.DataFactory;
+
 import uk.co.md87.evetool.api.parser.ApiElement;
+import uk.co.md87.evetool.api.wrappers.data.SkillInfo;
+import uk.co.md87.evetool.api.wrappers.data.SkillRequirement;
 
 /**
  *
@@ -39,12 +40,12 @@ public class SkillGroup extends ArrayList<SkillInfo> {
     private final int id;
     private final String name;
 
-    public SkillGroup(final ApiElement rowElement, final DataFactory df) {
+    public SkillGroup(final ApiElement rowElement) {
         this.name = rowElement.getAttributes().get("groupName");
         this.id = Integer.parseInt(rowElement.getAttributes().get("groupID"));
 
         for (ApiElement row : rowElement.getChild("rowset").getChildren()) {
-            addSkill(row, df);
+            addSkill(row);
         }
     }
 
@@ -56,7 +57,7 @@ public class SkillGroup extends ArrayList<SkillInfo> {
         return name;
     }
 
-    protected void addSkill(final ApiElement row, final DataFactory df) {
+    protected void addSkill(final ApiElement row) {
         final String skillName = row.getAttributes().get("typeName");
         final int typeId = Integer.parseInt(row.getAttributes().get("typeID"));
         final String desc = row.getChild("description").getContent();
@@ -68,7 +69,7 @@ public class SkillGroup extends ArrayList<SkillInfo> {
                 .getChild("secondaryAttribute").getContent();
         final Map<String, String> bonuses = getBonuses(row.getRowset("skillBonusCollection"));
 
-        add(df.getSkillInfo(this, skillName, typeId, desc, rank, reqs, primaryAttribute,
+        add(new SkillInfo(this, skillName, typeId, desc, rank, reqs, primaryAttribute,
                 secondaryAttribute, bonuses));
     }
 

src/uk/co/md87/evetool/api/wrappers/SkillInTraining.java

@@ -28,7 +28,6 @@ import java.text.SimpleDateFormat;
 import java.util.Date;
 import java.util.logging.Level;
 import java.util.logging.Logger;
-import uk.co.md87.evetool.api.DataFactory;
 import uk.co.md87.evetool.api.EveApi;
 import uk.co.md87.evetool.api.parser.ApiElement;
 
@@ -47,7 +46,7 @@ public class SkillInTraining {
     private int startSP, targetSP;
     private int targetLevel;
 
-    public SkillInTraining(final ApiElement resultElement, final DataFactory df) {
+    public SkillInTraining(final ApiElement resultElement) {
         super();
 
         if ("0".equals(resultElement.getChild("skillInTraining").getContent())) {

src/uk/co/md87/evetool/api/wrappers/SkillList.java

@@ -24,7 +24,6 @@ package uk.co.md87.evetool.api.wrappers;
 
 import java.util.ArrayList;
 
-import uk.co.md87.evetool.api.DataFactory;
 import uk.co.md87.evetool.api.parser.ApiElement;
 
 /**
@@ -34,9 +33,9 @@ import uk.co.md87.evetool.api.parser.ApiElement;
  */
 public class SkillList extends ArrayList<SkillGroup> {
 
-    public SkillList(final ApiElement resultElement, final DataFactory df) {
+    public SkillList(final ApiElement resultElement) {
         for (ApiElement row : resultElement.getRowset("skillGroups").getChildren()) {
-            add(new SkillGroup(row, df));
+            add(new SkillGroup(row));
         }
     }
 

src/uk/co/md87/evetool/api/wrappers/data/SkillInfo.java

@@ -59,6 +59,10 @@ public class SkillInfo {
         this.bonuses = bonuses;
     }
 
+    public int getSkillpointsForLevel(final int level) {
+        return (int) Math.ceil(250 * rank * Math.pow(32, ((double) level - 1) / 2));
+    }
+
     @Override
     public String toString() {
         return "[" + name + " (" + id + ")]";

src/uk/co/md87/evetool/data/EnhancedDataFactory.java

@@ -1,53 +0,0 @@
-/*
- * Copyright (c) 2009 Chris Smith
- *
- * Permission is hereby granted, free of charge, to any person obtaining a copy
- * of this software and associated documentation files (the "Software"), to deal
- * in the Software without restriction, including without limitation the rights
- * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
- * copies of the Software, and to permit persons to whom the Software is
- * furnished to do so, subject to the following conditions:
- *
- * The above copyright notice and this permission notice shall be included in
- * all copies or substantial portions of the Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
- * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
- * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
- * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
- * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
- * SOFTWARE.
- */
-
-package uk.co.md87.evetool.data;
-
-import java.util.List;
-import java.util.Map;
-
-import uk.co.md87.evetool.api.DataFactory;
-import uk.co.md87.evetool.api.wrappers.SkillGroup;
-import uk.co.md87.evetool.api.wrappers.data.SkillInfo;
-import uk.co.md87.evetool.api.wrappers.data.SkillRequirement;
-
-/**
- * An enhanced {@link DataFactory} which provides concrete classes from the
- * <code>data</code> package, which contain extra functionality for use in
- * the program.
- *
- * @author chris
- */
-public class EnhancedDataFactory extends DataFactory {
-
-    /** {@inheritDoc} */
-    @Override
-    public SkillInfo getSkillInfo(final SkillGroup group, final String name,
-            final int id, final String description, final int rank,
-            final List<SkillRequirement> requirements,
-            final String primaryAttribute, final String secondaryAttribute,
-            final Map<String, String> bonuses) {
-        return new Skill(group, name, id, description, rank, requirements,
-                primaryAttribute, secondaryAttribute, bonuses);
-    }
-
-}

src/uk/co/md87/evetool/data/Skill.java

@@ -1,51 +0,0 @@
-/*
- * Copyright (c) 2009 Chris Smith
- *
- * Permission is hereby granted, free of charge, to any person obtaining a copy
- * of this software and associated documentation files (the "Software"), to deal
- * in the Software without restriction, including without limitation the rights
- * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
- * copies of the Software, and to permit persons to whom the Software is
- * furnished to do so, subject to the following conditions:
- *
- * The above copyright notice and this permission notice shall be included in
- * all copies or substantial portions of the Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
- * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
- * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
- * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
- * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
- * SOFTWARE.
- */
-
-package uk.co.md87.evetool.data;
-
-import java.util.List;
-import java.util.Map;
-import uk.co.md87.evetool.api.wrappers.SkillGroup;
-import uk.co.md87.evetool.api.wrappers.data.SkillInfo;
-import uk.co.md87.evetool.api.wrappers.data.SkillRequirement;
-
-/**
- *
- * TODO: Document Skill
- * @author chris
- */
-public class Skill extends SkillInfo {
-
-    public Skill(final SkillGroup group, final String name, final int id,
-            final String description, final int rank,
-            final List<SkillRequirement> requirements,
-            final String primaryAttribute, final String secondaryAttribute,
-            final Map<String, String> bonuses) {
-        super(group, name, id, description, rank, requirements, primaryAttribute,
-                secondaryAttribute, bonuses);
-    }
-
-    public int getSkillpointsForLevel(final int level) {        
-        return (int) Math.ceil(250 * rank * Math.pow(32, ((double) level - 1) / 2));
-    }
-
-}

test/uk/co/md87/evetool/api/EveApiTest.java

@@ -47,7 +47,7 @@ public class EveApiTest {
             conn.createStatement().execute("DROP TABLE PAGECACHE");
         }
         
-        final EveApi api = new EveApi(conn, new DataFactory());
+        final EveApi api = new EveApi(conn);
         assertTrue(conn.getMetaData().getTables(null, null, "PAGECACHE", null).next());
     }
 

test/uk/co/md87/evetool/api/io/DBCacheTest.java

@@ -30,7 +30,6 @@ import java.util.Map;
 
 import org.junit.Test;
 
-import uk.co.md87.evetool.api.DataFactory;
 import uk.co.md87.evetool.api.EveApi;
 import static org.junit.Assert.*;
 
@@ -46,7 +45,7 @@ public class DBCacheTest {
     public void testBasicInsert() throws SQLException {
         final Map<String, String> args = new HashMap<String, String>();
         final Connection conn = DriverManager.getConnection(dbURL);
-        new EveApi(conn, new DataFactory()); // To create tables
+        new EveApi(conn); // To create tables
         final DBCache cache = new DBCache(conn);
 
         args.put("foo", "bar");

test/uk/co/md87/evetool/data/SkillTest.java → test/uk/co/md87/evetool/api/wrappers/data/SkillInfoTest.java

@@ -20,7 +20,7 @@
  * SOFTWARE.
  */
 
-package uk.co.md87.evetool.data;
+package uk.co.md87.evetool.api.wrappers.data;
 
 import org.junit.Test;
 import static org.junit.Assert.*;
@@ -29,7 +29,7 @@ import static org.junit.Assert.*;
  *
  * @author chris
  */
-public class SkillTest {
+public class SkillInfoTest {
 
     @Test
     public void testGetSkillpointsForLevel() {
@@ -44,7 +44,7 @@ public class SkillTest {
         };
 
         for (int[] datum : data) {
-            final Skill skill = new Skill(null, null, 0, null, datum[0],
+            final SkillInfo skill = new SkillInfo(null, null, 0, null, datum[0],
                     null, null, null, null);
             assertEquals(datum[2], skill.getSkillpointsForLevel(datum[1]));
         }