Revision 2761

tmp/org.txm.rcp/src/main/java/org/txm/rcp/messages/messages_fr.properties (revision 2761)
910 910

  
911 911
startsWith = commence par
912 912

  
913
startupFailedPleaseCheckTXMPreferencesInTheFileSupPreferencesMenuOrContactTxmusersMailingListMenuColonHelpSup = ** Le démarrage de la plateforme a été interrompu, veuillez régler les préférences de TXM (dans le menu ''Fichier>Préférences'') : {0}.
913
startupFailedPleaseCheckTXMPreferencesInTheFileSupPreferencesMenuOrContactTxmusersMailingListMenuColonHelpSup = ** Le démarrage de la plateforme a été interrompu, veuillez régler les préférences de TXM (dans le menu ''Fichier>Préférences'') : {0} puis redémarrer TXM.
914 914

  
915 915
string = Chaîne de caractères
916 916

  
tmp/org.txm.rcp/src/main/java/org/txm/rcp/messages/messages.properties (revision 2761)
976 976

  
977 977
startsWith = starts with
978 978

  
979
startupFailedPleaseCheckTXMPreferencesInTheFileSupPreferencesMenuOrContactTxmusersMailingListMenuColonHelpSup = ** Platform startup has been interrupted, please check TXM preferences (in the ''File>Preferences'' menu) : {0}.
979
startupFailedPleaseCheckTXMPreferencesInTheFileSupPreferencesMenuOrContactTxmusersMailingListMenuColonHelpSup = ** Platform startup has been interrupted, please check TXM preferences (in the ''File>Preferences'' menu) : {0}. Then restart TXM.
980 980

  
981 981
string = String
982 982

  
tmp/org.txm.rcp/src/main/java/org/txm/rcp/ApplicationWorkbenchAdvisor.java (revision 2761)
228 228
						if (!checkTXMHOME(this, monitor)) {
229 229
							monitor.done();
230 230
							System.err.println(TXMUIMessages.errorsOccuredDuringTXMPostInstallation);
231
							return Status.CANCEL_STATUS;
231 232
						}
232 233
						monitor.worked(30);
233 234
						
......
1025 1026
		this.callGroovyScript(new File(Toolbox.getTxmHomePath(), "scripts/groovy/user/stop.groovy")); //$NON-NLS-1$
1026 1027
	}
1027 1028
	
1029
	ProgressMonitorDialog initializeUIPMD; // store the state of the initializeUI step
1030
	
1028 1031
	/**
1029 1032
	 * after TXMHOME AND INSTALLDIR are ok, we can start the Toolbox
1030 1033
	 * <p>
......
1060 1063
					// remove some preference pages
1061 1064
					setPreferencesConfiguration();
1062 1065
					
1063
					new ProgressMonitorDialog(Display.getDefault().getActiveShell()).run(true, true, new IRunnableWithProgress() {
1066
					initializeUIPMD = new ProgressMonitorDialog(Display.getDefault().getActiveShell());
1067
					initializeUIPMD.run(true, true, new IRunnableWithProgress() {
1064 1068
						
1065 1069
						@Override
1066 1070
						public void run(IProgressMonitor monitor) throws InvocationTargetException, InterruptedException {
......
1116 1120
					Log.fine(TXMUIMessages.loadingViews);
1117 1121
					RestartTXM.reloadViews(); // reload views
1118 1122
					
1119
					
1120 1123
				}
1121 1124
				catch (Exception e) {
1122 1125
					Log.severe(TXMCoreMessages.bind(TXMUIMessages.errorDuringUIInitializationP0, e.getLocalizedMessage()));
......
1127 1130
		
1128 1131
		jobHandler.setTaskName(""); //$NON-NLS-1$ s
1129 1132
		// TxmPreferences.dump();
1130
		return true;
1133
		return initializeUIPMD != null && !initializeUIPMD.getProgressMonitor().isCanceled();
1131 1134
	}
1132 1135
}
tmp/org.txm.rcp/plugin.xml (revision 2761)
2521 2521
            defaultHandler="org.txm.rcp.commands.workspace.UpdateCorpus"
2522 2522
            id="org.txm.rcp.commands.workspace.UpdateCorpus"
2523 2523
            name="%command.name.98">
2524
         <commandParameter
2525
               id="org.txm.rcp.commands.workspace.UpdateCorpus.force"
2526
               name="force"
2527
               optional="true">
2528
         </commandParameter>
2524 2529
      </command>
2525 2530

  
2526 2531
      <command

Also available in: Unified diff