Révision 20
SRC/src/fr/triangle/hyperalign/gui/concord/ResultPane.java (revision 20) | ||
---|---|---|
41 | 41 |
import javax.swing.table.TableColumn; |
42 | 42 |
import javax.swing.table.TableRowSorter; |
43 | 43 |
|
44 |
import fr.triangle.hyperalign.gui.HMManager;
|
|
44 |
import fr.triangle.hyperalign.gui.HMController;
|
|
45 | 45 |
import fr.triangle.hyperalign.gui.Hypermachiavel; |
46 | 46 |
import fr.triangle.hyperalign.kernel.DataManager.AnnotationManager; |
47 | 47 |
import fr.triangle.hyperalign.kernel.DataManager.DictionaryManager; |
... | ... | |
116 | 116 |
|
117 | 117 |
private Vector<OccurrenceSet> selectedTargetOccurrences; |
118 | 118 |
|
119 |
private HMManager manager ;
|
|
119 |
private HMController manager ;
|
|
120 | 120 |
private ResultManager queryManager; |
121 | 121 |
|
122 |
public ResultPane(HMManager manager){
|
|
122 |
public ResultPane(HMController manager){
|
|
123 | 123 |
this.manager = manager; |
124 | 124 |
this.res = HyperalignData.getInstance().getResourceBundle(); |
125 | 125 |
HyperalignData.getInstance().addObserver(this); |
... | ... | |
685 | 685 |
resultEl = element.getName(); |
686 | 686 |
break; |
687 | 687 |
case 2 : //"Nb children" |
688 |
resultEl = ""+element.children().size(); |
|
688 |
resultEl = ""+element.childrenVect().size();
|
|
689 | 689 |
break; |
690 | 690 |
default : break; |
691 | 691 |
} |
... | ... | |
707 | 707 |
} |
708 | 708 |
else { |
709 | 709 |
equiTemp.removeElement(occ); |
710 |
equivalence.addElement(occ, textEl); |
|
710 |
equivalence.addElement(occ, textEl, "");
|
|
711 | 711 |
} |
712 | 712 |
}else { |
713 |
equivalence.addElement(occ, textEl); |
|
713 |
equivalence.addElement(occ, textEl, "");
|
|
714 | 714 |
} |
715 | 715 |
}else { |
716 | 716 |
ParallelTextElement textEl = manager.getDataManager().getCorpusManager().findTextElement(occ.getDivision()); |
717 |
equivalence = manager.getDataManager().getEquivalenceManager().addEquivalenceElement(occ, "", textEl); |
|
717 |
equivalence = manager.getDataManager().getEquivalenceManager().addEquivalenceElement(occ, "", textEl, "");
|
|
718 | 718 |
} |
719 | 719 |
} |
720 | 720 |
return equivalence; |
... | ... | |
743 | 743 |
} |
744 | 744 |
else { |
745 | 745 |
equiTemp.removeElement(occElement.getOccurrence()); |
746 |
equivalence.addElement(occElement.getOccurrence(),textEl); |
|
746 |
equivalence.addElement(occElement.getOccurrence(),textEl, "");
|
|
747 | 747 |
} |
748 | 748 |
}else { |
749 |
equivalence.addElement(occElement.getOccurrence(), textEl); |
|
749 |
equivalence.addElement(occElement.getOccurrence(), textEl, "");
|
|
750 | 750 |
} |
751 | 751 |
}else { |
752 | 752 |
OccurrenceSet occSet = occElement.getOccurrence(); |
753 | 753 |
ParallelTextElement textEl = manager.getDataManager().getCorpusManager().findTextElement(occSet.getDivision()); |
754 |
equivalence = manager.getDataManager().getEquivalenceManager().addEquivalenceElement(occSet, "", textEl); |
|
754 |
equivalence = manager.getDataManager().getEquivalenceManager().addEquivalenceElement(occSet, "", textEl, "");
|
|
755 | 755 |
} |
756 | 756 |
} |
757 | 757 |
} |
... | ... | |
902 | 902 |
if(okToIndex){ |
903 | 903 |
if(queryManager.getSearcher().getTerms()==null){ |
904 | 904 |
String [] words = queryManager.getSearcher().getQuery(); |
905 |
manager.getSearchManager().index(indexOcc, words, termino, refText);
|
|
905 |
manager.getSearchController().index(indexOcc, words, termino, refText);
|
|
906 | 906 |
}else{ |
907 | 907 |
int nbAdded = dicoManager.addOccurrences(indexOcc, queryManager.getSearcher().getTerms()); |
908 | 908 |
String [] words = dicoManager.getWords(queryManager.getSearcher().getTerms()); |
... | ... | |
1020 | 1020 |
indexLine.add(new Integer(row)); |
1021 | 1021 |
|
1022 | 1022 |
//TO DISPLAY !! |
1023 |
manager.displayText(elementSelected, newOccs, false); |
|
1023 |
manager.getCorpusController().displayText(elementSelected, newOccs, false);
|
|
1024 | 1024 |
} |
1025 | 1025 |
|
1026 | 1026 |
private void showEquivalenceEdition(int row, ParallelTextElement elementSelected){ |
... | ... | |
1042 | 1042 |
if(occSet.getEquivalence()!=null){ |
1043 | 1043 |
EquivalenceManager equiManager = manager.getDataManager().getEquivalenceManager(); |
1044 | 1044 |
equiManager.setEquivalenceCurrentState(occSet); |
1045 |
manager.showEquivalenceForOccurrence(); |
|
1045 |
manager.getTranslationController().showEquivalenceForOccurrence();
|
|
1046 | 1046 |
hasEquivalence = true; |
1047 | 1047 |
} |
1048 | 1048 |
} |
... | ... | |
1076 | 1076 |
} |
1077 | 1077 |
} |
1078 | 1078 |
} |
1079 |
manager.displayText(elementSelected, occs, true); |
|
1079 |
manager.getCorpusController().displayText(elementSelected, occs, true);
|
|
1080 | 1080 |
} |
1081 | 1081 |
|
1082 | 1082 |
private void exportConcordance(){ |
... | ... | |
1194 | 1194 |
//System.out.println("===> OCCS : "+occs.toString()); |
1195 | 1195 |
//System.out.println("===> SELECTED ELEMENT : "+elementSelected.getId()); |
1196 | 1196 |
//DISPLAY with selection of RESULT !!! |
1197 |
manager.displayText(elementSelected, occs, false); |
|
1197 |
manager.getCorpusController().displayText(elementSelected, occs, false);
|
|
1198 | 1198 |
|
1199 | 1199 |
|
1200 | 1200 |
if(resultBool){ |
... | ... | |
1220 | 1220 |
selectedTerminologyElement = (DictionaryElement) resultTableModel.getValueAt(row, 1); |
1221 | 1221 |
terminoElementSelected = true; |
1222 | 1222 |
//System.out.println("-------------selectionOfOccurrence : OCC (" +selectedTerminologyElement+")----------"); |
1223 |
manager.displayTextWithHighlightsForDictionary(occ, refText); |
|
1223 |
manager.getCorpusController().displayTextWithHighlightsForDictionary(occ, refText);
|
|
1224 | 1224 |
return word; |
1225 | 1225 |
} |
1226 | 1226 |
|
... | ... | |
1250 | 1250 |
*/ |
1251 | 1251 |
|
1252 | 1252 |
//////////////////// |
1253 |
manager.displayTextFromConcordance(localisation, occSet, refText); |
|
1253 |
manager.getCorpusController().displayTextFromConcordance(localisation, occSet, refText);
|
|
1254 | 1254 |
} |
1255 | 1255 |
|
1256 | 1256 |
private void selectionOfConcordanceIndex(int row, boolean resultBool){ |
... | ... | |
1274 | 1274 |
System.out.println("ResultPane.selectionOfConcordanceIndex() => LOCALISATION ["+localisation+"] - "+ |
1275 | 1275 |
occSet+" ["+indexesOcc[0]+"-"+indexesOcc[1]+"]"); |
1276 | 1276 |
refText = (HyperalignText) resultTableModel.getValueAt(row, numCol+1); //1 ou 2 |
1277 |
manager.displayTextFromConcordance(localisation, occSet, refText); |
|
1277 |
manager.getCorpusController().displayTextFromConcordance(localisation, occSet, refText);
|
|
1278 | 1278 |
|
1279 | 1279 |
|
1280 | 1280 |
if(resultBool){ |
Formats disponibles : Unified diff