← Back to branch summary

~interedition/collatex/mainbranch

« back to all changes in this revision

Viewing changes to collatex/src/main/java/eu/interedition/collatex2/implementation/indexing/ColumnPhrase.java

  • Committer: Ronald Haentjens Dekker
  • Date: 2010-10-06 10:48:21 UTC
  • mfrom: (832.1.3 collatex.column_refactor)
  • Revision ID: ronald.dekker@huygensinstituut.knaw.nl-20101006104821-0wktmqcnr6742eam
[RHD] Merged Troy's IColumn refactoring branch

Show diffs side-by-side

added added

removed removed

Lines of Context:
collatex/src/main/java/eu/interedition/collatex2/implementation/indexing/ColumnPhrase.java
27
27
 
28
28
import eu.interedition.collatex2.implementation.alignmenttable.Columns;
29
29
import eu.interedition.collatex2.input.Phrase;
30
 
import eu.interedition.collatex2.interfaces.IColumn;
 
30
import eu.interedition.collatex2.interfaces.IInternalColumn;
31
31
import eu.interedition.collatex2.interfaces.IColumns;
32
32
import eu.interedition.collatex2.interfaces.INormalizedToken;
33
33
import eu.interedition.collatex2.interfaces.IPhrase;
45
45
    this.name = _name;
46
46
  }
47
47
 
48
 
  public void addColumnToLeft(final IColumn column) {
49
 
    final List<IColumn> columnList = getColumns().getColumns();
 
48
  public void addColumnToLeft(final IInternalColumn column) {
 
49
    final List<IInternalColumn> columnList = getColumns().getColumns();
50
50
    columnList.add(0, column);
51
51
    setColumns(new Columns(columnList));
52
52
    if (column instanceof NullColumn) {
57
57
    }
58
58
  }
59
59
 
60
 
  public void addColumnToRight(final IColumn column) {
61
 
    final List<IColumn> columnList = getColumns().getColumns();
 
60
  public void addColumnToRight(final IInternalColumn column) {
 
61
    final List<IInternalColumn> columnList = getColumns().getColumns();
62
62
    columnList.add(column);
63
63
    setColumns(new Columns(columnList));
64
64
    if (column instanceof NullColumn) {
92
92
  public IPhrase getPhrase() {
93
93
    List<INormalizedToken> tokens = Lists.newArrayList(); //TODO: do the capacity thing!
94
94
    final String sigil = getSigla().get(0);
95
 
    for (IColumn column : columns.getColumns()) {
 
95
    for (IInternalColumn column : columns.getColumns()) {
96
96
      tokens.add(column.getToken(sigil));
97
97
    }
98
98
    return new Phrase(tokens);