Type safeing my class.

// .... <Unsafe version using Enum> ...
 
public class ChangeTable extends Table {
  static final Map<Enum,Field.Type> columnTypes = new HashMap<Enum,Field.Type>();
  
  enum Column {
      Change(Field.Type.String),
      Date(Field.Type.Long);
 
      // Keep track of the column types.
      Column(Field.Type type) {
        columnTypes.put(this, type);
      }
  };
  
  public ChangeTable () {
    super("ChangeTable", Column.values(), columnTypes);
  }
}
 
public class Table {
  final String tableName;
  final Enum[] columns;
  final Map<Enum,Field.Type> types;
  Map<Enum,Object> values = new HashMap<Enum,Object>();
  
  protected Table (String tableName, Enum [] columns, Map<Enum,Field.Type> types) {
    this.tableName = tableName;
    this.columns = columns;
    this.types = types;
  }
 
  // Returns a query that will update all records matching the key.
  private String updateQuery ( EnumSet key, Enum[] columns ) {
    String query = "UPDATE "+tableName+" SET ";
    // SET - All update columns not in key.
    for ( int i = 0; i < columns.length; i++ ) {
      Enum col = columns[i];
      // Not key column.
      if ( !key.contains(col) ) {
        // Add field to query.
        query += col.name() + " = " + values.get(col).toString();
      }
    }
    // WHERE All columns in key.
    query += " WHERE " + keyValues(key);
    return query;
  }
 
  public String updateQuery (EnumSet key) {
    // If columns not supplied, assume all columns.
    return ( updateQuery(key, columns) );
  }
 
  public String updateQuery (EnumSet key, EnumSet updateColumns) {
    // Allow an EnumSet of Columns to update.
    return updateQuery(key, (Enum[]) updateColumns.toArray() );
  }
 
  private String keyValues ( EnumSet key ) {
    String keyValues = "";
    for ( Iterator i = key.iterator(); i.hasNext(); ) {
      // Pull out the column.
      Enum col = (Enum)i.next();
      String val = values.get( col ).toString();
      keyValues += col.name() + " = " + val;
    }
    return keyValues;
  }
 
}
 
public class Field {
  
  enum Type {
    String,
    Long;
  }
  
  public Field () {
  }
}
 
// .... <Attempt at safe version, not using Enum but still using EnumSet> ... 
 
public class SafeChangeTable extends SafeTable<SafeChangeTable.Column> {
  static final Map<Column,Field.Type> columnTypes = new HashMap<Column,Field.Type>();
 
  enum Column {
      Change(Field.Type.String),
      Date(Field.Type.Long);
 
      // Keep track of the column types.
      Column(Field.Type type) {
        columnTypes.put(this, type);
      }
  };
 
  public SafeChangeTable () {
    super("ChangeTable", Column.values(), columnTypes);
  }
}
 
public class SafeTable<Column extends Enum> {
  final String tableName;
  final Column[] columns;
  final Map<Column,Field.Type> types;
  Map<Column,Object> values = new HashMap<Column,Object>();
 
  protected SafeTable (String tableName, Column [] columns, Map<Column,Field.Type> types) {
    this.tableName = tableName;
    this.columns = columns;
    this.types = types;
  }
 
  public String updateQuery ( EnumSet key, Column[] columns ) {
    String query = "UPDATE "+tableName+" SET ";
    // SET - All update columns not in key.
    for ( int i = 0; i < columns.length; i++ ) {
      Column col = columns[i];
      // Not key column.
      if ( !key.contains(col) ) {
        // Add field to query.
        query += col.name() + " = " + values.get(col);
      }
    }
    // WHERE All columns in key.
    query += " WHERE " + keyValues(key);
    return query;
  }
 
  public String updateQuery (EnumSet key) {
    // If columns not supplied, assume all columns.
    return ( updateQuery(key, columns) );
  }
 
  public String updateQuery (EnumSet key, EnumSet updateColumns) {
    // Allow an EnumSet of Columns to update.
    return updateQuery(key, (Column[]) updateColumns.toArray() );
  }
 
  private String keyValues ( EnumSet key ) {
    String keyValues = "";
    for ( Iterator i = key.iterator(); i.hasNext(); ) {
      // Pull out the column.
      Enum col = (Enum)i.next();
      String val = values.get( col ).toString();
      keyValues += col.name() + " = " + val;
    }
    return keyValues;
  }
 
}

                                  

1:
2:
3:
4:
5:
6:
7:
8:
9:
10:
11:
12:
13:
14:
15:
16:
17:
18:
19:
20:
21:
22:
23:
24:
25:
26:
27:
28:
29:
30:
31:
32:
33:
34:
35:
36:
37:
38:
39:
40:
41:
42:
43:
44:
45:
46:
47:
48:
49:
50:
51:
52:
53:
54:
55:
56:
57:
58:
59:
60:
61:
62:
63:
64:
65:
66:
67:
68:
69:
70:
71:
72:
73:
74:
75:
76:
77:
78:
79:
80:
81:
82:
83:
84:
85:
86:
87:
88:
89:
90:
91:
92:
93:
94:
95:
96:
97:
98:
99:
100:
101:
102:
103:
104:
105:
106:
107:
108:
109:
110:
111:
112:
113:
114:
115:
116:
117:
118:
119:
120:
121:
122:
123:
124:
125:
126:
127:
128:
129:
130:
131:
132:
133:
134:
135:
136:
137:
138:
139:
140:
141:
142:
143:
144:
145:
146:
147:
148:
149:
150:
151:
152:
153: