Révision 942

tmp/org.txm.cooccurrence.rcp/OSGI-INF/l10n/bundle_fr.properties (revision 942)
3 3

  
4 4
command.name.4 = Envoyer vers la cooccurrence
5 5

  
6
command.tooltip = Calculer les cooccurrents d'une requête
6
command.tooltip = Calculer les cooccurrents d'une requ\u00EAte
7 7

  
8 8
editor.name = Cooccurrences
9 9

  
tmp/org.txm.annotation.core/META-INF/MANIFEST.MF (revision 942)
3 3
Bundle-ActivationPolicy: lazy
4 4
Bundle-ClassPath: .
5 5
Bundle-Version: 1.0.0.qualifier
6
Bundle-Name: org.txm.annotation.core
6
Bundle-Name: Annotation Core
7 7
Bundle-ManifestVersion: 2
8 8
Bundle-Activator: org.txm.annotation.core.Activator
9 9
Bundle-SymbolicName: org.txm.annotation.core;singleton:=true
10 10
Bundle-RequiredExecutionEnvironment: JavaSE-1.7
11 11
Export-Package: org.txm.annotation.core,
12 12
 org.txm.annotation.core.preferences
13
Bundle-Vendor: Textometrie.org
13 14

  
tmp/org.txm.statsengine.r.rcp/src/org/txm/statsengine/r/rcp/decorators/RDecorator.java (revision 942)
32 32
import org.eclipse.jface.viewers.ILabelDecorator;
33 33
import org.eclipse.jface.viewers.LabelProvider;
34 34
import org.eclipse.swt.graphics.Image;
35
import org.txm.rcp.IImageKeys;
35
import org.osgi.framework.FrameworkUtil;
36 36
import org.txm.rcp.utils.OverlayImageIcon;
37
import org.txm.utils.logger.Log;
37 38

  
38 39
// TODO: Auto-generated Javadoc
39 40
/**
......
45 46
	/**
46 47
	 * Instantiates a new r decorator.
47 48
	 */
48
	public RDecorator()
49
	{
49
	public RDecorator() {
50 50
		super();
51 51
	}
52 52
	// Method to decorate Image 
......
54 54
	 * @see org.eclipse.jface.viewers.ILabelDecorator#decorateImage(org.eclipse.swt.graphics.Image, java.lang.Object)
55 55
	 */
56 56
	@Override
57
	public Image decorateImage(Image image, Object object)
58
	{
57
	public Image decorateImage(Image image, Object object) {
59 58
		String symbol= null;
60 59
		try {
61 60
			Method getname = object.getClass().getMethod("getSymbol"); //$NON-NLS-1$
62 61
			symbol = (String)getname.invoke(object);
63
		} catch (Exception e) {return null;}
62
		}
63
		catch (Exception e) {
64
//			Log.printStackTrace(e);
65
			return null;
66
		}
64 67
		
65 68
		if (symbol == null) {
66 69
			return null;
......
69 72
		// Overlay custom image over base image 
70 73
		try {
71 74
			Image image2;
72
			OverlayImageIcon overlayIcon = new OverlayImageIcon(image, IImageKeys.RDECORATION);
75
			OverlayImageIcon overlayIcon = new OverlayImageIcon(image, "platform:/plugin/"+ FrameworkUtil.getBundle(RDecorator.class).getSymbolicName() + "/icons/decorators/r.png"); //$NON-NLS-1$
73 76
			image2 = overlayIcon.getImage();
74 77
			return image2;
75 78
		}
76
		catch(NullPointerException e) {
79
		catch(Exception e) {
80
			Log.printStackTrace(e);
77 81
		}
78 82
		return null;
79 83
		// The image should be disposed when the plug-in is 
tmp/org.txm.statsengine.r.rcp/plugin.xml (revision 942)
260 260
         point="org.eclipse.ui.decorators">
261 261
      <decorator
262 262
            class=" org.txm.statsengine.r.rcp.decorators.RDecorator"
263
            icon="icons/decorators/R.png"
263
            icon="icons/decorators/r.png"
264 264
            id="org.txm.rcp.decorators.RDecorator"
265 265
            label="%decorator.label"
266 266
            lightweight="false"
tmp/org.txm.annotation.kr.rcp/META-INF/MANIFEST.MF (revision 942)
8 8
 org.txm.annotation.kr.rcp.messages,
9 9
 org.txm.annotation.kr.rcp.preferences,
10 10
 org.txm.annotation.kr.rcp.views.knowledgerepositories
11
Bundle-Vendor: textometrie.org
11
Bundle-Vendor: Textometrie.org
12 12
Bundle-Version: 1.0.0.qualifier
13
Bundle-Name: org.txm.annotation.kr.rcp
13
Bundle-Name: KR Annotation RCP
14 14
Bundle-ManifestVersion: 2
15 15
Bundle-SymbolicName: org.txm.annotation.kr.rcp;singleton:=true
16 16
Bundle-RequiredExecutionEnvironment: JavaSE-1.7
tmp/org.txm.annotation.rcp/META-INF/MANIFEST.MF (revision 942)
1 1
Manifest-Version: 1.0
2 2
Require-Bundle: org.txm.annotation.core;bundle-version="1.0.0";visibility:=reexport,
3 3
 org.txm.concordance.rcp;bundle-version="1.0.0";visibility:=reexport
4
Bundle-Vendor: textometrie.org
4
Bundle-Vendor: Textometrie.org
5 5
Bundle-Version: 1.0.0.qualifier
6
Bundle-Name: Annoration RCP
6
Bundle-Name: Annotation RCP
7 7
Bundle-ManifestVersion: 2
8 8
Bundle-SymbolicName: org.txm.annotation.rcp;singleton:=true
9 9
Bundle-RequiredExecutionEnvironment: JavaSE-1.7
tmp/org.txm.ca.rcp/META-INF/MANIFEST.MF (revision 942)
8 8
Bundle-Vendor: Textometrie.org
9 9
Bundle-ActivationPolicy: lazy
10 10
Bundle-Version: 1.0.0.qualifier
11
Bundle-Name: CA RCP
11
Bundle-Name: Correspondence Analysis RCP
12 12
Bundle-ManifestVersion: 2
13 13
Bundle-SymbolicName: org.txm.ca.rcp;singleton:=true
14 14
Bundle-RequiredExecutionEnvironment: JavaSE-1.7
tmp/org.txm.ca.core/META-INF/MANIFEST.MF (revision 942)
10 10
 es,org.txm.ca.core.statsengine.r.functions
11 11
Bundle-Vendor: Textometrie.org
12 12
Bundle-Version: 1.0.0.qualifier
13
Bundle-Name: CA Core
13
Bundle-Name: Correspondence Analysis Core
14 14
Bundle-ManifestVersion: 2
15 15
Bundle-SymbolicName: org.txm.ca.core;singleton:=true
16 16
Bundle-RequiredExecutionEnvironment: JavaSE-1.7
tmp/org.txm.ca.core/src/org/txm/ca/core/preferences/CAPreferences.java (revision 942)
20 20
	public static final String PREFERENCES_NODE = FrameworkUtil.getBundle(CAPreferences.class).getSymbolicName();
21 21
	
22 22
	
23
	public static final String PREFERENCES_PREFIX = "ca_"; //$NON-NLS-1$
24
	
25
	/** Lexical table FMIN. */
26
	public static final String F_MIN = PREFERENCES_PREFIX + "lt_fmin"; //$NON-NLS-1$
27
	/** Lexical table VMAX. */
28
	public static final String V_MAX = PREFERENCES_PREFIX + "lt_vmax"; //$NON-NLS-1$
29

  
30 23
	/** The Constant QUALITYDISPLAY. */
31
	public static final String QUALITY_DISPLAY_FORMAT = PREFERENCES_PREFIX + "quality_display_format"; //$NON-NLS-1$
24
	public static final String QUALITY_DISPLAY_FORMAT = "quality_display_format"; //$NON-NLS-1$
32 25

  
33 26
	/** The Constant CONTRIBDISPLAY. */
34
	public static final String CONTRIB_DISPLAY_FORMAT = PREFERENCES_PREFIX + "contrib_display_format"; //$NON-NLS-1$
27
	public static final String CONTRIB_DISPLAY_FORMAT = "contrib_display_format"; //$NON-NLS-1$
35 28

  
36 29
	/** The Constant MASSDISPLAY. */
37
	public static final String MASS_DISPLAY_FORMAT = PREFERENCES_PREFIX + "mass_display_format"; //$NON-NLS-1$
30
	public static final String MASS_DISPLAY_FORMAT = "mass_display_format"; //$NON-NLS-1$
38 31

  
39
	public static final String CHI_DISPLAY_FORMAT = PREFERENCES_PREFIX + "chi_display_format"; //$NON-NLS-1$
32
	public static final String CHI_DISPLAY_FORMAT = "chi_display_format"; //$NON-NLS-1$
40 33
	
41 34
	/** The Constant DISTDISPLAY. */
42
	public static final String DIST_DISPLAY_FORMAT = PREFERENCES_PREFIX + "dist_display_format"; //$NON-NLS-1$
35
	public static final String DIST_DISPLAY_FORMAT = "dist_display_format"; //$NON-NLS-1$
43 36

  
44 37
	/** The Constant COS2DISPLAY. */
45
	public static final String COS2_DISPLAY_FORMAT = PREFERENCES_PREFIX + "cos2_display_format"; //$NON-NLS-1$
38
	public static final String COS2_DISPLAY_FORMAT = "cos2_display_format"; //$NON-NLS-1$
46 39

  
47 40
	/** The Constant COORDDISPLAY. */
48
	public static final String COORD_DISPLAY_FORMAT = PREFERENCES_PREFIX + "coord_display_format"; //$NON-NLS-1$
41
	public static final String COORD_DISPLAY_FORMAT = "coord_display_format"; //$NON-NLS-1$
49 42

  
50 43
	
51
	public static final String FIRST_DIMENSION = PREFERENCES_PREFIX + "first_dimension"; //$NON-NLS-1$
52
	public static final String SECOND_DIMENSION = PREFERENCES_PREFIX + "second_dimension"; //$NON-NLS-1$
53
	public static final String SHOW_INDIVIDUALS = PREFERENCES_PREFIX + "chart_show_individuals"; //$NON-NLS-1$
54
	public static final String SHOW_VARIABLES = PREFERENCES_PREFIX + "chart_show_variables"; //$NON-NLS-1$
55
	public static final String SHOW_POINT_SHAPES = PREFERENCES_PREFIX + "chart_show_point_shapes"; //$NON-NLS-1$
44
	public static final String FIRST_DIMENSION = "first_dimension"; //$NON-NLS-1$
45
	public static final String SECOND_DIMENSION = "second_dimension"; //$NON-NLS-1$
46
	public static final String SHOW_INDIVIDUALS = "chart_show_individuals"; //$NON-NLS-1$
47
	public static final String SHOW_VARIABLES = "chart_show_variables"; //$NON-NLS-1$
48
	public static final String SHOW_POINT_SHAPES = "chart_show_point_shapes"; //$NON-NLS-1$
56 49
	
57 50
	
58 51

  
tmp/org.txm.lexicaltable.rcp/src/org/txm/lexicaltable/rcp/handlers/ComputeLexicalTable.java (revision 942)
30 30
import java.util.ArrayList;
31 31
import java.util.List;
32 32

  
33
import org.apache.batik.util.gui.CSSMediaPanel.Dialog;
34 33
import org.eclipse.core.commands.ExecutionEvent;
35 34
import org.eclipse.core.commands.ExecutionException;
36 35
import org.eclipse.jface.viewers.ArrayContentProvider;
......
96 95
			int ret = dialog.open();
97 96
			boolean useAllOccurrences = false;
98 97
			//System.out.println("ret= "+ret);
99
			if (ret == Dialog.OK_OPTION) {
98
			if (ret == ListDialog.OK) {
100 99
				//System.out.println("ok");
101 100
				if(dialog.getResult().length == 0) {
102 101
					return null;
tmp/org.txm.annotation.kr.core/META-INF/MANIFEST.MF (revision 942)
65 65
Bundle-ClassPath: .,libs/hsqldb.jar,libs/postgresql-9.4.1207.jre6.jar,
66 66
 libs/sqlite-jdbc-3.8.11.2.jar
67 67
Bundle-Version: 1.0.0.qualifier
68
Bundle-Name: org.txm.annotation.kr.core
68
Bundle-Name: KR Annotation Core
69 69
Bundle-ManifestVersion: 2
70 70
Bundle-Activator: org.txm.annotation.kr.core.Activator
71 71
Bundle-SymbolicName: org.txm.annotation.kr.core;singleton:=true
72 72
Meta-Persistence: META-INF/persistence.xml
73 73
Bundle-RequiredExecutionEnvironment: JavaSE-1.7
74
Bundle-Vendor: Textometrie.org
74 75

  
tmp/org.txm.rcp/src/main/java/org/txm/rcp/IImageKeys.java (revision 942)
33 33
import org.eclipse.swt.graphics.Image;
34 34
import org.eclipse.ui.plugin.AbstractUIPlugin;
35 35
import org.osgi.framework.FrameworkUtil;
36
import org.txm.utils.logger.Log;
36 37

  
37 38
/**
38 39
 * Stores image keys and also Image objects. 
......
136 137
	/** The Constant ACTION_TEXT. */
137 138
	public static final String ACTION_TEXT = "icons/objects/text.png"; //$NON-NLS-1$
138 139
	
139
	/** The Constant RDECORATION. */
140
	public static final String RDECORATION = "icons/decorators/R.png"; //$NON-NLS-1$
141

  
142 140
	public static final String GRAPH_SPECIFICITIES = "icons/functions/SpecificitiesGraph.png"; //$NON-NLS-1$
143 141
	
144 142
	/** The Constant CHECKED. */
......
265 263
		if (!images.containsKey(imagekey)) {
266 264
			ImageDescriptor imgg = AbstractUIPlugin.imageDescriptorFromPlugin(pluginId, imagekey);
267 265
			if (imgg == null) {
268
				System.out.println("Warning: image not found in '"+pluginId+"' -> '"+imagekey+"'");
266
				Log.severe("Warning: image not found in '"+pluginId+"' -> '"+imagekey+"'");
269 267
				return getImage("icons/null.png");
270 268
			}
271 269

  

Formats disponibles : Unified diff