Révision 3938

TXM/trunk/bundles/org.txm.annotation.kr.rcp/src/org/txm/annotation/kr/rcp/commands/SaveAnnotationsAndUpdateCorpus.java (revision 3938)
114 114 
				return null;
115 115 
			}
116 116
117 
			Log.info(NLS.bind(Messages.SaveP0Annotations, fcorpus.getName()));
117 
			Log.info(NLS.bind(Messages.SaveP0Annotations, fcorpus.getID()));
118 118 
			JobHandler job = SaveAnnotations.save(fcorpus);
119 119 
			if (job == null) {
120 120 
				return null;
TXM/trunk/bundles/org.txm.annotation.kr.rcp/src/org/txm/annotation/kr/rcp/edition/WordAnnotationToolbar.java (revision 3938)
410 410 
		typesList.clear();
411 411 
		Log.fine("Corpus KRs: " + krs); //$NON-NLS-1$
412 412
413 
		currentKnowledgeRepository = KnowledgeRepositoryManager.getKnowledgeRepository(corpus.getMainCorpus().getName());
413 
		currentKnowledgeRepository = KnowledgeRepositoryManager.getKnowledgeRepository(corpus.getMainCorpus().getID());
414 414 
		if (currentKnowledgeRepository == null) {
415 415 
			HashMap<String, HashMap<String, ?>> conf = new HashMap<>();
416 416 
			HashMap<String, String> access = new HashMap<>();
......
422 422
423 423 
			access.put("mode", DatabasePersistenceManager.ACCESS_FILE); //$NON-NLS-1$
424 424 
			access.put("version", "0"); //$NON-NLS-1$ //$NON-NLS-2$
425 
			currentKnowledgeRepository = KnowledgeRepositoryManager.createKnowledgeRepository(corpus.getMainCorpus().getName(), conf);
425 
			currentKnowledgeRepository = KnowledgeRepositoryManager.createKnowledgeRepository(corpus.getMainCorpus().getID(), conf);
426 426 
			KnowledgeRepositoryManager.registerKnowledgeRepository(currentKnowledgeRepository);
427 
			// KRAnnotationEngine.registerKnowledgeRepositoryName(corpus, corpus.getMainCorpus().getName());
427 
			// KRAnnotationEngine.registerKnowledgeRepositoryName(corpus, corpus.getMainCorpus().getID());
428 428 
		}
429 429
430 430 
		List<WordProperty> wordProperties = corpus.getProperties();
TXM/trunk/bundles/org.txm.annotation.kr.rcp/src/org/txm/annotation/kr/rcp/concordance/SimpleKRAnnotation.java (revision 3938)
194 194 
		typesList.clear();
195 195 
		Log.fine("Corpus KRs: " + krs); //$NON-NLS-1$
196 196
197 
		KnowledgeRepository kr = KnowledgeRepositoryManager.getKnowledgeRepository(corpus.getMainCorpus().getName());
197 
		KnowledgeRepository kr = KnowledgeRepositoryManager.getKnowledgeRepository(corpus.getMainCorpus().getID());
198 198 
		if (kr == null) {
199 199 
			HashMap<String, HashMap<String, ?>> conf = new HashMap<>();
200 
			kr = KnowledgeRepositoryManager.createKnowledgeRepository(corpus.getMainCorpus().getName(), conf);
200 
			kr = KnowledgeRepositoryManager.createKnowledgeRepository(corpus.getMainCorpus().getID(), conf);
201 201 
		}
202 202
203 203 
		currentKnowledgeRepository = kr;
TXM/trunk/bundles/org.txm.annotation.kr.rcp/src/org/txm/annotation/kr/rcp/concordance/KRAnnotation.java (revision 3938)
158 158 
		TableViewer viewer = this.editor.getLineTableViewer();
159 159
160 160 
		// RESULT
161
162 161 
		if (position < 0) {
163 162 
			position = 3 + extension.getNumberOfAnnotationArea(); // after keyword column and previous annotation columns
164 163 
		}
TXM/trunk/bundles/org.txm.annotation.kr.rcp/src/org/txm/annotation/kr/rcp/concordance/WordAnnotationToolbar.java (revision 3938)
488 488 
		typesList.clear();
489 489 
		Log.fine("Corpus KRs: " + krs); //$NON-NLS-1$
490 490
491 
		currentKnowledgeRepository = KnowledgeRepositoryManager.getKnowledgeRepository(corpus.getMainCorpus().getName());
491 
		currentKnowledgeRepository = KnowledgeRepositoryManager.getKnowledgeRepository(corpus.getMainCorpus().getID());
492 492 
		if (currentKnowledgeRepository == null) {
493 493 
			HashMap<String, HashMap<String, ?>> conf = new HashMap<>();
494 494 
			HashMap<String, String> access = new HashMap<>();
......
500 500
501 501 
			access.put("mode", DatabasePersistenceManager.ACCESS_FILE); //$NON-NLS-1$
502 502 
			access.put("version", "0"); //$NON-NLS-1$ //$NON-NLS-2$
503 
			currentKnowledgeRepository = KnowledgeRepositoryManager.createKnowledgeRepository(corpus.getMainCorpus().getName(), conf);
503 
			currentKnowledgeRepository = KnowledgeRepositoryManager.createKnowledgeRepository(corpus.getMainCorpus().getID(), conf);
504 504 
			KnowledgeRepositoryManager.registerKnowledgeRepository(currentKnowledgeRepository);
505 
			// KRAnnotationEngine.registerKnowledgeRepositoryName(corpus, corpus.getMainCorpus().getName());
505 
			// KRAnnotationEngine.registerKnowledgeRepositoryName(corpus, corpus.getMainCorpus().getID());
506 506 
		}
507 507
508 508 
		List<WordProperty> wordProperties = corpus.getProperties();
......
712 712
713 713 
					@Override
714 714 
					public String getColumnText(Object element, int columnIndex) {
715 
						if (element instanceof TypedValue)
715 
						if (element instanceof TypedValue) {
716 716 
							return ((TypedValue) element).getId();
717 
						}
717 718 
						return element.toString();
718 719 
					}
719 720 
				});
......
888 889
889 890 
		LocalKnowledgeRepository kr = (LocalKnowledgeRepository) currentKnowledgeRepository;
890 891 
		if (typeName == null) typeName = ""; //$NON-NLS-1$
891 
		InputDialog dialog = new InputDialog(e.widget.getDisplay().getActiveShell(), Messages.nouvelleProprit, Messages.nomDeLaPropritPatternEqualsazaz09Plus, typeName,
892 
				null);
892 
		InputDialog dialog = new InputDialog(e.widget.getDisplay().getActiveShell(), Messages.nouvelleProprit, Messages.nomDeLaPropritPatternEqualsazaz09Plus, typeName, null);
893 893 
		if (dialog.open() == InputDialog.OK) {
894 894 
			String name = dialog.getValue();
895 895 
			if (name.trim().length() == 0) return;

Formats disponibles : Unified diff