Revision 3087

tmp/org.txm.concordance.rcp/src/org/txm/concordance/rcp/editors/ConcordanceEditor.java (revision 3087)
125 125
import org.txm.rcp.views.QueriesView;
126 126
import org.txm.searchengine.cqp.CQPSearchEngine;
127 127
import org.txm.searchengine.cqp.ReferencePattern;
128
import org.txm.searchengine.cqp.clientExceptions.CqiClientException;
128 129
import org.txm.searchengine.cqp.core.messages.CQPSearchEngineCoreMessages;
129 130
import org.txm.searchengine.cqp.corpus.CQPCorpus;
130 131
import org.txm.searchengine.cqp.corpus.Property;
......
1109 1110
			refViewProperties.setLayoutData(new GridData(GridData.CENTER, GridData.CENTER, false, false));
1110 1111
			refViewProperties.setTitle(ConcordanceUIMessages.editor_21);
1111 1112
			refViewProperties.setButtonText(ConcordanceUIMessages.editor_19);
1112
			refViewProperties.setProperties(ReferencePattern.getAvailableProperties(getCorpus()));
1113
			refViewProperties.setPattern(null);
1114 1113
			refViewProperties.addSelectionListener(new ComputeSelectionListener(this) {
1115 1114
				
1116 1115
				@Override
......
1132 1131
			leftViewProperties = new PropertiesSelector<>(propertiesPanel, SWT.NONE);
1133 1132
			leftViewProperties.setLayoutData(new GridData(GridData.CENTER, GridData.CENTER, false, false));
1134 1133
			leftViewProperties.setTitle(ConcordanceUIMessages.editor_21);
1135
			tmp = new ArrayList<>(getCorpus().getOrderedProperties());
1136
			tmp.addAll(getCorpus().getVirtualProperties());
1137
			leftViewProperties.setProperties(tmp);
1138 1134
			leftViewProperties.setButtonText(ConcordanceUIMessages.editor_19);
1139 1135
			leftViewProperties.addSelectionListener(new ComputeSelectionListener(this) {
1140 1136
				
......
1148 1144
			keywordViewProperties = new PropertiesSelector<>(propertiesPanel, SWT.NONE);
1149 1145
			keywordViewProperties.setLayoutData(new GridData(GridData.CENTER, GridData.CENTER, false, false));
1150 1146
			keywordViewProperties.setTitle(ConcordanceUIMessages.editor_21);
1151
			tmp = new ArrayList<>(getCorpus().getOrderedProperties());
1152
			tmp.addAll(getCorpus().getVirtualProperties());
1153
			keywordViewProperties.setProperties(tmp);
1154 1147
			keywordViewProperties.setButtonText(ConcordanceUIMessages.editor_19);
1155 1148
			keywordViewProperties.addSelectionListener(new ComputeSelectionListener(this) {
1156 1149
				
......
1164 1157
			rightViewProperties = new PropertiesSelector<>(propertiesPanel, SWT.NONE);
1165 1158
			rightViewProperties.setLayoutData(new GridData(GridData.CENTER, GridData.CENTER, false, false));
1166 1159
			rightViewProperties.setTitle(ConcordanceUIMessages.editor_21);
1167
			tmp = new ArrayList<>(getCorpus().getOrderedProperties());
1168
			tmp.addAll(getCorpus().getVirtualProperties());
1169
			rightViewProperties.setProperties(tmp);
1170 1160
			rightViewProperties.setButtonText(ConcordanceUIMessages.editor_19);
1171 1161
			rightViewProperties.addSelectionListener(new ComputeSelectionListener(this) {
1172 1162
				
......
1185 1175
			refSortProperties.setLayoutData(new GridData(GridData.CENTER, GridData.CENTER, false, false));
1186 1176
			refSortProperties.setTitle(ConcordanceUIMessages.editor_21);
1187 1177
			refSortProperties.setButtonText(ConcordanceUIMessages.editor_19);
1188
			refSortProperties.setProperties(ReferencePattern.getAvailableProperties(getCorpus()));
1189 1178
			refSortProperties.addSelectionListener(new ComputeSelectionListener(this) {
1190 1179
				
1191 1180
				@Override
......
1199 1188
			leftSortProperties.setLayoutData(new GridData(GridData.CENTER, GridData.CENTER, false, false));
1200 1189
			leftSortProperties.setTitle(ConcordanceUIMessages.editor_21);
1201 1190
			leftSortProperties.setButtonText(ConcordanceUIMessages.editor_19);
1202
			tmp = new ArrayList<>(getCorpus().getOrderedProperties());
1203
			tmp.addAll(getCorpus().getVirtualProperties());
1204
			leftSortProperties.setProperties(tmp);
1205 1191
			leftSortProperties.addSelectionListener(new ComputeSelectionListener(this) {
1206 1192
				
1207 1193
				@Override
......
1215 1201
			keywordSortProperties.setLayoutData(new GridData(GridData.CENTER, GridData.CENTER, false, false));
1216 1202
			keywordSortProperties.setTitle(ConcordanceUIMessages.editor_21);
1217 1203
			keywordSortProperties.setButtonText(ConcordanceUIMessages.editor_19);
1218
			tmp = new ArrayList<>(getCorpus().getOrderedProperties());
1219
			tmp.addAll(getCorpus().getVirtualProperties());
1220
			keywordSortProperties.setProperties(tmp);
1221 1204
			keywordSortProperties.addSelectionListener(new ComputeSelectionListener(this) {
1222 1205
				
1223 1206
				@Override
......
1231 1214
			rightSortProperties.setLayoutData(new GridData(GridData.CENTER, GridData.CENTER, false, false));
1232 1215
			rightSortProperties.setTitle(ConcordanceUIMessages.editor_21);
1233 1216
			rightSortProperties.setButtonText(ConcordanceUIMessages.editor_19);
1234
			tmp = new ArrayList<>(getCorpus().getOrderedProperties());
1235
			tmp.addAll(getCorpus().getVirtualProperties());
1236
			rightSortProperties.setProperties(tmp);
1237 1217
			rightSortProperties.addSelectionListener(new ComputeSelectionListener(this) {
1238 1218
				
1239 1219
				@Override
......
1423 1403
		queryArea.layout();
1424 1404
	}
1425 1405
	
1406
	@Override
1407
	protected void firstInitializeEditorFieldsFromResult(boolean update) throws CqiClientException {
1408
		refViewProperties.setProperties(ReferencePattern.getAvailableProperties(getCorpus()));
1409
		
1410
		ArrayList<WordProperty> tmp = new ArrayList<>(getCorpus().getOrderedProperties());
1411
		tmp.addAll(getCorpus().getVirtualProperties());
1412
		leftViewProperties.setProperties(tmp);
1413
		
1414
		tmp = new ArrayList<>(getCorpus().getOrderedProperties());
1415
		tmp.addAll(getCorpus().getVirtualProperties());
1416
		keywordViewProperties.setProperties(tmp);
1417
		
1418
		tmp = new ArrayList<>(getCorpus().getOrderedProperties());
1419
		tmp.addAll(getCorpus().getVirtualProperties());
1420
		rightViewProperties.setProperties(tmp);
1421
		
1422
		refSortProperties.setProperties(ReferencePattern.getAvailableProperties(getCorpus()));
1423
		
1424
		tmp = new ArrayList<>(getCorpus().getOrderedProperties());
1425
		tmp.addAll(getCorpus().getVirtualProperties());
1426
		leftSortProperties.setProperties(tmp);
1427
		
1428
		tmp = new ArrayList<>(getCorpus().getOrderedProperties());
1429
		tmp.addAll(getCorpus().getVirtualProperties());
1430
		keywordSortProperties.setProperties(tmp);
1431
		
1432
		tmp = new ArrayList<>(getCorpus().getOrderedProperties());
1433
		tmp.addAll(getCorpus().getVirtualProperties());
1434
		rightSortProperties.setProperties(tmp);
1435
	}
1436
	
1426 1437
	/**
1427 1438
	 * refresh
1428 1439
	 * 
......
1435 1446
		StatusLine.setMessage(ConcordanceUIMessages.startComputingConcordance);
1436 1447
		
1437 1448
		try {
1449
			
1438 1450
			QueriesView.refresh();
1439 1451
			
1440 1452
			this.fillDisplayArea(update);
tmp/org.txm.concordance.core/src/org/txm/concordance/core/functions/Concordance.java (revision 3087)
205 205
	public boolean loadParameters() {
206 206
		
207 207
		try {
208
			if (!getCorpus().hasBeenComputedOnce()) {
209
				Log.warning("Error: CQP corpus is not available: " + getCorpus());
210
				return false;
211
			}
208
			
212 209
			this.setQuery(this.getStringParameterValue(ConcordancePreferences.QUERY));
213 210
			
214 211
			this.setCQLSeparator(this.getCorpus().getCQLLimitQuery());

Also available in: Unified diff