Révision 661

tmp/org.txm.rcp/src/main/java/org/txm/rcp/commands/base/DeleteObject.java (revision 661)
53 53
import org.txm.Toolbox;
54 54
import org.txm.core.preferences.TXMPreferences;
55 55
import org.txm.core.results.TXMResult;
56

  
57 56
import org.txm.objects.TxmObject;
58 57
import org.txm.rcp.RCPMessages;
59 58
import org.txm.rcp.StatusLine;
60
import org.txm.rcp.commands.RestartTXM;
61 59
import org.txm.rcp.editors.TXMEditor;
62 60
import org.txm.rcp.preferences.RCPPreferences;
63 61
import org.txm.rcp.utils.JobHandler;
......
145 143
	 * TODO: select the parent object of the deleted object
146 144
	 *
147 145
	 * @param objects the objects to delete
148
	 * @return the e
146
	 * @return 
149 147
	 */
150 148
	public synchronized static HashSet<Object> delete(final List<Object> objects) {
151 149
		StatusLine.setMessage(NLS.bind(RCPMessages.DeleteObject_5, objects));
......
241 239
				org.txm.rcp.utils.Logger.printStackTrace(e);
242 240
			}
243 241
		}
244
//		} else if (o instanceof Lexicon) {
245
//			Lexicon l = (Lexicon) o;
246
//			Corpus c = l.getCorpus();
247
//			c.dropLexicon(l.getProperty());
248
//			System.out.println(NLS.bind(Messages.DeleteObject_10, l.getName()));
249
//		} else if (o instanceof SpecificitesResult) {
250
//			SpecificitesResult specif = (SpecificitesResult) o;
251
//			
252
//			TXMResult p = specif.getParent();
253
//			
254
//			if (p != null) {
255
//				if (p instanceof Partition)	{
256
//					p.removeResult(specif.getLexicalTable());
257
//				}
258
//				p.removeResult(specif);
259
//			}
260
//			System.out.println(NLS.bind(Messages.DeleteObject_10, specif.getName()));
261
//		} else if (o instanceof Concordance) {
262
//			Concordance conc = (Concordance) o;
263
//			Corpus c = conc.getCorpus();
264
//			c.removeResult(conc);
265
//			conc.cleanMemory();
266
//			System.out.println(NLS.bind(Messages.DeleteObject_10, conc.getName()));
267
//		} else if (o instanceof Referencer) {
268
//			Referencer referencer = (Referencer) o;
269
//			Corpus c = referencer.getCorpus();
270
//			c.removeResult(referencer);
271
//			System.out.println(NLS.bind(Messages.DeleteObject_10, referencer.getName()));
272
//		}
273
//			else if (o instanceof Cooccurrence) {
274
//			Cooccurrence cooc = (Cooccurrence) o;
275
//			Corpus c = cooc.getCorpus();
276
//			c.removeResult(cooc);
277
//			System.out.println(NLS.bind(Messages.DeleteObject_10, cooc.getName()));
278
//		} else if (o instanceof Progression) {
279
//			Progression rep = (Progression) o;
280
//			Corpus c = rep.getCorpus();
281
//			c.removeResult(rep);
282
//			System.out.println(NLS.bind(Messages.DeleteObject_10, rep.getName()));
283
//		} else if (o instanceof Index) {
284
//			Index voc = (Index) o;
285
//			voc.getHasResultsParent().removeResult(voc);
286
//			System.out.println(NLS.bind(Messages.DeleteObject_10, voc.getName()));
287
			//FIXME
288
//		} else if (o instanceof CA) {
289
//			CA ca = (CA) o;
290
//			for (int i = 0 ; i < ca.getResults().size() ; i++) {
291
//				deleted.addAll(delete(ca.getResults().get(i)));
292
//				i--;
293
//			}
294
//			ca.delete();
295
//			deleted.add(ca);
296
//			System.out.println(NLS.bind(Messages.DeleteObject_10, ca.getName()));
297
//		} else if (o instanceof CAH) {
298
//			CAH cah = (CAH) o;
299
//			cah.delete();
300
//			deleted.add(cah);
301
//			System.out.println(NLS.bind(Messages.DeleteObject_10, cah.getName()));
302
//		} else if (o instanceof LexicalTable) {
303
//			LexicalTable lt = (LexicalTable) o;
304
//			for (int i = 0 ; i < lt.getResults().size() ; i++) {
305
//				deleted.addAll(delete(lt.getResults().get(i)));
306
//				i--;
307
//			}
308
//			lt.getParent().removeResult(lt);
309
//			System.out.println(NLS.bind(Messages.DeleteObject_10, lt.getName()));
310
//			
311
//		}
312 242
		// FIXME: when TXMResult will be implemented, only this code must be left
313 243
		else if (o instanceof TXMResult) {
314 244
			((TXMResult) o).delete();
315 245
			System.out.println(NLS.bind(RCPMessages.DeleteObject_10, ((TXMResult) o).getName()));
316 246
		}
317
		else if (o instanceof TXMResult) {
318
			TXMResult l = (TXMResult) o;
319
			l.delete();
320
			System.out.println(NLS.bind(RCPMessages.DeleteObject_10, l));
321
		}
322 247

  
323 248

  
324 249
		deleted.add(o);
tmp/org.txm.rcp/plugin.xml (revision 661)
944 944
               sibling_order="&lt;command&#x0A;                  commandId=&quot;org.txm.rcp.commands.function.ComputeConcordance&quot;&#x0A;                  icon=&quot;icons/functions/Concordances.png&quot;&#x0A;                  label=&quot;%command.label.11&quot;&#x0A;                  style=&quot;push&quot;&#x0A;                  tooltip=&quot;%command.tooltip.7&quot;&gt;&#x0A;               &lt;visibleWhen&#x0A;                     checkEnabled=&quot;false&quot;&gt;&#x0A;                  &lt;reference&#x0A;                        definitionId=&quot;OneCorpusSelected&quot;&gt;&#x0A;                  &lt;/reference&gt;&#x0A;               &lt;/visibleWhen&gt;&#x0A;            &lt;/command&gt;">
945 945
            
946 946
            <command
947
                  commandId="org.txm.rcp.commands.base.DeleteInCorpora"
947
                  commandId="org.txm.rcp.commands.base.DeleteObject"
948 948
                  icon="icons/functions/Delete.png"
949 949
                  style="push">
950 950
               <visibleWhen
......
1313 1313
            allPopups="true"
1314 1314
            locationURI="toolbar:org.eclipse.ui.main.toolbar">
1315 1315
         <toolbar
1316
               id="org.txm.rcp.toolbarcorpus">
1317
            
1316
               id="org.txm.rcp.toolbarresult">
1318 1317
            <command
1319
                  commandId="org.txm.rcp.commands.base.DeleteInCorpora"
1320
                  icon="icons/functions/Delete.png"
1321
                  style="push"
1322
                  tooltip="%command.tooltip.33">
1323
               <visibleWhen
1324
                     checkEnabled="false">
1325
                  <or>
1326
                     <reference
1327
                           definitionId="OneBaseSelected">
1328
                     </reference>
1329
                     <reference
1330
                           definitionId="OneConcordanceSelected">
1331
                     </reference>
1332
                     <reference
1333
                           definitionId="OneCorpusSelected">
1334
                     </reference>
1335
                     <reference
1336
                           definitionId="OneLexicalTableSelected">
1337
                     </reference>
1338
                     <reference
1339
                           definitionId="OneLexiconSelected">
1340
                     </reference>
1341
                     <reference
1342
                           definitionId="OnePartitionSelected">
1343
                     </reference>
1344
                     <reference
1345
                           definitionId="OneTxmObjectSelected">
1346
                     </reference>
1347
                     <reference
1348
                           definitionId="OneTXMResultSelected">
1349
                     </reference>
1350
                  </or>
1351
               </visibleWhen>
1352
            </command>
1353
            <separator
1354
                  name="org.txm.rcp.toolbarcorpus.corpus"
1355
                  visible="true">
1356
            </separator>
1357
            <separator
1358
                  name="org.txm.rcp.toolbarcorpus.annotation"
1359
                  visible="true">
1360
            </separator>
1361
         </toolbar>
1362
         <separator
1363
               name="org.txm.rcp.toolbar.separator1"
1364
               visible="true">
1365
         </separator>
1366
         <toolbar
1367
               id="org.txm.rcp.toolbartools">
1368
            <command
1369 1318
                  commandId="org.txm.rcp.commands.function.ExportResult"
1370 1319
                  icon="icons/functions/export_data.png"
1371
                  label="%command.label.51"
1372 1320
                  style="push">
1373 1321
               <visibleWhen
1374 1322
                     checkEnabled="false">
......
1412 1360
            <command
1413 1361
                  commandId="org.txm.rcp.commands.function.ExportSVG"
1414 1362
                  icon="icons/functions/exportSVG.png"
1415
                  label="%command.label.101"
1416 1363
                  style="push"
1417 1364
                  tooltip="%command.tooltip.54">
1418 1365
               <visibleWhen
......
1433 1380
                  </or>
1434 1381
               </visibleWhen>
1435 1382
            </command>
1436

  
1383
            <command
1384
                  commandId="org.txm.rcp.commands.base.DeleteObject"
1385
                  icon="icons/functions/Delete.png"
1386
                  style="push"
1387
                  tooltip="%command.tooltip.33">
1388
               <visibleWhen
1389
                     checkEnabled="false">
1390
                  <or>
1391
                     <reference
1392
                           definitionId="OneBaseSelected">
1393
                     </reference>
1394
                     <reference
1395
                           definitionId="OneConcordanceSelected">
1396
                     </reference>
1397
                     <reference
1398
                           definitionId="OneCorpusSelected">
1399
                     </reference>
1400
                     <reference
1401
                           definitionId="OneLexicalTableSelected">
1402
                     </reference>
1403
                     <reference
1404
                           definitionId="OneLexiconSelected">
1405
                     </reference>
1406
                     <reference
1407
                           definitionId="OnePartitionSelected">
1408
                     </reference>
1409
                     <reference
1410
                           definitionId="OneTxmObjectSelected">
1411
                     </reference>
1412
                     <reference
1413
                           definitionId="OneTXMResultSelected">
1414
                     </reference>
1415
                  </or>
1416
               </visibleWhen>
1417
            </command>
1418
         </toolbar>
1419
         <separator
1420
               name="org.txm.rcp.toolbar.separator1"
1421
               visible="true">
1422
         </separator>
1423
         <toolbar
1424
               id="org.txm.rcp.toolbarcorpus">
1425
            
1437 1426
            <separator
1438
                  name="org.txm.rcp.separator4"
1427
                  name="org.txm.rcp.toolbarcorpus.corpus"
1439 1428
                  visible="true">
1440 1429
            </separator>
1441 1430
            <separator
1442
                  name="org.txm.rcp.separator1">
1431
                  name="org.txm.rcp.toolbarcorpus.annotation"
1432
                  visible="true">
1443 1433
            </separator>
1434
         </toolbar>
1435
         <separator
1436
               name="org.txm.rcp.toolbar.separator1"
1437
               visible="true">
1438
         </separator>
1439
         <toolbar
1440
               id="org.txm.rcp.toolbartools">
1441
            <separator
1442
                  name="org.txm.rcp.separator1"
1443
                  visible="true">
1444
            </separator>
1445

  
1444 1446
            <command
1445 1447
                  commandId="org.eclipse.ui.window.preferences"
1446 1448
                  icon="icons/functions/prefs.png"
......
1994 1996
            </separator>
1995 1997
            
1996 1998
            <command
1997
                  commandId="org.txm.rcp.commands.base.DeleteInCorpora"
1999
                  commandId="org.txm.rcp.commands.base.DeleteObject"
1998 2000
                  icon="icons/functions/Delete.png"
1999 2001
                  style="push">
2000 2002
               <visibleWhen
......
2361 2363
      </command>
2362 2364
      <command
2363 2365
            defaultHandler="org.txm.rcp.commands.base.DeleteObject"
2364
            id="org.txm.rcp.commands.base.DeleteInCorpora"
2366
            id="org.txm.rcp.commands.base.DeleteObject"
2365 2367
            name="%command.name.26">
2366 2368
      </command>
2367 2369
      
tmp/org.txm.wordcloud.rcp/plugin.xml (revision 661)
15 15
         point="org.eclipse.ui.menus">
16 16
      <menuContribution
17 17
            allPopups="false"
18
            locationURI="toolbar:org.txm.rcp.toolbartools">
18
            locationURI="toolbar:org.txm.rcp.toolbartools?after=org.txm.internalview.rcp.handlers.ComputeInternalView">
19 19
         <command
20 20
               commandId="org.txm.wordcloud.rcp.handlers.ComputeWordCloud"
21 21
               icon="icons/functions/wordcloud.png"
tmp/org.txm.chartsengine.rcp/plugin.xml (revision 661)
92 92
      </menuContribution>
93 93
      <menuContribution
94 94
            allPopups="false"
95
            locationURI="toolbar:org.txm.rcp.toolbarcorpus">
95
            locationURI="toolbar:org.txm.rcp.toolbarresult?before=org.txm.rcp.commands.function.ExportResult">
96 96
         <command
97 97
               commandId="ExportChart"
98 98
               icon="icons/export_chart.png"
tmp/org.txm.textsbalance.rcp/plugin.xml (revision 661)
28 28
         point="org.eclipse.ui.menus">
29 29
      <menuContribution
30 30
            allPopups="false"
31
            locationURI="toolbar:org.txm.rcp.toolbartools">
31
            locationURI="toolbar:org.txm.rcp.toolbartools?after=org.txm.internalview.rcp.handlers.ComputeInternalView">
32 32
         <command
33 33
               commandId="org.txm.textsbalance.rcp.handlers.ComputeTextsBalance"
34 34
               icon="icons/balance.png"

Formats disponibles : Unified diff