Révision 848

tmp/org.txm.groovy.feature/feature.xml (revision 848)
61 61
         version="0.0.0"
62 62
         unpack="false"/>
63 63

  
64
   <plugin
65
         id="org.txm.groovy.rcp"
66
         download-size="0"
67
         install-size="0"
68
         version="0.0.0"
69
         unpack="false"/>
70

  
71 64
</feature>
tmp/org.txm.rcp.feature/feature.xml (revision 848)
273 273
      <import plugin="org.eclipse.e4.ui.workbench3" version="0.12.0" match="greaterOrEqual"/>
274 274
      <import plugin="org.eclipse.e4.ui.workbench.addons.swt" version="0.10.0" match="greaterOrEqual"/>
275 275
      <import plugin="org.eclipse.emf.ecore" version="2.7.0" match="greaterOrEqual"/>
276
      <import plugin="com.ibm.icu"/>
277
      <import plugin="javax.annotation"/>
278
      <import plugin="javax.inject"/>
279
      <import plugin="org.eclipse.e4.core.commands"/>
280
      <import plugin="org.eclipse.e4.ui.workbench.renderers.swt"/>
281
      <import plugin="org.eclipse.e4.ui.services"/>
282
      <import plugin="org.eclipse.emf.common"/>
283
      <import plugin="javax.xml"/>
276 284
   </requires>
277 285

  
278 286
   <plugin
tmp/org.txm.synopticeditor.rcp/src/org/txm/edition/rcp/handlers/BackToText.java (revision 848)
50 50
import org.txm.edition.rcp.editors.RGBA;
51 51
import org.txm.edition.rcp.editors.SynopticEditionEditor;
52 52
import org.txm.edition.rcp.messages.SynopticEditionUIMessages;
53
import org.txm.objects.Edition;
54
import org.txm.objects.Page;
55 53
import org.txm.objects.Text;
56 54
import org.txm.rcp.StatusLine;
57 55
import org.txm.rcp.utils.SWTEditorsUtils;
58 56
import org.txm.searchengine.cqp.AbstractCqiClient;
59 57
import org.txm.searchengine.cqp.CQPSearchEngine;
60
import org.txm.searchengine.cqp.clientExceptions.CqiClientException;
61
import org.txm.searchengine.cqp.clientExceptions.InvalidCqpIdException;
62 58
import org.txm.searchengine.cqp.corpus.Corpus;
63 59
import org.txm.searchengine.cqp.corpus.CorpusManager;
64 60
import org.txm.searchengine.cqp.corpus.MainCorpus;
......
120 116
			return null;
121 117
		}
122 118
		ConcordanceEditor concordanceEditor = (ConcordanceEditor)ieditor;
123
		ISelection sel = wb.getSelectionService().getSelection();
124
		if (sel instanceof IStructuredSelection) {
125
			IStructuredSelection selection = (IStructuredSelection) sel;
126
			if (selection.getFirstElement() instanceof Match) {
127
				backToText(concordanceEditor, (Match)(selection.getFirstElement()));
128
			} else {
129
				System.out.println(SynopticEditionUIMessages.BackToText_1+selection);
130
			}
131
		} else {
132
			System.out.println(SynopticEditionUIMessages.BackToText_2);
133
		}
119
		// FIXME: SJ: new version
120
		concordanceEditor.backToText();
121
		// FIXME: SJ: old version
122
//		ISelection sel = wb.getSelectionService().getSelection();
123
//		if (sel instanceof IStructuredSelection) {
124
//			IStructuredSelection selection = (IStructuredSelection) sel;
125
//			if (selection.getFirstElement() instanceof Match) {
126
//				backToText(concordanceEditor, (Match)(selection.getFirstElement()));
127
//			} else {
128
//				System.out.println(SynopticEditionUIMessages.BackToText_1+selection);
129
//			}
130
//		} else {
131
//			System.out.println(SynopticEditionUIMessages.BackToText_2);
132
//		}
134 133
		return null;
135 134
	}
136 135

  
tmp/org.txm.concordance.rcp/src/org/txm/concordance/rcp/editors/ConcordanceEditor.java (revision 848)
112 112
import org.txm.concordance.rcp.messages.ConcordanceUIMessages;
113 113
import org.txm.concordance.rcp.widgets.ComplexSortSelector;
114 114
import org.txm.cooccurrence.rcp.messages.CooccurrenceUIMessages;
115
import org.txm.core.preferences.TBXPreferences;
115 116
import org.txm.core.preferences.TXMPreferences;
116 117
import org.txm.core.results.Parameter;
117 118
import org.txm.core.results.TXMResult;
......
631 632

  
632 633
		//resetColumnWidths(); // set column widths
633 634

  
634
		createContextMenu();
635 635

  
636 636
		//		// And now, a sweet piece of code :)
637 637
		//		// When the window is resized, the scrollbar is adjusted so that the
......
748 748
		data3.left = new FormAttachment(sash,0);
749 749
		data3.right = new FormAttachment(100);
750 750
		viewer.getTable().setLayoutData(data3);
751
		
752
		
753
		createContextMenu();
754

  
751 755
	}
752 756

  
753 757
	/**
......
1967 1971
		try {
1968 1972
			InternalView iview = new InternalView(concordance.getCorpus());
1969 1973
			iview.setParameters(concordance.getKeywordAnalysisProperties(), 
1970
					concordance.getCorpus().getStructuralUnit("text"),
1974
					concordance.getCorpus().getStructuralUnit(TBXPreferences.DEFAULT_STRUCTURAL_UNIT),
1971 1975
					new ArrayList<StructuralUnitProperty>(), null);
1972 1976

  
1973 1977
			TXMResultEditorInput editorInput = new TXMResultEditorInput(iview);
tmp/org.txm.groovy.rcp/META-INF/MANIFEST.MF (revision 848)
1 1
Manifest-Version: 1.0
2
Require-Bundle: org.eclipse.core.runtime;visibility:=reexport,org.ecli
3
 pse.ui;visibility:=reexport,org.txm.groovy.core;bundle-version="1.0.0
4
 ";visibility:=reexport,org.codehaus.groovy.eclipse.ui;bundle-version=
5
 "2.9.1";visibility:=reexport
2
Require-Bundle: org.eclipse.core.runtime;visibility:=reexport,
3
 org.eclipse.ui;visibility:=reexport,
4
 org.txm.groovy.core;bundle-version="1.0.0";visibility:=reexport,
5
 org.codehaus.groovy.eclipse.ui;bundle-version="2.9.1";visibility:=reexport
6 6
Bundle-Vendor: Textometry.org
7 7
Bundle-Version: 1.0.0.qualifier
8 8
Bundle-Name: Rcp
tmp/org.txm.specificities.core/src/org/txm/specificities/core/preferences/SpecificitiesPreferences.java (revision 848)
20 20
	// auto populate the preference node qualifier from the current bundle id
21 21
	public static final String PREFERENCES_NODE = FrameworkUtil.getBundle(SpecificitiesPreferences.class).getSymbolicName();
22 22
	
23
	public static final String PREFERENCES_PREFIX = "specificities_"; //$NON-NLS-1$
24

  
25
	
26 23
	/**
27
	 * Unit property.
28
	 */
29
	public static final String UNIT_PROPERTY = PREFERENCES_PREFIX + "unit_property"; //$NON-NLS-1$
30
	
31
	/**
32 24
	 * Maximum score.
33 25
	 */
34
	public static final String MAX_SCORE = PREFERENCES_PREFIX + "max_score"; //$NON-NLS-1$
26
	public static final String MAX_SCORE = "max_score"; //$NON-NLS-1$
35 27
	
36 28
	/**
37 29
	 * Display format.
38 30
	 */
39
	public static final String FORMAT = PREFERENCES_PREFIX + "format"; //$NON-NLS-1$
31
	public static final String FORMAT = "format"; //$NON-NLS-1$
40 32
	
41 33
	
42 34
	// charts
43
	public static final String CHART_GROUP_BY_LINES = PREFERENCES_PREFIX + "chart_group_by_lines"; //$NON-NLS-1$
44
	public static final String CHART_DRAW_BARS = PREFERENCES_PREFIX + "chart_draw_bars"; //$NON-NLS-1$
45
	public static final String CHART_DRAW_LINES = PREFERENCES_PREFIX + "chart_draw_lines"; //$NON-NLS-1$
46
	public static final String CHART_BANALITY = PREFERENCES_PREFIX + "chart_banality"; //$NON-NLS-1$
35
	public static final String CHART_GROUP_BY_LINES = "chart_group_by_lines"; //$NON-NLS-1$
36
	public static final String CHART_DRAW_BARS = "chart_draw_bars"; //$NON-NLS-1$
37
	public static final String CHART_DRAW_LINES = "chart_draw_lines"; //$NON-NLS-1$
38
	public static final String CHART_BANALITY = "chart_banality"; //$NON-NLS-1$
47 39

  
48 40
	
49 41
	
tmp/org.txm.rcp/src/main/java/org/txm/rcp/utils/SWTEditorsUtils.java (revision 848)
62 62
	/**
63 63
	 * Splits the parent area of an editor and add another one in this area by splitting it. 
64 64
	 * (Same behavior than the splitting drag and drop event on editor.)
65
	 * EModelService.ABOVE, EModelService.BELOW, etc. can be used as position.
66
	 * 
65 67
	 * @param parentEditor
66 68
	 * @param editorToAdd
67 69
	 * @param position
68
	 * @param percent
70
	 * @param percent The percentage of the area to be occupied by the inserted element
69 71
	 */
70 72
	public static void addEditor(EditorPart parentEditor, EditorPart editorToAdd, int position, float percent) {
71 73
		addPart((MPart) parentEditor.getSite().getService(MPart.class), (MPart) editorToAdd.getSite().getService(MPart.class), position, percent);
......
74 76
	/**
75 77
	 * Splits the parent area of an editor and add another one in this area by splitting it by the middle. 
76 78
	 * (Same behavior than the splitting drag and drop event on editor.)
79
	 * EModelService.ABOVE, EModelService.BELOW, etc. can be used as position.
77 80
	 * 
78 81
	 * @param parentEditor
79 82
	 * @param editorToAdd
80 83
	 * @param position
81
	 * @param percent
82 84
	 */
83 85
	public static void addEditor(EditorPart parentEditor, EditorPart editorToAdd, int position) {
84 86
		addEditor(parentEditor, editorToAdd, position, 0.5f);
......
87 89
	/**
88 90
	 * Splits the parent area of a part and add another one in this area by splitting it. 
89 91
	 * (Same behavior than the splitting drag and drop event on editor.)
92
	 * EModelService.ABOVE, EModelService.BELOW, etc. can be used as position.
90 93
	 * 
91
	 * @param percent
92
	 * @param position
93 94
	 * @param parentPart
94 95
	 * @param partToAdd
96
	 * @param position
97
	 * @param percent The percentage of the area to be occupied by the inserted element
95 98
	 */
96 99
	public static void addPart(MPart parentPart, MPart partToAdd, int position, float percent) {
97 100
		IWorkbenchWindow window = PlatformUI.getWorkbench().getActiveWorkbenchWindow();
tmp/org.txm.rcp/rcpapplication.product (revision 848)
566 566
      <feature id="org.eclipse.ecf.filetransfer.ssl.feature"/>
567 567
      <feature id="org.txm.statsengine.r.feature"/>
568 568
      <feature id="org.txm.searchengine.cqp.feature"/>
569
      <feature id="org.txm.synopticeditor.feature"/>
570 569
      <feature id="org.txm.ca.feature"/>
571 570
      <feature id="org.txm.chartsengine.jfreechart.feature"/>
572 571
      <feature id="org.txm.annotation.feature"/>

Formats disponibles : Unified diff