Revision 875

tmp/org.txm.annotation.kr.core/src/org/txm/annotation/kr/core/repository/KnowledgeRepositoryManager.java (revision 875)
105 105

  
106 106
	public static KnowledgeRepository getKnowledgeRepository(String name) {
107 107
		KnowledgeRepository kr = null;
108
		File krconf = new File(Toolbox.getTXMHOMEPATH(),"repositories/"+name+"/conf.xml");
108
		File krconf = new File(Toolbox.getTxmHomePath(),"repositories/"+name+"/conf.xml");
109 109
		if (repositories.containsKey(name)) {
110 110
			kr = repositories.get(name);
111 111
		} else {
......
132 132
	public static KnowledgeRepository getKnowledgeRepository(String name, MainCorpus corpus) {
133 133
		KnowledgeRepository kr = null;
134 134

  
135
		File krconf = new File(Toolbox.getTXMHOMEPATH(),"repositories/"+name+"/conf.xml");
135
		File krconf = new File(Toolbox.getTxmHomePath(),"repositories/"+name+"/conf.xml");
136 136
		
137 137
		if (repositories.containsKey(name)) {
138 138
			kr = repositories.get(name);
......
232 232
	public static String generateLocalURLPage(String krname, String name, String id) {
233 233

  
234 234
		KnowledgeRepository kr = getKnowledgeRepository(krname);
235
		String path = Toolbox.getTXMHOMEPATH()+"/repositories/"+krname;
235
		String path = Toolbox.getTxmHomePath()+"/repositories/"+krname;
236 236
		//File htmlTemplateFile = new File(path+"/template.html");
237 237
		File newHtmlFile = null;
238 238
		String htmlString;
tmp/org.txm.annotation.kr.core/src/org/txm/annotation/kr/core/repository/LocalKnowledgeRepository.java (revision 875)
27 27

  
28 28
		String path = accessProperties.get(SQLConnection.SQL_ADDRESS);
29 29
		if (path == null || path.trim().length() == 0) { // no address, forge one 
30
			path = Toolbox.getTXMHOMEPATH()+"/repositories/"+getName();
30
			path = Toolbox.getTxmHomePath()+"/repositories/"+getName();
31 31
			System.out.println("No address given to build values. No values created");
32 32
			return true;
33 33
		}
tmp/org.txm.annotation.kr.core/src/org/txm/annotation/kr/core/repository/KnowledgeRepository.java (revision 875)
70 70
	 * @return
71 71
	 */
72 72
	public EntityManager initializeEntityManager(){
73
		this.dbPath = Toolbox.getTXMHOMEPATH()+"/repositories/"+name;
73
		this.dbPath = Toolbox.getTxmHomePath()+"/repositories/"+name;
74 74
		//System.out.println("KnowledgeRepository.initializeEntityManager [DB @ "+dbPath+"]");
75 75
		EntityManagerFactory emf;
76 76
		HashMap<String, Object> properties = new HashMap<String, Object>();
tmp/org.txm.annotation.kr.core/src/org/txm/annotation/kr/core/conversion/CorpusRuledConvertion.java (revision 875)
94 94
					}
95 95
					if (errors.size() > 10) {
96 96
						try {
97
							File errorFile = new File(Toolbox.getTXMHOMEPATH(), "errors.txt");
97
							File errorFile = new File(Toolbox.getTxmHomePath(), "errors.txt");
98 98
							IOUtils.write(errorFile, StringUtils.join(errors, "\t"));
99 99
							System.out.println("More errors, see "+errorFile.getAbsolutePath());
100 100
						} catch (Exception e) {
tmp/org.txm.statsengine.r.rcp/src/org/txm/statsengine/r/rcp/views/RVariablesView.java (revision 875)
253 253
				//System.out.println("reload");
254 254
				
255 255
				try {
256
					File homedir = new File(Toolbox.getTXMHOMEPATH());
256
					File homedir = new File(Toolbox.getTxmHomePath());
257 257
					long time = System.currentTimeMillis();
258 258
					File tmp = new File(homedir, "REvalLogs.txt"); //$NON-NLS-1$
259 259
					RWorkspace.saveEvalLog(tmp);
tmp/org.txm.statsengine.r.rcp/META-INF/MANIFEST.MF (revision 875)
1 1
Manifest-Version: 1.0
2
Require-Bundle: org.eclipse.ui;bundle-version="3.106.1";visibility:=re
3
 export,org.txm.utils;bundle-version="1.0.0";visibility:=reexport,org.
4
 eclipse.osgi;bundle-version="3.10.2";visibility:=reexport,org.eclipse
5
 .jface.text;bundle-version="3.9.2";visibility:=reexport,org.eclipse.c
6
 ore.runtime;bundle-version="3.10.0";visibility:=reexport,org.eclipse.
7
 ui.console;bundle-version="3.5.300";visibility:=reexport,org.eclipse.
8
 ui.ide;bundle-version="3.10.2";visibility:=reexport,org.txm.index.cor
9
 e;bundle-version="1.0.0";visibility:=reexport,org.txm.concordance.cor
10
 e;bundle-version="1.0.0";visibility:=reexport,org.txm.lexicaltable.co
11
 re;bundle-version="1.0.0";visibility:=reexport,org.txm.ca.core;bundle
12
 -version="1.0.0";visibility:=reexport,org.txm.specificities.core;bund
13
 le-version="1.0.0";visibility:=reexport,org.txm.progression.core;bund
14
 le-version="1.0.0";visibility:=reexport,org.txm.ahc.core;bundle-versi
15
 on="1.0.0";visibility:=reexport,org.txm.cooccurrence.core;bundle-vers
16
 ion="1.0.0";visibility:=reexport,org.txm.searchengine.core;bundle-ver
17
 sion="1.0.0";visibility:=reexport,org.txm.referencer.core;bundle-vers
18
 ion="1.0.0";visibility:=reexport,org.txm.statsengine.r.core;bundle-ve
19
 rsion="1.0.0";visibility:=reexport,org.txm.searchengine.cqp.core;bund
20
 le-version="1.1.0";visibility:=reexport,org.txm.statsengine.core;bund
21
 le-version="1.0.0";visibility:=reexport,org.txm.core;bundle-version="
22
 0.7.0";visibility:=reexport,org.txm.rcp;bundle-version="0.7.8";visibi
23
 lity:=reexport
2
Require-Bundle: org.eclipse.ui;bundle-version="3.106.1";visibility:=reexport,
3
 org.txm.utils;bundle-version="1.0.0";visibility:=reexport,
4
 org.eclipse.osgi;bundle-version="3.10.2";visibility:=reexport,
5
 org.eclipse.jface.text;bundle-version="3.9.2";visibility:=reexport,
6
 org.eclipse.core.runtime;bundle-version="3.10.0";visibility:=reexport,
7
 org.eclipse.ui.console;bundle-version="3.5.300";visibility:=reexport,
8
 org.eclipse.ui.ide;bundle-version="3.10.2";visibility:=reexport,
9
 org.txm.index.core;bundle-version="1.0.0";visibility:=reexport,
10
 org.txm.concordance.core;bundle-version="1.0.0";visibility:=reexport,
11
 org.txm.lexicaltable.core;bundle-version="1.0.0";visibility:=reexport,
12
 org.txm.ca.core;bundle-version="1.0.0";visibility:=reexport,
13
 org.txm.specificities.core;bundle-version="1.0.0";visibility:=reexport,
14
 org.txm.progression.core;bundle-version="1.0.0";visibility:=reexport,
15
 org.txm.ahc.core;bundle-version="1.0.0";visibility:=reexport,
16
 org.txm.cooccurrence.core;bundle-version="1.0.0";visibility:=reexport,
17
 org.txm.searchengine.core;bundle-version="1.0.0";visibility:=reexport,
18
 org.txm.referencer.core;bundle-version="1.0.0";visibility:=reexport,
19
 org.txm.statsengine.r.core;bundle-version="1.0.0";visibility:=reexport,
20
 org.txm.searchengine.cqp.core;bundle-version="1.1.0";visibility:=reexport,
21
 org.txm.statsengine.core;bundle-version="1.0.0";visibility:=reexport,
22
 org.txm.core;bundle-version="0.7.0";visibility:=reexport,
23
 org.txm.rcp;bundle-version="0.8.0"
24 24
Export-Package: org.txm.rcp.commands.R,
25 25
 org.txm.statsengine.r.rcp.decorators,
26 26
 org.txm.statsengine.r.rcp.handlers,
tmp/org.txm.annotation.kr.rcp/src/org/txm/annotation/kr/rcp/commands/RecodeCorpus.java (revision 875)
105 105
		monitor.worked(1);
106 106
		
107 107
		// update corpus indexes and edition
108
		String txmhome = Toolbox.getTXMHOMEPATH();
108
		String txmhome = Toolbox.getTxmHomePath();
109 109

  
110 110
		BaseParameters params = corpus.getBase().getBaseParameters();
111 111
		params.getKeyValueParameters().put(ImportKeys.MULTITHREAD, "false"); //too soon
tmp/org.txm.annotation.kr.rcp/src/org/txm/annotation/kr/rcp/commands/ExportStandoff.java (revision 875)
81 81
		//FileDialog dialog = new FileDialog(shell, SWT.SAVE);
82 82
		FileDialog dialog = new FileDialog(shell, SWT.SAVE);
83 83
		MainCorpus corpus = (MainCorpus) s;
84
		String path = Toolbox.getTXMHOMEPATH();
84
		String path = Toolbox.getTxmHomePath();
85 85
		dialog.setFilterPath(path); //To set a specific path
86 86
		dialog.setFileName(corpus.getName()+"_annotations.zip");
87 87
		dialog.setFilterExtensions(new String[]{"*.zip"});
tmp/org.txm.ca.core/src/org/txm/ca/core/messages/CACoreMessages.java (revision 875)
12 12
 */
13 13
public class CACoreMessages extends NLS {
14 14

  
15
	private static final String BUNDLE_NAME = "org.txm.ca.core.messages.messages"; //$NON-NLS-1$
16
	
15 17
	public static String charts_error_factorialMap_cantCreateCAChartFile;
16 18
	public static String charts_error_singularValues_cantCreateSingularValuesChart;
17 19

  
......
51 53
	public static String error_unableToExtractSingularValues;
52 54

  
53 55
	static {
54
		Utf8NLS.initializeMessages(CACoreMessages.class);
56
		Utf8NLS.initializeMessages(BUNDLE_NAME, CACoreMessages.class);
55 57
	}
56 58
}
tmp/org.txm.ahc.core/src/org/txm/ahc/core/messages/AHCCoreMessages.java (revision 875)
12 12
 */
13 13
public class AHCCoreMessages extends NLS {
14 14
	
15
	
15
	private static final String BUNDLE_NAME = "org.txm.ahc.core.messages.messages"; //$NON-NLS-1$
16 16

  
17 17
	public static String RESULT_TYPE;
18 18
	
......
21 21
	
22 22
	
23 23
	static {
24
		Utf8NLS.initializeMessages(AHCCoreMessages.class);
24
		Utf8NLS.initializeMessages(BUNDLE_NAME, AHCCoreMessages.class);
25 25
	}
26 26
	
27 27

  
tmp/org.txm.xmleditor.rcp/META-INF/MANIFEST.MF (revision 875)
1 1
Manifest-Version: 1.0
2
Require-Bundle: org.eclipse.ui;visibility:=reexport,org.eclipse.core.r
3
 untime;visibility:=reexport,org.eclipse.wst.xml.ui;bundle-version="1.
4
 1.401";visibility:=reexport,org.eclipse.core.filesystem;bundle-versio
5
 n="1.4.0";visibility:=reexport,org.eclipse.ui.ide;bundle-version="3.9
6
 .0";visibility:=reexport,org.eclipse.wst.sse.ui;bundle-version="1.3.2
7
 00";visibility:=reexport,org.eclipse.wst.sse.core;bundle-version="1.1
8
 .801";visibility:=reexport,org.eclipse.wst.xml.core;bundle-version="1
9
 .1.801";visibility:=reexport,org.eclipse.wst.common.uriresolver;bundl
10
 e-version="1.2.100";visibility:=reexport,org.eclipse.wst.common.core;
11
 bundle-version="1.2.0";visibility:=reexport,org.eclipse.wst.validatio
12
 n;bundle-version="1.2.500";visibility:=reexport,org.eclipse.wst.valid
13
 ation.ui;bundle-version="1.2.400";visibility:=reexport,org.eclipse.se
14
 arch;bundle-version="3.9.0";visibility:=reexport,org.eclipse.wst.comm
15
 on.project.facet.core;bundle-version="1.4.300";visibility:=reexport,o
16
 rg.eclipse.wst.common.ui;bundle-version="1.1.500";visibility:=reexpor
17
 t,org.eclipse.debug.core;bundle-version="3.8.0";visibility:=reexport,
18
 org.eclipse.debug.ui;bundle-version="3.9.0";visibility:=reexport,org.
19
 eclipse.wst.common.frameworks;bundle-version="1.2.200";visibility:=re
20
 export,org.eclipse.wst.common.frameworks.ui;bundle-version="1.2.201";
21
 visibility:=reexport,org.apache.xml.serializer;bundle-version="2.7.1"
22
 ;visibility:=reexport,org.eclipse.ui.views;bundle-version="3.7.0";vis
23
 ibility:=reexport,org.eclipse.jface.text;bundle-version="3.9.2";visib
24
 ility:=reexport,org.eclipse.core.expressions;bundle-version="3.4.600"
25
 ;visibility:=reexport,org.txm.core;bundle-version="0.7.0";visibility:
26
 =reexport,org.txm.rcp;bundle-version="0.7.8";visibility:=reexport
27
Export-Package: org.txm.xmleditor,xmleditorrcp
2
Require-Bundle: org.eclipse.ui;visibility:=reexport,
3
 org.eclipse.core.runtime;visibility:=reexport,
4
 org.eclipse.wst.xml.ui;bundle-version="1.1.401";visibility:=reexport,
5
 org.eclipse.core.filesystem;bundle-version="1.4.0";visibility:=reexport,
6
 org.eclipse.ui.ide;bundle-version="3.9.0";visibility:=reexport,
7
 org.eclipse.wst.sse.ui;bundle-version="1.3.200";visibility:=reexport,
8
 org.eclipse.wst.sse.core;bundle-version="1.1.801";visibility:=reexport,
9
 org.eclipse.wst.xml.core;bundle-version="1.1.801";visibility:=reexport,
10
 org.eclipse.wst.common.uriresolver;bundle-version="1.2.100";visibility:=reexport,
11
 org.eclipse.wst.common.core;bundle-version="1.2.0";visibility:=reexport,
12
 org.eclipse.wst.validation;bundle-version="1.2.500";visibility:=reexport,
13
 org.eclipse.wst.validation.ui;bundle-version="1.2.400";visibility:=reexport,
14
 org.eclipse.search;bundle-version="3.9.0";visibility:=reexport,
15
 org.eclipse.wst.common.project.facet.core;bundle-version="1.4.300";visibility:=reexport,
16
 org.eclipse.wst.common.ui;bundle-version="1.1.500";visibility:=reexport,
17
 org.eclipse.debug.core;bundle-version="3.8.0";visibility:=reexport,
18
 org.eclipse.debug.ui;bundle-version="3.9.0";visibility:=reexport,
19
 org.eclipse.wst.common.frameworks;bundle-version="1.2.200";visibility:=reexport,
20
 org.eclipse.wst.common.frameworks.ui;bundle-version="1.2.201";visibility:=reexport,
21
 org.apache.xml.serializer;bundle-version="2.7.1";visibility:=reexport,
22
 org.eclipse.ui.views;bundle-version="3.7.0";visibility:=reexport,
23
 org.eclipse.jface.text;bundle-version="3.9.2";visibility:=reexport,
24
 org.eclipse.core.expressions;bundle-version="3.4.600";visibility:=reexport,
25
 org.txm.core;bundle-version="0.7.0";visibility:=reexport,
26
 org.txm.rcp;bundle-version="0.7.8";visibility:=reexport
27
Export-Package: org.txm.xmleditor,
28
 org.txm.xmleditor.messages
28 29
Bundle-Vendor: Textometrie.org
29 30
Bundle-ActivationPolicy: lazy
30 31
Bundle-Version: 1.0.0.qualifier
31 32
Bundle-Name: %Bundle-Name
32 33
Bundle-ManifestVersion: 2
33
Bundle-Activator: xmleditorrcp.Activator
34
Bundle-SymbolicName: XmlEditorRCP;singleton:=true
34
Bundle-SymbolicName: org.txm.xmleditor.rcp;singleton:=true
35 35
Bundle-RequiredExecutionEnvironment: JavaSE-1.7
36 36

  
tmp/org.txm.xmleditor.rcp/src/xmleditorrcp/messages_fr.properties (revision 875)
1
OpenXMLEditor_1=Ouverture de l'?diteur XML...
2
OpenXMLEditor_3=Ouverture de l'?diteur XML...
3
OpenXMLEditor_4=Erreur : 
tmp/org.txm.xmleditor.rcp/src/xmleditorrcp/Activator.java (revision 875)
1
package xmleditorrcp;
2

  
3
import org.eclipse.jface.resource.ImageDescriptor;
4
import org.eclipse.ui.plugin.AbstractUIPlugin;
5
import org.osgi.framework.BundleContext;
6

  
7
/**
8
 * The activator class controls the plug-in life cycle
9
 */
10
public class Activator extends AbstractUIPlugin {
11

  
12
	// The plug-in ID
13
	public static final String PLUGIN_ID = "XmlEditorRCP"; //$NON-NLS-1$
14

  
15
	// The shared instance
16
	private static Activator plugin;
17
	
18
	/**
19
	 * The constructor
20
	 */
21
	public Activator() {
22
	}
23

  
24
	/*
25
	 * (non-Javadoc)
26
	 * @see org.eclipse.ui.plugin.AbstractUIPlugin#start(org.osgi.framework.BundleContext)
27
	 */
28
	public void start(BundleContext context) throws Exception {
29
		super.start(context);
30
//		IWorkbenchPage page = PlatformUI.getWorkbench().getActiveWorkbenchWindow().getActivePage();
31
//		PreferenceManager pm = PlatformUI.getWorkbench().getPreferenceManager();
32
//		System.out.println("REMOVE PAGE: org.eclipse.team.svn.ui.SVNTeamPreferences");
33
//		pm.remove("org.eclipse.team.svn.ui.SVNTeamPreferences"); //$NON-NLS-1$
34

  
35
//		//Remove RCP Web browser preference page
36
//		IPreferenceNode[] arr = pm.getRootSubNodes();
37
//		for(IPreferenceNode pn : arr){
38
//			//		    System.out.println("Label:" + pn.getLabelText() + " ID:" + pn.getId()+" Type: "+pn.getClass());
39
//			//		    for (IPreferenceNode subn : pn.getSubNodes()) {
40
//			//		    	System.out.println(" SLabel:" + subn.getLabelText() + " ID:" + subn.getId());
41
//			//		    }
42
//			if ("org.eclipse.ui.preferencePages.Workbench".equals(pn.getId())) {
43
//				WorkbenchPreferenceNode pwn = (WorkbenchPreferenceNode)pn;
44
//				pwn.remove("org.eclipse.ui.browser.preferencePage");
45
//			}
46
//		}
47
		//page.hideActionSet("org.eclipse.team.svn.ui.SVNTeamPreferences"); //$NON-NLS-1$
48
		// Validation
49
	 	//page.hideActionSet("org.eclipse.ui.edit.text.actionSet.annotationNavigation"); //$NON-NLS-1$
50
		plugin = this;
51
	}
52

  
53
	/*
54
	 * (non-Javadoc)
55
	 * @see org.eclipse.ui.plugin.AbstractUIPlugin#stop(org.osgi.framework.BundleContext)
56
	 */
57
	public void stop(BundleContext context) throws Exception {
58
		plugin = null;
59
		super.stop(context);
60
	}
61

  
62
	/**
63
	 * Returns the shared instance
64
	 *
65
	 * @return the shared instance
66
	 */
67
	public static Activator getDefault() {
68
		return plugin;
69
	}
70

  
71
	/**
72
	 * Returns an image descriptor for the image file at the given
73
	 * plug-in relative path
74
	 *
75
	 * @param path the path
76
	 * @return the image descriptor
77
	 */
78
	public static ImageDescriptor getImageDescriptor(String path) {
79
		return imageDescriptorFromPlugin(PLUGIN_ID, path);
80
	}
81
}
tmp/org.txm.xmleditor.rcp/src/xmleditorrcp/XMLEditorMessages.java (revision 875)
1
package xmleditorrcp;
2

  
3
import org.eclipse.osgi.util.NLS;
4
import org.txm.utils.messages.Utf8NLS;
5

  
6
public class XMLEditorMessages extends NLS {
7

  
8
	public static String OpenXMLEditor_1;
9
	public static String OpenXMLEditor_3;
10
	public static String OpenXMLEditor_4;
11
	
12
	static {
13
		// initialize resource bundle
14
		Utf8NLS.initializeMessages(XMLEditorMessages.class);
15
	}
16

  
17
	private XMLEditorMessages() {
18
	}
19
}
tmp/org.txm.xmleditor.rcp/src/xmleditorrcp/messages.properties (revision 875)
1
OpenXMLEditor_1=Open XML Editor...
2
OpenXMLEditor_3=Opening XML editor...
3
OpenXMLEditor_4=Error: 
tmp/org.txm.xmleditor.rcp/src/org/txm/xmleditor/messages/messages_fr.properties (revision 875)
1
OpenXMLEditor_1=Ouverture de l'?diteur XML...
2
OpenXMLEditor_3=Ouverture de l'?diteur XML...
3
OpenXMLEditor_4=Erreur : 
0 4

  
tmp/org.txm.xmleditor.rcp/src/org/txm/xmleditor/messages/XMLEditorMessages.java (revision 875)
1
package org.txm.xmleditor.messages;
2

  
3
import org.eclipse.osgi.util.NLS;
4
import org.txm.utils.messages.Utf8NLS;
5

  
6
public class XMLEditorMessages extends NLS {
7

  
8
	private static final String BUNDLE_NAME = "org.txm.xmleditor.messages.messages"; //$NON-NLS-1$
9
	
10
	public static String OpenXMLEditor_1;
11
	public static String OpenXMLEditor_3;
12
	public static String OpenXMLEditor_4;
13
	
14
	static {
15
		// initialize resource bundle
16
		Utf8NLS.initializeMessages(BUNDLE_NAME, XMLEditorMessages.class);
17
	}
18

  
19
	private XMLEditorMessages() {
20
	}
21
}
0 22

  
tmp/org.txm.xmleditor.rcp/src/org/txm/xmleditor/messages/messages.properties (revision 875)
1
OpenXMLEditor_1=Open XML Editor...
2
OpenXMLEditor_3=Opening XML editor...
3
OpenXMLEditor_4=Error: 
0 4

  
tmp/org.txm.xmleditor.rcp/src/org/txm/xmleditor/OpenXMLEditor.java (revision 875)
20 20
import org.eclipse.ui.PlatformUI;
21 21
import org.eclipse.ui.handlers.HandlerUtil;
22 22
import org.eclipse.ui.ide.FileStoreEditorInput;
23
import org.txm.core.preferences.TBXPreferences;
24
import org.txm.core.preferences.TXMPreferences;
23
import org.txm.Toolbox;
25 24
import org.txm.rcp.StatusLine;
26 25
import org.txm.rcp.swt.dialog.LastOpened;
27 26
import org.txm.utils.logger.Log;
27
import org.txm.xmleditor.messages.XMLEditorMessages;
28 28

  
29
import xmleditorrcp.XMLEditorMessages;
30

  
31 29
public class OpenXMLEditor  extends AbstractHandler {
32 30

  
33 31
	public static final String ID = "org.txm.xmleditor.OpenXMLEditor"; //$NON-NLS-1$
......
37 35
	public Object execute(ExecutionEvent event) throws ExecutionException {
38 36
		Shell shell = HandlerUtil.getActiveWorkbenchWindowChecked(event)
39 37
				.getShell();
40
		String txmhome = TXMPreferences.getString(TBXPreferences.USER_TXM_HOME, TBXPreferences.PREFERENCES_NODE);
38
		String txmhome = Toolbox.getTxmHomePath();
41 39
		String filename = event
42 40
				.getParameter("org.txm.rcp.commands.commandParameter2"); //$NON-NLS-1$
43 41
		if (filename != null && !filename.matches("") && !filename.matches(" ")) { //$NON-NLS-1$ //$NON-NLS-2$
tmp/org.txm.searchengine.cqp.rcp/src/org/txm/searchengine/cqp/rcp/handlers/base/ExportCorpus.java (revision 875)
74 74
		Shell shell = HandlerUtil.getActiveWorkbenchWindowChecked(event)
75 75
				.getShell();
76 76

  
77
		String txmhome = Toolbox.getTXMHOMEPATH();
77
		String txmhome = Toolbox.getTxmHomePath();
78 78
		if (!(selection.getFirstElement() instanceof MainCorpus))
79 79
			return null;
80 80

  
tmp/org.txm.analec.rcp/src/org/txm/macro/analec/misc/UnitsCorrelationMacro.groovy (revision 875)
127 127
r.eval("rownames(corrmatrix) = corrlines")
128 128
r.eval("colnames(corrmatrix) = corrcols")
129 129

  
130
def resultsDir = new File(Toolbox.getTXMHOMEPATH(), "results")
130
def resultsDir = new File(Toolbox.getTxmHomePath(), "results")
131 131
resultsDir.mkdirs()
132 132
file = File.createTempFile("txm_corr_pairs_", ".svg", resultsDir)
133 133

  
tmp/org.txm.analec.rcp/src/org/txm/macro/analec/LongueurMoyenneMacro.groovy (revision 875)
152 152

  
153 153
def corpusName = corpus.getName()
154 154

  
155
def file = File.createTempFile("txm", ".svg", new File(Toolbox.getTXMHOMEPATH(), "results"))
155
def file = File.createTempFile("txm", ".svg", new File(Toolbox.getTxmHomePath(), "results"))
156 156
println "SVG file: "+file.getAbsolutePath()
157 157
/// BEGINNING OF R SCRIPT
158 158
def script ="""
tmp/org.txm.analec.rcp/src/org/txm/macro/analec/exploit/mesures1/LongueurMoyenneMacro.groovy (revision 875)
155 155

  
156 156
def corpusName = corpus.getName()
157 157

  
158
def PNGFile = File.createTempFile("txm", ".png", new File(Toolbox.getTXMHOMEPATH(), "results"))
158
def PNGFile = File.createTempFile("txm", ".png", new File(Toolbox.getTxmHomePath(), "results"))
159 159
def PNGFilePath = PNGFile.getAbsolutePath()
160 160
println "PNG file: "+PNGFilePath
161 161

  
162
def SVGFile = File.createTempFile("txm", ".svg", new File(Toolbox.getTXMHOMEPATH(), "results"))
162
def SVGFile = File.createTempFile("txm", ".svg", new File(Toolbox.getTxmHomePath(), "results"))
163 163
def SVGFilePath = SVGFile.getAbsolutePath()
164 164
println "SVG file: "+SVGFilePath
165 165

  
tmp/org.txm.analec.rcp/src/org/txm/macro/analec/exploit/UnitsIndexMacro.groovy (revision 875)
192 192
r.eval("rownames(textpropfreqs) = props")
193 193
r.eval("colnames(textpropfreqs) = texts")
194 194

  
195
def resultsDir = new File(Toolbox.getTXMHOMEPATH(), "results")
195
def resultsDir = new File(Toolbox.getTxmHomePath(), "results")
196 196
def file = File.createTempFile("txm", ".svg", resultsDir)
197 197

  
198 198

  
tmp/org.txm.analec.rcp/src/org/txm/macro/analec/exploit/StructuresIndexMacro.groovy (revision 875)
471 471
	def textDivLengths1 = textDivLengths[0] as int[]
472 472
	r.addVectorToWorkspace("textDivLengths1", textDivLengths1)
473 473

  
474
	def PNGFile = File.createTempFile("txm", ".png", new File(Toolbox.getTXMHOMEPATH(), "results"))
474
	def PNGFile = File.createTempFile("txm", ".png", new File(Toolbox.getTxmHomePath(), "results"))
475 475
	def PNGFilePath = PNGFile.getAbsolutePath()
476 476
	println "PNG file: "+PNGFilePath
477 477

  
478
	def SVGFile = File.createTempFile("txm", ".svg", new File(Toolbox.getTXMHOMEPATH(), "results"))
478
	def SVGFile = File.createTempFile("txm", ".svg", new File(Toolbox.getTxmHomePath(), "results"))
479 479
	def SVGFilePath = SVGFile.getAbsolutePath()
480 480
	println "SVG file: "+SVGFilePath
481 481

  
tmp/org.txm.analec.rcp/src/org/txm/analec/commands/DoInstallStep.java (revision 875)
47 47
		}
48 48
		System.out.println(Messages.DoInstallStep_6+currentVersion);
49 49
		
50
		File previousAnalecMacroDirectory = new File(Toolbox.getTXMHOMEPATH(), Messages.DoInstallStep_7);
50
		File previousAnalecMacroDirectory = new File(Toolbox.getTxmHomePath(), Messages.DoInstallStep_7);
51 51
		if (previousAnalecMacroDirectory.exists() && saved != null && saved.length() > 0) {
52 52
			File back = new File(previousAnalecMacroDirectory.getParentFile(), "analec_"+saved); //$NON-NLS-1$
53 53
			if (back.exists()) {
......
58 58
			System.out.println(Messages.DoInstallStep_11+back.getAbsolutePath());
59 59
		}
60 60
		
61
		File macroDirectory = new File(Toolbox.getTXMHOMEPATH(), "scripts/macro/org/txm/macro"); //$NON-NLS-1$
61
		File macroDirectory = new File(Toolbox.getTxmHomePath(), "scripts/macro/org/txm/macro"); //$NON-NLS-1$
62 62
		if (!BundleUtils.copyFiles("AnalecRCP", "src", "org/txm/macro/", "analec", macroDirectory)) { //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ //$NON-NLS-4$
63 63
			System.out.println(Messages.DoInstallStep_17+macroDirectory.getAbsolutePath());
64 64
			return;
tmp/org.txm.analec.rcp/src/org/txm/analec/commands/ImportGlozzCorpus.java (revision 875)
163 163
				return null;
164 164
			}
165 165

  
166
			String txmhome = Toolbox.getTXMHOMEPATH();
166
			String txmhome = Toolbox.getTxmHomePath();
167 167
			File scriptsdir = new File(txmhome, "scripts/import"); //$NON-NLS-1$
168 168
			File script = new File(scriptsdir, "txtLoader.groovy"); //$NON-NLS-1$
169 169
			if (!script.exists()) {
tmp/org.txm.analec.rcp/src/org/txm/analec/commands/ImportTEICorpus.java (revision 875)
101 101
				return null;
102 102
			}
103 103

  
104
			String txmhome = Toolbox.getTXMHOMEPATH();
104
			String txmhome = Toolbox.getTxmHomePath();
105 105
			File scriptsdir = new File(txmhome, "scripts/import"); //$NON-NLS-1$
106 106
			File script = new File(scriptsdir, "txtLoader.groovy"); //$NON-NLS-1$
107 107
			if (!script.exists()) {
tmp/org.txm.analec.rcp/src/org/txm/analec/AnalecCorpora.java (revision 875)
27 27
	 * @return the Corpus loaded and stored
28 28
	 */
29 29
	public static Corpus getCorpus(String name) {
30
		File fichierCorpus = new File(Toolbox.getTXMHOMEPATH(), "corpora/"+name+"/analec/"+name+".ec"); //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
30
		File fichierCorpus = new File(Toolbox.getTxmHomePath(), "corpora/"+name+"/analec/"+name+".ec"); //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
31 31
		//File fichierVue = new File(Toolbox.getTXMHOMEPATH(), "corpora/"+name+"/analec/"+name+".ecv");
32 32
		Corpus corpus = null;
33 33
		if (AnalecCorpora.corpora.containsKey(name)) {
......
77 77
		if (AnalecCorpora.corpora.containsKey(name)) {
78 78
			return !AnalecCorpora.corpora.get(name).getStructure().isVide();
79 79
		} else {
80
			File fichierCorpus = new File(Toolbox.getTXMHOMEPATH(), "corpora/"+name+"/analec/"+name+".ec"); //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
80
			File fichierCorpus = new File(Toolbox.getTxmHomePath(), "corpora/"+name+"/analec/"+name+".ec"); //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
81 81
			if (fichierCorpus.exists()) {
82 82
				return !getCorpus(name).getStructure().isVide();
83 83
			} else {
......
107 107
	public static boolean saveCorpus(String name) {
108 108
		Corpus corpus = getCorpus(name);
109 109

  
110
		File dir = new File(Toolbox.getTXMHOMEPATH(), "corpora/"+name+"/analec/"); //$NON-NLS-1$ //$NON-NLS-2$
110
		File dir = new File(Toolbox.getTxmHomePath(), "corpora/"+name+"/analec/"); //$NON-NLS-1$ //$NON-NLS-2$
111 111
		dir.mkdir();
112 112
		File fichierCorpus = new File(dir,name+".ec"); //$NON-NLS-1$
113 113
		return FichiersJava.enregistrerCorpus(corpus, fichierCorpus);
tmp/org.txm.ahc.rcp/src/org/txm/ahc/rcp/messages/AHCUIMessages.java (revision 875)
4 4
import org.txm.utils.messages.Utf8NLS;
5 5

  
6 6
/**
7
 * AHC UI messages.
7 8
 * 
9
 * @author mdecorde
8 10
 * @author sjacquot
9 11
 *
10 12
 */
11 13
public class AHCUIMessages extends NLS {
12 14
	
13
	public static String CAHPreferencePage_0;
15
	
16
	private static final String BUNDLE_NAME = "org.txm.ahc.rcp.messages.messages"; //$NON-NLS-1$
17
	
18
	public static String preferences_displayChartIn2D;
14 19
	public static String CAHPreferencePage_2;
15 20
	public static String CAHPreferencePage_3;
16 21
	public static String CAHPreferencePage_4;
17 22
	
18 23
	public static String ComputeCAH_0;
19 24
	
20
	//FIXME: these keys/values are not used, remove or use them?
21
	public static String ComputeCAH_1;
22
	public static String ComputeCAH_2;
23
	public static String ComputeCAH_3;
24
	public static String ComputeCAH_5;
25
	public static String ComputeCAH_6;
26
	// end of fixme
27
	
28 25
	public static String COMPUTE_COLUMNS;
29 26
	public static String COMPUTE_ROWS;
30 27
	
31
	public static String CHART_TOOLBAR_BUTTON_NUMBER_OF_CLUSTERS;
28
	public static String toolbars_numberOfClusters;
32 29
	
33 30
	
34 31
	
35 32
	static {
36
		Utf8NLS.initializeMessages(AHCUIMessages.class);
33
		Utf8NLS.initializeMessages(BUNDLE_NAME, AHCUIMessages.class);
37 34
	}
38 35

  
39 36
	
tmp/org.txm.ahc.rcp/src/org/txm/ahc/rcp/messages/messages.properties (revision 875)
1 1

  
2
CAHPreferencePage_0 = Display chart in
3

  
4 2
CAHPreferencePage_2 = Number of clusters
5

  
6 3
CAHPreferencePage_3 = Method
7

  
8 4
CAHPreferencePage_4 = Metric
9 5

  
10
CHART_TOOLBAR_BUTTON_NUMBER_OF_CLUSTERS = Number of clusters:
11

  
12 6
COMPUTE_COLUMNS = Compute columns
7
COMPUTE_ROWS    = Compute rows
13 8

  
14
COMPUTE_ROWS = Compute rows
15

  
16 9
ComputeCAH_0 = Compute Classification with {0}
17 10

  
18
ComputeCAH_1 = Show chart
11
preferences_displayChartIn2D = Display charts in 2D
19 12

  
20
ComputeCAH_2 = Error: temporary file created cannot be written:
21

  
22
ComputeCAH_3 = Computing CAH with
23

  
24
ComputeCAH_5 = Opening the Classification result
25

  
26
ComputeCAH_6 = Error while computing Classification: {0}
13
toolbars_numberOfClusters = Number of clusters:
tmp/org.txm.ahc.rcp/src/org/txm/ahc/rcp/messages/messages_ru.properties (revision 875)
1 1

  
2
CAHPreferencePage_0 = Показывать графики в 2D
3 2
CAHPreferencePage_2 = Число кластеров
4 3
CAHPreferencePage_3 = Метод
5 4
CAHPreferencePage_4 = Метрика
......
8 7
COMPUTE_ROWS    = Строчки
9 8

  
10 9
ComputeCAH_0 = Расчет Классификации {0}
11
ComputeCAH_1 = Показать график
12
ComputeCAH_2 = ** Не удается записать данные во временный файл
13
ComputeCAH_3 = Расчет классификации с 
10

  
11
preferences_displayChartIn2D = Показывать графики в 2D
tmp/org.txm.ahc.rcp/src/org/txm/ahc/rcp/messages/messages_fr.properties (revision 875)
1 1

  
2
CAHPreferencePage_0 = Afficher les graphiques en 2D
3

  
4 2
CAHPreferencePage_2 = Nombre de clusters
5

  
6 3
CAHPreferencePage_3 = Méthode
7

  
8 4
CAHPreferencePage_4 = Métrique
9 5

  
10
CHART_TOOLBAR_BUTTON_NUMBER_OF_CLUSTERS = Nombre de clusters :
11

  
12 6
COMPUTE_COLUMNS = Classer les colonnes
7
COMPUTE_ROWS    = Classer les lignes
13 8

  
14
COMPUTE_ROWS = Classer les lignes
15

  
16 9
ComputeCAH_0 = Calcul de la Classification avec {0}
17 10

  
18
ComputeCAH_1 = Afficher le graphique
11
preferences_displayChartIn2D = Afficher les graphiques en 2D
19 12

  
20
ComputeCAH_2 = ** Impossible d'écrire dans le fichier temporaire
21

  
22
ComputeCAH_3 = Calcul de la classification avec
23

  
24
ComputeCAH_5 = Ouverture de la fenêtre de Classification
25

  
26
ComputeCAH_6 = Erreur lors de l'ouverture de l'éditeur de Classification : {0}
13
toolbars_numberOfClusters = Nombre de clusters :
tmp/org.txm.ahc.rcp/src/org/txm/ahc/rcp/editors/AHCChartEditor.java (revision 875)
73 73

  
74 74
		// Number of clusters
75 75
	    CLabel clustersLabel = new CLabel(this.chartToolBar, SWT.CENTER);
76
		clustersLabel.setText(AHCUIMessages.CHART_TOOLBAR_BUTTON_NUMBER_OF_CLUSTERS);
76
		clustersLabel.setText(AHCUIMessages.toolbars_numberOfClusters);
77 77
		this.chartToolBar.addControl(clustersLabel);
78 78

  
79 79
	    this.numberOfClusters = new Spinner(this.chartToolBar, SWT.BORDER);
tmp/org.txm.ahc.rcp/src/org/txm/ahc/rcp/preferences/AHCPreferencePage.java (revision 875)
78 78
		Composite chartsTab = SWTChartsComponentsProvider.createChartsRenderingPreferencesTabFolderComposite(getFieldEditorParent());
79 79

  
80 80
		String[][] labelAndValues = {{"2D", "true"}, {"3D", "false"}}; //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ //$NON-NLS-4$
81
		RadioGroupFieldEditor default2D3Ddisplay = new RadioGroupFieldEditor(AHCPreferences.RENDERING_2D, AHCUIMessages.CAHPreferencePage_0, 2, labelAndValues, chartsTab);
81
		RadioGroupFieldEditor default2D3Ddisplay = new RadioGroupFieldEditor(AHCPreferences.RENDERING_2D, AHCUIMessages.preferences_displayChartIn2D, 2, labelAndValues, chartsTab);
82 82
		addField(default2D3Ddisplay);
83 83
		
84 84
		
tmp/org.txm.core.tests/src/org/txm/rcp/commands/tests/TestImports.java (revision 875)
83 83
	 */
84 84
	@Override
85 85
	public Object execute(ExecutionEvent event) throws ExecutionException {
86
		String txmhome = Toolbox.getTXMHOMEPATH();
86
		String txmhome = Toolbox.getTxmHomePath();
87 87
		final File scriptsdir = new File(txmhome, "scripts/import");
88 88
		// final File sourcesdir = new
89 89
		// File(System.getProperty("user.home"),"xml/TESTS");
......
131 131
			protected IStatus run(IProgressMonitor monitor) {
132 132
				this.runInit(monitor);
133 133
				try {
134
					String txmhome = Toolbox.getTXMHOMEPATH();
134
					String txmhome = Toolbox.getTxmHomePath();
135 135
					File outDir = new File(txmhome, "results/TESTS-imports");
136 136
					outDir.mkdirs();
137 137
					ArrayList<File> missings = new ArrayList<File>();
tmp/org.txm.core.tests/src/org/txm/rcp/commands/tests/TestImportLangs.java (revision 875)
49 49
	 */
50 50
	@Override
51 51
	public Object execute(ExecutionEvent event) throws ExecutionException {
52
		String txmhome = Toolbox.getTXMHOMEPATH();
52
		String txmhome = Toolbox.getTxmHomePath();
53 53
		final File scriptsdir = new File(txmhome, "scripts/import");
54 54

  
55 55
		System.out.println("Select the directory containing the source directories : "
tmp/org.txm.chartsengine.core/src/org/txm/chartsengine/core/messages/ChartsEngineCoreMessages.java (revision 875)
11 11
 */
12 12
public class ChartsEngineCoreMessages extends NLS {
13 13
	
14
	private static final String BUNDLE_NAME = "org.txm.chartsengine.core.messages.messages"; //$NON-NLS-1$
15

  
16
	
14 17
	public static String error_cantCreateTmpChartFile;
15 18
	public static String error_cantWriteInFile;
16 19

  
......
18 21

  
19 22
	
20 23
	static {
21
		Utf8NLS.initializeMessages(ChartsEngineCoreMessages.class);
24
		Utf8NLS.initializeMessages(BUNDLE_NAME, ChartsEngineCoreMessages.class);
22 25
	}
23 26
	
24 27
}

Also available in: Unified diff