Révision 836

tmp/org.txm.cql2lsa.rcp/META-INF/MANIFEST.MF (revision 836)
12 12
Bundle-Vendor: Textometrie.org
13 13
Bundle-ActivationPolicy: lazy
14 14
Bundle-Version: 1.0.0.qualifier
15
Bundle-Name: CQL2LSA
15
Bundle-Name: org.txm.cql2lsa.rcp
16 16
Bundle-ManifestVersion: 2
17 17
Bundle-Activator: cql2lsarcp.Activator
18
Bundle-SymbolicName: CQL2LSA;singleton:=true
18
Bundle-SymbolicName: org.txm.cql2lsa.rcp;singleton:=true
19 19
Bundle-RequiredExecutionEnvironment: JavaSE-1.7
20 20

  
tmp/org.txm.cooccurrence.rcp/src/org/txm/cooccurrence/rcp/editors/CooccurrencesEditor.java (revision 836)
196 196
	 * @see org.eclipse.ui.part.WorkbenchPart#createPartControl(org.eclipse.swt.widgets.Composite)
197 197
	 */
198 198
	@Override
199
	public void _createPartControl(final Composite parent) {
199
	public void _createPartControl() {
200 200

  
201 201
		// FormLayout parentLayout = new FormLayout();
202 202
		// parent.setLayout(parentLayout);
tmp/org.txm.libs.cqp.macosx/META-INF/MANIFEST.MF (revision 836)
1 1
Manifest-Version: 1.0
2 2
Bundle-ManifestVersion: 2
3
Bundle-Name: CQP.macosx
4
Bundle-SymbolicName: CQP.macosx
3
Bundle-Name: org.txm.libs.cqp.macosx
4
Bundle-SymbolicName: org.txm.libs.cqp.macosx
5 5
Bundle-Version: 1.1.0.qualifier
6 6
Fragment-Host: org.txm.libs.cqp;bundle-version="1.0.0.qualifier"
7 7
Bundle-RequiredExecutionEnvironment: JavaSE-1.7
tmp/org.txm.libs.cqp/META-INF/MANIFEST.MF (revision 836)
8 8
Bundle-RequiredExecutionEnvironment: JavaSE-1.7
9 9
Bundle-ActivationPolicy: lazy
10 10
Export-Package: org.txm.libs.cqp
11
Bundle-Vendor: Textometrie.org
tmp/org.txm.core/buildJavadoc.xml (revision 836)
24 24
		-->
25 25
		<groovydoc 
26 26
			destdir="javadoc/" 
27
			sourcepath="../org.txm.core/src/java:../org.txm.statsengine.r.core/src:../org.txm.core.tests/src:../org.txm.cql2lsa.rcp/src:../org.txm.oriflamms.rcp/src:../org.txm.dictionary.rcp/src:../org.txm.para.core/src:../org.txm.groovy.core/src:../org.txm.para.rcp/src:../org.txm.groovy.rcp/src:../org.txm.partition.core/src:../org.txm.statsengine.r.rcp/src:../org.txm.imports.metopes/src:../org.txm.partition.rcp/src:../org.txm.svn.rcp/src:../org.txm.analec.rcp/src:../org.txm.index.core/src:../org.txm.practically.rcp/src:../org.txm.annotation.core/src:../org.txm.index.rcp/src:../org.txm.progression.core/src:../org.txm.synopticeditor.rcp/src:../org.txm.annotation.rcp/src:../org.txm.internalview.core/src:../org.txm.progression.rcp/src:../org.txm.textsbalance.core/src:../org.txm.backtomedia.rcp/src:../org.txm.internalview.rcp/src:../org.txm.querycooccurrences.rcp/src:../org.txm.ca.core/src:../org.txm.jodconverter.core/src:../org.txm.queryindex.rcp/src:../org.txm.textsbalance.rcp/src:../org.txm.ahc.core/src:../org.txm.lexicaltable.core/src:../org.txm.r/src:../org.txm.tigersearch.rcp/src:../org.txm.cah.rcp/src:../org.txm.lexicaltable.rcp/src:../org.txm.rcp/src/main/java:../org.txm.tmp.rcp/src:../org.txm.ca.rcp/src:../org.txm.lexicon.core/src:../org.txm.rcp.about.fragment/src:../org.txm.treetaggerinstaller.rcp/src:../org.txm.chartsengine.core/src:../org.txm.lexicon.rcp/src:../org.txm.treetagger.rcp/src:../org.txm.chartsengine.jfreechart.core/src:../org.txm.rcp.p2.ui/src:../org.txm.utils/src:../org.txm.chartsengine.jfreechart.rcp/src:../org.txm.referencer.core/src:../org.txm.wordcloud.core/src:../org.txm.chartsengine.raster.rcp/src:../org.txm.referencer.rcp/src:../org.txm.chartsengine.r.core/src:../org.txm.searchengine.core/src:../org.txm.wordcloud.rcp/src:../org.txm.chartsengine.rcp/src:../org.txm.searchengine.cqp.core/src:../org.txm.xmleditor.rcp/src:../org.txm.chartsengine.r.rcp/src:../org.txm.chartsengine.svgbatik.rcp/src:../org.txm.searchengine.cqp.rcp/src:../org.txm.concordance.core/src:../org.txm.setups.startdialog/src:../org.txm.concordance.rcp/src:../org.txm.specificities.core/src:../org.txm.cooccurrence.core/src:../org.txm.specificities.rcp/src:../org.txm.cooccurrence.rcp/src:../org.txm.statsengine.core" 
27
			sourcepath="../org.txm.core/src/java:../org.txm.statsengine.r.core/src:../org.txm.core.tests/src:../org.txm.cql2lsa.rcp/src:../org.txm.oriflamms.rcp/src:../org.txm.dictionary.rcp/src:../org.txm.para.core/src:../org.txm.groovy.core/src:../org.txm.para.rcp/src:../org.txm.groovy.rcp/src:../org.txm.partition.core/src:../org.txm.statsengine.r.rcp/src:../org.txm.imports.metopes/src:../org.txm.partition.rcp/src:../org.txm.svn.rcp/src:../org.txm.analec.rcp/src:../org.txm.index.core/src:../org.txm.practically.rcp/src:../org.txm.annotation.core/src:../org.txm.index.rcp/src:../org.txm.progression.core/src:../org.txm.edition.rcp/src:../org.txm.annotation.rcp/src:../org.txm.internalview.core/src:../org.txm.progression.rcp/src:../org.txm.textsbalance.core/src:../org.txm.backtomedia.rcp/src:../org.txm.internalview.rcp/src:../org.txm.querycooccurrences.rcp/src:../org.txm.ca.core/src:../org.txm.jodconverter.core/src:../org.txm.queryindex.rcp/src:../org.txm.textsbalance.rcp/src:../org.txm.ahc.core/src:../org.txm.lexicaltable.core/src:../org.txm.r/src:../org.txm.tigersearch.rcp/src:../org.txm.cah.rcp/src:../org.txm.lexicaltable.rcp/src:../org.txm.rcp/src/main/java:../org.txm.tmp.rcp/src:../org.txm.ca.rcp/src:../org.txm.lexicon.core/src:../org.txm.rcp.about.fragment/src:../org.txm.treetaggerinstaller.rcp/src:../org.txm.chartsengine.core/src:../org.txm.lexicon.rcp/src:../org.txm.treetagger.rcp/src:../org.txm.chartsengine.jfreechart.core/src:../org.txm.rcp.p2.ui/src:../org.txm.utils/src:../org.txm.chartsengine.jfreechart.rcp/src:../org.txm.referencer.core/src:../org.txm.wordcloud.core/src:../org.txm.chartsengine.raster.rcp/src:../org.txm.referencer.rcp/src:../org.txm.chartsengine.r.core/src:../org.txm.searchengine.core/src:../org.txm.wordcloud.rcp/src:../org.txm.chartsengine.rcp/src:../org.txm.searchengine.cqp.core/src:../org.txm.xmleditor.rcp/src:../org.txm.chartsengine.r.rcp/src:../org.txm.chartsengine.svgbatik.rcp/src:../org.txm.searchengine.cqp.rcp/src:../org.txm.concordance.core/src:../org.txm.setups.startdialog/src:../org.txm.concordance.rcp/src:../org.txm.specificities.core/src:../org.txm.cooccurrence.core/src:../org.txm.specificities.rcp/src:../org.txm.cooccurrence.rcp/src:../org.txm.statsengine.core" 
28 28
			packagenames="org.txm.*" 
29 29

  
30 30
			use="true"  
tmp/org.txm.core/src/java/org/txm/utils/BundleUtils.java (revision 836)
24 24
	public static Version getBundleVersion(String bundle_id) {
25 25
		Bundle bundle = Platform.getBundle(bundle_id);
26 26
		if (bundle == null) {
27
			System.out.println("Error while initializing "+bundle_id+" plugin: bundle not found.");
27
			//System.out.println("Error while initializing "+bundle_id+" plugin: bundle not found.");
28 28
			return null;
29 29
		}
30 30
		return bundle.getVersion();
......
38 38
	public static String getBundleLocation(String bundle_id) {
39 39
		Bundle bundle = Platform.getBundle(bundle_id);
40 40
		if (bundle == null) {
41
			System.out.println("Error while initializing Oriflamms plugin: bundle not found.");
41
			//System.out.println("Error while initializing Oriflamms plugin: bundle not found.");
42 42
			return null;
43 43
		}
44 44
		return bundle.getLocation();
tmp/org.txm.svn.rcp/META-INF/MANIFEST.MF (revision 836)
12 12
Bundle-Vendor: Textometrie.org
13 13
Bundle-ActivationPolicy: lazy
14 14
Bundle-Version: 1.0.0.qualifier
15
Bundle-Name: %Bundle-Name
15
Bundle-Name: org.txm.svn.rcp
16 16
Bundle-ManifestVersion: 2
17 17
Bundle-Activator: svnenvironement.Activator
18
Bundle-SymbolicName: SVNEnvironmentRCP;singleton:=true
18
Bundle-SymbolicName: org.txm.svn.rcp;singleton:=true
19 19
Bundle-RequiredExecutionEnvironment: JavaSE-1.7
20 20

  
tmp/org.txm.textsbalance.rcp/src/org/txm/textsbalance/rcp/editors/TextsBalanceEditor.java (revision 836)
53 53
	
54 54
	
55 55
	@Override
56
	public void __createPartControl(Composite parent) {
56
	public void __createPartControl() {
57 57
		
58 58
		if (((TextsBalance)this.getResult()).getCorpus() == null) {
59 59
			System.out.println("Error: no corpus");
tmp/TXMBetaPlugins.site/index.html (revision 836)
1
<h3>TXM extensions - Beta</h3>
0 2

  
tmp/TXMBetaPlugins.site/site.xml (revision 836)
1 1
<?xml version="1.0" encoding="UTF-8"?>
2 2
<site>
3
   <feature url="features/TreeTaggerInstaller_1.0.0.201702061153.jar" id="TreeTaggerInstaller" version="1.0.0.201702061153">
4
      <category name="NLP"/>
5
   </feature>
6
   <feature url="features/Analec_1.0.0.201702061153.jar" id="Analec" version="1.0.0.201702061153">
7
      <category name="Annotation"/>
8
   </feature>
9
   <category-def name="NLP" label="NLP"/>
10
   <category-def name="Annotation" label="Annotation"/>
11 3
</site>
tmp/org.txm.ahc.rcp/src/org/txm/ahc/rcp/editors/AHCChartEditor.java (revision 836)
66 66
	
67 67

  
68 68
	@Override
69
	public void __createPartControl(Composite parent) {
69
	public void __createPartControl() {
70 70

  
71 71
		// Extend the chart editor tool bar
72 72
		new ToolItem(this.chartToolBar, SWT.SEPARATOR);
tmp/org.txm.treetagger.core/src/org/txm/treetagger/core/preferences/TreeTaggerPreferences.java (revision 836)
3 3

  
4 4
import java.io.BufferedReader;
5 5
import java.io.File;
6
import java.net.MalformedURLException;
7
import java.net.URL;
6 8
import java.util.Properties;
7 9

  
8 10
import org.eclipse.core.runtime.preferences.DefaultScope;
9 11
import org.osgi.framework.FrameworkUtil;
12
import org.osgi.framework.Version;
10 13
import org.osgi.service.prefs.Preferences;
11 14
import org.txm.core.preferences.TXMPreferences;
15
import org.txm.utils.BundleUtils;
12 16
import org.txm.utils.io.IOUtils;
13 17

  
14 18
/**
......
25 29
	public static final String PREFERENCES_NODE = FrameworkUtil.getBundle(TreeTaggerPreferences.class).getSymbolicName();
26 30
	
27 31
	public static final String PREFERENCES_PREFIX = "treetagger_"; //$NON-NLS-1$
28
	
29 32

  
30 33
	/**
34
	 * contains the last bundle version setting the TreeTagger binariesl directory
35
	 */
36
	public static final String INSTALLED_BINARIES_VERSION = PREFERENCES_PREFIX + "installed_binaries_version"; //$NON-NLS-1$
37
	/**
38
	 * contains the last bundle version setting the TreeTagger models directory
39
	 */
40
	public static final String INSTALLED_MODELS_VERSION = PREFERENCES_PREFIX + "installed_models_version"; //$NON-NLS-1$
41
	
42
	/**
31 43
	 * Installation path.
32 44
	 */
33 45
	public static final String INSTALL_PATH = PREFERENCES_PREFIX + "install_path"; //$NON-NLS-1$
......
41 53
	
42 54
	public static final String FIX_APOSTROPHES = PREFERENCES_PREFIX + "fix_apostrophes"; //$NON-NLS-1$
43 55

  
44

  
45
	
46 56
	@Override
47 57
	public void initializeDefaultPreferences() {
48 58

  
49
		// Default preferences
59
		// Default preferences if no org.txm.treetagger.core fragment is found
50 60
		Preferences preferences = DefaultScope.INSTANCE.getNode(PREFERENCES_NODE);
51 61
		
52 62
		String installPath = "/usr/lib/treetagger"; //"System.getProperty("osgi.user.area") + "/TXM/treetagger"; //$NON-NLS-1$ //$NON-NLS-2$
......
60 70
		preferences.put(MODELS_PATH, installPath + "/models"); //$NON-NLS-1$
61 71
		preferences.putBoolean(FIX_APOSTROPHES, false);
62 72

  
63
		
64 73
		// FIXME: need to validate this code + need to check if it's still useful
74
		String bversion = TXMPreferences.getString(INSTALLED_BINARIES_VERSION, PREFERENCES_NODE);
75
		String mversion = TXMPreferences.getString(INSTALLED_MODELS_VERSION, PREFERENCES_NODE);
65 76
		
66
		// Restore previous TreeTagger preferences
67
		File previousPreferenceFile = new File(System.getProperty("java.io.tmpdir"), "org.txm.rcp.prefs"); //$NON-NLS-1$ //$NON-NLS-2$
77
		// if TXM is launch for the first time bversion and mversion valus are empty
78
		if (bversion == null || bversion.equals("") || mversion == null || mversion.equals("")) {
79
			
80
			// Restore previous TreeTagger preferences
81
			File previousPreferenceFile = new File(System.getProperty("java.io.tmpdir"), "org.txm.rcp.prefs"); //$NON-NLS-1$ //$NON-NLS-2$
68 82

  
69
		if (System.getProperty("os.name").indexOf("Mac") >= 0) { //$NON-NLS-1$ //$NON-NLS-2$
70
			previousPreferenceFile = new File("/tmp/org.txm.rcp.prefs"); //$NON-NLS-1$
71
		}
83
			if (System.getProperty("os.name").indexOf("Mac") >= 0) { //$NON-NLS-1$ //$NON-NLS-2$
84
				previousPreferenceFile = new File("/tmp/org.txm.rcp.prefs"); //$NON-NLS-1$
85
			}
72 86

  
73
		if (previousPreferenceFile.exists()) {
74
			try {
75
				System.out.println("Restoring preferences (from " + previousPreferenceFile + ")."); //$NON-NLS-1$ //$NON-NLS-2$
76
				Properties previousProperties = new Properties();
77
				BufferedReader reader = IOUtils.getReader(previousPreferenceFile, "ISO-8859-1"); //$NON-NLS-1$
78
				previousProperties.load(reader);
79
				
80
				String [] keys= {INSTALL_PATH, MODELS_PATH, OPTIONS};
81
				for (String k : keys) {
82
					if (previousProperties.getProperty(k) != null) {
83
						TreeTaggerPreferences.put(PREFERENCES_NODE, k, previousProperties.getProperty(k));
87
			if (previousPreferenceFile.exists()) {
88
				try {
89
					System.out.println("Restoring preferences (from " + previousPreferenceFile + ")."); //$NON-NLS-1$ //$NON-NLS-2$
90
					Properties previousProperties = new Properties();
91
					BufferedReader reader = IOUtils.getReader(previousPreferenceFile, "ISO-8859-1"); //$NON-NLS-1$
92
					previousProperties.load(reader);
93
					
94
					String [] keys= {INSTALL_PATH, MODELS_PATH, OPTIONS};
95
					for (String k : keys) {
96
						if (previousProperties.getProperty(previousProperties.getProperty(k)) != null) {
97
							preferences.put(k, installPath);
98
							TreeTaggerPreferences.put(PREFERENCES_NODE, k, previousProperties.getProperty(k));
99
						}
84 100
					}
85 101
				}
102
				catch (Exception e) {
103
					e.printStackTrace();
104
				}
86 105
			}
87
			catch (Exception e) {
106
			
107
			TreeTaggerPreferences.put(PREFERENCES_NODE, INSTALLED_BINARIES_VERSION, "0.0.0");
108
			TreeTaggerPreferences.put(PREFERENCES_NODE, INSTALLED_MODELS_VERSION, "0.0.0");
109
			
110
			bversion = TXMPreferences.getString(INSTALLED_BINARIES_VERSION, PREFERENCES_NODE);
111
			mversion = TXMPreferences.getString(INSTALLED_MODELS_VERSION, PREFERENCES_NODE);
112
		}
113
		
114
		// look for org.txm.treetagger.core.<osname> fragment
115
		String mfragmentid = "org.txm.treetagger.core.models";
116
		String bfragmentid = "org.txm.treetagger.core";
117
		String osname = System.getProperty("os.name").toLowerCase();
118
		if (osname.contains("windows")) {
119
			osname = "win32";
120
		} else if (osname.contains("macosx")) {
121
			osname = "macosx";
122
		} else {
123
			osname = "linux";
124
		}
125
		bfragmentid += "."+osname;
126
		
127
		Version currentBVersion = new Version(bversion);
128
		Version currentMVersion = new Version(mversion);
129
		Version binariesFragmentVersion = BundleUtils.getBundleVersion(bfragmentid);
130
		if (binariesFragmentVersion != null && binariesFragmentVersion.compareTo(currentBVersion) >= 0) { // udpate binaries path !
131
			System.out.print("Updating TreeTagger binaries path...");
132
			try {
133
				URL dir = new URL(BundleUtils.getBundleLocation(bfragmentid));
134
				String path = dir.getPath();
135
				if (path.startsWith("file:")) path = path.substring(5);
136
				File binariesDir = new File(path, "res/"+osname);
137
				new File(binariesDir, "bin/separate-punctuation").setExecutable(true); // linux&mac
138
				new File(binariesDir, "bin/tree-tagger").setExecutable(true); // linux&mac
139
				new File(binariesDir, "bin/train-tree-tagger").setExecutable(true); // linux&mac
140
				preferences.put(INSTALL_PATH, binariesDir.getAbsolutePath());
141
				TreeTaggerPreferences.put(PREFERENCES_NODE, INSTALLED_BINARIES_VERSION, binariesFragmentVersion.toString());
142
				System.out.println("Done.");
143
			} catch (MalformedURLException e) {
144
				// TODO Auto-generated catch block
88 145
				e.printStackTrace();
89 146
			}
90 147
		}
91

  
148
		
149
		Version modelsFragmentVersion = BundleUtils.getBundleVersion(mfragmentid);
150
		if (modelsFragmentVersion != null && modelsFragmentVersion.compareTo(currentMVersion) >= 0) { // udpate models path!
151
			System.out.print("Updating TreeTagger models path...");
152
			try {
153
				URL dir = new URL(BundleUtils.getBundleLocation(mfragmentid));
154
				String path = dir.getPath();
155
				if (path.startsWith("file:")) path = path.substring(5);
156
				File modelsDir = new File(path, "res/models");
157
				preferences.put(MODELS_PATH, modelsDir.getAbsolutePath()); //$NON-NLS-1$
158
				TreeTaggerPreferences.put(PREFERENCES_NODE, INSTALLED_MODELS_VERSION, modelsFragmentVersion.toString());
159
				System.out.println("Done.");
160
			} catch (MalformedURLException e) {
161
				// TODO Auto-generated catch block
162
				e.printStackTrace();
163
			}
164
		}
92 165
	}
93
	
94 166
}
tmp/TXMAlphaPlugins.site/site.xml (revision 836)
3 3
   <description name="TXM Extensions - Alpha" url="http://txm.textometrie.org/updates/TXMalpha">
4 4
      This update site contains the Alpha plugins for TXM
5 5
   </description>
6
   <feature url="features/BackToMedia_1.0.0.201607181452.jar" id="BackToMedia" version="1.0.0.201607181452"/>
7
   <feature url="features/CheckTXMFeature_1.0.0.201702061152.jar" id="CheckTXMFeature" version="1.0.0.201702061152"/>
8
   <feature url="features/CQL2LSA_1.0.0.201702061152.jar" id="CQL2LSA" version="1.0.0.201702061152"/>
9
   <feature url="features/Dictionary_1.0.0.201702061152.jar" id="Dictionary" version="1.0.0.201702061152"/>
10
   <feature url="features/Oriflamms_1.0.0.201702061152.jar" id="Oriflamms" version="1.0.0.201702061152"/>
11
   <feature url="features/QueryCooccurrencesFeature_1.0.0.201702061152.jar" id="QueryCooccurrencesFeature" version="1.0.0.201702061152"/>
12
   <feature url="features/QueryIndex_1.0.0.201702061152.jar" id="QueryIndex" version="1.0.0.201702061152"/>
13
   <feature url="features/SVNEnvironment.feature_1.0.0.201702061152.jar" id="SVNEnvironment.feature" version="1.0.0.201702061152"/>
14
   <feature url="features/TextBalanceFeature_1.0.0.201702061152.jar" id="TextBalanceFeature" version="1.0.0.201702061152"/>
15
   <feature url="features/TreeTagger_1.0.0.201702061152.jar" id="TreeTagger" version="1.0.0.201702061152"/>
16
   <feature url="features/TreeTaggerInstaller_1.0.0.201702061152.jar" id="TreeTaggerInstaller" version="1.0.0.201702061152"/>
17
   <feature url="features/WordCloudFeature_1.0.0.201702061152.jar" id="WordCloudFeature" version="1.0.0.201702061152"/>
18
   <feature url="features/XMLEditor.feature_1.0.0.201702061152.jar" id="XMLEditor.feature" version="1.0.0.201702061152"/>
19
   <feature url="features/TIGERSearch.feature_1.0.0.201702061152.jar" id="TIGERSearch.feature" version="1.0.0.201702061152"/>
20
   <feature url="features/BackToMedia_1.0.0.201702061152.jar" id="BackToMedia" version="1.0.0.201702061152"/>
21
   <feature url="features/Analec_1.0.0.201702061152.jar" id="Analec" version="1.0.0.201702061152"/>
22 6
</site>
tmp/TXMAlphaPlugins.site/index.html (revision 836)
1
<h3>TXM extensions - Alpha</h3>
0 2

  
tmp/org.txm.wordcloud.feature/feature.xml (revision 836)
1 1
<?xml version="1.0" encoding="UTF-8"?>
2 2
<feature
3
      id="WordCloudFeature"
3
      id="org.txm.wordcloud.feature"
4 4
      label="WordCloud"
5 5
      version="1.0.0.qualifier">
6 6

  
......
67 67
   </license>
68 68

  
69 69
   <requires>
70
      <import plugin="org.eclipse.core.runtime"/>
71
      <import plugin="org.eclipse.ui"/>
72 70
      <import plugin="org.txm.core" version="0.7.0" match="greaterOrEqual"/>
73
      <import plugin="org.txm.rcp" version="0.7.5" match="greaterOrEqual"/>
74
      <import plugin="org.eclipse.core.expressions" version="3.4.500" match="greaterOrEqual"/>
75
      <import plugin="org.txm.wordcloud.rcp"/>
76
      <import plugin="org.txm.wordcloud.core"/>
71

  
72
      <import plugin="org.txm.utils" version="1.0.0" match="greaterOrEqual"/>
73
      <import plugin="org.eclipse.core.runtime" version="3.10.0" match="greaterOrEqual"/>
74
      <import plugin="org.txm.chartsengine.core" version="1.0.0" match="greaterOrEqual"/>
75
      <import plugin="org.txm.searchengine.cqp.core" version="1.1.0" match="greaterOrEqual"/>
76
      <import plugin="org.txm.statsengine.r.core" version="1.0.0" match="greaterOrEqual"/>
77
      <import plugin="org.txm.chartsengine.jfreechart.core" version="1.0.0" match="greaterOrEqual"/>
78
      <import plugin="org.txm.statsengine.core" version="1.0.0" match="greaterOrEqual"/>
79
      <import plugin="org.txm.chartsengine.r.core" version="1.0.0" match="greaterOrEqual"/>
80
      <import plugin="org.txm.index.core" version="1.0.0" match="greaterOrEqual"/>
81
      <import plugin="org.txm.rcp" version="0.7.8" match="greaterOrEqual"/>
82
      <import plugin="org.eclipse.osgi" version="3.10.2" match="greaterOrEqual"/>
83
      <import plugin="org.txm.index.rcp" version="1.0.0" match="greaterOrEqual"/>
84
      <import plugin="org.eclipse.ui" version="3.106.1" match="greaterOrEqual"/>
85
      <import plugin="org.txm.wordcloud.core" version="1.0.0" match="greaterOrEqual"/>
86
      <import plugin="org.txm.chartsengine.rcp"/>
77 87
   </requires>
78 88

  
79 89
   <plugin
80
         id="WordCloudRCP"
90
         id="org.txm.wordcloud.core"
81 91
         download-size="0"
82 92
         install-size="0"
83
         version="1.0.0.qualifier"
93
         version="0.0.0"
84 94
         unpack="false"/>
85 95

  
96
   <plugin
97
         id="org.txm.wordcloud.rcp"
98
         download-size="0"
99
         install-size="0"
100
         version="0.0.0"
101
         unpack="false"/>
102

  
86 103
</feature>
tmp/org.txm.specificities.rcp/src/org/txm/specificities/rcp/editors/SpecificitiesEditor.java (revision 836)
99 99
	
100 100
	
101 101
	@Override
102
	public void _createPartControl(Composite parent) {
102
	public void _createPartControl() {
103 103

  
104 104
		try {
105 105

  
tmp/org.txm.specificities.rcp/src/org/txm/specificities/rcp/editors/SpecificitiesSelectionEditor.java (revision 836)
37 37

  
38 38
	
39 39
	@Override
40
	public void __createPartControl(Composite parent) {
40
	public void __createPartControl() {
41 41
		
42 42
		// Group bars by lines
43 43
		groupBarsByLines = new ToolItem(this.getToolBar(), SWT.CHECK);
tmp/org.txm.ca.rcp/src/org/txm/ca/rcp/editors/CAFactorialMapChartEditor.java (revision 836)
69 69

  
70 70

  
71 71
	@Override
72
	public void __createPartControl(Composite parent) {
72
	public void __createPartControl() {
73 73

  
74 74
		// Extend the chart editor tool bar
75 75
		new ToolItem(this.chartToolBar, SWT.SEPARATOR);
tmp/org.txm.ca.rcp/src/org/txm/ca/rcp/editors/EigenvaluesChartEditor.java (revision 836)
3 3
 */
4 4
package org.txm.ca.rcp.editors;
5 5

  
6
import org.eclipse.swt.widgets.Composite;
7 6
import org.txm.ca.core.functions.Eigenvalues;
8 7
import org.txm.chartsengine.rcp.editors.ChartEditor;
9 8
import org.txm.chartsengine.rcp.editors.ChartEditorInput;
......
21 20
	 * 
22 21
	 * @param createChartEditorInput
23 22
	 */
24
	public EigenvaluesChartEditor(ChartEditorInput chartEditorInput) {
23
	public EigenvaluesChartEditor(ChartEditorInput<Eigenvalues> chartEditorInput) {
25 24
		super(chartEditorInput);
26 25
	}
27 26

  
28 27
	@Override
29
	public void __createPartControl(Composite parent) {
28
	public void __createPartControl() {
30 29
		// nothing to do
31 30
	}
32 31

  
tmp/org.txm.information.rcp/src/org/txm/properties/rcp/editors/PropertiesEditor.java (revision 836)
64 64

  
65 65

  
66 66
	@Override
67
	public void _createPartControl(Composite parent) {
67
	public void _createPartControl() {
68 68

  
69 69
		Composite parametersArea = this.getExtendedParametersComposite();
70 70

  
tmp/org.txm.lexicaltable.rcp/src/org/txm/lexicaltable/rcp/editors/LexicalTableEditor.java (revision 836)
162 162
	 * @see org.eclipse.ui.part.WorkbenchPart#createPartControl(org.eclipse.swt.widgets.Composite)
163 163
	 */
164 164
	@Override
165
	public void _createPartControl(final Composite parent) {
165
	public void _createPartControl() {
166 166
		
167 167
		try {
168 168
			lexicalTable = (LexicalTable) this.getResult();
169 169
			
170
			
171 170
			// Main parameters
172 171
			GLComposite mainParametersArea = this.getMainParametersComposite();
173 172
			mainParametersArea.getLayout().numColumns = 2;
......
178 177
					Corpus.getFirstParentCorpus(this.getResult()).getOrderedProperties(),
179 178
					this.getResult().getProperty(), false);
180 179

  
181
			
182

  
183 180
			// Extended parameters
184 181
			Composite extendedParametersArea = this.getExtendedParametersComposite();
185 182
			
tmp/org.txm.rcp.feature/feature.xml (revision 836)
93 93
         optional="true"/>
94 94

  
95 95
   <includes
96
         id="org.txm.treetagger.feature"
97
         version="0.0.0"
98
         optional="true"/>
99

  
100
   <includes
101
         id="org.txm.ahc.feature"
102
         version="0.0.0"
103
         optional="true"/>
104

  
105
   <includes
106
         id="org.txm.annotation.feature"
107
         version="0.0.0"
108
         optional="true"/>
109

  
110
   <includes
111
         id="org.txm.ca.feature"
112
         version="0.0.0"
113
         optional="true"/>
114

  
115
   <includes
116
         id="org.txm.concordance.feature"
117
         version="0.0.0"
118
         optional="true"/>
119

  
120
   <includes
121
         id="org.txm.cooccurrence.feature"
122
         version="0.0.0"
123
         optional="true"/>
124

  
125
   <includes
126
         id="org.txm.edition.feature"
127
         version="0.0.0"
128
         optional="true"/>
129

  
130
   <includes
131
         id="org.txm.groovy.feature"
132
         version="0.0.0"
133
         optional="true"/>
134

  
135
   <includes
136
         id="org.txm.index.feature"
137
         version="0.0.0"
138
         optional="true"/>
139

  
140
   <includes
141
         id="org.txm.internalview.feature"
142
         version="0.0.0"
143
         optional="true"/>
144

  
145
   <includes
146
         id="org.txm.lexicaltable.feature"
147
         version="0.0.0"
148
         optional="true"/>
149

  
150
   <includes
151
         id="org.txm.partition.feature"
152
         version="0.0.0"
153
         optional="true"/>
154

  
155
   <includes
156
         id="org.txm.progression.feature"
157
         version="0.0.0"
158
         optional="true"/>
159

  
160
   <includes
161
         id="org.txm.properties.feature"
162
         version="0.0.0"
163
         optional="true"/>
164

  
165
   <includes
166
         id="org.txm.referencer.feature"
167
         version="0.0.0"
168
         optional="true"/>
169

  
170
   <includes
96 171
         id="org.txm.searchengine.cqp.feature"
97 172
         version="0.0.0"
98 173
         optional="true"/>
99 174

  
175
   <includes
176
         id="org.txm.specificities.feature"
177
         version="0.0.0"
178
         optional="true"/>
179

  
180
   <includes
181
         id="org.txm.treetagger.feature"
182
         version="0.0.0"
183
         optional="true"/>
184

  
185
   <includes
186
         id="org.txm.chartsengine.jfreechart.feature"
187
         version="0.0.0"/>
188

  
189
   <includes
190
         id="org.txm.chartsengine.r.feature"
191
         version="0.0.0"/>
192

  
100 193
   <requires>
101
      <import plugin="org.txm.statsengine.r.core" version="1.0.0" match="greaterOrEqual"/>
102 194
      <import plugin="org.eclipse.core.runtime" version="3.10.0" match="greaterOrEqual"/>
103
      <import plugin="org.txm.lexicaltable.core"/>
104
      <import plugin="org.txm.searchengine.cqp.core" version="1.1.0" match="greaterOrEqual"/>
105
      <import plugin="org.eclipse.osgi" version="3.10.2" match="greaterOrEqual"/>
106
      <import plugin="org.eclipse.ui" version="3.106.1" match="greaterOrEqual"/>
107
      <import plugin="org.txm.chartsengine.rcp"/>
108
      <import plugin="org.eclipse.core.expressions" version="3.4.600" match="greaterOrEqual"/>
109
      <import plugin="org.txm.libs.itext"/>
110
      <import plugin="org.eclipse.core.resources"/>
111
      <import plugin="org.eclipse.swt"/>
112
      <import plugin="org.eclipse.e4.ui.workbench.renderers.swt"/>
113
      <import plugin="org.eclipse.swt" version="3.103.2" match="greaterOrEqual"/>
114
      <import plugin="org.eclipse.e4.ui.workbench" version="1.2.2" match="greaterOrEqual"/>
115
      <import plugin="org.txm.concordance.core"/>
116
      <import plugin="org.txm.utils"/>
117
      <import plugin="org.txm.statsengine.r.rcp" version="1.0.0" match="greaterOrEqual"/>
118 195
      <import plugin="org.eclipse.osgi.util" version="3.2.0" match="greaterOrEqual"/>
119 196
      <import plugin="org.eclipse.core.net"/>
197
      <import plugin="org.eclipse.osgi" version="3.10.2" match="greaterOrEqual"/>
120 198
      <import plugin="org.eclipse.core.commands" version="3.6.100" match="greaterOrEqual"/>
121
      <import plugin="org.txm.libs.rserve"/>
122
      <import plugin="org.txm.libs.cqp" version="1.0.0" match="greaterOrEqual"/>
123
      <import plugin="org.txm.properties.core" version="1.0.0" match="greaterOrEqual"/>
199
      <import plugin="org.eclipse.core.resources"/>
124 200
      <import plugin="org.apache.xerces" version="2.9.0" match="greaterOrEqual"/>
125
      <import plugin="org.txm.chartsengine.core"/>
126
      <import plugin="org.txm.partition.core"/>
127
      <import plugin="org.txm.concordance.rcp"/>
128
      <import plugin="org.txm.synopticeditor.rcp"/>
201
      <import plugin="org.eclipse.ui" version="3.106.1" match="greaterOrEqual"/>
129 202
      <import plugin="org.eclipse.core.filesystem" version="1.2.0" match="greaterOrEqual"/>
130 203
      <import plugin="org.eclipse.ui.ide"/>
131 204
      <import plugin="org.eclipse.ui.console" version="3.4.0" match="greaterOrEqual"/>
......
152 225
      <import plugin="org.eclipse.equinox.p2.ui.discovery" version="1.0.0" match="greaterOrEqual"/>
153 226
      <import plugin="org.eclipse.equinox.p2.discovery" version="1.0.200" match="greaterOrEqual"/>
154 227
      <import plugin="org.eclipse.equinox.p2.discovery.compatibility" version="1.0.101" match="greaterOrEqual"/>
228
      <import plugin="org.eclipse.swt"/>
155 229
      <import plugin="org.eclipse.equinox.p2.repository" version="2.3.0" match="greaterOrEqual"/>
156 230
      <import plugin="org.eclipse.equinox.p2.core" version="2.3.0" match="greaterOrEqual"/>
157 231
      <import plugin="org.eclipse.equinox.p2.engine" version="2.3.0" match="greaterOrEqual"/>
......
160 234
      <import plugin="org.eclipse.e4.ui.model.workbench"/>
161 235
      <import plugin="org.eclipse.e4.ui.workbench" version="1.0.0" match="greaterOrEqual"/>
162 236
      <import plugin="org.eclipse.e4.core.contexts" version="1.3.0" match="greaterOrEqual"/>
237
      <import plugin="org.eclipse.core.expressions" version="3.4.600" match="greaterOrEqual"/>
163 238
      <import plugin="org.eclipse.ui.navigator" version="3.5.300" match="greaterOrEqual"/>
164 239
      <import plugin="org.eclipse.ui.navigator.resources" version="3.4.500" match="greaterOrEqual"/>
165 240
      <import plugin="org.eclipse.e4.ui.di"/>
......
171 246
      <import plugin="org.eclipse.osgi.util" version="3.3.0" match="greaterOrEqual"/>
172 247
      <import plugin="org.eclipse.equinox.p2.reconciler.dropins" version="1.1.200" match="greaterOrEqual"/>
173 248
      <import plugin="org.eclipse.ui.views.log" version="1.0.500" match="greaterOrEqual"/>
249
      <import plugin="org.txm.searchengine.cqp.core" version="1.1.0" match="greaterOrEqual"/>
250
      <import plugin="org.txm.chartsengine.core" version="1.0.0" match="greaterOrEqual"/>
251
      <import plugin="org.txm.chartsengine.jfreechart.core" version="1.0.0" match="greaterOrEqual"/>
252
      <import plugin="org.txm.chartsengine.r.core" version="1.0.0" match="greaterOrEqual"/>
253
      <import plugin="org.txm.specificities.core" version="1.0.0" match="greaterOrEqual"/>
254
      <import plugin="org.txm.statsengine.core" version="1.0.0" match="greaterOrEqual"/>
255
      <import plugin="org.txm.statsengine.r.core" version="1.0.0" match="greaterOrEqual"/>
256
      <import plugin="org.txm.searchengine.core" version="1.0.0" match="greaterOrEqual"/>
174 257
      <import plugin="org.txm.groovy.core"/>
175
      <import plugin="org.eclipse.ui.browser" version="3.4.100" match="greaterOrEqual"/>
176
      <import plugin="org.eclipse.jface.databinding" version="1.6.200" match="greaterOrEqual"/>
177
      <import plugin="org.eclipse.jface.text" version="3.9.2" match="greaterOrEqual"/>
258
      <import plugin="org.eclipse.jface" version="3.9.0" match="compatible"/>
178 259
      <import plugin="org.eclipse.core.net" version="1.2.200" match="greaterOrEqual"/>
179
      <import plugin="org.txm.specificities.core"/>
180
      <import plugin="org.txm.lexicaltable.rcp"/>
181 260
      <import plugin="org.eclipse.core.runtime" version="3.6.0" match="compatible"/>
182 261
      <import plugin="org.eclipse.help" version="3.2.0" match="compatible"/>
183
      <import plugin="org.eclipse.jface" version="3.9.0" match="compatible"/>
184 262
      <import plugin="org.eclipse.swt" version="3.101.0" match="compatible"/>
185 263
      <import plugin="org.eclipse.jface.databinding" version="1.3.0" match="compatible"/>
186 264
      <import plugin="org.eclipse.core.databinding.property" version="1.2.0" match="compatible"/>
......
198 276
      <import plugin="org.eclipse.e4.ui.workbench3" version="0.12.0" match="greaterOrEqual"/>
199 277
      <import plugin="org.eclipse.e4.ui.workbench.addons.swt" version="0.10.0" match="greaterOrEqual"/>
200 278
      <import plugin="org.eclipse.emf.ecore" version="2.7.0" match="greaterOrEqual"/>
201
      <import plugin="org.txm.ca.core"/>
202
      <import plugin="org.eclipse.persistence.asm" version="3.3.1" match="greaterOrEqual"/>
203
      <import plugin="org.eclipse.persistence.jpa" version="2.6.0" match="greaterOrEqual"/>
204
      <import plugin="org.eclipse.persistence.jpa.jpql" version="2.6.0" match="greaterOrEqual"/>
205
      <import plugin="org.eclipse.persistence.antlr" version="3.2.0" match="greaterOrEqual"/>
206
      <import plugin="org.txm.annotation.core" version="1.0.0" match="greaterOrEqual"/>
207
      <import plugin="org.eclipse.ui.workbench" version="3.106.2" match="greaterOrEqual"/>
208
      <import plugin="org.eclipse.ui.console" version="3.5.300" match="greaterOrEqual"/>
209
      <import plugin="org.eclipse.ui.ide" version="3.10.2" match="greaterOrEqual"/>
210
      <import plugin="org.txm.treetagger.core" version="1.0.0" match="greaterOrEqual"/>
211 279
   </requires>
212 280

  
213 281
   <plugin
214
         id="org.txm.ca.core"
215
         download-size="0"
216
         install-size="0"
217
         version="1.0.0.qualifier"
218
         unpack="false"/>
219

  
220
   <plugin
221
         id="org.txm.ca.rcp"
222
         download-size="0"
223
         install-size="0"
224
         version="1.0.0.qualifier"
225
         unpack="false"/>
226

  
227
   <plugin
228
         id="org.txm.ahc.core"
229
         download-size="0"
230
         install-size="0"
231
         version="1.0.0.qualifier"
232
         unpack="false"/>
233

  
234
   <plugin
235
         id="org.txm.chartsengine.core"
236
         download-size="0"
237
         install-size="0"
238
         version="1.0.0.qualifier"
239
         unpack="false"/>
240

  
241
   <plugin
242
         id="org.txm.chartsengine.jfreechart.core"
243
         download-size="0"
244
         install-size="0"
245
         version="1.0.0.qualifier"
246
         unpack="false"/>
247

  
248
   <plugin
249
         id="org.txm.chartsengine.jfreechart.rcp"
250
         download-size="0"
251
         install-size="0"
252
         version="1.0.0.qualifier"
253
         unpack="false"/>
254

  
255
   <plugin
256
         id="org.txm.chartsengine.r.core"
257
         download-size="0"
258
         install-size="0"
259
         version="1.0.0.qualifier"
260
         unpack="false"/>
261

  
262
   <plugin
263
         id="org.txm.chartsengine.r.rcp"
264
         download-size="0"
265
         install-size="0"
266
         version="1.0.0.qualifier"
267
         unpack="false"/>
268

  
269
   <plugin
270
         id="org.txm.chartsengine.raster.rcp"
271
         download-size="0"
272
         install-size="0"
273
         version="1.0.0.qualifier"
274
         unpack="false"/>
275

  
276
   <plugin
277
         id="org.txm.chartsengine.rcp"
278
         download-size="0"
279
         install-size="0"
280
         version="1.0.0.qualifier"
281
         unpack="false"/>
282

  
283
   <plugin
284
         id="org.txm.chartsengine.svgbatik.rcp"
285
         download-size="0"
286
         install-size="0"
287
         version="1.0.0.qualifier"
288
         unpack="false"/>
289

  
290
   <plugin
291
         id="org.txm.concordance.core"
292
         download-size="0"
293
         install-size="0"
294
         version="1.0.0.qualifier"
295
         unpack="false"/>
296

  
297
   <plugin
298
         id="org.txm.concordance.rcp"
299
         download-size="0"
300
         install-size="0"
301
         version="1.0.0.qualifier"
302
         unpack="false"/>
303

  
304
   <plugin
305
         id="org.txm.cooccurrence.core"
306
         download-size="0"
307
         install-size="0"
308
         version="1.0.0.qualifier"
309
         unpack="false"/>
310

  
311
   <plugin
312
         id="org.txm.cooccurrence.rcp"
313
         download-size="0"
314
         install-size="0"
315
         version="1.0.0.qualifier"
316
         unpack="false"/>
317

  
318
   <plugin
319 282
         id="org.txm.core"
320 283
         download-size="0"
321 284
         install-size="0"
322 285
         version="0.8.0.qualifier"/>
323 286

  
324 287
   <plugin
325
         id="org.txm.groovy.core"
326
         download-size="0"
327
         install-size="0"
328
         version="1.0.0.qualifier"
329
         unpack="false"/>
330

  
331
   <plugin
332
         id="org.txm.index.core"
333
         download-size="0"
334
         install-size="0"
335
         version="1.0.0.qualifier"
336
         unpack="false"/>
337

  
338
   <plugin
339
         id="org.txm.index.rcp"
340
         download-size="0"
341
         install-size="0"
342
         version="1.0.0.qualifier"
343
         unpack="false"/>
344

  
345
   <plugin
346
         id="org.txm.internalview.core"
347
         download-size="0"
348
         install-size="0"
349
         version="1.0.0.qualifier"
350
         unpack="false"/>
351

  
352
   <plugin
353
         id="org.txm.internalview.rcp"
354
         download-size="0"
355
         install-size="0"
356
         version="1.0.0.qualifier"
357
         unpack="false"/>
358

  
359
   <plugin
360
         id="org.txm.lexicaltable.core"
361
         download-size="0"
362
         install-size="0"
363
         version="1.0.0.qualifier"
364
         unpack="false"/>
365

  
366
   <plugin
367
         id="org.txm.lexicaltable.rcp"
368
         download-size="0"
369
         install-size="0"
370
         version="1.0.0.qualifier"
371
         unpack="false"/>
372

  
373
   <plugin
374 288
         id="org.txm.libs.batik"
375 289
         download-size="0"
376 290
         install-size="0"
......
425 339
         unpack="false"/>
426 340

  
427 341
   <plugin
428
         id="org.txm.partition.core"
429
         download-size="0"
430
         install-size="0"
431
         version="1.0.0.qualifier"
432
         unpack="false"/>
433

  
434
   <plugin
435
         id="org.txm.partition.rcp"
436
         download-size="0"
437
         install-size="0"
438
         version="1.0.0.qualifier"
439
         unpack="false"/>
440

  
441
   <plugin
442
         id="org.txm.progression.core"
443
         download-size="0"
444
         install-size="0"
445
         version="1.0.0.qualifier"
446
         unpack="false"/>
447

  
448
   <plugin
449
         id="org.txm.progression.rcp"
450
         download-size="0"
451
         install-size="0"
452
         version="1.0.0.qualifier"
453
         unpack="false"/>
454

  
455
   <plugin
456 342
         id="org.txm.rcp"
457 343
         download-size="0"
458 344
         install-size="0"
......
460 346
         unpack="false"/>
461 347

  
462 348
   <plugin
463
         id="org.txm.referencer.core"
464
         download-size="0"
465
         install-size="0"
466
         version="1.0.0.qualifier"
467
         unpack="false"/>
468

  
469
   <plugin
470
         id="org.txm.referencer.rcp"
471
         download-size="0"
472
         install-size="0"
473
         version="1.0.0.qualifier"
474
         unpack="false"/>
475

  
476
   <plugin
477
         id="org.txm.searchengine.core"
478
         download-size="0"
479
         install-size="0"
480
         version="1.0.0.qualifier"
481
         unpack="false"/>
482

  
483
   <plugin
484
         id="org.txm.specificities.core"
485
         download-size="0"
486
         install-size="0"
487
         version="1.0.0.qualifier"
488
         unpack="false"/>
489

  
490
   <plugin
491
         id="org.txm.statsengine.core"
492
         download-size="0"
493
         install-size="0"
494
         version="1.0.0.qualifier"
495
         unpack="false"/>
496

  
497
   <plugin
498
         id="org.txm.synopticeditor.rcp"
499
         download-size="0"
500
         install-size="0"
501
         version="1.0.0.qualifier"
502
         unpack="false"/>
503

  
504
   <plugin
505 349
         id="org.txm.utils"
506 350
         download-size="0"
507 351
         install-size="0"
......
509 353
         unpack="false"/>
510 354

  
511 355
   <plugin
512
         id="javax.persistence"
513
         download-size="0"
514
         install-size="0"
515
         version="2.1.0.v201304241213"
516
         unpack="false"/>
517

  
518
   <plugin
519
         id="org.txm.specificities.rcp"
520
         download-size="0"
521
         install-size="0"
522
         version="1.0.0.qualifier"
523
         unpack="false"/>
524

  
525
   <plugin
526 356
         id="org.eclipse.ui.workbench"
527 357
         download-size="0"
528 358
         install-size="0"
529 359
         version="0.0.0"
530 360
         unpack="false"/>
531 361

  
532
   <plugin
533
         id="org.txm.ahc.rcp"
534
         download-size="0"
535
         install-size="0"
536
         version="0.0.0"
537
         unpack="false"/>
538

  
539
   <plugin
540
         id="org.txm.properties.core"
541
         download-size="0"
542
         install-size="0"
543
         version="0.0.0"
544
         unpack="false"/>
545

  
546
   <plugin
547
         id="org.txm.properties.rcp"
548
         download-size="0"
549
         install-size="0"
550
         version="0.0.0"
551
         unpack="false"/>
552

  
553
   <plugin
554
         id="org.txm.annotation.core"
555
         download-size="0"
556
         install-size="0"
557
         version="0.0.0"
558
         unpack="false"/>
559

  
560
   <plugin
561
         id="org.txm.annotation.rcp"
562
         download-size="0"
563
         install-size="0"
564
         version="0.0.0"
565
         unpack="false"/>
566

  
567
   <plugin
568
         id="org.txm.searchengine.cqp.core"
569
         download-size="0"
570
         install-size="0"
571
         version="0.0.0"
572
         unpack="false"/>
573

  
574
   <plugin
575
         id="org.txm.searchengine.cqp.rcp"
576
         download-size="0"
577
         install-size="0"
578
         version="0.0.0"
579
         unpack="false"/>
580

  
581
   <plugin
582
         id="org.txm.statsengine.r.core"
583
         download-size="0"
584
         install-size="0"
585
         version="0.0.0"
586
         unpack="false"/>
587

  
588
   <plugin
589
         id="org.txm.statsengine.r.rcp"
590
         download-size="0"
591
         install-size="0"
592
         version="0.0.0"
593
         unpack="false"/>
594

  
595
   <plugin
596
         id="org.txm.treetagger.core"
597
         download-size="0"
598
         install-size="0"
599
         version="0.0.0"
600
         unpack="false"/>
601

  
602
   <plugin
603
         id="org.txm.treetagger.rcp"
604
         download-size="0"
605
         install-size="0"
606
         version="0.0.0"
607
         unpack="false"/>
608

  
609 362
</feature>
tmp/TXMDevPlugins.site/site.xml (revision 836)
1 1
<?xml version="1.0" encoding="UTF-8"?>
2 2
<site>
3
   <feature url="features/Analec_1.0.0.201702061154.jar" id="Analec" version="1.0.0.201702061154"/>
4
   <feature url="features/BackToMedia_1.0.0.201702061154.jar" id="BackToMedia" version="1.0.0.201702061154"/>
5
   <feature url="features/CQL2LSA_1.0.0.201702061154.jar" id="CQL2LSA" version="1.0.0.201702061154"/>
6
   <feature url="features/CQP.feature_1.0.0.201702061154.jar" id="CQP.feature" version="1.0.0.201702061154"/>
7
   <feature url="features/CheckTXMFeature_1.0.0.201702061154.jar" id="CheckTXMFeature" version="1.0.0.201702061154"/>
8
   <feature url="features/Dictionary_1.0.0.201702061154.jar" id="Dictionary" version="1.0.0.201702061154"/>
9
   <feature url="features/Oriflamms_1.0.0.201702061154.jar" id="Oriflamms" version="1.0.0.201702061154"/>
10
   <feature url="features/QueryCooccurrencesFeature_1.0.0.201702061154.jar" id="QueryCooccurrencesFeature" version="1.0.0.201702061154"/>
11
   <feature url="features/QueryIndex_1.0.0.201702061154.jar" id="QueryIndex" version="1.0.0.201702061154"/>
12
   <feature url="features/SVNEnvironment.feature_1.0.0.201702061154.jar" id="SVNEnvironment.feature" version="1.0.0.201702061154"/>
13
   <feature url="features/SynopticEditor.feature_1.0.0.201702061154.jar" id="SynopticEditor.feature" version="1.0.0.201702061154"/>
14
   <feature url="features/TIGERSearch.feature_1.0.0.201702061154.jar" id="TIGERSearch.feature" version="1.0.0.201702061154"/>
15
   <feature url="features/TextBalanceFeature_1.0.0.201702061154.jar" id="TextBalanceFeature" version="1.0.0.201702061154"/>
16
   <feature url="features/TreeTagger_1.0.0.201702061154.jar" id="TreeTagger" version="1.0.0.201702061154"/>
17
   <feature url="features/TreeTaggerInstaller_1.0.0.201702061154.jar" id="TreeTaggerInstaller" version="1.0.0.201702061154"/>
18
   <feature url="features/WordCloudFeature_1.0.0.201702061154.jar" id="WordCloudFeature" version="1.0.0.201702061154"/>
19
   <feature url="features/XMLEditor.feature_1.0.0.201702061154.jar" id="XMLEditor.feature" version="1.0.0.201702061154"/>
20 3
</site>
tmp/TXMDevPlugins.site/index.html (revision 836)
1
<h3>TXM extensions - Dev</h3>
0 2

  
tmp/org.txm.treetagger.feature/feature.xml (revision 836)
1 1
<?xml version="1.0" encoding="UTF-8"?>
2 2
<feature
3 3
      id="org.txm.treetagger.feature"
4
      label="org.txm.treetagger.feature"
4
      label="TreeTagger files"
5 5
      version="1.0.0.qualifier"
6 6
      provider-name="Textometrie.org">
7 7

  
8
   <description url="http://www.example.com/description">
9
      [Enter Feature Description here.]
8
   <description>
9
      Install TreeTagger for TXM.&lt;br/&gt;
10
See http://www.cis.uni-muenchen.de/~schmid/tools/TreeTagger for more informations about TreeTagger.
10 11
   </description>
11 12

  
12
   <copyright url="http://www.example.com/copyright">
13
      [Enter Copyright Description here.]
13
   <copyright url="http://www.cis.uni-muenchen.de/~schmid/tools/TreeTagger/">
14
      See: http://www.cis.uni-muenchen.de/~schmid/tools/TreeTagger/
14 15
   </copyright>
15 16

  
16
   <license url="http://www.example.com/license">
17
      [Enter License Description here.]
17
   <license url="http://www.cis.uni-muenchen.de/~schmid/tools/TreeTagger/Tagger-Licence">
18
      ** TreeTagger License **
19

  
20
1. The Institut fuer maschinelle Sprachverarbeitung, Universitaet
21
   Stuttgart, subsequently called ``the licenser&apos;&apos;, grants you (the
22
   licensee) the rights to use the TreeTagger software subsequently
23
   called ``the system&apos;&apos; for evaluation, research and teaching
24
   purposes. **Any other usage of the system (in particular for
25
   commercial purposes) is forbidden**.
26

  
27
2. The licensee has no right to give or sell the system to third
28
   parties without written permission from the licenser.
29

  
30
3. The licenser has no obligation to maintain the system.
31
   Nevertheless the licensee is encouraged to report to the licenser
32
   any problems with or suggestions for improvement of the system.
33

  
34
4. The licenser has no obligation to make new releases available to the
35
   licensee, but where such updates are supplied they shall be governed by
36
   the terms of this agreement.
37

  
38
      NO WARRANTY
39

  
40
5. BECAUSE THE SYSTEM IS LICENSED FREE OF CHARGE, WE PROVIDE
41
ABSOLUTELY NO WARRANTY, TO THE EXTENT PERMITTED BY APPLICABLE STATE
42
LAW. EXCEPT WHEN OTHERWISE STATED IN WRITING THE LICENSER PROVIDES THE
43
SYSTEM &quot;AS IS&quot; WITHOUT WARRANTY OF ANY KIND, EITHER EXPRESSED OR
44
IMPLIED, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
45
MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE. THE ENTIRE RISK
46
AS TO THE QUALITY AND PERFORMANCE OF THE PROGRAM IS WITH THE LICENSEE.
47
SHOULD THE SYSTEM PROVE DEFECTIVE, THE LICENSEE ASSUMES THE COST OF
48
ALL NECESSARY SERVICING, REPAIR OR CORRECTION.
49

  
50
6. IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW WILL THE LICENSER BE
51
LIABLE TO THE LICENSEE FOR DAMAGES, INCLUDING ANY LOST PROFITS, LOST
52
MONIES, OR OTHER SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING
53
OUT OF THE USE OR INABILITY TO USE (INCLUDING BUT NOT LIMITED TO LOSS
54
OF DATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY THIRD
55
PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER PROGRAM)
56
THE PROGRAM, EVEN IF THE LICENSEE HAS BEEN ADVISED OF THE POSSIBILITY
57
OF SUCH DAMAGES, OR FOR ANY CLAIM BY ANY OTHER PARTY.
58

  
59

  
60
Contact Adress:
61

  
62
Helmut Schmid
63
Institut fuer maschinelle Sprachverarbeitung (IMS) 
64
Universitaet Stuttgart
65
Azenbergstr. 12
66
D-70174 Stuttgart, Germany
67

  
68
Helmut.Schmid@ims.uni-stuttgart.de
18 69
   </license>
19 70

  
20 71
   <requires>
......
38 89
         unpack="false"/>
39 90

  
40 91
   <plugin
41
         id="org.txm.treetagger.core.linux"
42
         os="linux"
43
         download-size="0"
44
         install-size="0"
45
         version="0.0.0"
46
         fragment="true"/>
47

  
48
   <plugin
49
         id="org.txm.treetagger.core.macosx"
50
         os="macosx"
51
         download-size="0"
52
         install-size="0"
53
         version="0.0.0"
54
         fragment="true"/>
55

  
56
   <plugin
57
         id="org.txm.treetagger.core.models"
58
         download-size="0"
59
         install-size="0"
60
         version="0.0.0"
61
         fragment="true"/>
62

  
63
   <plugin
64
         id="org.txm.treetagger.core.win32"
65
         os="win32"
66
         download-size="0"
67
         install-size="0"
68
         version="0.0.0"
69
         fragment="true"/>
70

  
71
   <plugin
72 92
         id="org.txm.treetagger.rcp"
73 93
         download-size="0"
74 94
         install-size="0"
tmp/org.txm.setups/VERSION (revision 836)
1
0.8.0a
1
0.8.0
tmp/org.txm.wordcloud.rcp/src/org/txm/wordcloud/rcp/editors/WordCloudEditor.java (revision 836)
38 38
	
39 39
	
40 40
	@Override
41
	public void __createPartControl(Composite parent) {
41
	public void __createPartControl() {
42 42

  
43 43
		// for group tests
44 44
		Composite parametersArea = this.getExtendedParametersComposite();
tmp/org.txm.dictionary.rcp/META-INF/MANIFEST.MF (revision 836)
14 14
Bundle-Vendor: Textometrie.org
15 15
Bundle-ActivationPolicy: lazy
16 16
Bundle-Version: 1.0.0.qualifier
17
Bundle-Name: Dictionary
17
Bundle-Name: org.txm.dictionary.rcp
18 18
Bundle-ManifestVersion: 2
19
Bundle-SymbolicName: Dictionary;singleton:=true
19
Bundle-SymbolicName: org.txm.dictionary.rcp;singleton:=true
20 20
Bundle-RequiredExecutionEnvironment: JavaSE-1.7
21 21

  
tmp/org.txm.partition.rcp/src/org/txm/partition/rcp/editors/PartitionDimensionsEditor.java (revision 836)
30 30

  
31 31
	
32 32
	@Override
33
	public void __createPartControl(Composite parent) {
33
	public void __createPartControl() {
34 34

  
35 35
		// extend the tool bar
36 36
		new ToolItem(this.getToolBar(), SWT.SEPARATOR);
tmp/org.txm.referencer.rcp/src/org/txm/referencer/rcp/editors/ReferencerEditor.java (revision 836)
139 139

  
140 140
	
141 141
	@Override
142
	public void _createPartControl(Composite parent) {
142
	public void _createPartControl() {
143 143
		
144
		
145 144
		this.referencer = ((Referencer) this.getResult());
146 145
		this.corpus = referencer.getCorpus();
147 146

  
148 147
		// Computing listener
149 148
		ComputeSelectionListener computeSelectionListener = new ComputeSelectionListener(this);
150 149
		ComputeKeyListener computeKeyListener = new ComputeKeyListener(this);
151

  
152 150
		
153
		parent.setLayout(new GridLayout(1,true));
154 151
		Composite paramArea = getExtendedParametersComposite();
155 152
		paramArea.setLayout(new GridLayout(3, false));
156 153
		
tmp/org.txm.queryindex.rcp/src/org/txm/rcp/editors/queryindex/QueryIndexEditor.java (revision 836)
40 40
import org.eclipse.jface.viewers.StructuredSelection;
41 41
import org.eclipse.jface.viewers.TableViewer;
42 42
import org.eclipse.swt.SWT;
43
import org.eclipse.swt.custom.ScrolledComposite;
44
import org.eclipse.swt.events.ControlAdapter;
45
import org.eclipse.swt.events.ControlEvent;
46 43
import org.eclipse.swt.events.KeyEvent;
47 44
import org.eclipse.swt.events.KeyListener;
48 45
import org.eclipse.swt.events.MouseAdapter;
......
51 48
import org.eclipse.swt.events.SelectionListener;
52 49
import org.eclipse.swt.graphics.Font;
53 50
import org.eclipse.swt.graphics.FontData;
54
import org.eclipse.swt.graphics.Image;
55 51
import org.eclipse.swt.graphics.Point;
56
import org.eclipse.swt.graphics.Rectangle;
57 52
import org.eclipse.swt.layout.FormAttachment;
58 53
import org.eclipse.swt.layout.FormData;
59 54
import org.eclipse.swt.layout.FormLayout;
......
70 65
import org.eclipse.ui.IEditorInput;
71 66
import org.eclipse.ui.IEditorSite;
72 67
import org.eclipse.ui.PartInitException;
73
import org.eclipse.ui.part.EditorPart;
74 68
import org.txm.core.messages.TXMCoreMessages;
75
import org.txm.core.results.TXMResult;
69
import org.txm.functions.queryindex.Messages;
76 70
import org.txm.functions.queryindex.QueryIndex;
77 71
import org.txm.functions.queryindex.QueryIndexLine;
78 72
import org.txm.index.core.functions.LineComparator.SortMode;
......
81 75
import org.txm.rcp.StatusLine;
82 76
import org.txm.rcp.editors.TXMEditor;
83 77
import org.txm.rcp.editors.TableKeyListener;
78
import org.txm.rcp.editors.input.QueryIndexEditorInput;
84 79
import org.txm.rcp.messages.TXMUIMessages;
85 80
import org.txm.rcp.swt.dialog.LastOpened;
86 81
import org.txm.rcp.swt.widget.NamedAssistedQueryWidget;
......
88 83
import org.txm.rcp.utils.JobHandler;
89 84
import org.txm.rcp.views.QueriesView;
90 85
import org.txm.rcp.views.corpora.CorporaView;
91
import org.txm.rcp.editors.input.QueryIndexEditorInput;
92 86
import org.txm.searchengine.cqp.CQPSearchEngine;
93 87
import org.txm.searchengine.cqp.clientExceptions.CqiClientException;
94 88
import org.txm.searchengine.cqp.corpus.Corpus;
......
97 91
import org.txm.searchengine.cqp.corpus.query.Query;
98 92
import org.txm.statsengine.r.rcp.views.RVariablesView;
99 93
import org.txm.utils.logger.Log;
100
import org.txm.functions.queryindex.*;
101 94

  
102 95
/**
103 96
 * display the query index parameters and result.
......
170 163
	/** The nblinesmax. */
171 164
	protected int nblinesmax;
172 165

  
173
	/** The scroll composite. */
174
	private ScrolledComposite scrollComposite;
166
//	/** The scroll composite. */
167
//	private ScrolledComposite scrollComposite;
168
//
169
//	/** The head composite. */
170
//	private Composite headComposite;
175 171

  
176
	/** The head composite. */
177
	private Composite headComposite;
178

  
179 172
	/** The title. */
180 173
	String title;
181 174

  
......
400 393
	 * @see org.eclipse.ui.part.WorkbenchPart#createPartControl(org.eclipse.swt.widgets.Composite)
401 394
	 */
402 395
	@Override
403
	public void _createPartControl(final Composite parent) {
404
		FormLayout parentLayout = new FormLayout();
405
		parent.setLayout(parentLayout);
396
	public void _createPartControl() {
406 397

  
407 398
		// create scrollable area
408
		scrollComposite = new ScrolledComposite(parent, SWT.H_SCROLL | SWT.NONE);
409
		FormData headLayoutData = new FormData();
410
		headLayoutData.top = new FormAttachment(0, 0);
411
		headLayoutData.left = new FormAttachment(0);
412
		headLayoutData.right = new FormAttachment(100);
413
		scrollComposite.setLayoutData(headLayoutData);
414
		scrollComposite.setLayout(new FormLayout());
399
//		scrollComposite = new ScrolledComposite(parent, SWT.H_SCROLL | SWT.NONE);
400
//		FormData headLayoutData = new FormData();
401
//		headLayoutData.top = new FormAttachment(0, 0);
402
//		headLayoutData.left = new FormAttachment(0);
403
//		headLayoutData.right = new FormAttachment(100);
404
//		scrollComposite.setLayoutData(headLayoutData);
405
//		scrollComposite.setLayout(new FormLayout());
406
//
407
//		headComposite = new Composite(scrollComposite, SWT.NONE);
408
//		headLayoutData = new FormData();
409
//		headLayoutData.top = new FormAttachment(0);
410
//		headLayoutData.bottom = new FormAttachment(100);
411
//		headLayoutData.left = new FormAttachment(0);
412
//		headLayoutData.right = new FormAttachment(100);
413
//		headComposite.setLayoutData(headLayoutData);
414
//		headComposite.setLayout(new FormLayout());
415
//
416
//		scrollComposite.setContent(headComposite);
417
//		scrollComposite.setExpandVertical(true);
418
//		scrollComposite.setExpandHorizontal(true);
419
//		scrollComposite.addControlListener(new ControlAdapter() {
420
//			@Override
421
//			public void controlResized(ControlEvent e) {
422
//				Rectangle r = scrollComposite.getClientArea();
423
//				scrollComposite.setMinSize(headComposite.computeSize(
424
//						SWT.DEFAULT, SWT.DEFAULT));
425
//			}
426
//		});
415 427

  
416
		headComposite = new Composite(scrollComposite, SWT.NONE);
417
		headLayoutData = new FormData();
418
		headLayoutData.top = new FormAttachment(0);
419
		headLayoutData.bottom = new FormAttachment(100);
420
		headLayoutData.left = new FormAttachment(0);
421
		headLayoutData.right = new FormAttachment(100);
422
		headComposite.setLayoutData(headLayoutData);
423
		headComposite.setLayout(new FormLayout());
428
		final Composite paramArea = getExtendedParametersComposite();
424 429

  
425
		scrollComposite.setContent(headComposite);
426
		scrollComposite.setExpandVertical(true);
427
		scrollComposite.setExpandHorizontal(true);
428
		scrollComposite.addControlListener(new ControlAdapter() {
429
			@Override
430
			public void controlResized(ControlEvent e) {
431
				Rectangle r = scrollComposite.getClientArea();
432
				scrollComposite.setMinSize(headComposite.computeSize(
433
						SWT.DEFAULT, SWT.DEFAULT));
434
			}
435
		});
436

  
437
		final Composite paramArea = new Composite(headComposite, SWT.NONE);
438
		FormData paramLayoutData = new FormData();
439
		paramLayoutData.top = new FormAttachment(0);
440
		paramLayoutData.left = new FormAttachment(0);
441
		paramLayoutData.right = new FormAttachment(100);
442
		paramArea.setLayoutData(paramLayoutData);
443

  
444 430
		// info&navigation panel
445 431
		// final Composite infosArea = new Composite(headComposite, SWT.NONE);
446 432
		// FormData infosLayoutData = new FormData();
......
449 435
		// infosLayoutData.right = new FormAttachment(100);
450 436
		// infosArea.setLayoutData(infosLayoutData);
451 437

  
452
		Composite resultArea = new Composite(parent, SWT.NONE);
453
		FormData resultLayoutData = new FormData();
454
		resultLayoutData.top = new FormAttachment(scrollComposite, 0);
455
		resultLayoutData.left = new FormAttachment(0);
456
		resultLayoutData.right = new FormAttachment(100);
457
		resultLayoutData.bottom = new FormAttachment(100);
458
		resultArea.setLayoutData(resultLayoutData);
438
		Composite resultArea = getResultArea();
459 439

  
460 440
		// compose paramArea
461 441
		FormLayout paramLayout = new FormLayout();
......
513 493
				if (LastOpened.getFile(ID) != null)
514 494
					propFile = new File(LastOpened.getFolder(ID));
515 495

  
516
				FileDialog dialog = new FileDialog(parent.getShell(), SWT.OPEN);
496
				FileDialog dialog = new FileDialog(getShell(), SWT.OPEN);
517 497
				String[] exts = { "*.properties" }; //$NON-NLS
518 498
				dialog.setFilterExtensions(exts);
... Ce différentiel a été tronqué car il excède la taille maximale pouvant être affichée.

Formats disponibles : Unified diff