Révision 1794

tmp/org.txm.rcp/src/main/java/org/txm/rcp/commands/workspace/LoadBinaryCorporaDirectory.java (revision 1794)
51 51 
import org.eclipse.ui.handlers.HandlerUtil;
52 52 
import org.txm.Toolbox;
53 53 
import org.txm.core.engines.EngineType;
54 
import org.txm.core.messages.TXMCoreMessages;
54 55 
import org.txm.objects.Project;
55 56 
import org.txm.rcp.StatusLine;
56 57 
import org.txm.rcp.commands.RestartTXM;
......
331 332
332 333 
				Project project = Toolbox.workspace.getProject(corpusDirectory.getName().toUpperCase());
333 334 
				if (project != null) {
334 
					Log.warning("A corpus named "+corpusDirectory.getName().toUpperCase()+" already exists, abandoning the loading of "+corpusDirectory);
335 
					Log.warning(TXMCoreMessages.bind("A corpus named {0} already exists, loading of {1} canceled.", corpusDirectory.getName().toUpperCase(), corpusDirectory));
335 336 
					continue;
336 337 
				}
337 338
tmp/org.txm.rcp/src/main/java/org/txm/rcp/commands/workspace/LoadBinaryCorpus.java (revision 1794)
85 85 
		// create dialog to get the corpus directory
86 86 
		Shell shell = HandlerUtil.getActiveWorkbenchWindowChecked(event).getShell();
87 87 

  		





  88
  
  
    
		String url = event.getParameter("url");


  		





  
  88
  
    
		String url = event.getParameter("url"); //$NON-NLS-1$


  		





  89
  89
  
    

  		





  90
  
  
    
		if (url != null && url.length() > 0 && url.endsWith(".txm")) {


  		





  
  90
  
    
		if (url != null && url.length() > 0 && url.endsWith(".txm")) { //$NON-NLS-1$


  		





  91
  91
  
    
			zipFile = new File(url);


  		





  92
  
  
    
			if (!zipFile.exists() && url.startsWith("http")) {


  		





  
  92
  
    
			if (!zipFile.exists() && url.startsWith("http")) { //$NON-NLS-1$


  		





  93
  93
  
    
				try {


  		





  94
  94
  
    
					URL u = new URL(url);


  		





  95
  95
  
    
					File f = new File(url);


  		





  ......




  106
  106
  
    
			}


  		





  107
  107
  
    
		} else {


  		





  108
  108
  
    
			FileDialog dialog = new FileDialog(shell, SWT.OPEN);


  		





  109
  
  
    
			dialog.setFilterExtensions(new String[]{"*.txm"});


  		





  
  109
  
    
			dialog.setFilterExtensions(new String[]{"*.txm"}); //$NON-NLS-1$


  		





  110
  110
  
    
			if (LastOpened.getFile(ID) != null) {


  		





  111
  111
  
    
				dialog.setFilterPath(LastOpened.getFolder(ID));


  		





  112
  112
  
    
				dialog.setFileName(LastOpened.getFile(ID));


  		












Formats disponibles :
  Unified diff