Revision 929

tmp/org.txm.ahc.core/src/org/txm/ahc/core/messages/messages.properties (revision 929)
1 1

  
2 2
RESULT_TYPE = AHC
3 3

  
4
error_errorWhileExportingCAHToTXT = Error while exporting CAH result: 
4
error_errorWhileExportingCAHToTXT = Error while exporting CAH result.
tmp/org.txm.ahc.core/src/org/txm/ahc/core/messages/messages_fr.properties (revision 929)
1 1

  
2 2
RESULT_TYPE = CAH
3 3

  
4
error_errorWhileExportingCAHToTXT = Erreur durant l'export du résultat CAH : 
4
error_errorWhileExportingCAHToTXT = Erreur durant l'export du résultat CAH.
tmp/org.txm.ahc.rcp/src/org/txm/ahc/rcp/messages/AHCUIMessages.java (revision 929)
18 18
	public static String preferences_displayChartIn2D;
19 19
	public static String CAHPreferencePage_2;
20 20
	public static String CAHPreferencePage_3;
21
	public static String CAHPreferencePage_4;
21
	public static String common_metric;
22 22
	
23 23
	public static String ComputeCAH_0;
24 24
	
25
	public static String COMPUTE_COLUMNS;
26
	public static String COMPUTE_ROWS;
25
	public static String tooltips_computeColumns;
26
	public static String tooltips_computeRows;
27 27
	
28 28
	public static String toolbars_numberOfClusters;
29 29
	
tmp/org.txm.ahc.rcp/src/org/txm/ahc/rcp/messages/messages.properties (revision 929)
1 1

  
2 2
CAHPreferencePage_2 = Number of clusters
3 3
CAHPreferencePage_3 = Method
4
CAHPreferencePage_4 = Metric
5 4

  
6
COMPUTE_COLUMNS = Compute columns
7
COMPUTE_ROWS    = Compute rows
5
ComputeCAH_0 = Computing classification with {0}.
8 6

  
9
ComputeCAH_0 = Compute Classification with {0}
7
common_metric = Metric
10 8

  
11 9
preferences_displayChartIn2D = Display charts in 2D
12 10

  
13 11
toolbars_numberOfClusters = Number of clusters:
12

  
13
tooltips_computeColumns = Compute columns
14
tooltips_computeRows    = Compute rows
tmp/org.txm.ahc.rcp/src/org/txm/ahc/rcp/messages/messages_ru.properties (revision 929)
1 1

  
2 2
CAHPreferencePage_2 = Число кластеров
3 3
CAHPreferencePage_3 = Метод
4
CAHPreferencePage_4 = Метрика
5 4

  
6
COMPUTE_COLUMNS = Колонки
7
COMPUTE_ROWS    = Строчки
8

  
9 5
ComputeCAH_0 = Расчет Классификации {0}
10 6

  
7
common_metric = Метрика
8

  
11 9
preferences_displayChartIn2D = Показывать графики в 2D
10

  
11
tooltips_computeColumns = Колонки
12
tooltips_computeRows    = Строчки
tmp/org.txm.ahc.rcp/src/org/txm/ahc/rcp/messages/messages_fr.properties (revision 929)
1 1

  
2 2
CAHPreferencePage_2 = Nombre de clusters
3 3
CAHPreferencePage_3 = Méthode
4
CAHPreferencePage_4 = Métrique
5 4

  
6
COMPUTE_COLUMNS = Classer les colonnes
7
COMPUTE_ROWS    = Classer les lignes
5
ComputeCAH_0 = Calcul de la classification avec {0}.
8 6

  
9
ComputeCAH_0 = Calcul de la Classification avec {0}
7
common_metric = Métrique
10 8

  
11 9
preferences_displayChartIn2D = Afficher les graphiques en 2D
12 10

  
13 11
toolbars_numberOfClusters = Nombre de clusters :
12

  
13
tooltips_computeColumns = Classer les colonnes
14
tooltips_computeRows    = Classer les lignes
tmp/org.txm.ahc.rcp/src/org/txm/ahc/rcp/editors/AHCChartEditor.java (revision 929)
3 3
import org.eclipse.swt.SWT;
4 4
import org.eclipse.swt.custom.CLabel;
5 5
import org.eclipse.swt.widgets.Button;
6
import org.eclipse.swt.widgets.Composite;
7
import org.eclipse.swt.widgets.Display;
8 6
import org.eclipse.swt.widgets.Spinner;
9 7
import org.eclipse.swt.widgets.ToolItem;
10 8
import org.txm.ahc.core.functions.AHC;
......
16 14
import org.txm.rcp.editors.listeners.ComputeSelectionListener;
17 15

  
18 16
/**
19
 * CAH chart editor.
17
 * AHC chart editor.
20 18
 * 
21 19
 * @author mdecorde
22 20
 * @author sjacquot
......
85 83

  
86 84
		// Columns
87 85
		this.columnsComputing = new ToolItem(this.chartToolBar, SWT.RADIO);
88
		this.columnsComputing.setToolTipText(AHCUIMessages.COMPUTE_COLUMNS);
86
		this.columnsComputing.setToolTipText(AHCUIMessages.tooltips_computeColumns);
89 87
		this.columnsComputing.setImage(IImageKeys.getImage(AHCChartEditor.class, "icons/compute_columns.png")); //$NON-NLS-1$
90 88
		this.columnsComputing.addSelectionListener(new ComputeSelectionListener(this));
91
		// FIXME: keep this for offering an option "large icons" with text in buttons ?
92
		//this.columnsComputing.setText(CAUIPMessages.ComputeClassification_5);
93
		//this.columnsComputing.setSelection(this.getBooleanParameterValue(AHCPreferences.COLUMNS_COMPUTING));
94 89

  
95 90
		// Rows
96 91
		this.rowsComputing = new ToolItem(this.chartToolBar, SWT.RADIO);
97
		this.rowsComputing.setToolTipText(AHCUIMessages.COMPUTE_ROWS);
92
		this.rowsComputing.setToolTipText(AHCUIMessages.tooltips_computeRows);
98 93
		this.rowsComputing.setImage(IImageKeys.getImage(AHCChartEditor.class, "icons/compute_rows.png")); //$NON-NLS-1$
99 94

  
100 95
		
......
103 98
		this.rendering2D.setText("2D");//$NON-NLS-1$
104 99
		this.chartToolBar.addControl(this.rendering2D);
105 100
		this.rendering2D.addSelectionListener(new ComputeSelectionListener(this));
106
		//this.rendering2D.setBackground(itemSeparator.getParent().getBackground());
107 101

  
108 102
	}
109 103

  
tmp/org.txm.ahc.rcp/src/org/txm/ahc/rcp/handlers/ComputeAHC.java (revision 929)
47 47
import org.txm.utils.logger.Log;
48 48

  
49 49
/**
50
 * Opens a Cooccurrence editor.
50
 * Opens an AHC editor.
51 51
 * Computes the result if it contains all required parameters.
52 52
 * 
53 53
 * @author mdecorde
......
79 79
		}
80 80
		// creates from LexicalTable
81 81
		else if (selection instanceof LexicalTable) {
82
			//System.out.println("Compute CAH with LT : "+((LexicalTable)selection.getFirstElement()).getName());
83 82
			LexicalTable lexicaltable = (LexicalTable) selection;
84 83
			
85 84
			try {
86 85
				ahc = new AHC(new CA(lexicaltable));
87 86
			} catch (StatException e) {
88
				System.out.println("Failed to build the CA with lexical table " + lexicaltable + ": " + e);
87
				Log.severe("Failed to build the CA with lexical table " + lexicaltable + ": " + e);
89 88
				Log.printStackTrace(e);
90 89
			}
91 90
			lexicaltable.addChild(ahc);
......
97 96
			Partition partition = (Partition)selection;
98 97
			try {
99 98
				String title = AHCUIMessages.bind(AHCUIMessages.ComputeCAH_0, partition.getName());
100
				int vMax = TXMPreferences.getInt(CAPreferences.V_MAX, CAPreferences.PREFERENCES_NODE);
101
				int fMin = TXMPreferences.getInt(CAPreferences.F_MIN, CAPreferences.PREFERENCES_NODE);
99
				int vMax = TXMPreferences.getInt(TXMPreferences.V_MAX, CAPreferences.PREFERENCES_NODE);
100
				int fMin = TXMPreferences.getInt(TXMPreferences.F_MIN, CAPreferences.PREFERENCES_NODE);
102 101
				Shell shell = Display.getCurrent().getActiveShell();
103 102
				CAParametersDialog d = new CAParametersDialog(shell, partition.getCorpus(), title);
104 103
				d.setFminAndVMax(fMin, vMax);
......
115 114
					return null;
116 115
				}
117 116
			} catch (Exception e) {
118
				System.out.println("Failed to build the lexical table of " + partition + ": " + e);
117
				Log.severe("Failed to build the lexical table of " + partition + ": " + e);
119 118
				Log.printStackTrace(e);
120 119
				return null;
121 120
			} 
tmp/org.txm.ahc.rcp/src/org/txm/ahc/rcp/preferences/AHCPreferencePage.java (revision 929)
70 70
		for(int i = 0 ; i < list.length ; i++)
71 71
			metrics[i][0] = metrics[i][1] = list[i];
72 72
		
73
		ComboFieldEditor metric = new ComboFieldEditor(AHCPreferences.METRIC, AHCUIMessages.CAHPreferencePage_4, metrics, getFieldEditorParent());
73
		ComboFieldEditor metric = new ComboFieldEditor(AHCPreferences.METRIC, AHCUIMessages.common_metric, metrics, getFieldEditorParent());
74 74
		addField(metric);
75 75
		
76 76
		
tmp/org.txm.ca.rcp/src/org/txm/ca/rcp/editors/CAParametersDialog.java (revision 929)
44 44
import org.txm.ca.core.preferences.CAPreferences;
45 45
import org.txm.core.messages.TXMCoreMessages;
46 46
import org.txm.core.preferences.TXMPreferences;
47
import org.txm.lexicaltable.core.messages.LexicalTableCoreMessages;
47 48
import org.txm.lexicaltable.rcp.messages.LexicalTableUIMessages;
48 49
import org.txm.rcp.messages.TXMUIMessages;
49 50
import org.txm.searchengine.cqp.clientExceptions.CqiClientException;
......
139 140
	@Override
140 141
	protected void configureShell(Shell newShell) {
141 142
		super.configureShell(newShell);
142
		newShell.setText(LexicalTableUIMessages.LexicalTablePreferencePage_0);
143
		newShell.setText(LexicalTableCoreMessages.RESULT_TYPE);
143 144
		if (title != null)
144 145
			newShell.setText(title);
145 146
	}
tmp/org.txm.concordance.core/src/org/txm/concordance/core/messages/ConcordanceCoreMessages.java (revision 929)
17 17
	public static String RESULT_TYPE;
18 18

  
19 19
	
20
	public static String Concordance_0;
21 20
	public static String Concordance_1;
22 21
	public static String Concordance_12;
23 22
	public static String Concordance_13;
......
25 24
	public static String Concordance_15;
26 25
	public static String Concordance_16;
27 26
	public static String Concordance_17;
28
	public static String Concordance_18;
29 27
	public static String Concordance_19;
30 28
	public static String Concordance_2;
31 29
	public static String Concordance_3;
32
	public static String Concordance_4;
33
	public static String Concordance_5;
34 30
	public static String Concordance_6;
35 31
	public static String Concordance_7;
36 32
	public static String Concordance_8;
tmp/org.txm.concordance.core/src/org/txm/concordance/core/messages/messages.properties (revision 929)
1
#Generated by ResourceBundle Editor (http://essiembre.github.io/eclipse-rbe/)
1
#Generated by ResourceBundle Editor (http://essiembre.github.io/eclipse-rbe/)

2 2
#created/updated with GetStringsFromPropertiesFile.groovy
3 3
#Mon Jul 03 14:53:55 CEST 2017
4 4

  
5 5
CompositeComparator_0 = Composite: 
6 6

  
7
Concordance_0  = \ 
8 7
Concordance_1  = ** Failed to retrieve text_id property from lines
9 8
Concordance_12 = ** Failed to export Concordance: 
10 9
Concordance_13 = Reference
......
12 11
Concordance_15 = Keyword
13 12
Concordance_16 = RightContext
14 13
Concordance_17 = Reference
15
Concordance_18 = 
16 14
Concordance_19 = Context
17 15
Concordance_2  = undefined
18 16
Concordance_3  = \ results retrieved in 
19
Concordance_4  = Failed to remove QueryResult from CQP: 
20
Concordance_5  = 
21 17
Concordance_6  = Retrieving 
22 18
Concordance_7  = \ results
23 19
Concordance_8  = Failed to get texts limits: 
tmp/org.txm.concordance.core/src/org/txm/concordance/core/messages/messages_ru.properties (revision 929)
1
#Generated by ResourceBundle Editor (http://essiembre.github.io/eclipse-rbe/)
1
#Generated by ResourceBundle Editor (http://essiembre.github.io/eclipse-rbe/)

2 2
#created/updated with GetStringsFromPropertiesFile.groovy
3 3
#Mon Jul 03 14:53:55 CEST 2017
4 4

  
5 5
CompositeComparator_0 = MISSING
6 6

  
7
Concordance_0  = MISSING
8 7
Concordance_1  = MISSING
9 8
Concordance_12 = MISSING
10 9
Concordance_13 = MISSING
......
12 11
Concordance_15 = MISSING
13 12
Concordance_16 = MISSING
14 13
Concordance_17 = MISSING
15
Concordance_18 = MISSING
16 14
Concordance_19 = MISSING
17 15
Concordance_2  = MISSING
18 16
Concordance_3  = MISSING
19
Concordance_4  = MISSING
20
Concordance_5  = MISSING
21 17
Concordance_6  = MISSING
22 18
Concordance_7  = MISSING
23 19
Concordance_8  = MISSING
tmp/org.txm.concordance.core/src/org/txm/concordance/core/messages/messages_fr.properties (revision 929)
1
#Generated by ResourceBundle Editor (http://essiembre.github.io/eclipse-rbe/)
1
#Generated by ResourceBundle Editor (http://essiembre.github.io/eclipse-rbe/)

2 2
#created/updated with GetStringsFromPropertiesFile.groovy
3 3
#Mon Jul 03 14:53:55 CEST 2017
4 4

  
5 5
CompositeComparator_0 = Composé : 
6 6

  
7
Concordance_0  = \ 
8 7
Concordance_1  = ** Echec de récupération de la propriété 'text_id' des lignes 
9 8
Concordance_12 = ** Echec de l'exportation de la concordance : 
10 9
Concordance_13 = Référence
......
12 11
Concordance_15 = Pivot
13 12
Concordance_16 = ContexteDroit
14 13
Concordance_17 = Référence
15
Concordance_18 = MISSING
16 14
Concordance_19 = Contexte
17 15
Concordance_2  = indéfini
18 16
Concordance_3  = \ résultats obtenus en 
19
Concordance_4  = Echec de la suppression du QueryResult de CQP: 
20
Concordance_5  = MISSING
21 17
Concordance_6  = Récupération 
22 18
Concordance_7  = \ résultats
23 19
Concordance_8  = Echec de la récupération des limites de texte : 
tmp/org.txm.concordance.core/src/org/txm/concordance/core/functions/Concordance.java (revision 929)
175 175

  
176 176
	/**
177 177
	 * 
178
	 * @param corpus
178
	 * @param parent
179 179
	 */
180
	public Concordance(Corpus corpus)	{
181
		this(null, corpus);
180
	public Concordance(Corpus parent)	{
181
		super(parent);
182 182
	}
183 183

  
184 184
	/**
......
186 186
	 * @param uuid
187 187
	 */
188 188
	public Concordance(String uuid)	{
189
		this(uuid, null);
189
		super(uuid);
190 190
	}
191 191
	
192
	/**
193
	 * 
194
	 * @param corpus
195
	 */
196
	public Concordance(String uuid, Corpus corpus) {
197
		super(uuid, corpus);
198
		if (this.parent != null) {
199
			this.setCQLSeparator(this.getCorpus().getCQLLimitQuery());
192

  
193
	@Override
194
	public boolean loadParameters() {
195

  
196
		try {
197
			
198
			if(!this.getStringParameterValue(ConcordancePreferences.QUERY).isEmpty())	{
199
				this.setQuery(this.getStringParameterValue(ConcordancePreferences.QUERY));
200
			}
201

  
202
			if (this.parent != null) {
203
				this.setCQLSeparator(this.getCorpus().getCQLLimitQuery());
204
			}
205

  
206
			
207
//			this.pTopIndex = this.getIntParameterValue(ConcordancePreferences.TOP_INDEX);
208
//			this.pNLinesPerPage = this.getIntParameterValue(ConcordancePreferences.N_LINE_PER_PAGE);
209
//
210
//			this.pLeftContextSize = this.getIntParameterValue(ConcordancePreferences.LEFT_CONTEXT_SIZE);
211
//			this.pRightContextSize = this.getIntParameterValue(ConcordancePreferences.RIGHT_CONTEXT_SIZE);
212
//
213
//			this.pLimitCQL = this.getStringParameterValue(ConcordancePreferences.LIMITCQL);
214

  
215
			String propertyNames = this.getStringParameterValue(ConcordancePreferences.KEYWORD_VIEW_PROPERTIES);
216
			this.pViewKeywordProperties = (List<WordProperty>) WordProperty.stringToProperties(getCorpus(), propertyNames);
217
			this.availableKeywordViewProperties = new ArrayList<WordProperty>(getCorpus().getOrderedProperties());
218
			this.availableKeywordViewProperties.removeAll(pViewKeywordProperties);
219

  
220
			propertyNames = this.getStringParameterValue(ConcordancePreferences.LEFT_VIEW_PROPERTIES);
221
			this.pViewLeftProperties = (List<WordProperty>) Property.stringToProperties(getCorpus(), propertyNames);
222
			this.availableLeftViewProperties = new ArrayList<WordProperty>(getCorpus().getOrderedProperties());
223
			this.availableLeftViewProperties.removeAll(pViewLeftProperties);
224

  
225
			propertyNames = this.getStringParameterValue(ConcordancePreferences.RIGHT_VIEW_PROPERTIES);
226
			this.pViewRightProperties = (List<WordProperty>) Property.stringToProperties(getCorpus(), propertyNames);
227
			this.availableRightViewProperties = new ArrayList<WordProperty>(getCorpus().getOrderedProperties());
228
			this.availableRightViewProperties.removeAll(pViewRightProperties);
229

  
230
			propertyNames = this.getStringParameterValue(ConcordancePreferences.KEYWORD_ANALYSIS_PROPERTIES);
231
			this.pAnalysisKeywordProperties = (List<WordProperty>) Property.stringToProperties(getCorpus(), propertyNames);
232
			this.availableKeywordSortProperties = new ArrayList<WordProperty>(getCorpus().getOrderedProperties());
233
			this.availableKeywordSortProperties.removeAll(pAnalysisKeywordProperties);
234

  
235
			propertyNames = this.getStringParameterValue(ConcordancePreferences.LEFT_ANALYSIS_PROPERTIES);
236
			this.pAnalysisLeftProperties = (List<WordProperty>) Property.stringToProperties(getCorpus(), propertyNames);
237
			this.availableLeftSortProperties = new ArrayList<WordProperty>(getCorpus().getOrderedProperties());
238
			this.availableLeftSortProperties.removeAll(pAnalysisLeftProperties);
239

  
240
			propertyNames = this.getStringParameterValue(ConcordancePreferences.RIGHT_ANALYSIS_PROPERTIES);
241
			this.pAnalysisRightProperties = (List<WordProperty>) Property.stringToProperties(getCorpus(), propertyNames);
242
			this.availableRightSortProperties = new ArrayList<WordProperty>(getCorpus().getOrderedProperties());
243
			this.availableRightSortProperties.removeAll(pAnalysisRightProperties);
244

  
245
			String refPropertyNames = this.getStringParameterValue(ConcordancePreferences.VIEW_REFERENCE_PATTERN);
246
			if ("*".equals(refPropertyNames)) {
247
				Property refProperty = getCorpus().getProperty("ref");//$NON-NLS-1$
248
				if (refProperty == null) {
249
					StructuralUnitProperty sup_textid = getCorpus().getTextIdStructuralUnitProperty();
250
					this.pViewRefPattern = new ReferencePattern(sup_textid);
251
				} else {
252
					this.pViewRefPattern = new ReferencePattern(refProperty);
253
				}
254
			} else {
255
				this.pViewRefPattern = ReferencePattern.stringToReferencePattern(getCorpus(), refPropertyNames);
256
			}
257

  
258
			refPropertyNames = this.getStringParameterValue(ConcordancePreferences.ANALYSIS_REFERENCE_PATTERN);
259
			if ("*".equals(refPropertyNames)) { //$NON-NLS-1$
260
				Property refProperty = getCorpus().getProperty("ref");//$NON-NLS-1$
261
				if (refProperty == null) {
262
					StructuralUnitProperty sup_textid = getCorpus().getTextIdStructuralUnitProperty();
263
					this.pAnalysisRefPattern = new ReferencePattern(sup_textid);
264
				} else {
265
					this.pAnalysisRefPattern = new ReferencePattern(refProperty);
266
				}
267
			} else {
268
				this.pAnalysisRefPattern = ReferencePattern.stringToReferencePattern(getCorpus(), refPropertyNames);
269
			}
270
		} catch (CqiClientException e) {
271
			// TODO Auto-generated catch block
272
			e.printStackTrace();
273
			return false;
200 274
		}
275

  
276
		return true;
201 277
	}
202 278

  
203 279
	/**
......
218 294
	}
219 295
	
220 296

  
297
	
221 298
	/**
222 299
	 * Compute concordance.
223 300
	 *
......
1697 1774
	}
1698 1775

  
1699 1776

  
1700
	@Override
1701
	public boolean loadParameters() {
1702 1777

  
1703
		try {
1704
			
1705
			if(!this.getStringParameterValue(ConcordancePreferences.QUERY).isEmpty())	{
1706
				this.setQuery(this.getStringParameterValue(ConcordancePreferences.QUERY));
1707
			}
1708
			
1709
			
1710
//			this.pTopIndex = this.getIntParameterValue(ConcordancePreferences.TOP_INDEX);
1711
//			this.pNLinesPerPage = this.getIntParameterValue(ConcordancePreferences.N_LINE_PER_PAGE);
1712
//
1713
//			this.pLeftContextSize = this.getIntParameterValue(ConcordancePreferences.LEFT_CONTEXT_SIZE);
1714
//			this.pRightContextSize = this.getIntParameterValue(ConcordancePreferences.RIGHT_CONTEXT_SIZE);
1715
//
1716
//			this.pLimitCQL = this.getStringParameterValue(ConcordancePreferences.LIMITCQL);
1717

  
1718
			String propertyNames = this.getStringParameterValue(ConcordancePreferences.KEYWORD_VIEW_PROPERTIES);
1719
			this.pViewKeywordProperties = (List<WordProperty>) WordProperty.stringToProperties(getCorpus(), propertyNames);
1720
			this.availableKeywordViewProperties = new ArrayList<WordProperty>(getCorpus().getOrderedProperties());
1721
			this.availableKeywordViewProperties.removeAll(pViewKeywordProperties);
1722

  
1723
			propertyNames = this.getStringParameterValue(ConcordancePreferences.LEFT_VIEW_PROPERTIES);
1724
			this.pViewLeftProperties = (List<WordProperty>) Property.stringToProperties(getCorpus(), propertyNames);
1725
			this.availableLeftViewProperties = new ArrayList<WordProperty>(getCorpus().getOrderedProperties());
1726
			this.availableLeftViewProperties.removeAll(pViewLeftProperties);
1727

  
1728
			propertyNames = this.getStringParameterValue(ConcordancePreferences.RIGHT_VIEW_PROPERTIES);
1729
			this.pViewRightProperties = (List<WordProperty>) Property.stringToProperties(getCorpus(), propertyNames);
1730
			this.availableRightViewProperties = new ArrayList<WordProperty>(getCorpus().getOrderedProperties());
1731
			this.availableRightViewProperties.removeAll(pViewRightProperties);
1732

  
1733
			propertyNames = this.getStringParameterValue(ConcordancePreferences.KEYWORD_ANALYSIS_PROPERTIES);
1734
			this.pAnalysisKeywordProperties = (List<WordProperty>) Property.stringToProperties(getCorpus(), propertyNames);
1735
			this.availableKeywordSortProperties = new ArrayList<WordProperty>(getCorpus().getOrderedProperties());
1736
			this.availableKeywordSortProperties.removeAll(pAnalysisKeywordProperties);
1737

  
1738
			propertyNames = this.getStringParameterValue(ConcordancePreferences.LEFT_ANALYSIS_PROPERTIES);
1739
			this.pAnalysisLeftProperties = (List<WordProperty>) Property.stringToProperties(getCorpus(), propertyNames);
1740
			this.availableLeftSortProperties = new ArrayList<WordProperty>(getCorpus().getOrderedProperties());
1741
			this.availableLeftSortProperties.removeAll(pAnalysisLeftProperties);
1742

  
1743
			propertyNames = this.getStringParameterValue(ConcordancePreferences.RIGHT_ANALYSIS_PROPERTIES);
1744
			this.pAnalysisRightProperties = (List<WordProperty>) Property.stringToProperties(getCorpus(), propertyNames);
1745
			this.availableRightSortProperties = new ArrayList<WordProperty>(getCorpus().getOrderedProperties());
1746
			this.availableRightSortProperties.removeAll(pAnalysisRightProperties);
1747

  
1748
			String refPropertyNames = this.getStringParameterValue(ConcordancePreferences.VIEW_REFERENCE_PATTERN);
1749
			if ("*".equals(refPropertyNames)) {
1750
				Property refProperty = getCorpus().getProperty("ref");
1751
				if (refProperty == null) {
1752
					StructuralUnitProperty sup_textid = getCorpus().getTextIdStructuralUnitProperty();
1753
					this.pViewRefPattern = new ReferencePattern(sup_textid);
1754
				} else {
1755
					this.pViewRefPattern = new ReferencePattern(refProperty);
1756
				}
1757
			} else {
1758
				this.pViewRefPattern = ReferencePattern.stringToReferencePattern(getCorpus(), refPropertyNames);
1759
			}
1760

  
1761
			refPropertyNames = this.getStringParameterValue(ConcordancePreferences.ANALYSIS_REFERENCE_PATTERN);
1762
			if ("*".equals(refPropertyNames)) {
1763
				Property refProperty = getCorpus().getProperty("ref");
1764
				if (refProperty == null) {
1765
					StructuralUnitProperty sup_textid = getCorpus().getTextIdStructuralUnitProperty();
1766
					this.pAnalysisRefPattern = new ReferencePattern(sup_textid);
1767
				} else {
1768
					this.pAnalysisRefPattern = new ReferencePattern(refProperty);
1769
				}
1770
			} else {
1771
				this.pAnalysisRefPattern = ReferencePattern.stringToReferencePattern(getCorpus(), refPropertyNames);
1772
			}
1773
		} catch (CqiClientException e) {
1774
			// TODO Auto-generated catch block
1775
			e.printStackTrace();
1776
			return false;
1777
		}
1778

  
1779
		return true;
1780
	}
1781

  
1782 1778
	@Override
1783 1779
	public String getResultype() {
1784 1780
		return ConcordanceCoreMessages.RESULT_TYPE;

Also available in: Unified diff