Révision 3936
TXM/trunk/bundles/org.txm.rcp/src/main/java/org/txm/rcp/ApplicationWorkbenchAdvisor.java (revision 3936) | ||
---|---|---|
232 | 232 |
} |
233 | 233 |
lockFile.createNewFile(); //$NON-NLS-1$ |
234 | 234 |
|
235 |
String s = getVersionLevel(); |
|
236 |
if ("STABLE".equals(RCPPreferences.getInstance().getString(RCPPreferences.UPDATE_LEVEL)) && s.length() == 0) { //$NON-NLS-1$
|
|
235 |
String s = getVersionLevel().trim();
|
|
236 |
if (s.length() == 0) { //$NON-NLS-1$ |
|
237 | 237 |
Log.info(TXMUIMessages.info_txmIsReady); |
238 | 238 |
} else { |
239 | 239 |
String s2 = TXMUIMessages.youAreUsingAnAlphaBetaVersionOfTXMItIsNotRecommendedToUseItForYourWork; |
... | ... | |
1076 | 1076 |
|
1077 | 1077 |
public static String getVersionLevel() { |
1078 | 1078 |
try { |
1079 |
URL url = Activator.getDefault().getBundle().getResource("SUBVERSION"); //$NON-NLS-1$
|
|
1079 |
URL url = BundleUtils.getBundle(Activator.class).getResource("SUBVERSION"); //$NON-NLS-1$
|
|
1080 | 1080 |
String subversion = IOUtils.getText(url, "UTF-8"); //$NON-NLS-1$ |
1081 | 1081 |
return subversion; |
1082 | 1082 |
} |
1083 | 1083 |
catch (IOException e) { |
1084 | 1084 |
e.printStackTrace(); |
1085 | 1085 |
} |
1086 |
return "STABLE"; //$NON-NLS-1$
|
|
1086 |
return ""; //$NON-NLS-1$ |
|
1087 | 1087 |
} |
1088 | 1088 |
} |
TXM/trunk/bundles/org.txm.rcp/src/main/java/org/txm/rcp/preferences/RCPPreferences.java (revision 3936) | ||
---|---|---|
74 | 74 |
|
75 | 75 |
public static final String CGU = "cgu"; //$NON-NLS-1$ |
76 | 76 |
|
77 |
public static String DISABLE_TEST_WARNING = "no_test_warning"; //$NON-NLS-1$ |
|
77 |
public static final String DISABLE_TEST_WARNING = "no_test_warning"; //$NON-NLS-1$
|
|
78 | 78 |
|
79 | 79 |
|
80 | 80 |
@Override |
TXM/trunk/bundles/org.txm.rcp/src/main/java/org/txm/rcp/editors/imports/CorpusPage.java (revision 3936) | ||
---|---|---|
1152 | 1152 |
|
1153 | 1153 |
ExecuteImportScript.executeScript(editor.project); |
1154 | 1154 |
} |
1155 |
|
|
1156 |
|
|
1157 | 1155 |
} |
1158 | 1156 |
|
1159 | 1157 |
// private void updateEditionsSection() { |
1160 | 1158 |
Formats disponibles : Unified diff