Révision 1534

tmp/org.txm.core/src/java/org/txm/core/results/TXMResult.java (revision 1534)
74 74
	public static final DateFormat PRETTY_TIME_FORMAT = new SimpleDateFormat("YYYY/MM/dd HH:mm:ss");
75 75
	public static final DateFormat PRETTY_LOCALIZED_TIME_FORMAT = new SimpleDateFormat("dd MMMM yyyy, HH'h'mm", Locale.getDefault());
76 76
	public static final String UUID_PREFIX = "txm_res_"; //$NON-NLS-1$
77
	public static final Pattern FILE_NAME_PATTERN = Pattern.compile("[^a-zA-Z0-9\\.-]+"); //$NON-NLS-1$
77
	public static final Pattern FILE_NAME_PATTERN = Pattern.compile("[^a-zA-Z0-9\\.-_]+"); //$NON-NLS-1$
78 78
	public static final String UNDERSCORE = "_";
79 79

  
80 80
	/**
tmp/org.txm.core/src/java/org/txm/objects/Project.java (revision 1534)
1168 1168

  
1169 1169
			try {
1170 1170

  
1171
				Log.finest("Toolbox.initialize(): checking result type linked to node path " + parametersNodePath);
1171
				//Log.finest("Toolbox.initialize(): checking result type linked to node path " + parametersNodePath);
1172 1172

  
1173 1173
				String className = TXMPreferences.preferencesRootNode.node(parametersNodePath).get("class", ""); //$NON-NLS-1$
1174 1174

  
......
1176 1176
					continue;
1177 1177
				}
1178 1178

  
1179
				Log.finest("Toolbox.initialize(): loading from result node path " + parametersNodePath);
1179
				Log.fine("Toolbox.initialize(): loading from result node path " + parametersNodePath);
1180 1180
				//Log.finest("Toolbox.initialize(): class = " + TXMPreferences.getString("class", nodeQualifier));
1181 1181
				//TXMPreferences.dump();
1182 1182

  
tmp/org.txm.annotation.kr.core/src/org/txm/annotation/kr/core/KRAnnotationEngine.java (revision 1534)
421 421
		
422 422
		if (r instanceof MainCorpus && "clean".equals(state)) {
423 423
			MainCorpus c = (MainCorpus)r;
424
			if (!c.getProjectDirectory().exists()) {
424
			if (c.getProjectDirectory() == null || !c.getProjectDirectory().exists()) {
425 425
				return;
426 426
			}
427 427
			File buildDirectory = new File(c.getProjectDirectory(), "temporary_annotations/"+c.getID());
tmp/org.txm.rcp/src/main/java/org/txm/rcp/commands/workspace/LoadBinaryCorpus.java (revision 1534)
356 356

  
357 357
		Project project = null;
358 358
		File paramFile = new File(destDir, ".settings");
359
		if (paramFile.exists() && paramFile.isDirectory()) {
359
		File dotProjectFile = new File(destDir, ".project");
360
		if (paramFile.exists() && paramFile.isDirectory() && dotProjectFile.exists() && dotProjectFile.isFile()) {
361
			System.out.println(NLS.bind(TXMUIMessages.loadingTheP0BinaryCorpusAsATXM080Corpus, destDir));
360 362
			project = Load080BinaryCorpus.loadBinaryCorpusAsDirectory(destDir);
361 363
			//			continue;
364
			if (project != null) {
365
				return project;
366
			}
362 367
		}
363 368

  
364 369
		paramFile = new File(destDir, "import.xml");
365 370
		if (paramFile.exists()) {
371
			System.out.println(NLS.bind(TXMUIMessages.loadingTheP0BinaryCorpusAsATXM079Corpus, destDir));
366 372
			project = Load079BinaryCorpus.loadBinaryCorpusAsDirectory(destDir, null);
367 373
			//			continue;
368 374
		}
tmp/org.txm.rcp/src/main/java/org/txm/rcp/editors/imports/sections/InfosSection.java (revision 1534)
44 44
		});
45 45

  
46 46
		Composite sectionClient = toolkit.createComposite(this.section);
47
		TableWrapData gdatac = new TableWrapData();
48
		gdatac.colspan = 2;
49
		sectionClient.setLayoutData(gdatac);
50
		
47 51
		TableWrapLayout slayout = new TableWrapLayout();
48 52
		slayout.numColumns = 1;
49 53
		sectionClient.setLayout(slayout);

Formats disponibles : Unified diff