Révision 1066

tmp/org.txm.statsengine.r.rcp/src/org/txm/rcp/commands/R/OpenEmptyEditor.java (revision 1066)
69 69
			return null;
70 70
		}
71 71
		
72
		int nosession = TXMPreferences.getInt(RCPPreferences.NO_SESSION, RCPPreferences.PREFERENCES_NODE);
72
		int nosession = RCPPreferences.getInstance().getInt(RCPPreferences.NO_SESSION);
73 73
		
74 74
		File temp = new File(Rscripts, "session"+nosession+".R"); //$NON-NLS-1$ //$NON-NLS-2$
75 75
		
76 76
		//create newt session no
77 77
		nosession++;
78
		TXMPreferences.put(RCPPreferences.PREFERENCES_NODE, RCPPreferences.NO_SESSION, nosession);
78
		RCPPreferences.getInstance().put(RCPPreferences.NO_SESSION, nosession);
79 79
		
80 80
		try {
81 81
			temp.createNewFile();
tmp/org.txm.statsengine.r.rcp/src/org/txm/statsengine/r/rcp/preferences/RPreferencePage.java (revision 1066)
86 86
	
87 87
	@Override
88 88
	public void init(IWorkbench workbench) {
89
		this.setPreferenceStore(new TXMPreferenceStore(RPreferences.PREFERENCES_NODE));
89
		this.setPreferenceStore(new TXMPreferenceStore(RPreferences.getInstance().getPreferencesNodeQualifier()));
90 90
		//this.setTitle(RUIMessages.RPreferencePage_0);
91 91
		//FIXME todo if needed
92 92
		//setDescription(Messages.RPreferencePage_1);
......
140 140
//		addField(r_svg_device);
141 141

  
142 142
		
143
		changeFieldStates(TXMPreferences.getBoolean(RPreferences.REMOTE, RPreferences.PREFERENCES_NODE));
143
		changeFieldStates(RPreferences.getInstance().getBoolean(RPreferences.REMOTE));
144 144
		
145 145
		
146 146
		addField(new BooleanFieldEditor(RPreferences.SHOW_EVAL_LOGS, "Log the R eval command lines", getFieldEditorParent()));
......
197 197
			
198 198
			RWorkspace rw = RWorkspace.getRWorkspaceInstance();
199 199
			if (rw != null)	{
200
				RWorkspace.setUseFileCommunication(TXMPreferences.getBoolean(RPreferences.FILE_TRANSFERT, RPreferences.PREFERENCES_NODE));
200
				RWorkspace.setUseFileCommunication(RPreferences.getInstance().getBoolean(RPreferences.FILE_TRANSFERT));
201 201
			}
202 202
		} catch (Exception e) {
203 203
			System.err.println(TXMUIMessages.FAILED_TO_SAVE_PREFERENCES + e);
tmp/org.txm.dictionary.rcp/src/org/txm/dictionary/commands/DoInstallStep.java (revision 1066)
29 29
		
30 30
		Log.info("Dictionary.DoInstallStep.install()");
31 31
		
32
		String saved = TXMPreferences.getString(DictionaryPreferences.VERSION, DictionaryPreferences.PREFERENCES_NODE);
32
		String saved = DictionaryPreferences.getInstance().getString(DictionaryPreferences.VERSION);
33 33
		Version currentVersion = BundleUtils.getBundleVersion("Dictionary");
34 34
		
35 35
		if (saved != null && saved.length() > 0) {
......
49 49
		}
50 50
		
51 51
		Log.warning("Dictionary post-installation done.");
52
		TXMPreferences.put(DictionaryPreferences.PREFERENCES_NODE, DictionaryPreferences.VERSION, currentVersion.toString());
52
		DictionaryPreferences.getInstance().put(DictionaryPreferences.VERSION, currentVersion.toString());
53 53
		return;
54 54
	}
55 55
	
tmp/org.txm.dictionary.rcp/src/org/txm/dictionary/preferences/DictionaryPreferences.java (revision 1066)
7 7

  
8 8
public class DictionaryPreferences extends TXMPreferences {
9 9

  
10
	public static final String PREFERENCES_NODE = FrameworkUtil.getBundle(DictionaryPreferences.class).getSymbolicName();
10
//	public static final String PREFERENCES_NODE = FrameworkUtil.getBundle(DictionaryPreferences.class).getSymbolicName();
11
	
11 12
	public static final String VERSION = "dictionary.version"; //$NON-NLS-1$
12 13
	
13 14
	@Override
14 15
	public void initializeDefaultPreferences() {
15
		Preferences preferences = DefaultScope.INSTANCE.getNode(PREFERENCES_NODE);
16
		Preferences preferences = DefaultScope.INSTANCE.getNode(getPreferencesNodeQualifier());
16 17
		preferences.put(VERSION, "");
17 18
	}
19
	
20
	/**
21
	 * Gets the instance.
22
	 * @return the instance
23
	 */
24
	public static TXMPreferences getInstance()	{
25
		if (!TXMPreferences.instances.containsKey(DictionaryPreferences.class)) {
26
			new DictionaryPreferences();
27
		}
28
		return TXMPreferences.instances.get(DictionaryPreferences.class);
29
	}
18 30
}
tmp/org.txm.treetagger.core/src/org/txm/importer/xmltxm/BuildTTSrc.groovy (revision 1066)
171 171
			}
172 172

  
173 173
			String str = buffer.toString()
174
			if ("false".equals(TreeTaggerPreferences.getString(TreeTaggerPreferences.FIX_APOSTROPHES, TreeTaggerPreferences.PREFERENCES_NODE))) {
174
			if ("false".equals(TreeTaggerPreferences.getInstance().getString(TreeTaggerPreferences.FIX_APOSTROPHES))) {
175 175
				str = str.replace("’", "'").replace("‘", "'");
176 176
			}
177 177
			output.write(str)
tmp/org.txm.treetagger.core/src/org/txm/importer/xmltxm/Annotate.groovy (revision 1066)
109 109
	File modelsDirectory;
110 110

  
111 111
	public Annotate() {
112
		modelsDirectory = new File(TreeTaggerPreferences.getString(TreeTaggerPreferences.MODELS_PATH, TreeTaggerPreferences.PREFERENCES_NODE)); // default models directory is set in the Toolbox
112
		modelsDirectory = new File(TreeTaggerPreferences.getInstance().getString(TreeTaggerPreferences.MODELS_PATH)); // default models directory is set in the Toolbox
113 113
	}
114 114

  
115 115
	/**
......
209 209
			File infile = ttsrcfile;
210 210
			File outfile = ttoutfile;
211 211

  
212
			def tt = new TreeTagger(TreeTaggerPreferences.getString(TreeTaggerPreferences.INSTALL_PATH, TreeTaggerPreferences.PREFERENCES_NODE)+"/bin/", options);
212
			def tt = new TreeTagger(TreeTaggerPreferences.getInstance().getString(TreeTaggerPreferences.INSTALL_PATH)+"/bin/", options);
213 213
			tt.settoken();
214 214
			tt.setlemma();
215 215
			tt.setsgml();
216
			if (TreeTaggerPreferences.getBoolean(TreeTaggerPreferences.OPTIONS_UNKNOWN, TreeTaggerPreferences.PREFERENCES_NODE)) {
216
			if (TreeTaggerPreferences.getInstance().getBoolean(TreeTaggerPreferences.OPTIONS_UNKNOWN)) {
217 217
				tt.setnounknown();
218 218
			}
219 219
			tt.seteostag("<s>");
220
			if (TreeTaggerPreferences.getBoolean(TreeTaggerPreferences.OPTIONS_DEBUG, TreeTaggerPreferences.PREFERENCES_NODE)) {
220
			if (TreeTaggerPreferences.getInstance().getBoolean(TreeTaggerPreferences.OPTIONS_DEBUG)) {
221 221
				tt.debug(true);
222 222
			} else {
223 223
				tt.setquiet();
224 224
			}
225
			if (TreeTaggerPreferences.getBoolean(TreeTaggerPreferences.OPTIONS_CAPHEURISTIC, TreeTaggerPreferences.PREFERENCES_NODE)) {
225
			if (TreeTaggerPreferences.getInstance().getBoolean(TreeTaggerPreferences.OPTIONS_CAPHEURISTIC)) {
226 226
				tt.setcapheuristics();
227 227
			}
228
			if (TreeTaggerPreferences.getBoolean(TreeTaggerPreferences.OPTIONS_HYPHENHEURISTIC, TreeTaggerPreferences.PREFERENCES_NODE)) {
228
			if (TreeTaggerPreferences.getInstance().getBoolean(TreeTaggerPreferences.OPTIONS_HYPHENHEURISTIC)) {
229 229
				tt.sethyphenheuristics();
230 230
			}
231
			if (TreeTaggerPreferences.getBoolean(TreeTaggerPreferences.OPTIONS_PROB, TreeTaggerPreferences.PREFERENCES_NODE)) {
231
			if (TreeTaggerPreferences.getInstance().getBoolean(TreeTaggerPreferences.OPTIONS_PROB)) {
232 232
				tt.setprob();
233 233
			}
234 234
			
235
			String lex = TreeTaggerPreferences.getString(TreeTaggerPreferences.OPTIONS_LEX, TreeTaggerPreferences.PREFERENCES_NODE);
235
			String lex = TreeTaggerPreferences.getInstance().getString(TreeTaggerPreferences.OPTIONS_LEX);
236 236
			if (lex !=null && lex.length() > 0) {
237 237
				tt.setlex(lex);
238 238
			}
239
			String wc = TreeTaggerPreferences.getString(TreeTaggerPreferences.OPTIONS_WC, TreeTaggerPreferences.PREFERENCES_NODE);
239
			String wc = TreeTaggerPreferences.getInstance().getString(TreeTaggerPreferences.OPTIONS_WC);
240 240
			if (wc !=null && wc.length() > 0) {
241 241
				tt.setwc(wc);
242 242
			}
......
283 283
		if (debug) {
284 284
			println "rootDirFile "+binDir
285 285
			println "txmDir "+txmDir
286
			println "TREETAGGER INSTALL PATH : "+TreeTaggerPreferences.getString(TreeTaggerPreferences.INSTALL_PATH, TreeTaggerPreferences.PREFERENCES_NODE);
287
			println "TREETAGGER MODELS PATH : "+TreeTaggerPreferences.getString(TreeTaggerPreferences.MODELS_PATH, TreeTaggerPreferences.PREFERENCES_NODE)
286
			println "TREETAGGER INSTALL PATH : "+TreeTaggerPreferences.getInstance().getString(TreeTaggerPreferences.INSTALL_PATH);
287
			println "TREETAGGER MODELS PATH : "+TreeTaggerPreferences.getInstance().getString(TreeTaggerPreferences.MODELS_PATH)
288 288
		}
289 289

  
290 290
		//test if the Toolbox know TreeTagger
291
		if (!new File(TreeTaggerPreferences.getString(TreeTaggerPreferences.INSTALL_PATH, TreeTaggerPreferences.PREFERENCES_NODE)+"/bin/").exists()) {
292
			println("Could not find TreeTagger binaries in "+TreeTaggerPreferences.getString(TreeTaggerPreferences.INSTALL_PATH, TreeTaggerPreferences.PREFERENCES_NODE)+"/bin/")
291
		if (!new File(TreeTaggerPreferences.getInstance().getString(TreeTaggerPreferences.INSTALL_PATH)+"/bin/").exists()) {
292
			println("Could not find TreeTagger binaries in "+TreeTaggerPreferences.getInstance().getString(TreeTaggerPreferences.INSTALL_PATH)+"/bin/")
293 293
			return false;
294 294
		}
295 295
		String langAll = null
......
325 325

  
326 326
		if (cancelNow) return;
327 327

  
328
		File modelDirectory = new File(TreeTaggerPreferences.getString(TreeTaggerPreferences.MODELS_PATH, TreeTaggerPreferences.PREFERENCES_NODE));
328
		File modelDirectory = new File(TreeTaggerPreferences.getInstance().getString(TreeTaggerPreferences.MODELS_PATH));
329 329
		if (!modelDirectory.exists()) {
330 330
			println "Skipping ANNOTATE: TreeTagger language model file directory not found: "+modelDirectory.getAbsolutePath();
331 331
			return false;
......
475 475
	 */
476 476
	public boolean run(File binDir, File txmDir, HashMap<String, String> langs, boolean replace, String[] properties, String[] options)
477 477
	{
478
		if (!new File(TreeTaggerPreferences.getString(TreeTaggerPreferences.INSTALL_PATH, TreeTaggerPreferences.PREFERENCES_NODE)+"/bin/").exists()) {
479
			println("Path to TreeTagger is wrong "+TreeTaggerPreferences.getString(TreeTaggerPreferences.INSTALL_PATH, TreeTaggerPreferences.PREFERENCES_NODE)+"/bin/")
478
		if (!new File(TreeTaggerPreferences.getInstance().getString(TreeTaggerPreferences.INSTALL_PATH)+"/bin/").exists()) {
479
			println("Path to TreeTagger is wrong "+TreeTaggerPreferences.getInstance().getString(TreeTaggerPreferences.INSTALL_PATH)+"/bin/")
480 480
			return true;
481 481
		}
482 482

  
tmp/org.txm.treetagger.core/src/org/txm/treetagger/core/preferences/TreeTaggerPreferences.java (revision 1066)
51 51
	public static final String OPTIONS_CAPHEURISTIC = "cap_heuristic"; //$NON-NLS-1$
52 52
	public static final String OPTIONS_HYPHENHEURISTIC = "hyphen_heuristic"; //$NON-NLS-1$
53 53
	public static final String OPTIONS_PROB = "prob"; //$NON-NLS-1$
54
	public static final String OPTIONS_CL = "cl";
55
	public static final String OPTIONS_DTG = "dtg";
56
	public static final String OPTIONS_SW = "sw";
57
	public static final String OPTIONS_ATG = "atg";
58
	public static final String OPTIONS_ECW = "ecw";
59
	public static final String OPTIONS_LT = "lt";
54 60
	
55 61
	public static final String FIX_APOSTROPHES = "fix_apostrophes"; //$NON-NLS-1$
62
	
56 63

  
57 64
	
58 65
	/**
tmp/org.txm.properties.core/src/org/txm/properties/core/preferences/PropertiesPreferences.java (revision 1066)
2 2

  
3 3

  
4 4
import org.eclipse.core.runtime.preferences.DefaultScope;
5
import org.osgi.framework.FrameworkUtil;
6 5
import org.osgi.service.prefs.Preferences;
7 6
import org.txm.core.preferences.TXMPreferences;
8 7

  
......
13 12
 */
14 13
public class PropertiesPreferences extends TXMPreferences {
15 14

  
16
	// auto populate the preference node qualifier from the current bundle id
17
	public static final String PREFERENCES_NODE = FrameworkUtil.getBundle(PropertiesPreferences.class).getSymbolicName();
18
	
19 15
	public static final String PREFERENCES_PREFIX = "properties_"; //$NON-NLS-1$
20 16
	
21 17
	
......
27 23
	
28 24
	@Override
29 25
	public void initializeDefaultPreferences() {
30
		Preferences preferences = DefaultScope.INSTANCE.getNode(PREFERENCES_NODE);
26
		Preferences preferences = DefaultScope.INSTANCE.getNode(getPreferencesNodeQualifier());
31 27
		
32 28
		preferences.putInt(MAX_PROPERTIES_TO_DISPLAY, 100);
33 29
		
34 30
	}
35 31
	
32
	/**
33
	 * Gets the instance.
34
	 * @return the instance
35
	 */
36
	public static TXMPreferences getInstance()	{
37
		if (!TXMPreferences.instances.containsKey(PropertiesPreferences.class)) {
38
			new PropertiesPreferences();
39
		}
40
		return TXMPreferences.instances.get(PropertiesPreferences.class);
41
	}
36 42
}
tmp/org.txm.imports.metopes/src/org/txm/imports/metopes/DoInstallStep.java (revision 1066)
28 28
	public void install() { // after the Toolbox is initialized
29 29
		
30 30
		Log.info("Metopes.DoInstallStep.install()");
31
		String saved = TXMPreferences.getString(MetopesPreferences.VERSION, MetopesPreferences.PREFERENCES_NODE);
31
		String saved = MetopesPreferences.getInstance().getString(MetopesPreferences.VERSION);
32 32
		Version currentVersion = BundleUtils.getBundleVersion("org.txm.imports.metopes");
33 33
		
34 34
		if (saved != null && saved.length() > 0) {
......
63 63
		}
64 64
		
65 65
		Log.warning("Metopes post-installation done.");
66
		TXMPreferences.put(MetopesPreferences.PREFERENCES_NODE, MetopesPreferences.VERSION, currentVersion.toString());
66
		MetopesPreferences.getInstance().put(MetopesPreferences.VERSION, currentVersion.toString());
67 67
		return;
68 68
	}
69 69
}
tmp/org.txm.imports.metopes/src/org/txm/importer/metopes/preferences/MetopesPreferences.java (revision 1066)
1 1
package org.txm.importer.metopes.preferences;
2 2

  
3 3
import org.eclipse.core.runtime.preferences.DefaultScope;
4
import org.osgi.framework.FrameworkUtil;
5 4
import org.osgi.service.prefs.Preferences;
6 5
import org.txm.core.preferences.TXMPreferences;
7 6

  
8 7
public class MetopesPreferences extends TXMPreferences{
9 8

  
10
	public static final String PREFERENCES_NODE = FrameworkUtil.getBundle(MetopesPreferences.class).getSymbolicName();
11 9
	public static final String VERSION = "metopes.version"; //$NON-NLS-1$
12 10
	
13 11
	@Override
14 12
	public void initializeDefaultPreferences() {
15
		Preferences preferences = DefaultScope.INSTANCE.getNode(PREFERENCES_NODE);
13
		Preferences preferences = DefaultScope.INSTANCE.getNode(getPreferencesNodeQualifier());
16 14
		preferences.put(VERSION, "");
17 15
	}
16
	
17
	/**
18
	 * Gets the instance.
19
	 * @return the instance
20
	 */
21
	public static TXMPreferences getInstance()	{
22
		if (!TXMPreferences.instances.containsKey(MetopesPreferences.class)) {
23
			new MetopesPreferences();
24
		}
25
		return TXMPreferences.instances.get(MetopesPreferences.class);
26
	}
18 27
}
tmp/org.txm.chartsengine.jfreechart.rcp/src/org/txm/chartsengine/jfreechart/rcp/preferences/JFCChartsEnginePreferencePage.java (revision 1066)
98 98

  
99 99
				//FIXME: old code
100 100
//				// Set the first charts engine supported export file format as default charts export file format
101
//				TXMPreferences.putString(ChartsEnginePreferences.PREFERENCES_NODE, ChartsEnginePreferences.RDEVICE, ChartsEngine.getCurrent().getSupportedOutputFileFormats().get(0));
101
//				ChartsEnginePreferences.getInstance().put(ChartsEnginePreferences.RDEVICE, ChartsEngine.getCurrent().getSupportedOutputFileFormats().get(0));
102 102
//					
103 103
//				// Refresh the User\Export preference page to update "Default charts export file format" combo box
104 104
//				PlatformUI.getWorkbench().getPreferenceManager().
tmp/org.txm.libs.cqp/src/org/txm/libs/cqp/CQPLibPreferences.java (revision 1066)
13 13

  
14 14
public class CQPLibPreferences extends TXMPreferences {
15 15
	
16
	public static String PREFERENCES_NODE = FrameworkUtil.getBundle(CQPLibPreferences.class).getSymbolicName();
16
//	public static String PREFERENCES_NODE = FrameworkUtil.getBundle(CQPLibPreferences.class).getSymbolicName();
17 17
	
18 18
	/** The Constant CQI_SERVER_PATH_TO_EXECUTABLE. */
19 19
	public static final String VERSION = "version"; //$NON-NLS-1$
......
56 56
	public void initializeDefaultPreferences() {
57 57
		
58 58
		
59
		Preferences preferences = DefaultScope.INSTANCE.getNode(PREFERENCES_NODE);
59
		Preferences preferences = DefaultScope.INSTANCE.getNode(getPreferencesNodeQualifier());
60 60

  
61 61
		preferences.put(CQI_SERVER_ADDITIONAL_OPTIONS, "-b 1000000 -d OFF"); //$NON-NLS-1$
62 62
		preferences.put(CQI_SERVER_PORT, "4877"); //$NON-NLS-1$
......
69 69
		String CQPFRAGMENT = "org.txm.libs.cqp."+System.getProperty("osgi.os");
70 70
		//TODO: fix preferneces logic between org.txm.cqp.lib et org.txm.searchengine.cqp
71 71
		Log.info("CQP.DoInstallStep.preInstall()");
72
		String saved = TXMPreferences.getString(CQPLibPreferences.VERSION, CQPLibPreferences.PREFERENCES_NODE);
72
		String saved = getString(CQPLibPreferences.VERSION);
73 73
		Version currentVersion = BundleUtils.getBundleVersion(CQPFRAGMENT); // the CQPFRAGMENT plugin contains the right version
74 74
		
75 75
		
......
148 148
		Log.info("Updating CWB preferences for CQP version=" + currentVersion);
149 149
	
150 150
		Log.warning("SearchEngine preferences set with: "+OSDir.getAbsolutePath()+ ", "+initFile.getAbsolutePath()+ " and "+execFile.getAbsolutePath());
151
		TXMPreferences.put(CQPLibPreferences.PREFERENCES_NODE, CQPLibPreferences.VERSION, currentVersion.toString());
151
		put(CQPLibPreferences.VERSION, currentVersion.toString());
152 152
	
153
		TXMPreferences.put(CQPLibPreferences.PREFERENCES_NODE, CQI_SERVER_PATH_TO_CQPLIB, OSDir.getAbsolutePath());
154
		TXMPreferences.put(CQPLibPreferences.PREFERENCES_NODE, CQI_SERVER_PATH_TO_INIT_FILE, initFile.getAbsolutePath());
155
		TXMPreferences.put(CQPLibPreferences.PREFERENCES_NODE, CQI_SERVER_PATH_TO_EXECUTABLE, execFile.getAbsolutePath());
156
		TXMPreferences.put(CQPLibPreferences.PREFERENCES_NODE, CQI_SERVER_ADDITIONAL_OPTIONS, "-b 1000000 -d OFF"); //$NON-NLS-1$
157
		TXMPreferences.put(CQPLibPreferences.PREFERENCES_NODE, CQI_SERVER_PORT, "4877"); //$NON-NLS-1$
158
		TXMPreferences.put(CQPLibPreferences.PREFERENCES_NODE, CQI_SERVER_HOST, "localhost"); //$NON-NLS-1$
159
		TXMPreferences.put(CQPLibPreferences.PREFERENCES_NODE, CQI_SERVER_LOGIN, "anonymous"); //$NON-NLS-1$
160
		TXMPreferences.put(CQPLibPreferences.PREFERENCES_NODE, CQI_SERVER_PASSWORD, ""); //$NON-NLS-1$
161
		TXMPreferences.put(CQPLibPreferences.PREFERENCES_NODE, CQI_SERVER_IS_REMOTE, "" + false); //$NON-NLS-1$
162
		TXMPreferences.put(CQPLibPreferences.PREFERENCES_NODE, CQI_NETWORK_MODE, false); //$NON-NLS-1$
153
		put(CQI_SERVER_PATH_TO_CQPLIB, OSDir.getAbsolutePath());
154
		put(CQI_SERVER_PATH_TO_INIT_FILE, initFile.getAbsolutePath());
155
		put(CQI_SERVER_PATH_TO_EXECUTABLE, execFile.getAbsolutePath());
156
		put(CQI_SERVER_ADDITIONAL_OPTIONS, "-b 1000000 -d OFF"); //$NON-NLS-1$
157
		put(CQI_SERVER_PORT, "4877"); //$NON-NLS-1$
158
		put(CQI_SERVER_HOST, "localhost"); //$NON-NLS-1$
159
		put(CQI_SERVER_LOGIN, "anonymous"); //$NON-NLS-1$
160
		put(CQI_SERVER_PASSWORD, ""); //$NON-NLS-1$
161
		put(CQI_SERVER_IS_REMOTE, "" + false); //$NON-NLS-1$
162
		put(CQI_NETWORK_MODE, false); //$NON-NLS-1$
163 163
	}
164
	
165
	/**
166
	 * Gets the instance.
167
	 * @return the instance
168
	 */
169
	public static TXMPreferences getInstance()	{
170
		if (!TXMPreferences.instances.containsKey(CQPLibPreferences.class)) {
171
			new CQPLibPreferences();
172
		}
173
		return TXMPreferences.instances.get(CQPLibPreferences.class);
174
	}
164 175
}
tmp/org.txm.libs.cqp/src/org/txm/libs/cqp/___DoInstallStep.java (revision 1066)
21 21
//		String CQPFRAGMENT = "org.txm.libs.cqp."+System.getProperty("osgi.os");
22 22
//		//TODO: fix preferneces logic between org.txm.cqp.lib et org.txm.searchengine.cqp
23 23
//		Log.info("CQP.DoInstallStep.preInstall()");
24
//		String saved = TXMPreferences.getString(CQPLibPreferences.VERSION, CQPLibPreferences.PREFERENCES_NODE);
24
//		String saved = CQPLibPreferences.getInstance().getString(CQPLibPreferences.VERSION);
25 25
//		Version currentVersion = BundleUtils.getBundleVersion(CQPFRAGMENT); // the CQPFRAGMENT plugin contains the right version
26 26
//		
27 27
//		if (saved != null && saved.length() > 0) {
......
71 71
//		
72 72
//		File execFile = new File(OSDir, "cqpserver"+ext);
73 73
//
74
//		TXMPreferences.put(CQPLibPreferences.PREFERENCES_NODE, CQPLibPreferences.CQI_SERVER_PATH_TO_CQPLIB, OSDir.getAbsolutePath());
75
//		TXMPreferences.put(CQPLibPreferences.PREFERENCES_NODE, CQPLibPreferences.CQI_SERVER_PATH_TO_INIT_FILE, initFile.getAbsolutePath());
76
//		TXMPreferences.put(CQPLibPreferences.PREFERENCES_NODE, CQPLibPreferences.CQI_SERVER_PATH_TO_EXECUTABLE, execFile.getAbsolutePath());
74
//		CQPLibPreferences.getInstance().put(CQPLibPreferences.CQI_SERVER_PATH_TO_CQPLIB, OSDir.getAbsolutePath());
75
//		CQPLibPreferences.getInstance().put(CQPLibPreferences.CQI_SERVER_PATH_TO_INIT_FILE, initFile.getAbsolutePath());
76
//		CQPLibPreferences.getInstance().put(CQPLibPreferences.CQI_SERVER_PATH_TO_EXECUTABLE, execFile.getAbsolutePath());
77 77
//		if (!Util.isWindows()) { 
78 78
//			try {
79 79
//				Log.info("Setting execution file rights to: "+OSDir.getAbsolutePath());
......
96 96
//		}
97 97
//		
98 98
//		Log.warning("SearchEngine preferences set with: "+OSDir.getAbsolutePath()+ ", "+initFile.getAbsolutePath()+ " and "+execFile.getAbsolutePath());
99
//		TXMPreferences.put(CQPLibPreferences.PREFERENCES_NODE, CQPLibPreferences.VERSION, currentVersion.toString());
99
//		CQPLibPreferences.getInstance().put(CQPLibPreferences.VERSION, currentVersion.toString());
100 100
	}
101 101
}
tmp/org.txm.properties.rcp/src/org/txm/properties/rcp/preferences/PropertiesPreferencePage.java (revision 1066)
48 48
		
49 49
	@Override
50 50
	public void init(IWorkbench workbench) {
51
		this.setPreferenceStore(new TXMPreferenceStore(PropertiesPreferences.PREFERENCES_NODE));
51
		this.setPreferenceStore(new TXMPreferenceStore(new PropertiesPreferences().getPreferencesNodeQualifier()));
52 52
		this.setTitle(TXMCoreMessages.common_description);
53 53
	}
54 54
	
tmp/org.txm.backtomedia.rcp/src/org/txm/backtomedia/commands/function/BackToMedia.java (revision 1066)
97 97
		//System.out.println("Selected object: "+s);
98 98
		if (s instanceof Line) {
99 99
			
100
			String structurePropertyName = TXMPreferences.getString(BackToMediaPreferences.STRUCTURE, BackToMediaPreferences.PREFERENCES_NODE); //$NON-NLS-1$
101
			String startPropertyName = TXMPreferences.getString(BackToMediaPreferences.STRUCTURE_START_PROPERTY, BackToMediaPreferences.PREFERENCES_NODE); //$NON-NLS-1$
102
			String endPropertyName = TXMPreferences.getString(BackToMediaPreferences.STRUCTURE_END_PROPERTY, BackToMediaPreferences.PREFERENCES_NODE); //$NON-NLS-1$
100
			String structurePropertyName = BackToMediaPreferences.getInstance().getString(BackToMediaPreferences.STRUCTURE); //$NON-NLS-1$
101
			String startPropertyName = BackToMediaPreferences.getInstance().getString(BackToMediaPreferences.STRUCTURE_START_PROPERTY); //$NON-NLS-1$
102
			String endPropertyName = BackToMediaPreferences.getInstance().getString(BackToMediaPreferences.STRUCTURE_END_PROPERTY); //$NON-NLS-1$
103 103
			
104 104
			
105 105
			Line line = (Line)s;
......
111 111
				int startTime = 0;
112 112
				int endTime = 0;
113 113
				//boolean useWordProperty = Platform.getPreferencesService().getBoolean(Application.PLUGIN_ID, BackToMediaPreferences.USEWORDPROPERTY, false, null);
114
				boolean useWordProperty = TXMPreferences.getBoolean(BackToMediaPreferences.USEWORDPROPERTY, BackToMediaPreferences.PREFERENCES_NODE);
114
				boolean useWordProperty = BackToMediaPreferences.getInstance().getBoolean(BackToMediaPreferences.USEWORDPROPERTY);
115 115

  
116 116
				StructuralUnit textS = corpus.getStructuralUnit("text"); //$NON-NLS-1$
117 117
				Property textP = textS.getProperty("id"); //$NON-NLS-1$
......
119 119
				Log.info(MessagesMP.BackToMedia_7+textid);
120 120

  
121 121
				if (useWordProperty) {
122
					String pTimeName = TXMPreferences.getString(BackToMediaPreferences.WORD_PROPERTY, BackToMediaPreferences.PREFERENCES_NODE); //$NON-NLS-1$
122
					String pTimeName = BackToMediaPreferences.getInstance().getString(BackToMediaPreferences.WORD_PROPERTY);
123 123
					if ("".equals(pTimeName)) pTimeName = "time"; //$NON-NLS-1$ //$NON-NLS-2$
124 124
					
125 125
					Property timeP = corpus.getProperty(pTimeName);
tmp/org.txm.backtomedia.rcp/src/org/txm/backtomedia/preferences/BackToMediaPreferences.java (revision 1066)
8 8
public class BackToMediaPreferences extends TXMPreferences {
9 9

  
10 10
	// auto populate the preference node qualifier from the current bundle id
11
	public static final String PREFERENCES_NODE = FrameworkUtil.getBundle(BackToMediaPreferences.class).getSymbolicName();
11
//	public static final String PREFERENCES_NODE = FrameworkUtil.getBundle(BackToMediaPreferences.class).getSymbolicName();
12 12
	
13 13
	public static final String PREFERENCES_PREFIX = "backtomedia_";
14 14
	
......
27 27
	@Override
28 28
	public void initializeDefaultPreferences() {
29 29
	
30
		Preferences preferences = DefaultScope.INSTANCE.getNode(PREFERENCES_NODE);
30
		Preferences preferences = DefaultScope.INSTANCE.getNode(getPreferencesNodeQualifier());
31 31
		preferences.putBoolean(REPEAT, true);
32 32
		preferences.putBoolean(USEWORDPROPERTY, false);
33 33
		preferences.put(STRUCTURE, "sp");
......
35 35
		preferences.put(STRUCTURE_START_PROPERTY, "endtime");
36 36
		preferences.put(WORD_PROPERTY, "time");
37 37
	}
38
	
39
	/**
40
	 * Gets the instance.
41
	 * @return the instance
42
	 */
43
	public static TXMPreferences getInstance()	{
44
		if (!TXMPreferences.instances.containsKey(BackToMediaPreferences.class)) {
45
			new BackToMediaPreferences();
46
		}
47
		return TXMPreferences.instances.get(BackToMediaPreferences.class);
48
	}
38 49
}
tmp/org.txm.backtomedia.rcp/src/org/txm/backtomedia/preferences/BackToMediaPreferencePage.java (revision 1066)
87 87
	 */
88 88
	@Override
89 89
	public void init(IWorkbench workbench) {
90
		this.setPreferenceStore(new TXMPreferenceStore(BackToMediaPreferences.PREFERENCES_NODE));
90
		this.setPreferenceStore(new TXMPreferenceStore(new BackToMediaPreferences().getPreferencesNodeQualifier()));
91 91
		//this.setImageDescriptor(WordCloudAdapterFactory.ICON);
92 92
	}
93 93

  
tmp/org.txm.backtomedia.rcp/src/org/txm/backtomedia/editors/vlcplayer/VLCPlayer.java (revision 1066)
214 214

  
215 215
		repeatButton = new Button(this,SWT.CHECK);
216 216
		repeatButton.setText(MessagesMP.repeat);
217
		repeat = TXMPreferences.getBoolean(BackToMediaPreferences.REPEAT, BackToMediaPreferences.PREFERENCES_NODE);
217
		repeat = BackToMediaPreferences.getInstance().getBoolean(BackToMediaPreferences.REPEAT);
218 218
		repeatButton.setSelection(repeat);
219 219
		repeatButton.addSelectionListener(new SelectionListener() {
220 220
			@Override
tmp/org.txm.core/src/java/org/txm/Toolbox.java (revision 1066)
267 267

  
268 268

  
269 269
		// FIXME: tmp persistence tests: Reload saved results
270
//		if (TBXPreferences.getBoolean(TBXPreferences.AUTO_PERSISTENCE_ENABLED, TBXPreferences.PREFERENCES_NODE)) {
270
//		if (TBXPreferences.getInstance().getBoolean(TBXPreferences.AUTO_PERSISTENCE_ENABLED)) {
271 271
			Log.info("Toolbox.initialize(): reloading persitent results...");
272 272
			ArrayList<String> resultsNodesQualifiers = TXMPreferences.getAllResultsNodesQualifiers();
273 273
			for (String nodeQualifier : resultsNodesQualifiers) {
......
503 503
			// FIXME: tmp solution before IProject: remove all not persistable result nodes
504 504
			//TXMPreferences.deleteAllNotPersistableResultsNodes();
505 505
			// FIXME: tmp solution before IProject: remove result local nodes if persistence preference is disabled
506
//			if (!TBXPreferences.getBoolean(TBXPreferences.AUTO_PERSISTENCE_ENABLED, TBXPreferences.PREFERENCES_NODE)) {
506
//			if (!TBXPreferences.getInstance().getBoolean(TBXPreferences.AUTO_PERSISTENCE_ENABLED)) {
507 507
//				TXMPreferences.deleteAllResultsNodes();
508 508
//			}
509 509
			// FIXME: other tmp solution
tmp/org.txm.core/src/java/org/txm/core/preferences/TXMPreferences.java (revision 1066)
229 229
	public String getString(String key)	{
230 230
		return getString(key, this.preferencesNode);
231 231
	}
232
	
232 233

  
233 234
	/**
235
	 * 
236
	 * @param key
237
	 * @return
238
	 */
239
	public float getFloat(String key)	{
240
		return getFloat(key, this.preferencesNode);
241
	}
242

  
243

  
244
	/**
234 245
	 * Gets the preferences node qualifier of the instance.
235 246
	 * @return the preferencesNode
236 247
	 */
......
239 250
	}
240 251

  
241 252
	
253
	
254
	
242 255
	/**
243 256
	 * Stores a pairs of key / value in a local node dedicated to the specified result. The node qualifier is generated by the <code>Object.toString()</code> method.
244 257
	 * 
tmp/org.txm.jodconverter.core/target/classes/document-formats.js (revision 1066)
1
[
2
  {
3
    "name": "Portable Document Format",
4
    "extension": "pdf",
5
    "mediaType": "application/pdf",
6
    "storePropertiesByFamily": {
7
      "DRAWING": {"FilterName": "draw_pdf_Export"},
8
      "SPREADSHEET": {"FilterName": "calc_pdf_Export"},
9
      "PRESENTATION": {"FilterName": "impress_pdf_Export"},
10
      "TEXT": {"FilterName": "writer_pdf_Export"}
11
    }
12
  },
13
  {
14
    "name": "Macromedia Flash",
15
    "extension": "swf",
16
    "mediaType": "application/x-shockwave-flash",
17
    "storePropertiesByFamily": {
18
      "DRAWING": {"FilterName": "draw_flash_Export"},
19
      "PRESENTATION": {"FilterName": "impress_flash_Export"}
20
    }
21
  },
22
  {
23
    "name": "HTML",
24
    "extension": "html",
25
    "mediaType": "text/html",
26
    "inputFamily": "TEXT",
27
    "storePropertiesByFamily": {
28
      "SPREADSHEET": {"FilterName": "HTML (StarCalc)"},
29
      "PRESENTATION": {"FilterName": "impress_html_Export"},
30
      "TEXT": {"FilterName": "HTML (StarWriter)"}
31
    }
32
  },
33
  {
34
    "name": "OpenDocument Text",
35
    "extension": "odt",
36
    "mediaType": "application/vnd.oasis.opendocument.text",
37
    "inputFamily": "TEXT",
38
    "storePropertiesByFamily": {"TEXT": {"FilterName": "writer8"}}
39
  },
40
  {
41
    "name": "OpenOffice.org 1.0 Text Document",
42
    "extension": "sxw",
43
    "mediaType": "application/vnd.sun.xml.writer",
44
    "inputFamily": "TEXT",
45
    "storePropertiesByFamily": {"TEXT": {"FilterName": "StarOffice XML (Writer)"}}
46
  },
47
  {
48
    "name": "Microsoft Word",
49
    "extension": "doc",
50
    "mediaType": "application/msword",
51
    "inputFamily": "TEXT",
52
    "storePropertiesByFamily": {"TEXT": {"FilterName": "MS Word 97"}}
53
  },
54
  {
55
    "name": "Microsoft Word 2007 XML",
56
    "extension": "docx",
57
    "mediaType": "application/vnd.openxmlformats-officedocument.wordprocessingml.document",
58
    "inputFamily": "TEXT"
59
  },
60
  {
61
    "name": "Rich Text Format",
62
    "extension": "rtf",
63
    "mediaType": "text/rtf",
64
    "inputFamily": "TEXT",
65
    "storePropertiesByFamily": {"TEXT": {"FilterName": "Rich Text Format"}}
66
  },
67
  {
68
    "name": "WordPerfect",
69
    "extension": "wpd",
70
    "mediaType": "application/wordperfect",
71
    "inputFamily": "TEXT"
72
  },
73
  {
74
    "name": "Plain Text",
75
    "extension": "txt",
76
    "mediaType": "text/plain",
77
    "inputFamily": "TEXT",
78
    "loadProperties": {
79
      "FilterName": "Text (encoded)",
80
      "FilterOptions": "utf8"
81
    },
82
    "storePropertiesByFamily": {"TEXT": {
83
      "FilterName": "Text (encoded)",
84
      "FilterOptions": "utf8"
85
    }}
86
  },
87
  {
88
    "name": "MediaWiki wikitext",
89
    "extension": "wiki",
90
    "mediaType": "text/x-wiki",
91
    "storePropertiesByFamily": {"TEXT": {"FilterName": "MediaWiki"}}
92
  },
93
  {
94
    "name": "OpenDocument Spreadsheet",
95
    "extension": "ods",
96
    "mediaType": "application/vnd.oasis.opendocument.spreadsheet",
97
    "inputFamily": "SPREADSHEET",
98
    "storePropertiesByFamily": {"SPREADSHEET": {"FilterName": "calc8"}}
99
  },
100
  {
101
    "name": "OpenOffice.org 1.0 Spreadsheet",
102
    "extension": "sxc",
103
    "mediaType": "application/vnd.sun.xml.calc",
104
    "inputFamily": "SPREADSHEET",
105
    "storePropertiesByFamily": {"SPREADSHEET": {"FilterName": "StarOffice XML (Calc)"}}
106
  },
107
  {
108
    "name": "Microsoft Excel",
109
    "extension": "xls",
110
    "mediaType": "application/vnd.ms-excel",
111
    "inputFamily": "SPREADSHEET",
112
    "storePropertiesByFamily": {"SPREADSHEET": {"FilterName": "MS Excel 97"}}
113
  },
114
  {
115
    "name": "Microsoft Excel 2007 XML",
116
    "extension": "xlsx",
117
    "mediaType": "application/vnd.openxmlformats-officedocument.spreadsheetml.sheet",
118
    "inputFamily": "SPREADSHEET"
119
  },
120
  {
121
    "name": "Comma Separated Values",
122
    "extension": "csv",
123
    "mediaType": "text/csv",
124
    "inputFamily": "SPREADSHEET",
125
    "loadProperties": {
126
      "FilterName": "Text - txt - csv (StarCalc)",
127
      "FilterOptions": "44,34,0"
128
    },
129
    "storePropertiesByFamily": {"SPREADSHEET": {
130
      "FilterName": "Text - txt - csv (StarCalc)",
131
      "FilterOptions": "44,34,0"
132
    }}
133
  },
134
  {
135
    "name": "Tab Separated Values",
136
    "extension": "tsv",
137
    "mediaType": "text/tab-separated-values",
138
    "inputFamily": "SPREADSHEET",
139
    "loadProperties": {
140
      "FilterName": "Text - txt - csv (StarCalc)",
141
      "FilterOptions": "9,34,0"
142
    },
143
    "storePropertiesByFamily": {"SPREADSHEET": {
144
      "FilterName": "Text - txt - csv (StarCalc)",
145
      "FilterOptions": "9,34,0"
146
    }}
147
  },
148
  {
149
    "name": "OpenDocument Presentation",
150
    "extension": "odp",
151
    "mediaType": "application/vnd.oasis.opendocument.presentation",
152
    "inputFamily": "PRESENTATION",
153
    "storePropertiesByFamily": {"PRESENTATION": {"FilterName": "impress8"}}
154
  },
155
  {
156
    "name": "OpenOffice.org 1.0 Presentation",
157
    "extension": "sxi",
158
    "mediaType": "application/vnd.sun.xml.impress",
159
    "inputFamily": "PRESENTATION",
160
    "storePropertiesByFamily": {"PRESENTATION": {"FilterName": "StarOffice XML (Impress)"}}
161
  },
162
  {
163
    "name": "Microsoft PowerPoint",
164
    "extension": "ppt",
165
    "mediaType": "application/vnd.ms-powerpoint",
166
    "inputFamily": "PRESENTATION",
167
    "storePropertiesByFamily": {"PRESENTATION": {"FilterName": "MS PowerPoint 97"}}
168
  },
169
  {
170
    "name": "Microsoft PowerPoint 2007 XML",
171
    "extension": "pptx",
172
    "mediaType": "application/vnd.openxmlformats-officedocument.presentationml.presentation",
173
    "inputFamily": "PRESENTATION"
174
  },
175
  {
176
    "name": "OpenDocument Drawing",
177
    "extension": "odg",
178
    "mediaType": "application/vnd.oasis.opendocument.graphics",
179
    "inputFamily": "DRAWING",
180
    "storePropertiesByFamily": {"DRAWING": {"FilterName": "draw8"}}
181
  },
182
  {
183
    "name": "Scalable Vector Graphics",
184
    "extension": "svg",
185
    "mediaType": "image/svg+xml",
186
    "storePropertiesByFamily": {"DRAWING": {"FilterName": "draw_svg_Export"}}
187
  }
188
]
0 189

  
tmp/org.txm.analec.rcp/src/org/eclipse/jface/fieldassist/TXMSimpleContentProposalProvider.java (revision 1066)
78 78
//			System.out.println("getProposals...");
79 79
			ArrayList<ContentProposal> list = new ArrayList<ContentProposal>();
80 80
			
81
			boolean prefixeSearch = TXMPreferences.getBoolean(AnalecPreferences.PREFIX_AUTOCOMPLETION, AnalecPreferences.PREFERENCES_NODE);
81
			boolean prefixeSearch = AnalecPreferences.getInstance().getBoolean(AnalecPreferences.PREFIX_AUTOCOMPLETION);
82 82
			if (prefixeSearch) {
83 83
				for (int i = 0; i < proposals.length; i++) {
84 84
					if (proposals[i].length() >= contents.length()
tmp/org.txm.analec.rcp/src/org/txm/analec/commands/DoInstallStep.java (revision 1066)
35 35
	public void install() {
36 36
		
37 37
		Log.info(Messages.DoInstallStep_2);
38
		String saved = TXMPreferences.getString(AnalecPreferences.VERSION, AnalecPreferences.PREFERENCES_NODE); //$NON-NLS-1$
38
		String saved = AnalecPreferences.getInstance().getString(AnalecPreferences.VERSION); //$NON-NLS-1$
39 39
		Version currentVersion = BundleUtils.getBundleVersion("AnalecRCP"); //$NON-NLS-1$
40 40
		
41 41
		if (saved != null && saved.length() > 0) {
......
66 66
		}
67 67
		
68 68
		Log.warning(Messages.DoInstallStep_18);
69
		TXMPreferences.put(AnalecPreferences.PREFERENCES_NODE, AnalecPreferences.VERSION, currentVersion.toString());
69
		AnalecPreferences.getInstance().put(AnalecPreferences.VERSION, currentVersion.toString());
70 70
		return;
71 71
	}
72 72
}
tmp/org.txm.analec.rcp/src/org/txm/analec/preferences/AnalecPreferences.java (revision 1066)
4 4
import org.osgi.framework.FrameworkUtil;
5 5
import org.osgi.service.prefs.Preferences;
6 6
import org.txm.core.preferences.TXMPreferences;
7
import org.txm.rcp.preferences.RCPPreferences;
7 8

  
8 9
public class AnalecPreferences extends TXMPreferences{
9 10
	
10
	public static final String PREFERENCES_NODE = FrameworkUtil.getBundle(AnalecPreferences.class).getSymbolicName();
11
//	public static final String PREFERENCES_NODE = FrameworkUtil.getBundle(AnalecPreferences.class).getSymbolicName();
12
	
11 13
	public static final String VERSION = "analec.version"; //$NON-NLS-1$
12 14
	public static final String COLOR_PALETTE = "color_palette";
13 15
	public static final String PREFIX_AUTOCOMPLETION = "prefix_autocompletion"; //$NON-NLS-1$
......
16 18
	
17 19
	@Override
18 20
	public void initializeDefaultPreferences() {
19
		Preferences preferences = DefaultScope.INSTANCE.getNode(PREFERENCES_NODE);
21
		Preferences preferences = DefaultScope.INSTANCE.getNode(getPreferencesNodeQualifier());
20 22
		preferences.put(VERSION, "");
21 23
		preferences.put(COLOR_PALETTE, "green");
22 24
		preferences.putBoolean(ANALEC_LIMIT_CORRECTION_SCHEME, false);
23 25
		preferences.putBoolean(PREFIX_AUTOCOMPLETION, false);
24 26
	}
27
	
28
	/**
29
	 * Gets the instance.
30
	 * @return the instance
31
	 */
32
	public static TXMPreferences getInstance()	{
33
		if (!TXMPreferences.instances.containsKey(AnalecPreferences.class)) {
34
			new AnalecPreferences();
35
		}
36
		return TXMPreferences.instances.get(AnalecPreferences.class);
37
	}
25 38
}
tmp/org.txm.analec.rcp/src/org/txm/analec/toolbar/UnitToolbar.java (revision 1066)
101 101
		annotationArea.getLayout().numColumns = 10;
102 102
		annotationArea.setLayoutData(new GridData(GridData.FILL, GridData.FILL, true, false));
103 103

  
104
		String color_palette = TXMPreferences.getString(AnalecPreferences.COLOR_PALETTE, AnalecPreferences.PREFERENCES_NODE); //$NON-NLS-1$
104
		String color_palette = AnalecPreferences.getInstance().getString(AnalecPreferences.COLOR_PALETTE);
105 105
		if ("yellow".equals(color_palette)) { //$NON-NLS-1$
106 106
			this.highlighted_unit_color = URSAnnotationToolbar.lightyellow;
107 107
			this.selected_unit_color = URSAnnotationToolbar.yellow;
tmp/org.txm.analec.rcp/src/org/txm/analec/toolbar/SchemaToolbar.java (revision 1066)
94 94
		annotationArea.getLayout().numColumns = 7;
95 95
		annotationArea.setLayoutData(new GridData(GridData.FILL, GridData.FILL, true, false));
96 96
		
97
		String color_palette = TXMPreferences.getString(AnalecPreferences.COLOR_PALETTE, AnalecPreferences.PREFERENCES_NODE);
97
		String color_palette = AnalecPreferences.getInstance().getString(AnalecPreferences.COLOR_PALETTE);
98 98
		if ("yellow".equals(color_palette)) { //$NON-NLS-1$
99 99
			this.highlighted_unit_color = URSAnnotationToolbar.lightyellow;
100 100
			this.selected_unit_color = URSAnnotationToolbar.yellow;
tmp/org.txm.tigersearch.rcp/src/org/txm/searchengine/ts/TSResult.java (revision 1066)
307 307
//			ConcordanceBlocks builder = new ConcordanceBlocks();
308 308
//			rez = builder.process(xmlFile, csvFile, cx, list, list2);
309 309
//		} else { // XSL method
310
//			File xslDir = new File(TXMPreferences.getString(TBXPreferences.USER_TXM_HOME, TBXPreferences.PREFERENCES_NODE), "xsl"); //$NON-NLS-1$
310
//			File xslDir = new File(TBXPreferences.getInstance().getString(TBXPreferences.USER_TXM_HOME), "xsl"); //$NON-NLS-1$
311 311
//			File xslFile = new File(xslDir, method+".xsl"); //$NON-NLS-1$
312 312
//			if (!xslFile.exists()) {
313 313
//				Log.severe(TXMCoreMessages.TSResult_7+xslFile);
tmp/org.txm.tigersearch.rcp/src/org/txm/tigersearch/editors/TSIndexEditor.java (revision 1066)
528 528
		propsArea.addValueChangeListener(new Listener() {
529 529
			@Override
530 530
			public void handleEvent(Event event) {
531
				if (!initializing && TXMPreferences.getBoolean(RCPPreferences.AUTO_UPDATE_EDITOR, RCPPreferences.PREFERENCES_NODE))
531
				if (!initializing && RCPPreferences.getInstance().getBoolean(RCPPreferences.AUTO_UPDATE_EDITOR))
532 532
					compute();
533 533
			}
534 534
		});
tmp/org.txm.wordcloud.core/src/org/txm/wordcloud/core/preferences/WordCloudPreferences.java (revision 1066)
16 16
public class WordCloudPreferences extends TXMPreferences {
17 17

  
18 18

  
19
	// auto populate the preference node qualifier from the current bundle id
20
	public static final String PREFERENCES_NODE = FrameworkUtil.getBundle(WordCloudPreferences.class).getSymbolicName();
21
	
22 19
	public static final String PREFERENCES_PREFIX = "wordcloud_";
23 20
	
24 21
	public static final String MAX_WORDS_COUNT = PREFERENCES_PREFIX + "max_words"; //$NON-NLS-1$
......
30 27
	@Override
31 28
	public void initializeDefaultPreferences() {
32 29
	
33
		Preferences preferences = DefaultScope.INSTANCE.getNode(PREFERENCES_NODE);
30
		Preferences preferences = getDefaultPreferencesNode();
34 31
		preferences.putInt(MAX_WORDS_COUNT, 50);
35 32
		preferences.putInt(F_MIN, 20);
36 33
		preferences.putInt(ROTATION_PERCENT, 10);
......
39 36
		// shared charts rendering preferences
40 37
		ChartsEnginePreferences.initializeChartsEngineSharedPreferences(preferences);
41 38
	}
39
	
40
	/**
41
	 * Gets the instance.
42
	 * @return the instance
43
	 */
44
	public static TXMPreferences getInstance()	{
45
		if (!TXMPreferences.instances.containsKey(WordCloudPreferences.class)) {
46
			new WordCloudPreferences();
47
		}
48
		return TXMPreferences.instances.get(WordCloudPreferences.class);
49
	}
42 50
}
tmp/org.txm.searchengine.cqp.rcp/src/org/txm/searchengine/cqp/rcp/preferences/CQPPreferencePage.java (revision 1066)
183 183
	 */
184 184
	@Override
185 185
	public void init(IWorkbench workbench) {
186
		this.setPreferenceStore(new TXMPreferenceStore(CQPLibPreferences.PREFERENCES_NODE));
186
		this.setPreferenceStore(new TXMPreferenceStore(new CQPLibPreferences().getPreferencesNodeQualifier()));
187 187
	}
188 188

  
189 189
	/* (non-Javadoc)
tmp/org.txm.chartsengine.core/src/org/txm/chartsengine/core/ChartsEnginesManager.java (revision 1066)
36 36
			ChartsEngine.chartsEngines.add(engine);
37 37
		}
38 38
		
39
		//ChartsEngine.setCurrrentChartsEngine(this.getEngine(TXMPreferences.getString(ChartsEnginePreferences.CURRENT_NAME, ChartsEnginePreferences.PREFERENCES_NODE)));
39
		//ChartsEngine.setCurrrentChartsEngine(this.getEngine(ChartsEnginePreferences.getInstance().getString(ChartsEnginePreferences.CURRENT_NAME)));
40 40
		
41 41
		this.setCurrentEngine(ChartsEnginePreferences.getInstance().getString(ChartsEnginePreferences.CURRENT_NAME));
42 42

  
43 43

  
44 44
		
45
		//TXMPreferences.alternativeNodesQualifiers.add(ChartsEnginePreferences.PREFERENCES_NODE);
45
		//TXMPreferences.alternativeNodesQualifiers.add(ChartsEnginePreferences.getInstance().getPreferencesNodeQualifier());
46 46

  
47 47

  
48 48
		return super.startEngines(monitor);
tmp/org.txm.searchengine.cqp.core/src/org/txm/searchengine/cqp/CQPSearchEngine.java (revision 1066)
52 52

  
53 53
		boolean cqiserverok = false;
54 54

  
55
		useNetCQi = Boolean.parseBoolean(TXMPreferences.getString(CQPLibPreferences.CQI_NETWORK_MODE, CQPLibPreferences.PREFERENCES_NODE));
55
		useNetCQi = CQPLibPreferences.getInstance().getBoolean(CQPLibPreferences.CQI_NETWORK_MODE);
56 56

  
57 57
		Log.warning("Killing CQP and RServe process if any");
58 58
		killSearchEngine();
59 59

  
60
		boolean remote = Boolean.parseBoolean(TXMPreferences.getString(CQPLibPreferences.CQI_SERVER_IS_REMOTE, CQPLibPreferences.PREFERENCES_NODE));
60
		boolean remote = CQPLibPreferences.getInstance().getBoolean(CQPLibPreferences.CQI_SERVER_IS_REMOTE);
61 61
		state = false;
62 62
		// test if must-have properties for CWB are set
63 63

  
......
88 88
		if (reg_path.length() > 0) reg_path = reg_path.substring(path_separator.length()); // remove first path_separator
89 89
		reg_path = reg_path.replace("\\\\", "//"); // fix the UNC paths for mingw
90 90

  
91
		String init_path = TXMPreferences.getString(CQPLibPreferences.CQI_SERVER_PATH_TO_INIT_FILE, CQPLibPreferences.PREFERENCES_NODE);
91
		String init_path = CQPLibPreferences.getInstance().getString(CQPLibPreferences.CQI_SERVER_PATH_TO_INIT_FILE);
92 92

  
93 93

  
94 94
		if (!remote) {
......
97 97
				try {
98 98
					cqiServer = new MemCqiServer(reg_path, 
99 99
							init_path, 
100
							TXMPreferences.getString(CQPLibPreferences.CQI_SERVER_ADDITIONAL_OPTIONS, CQPLibPreferences.PREFERENCES_NODE)
101
							+ " -P " + TXMPreferences.getString(CQPLibPreferences.CQI_SERVER_PORT, CQPLibPreferences.PREFERENCES_NODE), //$NON-NLS-1$
102
							Boolean.parseBoolean(TXMPreferences.getString(CQPLibPreferences.CQI_SERVER_MONITOR_OUTPUT, CQPLibPreferences.PREFERENCES_NODE)));
100
							CQPLibPreferences.getInstance().getString(CQPLibPreferences.CQI_SERVER_ADDITIONAL_OPTIONS)
101
							+ " -P " + CQPLibPreferences.getInstance().getString(CQPLibPreferences.CQI_SERVER_PORT), //$NON-NLS-1$
102
							Boolean.parseBoolean(CQPLibPreferences.getInstance().getString(CQPLibPreferences.CQI_SERVER_MONITOR_OUTPUT)));
103 103
				} catch (Exception e) {
104 104
					// TODO Auto-generated catch block
105 105
					org.txm.utils.logger.Log.printStackTrace(e);
106 106
				}
107 107
			} else {
108 108

  
109
				String exec_path = TXMPreferences.getString(CQPLibPreferences.CQI_SERVER_PATH_TO_EXECUTABLE, CQPLibPreferences.PREFERENCES_NODE);
109
				String exec_path = CQPLibPreferences.getInstance().getString(CQPLibPreferences.CQI_SERVER_PATH_TO_EXECUTABLE);
110 110

  
111 111
				if (exec_path == null || exec_path.length() == 0) {
112 112
					System.out.println("Error: the '"+CQPLibPreferences.CQI_SERVER_PATH_TO_EXECUTABLE+"' preference is not set.");
......
118 118
				cqiServer = new NetCqiServer(exec_path,
119 119
						reg_path, 
120 120
						init_path, 
121
						TXMPreferences.getString(CQPLibPreferences.CQI_SERVER_ADDITIONAL_OPTIONS, CQPLibPreferences.PREFERENCES_NODE)
122
						+ " -P " + TXMPreferences.getString(CQPLibPreferences.CQI_SERVER_PORT, CQPLibPreferences.PREFERENCES_NODE), //$NON-NLS-1$
123
						Boolean.parseBoolean(TXMPreferences.getString(CQPLibPreferences.CQI_SERVER_MONITOR_OUTPUT, CQPLibPreferences.PREFERENCES_NODE)));
121
						CQPLibPreferences.getInstance().getString(CQPLibPreferences.CQI_SERVER_ADDITIONAL_OPTIONS)
122
						+ " -P " + CQPLibPreferences.getInstance().getString(CQPLibPreferences.CQI_SERVER_PORT), //$NON-NLS-1$
123
						CQPLibPreferences.getInstance().getBoolean(CQPLibPreferences.CQI_SERVER_MONITOR_OUTPUT));
124 124
			}
125 125

  
126 126
			if (cqiServer != null)
......
139 139
						cqiserverok = false;
140 140
					}
141 141
				} else {
142
					int port = Integer.parseInt(TXMPreferences.getString(CQPLibPreferences.CQI_SERVER_PORT, CQPLibPreferences.PREFERENCES_NODE));
143
					String host = TXMPreferences.getString(CQPLibPreferences.CQI_SERVER_HOST, CQPLibPreferences.PREFERENCES_NODE);
142
					int port = CQPLibPreferences.getInstance().getInt(CQPLibPreferences.CQI_SERVER_PORT);
143
					String host = CQPLibPreferences.getInstance().getString(CQPLibPreferences.CQI_SERVER_HOST);
144 144
					cqiClient = new NetCqiClient(host, port);
145 145
				}
146 146
			}
147 147
		} catch (NumberFormatException e1) {
148
			Log.severe(TXMCoreMessages.Toolbox_wrong_port + TXMPreferences.getString(CQPLibPreferences.CQI_SERVER_PORT, CQPLibPreferences.PREFERENCES_NODE)); 
148
			Log.severe(TXMCoreMessages.Toolbox_wrong_port + CQPLibPreferences.getInstance().getString(CQPLibPreferences.CQI_SERVER_PORT)); 
149 149
		} catch (ServerNotFoundException e1) {
150
			Log.severe(TXMCoreMessages.Error_CONNECTION_FAILED + TXMPreferences.getString(CQPLibPreferences.CQI_SERVER_HOST, CQPLibPreferences.PREFERENCES_NODE)
151
					+ TXMCoreMessages.Toolbox_27 + TXMPreferences.getString(CQPLibPreferences.CQI_SERVER_PORT, CQPLibPreferences.PREFERENCES_NODE)); 
150
			Log.severe(TXMCoreMessages.Error_CONNECTION_FAILED + CQPLibPreferences.getInstance().getString(CQPLibPreferences.CQI_SERVER_HOST)
151
					+ TXMCoreMessages.Toolbox_27 + CQPLibPreferences.getInstance().getString(CQPLibPreferences.CQI_SERVER_PORT)); 
152 152
		}
153 153

  
154 154
		// try connecting to the CWB server
155 155
		try {
156 156
			if (cqiserverok) {
157
				String login = TXMPreferences.getString(CQPLibPreferences.CQI_SERVER_LOGIN, CQPLibPreferences.PREFERENCES_NODE);
158
				String password = TXMPreferences.getString(CQPLibPreferences.CQI_SERVER_PASSWORD, CQPLibPreferences.PREFERENCES_NODE);
157
				String login = CQPLibPreferences.getInstance().getString(CQPLibPreferences.CQI_SERVER_LOGIN);
158
				String password = CQPLibPreferences.getInstance().getString(CQPLibPreferences.CQI_SERVER_PASSWORD);
159 159
				state = cqiClient.connect(login, password);
160 160
			}
161 161
		} catch (Exception e1) {
......
164 164

  
165 165
		if (state == false) {
166 166
			System.out.println(TXMCoreMessages.Toolbox_29); 
167
			if (cqiClient instanceof NetCqiClient) System.out.println(TXMCoreMessages.Toolbox_30 + TXMPreferences.getString(CQPLibPreferences.CQI_SERVER_LOGIN, CQPLibPreferences.PREFERENCES_NODE) + " " + TXMPreferences.getString(CQPLibPreferences.CQI_SERVER_PASSWORD, CQPLibPreferences.PREFERENCES_NODE) + TXMPreferences.getString(CQPLibPreferences.CQI_SERVER_HOST, CQPLibPreferences.PREFERENCES_NODE) + " " + Integer.parseInt(TXMPreferences.getString(CQPLibPreferences.CQI_SERVER_PORT, CQPLibPreferences.PREFERENCES_NODE))); //$NON-NLS-1$ //$NON-NLS-2$
168
			if (cqiServer != null && cqiServer instanceof NetCqiServer)
167
			if (cqiClient instanceof NetCqiClient) {
168
				System.out.println(TXMCoreMessages.Toolbox_30 + 
169
						CQPLibPreferences.getInstance().getString(CQPLibPreferences.CQI_SERVER_LOGIN) + " " + //$NON-NLS-1$
170
						CQPLibPreferences.getInstance().getString(CQPLibPreferences.CQI_SERVER_PASSWORD) + 
171
						CQPLibPreferences.getInstance().getString(CQPLibPreferences.CQI_SERVER_HOST) + " " + //$NON-NLS-1$
172
						CQPLibPreferences.getInstance().getInt(CQPLibPreferences.CQI_SERVER_PORT));
173
			}
174
			if (cqiServer != null && cqiServer instanceof NetCqiServer) {
169 175
				System.out.println(TXMCoreMessages.Toolbox_33 + cqiServer.getLastCmdLine());
176
			}
170 177
		} else {
171 178
			if (cqiServer == null || cqiServer instanceof NetCqiServer)
172 179
				System.out.println(TXMCoreMessages.Toolbox_connected_to_corpus_sever); 
......
319 326
	 * kill cqpserver process.
320 327
	 */
321 328
	private static void killSearchEngine() {
322
		if (!TXMPreferences.getBoolean(CQPLibPreferences.CQI_SERVER_IS_REMOTE, CQPLibPreferences.PREFERENCES_NODE))
329
		if (!CQPLibPreferences.getInstance().getBoolean(CQPLibPreferences.CQI_SERVER_IS_REMOTE))
323 330
			// Windows OS
324 331
			if (OSDetector.isFamilyWindows()) {
325 332
				try {
......
352 359
			}
353 360
		// Mac, Linux
354 361
			else {
355
				String cmd = TXMCoreMessages.Toolbox_37 + TXMPreferences.getString(CQPLibPreferences.CQI_SERVER_PORT, CQPLibPreferences.PREFERENCES_NODE) + TXMCoreMessages.Toolbox_38;
362
				String cmd = TXMCoreMessages.Toolbox_37 + CQPLibPreferences.getInstance().getString(CQPLibPreferences.CQI_SERVER_PORT) + TXMCoreMessages.Toolbox_38;
356 363
				try {
357 364
					//Process p = Runtime.getRuntime().exec("killall -9 cqpserver"); //$NON-NLS-1$
358 365
					// System.out.println("kill `ps aux | grep cqpserver | awk '/-P "
359
					// + TXMPreferences.getString(CQPPreferences.PREFERENCES_NODE, CQI_SERVER_PORT) + "/ {print $2}'`");
366
					// + CQPPreferences.getInstance().getString(CQI_SERVER_PORT) + "/ {print $2}'`");
360 367
					// String[] args =
361 368
					// {"kill","`ps aux | grep cqpserver | awk '/-P " +
362
					// TXMPreferences.getString(CQPPreferences.PREFERENCES_NODE, CQI_SERVER_PORT) + "/ {print $2}'`"};
369
					// CQPPreferences.getInstance().getString(CQI_SERVER_PORT) + "/ {print $2}'`"};
363 370
					// System.out.println("before Sh constructor");
364 371
					Sh sh = new Sh(""); //$NON-NLS-1$
365 372
					// System.out.println("after Sh constructor");
366 373
					// System.out.println("EXECUTE SH : "+"kill `ps aux | grep cqpserver | awk '/-P "
367
					// + TXMPreferences.getString(CQPPreferences.PREFERENCES_NODE, CQI_SERVER_PORT) + "/ {print $2}'`");
374
					// + CQPPreferences.getInstance().getString(CQI_SERVER_PORT) + "/ {print $2}'`");
368 375
					sh.setIsc(cmd);
369 376
					sh.sh();
370 377
					// Runtime.getRuntime().exec("sh kill `ps aux | grep cqpserver | awk '/-P "
371
					// + TXMPreferences.getString(CQPPreferences.PREFERENCES_NODE, CQI_SERVER_PORT) + "/ {print $2}'`");
378
					// + CQPPreferences.getInstance().getString(CQI_SERVER_PORT) + "/ {print $2}'`");
372 379

  
373 380
				} catch (Exception e) {
374 381
					Log.severe(TXMCoreMessages.Toolbox_39+cmd+TXMCoreMessages.Toolbox_40+Log.toString(e));
tmp/org.txm.searchengine.cqp.core/src/org/txm/searchengine/cqp/MemCqiServer.java (revision 1066)
167 167

  
168 168
			try {
169 169

  
170
				String cqplibpath = TXMPreferences.getString(CQPLibPreferences.CQI_SERVER_PATH_TO_CQPLIB, CQPLibPreferences.PREFERENCES_NODE);
170
				String cqplibpath = CQPLibPreferences.getInstance().getString(CQPLibPreferences.CQI_SERVER_PATH_TO_CQPLIB);
171 171
				if (cqplibpath == null || cqplibpath.length() == 0) {
172 172
					System.err.println("Error: cqp lib path is not set in preferences");
173 173
					return false;
......
455 455
		String[] strings = {"je", "jamais"};
456 456
		int[] strucpos = {0, 1, 2, 3 , 4};
457 457

  
458
		TXMPreferences.put(CQPLibPreferences.PREFERENCES_NODE, CQPLibPreferences.CQI_SERVER_PATH_TO_CQPLIB, pathToCQPLibDirectory);
458
		CQPLibPreferences.getInstance().put(CQPLibPreferences.CQI_SERVER_PATH_TO_CQPLIB, pathToCQPLibDirectory);
459 459

  
460 460
		MemCqiServer server = new MemCqiServer(pathToRegistry, pathToInitFile, " -b 10000000 -d OFF", false);
461 461
		if (server.start()) System.out.println("Mem Server ok");
tmp/org.txm.searchengine.cqp.core/src/org/txm/importer/cwb/CwbMakeAll.java (revision 1066)
104 104
	public boolean run(String corpusName,
105 105
			String pathToRegistry, boolean monitorOutput) throws ServerNotFoundException, InterruptedException, IOException {
106 106
		
107
		File pathToExecutable = new File(TXMPreferences.getString(CQPLibPreferences.CQI_SERVER_PATH_TO_CQPLIB, CQPLibPreferences.PREFERENCES_NODE), 
107
		File pathToExecutable = new File(CQPLibPreferences.getInstance().getString(CQPLibPreferences.CQI_SERVER_PATH_TO_CQPLIB), 
108 108
				"cwb-makeall"+(System.getProperty("os.name").toLowerCase().contains("windows")?".exe":""));
109 109
		
110 110
		return run(pathToExecutable.getAbsolutePath(), corpusName, pathToRegistry, monitorOutput);
tmp/org.txm.searchengine.cqp.core/src/org/txm/importer/cwb/CwbAlign.java (revision 1066)
56 56
	 * @param binpath the binpath
57 57
	 */
58 58
	public CwbAlign() {
59
		this.binpath = TXMPreferences.getString(CQPLibPreferences.CQI_SERVER_PATH_TO_CQPLIB, CQPLibPreferences.PREFERENCES_NODE);
59
		this.binpath = CQPLibPreferences.getInstance().getString(CQPLibPreferences.CQI_SERVER_PATH_TO_CQPLIB);
60 60
	}
61 61
	
62 62
	
tmp/org.txm.searchengine.cqp.core/src/org/txm/importer/cwb/CwbEncode.java (revision 1066)
108 108
			String inputFile, String pathToRegistry, String[] pAttributes,
109 109
			String[] sAttributes, boolean monitorOutput) throws ServerNotFoundException, InterruptedException, IOException {
110 110
		
111
		File pathToExecutable = new File(TXMPreferences.getString(CQPLibPreferences.CQI_SERVER_PATH_TO_CQPLIB, CQPLibPreferences.PREFERENCES_NODE),
111
		File pathToExecutable = new File(CQPLibPreferences.getInstance().getString(CQPLibPreferences.CQI_SERVER_PATH_TO_CQPLIB),
112 112
				"cwb-encode"+(System.getProperty("os.name").toLowerCase().contains("windows")?".exe":""));
113 113

  
114 114
		return run(pathToExecutable.getAbsolutePath(), pathToData, inputFile,
tmp/org.txm.searchengine.cqp.core/src/org/txm/importer/cwb/CwbProcess.java (revision 1066)
90 90
	 * @return true if the 'filename' executable file set in preferences is available 
91 91
	 */
92 92
	public static boolean isExecutableAvailable(String filename) {
93
		File pathToExecutable = new File(TXMPreferences.getString(CQPLibPreferences.CQI_SERVER_PATH_TO_CQPLIB, CQPLibPreferences.PREFERENCES_NODE), filename);
93
		File pathToExecutable = new File(CQPLibPreferences.getInstance().getString(CQPLibPreferences.CQI_SERVER_PATH_TO_CQPLIB), filename);
94 94

  
95 95
		if (!pathToExecutable.exists()) {
96 96
			System.out.println("Error: "+pathToExecutable.getAbsolutePath()+" not found.");
......
262 262
	 */
263 263
	public static String getCWBLocation()
264 264
	{
265
		String cwbLoc = TXMPreferences.getString(CQPLibPreferences.CQI_SERVER_PATH_TO_CQPLIB, CQPLibPreferences.PREFERENCES_NODE)+File.separator;
265
		String cwbLoc = CQPLibPreferences.getInstance().getString(CQPLibPreferences.CQI_SERVER_PATH_TO_CQPLIB)+File.separator;
266 266

  
267 267
		if (!new File(cwbLoc).exists()) {
268 268
			System.out.println(TXMCoreMessages.CwbProcess_5+cwbLoc);
tmp/org.txm.core.tests/src/org/txm/core/tests/manual/ToolBoxTesterRCPApplication.java (revision 1066)
43 43
//			System.out.println(arg);
44 44
//		}
45 45

  
46
		//FIXME: tests to retrieve PREFERENCE_NODE static field from the subclasses
47 46
//		System.err.println("ToolBoxTesterApplication.start() runtime node qualifier = " + RPreferences.getNodeQualifier());
48 47
//		System.err.println("ToolBoxTesterApplication.start(): " + RPreferences.getString(RPreferences.PATH_TO_EXECUTABLE));
49 48

  
tmp/org.txm.treetagger.rcp/src/org/txm/treetagger/rcp/handlers/Train.java (revision 1066)
348 348

  
349 349
						TreeTagger tt = new TreeTagger(treetaggerBinDirectory, options);
350 350
						tt.settoken();
351
						tt.setquiet();
352
						tt.setlemma();
351
						
352
						//tt.setlemma();
353 353
						tt.setsgml();
354 354
						tt.setst(sentenceTag);
355
						tt.setproto();
355
						//tt.setproto();
356 356
						tt.setutf8();
357
						tt.debug(true);
357
						int cl = TreeTaggerPreferences.getInstance().getInt(TreeTaggerPreferences.OPTIONS_CL);
358
						if (cl > 0) {
359
							tt.setcl(cl);
360
						}
361
						
362
						float dtg = TreeTaggerPreferences.getInstance().getFloat(TreeTaggerPreferences.OPTIONS_DTG);
363
						if (dtg > 0) {
364
							tt.setdtg(dtg);
365
						}
366
						
367
						float sw = TreeTaggerPreferences.getInstance().getFloat(TreeTaggerPreferences.OPTIONS_SW);
368
						if (sw > 0) {
369
							tt.setsw(sw);
370
						}
371
						
372
						float atg = TreeTaggerPreferences.getInstance().getFloat(TreeTaggerPreferences.OPTIONS_ATG);
373
						if (atg > 0) {
374
							tt.setatg(atg);
375
						}
376
						
377
						float ecw = TreeTaggerPreferences.getInstance().getFloat(TreeTaggerPreferences.OPTIONS_ECW);
378
						if (ecw > 0) {
379
							tt.setecw(ecw);
380
						}
381
						
382
						float lt = TreeTaggerPreferences.getInstance().getFloat(TreeTaggerPreferences.OPTIONS_LT);
383
						if (lt > 0) {
384
							tt.setlt(lt);
385
						}
386
						
387
						if (TreeTaggerPreferences.getInstance().getBoolean(TreeTaggerPreferences.OPTIONS_DEBUG)) {
388
							tt.debug(true);
389
						} else {
390
							tt.setquiet();
391
						}
392
						
358 393
						tt.traintreetagger(lexique2.getAbsolutePath(), openclassfile.getAbsolutePath(), ttSrcFile.getAbsolutePath(), model.getAbsolutePath());
359 394
						
360 395
						System.out.println("Done: "+model.getAbsolutePath());
tmp/org.txm.treetagger.rcp/src/org/txm/treetagger/rcp/preferences/TreeTaggerPreferencePage.java (revision 1066)
79 79
	public void init(IWorkbench workbench) {
80 80
		this.setPreferenceStore(new TXMPreferenceStore(TreeTaggerPreferences.getInstance().getPreferencesNodeQualifier()));
81 81
	}
82

  
83 82
}
tmp/org.txm.progression.rcp/src/org/txm/progression/rcp/preferences/ProgressionPreferencePage.java (revision 1066)
77 77
	public void init(IWorkbench workbench) {
78 78
		Log.info("ProgressionPreferencePage.init()" + ProgressionPreferences.CHART_CUMULATIVE); // $NON-NLS-1$
79 79
		
80
		//this.setPreferenceStore(new TXMPreferenceStore(ProgressionPreferences.PREFERENCES_NODE));
81
		//System.out.println("ProgressionPreferences.getInstance() " + ProgressionPreferences.PREFERENCES_NODE);
82

  
83 80
		this.setPreferenceStore(new TXMPreferenceStore(ProgressionPreferences.getInstance().getPreferencesNodeQualifier()));
84 81
		
85 82
		//FIXME: description
tmp/org.txm.chartsengine.r.rcp/src/org/txm/rcp/chartsengine/r/preferences/RChartsEnginePreferencePage.java (revision 1066)
102 102
				//FIXME: old code
103 103
				// Set the first charts engine supported export file format as default charts export file format
104 104

  
105
//				TXMPreferences.putString(ChartsEnginePreferences.PREFERENCES_NODE, ChartsEnginePreferences.RDEVICE, ChartsEngine.getCurrent().getSupportedOutputFileFormats().get(0));
105
//				ChartsEnginePreferences.getInstance().put(ChartsEnginePreferences.RDEVICE, ChartsEngine.getCurrent().getSupportedOutputFileFormats().get(0));
106 106
//				
107 107
//				// Refresh the User\Export preference page to update "Default charts export file format" combo box
108 108
//				PlatformUI.getWorkbench().getPreferenceManager().
tmp/org.txm.concordance.rcp/src/org/txm/concordance/rcp/editors/ConcordanceEditor.java (revision 1066)
140 140

  
141 141
	public static final String ID = ConcordanceEditor.class.getName();
142 142

  
143
	String locale = TXMPreferences.getString(RCPPreferences.UI_LOCALE, RCPPreferences.PREFERENCES_NODE);
143
	String locale = RCPPreferences.getInstance().getString(RCPPreferences.UI_LOCALE);
144 144

  
145 145

  
146 146
	private static final String BACKTOTEXT_COMMAND_ID = "org.txm.rcp.extensionpoint.backtotext"; //$NON-NLS-1$
tmp/org.txm.rcp/src/main/java/org/txm/rcp/editors/TXMEditor.java (revision 1066)
472 472
	@Override
473 473
	public void doSave(IProgressMonitor monitor) {
474 474
		// FIXME: SJ: to discuss. A this moment the save is automatically done or not in TXMResult.compute() according to a preference of the TBX
475
//		if (TXMPreferences.getBoolean(TBXPreferences.AUTO_SAVE_RESULTS, TBXPreferences.PREFERENCES_NODE)) { // ?
475
//		if (TBXPreferences.getInstance().getBoolean(TBXPreferences.AUTO_SAVE_RESULTS)) { // ?
476 476
//			getResult().saveParameters();
477 477
//		}
478 478

  
tmp/org.txm.rcp/src/main/java/org/txm/rcp/editors/listeners/ComputeListener.java (revision 1066)
25 25

  
26 26
	@Override
27 27
	public void handleEvent(Event event) {
28
		if (TXMPreferences.getBoolean(RCPPreferences.AUTO_UPDATE_EDITOR, RCPPreferences.PREFERENCES_NODE)) {
28
		if (RCPPreferences.getInstance().getBoolean(RCPPreferences.AUTO_UPDATE_EDITOR)) {
29 29
			this.editor.compute(true);
30 30
		}
31 31
	}
tmp/org.txm.rcp/src/main/java/org/txm/rcp/editors/listeners/ComputeSelectionListener.java (revision 1066)
38 38
	public void selectionChanged(SelectionChangedEvent event) {
39 39
		// to skip programmatically setSelection() calls on some widgets or if auto-compute preference is false
40 40
		if(!mustIgnoreEvent(event)
41
				&& TXMPreferences.getBoolean(RCPPreferences.AUTO_UPDATE_EDITOR, RCPPreferences.PREFERENCES_NODE))	{
41
				&& RCPPreferences.getInstance().getBoolean(RCPPreferences.AUTO_UPDATE_EDITOR))	{
42 42
			this.editor.compute(true);
43 43
		}
44 44
	}
tmp/org.txm.rcp/src/main/java/org/txm/rcp/ApplicationWorkbenchAdvisor.java (revision 1066)
619 619
		@Override
620 620
		public void publish(final LogRecord record) {
621 621
			//System.out.println("severeDialobBoxHandler.publish()");
622
			boolean showSevereDialobBox = TXMPreferences.getBoolean(RCPPreferences.SHOW_SEVERE_DIALOG, RCPPreferences.PREFERENCES_NODE);
622
			boolean showSevereDialobBox = RCPPreferences.getInstance().getBoolean(RCPPreferences.SHOW_SEVERE_DIALOG);
623 623
			if (showSevereDialobBox) {
624 624
				if (record.getLevel() != Level.SEVERE) return;
625 625

  
tmp/org.txm.rcp/src/main/java/org/txm/rcp/Application.java (revision 1066)
91 91
//				System.out.println("Stand alone launch, creating minimal TXM user home directory in "+userhomeDirectory.getAbsolutePath());
92 92
//				System.out.println("Sample corpora, scripts, import scripts and macros files are not yet installed.");
93 93
//				
94
//				TXMPreferences.put(TBXPreferences.PREFERENCES_NODE, TBXPreferences.USER_TXM_HOME, userhomeDirectory.getAbsolutePath());
95
//				TXMPreferences.put(TBXPreferences.PREFERENCES_NODE, TBXPreferences.INSTALL_DIR, userhomeDirectory.getParentFile().getAbsolutePath());
94
//				TBXPreferences.getInstance().put(TBXPreferences.USER_TXM_HOME, userhomeDirectory.getAbsolutePath());
95
//				TBXPreferences.getInstance().put(TBXPreferences.INSTALL_DIR, userhomeDirectory.getParentFile().getAbsolutePath());
96 96
//				
97 97
//				File corpusworkspaceDirectory = new File(userhomeDirectory, "workspaces");
98 98
//				corpusworkspaceDirectory.mkdirs();
tmp/org.txm.rcp/src/main/java/org/txm/rcp/handlers/results/DeleteObject.java (revision 1066)
104 104
	public static synchronized boolean askContinueToDelete(final IStructuredSelection selection) {
105 105
		continueToDelete = true;
106 106
		
107
		boolean showAlert = !TXMPreferences.getBoolean(RCPPreferences.USER_ALERT_DELETE, RCPPreferences.PREFERENCES_NODE);
107
		boolean showAlert = !RCPPreferences.getInstance().getBoolean(RCPPreferences.USER_ALERT_DELETE);
108 108
		
109 109
		if (showAlert) {
110 110
			Display.getDefault().syncExec(new Runnable() {
tmp/org.txm.rcp/src/main/java/org/txm/rcp/handlers/scripts/ExecuteScript.java (revision 1066)
120 120

  
121 121
		if (executionFromEditor && txteditor != null) { // save file if needed 
122 122
			if (txteditor.isSaveOnCloseNeeded()) { // check if file need to be saved
123
				boolean doit = TXMPreferences.getBoolean(RCPPreferences.SAVE_BEFORE_EXECUTION, RCPPreferences.PREFERENCES_NODE);
123
				boolean doit = RCPPreferences.getInstance().getBoolean(RCPPreferences.SAVE_BEFORE_EXECUTION);
124 124
				//System.out.println("Save file? "+doit);
125 125
				if (!doit) { // ask user
126 126
					MessageDialog dialog = new MessageDialog(shell, TXMUIMessages.ExecuteScript_0+result, null,
......
132 132
						    Composite container = (Composite) super.createDialogArea(parent);
133 133
						    checkDefault = new Button(container, SWT.CHECK);
134 134
						    checkDefault.setText(TXMUIMessages.ExecuteScript_6);
135
						    boolean b = TXMPreferences.getBoolean(RCPPreferences.SAVE_BEFORE_EXECUTION, RCPPreferences.PREFERENCES_NODE);
135
						    boolean b = RCPPreferences.getInstance().getBoolean(RCPPreferences.SAVE_BEFORE_EXECUTION);
136 136
						    checkDefault.setSelection(b);
137 137
						    
138 138
						    checkDefault.addSelectionListener(new SelectionListener() {
......
140 140
								@Override
141 141
								public void widgetSelected(SelectionEvent e) {
142 142
									boolean b = checkDefault.getSelection();
143
									TXMPreferences.put(RCPPreferences.PREFERENCES_NODE, RCPPreferences.SAVE_BEFORE_EXECUTION, b);
143
									RCPPreferences.getInstance().put(RCPPreferences.SAVE_BEFORE_EXECUTION, b);
144 144
								}
145 145
								
146 146
								@Override
tmp/org.txm.rcp/src/main/java/org/txm/rcp/p2/plugins/TXMUpdateHandler.java (revision 1066)
208 208
			Log.printStackTrace(e);
209 209
		}
210 210

  
211
		String updateLevel = TXMPreferences.getString(RCPPreferences.UPDATE_LEVEL, null, RCPPreferences.PREFERENCES_NODE, "STABLE");
211
		String updateLevel = RCPPreferences.getInstance().getString(RCPPreferences.UPDATE_LEVEL);
212 212
		boolean alphaMode = false;
213 213
		boolean betaMode = false;
214 214
		boolean devMode = false;
......
276 276
			Log.printStackTrace(e);
277 277
		}
278 278

  
279
		String updateLevel = TXMPreferences.getString(RCPPreferences.UPDATE_LEVEL, null, RCPPreferences.PREFERENCES_NODE, "STABLE");
279
		String updateLevel = RCPPreferences.getInstance().getString(RCPPreferences.UPDATE_LEVEL);
280 280
		boolean alphaMode = false;
281 281
		boolean betaMode = false;
282 282
		boolean devMode = false;
... Ce différentiel a été tronqué car il excède la taille maximale pouvant être affichée.

Formats disponibles : Unified diff