Révision 3642
| TXM/trunk/org.txm.rcp/src/main/java/org/txm/rcp/ApplicationWorkbenchAdvisor.java (revision 3642) | ||
|---|---|---|
| 7 | 7 |
import java.lang.reflect.InvocationTargetException; |
| 8 | 8 |
import java.net.URL; |
| 9 | 9 |
import java.util.ArrayList; |
| 10 |
import java.util.Arrays; |
|
| 11 | 10 |
import java.util.Date; |
| 12 |
import java.util.HashMap; |
|
| 13 |
import java.util.List; |
|
| 14 | 11 |
import java.util.logging.Handler; |
| 15 | 12 |
import java.util.logging.Level; |
| 16 | 13 |
import java.util.logging.LogRecord; |
| ... | ... | |
| 31 | 28 |
import org.eclipse.jface.preference.IPreferenceNode; |
| 32 | 29 |
import org.eclipse.jface.preference.PreferenceManager; |
| 33 | 30 |
import org.eclipse.jface.util.Util; |
| 34 |
import org.eclipse.jface.viewers.ArrayContentProvider; |
|
| 35 |
import org.eclipse.jface.viewers.LabelProvider; |
|
| 36 | 31 |
import org.eclipse.osgi.util.NLS; |
| 37 | 32 |
import org.eclipse.swt.SWT; |
| 38 | 33 |
import org.eclipse.swt.graphics.Color; |
| 39 |
import org.eclipse.swt.widgets.DirectoryDialog; |
|
| 40 | 34 |
import org.eclipse.swt.widgets.Display; |
| 41 | 35 |
import org.eclipse.swt.widgets.Event; |
| 42 | 36 |
import org.eclipse.swt.widgets.Shell; |
| ... | ... | |
| 54 | 48 |
import org.eclipse.ui.console.IOConsole; |
| 55 | 49 |
import org.eclipse.ui.console.IOConsoleInputStream; |
| 56 | 50 |
import org.eclipse.ui.console.IOConsoleOutputStream; |
| 57 |
import org.eclipse.ui.dialogs.ListSelectionDialog; |
|
| 58 | 51 |
import org.eclipse.ui.handlers.IHandlerService; |
| 59 | 52 |
import org.eclipse.ui.internal.IPreferenceConstants; |
| 60 | 53 |
import org.eclipse.ui.internal.WorkbenchPlugin; |
| ... | ... | |
| 72 | 65 |
import org.txm.rcp.commands.OpenWelcomePage; |
| 73 | 66 |
import org.txm.rcp.commands.RecoverCorporaFromInstalls; |
| 74 | 67 |
import org.txm.rcp.commands.RestartTXM; |
| 75 |
import org.txm.rcp.commands.workspace.LoadBinaryCorporaDirectory; |
|
| 76 | 68 |
import org.txm.rcp.handlers.scripts.ExecuteGroovyScript; |
| 77 | 69 |
import org.txm.rcp.messages.TXMUIMessages; |
| 78 | 70 |
import org.txm.rcp.p2.plugins.TXMUpdateHandler; |
| ... | ... | |
| 81 | 73 |
import org.txm.rcp.utils.JobHandler; |
| 82 | 74 |
import org.txm.rcp.utils.SWTEditorsUtils; |
| 83 | 75 |
import org.txm.utils.BundleUtils; |
| 84 |
import org.txm.utils.DeleteDir; |
|
| 85 | 76 |
import org.txm.utils.io.IOUtils; |
| 86 | 77 |
import org.txm.utils.logger.Log; |
| 87 | 78 |
|
| ... | ... | |
| 157 | 148 |
engine.setTheme(theme, true); |
| 158 | 149 |
} |
| 159 | 150 |
|
| 151 |
File lockFile; |
|
| 160 | 152 |
/** |
| 161 | 153 |
* initialization code done after the splash screen call a job which does the |
| 162 | 154 |
* post installation the TXMHOME, checks the TreeTagger and finally |
| ... | ... | |
| 205 | 197 |
|
| 206 | 198 |
// CREATE THE CLOSE CONTROL FILE |
| 207 | 199 |
String rootPath = Platform.getInstanceLocation().getURL().toURI().getPath(); |
| 208 |
File lockFile = new File(rootPath, "txm_was_not_closed_correctly.lock"); |
|
| 200 |
lockFile = new File(rootPath, "txm_was_not_closed_correctly.lock"); |
|
| 201 |
Log.fine("Lock file path: "+lockFile);
|
|
| 209 | 202 |
if (lockFile.exists()) { // the close control file was not deleted //$NON-NLS-1$
|
| 210 | 203 |
lockFile.delete(); //$NON-NLS-1$ |
| 211 | 204 |
|
| ... | ... | |
| 526 | 519 |
|
| 527 | 520 |
callStopScript(); |
| 528 | 521 |
|
| 529 |
new File("txm_was_not_closed_correctly.lock").delete(); //$NON-NLS-1$
|
|
| 522 |
if (lockFile != null) {
|
|
| 523 |
lockFile.delete(); //$NON-NLS-1$ |
|
| 524 |
} |
|
| 530 | 525 |
} |
| 531 | 526 |
|
| 532 | 527 |
/** |
Formats disponibles : Unified diff