Revision 802

tmp/org.txm.concordance.rcp/src/org/txm/concordance/rcp/editors/ConcordanceEditor.java (revision 802)
226 226
	/** The right context column. */
227 227
	private TableColumn rightContextColumn;
228 228

  
229
	/** The view properties label. */
230
	private Label viewPropertiesLabel;
229
//	/** The view properties label. */
230
//	private Label viewPropertiesLabel;
231 231

  
232 232
	/** The set sort property action. */
233 233
	private Action setSortPropertyAction;
......
1039 1039
			leftViewProperties.addSelectionListener(new ComputeSelectionListener(this) {
1040 1040
				@Override
1041 1041
				public void widgetSelected(SelectionEvent e) {
1042
					concordance.setRefViewPattern(new ReferencePattern(refViewProperties.getSelectedProperties()));
1042
					concordance.setLeftViewProperties(leftViewProperties.getSelectedProperties());
1043 1043
					super.widgetSelected(e);
1044 1044
				}
1045 1045
			});
......
1050 1050
			keywordViewProperties.addSelectionListener(new ComputeSelectionListener(this) {
1051 1051
				@Override
1052 1052
				public void widgetSelected(SelectionEvent e) {
1053
					concordance.setRefViewPattern(new ReferencePattern(refViewProperties.getSelectedProperties()));
1053
					concordance.setKeywordViewProperties(keywordViewProperties.getSelectedProperties());
1054 1054
					super.widgetSelected(e);
1055 1055
				}
1056 1056
			});
......
1061 1061
			rightViewProperties.addSelectionListener(new ComputeSelectionListener(this) {
1062 1062
				@Override
1063 1063
				public void widgetSelected(SelectionEvent e) {
1064
					concordance.setRefViewPattern(new ReferencePattern(refViewProperties.getSelectedProperties()));
1064
					concordance.setRightViewProperties(rightViewProperties.getSelectedProperties());
1065 1065
					super.widgetSelected(e);
1066 1066
				}
1067 1067
			});
......
1071 1071
			refSortProperties.setTitle("");
1072 1072
			refSortProperties.setButtonText("...");
1073 1073
			refSortProperties.setProperties(ReferencePattern.getPossibleValues(getCorpus()));
1074
			rightViewProperties.addSelectionListener(new ComputeSelectionListener(this) {
1074
			refSortProperties.addSelectionListener(new ComputeSelectionListener(this) {
1075 1075
				@Override
1076 1076
				public void widgetSelected(SelectionEvent e) {
1077
					concordance.setRefViewPattern(new ReferencePattern(refViewProperties.getSelectedProperties()));
1077
					concordance.setRefAnalysePattern(new ReferencePattern(refSortProperties.getSelectedProperties()));
1078 1078
					super.widgetSelected(e);
1079 1079
				}
1080 1080
			});
......
1082 1082
			leftSortProperties.setTitle("");
1083 1083
			leftSortProperties.setButtonText("...");
1084 1084
			leftSortProperties.setProperties(getCorpus().getOrderedProperties());
1085
			rightViewProperties.addSelectionListener(new ComputeSelectionListener(this) {
1085
			leftSortProperties.addSelectionListener(new ComputeSelectionListener(this) {
1086 1086
				@Override
1087 1087
				public void widgetSelected(SelectionEvent e) {
1088
					concordance.setRefViewPattern(new ReferencePattern(refViewProperties.getSelectedProperties()));
1088
					concordance.setLeftAnalysisProperties(leftSortProperties.getSelectedProperties());
1089 1089
					super.widgetSelected(e);
1090 1090
				}
1091 1091
			});
......
1093 1093
			keywordSortProperties.setTitle("");
1094 1094
			keywordSortProperties.setButtonText("...");
1095 1095
			keywordSortProperties.setProperties(getCorpus().getOrderedProperties());
1096
			rightViewProperties.addSelectionListener(new ComputeSelectionListener(this) {
1096
			keywordSortProperties.addSelectionListener(new ComputeSelectionListener(this) {
1097 1097
				@Override
1098 1098
				public void widgetSelected(SelectionEvent e) {
1099
					concordance.setRefViewPattern(new ReferencePattern(refViewProperties.getSelectedProperties()));
1099
					concordance.setKeywordAnalysisProperties(keywordSortProperties.getSelectedProperties());
1100 1100
					super.widgetSelected(e);
1101 1101
				}
1102 1102
			});
......
1104 1104
			rightSortProperties.setTitle("");
1105 1105
			rightSortProperties.setButtonText("...");
1106 1106
			rightSortProperties.setProperties(getCorpus().getOrderedProperties());
1107
			rightViewProperties.addSelectionListener(new ComputeSelectionListener(this) {
1107
			rightSortProperties.addSelectionListener(new ComputeSelectionListener(this) {
1108 1108
				@Override
1109 1109
				public void widgetSelected(SelectionEvent e) {
1110
					concordance.setRightViewProperties(rightViewProperties.getSelectedProperties());
1110
					concordance.setRightAnalysisProperties(rightSortProperties.getSelectedProperties());
1111 1111
					super.widgetSelected(e);
1112 1112
				}
1113 1113
			});
......
1287 1287
		return concordance.getNLinePerPage();
1288 1288
	}
1289 1289

  
1290
	/**
1291
	 * Update view properties label.
1292
	 */
1293
	void updateViewPropertiesLabel() {
1294
		String str = StringUtils.join(concordance.getKeywordViewProperties(), "_");
1295
		viewPropertiesLabel.setText(str);
1296
		viewPropertiesLabel.getParent().layout();
1297
		viewPropertiesLabel.update();
1298
		queryArea.layout();
1299
	}
1290
//	/**
1291
//	 * Update view properties label.
1292
//	 */
1293
//	void updateViewPropertiesLabel() {
1294
//		String str = StringUtils.join(concordance.getKeywordViewProperties(), "_");
1295
//		viewPropertiesLabel.setText(str);
1296
//		viewPropertiesLabel.getParent().layout();
1297
//		viewPropertiesLabel.update();
1298
//		queryArea.layout();
1299
//	}
1300 1300

  
1301 1301
	/* (non-Javadoc)
1302 1302
	 * @see org.eclipse.ui.part.EditorPart#getTitleToolTip()
......
1651 1651
	public void setKeywordViewProperties(List<WordProperty> selectedViewProperties) {
1652 1652
		concordance.setKeywordViewProperties(selectedViewProperties);
1653 1653
		refreshViewProperties();
1654
		updateViewPropertiesLabel();
1654
//		updateViewPropertiesLabel();
1655 1655
	}
1656 1656

  
1657 1657
	/**

Also available in: Unified diff