Révision 932

tmp/org.txm.cooccurrence.core/src/org/txm/cooccurrence/core/functions/Cooccurrence.java (revision 932)
48 48
import org.txm.cooccurrence.core.messages.CooccurrenceCoreMessages;
49 49
import org.txm.cooccurrence.core.preferences.CooccurrencePreferences;
50 50
import org.txm.core.messages.TXMCoreMessages;
51
import org.txm.core.preferences.TXMPreferences;
51 52
import org.txm.core.results.Parameter;
52 53
import org.txm.core.results.TXMParameters;
53 54
import org.txm.core.results.TXMResult;
......
178 179
	
179 180
	
180 181
	
181
	@Parameter(key=CooccurrencePreferences.COOC_QUERY_FILTER)
182
	@Parameter(key=CooccurrencePreferences.QUERY_FILTER)
182 183
	protected String pCooccurentQueryFilter = "[]"; //$NON-NLS-1$
183 184
	
184 185
	/** The mincof. */
......
186 187
	protected Integer pFCoocFilter;
187 188
	
188 189
	/** The minf. */
189
	@Parameter(key=CooccurrencePreferences.MIN_FREQ)
190
	@Parameter(key=TXMPreferences.F_MIN)
190 191
	protected Integer pFminFilter;
191 192
	
192 193
	/** The include xpivot. */
......
837 838
			int minRight = parameters.getInteger(CooccurrencePreferences.MIN_RIGHT);
838 839
			double minScore = parameters.getDouble(CooccurrencePreferences.MIN_SCORE);
839 840
			int minCof = parameters.getInteger(CooccurrencePreferences.MIN_COUNT);
840
			int minFreq = parameters.getInteger(CooccurrencePreferences.MIN_FREQ);
841
			int minFreq = parameters.getInteger(TXMPreferences.F_MIN);
841 842
			boolean buildLexicalTableWithCooccurrents = parameters.getBoolean(CooccurrencePreferences.PARTIAL_LEXICAL_TABLE);
842 843

  
843 844
			this.setParameters(query, properties, limit, maxLeft, minLeft, minRight, maxRight, minFreq, minScore, minCof, includeXpivot, buildLexicalTableWithCooccurrents);
tmp/org.txm.cooccurrence.core/src/org/txm/cooccurrence/core/preferences/CooccurrencePreferences.java (revision 932)
19 19
	// auto populate the preference node qualifier from the current bundle id
20 20
	public static final String PREFERENCES_NODE = FrameworkUtil.getBundle(CooccurrencePreferences.class).getSymbolicName();
21 21

  
22
	public static final String PREFERENCES_PREFIX = "cooccurrence_"; //$NON-NLS-1$
23
	
24 22
	/** The Constant SCOREFORMAT. */
25
	public static final String SCORE_FORMAT = PREFERENCES_PREFIX + "score_format"; //$NON-NLS-1$
23
	public static final String SCORE_FORMAT = "score_format"; //$NON-NLS-1$
26 24
	
27
	public static final String STRUCTURAL_UNIT_LIMIT = PREFERENCES_PREFIX + "structural_unit_limit"; //$NON-NLS-1$
25
	public static final String STRUCTURAL_UNIT_LIMIT = "structural_unit_limit"; //$NON-NLS-1$
28 26

  
29
	/** The Constant MINFREQ. */
30
	public static final String MIN_FREQ = PREFERENCES_PREFIX + "min_freq"; //$NON-NLS-1$
31
	
32 27
	/** The Constant MINCOUNT. */
33
	public static final String MIN_COUNT = PREFERENCES_PREFIX + "min_count"; //$NON-NLS-1$
28
	public static final String MIN_COUNT = "min_count"; //$NON-NLS-1$
34 29
	
35 30
	/** The Constant MINSCORE. */
36
	public static final String MIN_SCORE = PREFERENCES_PREFIX + "min_score"; //$NON-NLS-1$
31
	public static final String MIN_SCORE = "min_score"; //$NON-NLS-1$
37 32
	
38
	public static final String MAX_LEFT = PREFERENCES_PREFIX + "max_left"; //$NON-NLS-1$
39
	public static final String MIN_LEFT = PREFERENCES_PREFIX + "min_left"; //$NON-NLS-1$
40
	public static final String MIN_RIGHT = PREFERENCES_PREFIX + "min_right"; //$NON-NLS-1$
41
	public static final String MAX_RIGHT = PREFERENCES_PREFIX + "max_right"; //$NON-NLS-1$
33
	public static final String MAX_LEFT = "max_left"; //$NON-NLS-1$
34
	public static final String MIN_LEFT = "min_left"; //$NON-NLS-1$
35
	public static final String MIN_RIGHT = "min_right"; //$NON-NLS-1$
36
	public static final String MAX_RIGHT = "max_right"; //$NON-NLS-1$
42 37

  
43
	public static final String INCLUDE_X_PIVOT = PREFERENCES_PREFIX + "include_x_pivot"; //$NON-NLS-1$
44
	public static final String PARTIAL_LEXICAL_TABLE = PREFERENCES_PREFIX + "partial_lexical_table"; //$NON-NLS-1$
38
	public static final String INCLUDE_X_PIVOT = "include_x_pivot"; //$NON-NLS-1$
39
	public static final String PARTIAL_LEXICAL_TABLE = "partial_lexical_table"; //$NON-NLS-1$
45 40
	
46 41

  
47
	public static final String COOC_QUERY_FILTER = PREFERENCES_PREFIX + "cooc_query_filter"; //$NON-NLS-1$
42
	public static final String QUERY_FILTER = "query_filter"; //$NON-NLS-1$
48 43

  
49 44
	
50 45
	/**
......
59 54
		Preferences preferences = DefaultScope.INSTANCE.getNode(PREFERENCES_NODE);
60 55
		
61 56
		preferences.put(SCORE_FORMAT, "E00"); //$NON-NLS-1$
62
		preferences.putInt(MIN_FREQ, 2);
57
		preferences.putInt(F_MIN, 2);
63 58
		preferences.putInt(MIN_COUNT, 2);
64 59
		preferences.putDouble(MIN_SCORE, 2.0);
65 60
		
tmp/org.txm.index.rcp/OSGI-INF/l10n/bundle_ru.properties (revision 932)
1 1

  
2
command.name = \u0418\u043D\u0434\u0435\u043A\u0441
2
command.name = Индекс
3 3

  
4
command.tooltip = \u0412\u044B\u0447\u0438\u0441\u043B\u0438\u0442\u044C \u0441\u043B\u043E\u0432\u0430\u0440\u043D\u044B\u0439 \u0441\u043E\u0441\u0442\u0430\u0432 \u043E\u0442\u0432\u0435\u0442\u043E\u0432 \u043D\u0430 \u0437\u0430\u043F\u0440\u043E\u0441
4
command.name.0 = 
5 5

  
6
editor.name = \u0418\u043D\u0434\u0435\u043A\u0441
6
command.tooltip = Вычислить словарный состав ответов на запрос
7

  
8
editor.name = Индекс
tmp/org.txm.cooccurrence.rcp/src/org/txm/cooccurrence/rcp/editors/CooccurrencesEditor.java (revision 932)
568 568
		parameters.put(CooccurrencePreferences.MIN_LEFT, this.empantPanel.getMinLeft() + 1);
569 569
		parameters.put(CooccurrencePreferences.MIN_RIGHT, this.empantPanel.getMinRight() + 1);
570 570
		parameters.put(CooccurrencePreferences.MAX_RIGHT, this.empantPanel.getMaxRight() + 1);
571
		parameters.put(CooccurrencePreferences.MIN_FREQ, this.TFreq.getSelection());
571
		parameters.put(TXMPreferences.F_MIN, this.TFreq.getSelection());
572 572
		parameters.put(CooccurrencePreferences.MIN_COUNT, this.TCount.getSelection());
573 573
		parameters.put(CooccurrencePreferences.INCLUDE_X_PIVOT, this.empantPanel.getXPivot());
574 574
		parameters.put(CooccurrencePreferences.PARTIAL_LEXICAL_TABLE, this.getBooleanParameterValue(CooccurrencePreferences.PARTIAL_LEXICAL_TABLE));
......
604 604
			}
605 605
		}
606 606

  
607
		TFreq.setSelection(this.getIntParameterValue(CooccurrencePreferences.MIN_FREQ));
607
		TFreq.setSelection(this.getIntParameterValue(TXMPreferences.F_MIN));
608 608
		TCount.setSelection(this.getIntParameterValue(CooccurrencePreferences.MIN_COUNT));
609 609

  
610 610
		TScore.setText("" + this.getDoubleParameterValue(CooccurrencePreferences.MIN_SCORE));
tmp/org.txm.cooccurrence.rcp/src/org/txm/cooccurrence/rcp/handlers/ComputeCooccurrences.java (revision 932)
88 88
				int minright = 1;
89 89
				int maxright = 50;
90 90

  
91
				int minf = TXMPreferences.getInt(CooccurrencePreferences.MIN_FREQ, CooccurrencePreferences.PREFERENCES_NODE);
91
				int minf = TXMPreferences.getInt(TXMPreferences.F_MIN, CooccurrencePreferences.PREFERENCES_NODE);
92 92
				int mincof = TXMPreferences.getInt(CooccurrencePreferences.MIN_COUNT, CooccurrencePreferences.PREFERENCES_NODE);
93 93
				int minscore = (int) TXMPreferences.getDouble(CooccurrencePreferences.MIN_SCORE, CooccurrencePreferences.PREFERENCES_NODE);
94 94
				boolean buildLexicalTableWithCooccurrents = TXMPreferences.getBoolean(CooccurrencePreferences.PARTIAL_LEXICAL_TABLE, CooccurrencePreferences.PREFERENCES_NODE);
tmp/org.txm.cooccurrence.rcp/src/org/txm/cooccurrence/rcp/preferences/CoocPreferencePage.java (revision 932)
34 34
import org.txm.cooccurrence.core.preferences.CooccurrencePreferences;
35 35
import org.txm.cooccurrence.rcp.adapters.CooccurrenceAdapterFactory;
36 36
import org.txm.cooccurrence.rcp.messages.CooccurrenceUIMessages;
37
import org.txm.core.preferences.TXMPreferences;
37 38
import org.txm.rcp.preferences.TXMPreferencePage;
38 39
import org.txm.rcp.preferences.TXMPreferenceStore;
39 40
import org.txm.rcp.jface.DoubleFieldEditor;
......
56 57
		scoreformatfield.setTextLimit(15);
57 58

  
58 59
		/** The minfreqfield. */
59
		IntegerFieldEditor minfreqfield = new IntegerFieldEditor(CooccurrencePreferences.MIN_FREQ, CooccurrenceUIMessages.CoocPreferencePage_1, getFieldEditorParent());
60
		IntegerFieldEditor minfreqfield = new IntegerFieldEditor(TXMPreferences.F_MIN, CooccurrenceUIMessages.CoocPreferencePage_1, getFieldEditorParent());
60 61
		minfreqfield.setValidRange(0, 9999999);
61 62

  
62 63
		/** The mincountfield. */
tmp/org.txm.information.core/META-INF/MANIFEST.MF (revision 932)
6 6
Require-Bundle: org.txm.searchengine.cqp.core;bundle-version="1.1.0";visibility:=reexport
7 7
Bundle-Vendor: Textometrie.org
8 8
Bundle-Version: 1.0.0.qualifier
9
Bundle-Name: Information Core
9
Bundle-Name: Corpus Properties Core
10 10
Bundle-ManifestVersion: 2
11 11
Bundle-SymbolicName: org.txm.properties.core;singleton:=true
12 12
Bundle-RequiredExecutionEnvironment: JavaSE-1.7
tmp/org.txm.core/src/java/org/txm/core/preferences/TXMPreferences.java (revision 932)
87 87
	public final static String BUNDLE_ID = "bundle_id"; //$NON-NLS-1$
88 88
	public final static String NAME = "name"; //$NON-NLS-1$
89 89

  
90
	// to shared strings in some preferences
90
	// to shared strings in some command preferences
91 91
	/**
92 92
	 * Queries.
93 93
	 */
tmp/org.txm.core/src/java/org/txm/core/results/TXMResult.java (revision 932)
1645 1645
	}
1646 1646

  
1647 1647
	/**
1648
	 * 
1648
	 * Checks if the monitor is canceled.
1649 1649
	 * @return true if the monitor has been canceled by the user
1650 1650
	 */
1651 1651
	public boolean isCanceled() {
tmp/org.txm.partition.core/src/org/txm/partition/core/messages/messages_fr.properties (revision 932)
1 1

  
2 2
PartsSize_18 = Dimensions : {0}
3 3

  
4
RESULT_TYPE = Dimensions de partition
4
RESULT_TYPE = Propriétés
tmp/org.txm.partition.core/src/org/txm/partition/core/messages/messages.properties (revision 932)
9 9

  
10 10
PartsSize_18 = Dimensions: {0}
11 11

  
12
RESULT_TYPE = Partition dimensions
12
RESULT_TYPE = Properties
tmp/org.txm.partition.core/src/org/txm/partition/core/functions/PartitionDimensions.java (revision 932)
181 181
	}
182 182

  
183 183

  
184

  
185 184
	@Override
186 185
	public String getSimpleName() {
187
		return this.getParent().getSimpleName();
186
		return PartitionCoreMessages.RESULT_TYPE;
188 187
	}
189 188
	
190 189
	
tmp/org.txm.tmp.rcp/.settings/org.eclipse.jdt.core.prefs (revision 932)
1 1
eclipse.preferences.version=1
2 2
org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled
3 3
org.eclipse.jdt.core.compiler.codegen.methodParameters=do not generate
4
org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.7
4
org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.8
5 5
org.eclipse.jdt.core.compiler.codegen.unusedLocal=preserve
6
org.eclipse.jdt.core.compiler.compliance=1.7
6
org.eclipse.jdt.core.compiler.compliance=1.8
7 7
org.eclipse.jdt.core.compiler.debug.lineNumber=generate
8 8
org.eclipse.jdt.core.compiler.debug.localVariable=generate
9 9
org.eclipse.jdt.core.compiler.debug.sourceFile=generate
10 10
org.eclipse.jdt.core.compiler.problem.assertIdentifier=error
11 11
org.eclipse.jdt.core.compiler.problem.enumIdentifier=error
12
org.eclipse.jdt.core.compiler.source=1.7
12
org.eclipse.jdt.core.compiler.source=1.8
tmp/org.txm.tmp.rcp/.classpath (revision 932)
1 1
<?xml version="1.0" encoding="UTF-8"?>
2 2
<classpath>
3
	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.7"/>
3
	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.8"/>
4 4
	<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins">
5 5
		<accessrules>
6 6
			<accessrule kind="accessible" pattern="**"/>
tmp/org.txm.tmp.rcp/src/org/eclipse/swt/snippets/Snippet315.java (revision 932)
1
/*******************************************************************************
2
 * Copyright (c) 2009, 2016 IBM Corporation and others.
3
 * All rights reserved. This program and the accompanying materials
4
 * are made available under the terms of the Eclipse Public License v1.0
5
 * which accompanies this distribution, and is available at
6
 * http://www.eclipse.org/legal/epl-v10.html
7
 *
8
 * Contributors:
9
 *     IBM Corporation - initial API and implementation
10
 *******************************************************************************/
11
package org.eclipse.swt.snippets;
12

  
13
/*
14
 * Button example snippet: create a tri-state button (toggle three states)
15
 *
16
 * For a list of all SWT example snippets see
17
 * http://www.eclipse.org/swt/snippets/
18
 *
19
 * @since 3.5
20
 */
21
import org.eclipse.swt.*;
22
import org.eclipse.swt.layout.*;
23
import org.eclipse.swt.widgets.*;
24

  
25
public class Snippet315 {
26
	public static void main(String[] args) {
27
		Display display = new Display ();
28
		Shell shell = new Shell (display);
29
		shell.setLayout(new GridLayout());
30
		final Button button = new Button (shell, SWT.CHECK);
31
		button.setLayoutData(new GridData(GridData.GRAB_VERTICAL | GridData.GRAB_HORIZONTAL | GridData.HORIZONTAL_ALIGN_CENTER));
32
		button.setText ("Tri-state");
33
		/* Make the button toggle between three states */
34
		button.addListener (SWT.Selection, e -> {
35
			if (button.getSelection()) {
36
				if (!button.getGrayed()) {
37
					button.setGrayed(true);
38
				}
39
			} else {
40
				if (button.getGrayed()) {
41
					button.setGrayed(false);
42
					button.setSelection (true);
43
				}
44
			}
45
		});
46
		/* Read the tri-state button (application code) */
47
		button.addListener (SWT.Selection, e -> {
48
			if (button.getGrayed()) {
49
				System.out.println("Grayed");
50
			} else {
51
				if (button.getSelection()) {
52
					System.out.println("Selected");
53
				} else {
54
					System.out.println("Not selected");
55
				}
56
			}
57
		});
58
		shell.setSize(300, 300);
59
		shell.open ();
60
		while (!shell.isDisposed ()) {
61
			if (!display.readAndDispatch ()) display.sleep ();
62
		}
63
		display.dispose ();
64
	}
65
}
0 66

  
tmp/org.txm.information.rcp/META-INF/MANIFEST.MF (revision 932)
3 3
 org.txm.properties.core;bundle-version="1.0.0";visibility:=reexport
4 4
Bundle-Vendor: Textometrie.org
5 5
Bundle-Version: 1.0.0.qualifier
6
Bundle-Name: Information RCP
6
Bundle-Name: Corpus Properties RCP
7 7
Bundle-ManifestVersion: 2
8 8
Bundle-SymbolicName: org.txm.properties.rcp;singleton:=true
9 9
Bundle-RequiredExecutionEnvironment: JavaSE-1.7
tmp/org.txm.information.rcp/src/org/txm/properties/rcp/adapters/PropertiesAdapterFactory.java (revision 932)
20 20

  
21 21
	public static final ImageDescriptor ICON =
22 22
			AbstractUIPlugin.imageDescriptorFromPlugin(FrameworkUtil.getBundle(PropertiesAdapterFactory.class).getSymbolicName(),
23
					"platform:/plugin/"+ FrameworkUtil.getBundle(PropertiesAdapterFactory.class).getSymbolicName() + "/icons/functions/information.png"); //$NON-NLS-1$ //$NON-NLS-2$
23
					"platform:/plugin/"+ FrameworkUtil.getBundle(PropertiesAdapterFactory.class).getSymbolicName() + "/icons/functions/properties.png"); //$NON-NLS-1$ //$NON-NLS-2$
24 24

  
25
	
25 26
	@Override
26 27
	public Object getAdapter(Object adaptableObject, Class adapterType) {
27 28
		if(adapterType == IWorkbenchAdapter.class && adaptableObject instanceof Properties)	{
28 29
			return new TXMResultAdapter() {
29 30
				@Override
30 31
				public ImageDescriptor getImageDescriptor(Object object) {
31
					if (object instanceof Properties) {
32
							return ICON;
33
					}
34
					return null;
32
					return ICON;
35 33
				}
36 34
			};
37 35
		}
38 36
		return null;
39 37
	}
38
	
40 39
}
tmp/org.txm.information.rcp/plugin.xml (revision 932)
32 32
   <extension
33 33
         point="org.eclipse.core.runtime.adapters">
34 34
      <factory
35
            adaptableType="org.txm.information.core.functions.Information"
35
            adaptableType="org.txm.properties.core.functions.Properties"
36 36
            class="org.txm.properties.rcp.adapters.PropertiesAdapterFactory">
37 37
         <adapter
38 38
               type="org.eclipse.ui.model.IWorkbenchAdapter">
tmp/org.txm.specificities.core/src/org/txm/specificities/core/messages/messages_ru.properties (revision 932)
1 1

  
2
RESULT_TYPE = 
2
RESULT_TYPE = Специфичность
3 3

  
4 4
SELECTION_RESULT_TYPE = 
5 5

  
tmp/org.txm.partition.rcp/OSGI-INF/l10n/bundle_fr.properties (revision 932)
1

  
1 2
Bundle-Name = Partition RCP
2
command.name = Dimensions
3
editor.name = Dimensions
3

  
4
command.name = Propri\u00E9t\u00E9s
5

  
6
command.tooltip = Visualiser la taille des parties
7

  
8
editor.name = Propri\u00E9t\u00E9s
9

  
4 10
page.name = Partition
5
command.tooltip=Visualiser la taille des parties
tmp/org.txm.partition.rcp/OSGI-INF/l10n/bundle.properties (revision 932)
1

  
1 2
Bundle-Name = Partition RCP
2
command.name = Dimensions
3
editor.name = Dimensions
3

  
4
command.name = Properties
5

  
6
command.tooltip = Properties
7

  
8
editor.name = Properties
9

  
4 10
page.name = Partition
5
command.tooltip=Dimensions
tmp/org.txm.partition.rcp/plugin.xml (revision 932)
18 18
            locationURI="menu:menu.corpus">
19 19
         <command
20 20
               commandId="org.txm.partition.rcp.handlers.ComputePartitionDimensionsBarChart"
21
               icon="icons/silk_dimensions.png"
21
               icon="icons/dimensions.png"
22 22
               style="push">
23 23
            <visibleWhen
24 24
                  checkEnabled="false">
......
35 35
            locationURI="toolbar:org.txm.rcp.toolbartools">
36 36
         <command
37 37
               commandId="org.txm.partition.rcp.handlers.ComputePartitionDimensionsBarChart"
38
               icon="icons/silk_dimensions.png"
38
               icon="icons/dimensions.png"
39 39
               style="push"
40 40
               tooltip="%command.tooltip">
41 41
            <visibleWhen
......
53 53
            locationURI="popup:org.txm.rcp.views.corpora.CorporaView?after=org.txm.rcp.corporaview.corpus.read">
54 54
         <command
55 55
               commandId="org.txm.partition.rcp.handlers.ComputePartitionDimensionsBarChart"
56
               icon="icons/silk_dimensions.png"
56
               icon="icons/dimensions.png"
57 57
               style="push">
58 58
            <visibleWhen
59 59
                  checkEnabled="false">
......
92 92
      <editor
93 93
            class="org.txm.partition.rcp.editors.PartitionDimensionsEditor"
94 94
            default="false"
95
            icon="icons/silk_dimensions.png"
95
            icon="icons/dimensions.png"
96 96
            id="org.txm.partition.core.functions.PartitionDimensions"
97 97
            name="%editor.name">
98 98
      </editor>
tmp/org.txm.partition.rcp/src/org/txm/partition/rcp/adapters/PartitionDimensionsAdapterFactory.java (revision 932)
21 21
	
22 22
	public static final ImageDescriptor ICON =
23 23
			AbstractUIPlugin.imageDescriptorFromPlugin(FrameworkUtil.getBundle(PartitionDimensionsAdapterFactory.class).getSymbolicName(),
24
					"platform:/plugin/"+ FrameworkUtil.getBundle(PartitionDimensionsAdapterFactory.class).getSymbolicName() + "/icons/silk_dimensions.png"); //$NON-NLS-1$
24
					"platform:/plugin/"+ FrameworkUtil.getBundle(PartitionDimensionsAdapterFactory.class).getSymbolicName() + "/icons/dimensions.png"); //$NON-NLS-1$
25 25
	
26 26

  
27 27
	@Override

Formats disponibles : Unified diff