Révision 1854

tmp/org.txm.rcp/src/main/java/org/txm/rcp/commands/function/RenameResult.java (revision 1854)
1 1
package org.txm.rcp.commands.function;
2 2

  
3
import java.util.List;
4

  
5 3
import org.eclipse.core.commands.AbstractHandler;
6 4
import org.eclipse.core.commands.ExecutionEvent;
7 5
import org.eclipse.core.commands.ExecutionException;
8
import org.eclipse.jface.dialogs.MessageDialog;
9 6
import org.eclipse.jface.viewers.ISelection;
10 7
import org.eclipse.jface.viewers.IStructuredSelection;
11 8
import org.eclipse.ui.IWorkbenchWindow;
12 9
import org.eclipse.ui.handlers.HandlerUtil;
13
import org.txm.Toolbox;
14 10
import org.txm.core.preferences.TXMPreferences;
15 11
import org.txm.core.results.TXMResult;
16
import org.txm.objects.CorpusBuild;
17 12
import org.txm.rcp.swt.dialog.TextDialog;
18 13
import org.txm.rcp.views.corpora.CorporaView;
19 14

  
......
35 30
				String newName = dialog.getText();
36 31
				//if (newName.length() > 0) {
37 32
				
38
					if (r instanceof CorpusBuild) { // test if another corpus has the same name
39
						List<TXMResult> corpora = Toolbox.workspace.getDeepChildren(CorpusBuild.class);
40
					}
41
				
33
//					if (r instanceof CorpusBuild) { // test if another corpus has the same name
34
//						List<TXMResult> corpora = Toolbox.workspace.getDeepChildren(CorpusBuild.class);
35
//					}
36
//				
42 37
					r.setUserName(newName);
43 38
					try {
44 39
						r.autoSaveParametersFromAnnotations();
......
46 41
					catch (Exception e) {
47 42
						// TODO Auto-generated catch block
48 43
						e.printStackTrace();
44
						return null;
49 45
					}
50 46
					TXMPreferences.flush(r);
51 47
					
tmp/org.txm.rcp/src/main/java/org/txm/rcp/ApplicationWorkbenchAdvisor.java (revision 1854)
265 265
							return Status.CANCEL_STATUS;
266 266
						}
267 267

  
268
						// restore corpora if TXMHOME has been created
269
						if (txmHomeRestored) {
270
							//createBackUpDirectory(monitor);
271

  
272
							installCorporaDirectory(monitor);
273
							//							this.syncExec(new Runnable() {
274
							//								@Override
275
							//								public void run() {
276
							//									try {
277
							//										SearchEnginesManager.getCQPSearchEngine().stop();
278
							//										SearchEnginesManager.getCQPSearchEngine().start(monitor);
279
							//										CorporaView.refresh();
280
							//									} catch (Exception e) {
281
							//										// TODO Auto-generated catch block
282
							//										e.printStackTrace();
283
							//									}
284
							//								}
285
							//							});
286
						}
287

  
288 268
						monitor.done();
289 269
					} catch (Exception e) {
290 270
						System.out.println(TXMCoreMessages.bind(TXMUIMessages.errorWhileLoadingTXMColon, e));
......
856 836
			System.out.println("DEV MODE: no corpus restored!");
857 837
			return; // dev mode
858 838
		}
859
		
839
		monitor.setTaskName("Restoring corpora...");
860 840
		String installdirpath = Toolbox.getInstallDirectory();
861 841
		File sampleCorporaDirectory = new File(installdirpath, "samples"); //$NON-NLS-1$
862 842

  
......
950 930
				RestartTXM.reloadViews();
951 931
			}
952 932
		});
933
		
934
		monitor.setTaskName("");
953 935
	}
954 936

  
955 937
	/**
......
998 980
	}
999 981

  
1000 982
	/**
1001
	 * after TXMHOME AND INSTALLDIR are ok, we start launch the Toolbox after
1002
	 * init, 
983
	 * after TXMHOME AND INSTALLDIR are ok, we can start the Toolbox
1003 984
	 * <p>
1004
	 * we refresh the views (corpora, bases and query).
985
	 * in a modal dialogs: 1- call pre start scripts, 2- init, 3- call start scripts 4- restore corpora
1005 986
	 * <p>
1006
	 * we close empty editors
987
	 * 5- we refresh the views (corpora, bases and query).
1007 988
	 * <p>
1008
	 * we remove some preferences pages not useful
989
	 * 6- we close empty editors
990
	 * <p>
991
	 * 7- we remove some preferences pages not useful
1009 992
	 * 
1010 993
	 * @param jobHandler the job
1011 994
	 * @return true, if successful
......
1029 1012

  
1030 1013
									monitor.setTaskName("Calling Groovy prestart script...");
1031 1014
									callPreStartScript();
1032

  
1015
									monitor.worked(20);
1016
									
1033 1017
									monitor.setTaskName("Initializing Toolbox (engines and corpora)...");
1034 1018
									if (Toolbox.initialize(TBXPreferences.class, monitor)) {
1035 1019
										StatusLine.setMessage(TXMUIMessages.ready);
......
1041 1025
										monitor.done();
1042 1026
										return;
1043 1027
									}
1044

  
1028
									monitor.worked(20);
1029
									
1045 1030
									monitor.setTaskName("Calling Groovy start script...");
1046 1031
									callStartScript();
1032
									monitor.worked(20);
1033
									
1034
									// restore corpora if TXMHOME has been created
1035
									if (txmHomeRestored) {
1036
										installCorporaDirectory(monitor);
1037
									}
1038
									monitor.worked(20);
1047 1039
								} catch (Exception e) {
1048 1040
									// TODO Auto-generated catch block
1049 1041
									e.printStackTrace();
......
1053 1045
							monitor.done(); 
1054 1046
						}
1055 1047
					});
1056

  
1048
					
1057 1049
					Log.fine(TXMUIMessages.loadingViews);
1058 1050
					RestartTXM.reloadViews(); // reload views
1059

  
1060
					if (Toolbox.isInitialized()) {
1061
						StatusLine.setMessage(TXMUIMessages.ready);
1062
					}
1063
					else {
1064
						StatusLine.setMessage(TXMUIMessages.startupFailedPleaseCheckTXMPreferencesInTheFileSupPreferencesMenuOrContactTxmusersMailingListMenuColonHelpSup);
1065
					}
1066

  
1051
					
1067 1052
					setDefaultTheme();
1068 1053

  
1069 1054
					// CLOSE Empty&Error editors
......
1078 1063
					e.printStackTrace();
1079 1064
				}
1080 1065
			}
1081
		}); 
1082

  
1066
		});
1067
		
1068
		jobHandler.setTaskName("");
1083 1069
		//TxmPreferences.dump();
1084 1070
		return true;
1085 1071
	}

Formats disponibles : Unified diff