Révision 452

tmp/org.txm.specificities.core/META-INF/MANIFEST.MF (revision 452)
4 4
Bundle-SymbolicName: org.txm.specificities.core;singleton:=true
5 5
Bundle-Version: 1.0.0.qualifier
6 6
Bundle-RequiredExecutionEnvironment: JavaSE-1.6
7
Require-Bundle: org.txm.statsengine.r.core,
7
Require-Bundle: org.txm.utils;bundle-version="1.0.0",
8
 org.eclipse.osgi;bundle-version="3.10.2",
9
 org.eclipse.core.runtime;bundle-version="3.10.0",
10
 org.txm.searchengine.cqp.core;bundle-version="1.1.0",
11
 org.txm.statsengine.r.core,
8 12
 org.txm.lexicon.core;bundle-version="1.0.0",
9 13
 org.txm.lexicaltable.core;bundle-version="1.0.0",
10 14
 org.txm.statsengine.core;bundle-version="1.0.0",
......
12 16
 org.txm.progression.core;bundle-version="1.0.0",
13 17
 org.txm.chartsengine.core;bundle-version="1.0.0",
14 18
 org.txm.chartsengine.jfreechart.core;bundle-version="1.0.0",
15
 org.txm.chartsengine.r.core;bundle-version="1.0.0",
16
 org.eclipse.core.runtime;bundle-version="3.10.0"
19
 org.txm.chartsengine.r.core;bundle-version="1.0.0"
17 20
Export-Package: org.txm.functions.contrasts,
18 21
 org.txm.specificities.core.chartsengine.jfreechart,
19 22
 org.txm.specificities.core.chartsengine.r,
tmp/org.txm.libs.cqp/META-INF/MANIFEST.MF (revision 452)
4 4
Bundle-SymbolicName: org.txm.libs.cqp;singleton:=true
5 5
Bundle-Version: 1.0.0.qualifier
6 6
Bundle-Activator: org.txm.libs.cqp.Activator
7
Require-Bundle: org.eclipse.core.runtime;visibility:=reexport,
8
 org.txm.core;visibility:=reexport,
9
 org.eclipse.jface;visibility:=reexport,
10
 org.eclipse.ui.workbench;visibility:=reexport
7
Require-Bundle: org.txm.utils;bundle-version="1.0.0",
8
 org.eclipse.core.runtime,
9
 org.txm.core,
10
 org.eclipse.jface,
11
 org.eclipse.ui.workbench
11 12
Bundle-RequiredExecutionEnvironment: JavaSE-1.6
12 13
Bundle-ActivationPolicy: lazy
13 14
Export-Package: org.txm.libs.cqp
tmp/org.txm.libs.cqp/src/org/txm/libs/cqp/DoInstallStep.java (revision 452)
22 22
	@Override
23 23
	public void preInstall() {
24 24
		
25
		String CQPFRAGMENT = "CQP."+System.getProperty("osgi.os");
25
		String CQPFRAGMENT = "org.txm.libs.cqp."+System.getProperty("osgi.os");
26 26
		
27 27
		Log.info("CQP.DoInstallStep.install()");
28
		String saved = TXMPreferences.getString(CQPPreferences.PREFERENCES_NODE, CQPPreferences.VERSION, "");
28
		String saved = TXMPreferences.getString(CQPPreferences.VERSION, CQPPreferences.PREFERENCES_NODE);
29 29
		Version currentVersion = BundleUtils.getBundleVersion(CQPFRAGMENT); // the CQPFRAGMENT plugin contains the right version
30 30
		
31 31
		if (saved != null && saved.length() > 0) {
tmp/org.txm.lexicon.core/META-INF/MANIFEST.MF (revision 452)
5 5
Bundle-Version: 1.0.0.qualifier
6 6
Bundle-Vendor: Textometrie.org
7 7
Bundle-RequiredExecutionEnvironment: JavaSE-1.6
8
Require-Bundle: org.txm.core;bundle-version="0.7.0",
8
Require-Bundle: org.eclipse.osgi;bundle-version="3.10.2",
9 9
 org.eclipse.core.runtime;bundle-version="3.10.0",
10
 org.txm.statsengine.core;bundle-version="1.0.0",
10
 org.txm.utils,
11 11
 org.txm.statsengine.r.core;bundle-version="1.0.0",
12
 org.txm.core;bundle-version="0.7.0",
12 13
 org.txm.searchengine.core;bundle-version="1.0.0",
13 14
 org.txm.searchengine.cqp.core;bundle-version="1.1.0"
14 15
Export-Package: org.txm.lexicon.core.corpusengine.cqp,
tmp/org.txm.core/src/java/org/txm/core/preferences/TBXPreferences.java (revision 452)
121 121
		Log.info(TXMCoreMessages.Toolbox_4 + TBXPreferences.getID()); 
122 122

  
123 123
		Preferences preferences = DefaultScope.INSTANCE.getNode(PREFERENCES_NODE);
124
		DefaultScope.INSTANCE
125 124
		
126 125
		//FIXME: USE osgi.instance.area later
127 126
		preferences.put(TBXPreferences.USER_TXM_HOME, System.getProperty("user.home")+"/TXM");
tmp/org.txm.core/src/java/org/txm/core/results/TXMResult.java (revision 452)
90 90
		this.children = new ArrayList<TXMResult>(1);
91 91
		this.preferencesNodeQualifier = FrameworkUtil.getBundle(getClass()).getSymbolicName();
92 92
		this.parameters = parameters;
93

  
93 94
		//FIXME: Debug
94
		System.out.println("TXMResult.TXMResult(): default preferences node qualifier = " + this.preferencesNodeQualifier + ", class = " + getClass());
95
		//System.out.println("TXMResult.TXMResult(): default preferences node qualifier = " + this.preferencesNodeQualifier + ", class = " + getClass());
95 96
	}
96 97
	
97 98
	/**
tmp/org.txm.core/META-INF/MANIFEST.MF (revision 452)
4 4
Bundle-SymbolicName: org.txm.core;singleton:=true
5 5
Bundle-Version: 0.7.0.qualifier
6 6
Bundle-Activator: org.txm.toolbox.Activator
7
Require-Bundle: org.txm.utils;bundle-version="1.0.0";visibility:=reexport,
8
 org.eclipse.core.runtime,
7
Require-Bundle: org.eclipse.core.runtime;bundle-version="3.10.0",
8
 javax.persistence;bundle-version="2.1.0",
9
 org.txm.utils;bundle-version="1.0.0",
9 10
 org.eclipse.osgi.util;bundle-version="3.2.0",
10 11
 org.eclipse.core.net,
11 12
 org.eclipse.osgi,
12
 org.txm.libs.groovy-all;bundle-version="1.0.0";visibility:=reexport,
13
 org.eclipse.persistence.jpa;bundle-version="2.6.0",
14
 javax.persistence;bundle-version="2.1.0";visibility:=reexport,
15
 org.eclipse.persistence.jpa.jpql;bundle-version="2.6.0";visibility:=reexport,
16
 org.txm.statsengine.r.core;bundle-version="1.0.0";visibility:=reexport,
17
 org.txm.annotation.core;bundle-version="1.0.0";visibility:=reexport
13
 org.txm.libs.groovy-all;bundle-version="1.0.0",
14
 org.txm.statsengine.r.core;bundle-version="1.0.0",
15
 org.txm.annotation.core;bundle-version="1.0.0"
18 16
Bundle-RequiredExecutionEnvironment: JavaSE-1.6
19 17
Export-Package: EDU.oswego.cs.dl.util.concurrent,
20 18
 EDU.oswego.cs.dl.util.concurrent.misc,
tmp/org.txm.core.tests/META-INF/MANIFEST.MF (revision 452)
4 4
Bundle-SymbolicName: org.txm.core.tests;singleton:=true
5 5
Bundle-Version: 1.0.0.qualifier
6 6
Bundle-RequiredExecutionEnvironment: JavaSE-1.6
7
Require-Bundle: org.txm.utils,
7
Require-Bundle: org.txm.statsengine.r.core,
8
 org.txm.searchengine.cqp.core;bundle-version="1.1.0",
9
 org.txm.utils,
8 10
 org.txm.lexicon.core,
9 11
 org.eclipse.core.runtime;bundle-version="3.10.0",
10 12
 org.txm.core;bundle-version="0.7.0",
11
 org.txm.statsengine.r.core,
12 13
 org.txm.ca.core;bundle-version="1.0.0",
13 14
 org.txm.cah.core;bundle-version="1.0.0",
14 15
 org.txm.chartsengine.core;bundle-version="1.0.0",
tmp/org.txm.core.tests/src/org/txm/core/tests/manual/ToolBoxTesterRCPApplication.java (revision 452)
3 3
 */
4 4
package org.txm.core.tests.manual;
5 5

  
6
import org.apache.tools.ant.taskdefs.Sleep;
7
import org.eclipse.core.internal.preferences.RootPreferences;
8 6
import org.eclipse.equinox.app.IApplication;
9 7
import org.eclipse.equinox.app.IApplicationContext;
10 8
import org.txm.Toolbox;
......
14 12
import org.txm.searchengine.cqp.corpus.Property;
15 13
import org.txm.searchengine.cqp.corpus.StructuralUnit;
16 14
import org.txm.searchengine.cqp.corpus.StructuralUnitProperty;
17
import org.txm.statsengine.r.core.preferences.RPreferences;
18 15

  
19 16
/**
20 17
 * 
tmp/org.txm.chartsengine.rcp/src/org/txm/chartsengine/rcp/preferences/ChartsEnginePreferencePage.java (revision 452)
15 15
import org.eclipse.ui.PlatformUI;
16 16
import org.txm.chartsengine.core.ChartsEngine;
17 17
import org.txm.chartsengine.core.preferences.ChartsEnginePreferences;
18
import org.txm.chartsengine.jfreechart.core.JFCChartsEngine;
19
import org.txm.chartsengine.jfreechart.core.preferences.JFCChartsEnginePreferences;
20 18
import org.txm.chartsengine.rcp.SWTChartsComponentsProvider;
21 19
import org.txm.chartsengine.rcp.messages.SWTComponentsProviderMessages;
22 20
import org.txm.core.preferences.TBXPreferences;
tmp/org.txm.chartsengine.rcp/META-INF/MANIFEST.MF (revision 452)
4 4
Bundle-SymbolicName: org.txm.chartsengine.rcp;singleton:=true
5 5
Bundle-Version: 1.0.0.qualifier
6 6
Bundle-RequiredExecutionEnvironment: JavaSE-1.6
7
Require-Bundle: org.txm.chartsengine.core;bundle-version="1.0.0";visibility:=reexport,
7
Require-Bundle: org.txm.utils;bundle-version="1.0.0",
8
 org.eclipse.ui;bundle-version="3.106.1",
9
 org.eclipse.core.runtime;bundle-version="3.10.0",
10
 org.txm.chartsengine.core;bundle-version="1.0.0",
8 11
 org.txm.core;bundle-version="0.7.0",
9 12
 org.txm.rcp;bundle-version="0.7.8",
10 13
 org.eclipse.core.resources,
11
 org.eclipse.ui;bundle-version="3.106.1";visibility:=reexport,
12
 org.eclipse.core.runtime;bundle-version="3.10.0",
13 14
 org.eclipse.swt,
14 15
 org.eclipse.core.expressions;bundle-version="3.4.600"
15 16
Export-Package: org.txm.chartsengine.rcp,
tmp/org.txm.annotation.core/META-INF/MANIFEST.MF (revision 452)
4 4
Bundle-SymbolicName: org.txm.annotation.core
5 5
Bundle-Version: 1.0.0.qualifier
6 6
Bundle-Activator: org.txm.annotation.Activator
7
Require-Bundle: org.txm.core;bundle-version="0.7.0",
7
Require-Bundle: org.eclipse.persistence.jpa;bundle-version="2.6.0",
8
 org.eclipse.persistence.jpa.jpql;bundle-version="2.6.0",
9
 javax.persistence;bundle-version="2.1.0",
10
 org.txm.utils;bundle-version="1.0.0",
11
 org.eclipse.osgi;bundle-version="3.10.2",
12
 org.txm.core;bundle-version="0.7.0",
8 13
 org.eclipse.ui,
9
 org.eclipse.core.runtime,
10 14
 org.txm.searchengine.cqp.core
11 15
Bundle-RequiredExecutionEnvironment: JavaSE-1.6
12 16
Bundle-ActivationPolicy: lazy
tmp/org.txm.annotation.core/src/org/txm/annotation/AnnotationWriter.java (revision 452)
1 1
package org.txm.annotation;
2 2

  
3 3
import java.io.File;
4
import java.io.FileInputStream;
5
import java.io.FileOutputStream;
6 4
import java.io.IOException;
7
import java.io.InputStream;
8
import java.io.OutputStream;
9 5
import java.util.ArrayList;
10 6
import java.util.HashMap;
11 7
import java.util.List;
......
28 24
import org.txm.utils.DeleteDir;
29 25
import org.txm.utils.logger.Log;
30 26
import org.txm.utils.zip.Zip;
31
import org.w3c.dom.Document;
32
import org.w3c.dom.Node;
33 27

  
34 28

  
35 29
public class AnnotationWriter {
tmp/org.txm.progression.core/src/org/txm/progression/core/chartsengine/r/RProgressionChartCreator.java (revision 452)
7 7
import org.txm.chartsengine.core.preferences.ChartsEnginePreferences;
8 8
import org.txm.chartsengine.r.core.RChartCreator;
9 9
import org.txm.chartsengine.r.core.themes.DefaultTheme;
10
import org.txm.core.preferences.TXMPreferences;
11 10
import org.txm.core.results.TXMResult;
12 11
import org.txm.progression.core.chartsengine.base.ProgressionChartCreator;
13 12
import org.txm.progression.core.chartsengine.base.Utils;
14 13
import org.txm.progression.core.functions.Progression;
15 14
import org.txm.progression.core.preferences.ProgressionPreferences;
16
import org.txm.statsengine.core.StatException;
17 15
import org.txm.statsengine.r.core.RWorkspace;
18 16
import org.txm.statsengine.r.core.exceptions.RWorkspaceException;
19 17
import org.txm.utils.logger.Log;
tmp/org.txm.progression.core/META-INF/MANIFEST.MF (revision 452)
4 4
Bundle-SymbolicName: org.txm.progression.core;singleton:=true
5 5
Bundle-Version: 1.0.0.qualifier
6 6
Bundle-RequiredExecutionEnvironment: JavaSE-1.6
7
Require-Bundle: org.txm.statsengine.r.core;bundle-version="1.0.0",
7
Require-Bundle: org.txm.utils;bundle-version="1.0.0",
8
 org.txm.statsengine.core;bundle-version="1.0.0",
9
 org.txm.statsengine.r.core;bundle-version="1.0.0",
8 10
 org.txm.chartsengine.core,
9 11
 org.eclipse.core.runtime,
10 12
 org.txm.core;bundle-version="0.7.0",
tmp/org.txm.referencer.rcp/META-INF/MANIFEST.MF (revision 452)
4 4
Bundle-SymbolicName: org.txm.referencer.rcp;singleton:=true
5 5
Bundle-Version: 1.0.0.qualifier
6 6
Bundle-Activator: org.txm.referencer.rcp.Activator
7
Require-Bundle: org.txm.searchengine.cqp.core;bundle-version="1.1.0",
7
Require-Bundle: org.txm.utils;bundle-version="1.0.0",
8
 org.txm.referencer.core;bundle-version="1.0.0",
9
 org.txm.concordance.core;bundle-version="1.0.0",
10
 org.txm.searchengine.cqp.core;bundle-version="1.1.0",
11
 org.txm.concordance.rcp;bundle-version="1.0.0",
12
 org.txm.statsengine.r.rcp;bundle-version="1.0.0",
8 13
 org.eclipse.ui,
9 14
 org.eclipse.core.runtime,
10 15
 org.txm.core;bundle-version="0.7.0",
11 16
 org.txm.rcp;bundle-version="0.7.8",
12
 org.txm.concordance.core;bundle-version="1.0.0",
13 17
 org.eclipse.core.expressions;bundle-version="3.4.600",
14 18
 org.txm.searchengine.core;bundle-version="1.0.0"
15 19
Bundle-RequiredExecutionEnvironment: JavaSE-1.6
tmp/org.txm.concordance.core/META-INF/MANIFEST.MF (revision 452)
4 4
Bundle-SymbolicName: org.txm.concordance.core;singleton:=true
5 5
Bundle-Version: 1.0.0.qualifier
6 6
Bundle-RequiredExecutionEnvironment: JavaSE-1.6
7
Require-Bundle: org.txm.searchengine.cqp.core;bundle-version="1.1.0",
8
 org.txm.core;visibility:=reexport,
9
 org.txm.annotation.core;bundle-version="1.0.0";visibility:=reexport,
10
 org.eclipse.core.runtime;bundle-version="3.10.0";visibility:=reexport,
11
 org.txm.searchengine.core;bundle-version="1.0.0";visibility:=reexport
7
Require-Bundle: org.txm.annotation.core;bundle-version="1.0.0",
8
 org.txm.utils;bundle-version="1.0.0",
9
 org.txm.searchengine.cqp.core;bundle-version="1.1.0",
10
 org.txm.statsengine.r.core;bundle-version="1.0.0",
11
 org.eclipse.osgi;bundle-version="3.10.2",
12
 org.eclipse.core.runtime;bundle-version="3.10.0",
13
 org.txm.core,
14
 org.txm.searchengine.core;bundle-version="1.0.0"
12 15
Export-Package: org.txm.concordance.core.functions,
13 16
 org.txm.concordance.core.functions.comparators,
14 17
 org.txm.concordance.core.messages,
tmp/org.txm.specificities.rcp/META-INF/MANIFEST.MF (revision 452)
4 4
Bundle-SymbolicName: org.txm.specificities.rcp;singleton:=true
5 5
Bundle-Version: 1.0.0.qualifier
6 6
Bundle-RequiredExecutionEnvironment: JavaSE-1.6
7
Require-Bundle: org.txm.lexicaltable.core;bundle-version="1.0.0",
7
Require-Bundle: org.txm.utils;bundle-version="1.0.0",
8
 org.eclipse.osgi;bundle-version="3.10.2",
9
 org.eclipse.ui;bundle-version="3.106.1",
10
 org.eclipse.core.runtime;bundle-version="3.10.0",
11
 org.txm.lexicaltable.core;bundle-version="1.0.0",
8 12
 org.txm.index.core;bundle-version="1.0.0",
13
 org.txm.statsengine.core;bundle-version="1.0.0",
14
 org.txm.statsengine.r.core;bundle-version="1.0.0",
15
 org.txm.searchengine.cqp.core;bundle-version="1.1.0",
9 16
 org.txm.core;bundle-version="0.7.0",
10 17
 org.txm.statsengine.r.rcp,
11 18
 org.txm.specificities.core,
12 19
 org.txm.chartsengine.rcp,
13 20
 org.txm.rcp;bundle-version="0.7.8",
14
 org.eclipse.core.expressions;bundle-version="3.4.600",
15
 org.eclipse.core.runtime;bundle-version="3.10.0",
16
 org.txm.statsengine.core;bundle-version="1.0.0",
17
 org.txm.statsengine.r.core;bundle-version="1.0.0"
21
 org.eclipse.core.expressions;bundle-version="3.4.600"
18 22
Export-Package: org.txm.specificities.rcp.adapters,
19 23
 org.txm.specificities.rcp.editors,
20 24
 org.txm.specificities.rcp.handlers,
tmp/org.txm.referencer.core/META-INF/MANIFEST.MF (revision 452)
4 4
Bundle-SymbolicName: org.txm.referencer.core
5 5
Bundle-Version: 1.0.0.qualifier
6 6
Bundle-RequiredExecutionEnvironment: JavaSE-1.6
7
Require-Bundle: org.txm.statsengine.r.core;bundle-version="1.0.0",
7
Require-Bundle: org.txm.utils;bundle-version="1.0.0",
8
 org.txm.statsengine.r.core;bundle-version="1.0.0",
8 9
 org.txm.core;bundle-version="0.7.0",
9 10
 org.txm.searchengine.core;bundle-version="1.0.0",
10 11
 org.txm.searchengine.cqp.core;bundle-version="1.1.0"
tmp/org.txm.referencer.core/src/org/txm/functions/referencer/Referencer.java (revision 452)
145 145
	 * Call in order all stages to compute the referencer.
146 146
	 *
147 147
	 * @return true, if successful
148
	 * @throws CqiClientException the cqi client exception
149
	 * @throws IOException Signals that an I/O exception has occurred.
150
	 * @throws CqiServerError the cqi server error
151 148
	 */
152
	public boolean compute() throws CqiClientException, IOException, CqiServerError
149
	public boolean compute()
153 150
	{
154
		if (this.parent == null || query == null || pattern == null || prop == null)
155
			return false;
156
		if (pattern.size() == 0)
157
			return false;
158
		if (query.getQueryString().equals("")) //$NON-NLS-1$
159
			return false;
151
		try {
152
			if (this.parent == null || query == null || pattern == null || prop == null)
153
				return false;
154
			if (pattern.size() == 0)
155
				return false;
156
			if (query.getQueryString().equals("")) //$NON-NLS-1$
157
				return false;
160 158

  
161
		if (!getQueryMatches())
162
			return false;
159
			if (!getQueryMatches())
160
				return false;
163 161

  
164
		if (!getQueryindexes())
165
			return false;
162
			if (!getQueryindexes())
163
				return false;
166 164

  
167
		if (!groupPositionsbyId())
168
			return false;
165
			if (!groupPositionsbyId())
166
				return false;
167
		}
168
		catch(CqiClientException e) {
169
			// TODO Auto-generated catch block
170
			e.printStackTrace();
171
			return false;
172
		}
169 173

  
170 174
		return true;
171 175
	}
tmp/org.txm.groovy.core/META-INF/MANIFEST.MF (revision 452)
4 4
Bundle-SymbolicName: org.txm.groovy.core
5 5
Bundle-Version: 1.0.0.qualifier
6 6
Bundle-RequiredExecutionEnvironment: JavaSE-1.6
7
Require-Bundle: org.txm.searchengine.cqp.core;bundle-version="1.1.0",
7
Require-Bundle: org.txm.libs.groovy-all;bundle-version="2.3.3",
8
 org.txm.utils;bundle-version="1.0.0",
9
 org.eclipse.osgi;bundle-version="3.10.2",
10
 org.eclipse.core.runtime;bundle-version="3.10.0",
11
 org.txm.searchengine.cqp.core;bundle-version="1.1.0",
12
 org.txm.concordance.core;bundle-version="1.0.0",
13
 org.txm.statsengine.r.core;bundle-version="1.0.0",
8 14
 org.txm.ca.core;bundle-version="1.0.0",
9 15
 org.txm.ca.rcp;bundle-version="1.0.0",
10 16
 org.txm.cah.core;bundle-version="1.0.0",
......
29 35
 org.txm.lexicon.rcp;bundle-version="1.0.0",
30 36
 org.txm.libs.batik;bundle-version="0.0.0",
31 37
 org.txm.libs.colt;bundle-version="1.2.0",
32
 org.txm.libs.groovy-all;bundle-version="2.3.3",
33 38
 org.txm.libs.itext;bundle-version="2.1.5",
34 39
 org.txm.libs.jfreechart;bundle-version="1.0.17",
35 40
 org.txm.libs.jfreesvg;bundle-version="1.7.0",
......
43 48
 org.txm.specificities.core;bundle-version="1.0.0",
44 49
 org.txm.specificities.rcp;bundle-version="1.0.0",
45 50
 org.txm.statsengine.core;bundle-version="1.0.0",
46
 org.txm.statsengine.r.core;bundle-version="1.0.0",
47 51
 org.txm.statsengine.r.rcp;bundle-version="1.0.0",
48 52
 org.txm.synopticeditor.rcp;bundle-version="1.0.0",
49 53
 org.txm.textsbalance.core;bundle-version="1.0.0",
50 54
 org.txm.textsbalance.rcp;bundle-version="1.0.0",
51
 org.txm.utils;bundle-version="1.0.0",
52 55
 org.txm.wordcloud.core;bundle-version="1.0.0",
53 56
 org.txm.wordcloud.rcp;bundle-version="1.0.0",
54
 org.txm.concordance.core;bundle-version="1.0.0",
55 57
 org.txm.referencer.core;bundle-version="1.0.0",
56 58
 org.txm.annotation.core;bundle-version="1.0.0",
57 59
 org.txm.para.core;bundle-version="1.0.0",
......
60 62
 org.txm.para.rcp;bundle-version="1.0.0",
61 63
 org.txm.referencer.rcp;bundle-version="1.0.0",
62 64
 org.txm.searchengine.core;bundle-version="1.0.0",
63
 org.txm.experimentations.core;bundle-version="1.0.0",
64 65
 org.txm.links.rcp;bundle-version="1.0.0"
65 66
Export-Package: filters.BuildXmlLiturgie,
66 67
 filters.Concatenator,
tmp/org.txm.chartsengine.jfreechart.core/META-INF/MANIFEST.MF (revision 452)
6 6
Require-Bundle: org.txm.libs.jfreechart;bundle-version="1.0.17";visibility:=reexport,
7 7
 org.txm.libs.itext,
8 8
 org.eclipse.core.runtime,
9
 org.txm.libs.jfreesvg;bundle-version="1.7.0",
9
 org.txm.libs.jfreesvg;bundle-version="1.7.0";visibility:=reexport,
10 10
 org.txm.chartsengine.core;bundle-version="1.0.0";visibility:=reexport,
11 11
 org.txm.core
12 12
Bundle-RequiredExecutionEnvironment: JavaSE-1.6
tmp/org.txm.rcp.p2.ui/src/org/eclipse/equinox/internal/p2/ui/dialogs/ResolutionResultsWizardPage.java (revision 452)
36 36
import org.eclipse.swt.widgets.*;
37 37
import org.eclipse.ui.statushandlers.StatusManager;
38 38

  
39
import com.sun.xml.internal.bind.v2.runtime.reflect.Accessor.SetterOnlyReflection;
40 39

  
41 40
/**
42 41
 * A wizard page that shows detailed information about a resolved install
tmp/org.txm.wordcloud.rcp/META-INF/MANIFEST.MF (revision 452)
4 4
Bundle-SymbolicName: org.txm.wordcloud.rcp;singleton:=true
5 5
Bundle-Version: 1.0.0.qualifier
6 6
Bundle-RequiredExecutionEnvironment: JavaSE-1.6
7
Require-Bundle: org.txm.wordcloud.core;bundle-version="1.0.0",
7
Require-Bundle: org.txm.utils;bundle-version="1.0.0",
8
 org.eclipse.osgi;bundle-version="3.10.2",
9
 org.eclipse.core.runtime;bundle-version="3.10.0",
10
 org.txm.lexicon.core;bundle-version="1.0.0",
11
 org.txm.index.core;bundle-version="1.0.0",
12
 org.txm.searchengine.cqp.core;bundle-version="1.1.0",
13
 org.eclipse.ui;bundle-version="3.106.1",
14
 org.txm.wordcloud.core;bundle-version="1.0.0",
8 15
 org.txm.chartsengine.rcp,
9
 org.eclipse.core.runtime;bundle-version="3.10.0",
10 16
 org.txm.core;bundle-version="0.7.0",
11
 org.txm.rcp;bundle-version="0.7.8",
12
 org.txm.index.core;bundle-version="1.0.0"
17
 org.txm.rcp;bundle-version="0.7.8"
13 18
Bundle-Vendor: Textometrie.org
tmp/org.txm.partition.rcp/META-INF/MANIFEST.MF (revision 452)
3 3
Bundle-Name: %Bundle-Name
4 4
Bundle-SymbolicName: org.txm.partition.rcp;singleton:=true
5 5
Bundle-Version: 1.0.0.qualifier
6
Require-Bundle: org.txm.searchengine.cqp.core;bundle-version="1.1.0",
7
 org.txm.rcp;bundle-version="0.7.8",
8
 org.txm.partition.core;bundle-version="1.0.0",
9
 org.txm.chartsengine.rcp,
6
Require-Bundle: org.txm.utils;bundle-version="1.0.0",
7
 org.eclipse.osgi;bundle-version="3.10.2",
8
 org.eclipse.core.runtime;bundle-version="3.10.0",
10 9
 org.eclipse.ui,
11
 org.eclipse.core.runtime,
12 10
 org.txm.core;bundle-version="0.7.0",
11
 org.txm.searchengine.cqp.core;bundle-version="1.1.0",
12
 org.txm.chartsengine.rcp,
13
 org.txm.partition.core,
14
 org.txm.rcp;bundle-version="0.7.8",
13 15
 org.txm.chartsengine.core,
14
 org.eclipse.core.expressions;bundle-version="3.4.600",
15
 org.txm.searchengine.core;bundle-version="1.0.0"
16
 org.eclipse.core.expressions;bundle-version="3.4.600"
16 17
Bundle-RequiredExecutionEnvironment: JavaSE-1.6
17 18
Bundle-ActivationPolicy: lazy
18 19
Bundle-Vendor: Textometrie.org
tmp/org.txm.partition.rcp/src/org/txm/partition/rcp/handlers/ComputePartitionDimensionsBarChart.java (revision 452)
27 27
//
28 28
package org.txm.partition.rcp.handlers;
29 29

  
30
import java.util.List;
31

  
32 30
import org.eclipse.core.commands.ExecutionEvent;
33 31
import org.eclipse.core.commands.ExecutionException;
34
import org.eclipse.jface.viewers.IStructuredSelection;
35 32
import org.eclipse.swt.SWT;
36 33
import org.eclipse.swt.events.SelectionEvent;
37 34
import org.eclipse.swt.events.SelectionListener;
38 35
import org.eclipse.swt.widgets.ToolItem;
39
import org.eclipse.ui.handlers.HandlerUtil;
40
import org.txm.Toolbox;
41 36
import org.txm.chartsengine.rcp.SWTChartsComponentsProvider;
42 37
import org.txm.chartsengine.rcp.editors.ChartEditorPart;
43 38
import org.txm.core.preferences.TXMPreferences;
44 39
import org.txm.partition.core.functions.PartitionDimensions;
45 40
import org.txm.partition.core.preferences.PartitionDimensionsPreferences;
46 41
import org.txm.partition.rcp.messages.PartitionUIMessages;
47
import org.txm.rcp.handlers.BaseAbstractHandler;
48 42
import org.txm.rcp.IImageKeys;
43
import org.txm.rcp.handlers.BaseAbstractHandler;
49 44
import org.txm.rcp.views.corpora.CorporaView;
50
import org.txm.searchengine.cqp.CQPEngine;
51
import org.txm.searchengine.cqp.corpus.Part;
52 45
import org.txm.searchengine.cqp.corpus.Partition;
53 46

  
47

  
54 48
/**
55 49
 * Creates and opens a bar chart editor with the dimensions of the selected partition.
56 50
 * 
......
74 68
	@Override
75 69
	public Object execute(ExecutionEvent event) throws ExecutionException {
76 70
		
77
		if (!CQPEngine.isInitialized()) return false;
71
		if (!this.checkCorpusEngine())	{
72
			return false;
73
		}
78 74
		
79 75
		if(!this.checkStatsEngine()) {
80
			return null;
76
			return false;
81 77
		}
82 78

  
83 79
		
84
		IStructuredSelection selection = (IStructuredSelection) HandlerUtil.getCurrentSelection(event);
85

  
86
		PartitionDimensions partitionDimensions = null; 
80
		Object selection = this.getSelection();
81
		PartitionDimensions partitionDimensions = null;
87 82
		
88
		// Create new editor
89
		if (selection.getFirstElement() instanceof Partition) {
90
			final Partition partition = (Partition) selection.getFirstElement();
91
			try {
92
				List<Part> parts = partition.getParts();
93
				if(parts.size() == 0)	{
94
					return false;
95
				}
83
		
84
		// Creating from Partition
85
		if (selection instanceof Partition) {
86
			Partition partition = (Partition) selection;
87
			if(partition.getParts().size() == 0)	{
88
				return false;
89
			}
96 90

  
97
				partitionDimensions = new PartitionDimensions(partition);
98
				CorporaView.refreshObject(partitionDimensions.getCorpus());
91
			partitionDimensions = new PartitionDimensions(partition);
99 92
				
100
			}
101
			catch (Exception e) {
102
				org.txm.rcp.utils.Logger.printStackTrace(e);
103
			}
104 93
		}
105
		// Reopen an editor
106
		else if(selection.getFirstElement() instanceof PartitionDimensions)	{
107
			partitionDimensions = (PartitionDimensions) selection.getFirstElement(); 
94
		// Reopening from existing result
95
		else if(selection instanceof PartitionDimensions)	{
96
			partitionDimensions = (PartitionDimensions) selection;
108 97
		}
109 98

  
99
		final ChartEditorPart editor = SWTChartsComponentsProvider.getCurrent().openEditor(partitionDimensions, "Partition Dimensions Bar Chart"); //$NON-NLS-1$
100
		
101
		// FIXME: Pie chart tests
102
//		final ChartEditorPart editor = SWTChartsComponentsProvider.getCurrent().openEditor(partitionDimensions, "Partition Dimensions Pie Chart");
110 103

  
111
		if(partitionDimensions != null)	{
104
		
105
		// Contribute to the tool bar without extending ChartEditorPart
106
		// FIXME: finally, would be better to create a PartitionDimensionEditor
107
		if(!editor.wasAlreadyOpened())	{
112 108

  
113
			final ChartEditorPart editor = SWTChartsComponentsProvider.getCurrent().openEditor(partitionDimensions, PartitionDimensionsPreferences.PREFERENCES_NODE,
114
					"Partition Dimensions Bar Chart");
115 109
			
110
			editor.refresh();
116 111
			
117
			// FIXME: Pie chart tests
118
//			final ChartEditorPart editor = SWTChartsComponentsProvider.getCurrent().openEditor(partitionDimensions, PartitionDimensionsPreferences.PREFERENCES_NODE,
119
//					"Partition Dimensions Pie Chart");
120

  
112
			new ToolItem(editor.getToolBar(), SWT.SEPARATOR);
121 113
			
122
			// Contribute to the tool bar without extending ChartEditorPart
123
			if(!editor.wasAlreadyOpened())	{
114
			final ToolItem sortByPartSize = new ToolItem(editor.getToolBar(), SWT.CHECK);
115
			sortByPartSize.setImage(IImageKeys.getImage(ComputePartitionDimensionsBarChart.class, "icons/silk_sort_by_size.png"));
116
			sortByPartSize.setToolTipText(PartitionUIMessages.PreferencesPage_DIMENSIONS_SORT_BY_PARTS_SIZE);
117
			sortByPartSize.setSelection(editor.getBooleanParameterValue(PartitionDimensionsPreferences.CHART_DIMENSIONS_SORTED_BY_SIZE));
118
			
119
			sortByPartSize.addSelectionListener(new SelectionListener() {
124 120
				
125
				new ToolItem(editor.getToolBar(), SWT.SEPARATOR);
121
				@Override
122
				public void widgetSelected(SelectionEvent e) {
123
					TXMPreferences.putLocalBoolean(editor.getResultData(), PartitionDimensionsPreferences.CHART_DIMENSIONS_SORTED_BY_SIZE, sortByPartSize.getSelection());
124
					editor.computeChart(true, false, true);
125
				}
126 126
				
127
				final ToolItem sortByPartSize = new ToolItem(editor.getToolBar(), SWT.CHECK);
128
				sortByPartSize.setImage(IImageKeys.getImage(ComputePartitionDimensionsBarChart.class, "icons/silk_sort_by_size.png"));
129
				sortByPartSize.setToolTipText(PartitionUIMessages.PreferencesPage_DIMENSIONS_SORT_BY_PARTS_SIZE);
130
				sortByPartSize.setSelection(TXMPreferences.getBoolean(PartitionDimensionsPreferences.PREFERENCES_NODE, editor.getResultData(), PartitionDimensionsPreferences.CHART_DIMENSIONS_SORTED_BY_SIZE));
131
				
132
				sortByPartSize.addSelectionListener(new SelectionListener() {
127
				@Override
128
				public void widgetDefaultSelected(SelectionEvent e) {
129
					// TODO Auto-generated method stub
133 130
					
134
					@Override
135
					public void widgetSelected(SelectionEvent e) {
136
						TXMPreferences.putLocalBoolean(editor.getResultData(), PartitionDimensionsPreferences.CHART_DIMENSIONS_SORTED_BY_SIZE, sortByPartSize.getSelection());
137
						editor.computeChart(true, false, true);
138
					}
139
					
140
					@Override
141
					public void widgetDefaultSelected(SelectionEvent e) {
142
						// TODO Auto-generated method stub
143
						
144
					}
145
				});
146
				
147
				
148
				
149
			}
150
			
131
				}
132
			});
151 133
		}
152
		
134
			
153 135
		return null;
154 136
	}
155 137
	
tmp/org.txm.chartsengine.r.rcp/src/org/txm/rcp/chartsengine/r/preferences/RChartsEnginePreferencePage.java (revision 452)
34 34

  
35 35
import org.eclipse.jface.preference.ComboFieldEditor;
36 36
import org.eclipse.ui.IWorkbench;
37
import org.eclipse.ui.PlatformUI;
38 37
import org.txm.chartsengine.core.ChartsEngine;
39
import org.txm.chartsengine.core.preferences.ChartsEnginePreferences;
40
import org.txm.chartsengine.jfreechart.core.JFCChartsEngine;
41
import org.txm.chartsengine.jfreechart.core.preferences.JFCChartsEnginePreferences;
42 38
import org.txm.chartsengine.r.core.RChartsEngine;
43 39
import org.txm.chartsengine.r.core.preferences.RChartsEnginePreferences;
44 40
import org.txm.chartsengine.rcp.SWTChartsComponentsProvider;
45 41
import org.txm.chartsengine.rcp.messages.SWTComponentsProviderMessages;
46
import org.txm.core.preferences.TXMPreferences;
47
import org.txm.rcp.preferences.ExportPreferencePage;
48 42
import org.txm.rcp.preferences.TXMPreferencePage;
49 43
import org.txm.rcp.preferences.TXMPreferenceStore;
50
import org.txm.rcp.preferences.UserPreferencePage;
51 44

  
52 45
/**
53 46
 * R charts engine preference page.
tmp/org.txm.chartsengine.r.rcp/META-INF/MANIFEST.MF (revision 452)
4 4
Bundle-SymbolicName: org.txm.chartsengine.r.rcp;singleton:=true
5 5
Bundle-Version: 1.0.0.qualifier
6 6
Bundle-RequiredExecutionEnvironment: JavaSE-1.7
7
Require-Bundle: org.txm.core,
8
 org.txm.chartsengine.rcp;bundle-version="1.0.0";visibility:=reexport,
9
 org.txm.rcp;bundle-version="0.7.8",
10
 org.txm.chartsengine.r.core;bundle-version="1.0.0";visibility:=reexport
7
Require-Bundle: org.eclipse.ui;bundle-version="3.106.1",
8
 org.txm.chartsengine.r.core;bundle-version="1.0.0",
9
 org.txm.core,
10
 org.txm.chartsengine.rcp;bundle-version="1.0.0",
11
 org.txm.rcp;bundle-version="0.7.8"
11 12
Bundle-Vendor: Textometrie.org
12 13
Import-Package: org.txm.chartsengine.rcp.messages
tmp/org.txm.index.core/META-INF/MANIFEST.MF (revision 452)
3 3
Bundle-Name: Index Core
4 4
Bundle-SymbolicName: org.txm.index.core
5 5
Bundle-Version: 1.0.0.qualifier
6
Require-Bundle: org.txm.searchengine.cqp.core;bundle-version="1.1.0",
6
Require-Bundle: org.txm.utils;bundle-version="1.0.0",
7
 org.txm.searchengine.cqp.core;bundle-version="1.1.0",
7 8
 org.txm.statsengine.r.core;bundle-version="1.0.0",
8 9
 org.txm.lexicon.core;bundle-version="1.0.0",
9 10
 org.eclipse.core.runtime,
10 11
 org.txm.core;bundle-version="0.7.0",
11
 org.txm.utils;bundle-version="1.0.0",
12 12
 org.txm.searchengine.core;bundle-version="1.0.0"
13 13
Bundle-RequiredExecutionEnvironment: JavaSE-1.6
14 14
Bundle-ActivationPolicy: lazy
tmp/org.txm.index.core/src/org/txm/index/core/functions/Index.java (revision 452)
298 298
	protected boolean scanCorpus(Corpus corp) throws CqiClientException, IOException, CqiServerError {
299 299
		// get the cqp result of the query
300 300
		
301
		long time = System.currentTimeMillis();
301
		//long time = System.currentTimeMillis();
302 302
		QueryResult result = corp.query(query, "index", true); //$NON-NLS-1$
303 303
		boolean isTargetUsed = CQPEngine.getCqiClient().subCorpusHasField(result.getQualifiedCqpId(), ICqiClient.CQI_CONST_FIELD_TARGET);
304 304
		int nbresults = result.getNMatch();
......
429 429
	 * @return the lines
430 430
	 */
431 431
	public List<Line> getLines(int start, int end) {
432
		long time = System.currentTimeMillis();
432
	//	long time = System.currentTimeMillis();
433 433
		List<Line> selectedLines = new ArrayList<Line>();
434 434
		if (lines.size() > 0) {
435 435
			start = Math.max(0, start);
......
549 549
	 * @param Fmax the fmax
550 550
	 */
551 551
	public void filterLines(int Fmin, int Fmax) {
552
		int before = lines.size();
552
		//int before = lines.size();
553 553
		for (int i = 0; i < lines.size(); i++)// for each line
554 554
		{
555 555
			Line line = lines.get(i);
......
577 577
	public void cut(int vmax) {
578 578
		this.acquireSemaphore();
579 579
		// assume the lines are sorted
580
		int before = lines.size();
580
		//int before = lines.size();
581 581
		this.lines = this.lines.subList(0, Math.min(lines.size(), vmax));
582 582
		this.FilterVmax = vmax;
583 583
		updateFminFmax();
tmp/org.txm.utils/META-INF/MANIFEST.MF (revision 452)
3 3
Bundle-Name: org.txm.utils
4 4
Bundle-SymbolicName: org.txm.utils
5 5
Bundle-Version: 1.0.0.qualifier
6
Require-Bundle: org.eclipse.osgi.util;bundle-version="3.3.0";visibility:=reexport,
6
Require-Bundle: org.eclipse.osgi.util;bundle-version="3.3.0",
7 7
 org.eclipse.core.runtime,
8 8
 org.txm.libs.saxon;bundle-version="9.0.0";visibility:=reexport,
9 9
 org.eclipse.core.net;bundle-version="1.2.200"
tmp/org.txm.cooccurrence.core/src/org/txm/cooccurrence/core/functions/Cooccurrence.java (revision 452)
631 631
		//System.out.println("T counts : "+(System.currentTimeMillis()- time)); //$NON-NLS-1$
632 632
		
633 633
		allsignaturesstr = null; // no more need
634
		counted = null;
634
//		counted = null;
635 635
		return true;
636 636
	}
637 637

  
......
1012 1012
			monitor.worked(10);
1013 1013
			this.releaseSemaphore();
1014 1014
			
1015
			this.clearMemory();
1016 1015
		}
1017 1016
		// user canceling
1018 1017
		catch(ThreadDeath e) {
......
1040 1039
				this.getIntParameterValue(CooccurrencePreferences.MIN_RIGHT),
1041 1040
				this.getIntParameterValue(CooccurrencePreferences.MAX_RIGHT),
1042 1041
				this.getIntParameterValue(CooccurrencePreferences.MIN_FREQ),
1043
				this.getIntParameterValue(CooccurrencePreferences.MIN_SCORE),
1042
				this.getDoubleParameterValue(CooccurrencePreferences.MIN_SCORE),
1044 1043
				this.getIntParameterValue(CooccurrencePreferences.MIN_COUNT),
1045 1044
				this.getBooleanParameterValue(CooccurrencePreferences.INCLUDE_X_PIVOT),
1046 1045
				this.getBooleanParameterValue(CooccurrencePreferences.PARTIAL_LEXICAL_TABLE)))	{
......
1802 1801

  
1803 1802
	@Override
1804 1803
	public String getSimpleName() {
1805
		return query + " (" + (maxLeft-1) + ", " + (maxRight-1) + ")"; //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
1804
		String output = "";
1805
		
1806
		if(query != null)	{
1807
			output += query.getQueryString();
1808
		}
1809
		
1810
		if(maxLeft > 0 && maxRight > 0)	{
1811
			output += " (" + (maxLeft-1) + ", " + (maxRight-1) + ")"; //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ 
1812
		}
1813
		return output;
1806 1814
	}
1807 1815

  
1808 1816
	@Override
tmp/org.txm.cooccurrence.core/META-INF/MANIFEST.MF (revision 452)
3 3
Bundle-Name: Cooccurrence Core
4 4
Bundle-SymbolicName: org.txm.cooccurrence.core;singleton:=true
5 5
Bundle-Version: 1.0.0.qualifier
6
Require-Bundle: org.txm.concordance.core;bundle-version="1.0.0",
7
 org.txm.core;bundle-version="0.7.0";visibility:=reexport,
6
Require-Bundle: org.txm.utils;bundle-version="1.0.0",
7
 org.eclipse.osgi;bundle-version="3.10.2",
8
 org.eclipse.core.runtime;bundle-version="3.10.0",
9
 org.txm.concordance.core;bundle-version="1.0.0",
10
 org.txm.statsengine.r.core;bundle-version="1.0.0",
11
 org.txm.core;bundle-version="0.7.0",
8 12
 org.txm.lexicaltable.core,
9 13
 org.txm.specificities.core;bundle-version="1.0.0",
10
 org.eclipse.core.runtime,
11 14
 org.txm.index.core;bundle-version="1.0.0",
12
 org.txm.searchengine.core;bundle-version="1.0.0";visibility:=reexport,
13
 org.txm.searchengine.cqp.core;bundle-version="1.1.0";visibility:=reexport
15
 org.txm.searchengine.core;bundle-version="1.0.0",
16
 org.txm.searchengine.cqp.core;bundle-version="1.1.0"
14 17
Bundle-RequiredExecutionEnvironment: JavaSE-1.6
15 18
Bundle-ActivationPolicy: lazy
16 19
Export-Package: org.txm.cooccurrence.core.functions,
tmp/org.txm.textsbalance.core/META-INF/MANIFEST.MF (revision 452)
8 8
 org.txm.textsbalance.core.chartsengine.r,
9 9
 org.txm.textsbalance.core.functions,
10 10
 org.txm.textsbalance.core.preferences
11
Require-Bundle: org.txm.searchengine.cqp.core;bundle-version="1.1.0",
11
Require-Bundle: org.txm.utils;bundle-version="1.0.0",
12
 org.txm.searchengine.cqp.core;bundle-version="1.1.0",
12 13
 org.eclipse.core.runtime;bundle-version="3.10.0",
13 14
 org.txm.core;bundle-version="0.7.0",
14 15
 org.txm.chartsengine.core;bundle-version="1.0.0",
tmp/org.txm.statsengine.core/META-INF/MANIFEST.MF (revision 452)
8 8
 org.txm.statsengine.core.data,
9 9
 org.txm.statsengine.core.messages,
10 10
 org.txm.statsengine.core.utils
11
Require-Bundle: org.txm.core;bundle-version="0.7.0",
12
 org.txm.utils;bundle-version="1.0.0",
13
 org.eclipse.core.runtime;bundle-version="3.10.0"
11
Require-Bundle: org.txm.utils;bundle-version="1.0.0",
12
 org.eclipse.osgi;bundle-version="3.10.2",
13
 org.eclipse.core.runtime;bundle-version="3.10.0",
14
 org.txm.core;bundle-version="0.7.0"
14 15
Bundle-Vendor: Textometrie.org
15 16
Import-Package: org.eclipse.osgi.util
tmp/org.txm.lexicaltable.rcp/src/org/txm/lexicaltable/rcp/editors/LineLabelProvider.java (revision 452)
34 34
import org.eclipse.jface.viewers.ITableLabelProvider;
35 35
import org.eclipse.jface.viewers.LabelProvider;
36 36
import org.eclipse.swt.graphics.Image;
37
import org.txm.cooccurrence.rcp.preferences.CoocPreferencePage;
38 37
import org.txm.lexicaltable.core.functions.LexicalTable;
39 38
import org.txm.rcp.TxmPreferences;
40 39

  
tmp/org.txm.lexicaltable.rcp/src/org/txm/lexicaltable/rcp/handlers/ComputeLexicalTable.java (revision 452)
52 52
import org.txm.lexicaltable.core.functions.LexicalTable;
53 53
import org.txm.lexicaltable.core.functions.LexicalTableFactory;
54 54
import org.txm.lexicaltable.core.preferences.LexicalTablePreferences;
55
import org.txm.lexicaltable.core.statsengine.data.ILexicalTable;
56 55
import org.txm.lexicaltable.core.statsengine.r.data.LexicalTableImpl;
57 56
import org.txm.lexicaltable.rcp.editors.LexicalTableDialog;
58 57
import org.txm.lexicaltable.rcp.editors.LexicalTableEditor2;
59 58
import org.txm.lexicaltable.rcp.editors.LexicalTableEditorInput;
60
import org.txm.rcp.handlers.BaseAbstractHandler;
61 59
import org.txm.rcp.JobsTimer;
62 60
import org.txm.rcp.Messages;
63 61
import org.txm.rcp.StatusLine;
62
import org.txm.rcp.handlers.BaseAbstractHandler;
64 63
import org.txm.rcp.utils.JobHandler;
65 64
import org.txm.rcp.views.QueriesView;
66 65
import org.txm.rcp.views.corpora.CorporaView;
tmp/org.txm.lexicaltable.rcp/META-INF/MANIFEST.MF (revision 452)
3 3
Bundle-Name: Lexical Table RCP
4 4
Bundle-SymbolicName: org.txm.lexicaltable.rcp;singleton:=true
5 5
Bundle-Version: 1.0.0.qualifier
6
Require-Bundle: org.txm.index.core;bundle-version="1.0.0",
6
Require-Bundle: org.eclipse.osgi;bundle-version="3.10.2",
7
 org.eclipse.core.runtime;bundle-version="3.10.0",
8
 org.txm.utils;bundle-version="1.0.0",
9
 org.eclipse.ui;bundle-version="3.106.1",
10
 org.txm.libs.batik,
11
 org.txm.statsengine.core;bundle-version="1.0.0",
12
 org.txm.statsengine.r.core;bundle-version="1.0.0",
13
 org.txm.statsengine.r.rcp,
14
 org.txm.searchengine.cqp.core;bundle-version="1.1.0",
15
 org.txm.index.core;bundle-version="1.0.0",
7 16
 org.txm.ca.core;bundle-version="1.0.0",
8 17
 org.txm.core,
9 18
 org.txm.lexicaltable.core;bundle-version="1.0.0",
10
 org.eclipse.core.runtime,
11 19
 org.txm.rcp,
12
 org.eclipse.ui;bundle-version="3.106.1",
13
 org.txm.statsengine.r.rcp,
14
 org.eclipse.core.expressions;bundle-version="3.4.600",
15
 org.txm.statsengine.core;bundle-version="1.0.0",
16
 org.txm.statsengine.r.core;bundle-version="1.0.0"
20
 org.eclipse.core.expressions;bundle-version="3.4.600"
17 21
Bundle-RequiredExecutionEnvironment: JavaSE-1.6
18 22
Bundle-ActivationPolicy: lazy
19 23
Export-Package: org.txm.lexicaltable.rcp.adapters,
tmp/org.txm.cah.core/META-INF/MANIFEST.MF (revision 452)
3 3
Bundle-Name: CAH Core
4 4
Bundle-SymbolicName: org.txm.cah.core;singleton:=true
5 5
Bundle-Version: 1.0.0.qualifier
6
Require-Bundle: org.txm.ca.core;bundle-version="1.0.0",
7
 org.eclipse.core.runtime,
6
Require-Bundle: org.txm.utils;bundle-version="1.0.0",
7
 org.eclipse.osgi;bundle-version="3.10.2",
8
 org.eclipse.core.runtime;bundle-version="3.10.0",
9
 org.txm.statsengine.r.core;bundle-version="1.0.0",
10
 org.txm.searchengine.cqp.core;bundle-version="1.1.0",
11
 org.txm.ca.core;bundle-version="1.0.0",
8 12
 org.txm.core;bundle-version="0.7.0",
9 13
 org.txm.chartsengine.r.core;bundle-version="1.0.0",
10 14
 org.txm.chartsengine.jfreechart.core;bundle-version="1.0.0",
11
 org.txm.lexicaltable.core;bundle-version="1.0.0",
12
 org.txm.statsengine.core;bundle-version="1.0.0",
13
 org.txm.statsengine.r.core;bundle-version="1.0.0"
15
 org.txm.lexicaltable.core;bundle-version="1.0.0"
14 16
Bundle-RequiredExecutionEnvironment: JavaSE-1.6
15 17
Bundle-ActivationPolicy: lazy
16 18
Export-Package: org.txm.cah.core.chartsengine.jfreechart,
tmp/org.txm.index.rcp/META-INF/MANIFEST.MF (revision 452)
4 4
Bundle-SymbolicName: org.txm.index.rcp;singleton:=true
5 5
Bundle-Version: 1.0.0.qualifier
6 6
Bundle-RequiredExecutionEnvironment: JavaSE-1.6
7
Require-Bundle: org.txm.searchengine.cqp.core;bundle-version="1.1.0",
7
Require-Bundle: org.txm.utils;bundle-version="1.0.0",
8
 org.eclipse.osgi;bundle-version="3.10.2",
9
 org.eclipse.core.runtime;bundle-version="3.10.0",
10
 org.txm.lexicon.core;bundle-version="1.0.0",
11
 org.txm.statsengine.core;bundle-version="1.0.0",
12
 org.txm.statsengine.r.core;bundle-version="1.0.0",
13
 org.txm.searchengine.cqp.core;bundle-version="1.1.0",
8 14
 org.txm.core;bundle-version="0.7.0",
9 15
 org.txm.index.core;bundle-version="1.0.0",
10 16
 org.txm.statsengine.r.rcp,
11 17
 org.eclipse.ui;bundle-version="3.106.1",
12
 org.eclipse.core.runtime;bundle-version="3.10.0",
13 18
 org.txm.rcp,
14
 org.txm.statsengine.r.core;bundle-version="1.0.0",
15 19
 org.eclipse.core.expressions;bundle-version="3.4.600",
16 20
 org.txm.searchengine.core;bundle-version="1.0.0"
17 21
Export-Package: org.txm.index.rcp.adapters,
tmp/org.txm.progression.rcp/src/org/txm/progression/rcp/handlers/ComputeProgression.java (revision 452)
37 37
import org.eclipse.swt.SWT;
38 38
import org.eclipse.swt.widgets.Shell;
39 39
import org.eclipse.ui.handlers.HandlerUtil;
40
import org.txm.Toolbox;
41 40
import org.txm.chartsengine.core.ChartsEngine;
42 41
import org.txm.chartsengine.core.preferences.ChartsEnginePreferences;
43 42
import org.txm.chartsengine.r.core.RChartsEngine;
......
50 49
import org.txm.progression.core.preferences.ProgressionPreferences;
51 50
import org.txm.progression.rcp.dialogs.ProgressionDialog;
52 51
import org.txm.progression.rcp.forms.ProgressionParametersComposite;
53
import org.txm.rcp.handlers.BaseAbstractHandler;
54 52
import org.txm.rcp.JobsTimer;
55 53
import org.txm.rcp.Messages;
56 54
import org.txm.rcp.StatusLine;
55
import org.txm.rcp.handlers.BaseAbstractHandler;
57 56
import org.txm.rcp.utils.JobHandler;
58 57
import org.txm.rcp.views.corpora.CorporaView;
59 58
import org.txm.searchengine.cqp.CQPEngine;
60 59
import org.txm.searchengine.cqp.corpus.Corpus;
61 60
import org.txm.utils.logger.Log;
62 61

  
62

  
63 63
/**
64 64
 * Open the ProgressionDialog, computes and opens the result editor part.
65 65
 * 
......
151 151

  
152 152
			// FIXME: tests parameters composite extension
153 153
			// Contribute to the tool bar without extending ChartEditorPart
154
			// FIXME: finally, would be better to create a ProgressionEditor
154 155
			if(!editor.wasAlreadyOpened())	{
155 156
				new ProgressionParametersComposite(editor.getCommandParametersGroup(), SWT.NONE);
156 157
				editor.getCommandParametersGroup().pack();
tmp/org.txm.progression.rcp/META-INF/MANIFEST.MF (revision 452)
4 4
Bundle-SymbolicName: org.txm.progression.rcp;singleton:=true
5 5
Bundle-Version: 1.0.0.qualifier
6 6
Bundle-RequiredExecutionEnvironment: JavaSE-1.6
7
Require-Bundle: org.txm.searchengine.cqp.core;bundle-version="1.1.0",
7
Require-Bundle: org.txm.utils,
8
 org.eclipse.osgi;bundle-version="3.10.2",
9
 org.eclipse.core.runtime;bundle-version="3.10.0",
10
 org.eclipse.ui;bundle-version="3.106.1",
11
 org.eclipse.e4.ui.workbench;bundle-version="1.2.2",
12
 org.txm.concordance.core;bundle-version="1.0.0",
13
 org.txm.concordance.rcp,
14
 org.txm.synopticeditor.rcp,
15
 org.txm.searchengine.cqp.core;bundle-version="1.1.0",
8 16
 org.txm.progression.core;bundle-version="1.0.0",
9 17
 org.txm.chartsengine.svgbatik.rcp;bundle-version="1.0.0",
10 18
 org.txm.lexicaltable.rcp;bundle-version="1.0.0",
......
16 24
 org.txm.core;bundle-version="0.7.0",
17 25
 org.txm.chartsengine.jfreechart.core;bundle-version="1.0.0",
18 26
 org.txm.rcp,
19
 org.eclipse.core.runtime;bundle-version="3.10.0",
20
 org.txm.synopticeditor.rcp,
21 27
 org.eclipse.core.expressions;bundle-version="3.4.600",
22
 org.txm.concordance.rcp,
23 28
 org.txm.searchengine.core;bundle-version="1.0.0"
24 29
Export-Package: org.txm.progression.rcp.adapters,
25 30
 org.txm.progression.rcp.chartsengine.events,
tmp/org.txm.partition.core/src/org/txm/partition/core/functions/PartitionDimensions.java (revision 452)
9 9
import java.util.List;
10 10

  
11 11
import org.txm.chartsengine.core.results.ChartResult;
12
import org.txm.core.results.TXMParameters;
13
import org.txm.functions.ProgressWatcher;
14 12
import org.txm.partition.core.messages.PartitionCoreMessages;
15 13
import org.txm.searchengine.cqp.clientExceptions.CqiClientException;
16 14
import org.txm.searchengine.cqp.corpus.Corpus;
......
27 25

  
28 26
	
29 27
	/**
30
	 * Creates a partition dimensions result from the specified <code>Partition</code>.
28
	 * Creates a partition dimensions result from the specified <link>Partition</link>.
31 29
	 */
32 30
	public PartitionDimensions(Partition partition) {
33 31
		super(partition);
tmp/org.txm.partition.core/META-INF/MANIFEST.MF (revision 452)
3 3
Bundle-Name: Partition Core
4 4
Bundle-SymbolicName: org.txm.partition.core;singleton:=true
5 5
Bundle-Version: 1.0.0.qualifier
6
Require-Bundle: org.txm.chartsengine.core,
6
Require-Bundle: org.txm.utils;bundle-version="1.0.0",
7
 org.eclipse.osgi;bundle-version="3.10.2",
8
 org.eclipse.core.runtime;bundle-version="3.10.0",
9
 org.txm.chartsengine.core,
10
 org.txm.searchengine.cqp.core;bundle-version="1.1.0",
7 11
 org.txm.core;bundle-version="0.7.0",
8
 org.eclipse.core.runtime,
9 12
 org.txm.chartsengine.jfreechart.core;bundle-version="1.0.0",
10 13
 org.txm.chartsengine.r.core;bundle-version="1.0.0",
11 14
 org.txm.lexicaltable.core;bundle-version="1.0.0"
tmp/org.txm.concordance.rcp/META-INF/MANIFEST.MF (revision 452)
5 5
Bundle-Version: 1.0.0.qualifier
6 6
Bundle-Vendor: Textometrie.org
7 7
Bundle-RequiredExecutionEnvironment: JavaSE-1.6
8
Require-Bundle: org.txm.searchengine.cqp.core;bundle-version="1.1.0",
8
Require-Bundle: org.txm.annotation.core;bundle-version="1.0.0",
9
 org.eclipse.core.runtime;bundle-version="3.10.0",
10
 org.eclipse.ui;bundle-version="3.106.1",
11
 org.txm.cooccurrence.core;bundle-version="1.0.0",
12
 org.txm.cooccurrence.rcp;bundle-version="1.0.0",
13
 org.txm.searchengine.cqp.core;bundle-version="1.1.0",
14
 org.eclipse.e4.ui.workbench;bundle-version="1.2.2",
9 15
 org.txm.concordance.core,
16
 org.txm.utils;bundle-version="1.0.0",
17
 org.txm.core,
10 18
 org.txm.rcp,
11
 org.eclipse.ui;bundle-version="3.106.1",
12
 org.eclipse.core.runtime;bundle-version="3.10.0",
13 19
 org.eclipse.core.expressions;bundle-version="3.4.600",
14
 org.txm.core,
15 20
 org.txm.para.rcp,
16 21
 org.txm.searchengine.core;bundle-version="1.0.0"
17 22
Export-Package: org.txm.concordance.rcp.adapters,
tmp/org.txm.concordance.rcp/src/org/txm/concordance/rcp/actions/ComputeCoocFromLines.java (revision 452)
86 86
	 * @see org.eclipse.jface.action.Action#run()
87 87
	 */
88 88
	@Override
89
	@Deprecated
89 90
	public void run() {
91
		//FIXME: should call the ComputeCooccurrence command with some TXMParameters as RCP parametrized command
90 92
		TableViewer table = concordanceEditor.getLineTableViewer();
91 93
		Cooccurrence cooc = ComputeCooccurrences
92 94
				.computeCooc((IStructuredSelection) table.getSelection());
tmp/org.txm.concordance.rcp/src/org/txm/concordance/rcp/handlers/ComputeConcordance.java (revision 452)
31 31

  
32 32
import org.eclipse.core.commands.ExecutionEvent;
33 33
import org.eclipse.core.commands.ExecutionException;
34
import org.eclipse.e4.ui.model.application.ui.advanced.MPerspective;
35
import org.eclipse.e4.ui.model.application.ui.advanced.impl.PerspectiveStackImpl;
36
import org.eclipse.e4.ui.model.application.ui.advanced.impl.PlaceholderImpl;
37
import org.eclipse.e4.ui.model.application.ui.basic.MPartSashContainerElement;
38
import org.eclipse.e4.ui.model.application.ui.basic.MStackElement;
39
import org.eclipse.e4.ui.model.application.ui.basic.impl.PartSashContainerImpl;
40
import org.eclipse.e4.ui.model.application.ui.basic.impl.PartStackImpl;
41 34
import org.eclipse.osgi.util.NLS;
42 35
import org.eclipse.ui.IEditorPart;
43 36
import org.eclipse.ui.PartInitException;
......
192 185
		return true;
193 186
	}
194 187

  
195

  
196
	private static void printChildren(Object o, String space) {
197

  
198
		System.out.println(space+o.getClass().getSimpleName()+": "+o);
199
		
200
		if (o instanceof PlaceholderImpl) {
201
			PlaceholderImpl phi = (PlaceholderImpl)o;
202
			System.out.println("phi: "+phi);
203
		} else if (o instanceof PartSashContainerImpl) {
204
			PartSashContainerImpl psci = (PartSashContainerImpl)o;
205
			for (MPartSashContainerElement e :psci.getChildren()) {
206
				printChildren(e, space+" ");
207
			}
208
		} else if (o instanceof PerspectiveStackImpl) {
209
			PerspectiveStackImpl psi = (PerspectiveStackImpl)o;
210
			for (MPerspective p : psi.getChildren()) {
211
				printChildren(p,space+" ");
212
			}
213
		} else if (o instanceof MPerspective) {
214
			MPerspective p = (MPerspective)o;
215
			for (MPartSashContainerElement e : p.getChildren()) {
216
				printChildren(e, space+" ");
217
			}
218
		} else if (o instanceof PartStackImpl) {
219
			PartStackImpl psi = (PartStackImpl)o;
220
			for (MStackElement e : psi.getChildren()) {
221
				printChildren(e, space+" ");
222
			}
223
		}
224
	}
188
// FIXME: tests
189
//	private static void printChildren(Object o, String space) {
190
//
191
//		System.out.println(space+o.getClass().getSimpleName()+": "+o);
192
//		
193
//		if (o instanceof PlaceholderImpl) {
194
//			PlaceholderImpl phi = (PlaceholderImpl)o;
195
//			System.out.println("phi: "+phi);
196
//		} else if (o instanceof PartSashContainerImpl) {
197
//			PartSashContainerImpl psci = (PartSashContainerImpl)o;
198
//			for (MPartSashContainerElement e :psci.getChildren()) {
199
//				printChildren(e, space+" ");
200
//			}
201
//		} else if (o instanceof PerspectiveStackImpl) {
202
//			PerspectiveStackImpl psi = (PerspectiveStackImpl)o;
203
//			for (MPerspective p : psi.getChildren()) {
204
//				printChildren(p,space+" ");
205
//			}
206
//		} else if (o instanceof MPerspective) {
207
//			MPerspective p = (MPerspective)o;
208
//			for (MPartSashContainerElement e : p.getChildren()) {
209
//				printChildren(e, space+" ");
210
//			}
211
//		} else if (o instanceof PartStackImpl) {
212
//			PartStackImpl psi = (PartStackImpl)o;
213
//			for (MStackElement e : psi.getChildren()) {
214
//				printChildren(e, space+" ");
215
//			}
216
//		}
217
//	}
225 218
}
tmp/org.txm.chartsengine.core/META-INF/MANIFEST.MF (revision 452)
3 3
Bundle-Name: Charts Engine Core
4 4
Bundle-SymbolicName: org.txm.chartsengine.core;singleton:=true
5 5
Bundle-Version: 1.0.0.qualifier
6
Require-Bundle: org.txm.utils;visibility:=reexport,
7
 org.txm.core;bundle-version="0.7.0";visibility:=reexport,
8
 org.eclipse.core.runtime;visibility:=reexport
6
Require-Bundle: org.eclipse.core.runtime,
7
 org.txm.utils,
8
 org.txm.core;bundle-version="0.7.0"
9 9
Bundle-RequiredExecutionEnvironment: JavaSE-1.6
10 10
Bundle-ActivationPolicy: lazy
11 11
Export-Package: org.txm.chartsengine.core,
tmp/org.txm.searchengine.cqp.core/META-INF/MANIFEST.MF (revision 452)
7 7
 org.eclipse.core.runtime,
8 8
 org.txm.core;bundle-version="0.7.0",
9 9
 org.txm.searchengine.core;bundle-version="1.0.0",
10
 org.txm.libs.cqp;bundle-version="1.0.0"
10
 org.txm.libs.cqp;bundle-version="1.0.0",
11
 org.txm.utils;bundle-version="1.0.0"
11 12
Bundle-RequiredExecutionEnvironment: JavaSE-1.6
12 13
Bundle-ClassPath: res/,
13 14
 .
tmp/org.txm.searchengine.cqp.core/src/org/txm/functions/diagnostic/Diagnostic.java (revision 452)
43 43

  
44 44
import org.eclipse.osgi.util.NLS;
45 45
import org.txm.core.messages.TXMCoreMessages;
46
import org.txm.functions.Function;
46
import org.txm.functions.TXMCommand;
47 47
import org.txm.objects.Base;
48 48
import org.txm.searchengine.cqp.AbstractCqiClient;
49 49
import org.txm.searchengine.cqp.clientExceptions.CqiClientException;
......
60 60
/**
61 61
 * compute a diagnostic of Corpus, sub corpus and partition @ author mdecorde.
62 62
 */
63
public class Diagnostic extends Function {
63
public class Diagnostic extends TXMCommand {
64 64
	// Base base;
65 65
	/** The corpus. */
66 66
	Corpus corpus;
tmp/org.txm.searchengine.cqp.core/src/org/txm/searchengine/cqp/CQPEngine.java (revision 452)
42 42

  
43 43
		boolean cqiserverok = false;
44 44
		
45
		useNetCQi = Boolean.parseBoolean(TXMPreferences.getString(TBXPreferences.PREFERENCES_NODE, TBXPreferences.CQI_NETWORK_MODE));
45
		useNetCQi = Boolean.parseBoolean(TXMPreferences.getString(TBXPreferences.CQI_NETWORK_MODE, TBXPreferences.PREFERENCES_NODE));
46 46

  
47 47
		Log.warning("Killing CQP and RServe process if any");
48 48
		killSearchEngine();
49 49

  
50 50
		
51
		boolean remote = Boolean.parseBoolean(TXMPreferences.getString(TBXPreferences.PREFERENCES_NODE, TBXPreferences.CQI_SERVER_IS_REMOTE));
51
		boolean remote = Boolean.parseBoolean(TXMPreferences.getString(TBXPreferences.CQI_SERVER_IS_REMOTE, TBXPreferences.PREFERENCES_NODE));
52 52
		state = false;
53 53
		// test if must-have properties for CWB are set
54 54

  
55
		String exec_path = TXMPreferences.getString(TBXPreferences.PREFERENCES_NODE, TBXPreferences.CQI_SERVER_PATH_TO_EXECUTABLE);
55
		String exec_path = TXMPreferences.getString(TBXPreferences.CQI_SERVER_PATH_TO_EXECUTABLE, TBXPreferences.PREFERENCES_NODE);
56 56
		String reg_path = ""; // new way that concats registry of loaded corpus
57 57
		String path_separator = System.getProperty("path.separator");
58 58
		for (Base b : Toolbox.workspace.getProject("default").getBases()) {
......
78 78
		}
79 79
		if (reg_path.length() > 0) reg_path = reg_path.substring(path_separator.length()); // remove first path_separator
80 80
		//System.out.println("REGPATH="+reg_path);
81
		String init_path = TXMPreferences.getString(TBXPreferences.PREFERENCES_NODE, TBXPreferences.CQI_SERVER_PATH_TO_INIT_FILE);
81
		String init_path = TXMPreferences.getString(TBXPreferences.CQI_SERVER_PATH_TO_INIT_FILE, TBXPreferences.PREFERENCES_NODE);
82 82

  
83 83

  
84 84
		if (!remote) {
......
92 92
						cqiServer = new MemCqiServer(exec_path,
93 93
								reg_path, 
94 94
								init_path, 
95
								TXMPreferences.getString(TBXPreferences.PREFERENCES_NODE, TBXPreferences.CQI_SERVER_ADDITIONAL_OPTIONS)
96
								+ " -P " + TXMPreferences.getString(TBXPreferences.PREFERENCES_NODE, TBXPreferences.CQI_SERVER_PORT), //$NON-NLS-1$
97
								Boolean.parseBoolean(TXMPreferences.getString(TBXPreferences.PREFERENCES_NODE, TBXPreferences.CQI_SERVER_MONITOR_OUTPUT)));
95
								TXMPreferences.getString(TBXPreferences.CQI_SERVER_ADDITIONAL_OPTIONS, TBXPreferences.PREFERENCES_NODE)
96
								+ " -P " + TXMPreferences.getString(TBXPreferences.CQI_SERVER_PORT, TBXPreferences.PREFERENCES_NODE), //$NON-NLS-1$
97
								Boolean.parseBoolean(TXMPreferences.getString(TBXPreferences.CQI_SERVER_MONITOR_OUTPUT, TBXPreferences.PREFERENCES_NODE)));
98 98
					} catch (Exception e) {
99 99
						// TODO Auto-generated catch block
100 100
						org.txm.utils.logger.Log.printStackTrace(e);
......
103 103
					cqiServer = new NetCqiServer(exec_path,
104 104
							reg_path, 
105 105
							init_path, 
106
							TXMPreferences.getString(TBXPreferences.PREFERENCES_NODE, TBXPreferences.CQI_SERVER_ADDITIONAL_OPTIONS)
107
							+ " -P " + TXMPreferences.getString(TBXPreferences.PREFERENCES_NODE, TBXPreferences.CQI_SERVER_PORT), //$NON-NLS-1$
108
							Boolean.parseBoolean(TXMPreferences.getString(TBXPreferences.PREFERENCES_NODE, TBXPreferences.CQI_SERVER_MONITOR_OUTPUT)));
106
							TXMPreferences.getString(TBXPreferences.CQI_SERVER_ADDITIONAL_OPTIONS, TBXPreferences.PREFERENCES_NODE)
107
							+ " -P " + TXMPreferences.getString(TBXPreferences.CQI_SERVER_PORT, TBXPreferences.PREFERENCES_NODE), //$NON-NLS-1$
108
							Boolean.parseBoolean(TXMPreferences.getString(TBXPreferences.CQI_SERVER_MONITOR_OUTPUT, TBXPreferences.PREFERENCES_NODE)));
109 109
				}
110 110
				if (cqiServer != null)
111 111
					cqiserverok = cqiServer.start();
......
123 123
						cqiserverok = false;
124 124
					}
125 125
				} else {
126
					int port = Integer.parseInt(TXMPreferences.getString(TBXPreferences.PREFERENCES_NODE, TBXPreferences.CQI_SERVER_PORT));
127
					String host = TXMPreferences.getString(TBXPreferences.PREFERENCES_NODE, TBXPreferences.CQI_SERVER_HOST);
126
					int port = Integer.parseInt(TXMPreferences.getString(TBXPreferences.CQI_SERVER_PORT, TBXPreferences.PREFERENCES_NODE));
127
					String host = TXMPreferences.getString(TBXPreferences.CQI_SERVER_HOST, TBXPreferences.PREFERENCES_NODE);
128 128
					cqiClient = new NetCqiClient(host, port);
129 129
				}
130 130
			}
131 131
		} catch (NumberFormatException e1) {
132
			Log.severe(TXMCoreMessages.Toolbox_wrong_port + TXMPreferences.getString(TBXPreferences.PREFERENCES_NODE, TBXPreferences.CQI_SERVER_PORT)); 
132
			Log.severe(TXMCoreMessages.Toolbox_wrong_port + TXMPreferences.getString(TBXPreferences.CQI_SERVER_PORT, TBXPreferences.PREFERENCES_NODE)); 
133 133
		} catch (ServerNotFoundException e1) {
134
			Log.severe(TXMCoreMessages.Error_CONNECTION_FAILED + TXMPreferences.getString(TBXPreferences.PREFERENCES_NODE, TBXPreferences.CQI_SERVER_HOST) + TXMCoreMessages.Toolbox_27 + TXMPreferences.getString(TBXPreferences.PREFERENCES_NODE, TBXPreferences.CQI_SERVER_PORT)); 
134
			Log.severe(TXMCoreMessages.Error_CONNECTION_FAILED + TXMPreferences.getString(TBXPreferences.CQI_SERVER_HOST, TBXPreferences.PREFERENCES_NODE)
135
					+ TXMCoreMessages.Toolbox_27 + TXMPreferences.getString(TBXPreferences.CQI_SERVER_PORT, TBXPreferences.PREFERENCES_NODE)); 
135 136
		}
136 137

  
137 138
		// try connecting to the CWB server
138 139
		try {
139 140
			if (cqiserverok) {
140
				String login = TXMPreferences.getString(TBXPreferences.PREFERENCES_NODE, TBXPreferences.CQI_SERVER_LOGIN);
141
				String password = TXMPreferences.getString(TBXPreferences.PREFERENCES_NODE, TBXPreferences.CQI_SERVER_PASSWORD);
141
				String login = TXMPreferences.getString(TBXPreferences.CQI_SERVER_LOGIN, TBXPreferences.PREFERENCES_NODE);
142
				String password = TXMPreferences.getString(TBXPreferences.CQI_SERVER_PASSWORD, TBXPreferences.PREFERENCES_NODE);
142 143
				state = cqiClient.connect(login, password);
143 144
			}
144 145
		} catch (Exception e1) {
......
147 148

  
148 149
		if (state == false) {
149 150
			System.out.println(TXMCoreMessages.Toolbox_29); 
150
			System.out.println(TXMCoreMessages.Toolbox_30 + TXMPreferences.getString(TBXPreferences.PREFERENCES_NODE, TBXPreferences.CQI_SERVER_LOGIN) 
151
					+ " " + TXMPreferences.getString(TBXPreferences.PREFERENCES_NODE, TBXPreferences.CQI_SERVER_PASSWORD) 
152
					+ TXMPreferences.getString(TBXPreferences.PREFERENCES_NODE, TBXPreferences.CQI_SERVER_HOST) 
153
					+ " " + Integer.parseInt(TXMPreferences.getString(TBXPreferences.PREFERENCES_NODE, TBXPreferences.CQI_SERVER_PORT))); //$NON-NLS-1$ //$NON-NLS-2$
151
			System.out.println(TXMCoreMessages.Toolbox_30 + TXMPreferences.getString(TBXPreferences.CQI_SERVER_LOGIN, TBXPreferences.PREFERENCES_NODE) 
152
					+ " " + TXMPreferences.getString(TBXPreferences.CQI_SERVER_PASSWORD, TBXPreferences.PREFERENCES_NODE)  //$NON-NLS-1$
153
					+ TXMPreferences.getString(TBXPreferences.CQI_SERVER_HOST, TBXPreferences.PREFERENCES_NODE) 
154
					+ " " + Integer.parseInt(TXMPreferences.getString(TBXPreferences.CQI_SERVER_PORT, TBXPreferences.PREFERENCES_NODE))); //$NON-NLS-1$
154 155
			if (cqiServer != null)
155 156
				System.out.println(TXMCoreMessages.Toolbox_33 + cqiServer.getLastCmdLine());
156 157
		} else {
......
298 299
	 * kill cqpserver process.
299 300
	 */
300 301
	private static void killSearchEngine() {
301
		if ("false".equals(TXMPreferences.getString(TBXPreferences.PREFERENCES_NODE, TBXPreferences.CQI_SERVER_IS_REMOTE))) //$NON-NLS-1$
302
		if (!TXMPreferences.getBoolean(TBXPreferences.CQI_SERVER_IS_REMOTE, TBXPreferences.PREFERENCES_NODE))
302 303
			// Windows OS
303 304
			if (OSDetector.isFamilyWindows()) {
304 305
				try {
......
331 332
			}
332 333
		// Mac, Linux
333 334
			else {
334
				String cmd = TXMCoreMessages.Toolbox_37 + TXMPreferences.getString(TBXPreferences.PREFERENCES_NODE, TBXPreferences.CQI_SERVER_PORT) + TXMCoreMessages.Toolbox_38;
335
				String cmd = TXMCoreMessages.Toolbox_37 + TXMPreferences.getString(TBXPreferences.CQI_SERVER_PORT, TBXPreferences.PREFERENCES_NODE) + TXMCoreMessages.Toolbox_38;
335 336
				try {
336 337
					//Process p = Runtime.getRuntime().exec("killall -9 cqpserver"); //$NON-NLS-1$
337 338
					// System.out.println("kill `ps aux | grep cqpserver | awk '/-P "
tmp/org.txm.searchengine.cqp.core/src/org/txm/searchengine/cqp/corpus/CorpusManager.java (revision 452)
30 30
import java.util.ArrayList;
31 31
import java.util.List;
32 32

  
33
import org.eclipse.persistence.annotations.Structure;
34 33
import org.txm.Toolbox;
35 34
import org.txm.core.messages.TXMCoreMessages;
36 35
import org.txm.searchengine.cqp.AbstractCqiClient;
tmp/org.txm.searchengine.cqp.core/src/org/txm/searchengine/cqp/corpus/Partition.java (revision 452)
42 42
import java.util.TreeMap;
43 43

  
44 44
import org.eclipse.osgi.util.NLS;
45
import org.txm.Toolbox;
46 45
import org.txm.core.messages.TXMCoreMessages;
47 46
import org.txm.objects.TxmObject;
... Ce différentiel a été tronqué car il excède la taille maximale pouvant être affichée.

Formats disponibles : Unified diff