Révision 2869

tmp/org.txm.concordance.rcp/src/org/txm/concordance/rcp/actions/DefineSortReferencePattern.java (revision 2869)
110 110

  
111 111
		// System.out.println("selected "+concordanceEditor.getSelectedReferences());
112 112
		// System.out.println("before avail"+availableReferenceItems);
113
		availableReferenceItems.remove(concordanceEditor.getSelectedSortReferences());
113
		availableReferenceItems.removeAll(concordanceEditor.getSelectedSortReferences());
114 114

  
115 115
		// System.out.println("after avail"+availableReferenceItems);
116 116
		DefineReferencePatternDialog d = null;
tmp/org.txm.concordance.rcp/src/org/txm/concordance/rcp/actions/DefineViewReferencePattern.java (revision 2869)
109 109

  
110 110
		// System.out.println("selected "+concordanceEditor.getSelectedReferences());
111 111
		// System.out.println("before avail"+availableReferenceItems);
112
		availableReferenceItems.remove(concordanceEditor.getSelectedViewReferences());
112
		availableReferenceItems.removeAll(concordanceEditor.getSelectedViewReferences());
113 113

  
114 114
		// System.out.println("after avail"+availableReferenceItems);
115 115
		DefineReferencePatternDialog d = null;
tmp/org.txm.concordance.rcp/src/org/txm/concordance/rcp/widgets/ComplexSortSelector.java (revision 2869)
198 198
				defaultComparator = (CompositeComparator) c;
199 199
				List<LineComparator> comp = defaultComparator.getComparators();
200 200
				if (comp.size() >= 4) {
201
					firstKey.select(comparatorsNames.indexOf(comp.get(0)));
202
					secondKey.select(comparatorsNames.indexOf(comp.get(1)));
203
					thirdKey.select(comparatorsNames.indexOf(comp.get(2)));
204
					fourthKey.select(comparatorsNames.indexOf(comp.get(3)));
201
					firstKey.select(comparatorsNames.indexOf(comp.get(0).getName()));
202
					secondKey.select(comparatorsNames.indexOf(comp.get(1).getName()));
203
					thirdKey.select(comparatorsNames.indexOf(comp.get(2).getName()));
204
					fourthKey.select(comparatorsNames.indexOf(comp.get(3).getName()));
205 205
				} else if (comp.size() >= 3) {
206
					firstKey.select(comparatorsNames.indexOf(comp.get(0)));
207
					secondKey.select(comparatorsNames.indexOf(comp.get(1)));
208
					thirdKey.select(comparatorsNames.indexOf(comp.get(2)));
209
					fourthKey.select(comparatorsNames.indexOf(comp.get(2)));
206
					firstKey.select(comparatorsNames.indexOf(comp.get(0).getName()));
207
					secondKey.select(comparatorsNames.indexOf(comp.get(1).getName()));
208
					thirdKey.select(comparatorsNames.indexOf(comp.get(2).getName()));
209
					fourthKey.select(comparatorsNames.indexOf(comp.get(2).getName()));
210 210
				} else if (comp.size() == 2) {
211
					firstKey.select(comparatorsNames.indexOf(comp.get(0)));
212
					secondKey.select(comparatorsNames.indexOf(comp.get(1)));
213
					thirdKey.select(comparatorsNames.indexOf(comp.get(1)));
214
					fourthKey.select(comparatorsNames.indexOf(comp.get(1)));
211
					firstKey.select(comparatorsNames.indexOf(comp.get(0).getName()));
212
					secondKey.select(comparatorsNames.indexOf(comp.get(1).getName()));
213
					thirdKey.select(comparatorsNames.indexOf(comp.get(1).getName()));
214
					fourthKey.select(comparatorsNames.indexOf(comp.get(1).getName()));
215 215
				} else if (comp.size() == 1) {
216
					firstKey.select(comparatorsNames.indexOf(comp.get(0)));
217
					secondKey.select(comparatorsNames.indexOf(comp.get(0)));
218
					thirdKey.select(comparatorsNames.indexOf(comp.get(0)));
219
					fourthKey.select(comparatorsNames.indexOf(comp.get(0)));
216
					firstKey.select(comparatorsNames.indexOf(comp.get(0).getName()));
217
					secondKey.select(comparatorsNames.indexOf(comp.get(0).getName()));
218
					thirdKey.select(comparatorsNames.indexOf(comp.get(0).getName()));
219
					fourthKey.select(comparatorsNames.indexOf(comp.get(0).getName()));
220 220
				}
221 221
				return;
222 222
			}

Formats disponibles : Unified diff