Révision 596

tmp/org.txm.core/src/java/org/txm/core/preferences/TXMPreferences.java (revision 596)
1081 1081
				e.printStackTrace();
1082 1082
			}
1083 1083
		}
1084
		// FIXME: to do
1085
		// FIXME: need to prove/validate this methode
1086
		else if (byte.class.isAssignableFrom(value.getClass().getComponentType()))	{
1087
			System.err.println("TXMPreferences.put(): byte array -> need to prove/validate this method.");
1088
			scope.getNode(nodeQualifier).putByteArray(key, (byte[]) value);
1089
		}
1084
//		// FIXME: to do, MD: not for now
1085
//		// FIXME: need to prove/validate this method
1086
//		else if (byte.class.isAssignableFrom(value.getClass().getComponentType()))	{
1087
//			System.err.println("TXMPreferences.put(): byte array -> need to prove/validate this method.");
1088
//			scope.getNode(nodeQualifier).putByteArray(key, (byte[]) value);
1089
//		}
1090 1090
		else {
1091 1091
		// FIXME: to do if needed
1092 1092
			//FIXME: Debug
tmp/org.txm.core/src/java/org/txm/core/results/TXMResult.java (revision 596)
607 607
	 */
608 608
	protected boolean loadGenericParameters(int parameterType) throws Exception {
609 609
		
610
		// FIXME: debug
611
		System.err.println("TXMResult.loadGenericParameters(): loading generic parameters into fields for " + this.getClass() + " and parameters type = " + parameterType);
610
//		// FIXME: debug
611
//		System.err.println("TXMResult.loadGenericParameters(): loading generic parameters into fields for " + this.getClass() + " and parameters type = " + parameterType);
612 612
		
613 613
		List<Field> fields = this.getAllFields();
614 614

  
tmp/org.txm.concordance.core/src/org/txm/concordance/core/functions/Concordance.java (revision 596)
1562 1562

  
1563 1563
		this.saveParameter(ConcordancePreferences.LIMITCQL, this.pLimitCQL);
1564 1564

  
1565
		this.saveParameter(ConcordancePreferences.KEYWORD_VIEW_PROPERTIES, this.pViewKeywordProperties);
1565
		this.saveParameter(ConcordancePreferences.KEYWORD_VIEW_PROPERTIES, WordProperty.fromListToPreferenceString(this.pViewKeywordProperties));
1566 1566

  
1567
		this.saveParameter(ConcordancePreferences.LEFT_VIEW_PROPERTIES, this.pViewLeftProperties);
1567
		this.saveParameter(ConcordancePreferences.LEFT_VIEW_PROPERTIES, WordProperty.fromListToPreferenceString(this.pViewLeftProperties));
1568 1568

  
1569
		this.saveParameter(ConcordancePreferences.RIGHT_VIEW_PROPERTIES, this.pViewRightProperties);
1569
		this.saveParameter(ConcordancePreferences.RIGHT_VIEW_PROPERTIES, WordProperty.fromListToPreferenceString(this.pViewRightProperties));
1570 1570

  
1571
		this.saveParameter(ConcordancePreferences.KEYWORD_ANALYSIS_PROPERTIES, this.pAnalysisKeywordProperties);
1571
		this.saveParameter(ConcordancePreferences.KEYWORD_ANALYSIS_PROPERTIES, WordProperty.fromListToPreferenceString(this.pAnalysisKeywordProperties));
1572 1572

  
1573
		this.saveParameter(ConcordancePreferences.LEFT_ANALYSIS_PROPERTIES, this.pAnalysisLeftProperties);
1573
		this.saveParameter(ConcordancePreferences.LEFT_ANALYSIS_PROPERTIES, WordProperty.fromListToPreferenceString(this.pAnalysisLeftProperties));
1574 1574

  
1575
		this.saveParameter(ConcordancePreferences.RIGHT_ANALYSIS_PROPERTIES, this.pAnalysisRightProperties);
1575
		this.saveParameter(ConcordancePreferences.RIGHT_ANALYSIS_PROPERTIES, WordProperty.fromListToPreferenceString(this.pAnalysisRightProperties));
1576 1576

  
1577
		this.saveParameter(ConcordancePreferences.VIEW_REFERENCEPATTERN, this.pViewRefPattern);
1577
		this.saveParameter(ConcordancePreferences.VIEW_REFERENCEPATTERN, ReferencePattern.referenceToString(this.pViewRefPattern));
1578 1578

  
1579
		this.saveParameter(ConcordancePreferences.ANALYSIS_REFERENCEPATTERN, pAnalysisRefPattern);
1579
		this.saveParameter(ConcordancePreferences.ANALYSIS_REFERENCEPATTERN, ReferencePattern.referenceToString(pAnalysisRefPattern));
1580 1580

  
1581 1581
		return true;
1582 1582
	}
tmp/org.txm.searchengine.cqp.rcp/src/org/txm/searchengine/cqp/rcp/command/ComputeDiagnostic.java (revision 596)
38 38
import org.txm.functions.diagnostic.Diagnostic;
39 39
import org.txm.rcp.RCPMessages;
40 40
import org.txm.rcp.TXMWindows;
41
import org.txm.rcp.editors.TXMEditorPart;
41 42
import org.txm.rcp.editors.TXMResultEditorInput;
42 43
import org.txm.rcp.views.corpora.CorporaView;
43 44
import org.txm.searchengine.cqp.CQPEngine;
......
91 92
			System.out.println("Selection not managed: "+s);
92 93
		}
93 94
		try {
94
			return open(diag);
95
			open(diag);
95 96
		} catch (PartInitException e) {
96 97
			System.out.println("Error while opening editor: "+e.getLocalizedMessage());
97 98
			Log.printStackTrace(e);
......
99 100
		return null;
100 101
	}
101 102
	
102
	public static Object open(Diagnostic diag) throws PartInitException {
103
		IWorkbenchPage page = TXMWindows.getActiveWindow().getActivePage();
104
		return page.openEditor(new TXMResultEditorInput(diag), DiagnosticEditor.class.getName());
103
	public static void open(Diagnostic diag) throws PartInitException {
104
		TXMEditorPart.openEditor(diag, DiagnosticEditor.class.getName());
105 105
	}
106 106
}
tmp/org.txm.searchengine.cqp.core/src/org/txm/searchengine/cqp/ReferencePattern.java (revision 596)
31 31
import java.util.Iterator;
32 32
import java.util.List;
33 33

  
34
import org.apache.commons.lang.StringUtils;
34 35
import org.txm.core.messages.TXMCoreMessages;
35 36
import org.txm.searchengine.cqp.corpus.Corpus;
36 37
import org.txm.searchengine.cqp.corpus.Property;
......
174 175
		else if (this.properties.size() == 0) return "none";
175 176
		
176 177
		String title = ""; //$NON-NLS-1$
177
		for(Property p : this.properties)
178
		for (Property p : this.properties) {
178 179
			if (p instanceof StructuralUnitProperty)
179 180
			{
180 181
				StructuralUnitProperty sp = (StructuralUnitProperty)p;
......
182 183
			}
183 184
			else
184 185
				title += p.getName()+", "; //$NON-NLS-1$
186
		}
185 187
		if (title.length() == 0)
186 188
			title = TXMCoreMessages.ReferencePattern_3;
187 189
		else
188 190
			title = title.substring(0, title.length()-2);
189 191
		return title;
190 192
	}
193

  
194
	public static String referenceToString(ReferencePattern pViewRefPattern) {
195
		ArrayList<String> names = new ArrayList<String>();
196
		for (Property p : pViewRefPattern.getProperties()) {
197
			names.add(p.getFullName());
198
		}
199
		return StringUtils.join(names, "\t"); //$NON-NLS-1$
200
	}
191 201
}
tmp/org.txm.specificities.core/src/org/txm/specificities/core/preferences/SpecificitiesPreferences.java (revision 596)
38 38
		Preferences preferences = DefaultScope.INSTANCE.getNode(PREFERENCES_NODE);
39 39
		
40 40
		preferences.put(FORMAT, "%,.1f");
41
		preferences.putInt(MAX_SCORE, 1);
41
		preferences.putInt(MAX_SCORE, 10000);
42 42
		
43 43
		preferences.putBoolean(CHART_TRANSPOSE, false);
44 44
		preferences.putBoolean(CHART_DRAW_BARS, true);

Formats disponibles : Unified diff