Revision 1117

tmp/org.txm.rcp/src/main/java/org/txm/rcp/handlers/scripts/ExecuteImportScript.java (revision 1117)
152 152
		}
153 153
		
154 154
		if (CQPSearchEngine.isInitialized()) Toolbox.getEngineManager(EngineType.SEARCH).stopEngines();
155
		
155 156
		JobHandler jobhandler = new JobHandler(TXMUIMessages.RunGroovyScript_0
156 157
				+ project.getImportModuleName()) { //$NON-NLS-1$
157 158
			@Override
tmp/org.txm.rcp/src/main/java/org/txm/rcp/commands/queryview/Copy.java (revision 1117)
64 64
	{
65 65
		String query = ""; //$NON-NLS-1$
66 66
		List list = selection.toList();
67
		if (list.size() > 1)
68
		{
69
			for(Object q : selection.toList())
70
			{
71
				if (q instanceof SavedQuery)
72
				{
67
		if (list.size() > 1) {
68
			for(Object q : selection.toList()) {
69
				if (q instanceof SavedQuery) {
73 70
					if (query.length() != 0)
74 71
						query +=" | "; //$NON-NLS-1$
75 72
					query += "("+((SavedQuery)q).getQuery()+")"; //$NON-NLS-1$ //$NON-NLS-2$
tmp/org.txm.core/src/java/org/txm/Toolbox.java (revision 1117)
310 310
			Log.info("Toolbox.initialize(): loading project " + projects[i].getName() + "...");
311 311
			Log.info("Toolbox.initialize(): " + resultNodePaths.size() + " node(s) found in project " + projects[i].getName() + "...");
312 312
			
313
			
314 313
			for (String parametersNodePath : resultNodePaths) {
315 314

  
316 315
				// skip non-TXMResult preference node
......
643 642
			return false;
644 643
		}
645 644

  
646
		File workspaceFile = new File(txmhomedir, "corpora/default.xml");
645
		File workspaceFile = new File(txmhomedir, "corpora/.metadata");
647 646
		Version currentVersion = BundleUtils.getBundleVersion("org.txm.core");
648 647
		Log.info("Current toolbox version: " + currentVersion + ".");
649 648
		String installedVersionString = getPreference(TBXPreferences.VERSION);
tmp/org.txm.core/src/java/org/txm/core/preferences/TBXPreferences.java (revision 1117)
144 144
		preferences.put(TBXPreferences.LANG, Locale.getDefault().getCountry()); //$NON-NLS-1$
145 145
		preferences.put(TBXPreferences.ENCODING, DEFAULT_ENCODING); //$NON-NLS-1$
146 146
		preferences.put(TBXPreferences.DEFAULT_EDITION, "default"); //$NON-NLS-1$
147
		preferences.putBoolean(TBXPreferences.ANNOTATE, true);
147
		preferences.putBoolean(TBXPreferences.ANNOTATE, false);
148 148
		
149 149
		preferences.put(TBXPreferences.METADATA_ENCODING, "UTF-8"); //$NON-NLS-1$
150 150
		preferences.put(TBXPreferences.METADATA_TXTSEPARATOR, "\""); //$NON-NLS-1$

Also available in: Unified diff