diff options
| author | Marko Živković <[email protected]> | 2014-12-22 20:30:53 +0000 |
|---|---|---|
| committer | Marko Živković <[email protected]> | 2014-12-22 20:30:53 +0000 |
| commit | be328af1b87f9914bbc9da546e546c838a5ccd90 (patch) | |
| tree | e957a63545b5476d2388f28f4e40e02f5e92c461 | |
| parent | dd42f88d76dba35ae47113b321655a53a1c05316 (diff) | |
Update Version Information
git-svn-id: https://svn.code.sf.net/p/xlogo4schools/svn/trunk@22 3b0d7934-f7ef-4143-9606-b51f2e2281fd
| -rw-r--r-- | logo/build.xml | 2 | ||||
| -rw-r--r-- | logo/src/langage.properties | 2 | ||||
| -rw-r--r-- | logo/src/xlogo/gpl/x4s_info.html | 2 | ||||
| -rw-r--r-- | logo/src/xlogo/storage/global/GlobalConfig.java | 13 |
4 files changed, 14 insertions, 5 deletions
diff --git a/logo/build.xml b/logo/build.xml index 81b1701..3845532 100644 --- a/logo/build.xml +++ b/logo/build.xml @@ -35,7 +35,7 @@ <!-- Version for this Build --> - <property name="version" value="0.9.04beta-2014-12-16"/> + <property name="version" value="0.9.05beta-2014-12-22"/> <!-- ================================= default target: deploy diff --git a/logo/src/langage.properties b/logo/src/langage.properties index efb2ab7..f0f99dc 100644 --- a/logo/src/langage.properties +++ b/logo/src/langage.properties @@ -394,7 +394,7 @@ logo.file.has.error=This file contains errors and it cannot be executed. error.while.creating.editor=Unfortunately I could not create the editor for the following reason : error.no.error=Hurray, the Procedure has no errors. Why do I bother you? Just to be consistent with my enum. -error.missing.to=The document should always start with 'to' +error.missing.to=A program should always start with 'to' error.missing.name=I'm missing a procedure name. error.name.is.number=A procedure name cannot be a number. error.name.special=Procedure names should not contain special characters. diff --git a/logo/src/xlogo/gpl/x4s_info.html b/logo/src/xlogo/gpl/x4s_info.html index acbfc7f..a6faa6e 100644 --- a/logo/src/xlogo/gpl/x4s_info.html +++ b/logo/src/xlogo/gpl/x4s_info.html @@ -5,7 +5,7 @@ <body>
<h2>
XLogo4Schools</h2>
- Version 0.9.04beta-2014-12-16
+ Version 0.9.05beta-2014-12-22
<p>
XLogo4Schools is a modified, extended and reengineered version of Loïc Le Coq's XLogo. It is the result of a six month Bachelor's thesis conducted by Marko Živković at ETHZ, D-INFK department from March 2013 until September 2013.</p>
diff --git a/logo/src/xlogo/storage/global/GlobalConfig.java b/logo/src/xlogo/storage/global/GlobalConfig.java index d78ee51..66a26b5 100644 --- a/logo/src/xlogo/storage/global/GlobalConfig.java +++ b/logo/src/xlogo/storage/global/GlobalConfig.java @@ -33,6 +33,7 @@ import java.io.UnsupportedEncodingException; import java.security.MessageDigest;
import java.security.NoSuchAlgorithmException;
import java.util.ArrayList;
+import java.util.List;
import java.util.Map;
import java.util.Map.Entry;
import java.util.TreeMap;
@@ -574,9 +575,17 @@ public class GlobalConfig extends StorableObject implements Serializable { * */
public boolean isUSBDrive(String workspaceName) {
- for (USBStorageDevice device : driveDetector.getRemovableDevices()) {
- if (workspaceName.equals(device.getSystemDisplayName())) { return true; }
+ List<USBStorageDevice> devices = driveDetector.getRemovableDevices();
+ logger.trace("Is '" + workspaceName + "' on a USB Drive?");
+ for (USBStorageDevice device : devices) {
+ if (workspaceName.equals(device.getSystemDisplayName())) {
+ logger.trace("\t = Yes, corresponding USB Device found.");
+ return true;
+ } else {
+ logger.trace("\t Does not corresponding to " + device.getSystemDisplayName());
+ }
}
+ logger.trace("\t = No, could not find corresponding USB Drive.");
return false;
}
|