Revision 266

tmp/org.txm.specificities.rcp/plugin.xml (revision 266)
33 33
      </command>
34 34
   </extension>
35 35
   <extension
36
         point="org.eclipse.core.expressions.definitions">
37
      <definition
38
            id="OneSpecificitiesResultSelected">
39
         <with
40
               variable="selection">
41
            <iterate
42
                  ifEmpty="false"
43
                  operator="and">
44
               <instanceof
45
                     value="org.txm.functions.specificities.SpecificitesResult">
46
               </instanceof>
47
            </iterate>
48
         </with>
49
      </definition>
50
   </extension>
51
   <extension
52 36
         point="org.eclipse.ui.menus">
53 37
      <menuContribution
54 38
            locationURI="popup:org.txm.specificities.editors.SpecificitiesTableEditor">
......
146 130
            name="%page.name">
147 131
      </page>
148 132
   </extension>
133
   <extension
134
         point="org.eclipse.core.expressions.definitions">
135
      <definition
136
            id="OneSpecificitiesResultSelected">
137
         <with
138
               variable="selection">
139
            <iterate
140
                  ifEmpty="false"
141
                  operator="and">
142
               <instanceof
143
                     value="org.txm.functions.specificities.SpecificitesResult">
144
               </instanceof>
145
            </iterate>
146
         </with>
147
      </definition>
148
      <definition
149
            id="SpecificitiesEditorActive">
150
         <with
151
               variable="activePartId">
152
            <equals
153
                  value="org.txm.specificities.rcp.editors.SpecificitiesTableEditor">
154
            </equals>
155
         </with>
156
      </definition>
157
   </extension>
149 158

  
150 159
</plugin>
tmp/org.txm.specificities.rcp/META-INF/MANIFEST.MF (revision 266)
18 18
 org.txm.specificities.rcp.handlers,
19 19
 org.txm.specificities.rcp.messages,
20 20
 org.txm.specificities.rcp.preferences
21
Bundle-Vendor: Textometrie.org
tmp/org.txm.specificities.rcp/src/org/txm/specificities/rcp/messages/SpecificitiesUIMessages.java (revision 266)
1 1
package org.txm.specificities.rcp.messages;
2 2

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

  
6 6
public class SpecificitiesUIMessages extends NLS {
7 7
	
......
40 40
	
41 41
	static {
42 42
		// initialize resource bundle
43
		TXMCoreMessages.initializeMessages(BUNDLE_NAME, SpecificitiesUIMessages.class);
43
		Utf8NLS.initializeMessages(BUNDLE_NAME, SpecificitiesUIMessages.class);
44 44
	}
45 45

  
46 46
	private SpecificitiesUIMessages() {
tmp/org.txm.specificities.rcp/src/org/txm/specificities/rcp/editors/SpecificitiesTableEditor.java (revision 266)
480 480
		viewer.setInput(tableLines);
481 481

  
482 482
		// Pack the columns so the label of the sort column is not truncated due of the sorting order arrow display
483
		for (TableColumn col : specificitesTable.getColumns())	{
483
		// Refresh and pack the columns
484
		viewer.getControl().setRedraw(false);
485
		viewer.refresh();
486
		for (TableColumn col : viewer.getTable().getColumns()) {
484 487
			col.pack();
485 488
		}
489
		viewer.getControl().setRedraw(true);
486 490
	}
487 491

  
488 492
	/* (non-Javadoc)
tmp/org.txm.statsengine.r.rcp/src/org/txm/statsengine/r/rcp/handlers/ExecuteRScript.java (revision 266)
57 57
import org.txm.rcpapplication.preferences.ScriptPreferencePage;
58 58
import org.txm.rcpapplication.swt.dialog.LastOpened;
59 59
import org.txm.statsengine.r.core.RWorkspace;
60
import org.txm.statsengine.r.core.RWorkspaceException;
60
import org.txm.statsengine.r.core.exceptions.RWorkspaceException;
61 61
import org.txm.statsengine.r.rcp.views.RConsole;
62 62
import org.txm.utils.logger.Log;
63 63
// TODO: Auto-generated Javadoc
tmp/org.txm.statsengine.r.rcp/src/org/txm/statsengine/r/rcp/handlers/ExecuteRText.java (revision 266)
37 37
import org.txm.rcpapplication.Messages;
38 38
import org.txm.rcpapplication.StatusLine;
39 39
import org.txm.statsengine.r.core.RWorkspace;
40
import org.txm.statsengine.r.core.RWorkspaceException;
40
import org.txm.statsengine.r.core.exceptions.RWorkspaceException;
41 41
import org.txm.utils.logger.Log;
42 42
// TODO: Auto-generated Javadoc
43 43
/**
tmp/org.txm.statsengine.r.rcp/src/org/txm/statsengine/r/rcp/handlers/CheckRPackages.java (revision 266)
20 20
import org.txm.rcpapplication.TxmPreferences;
21 21
import org.txm.rcpapplication.preferences.AdvancePreferencePage;
22 22
import org.txm.statsengine.r.core.RWorkspace;
23
import org.txm.statsengine.r.core.RWorkspaceException;
23
import org.txm.statsengine.r.core.exceptions.RWorkspaceException;
24 24
import org.txm.statsengine.r.rcp.messages.RUIMessages;
25 25
import org.txm.utils.logger.Log;
26 26

  
tmp/org.txm.statsengine.r.rcp/src/org/txm/statsengine/r/rcp/handlers/SendToR.java (revision 266)
51 51
import org.txm.lexicaltable.core.statsengine.data.LexicalTable;
52 52
import org.txm.lexicaltable.rcp.editors.LexicalTableEditor;
53 53
import org.txm.lexicaltable.rcp.editors.LexicalTableEditor2;
54
import org.txm.lexicon.core.corpusengine.cqp.Lexicon;
54 55
import org.txm.progression.core.functions.Progression;
55 56
import org.txm.rcp.handlers.BaseAbstractHandler;
56 57
import org.txm.rcpapplication.JobsTimer;
......
60 61
import org.txm.rcpapplication.utils.JobHandler;
61 62
import org.txm.rcpapplication.views.corpora.CorporaView;
62 63
import org.txm.searchengine.cqp.corpus.Corpus;
63
import org.txm.searchengine.cqp.corpus.Lexicon;
64 64
import org.txm.specificities.core.functions.SpecificitesResult;
65 65
import org.txm.specificities.rcp.editors.SpecificitiesTableEditor;
66 66
import org.txm.statsengine.core.data.Vector;
......
183 183
	 * @param o the object used by an editor
184 184
	 */
185 185
	
186
	// FIXME: this method should only contains one test on TXMEditor.getResult()
186
	// FIXME: this method should only contains one test on TXMEditor.getResult() and moved to non-R code/plug-in
187 187
	public static void closeEditorOfSelection(Object o)
188 188
	{
189 189
		if (o != null) {
tmp/org.txm.statsengine.r.rcp/src/org/txm/statsengine/r/rcp/messages/RUIMessages.java (revision 266)
1 1
package org.txm.statsengine.r.rcp.messages;
2 2

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

  
6 6
public class RUIMessages extends NLS {
7 7
	
......
55 55
	
56 56
	static {
57 57
		// initialize resource bundle
58
		TXMCoreMessages.initializeMessages(BUNDLE_NAME, RUIMessages.class);
58
		Utf8NLS.initializeMessages(BUNDLE_NAME, RUIMessages.class);
59 59
	}
60 60

  
61 61
	private RUIMessages() {
tmp/org.txm.statsengine.r.rcp/src/org/txm/statsengine/r/rcp/views/RConsole.java (revision 266)
41 41
import org.txm.rcpapplication.IImageKeys;
42 42
import org.txm.rcpapplication.Messages;
43 43
import org.txm.statsengine.r.core.RWorkspace;
44
import org.txm.statsengine.r.core.RWorkspaceException;
44
import org.txm.statsengine.r.core.exceptions.RWorkspaceException;
45 45
import org.txm.utils.MessagePrinter;
46 46
import org.txm.utils.StreamHog;
47 47
import org.txm.utils.logger.Log;
tmp/org.txm.statsengine.r.rcp/src/org/txm/statsengine/r/rcp/views/RVariablesView.java (revision 266)
67 67
import org.txm.functions.referencer.Referencer;
68 68
import org.txm.index.core.functions.Index;
69 69
import org.txm.lexicaltable.core.statsengine.data.LexicalTable;
70
import org.txm.lexicon.core.corpusengine.cqp.Lexicon;
70 71
import org.txm.objects.Base;
71 72
import org.txm.progression.core.functions.Progression;
72 73
import org.txm.rcpapplication.IImageKeys;
......
76 77
import org.txm.searchengine.cqp.clientExceptions.CqiClientException;
77 78
import org.txm.searchengine.cqp.corpus.Corpus;
78 79
import org.txm.searchengine.cqp.corpus.CorpusManager;
79
import org.txm.searchengine.cqp.corpus.Lexicon;
80 80
import org.txm.searchengine.cqp.corpus.MainCorpus;
81 81
import org.txm.searchengine.cqp.corpus.Partition;
82 82
import org.txm.specificities.core.functions.SpecificitesResult;
tmp/org.txm.statsengine.r.rcp/META-INF/MANIFEST.MF (revision 266)
10 10
 org.eclipse.ui;bundle-version="3.106.1",
11 11
 org.txm.rcp;bundle-version="0.7.8"
12 12
Export-Package: org.txm.statsengine.r.rcp.views
13
Bundle-Vendor: Textometrie.org
tmp/org.txm.specificities.core/src/org/txm/specificities/core/messages/SpecificitiesCoreMessages.java (revision 266)
1 1
package org.txm.specificities.core.messages;
2 2

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

  
6 6

  
7 7

  
......
32 32
	
33 33
	static {
34 34
		// initialize resource bundle
35
		TXMCoreMessages.initializeMessages(BUNDLE_NAME, SpecificitiesCoreMessages.class);
35
		Utf8NLS.initializeMessages(BUNDLE_NAME, SpecificitiesCoreMessages.class);
36 36
	}
37 37

  
38 38
}
tmp/org.txm.specificities.core/src/org/txm/specificities/core/functions/SpecificitesResult.java (revision 266)
38 38

  
39 39
import org.txm.functions.Function;
40 40
import org.txm.lexicaltable.core.statsengine.data.LexicalTable;
41
import org.txm.lexicon.core.corpusengine.cqp.Lexicon;
41 42
import org.txm.searchengine.cqp.corpus.Corpus;
42
import org.txm.searchengine.cqp.corpus.Lexicon;
43 43
import org.txm.searchengine.cqp.corpus.Partition;
44 44
import org.txm.searchengine.cqp.corpus.Subcorpus;
45 45
import org.txm.specificities.core.messages.SpecificitiesCoreMessages;
......
93 93
	/** The sub corpus. */
94 94
	private Corpus subCorpus = null;
95 95

  
96
	/** The partition. */
97
	private Partition partition;
98

  
99 96
	/** The name. */
100 97
	private String name;
101 98

  
......
106 103
	private Corpus subcorpus;
107 104

  
108 105
	/** The writer. */
106
	@Deprecated
109 107
	private BufferedWriter writer;
110 108
	
111 109
	/**
......
193 191
		if (table == null) {
194 192
			throw new IllegalArgumentException(SpecificitiesCoreMessages.SpecificitesResult_2);
195 193
		}
196
		this.partition = table.getPartition();
197 194
		this.name = name;
198 195

  
199 196
		if (specIndex == null || specIndex.length == 0) {
......
304 301
	}
305 302

  
306 303
	/**
307
	 * Gets the specificites index.
304
	 * Gets the specificities index.
308 305
	 * 
309
	 * @return the specificites index
306
	 * @return the specificities index
310 307
	 */
311 308
	public double[][] getSpecificitesIndex() {
312 309
		return indices;
313 310
	}
314 311

  
315 312
	/**
316
	 * Name of the type for which specificite are computed.
313
	 * Name of the type for which specificities are computed.
317 314
	 *
318 315
	 * @return the type names
319 316
	 * @throws StatException the stat exception
......
329 326
	}
330 327

  
331 328
	/**
332
	 * Name of the part for which specif icite are computed.
329
	 * Name of the part for which specificities are computed.
333 330
	 *
334 331
	 * @return the part short names
335 332
	 * @throws StatException the stat exception
......
523 520

  
524 521

  
525 522
	/**
526
	 * Gets the name.
527
	 *
528
	 * @return the name
529
	 */
530
	public String getName() {
531
		return name;
532
	}
533

  
534
	/**
535 523
	 * Gets the symbol.
536 524
	 *
537 525
	 * @return the symbol
......
597 585
	@Override
598 586
	public void clean() {
599 587
		try {
600
			this.writer.flush();
601
			this.writer.close();	
588
			if(this.writer != null)	{
589
				this.writer.flush();
590
				this.writer.close();
591
			}
602 592
		} catch (IOException e) {
603 593
			org.txm.utils.logger.Log.printStackTrace(e);
604 594
		}
......
647 637
	}
648 638

  
649 639

  
640
	@Override
641
	public String getName() {
642
		return name;
643
	}
650 644

  
645

  
646

  
651 647
	@Override
652 648
	public String getSimpleName() {
653 649
		return this.getName();
......
655 651

  
656 652
	@Override
657 653
	public String getDetails() {
658
		// TODO Auto-generated method stub
659
		return null;
654
		return this.getName();
660 655
	}
661 656
}
tmp/org.txm.specificities.core/src/org/txm/specificities/core/functions/Specificites.java (revision 266)
35 35

  
36 36
import org.txm.lexicaltable.core.functions.LexicalTableFactory;
37 37
import org.txm.lexicaltable.core.statsengine.data.LexicalTable;
38
import org.txm.lexicon.core.corpusengine.cqp.Lexicon;
38 39
import org.txm.searchengine.cqp.clientExceptions.CqiClientException;
39 40
import org.txm.searchengine.cqp.corpus.Corpus;
40
import org.txm.searchengine.cqp.corpus.Lexicon;
41 41
import org.txm.searchengine.cqp.corpus.Part;
42 42
import org.txm.searchengine.cqp.corpus.Partition;
43 43
import org.txm.searchengine.cqp.corpus.Property;
......
46 46
import org.txm.specificities.core.messages.SpecificitiesCoreMessages;
47 47
import org.txm.statsengine.core.StatException;
48 48
import org.txm.statsengine.core.data.Vector;
49
import org.txm.statsengine.r.core.RWorkspaceException;
49
import org.txm.statsengine.r.core.exceptions.RWorkspaceException;
50 50

  
51 51
// TODO: Auto-generated Javadoc
52 52
/**
tmp/org.txm.specificities.core/src/org/txm/functions/contrasts/Contrast.java (revision 266)
12 12
import org.txm.lexicaltable.core.functions.LexicalTableFactory;
13 13
import org.txm.lexicaltable.core.statsengine.data.LexicalTable;
14 14
import org.txm.lexicaltable.core.statsengine.r.data.LexicalTableImpl;
15
import org.txm.lexicon.core.corpusengine.cqp.Lexicon;
15 16
//import org.txm.progression.core.functions.Progression;
16 17
import org.txm.searchengine.cqp.clientExceptions.CqiClientException;
17 18
import org.txm.searchengine.cqp.corpus.Corpus;
18
import org.txm.searchengine.cqp.corpus.Lexicon;
19 19
import org.txm.searchengine.cqp.corpus.Partition;
20 20
import org.txm.searchengine.cqp.corpus.Property;
21 21
import org.txm.searchengine.cqp.corpus.Subcorpus;
tmp/org.txm.specificities.core/META-INF/MANIFEST.MF (revision 266)
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.core;bundle-version="0.7.0",
7
Require-Bundle: org.txm.statsengine.core;bundle-version="1.0.0",
8
 org.txm.core;bundle-version="0.7.0",
8 9
 org.txm.progression.core;bundle-version="1.0.0",
9 10
 org.txm.chartsengine.core;bundle-version="1.0.0",
10 11
 org.txm.chartsengine.jfreechart.core;bundle-version="1.0.0",
11 12
 org.txm.chartsengine.r.core;bundle-version="1.0.0",
12 13
 org.eclipse.core.runtime;bundle-version="3.10.0",
13
 org.txm.lexicaltable.core;bundle-version="1.0.0"
14
 org.txm.lexicaltable.core;bundle-version="1.0.0",
15
 org.txm.lexicon.core;bundle-version="1.0.0"
14 16
Export-Package: org.txm.functions.contrasts,
15 17
 org.txm.specificities.core.chartsengine.jfreechart,
16 18
 org.txm.specificities.core.chartsengine.r,
......
18 20
 org.txm.specificities.core.messages,
19 21
 org.txm.specificities.core.preferences,
20 22
 org.txm.specificities.core.statsengine.r.function
23
Bundle-Vendor: Textometrie.org

Also available in: Unified diff