Revision 768

tmp/org.txm.chartsengine.core/META-INF/MANIFEST.MF (revision 768)
7 7
 org.txm.utils,
8 8
 org.txm.core;bundle-version="0.7.0"
9 9
Bundle-RequiredExecutionEnvironment: JavaSE-1.7
10
Bundle-ActivationPolicy: lazy
11 10
Export-Package: org.txm.chartsengine.core,
12 11
 org.txm.chartsengine.core.messages,
13 12
 org.txm.chartsengine.core.preferences,
tmp/org.txm.chartsengine.core/src/org/txm/chartsengine/core/ChartsEngine.java (revision 768)
9 9
import org.eclipse.core.runtime.CoreException;
10 10
import org.eclipse.core.runtime.IConfigurationElement;
11 11
import org.eclipse.core.runtime.Platform;
12
import org.eclipse.core.runtime.RegistryFactory;
12 13
import org.txm.chartsengine.core.messages.ChartsEngineCoreMessages;
13 14
import org.txm.chartsengine.core.preferences.ChartsEnginePreferences;
14 15
import org.txm.chartsengine.core.results.ChartResult;
......
227 228
	 * @param outputFormat
228 229
	 */
229 230
	public static void createChartsEngines()	{
231

  
232
		Log.info("Looking for charts engines with extension id " + ChartsEngine.extensionPointId + ".");
230 233
		
231 234
		ChartsEngine.chartsEngines = new ArrayList<ChartsEngine>();
232 235
		ChartsEngine.currentChartsEngineIndex = 0;
233 236
		
234
		IConfigurationElement[] contributions = Platform.getExtensionRegistry().getConfigurationElementsFor(ChartsEngine.extensionPointId);
237
		IConfigurationElement[] contributions =  RegistryFactory.getRegistry().getConfigurationElementsFor(ChartsEngine.extensionPointId);
235 238

  
239
		Log.info(contributions.length + " charts engines found.");
240
		
236 241
		for(int i = 0; i < contributions.length; i++) {
237 242
			try {
238 243
				ChartsEngine chartsEngine = (ChartsEngine)contributions[i].createExecutableExtension("class"); //$NON-NLS-1$
......
261 266
		for(int i = 0; i < ChartsEngine.chartsEngines.size(); i++) {
262 267
			if(chartsEngines.get(i).getName().equals(name))	{
263 268
				ChartsEngine.currentChartsEngineIndex = i;
264
				Log.warning("Set current charts engine to: " + ChartsEngine.getCurrent());
269
				Log.info("Set current charts engine to: " + ChartsEngine.getCurrent());
265 270
				break;
266 271
			}
267 272
		}
tmp/org.txm.searchengine.cqp.core/src/org/txm/searchengine/cqp/corpus/Partition.java (revision 768)
40 40
import java.util.HashMap;
41 41
import java.util.List;
42 42
import java.util.Locale;
43
import java.util.TreeMap;
44 43

  
45 44
import org.eclipse.osgi.util.NLS;
46 45
import org.txm.core.messages.TXMCoreMessages;
47
import org.txm.core.results.TXMParameters;
48 46
import org.txm.core.results.TXMResult;
49 47
import org.txm.objects.TxmObject;
50 48
import org.txm.searchengine.cqp.CQPEngine;
tmp/org.txm.searchengine.cqp.core/src/org/txm/searchengine/cqp/corpus/Corpus.java (revision 768)
146 146
		checkCqpId(cqpId);
147 147
		this.cqpId = cqpId;
148 148
		
149
		// FIXME: at this moment, store the CQPID as UUIDD
149
		// FIXME: at this moment, store the CQPID as UUIDD for persistence tests
150 150
		this.uniqueID = this.cqpId;
151 151

  
152 152
		subcorpora = new ArrayList<Subcorpus>();
tmp/org.txm.lexicaltable.core/src/org/txm/lexicaltable/core/functions/LexicalTable.java (revision 768)
27 27
import org.txm.statsengine.core.data.Vector;
28 28
import org.txm.statsengine.r.core.RWorkspace;
29 29
import org.txm.statsengine.r.core.exceptions.RWorkspaceException;
30
import org.txm.utils.logger.Log;
30 31

  
31 32
/**
32 33
 * Holds the word frequencies table of a {@link Partition} seen through a word property.
......
384 385
	
385 386
	@Override
386 387
	public boolean canCompute() {
387
		return this.parent != null; // can be computed on partition or corpus
388
		// can be computed on partition or corpus
389
		if(this.parent == null)	{
390
			return false;
391
		}
392
		if(this.property == null)	{
393
			Log.severe("LexicalTable.canCompute(): can not compute with no unit property."); //$NON-NLS-1$
394
			return false;
395
		}
396
		return true; 
388 397
	}
389 398

  
390 399
	@Override
tmp/org.txm.libs.jfreechart/build.properties (revision 768)
1 1
bin.includes = META-INF/,\
2
               lib/jfreesvg-1.7.jar,\
3 2
               about.html,\
4
               lib/jcommon-1.0.21.jar
5
jars.compile.order = 
6

  
3
               about_files/,\
4
               lib/jcommon-1.0.21.jar,\
5
               lib/jfreechart-1.0.17.jar
tmp/org.txm.libs.jfreechart/.classpath (revision 768)
1 1
<?xml version="1.0" encoding="UTF-8"?>
2 2
<classpath>
3
	<classpathentry exported="true" kind="lib" path="lib/jcommon-1.0.21.jar"/>
4
	<classpathentry exported="true" kind="lib" path="lib/jfreechart-1.0.17.jar"/>
3 5
	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.6"/>
4 6
	<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
5
	<classpathentry exported="true" kind="lib" path="lib/jcommon-1.0.21.jar"/>
6
	<classpathentry exported="true" kind="lib" path="lib/jfreechart-1.0.17.jar">
7
		<attributes>
8
			<attribute name="javadoc_location" value="http://www.jfree.org/jfreechart/api/javadoc/"/>
9
		</attributes>
10
	</classpathentry>
11 7
	<classpathentry kind="output" path="bin"/>
12 8
</classpath>
tmp/org.txm.libs.jfreechart/META-INF/MANIFEST.MF (revision 768)
60 60
 org.jfree.util
61 61
Bundle-RequiredExecutionEnvironment: JavaSE-1.7
62 62
Bundle-Vendor: www.jfree.org
63
Bundle-ClassPath: .,
64
 lib/jcommon-1.0.21.jar,
63
Bundle-ClassPath: lib/jcommon-1.0.21.jar,
65 64
 lib/jfreechart-1.0.17.jar
tmp/org.txm.specificities.rcp/src/org/txm/specificities/rcp/editors/SpecificitiesEditor.java (revision 768)
48 48
import org.txm.objects.TxmObject;
49 49
import org.txm.rcp.editors.TXMEditor;
50 50
import org.txm.rcp.editors.TableKeyListener;
51
import org.txm.rcp.messages.TXMUIMessages;
51
import org.txm.rcp.swt.GLComposite;
52 52
import org.txm.rcp.swt.widget.structures.PropertiesComboViewer;
53 53
import org.txm.searchengine.cqp.corpus.Corpus;
54 54
import org.txm.specificities.core.functions.Specificities;
......
101 101
	public void _createPartControl(Composite parent) {
102 102

  
103 103
		try {
104

  
104 105
			
106
			// unit property
107
			GLComposite minimalParametersArea = this.getMinimalParametersComposite();
108
			minimalParametersArea.getLayout().numColumns = 2;
109

  
110
			new Label(minimalParametersArea, SWT.NONE).setText(TXMCoreMessages.common_property);
111
			this.unitPropertyComboViewer = new PropertiesComboViewer(minimalParametersArea, this, true,
112
					Corpus.getFirstParentCorpus(this.getResult()).getOrderedProperties(),
113
					this.getResult().getUnitProperty(), true);
114

  
115
			
105 116
			// max score
106 117
			Composite parametersArea = this.getCommandParametersGroup();
107 118
			new Label(parametersArea, SWT.NONE).setText("Maximum score");
......
109 120
			this.maxScore.setToolTipText("The maximum score to display");
110 121
			this.maxScore.setMinimum(0);
111 122

  
112
			// unit property
113
			new Label(parametersArea, SWT.NONE).setText(TXMCoreMessages.common_property);
114
			this.unitPropertyComboViewer = new PropertiesComboViewer(parametersArea, this, true,
115
					Corpus.getFirstParentCorpus(this.getResult()).getOrderedProperties(),
116
					this.getResult().getUnitProperty(), false);
117 123
			
118 124
			
119 125
			// result area
tmp/org.txm.information.core/src/org/txm/information/core/functions/Information.java (revision 768)
51 51
import org.txm.information.core.preferences.InformationPreferences;
52 52
import org.txm.objects.Base;
53 53
import org.txm.searchengine.cqp.AbstractCqiClient;
54
import org.txm.searchengine.cqp.CQPPreferences;
55 54
import org.txm.searchengine.cqp.clientExceptions.CqiClientException;
56 55
import org.txm.searchengine.cqp.corpus.Corpus;
57 56
import org.txm.searchengine.cqp.corpus.CorpusManager;
......
62 61
import org.txm.utils.AsciiUtils;
63 62
import org.txm.utils.logger.Log;
64 63

  
65
// TODO: Auto-generated Javadoc
66 64
/**
67
 * compute a diagnostic of Corpus, sub corpus and partition @ author mdecorde.
65
 * Computes a diagnostic of Corpus or Subcorpus.
66
 * 
67
 * @author mdecorde
68 68
 */
69 69
public class Information extends TXMResult {
70 70
	// Base base;
......
179 179
	 * step2.
180 180
	 * randomly position are choose
181 181
	 */
182
	public void stepLexicalProperties()
183
	{
182
	public void stepLexicalProperties() {
184 183
		AbstractCqiClient cqiClient = CorpusManager.getCorpusManager().getCqiClient();
185 184
		for (Property p : properties) {
186 185
			//int size;
......
239 238
		}
240 239
	}
241 240

  
241
	// FIXME: useless?
242 242
//	/**
243 243
//	 * Instantiates a new diagnostic.
244 244
//	 *
......
610 610
	}
611 611

  
612 612
	@Override
613
	protected boolean _compute() throws Exception {
613
	synchronized protected boolean _compute() throws Exception {
614 614
		
615
		this.beginTask("Computing informations...", 3);
615
		this.beginTask("Computing properties...", 3);
616 616
		this.stepGeneralInfos();
617 617
		this.worked(1);
618 618
		
tmp/org.txm.rcp.feature/win/TXM.bat (revision 768)
75 75

  
76 76
set _JAVA_OPTIONS=-Duser.home="%USERHOME%"
77 77

  
78
echo running "%installdir%TXM.exe" -run --launcher.ini "%DOTTXM%TXM.ini" -data "%DOTTXM%data" -user "%DOTTXM%user" -install "%installdir%" 
78
echo running "%installdir%TXM.exe" -run --launcher.ini "%DOTTXM%TXM.ini" -data "%DOTTXM%data" -user "%DOTTXM%user" -install %installdir%
79 79

  
80
REM "%installdir%TXM.exe" -run --launcher.ini "%DOTTXM%TXM.ini" -consolelog -clean -debug -console -noexit -data "%DOTTXM%data" -user "%DOTTXM%user" -install %installdir%
81
"%installdir%TXM.exe" -run --launcher.ini "%DOTTXM%TXM.ini" -data "%DOTTXM%data" -user "%DOTTXM%user" -install %installdir%
80
"%installdir%TXM.exe" -log -run --launcher.ini "%DOTTXM%TXM.ini" -consolelog -clean -debug -console -noexit -data "%DOTTXM%data" -user "%DOTTXM%user" -install %installdir%
81
REM "%installdir%TXM.exe" -run --launcher.ini "%DOTTXM%TXM.ini" -data "%DOTTXM%data" -user "%DOTTXM%user" -install %installdir%
82 82

  
83 83
) >"%TXMHOME%TXMOutputLogs.txt" 2>"%TXMHOME%TXMErrorLogs.txt" 
tmp/org.txm.rcp/src/main/java/org/txm/rcp/editors/TXMEditor.java (revision 768)
126 126
	 * contains bottom toolbar subwidgets (installed grouped, etc.)
127 127
	 */
128 128
	private GLComposite bottomSubWidgetsComposite;
129
	private GLComposite minimalParameterComposite;
129
	private GLComposite minimalParametersComposite;
130 130
	private GLComposite firstLineComposite;
131 131
	
132 132

  
......
138 138
		this.setInput(input);
139 139
		// FIXME: see how to use the Adapters and AdapterFactory to define image and title of Editor in the contributing plug-ins
140 140
		// another way is to use editors extension in plug-ins and redefine icon and name, using this solution the problem is that the name (which is also editor title) can not be dynamic according to the result data
141
		// so it seems better to use Adapters if it's possible
141
		// so it seems better to use Adapters if it's possible or keep this solution below
142 142
		this.setPartName(input.getName());
143 143
	}
144 144

  
......
147 147
	 * @return the composite displayed before the toptoolbar, containing the minimal parameters widgets
148 148
	 */
149 149
	public GLComposite getMinimalParametersComposite() {
150
		return minimalParameterComposite;
150
		return minimalParametersComposite;
151 151
	}
152 152
	
153 153
	/**
......
165 165

  
166 166
			// contains the minimal panels and top toolbars
167 167
			this.firstLineComposite = new GLComposite(parent, SWT.NONE);
168
			firstLineComposite.getLayout().numColumns = 2;
168
			this.firstLineComposite.getLayout().numColumns = 2;
169 169
			this.firstLineComposite.setLayoutData(new GridData(GridData.FILL, GridData.FILL, true, false));
170 170
			
171
			this.minimalParameterComposite = new GLComposite(firstLineComposite, SWT.NONE);
172
			this.minimalParameterComposite.setLayoutData(new GridData(GridData.FILL, GridData.FILL, false, false));
171
			this.minimalParametersComposite = new GLComposite(firstLineComposite, SWT.NONE);
172
			this.minimalParametersComposite.setLayoutData(new GridData(GridData.FILL, GridData.FILL, false, false));
173
			this.minimalParametersComposite.getLayout().horizontalSpacing = 5;
174

  
173 175
			
174 176
			// create the top tool bar
175 177
			this.topToolBarContainer = new Composite(firstLineComposite, SWT.NONE);
......
309 311

  
310 312
	@Override
311 313
	public void doSave(IProgressMonitor monitor) {
314
		// FIXME: SJ: to discuss. A this moment the save is automatically done or not in TXMResult.compute() according to a preference of the TBX
312 315
		//		if (!getResultData().saveParameters()) { // ?
313 316
		//			
314 317
		//		}
tmp/org.txm.core/src/java/org/txm/core/results/TXMResult.java (revision 768)
219 219
		}
220 220
	}
221 221
	
222
	public void setUserName(String newName) {
223
		userName = newName;
222
	public void setUserName(String name) {
223
		userName = name;
224 224
	}
225 225

  
226 226
	/**
......
490 490
			try {
491 491
				Object v = f.get(this);
492 492
				if (v != null) {
493
					str.append(name + "("+v.getClass().getSimpleName()+") = " + v + "\n"); //$NON-NLS-1$ //$NON-NLS-2$
493
					str.append(name + " ("+ v.getClass().getSimpleName() + ") = " + v + "\n"); //$NON-NLS-1$ //$NON-NLS-2$
494 494
				} else {
495 495
					str.append(name + " = NULL \n"); //$NON-NLS-1$ //$NON-NLS-2$
496 496
				}
tmp/org.txm.chartsengine.rcp/META-INF/MANIFEST.MF (revision 768)
22 22
 org.txm.chartsengine.rcp.preferences,
23 23
 org.txm.chartsengine.rcp.swt
24 24
Bundle-Vendor: Textometrie.org
25
Bundle-ActivationPolicy: lazy
tmp/org.txm.chartsengine.rcp/src/org/txm/chartsengine/rcp/SWTChartsComponentsProvider.java (revision 768)
66 66
	
67 67
	
68 68
	// FIXME: should be done in an activator?
69
	static	{	
69
	static	{
70 70
		// Initializes the SWT Charts Components provider according to the current charts engine and its output format
71 71
		SWTChartsComponentsProvider.createSWTChartsComponentsProviders();
72 72
		SWTChartsComponentsProvider.setCurrrentComponentsProvider(ChartsEngine.getCurrent());
tmp/org.txm.chartsengine.r.core/META-INF/MANIFEST.MF (revision 768)
9 9
 org.txm.chartsengine.core;bundle-version="1.0.0";visibility:=reexport,
10 10
 org.txm.core
11 11
Bundle-RequiredExecutionEnvironment: JavaSE-1.7
12
Bundle-ActivationPolicy: lazy
13 12
Export-Package: org.txm.chartsengine.r.core,
14 13
 org.txm.chartsengine.r.core.preferences,
15 14
 org.txm.chartsengine.r.core.themes,
tmp/org.txm.chartsengine.jfreechart.core/META-INF/MANIFEST.MF (revision 768)
10 10
 org.txm.chartsengine.core;bundle-version="1.0.0";visibility:=reexport,
11 11
 org.txm.core
12 12
Bundle-RequiredExecutionEnvironment: JavaSE-1.7
13
Bundle-ActivationPolicy: lazy
14 13
Export-Package: org.txm.chartsengine.jfreechart.core,
15 14
 org.txm.chartsengine.jfreechart.core.preferences,
16 15
 org.txm.chartsengine.jfreechart.core.renderers,

Also available in: Unified diff