git://source.jalview.org
/
jalview.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
e245254
)
Add test case if code version not found
author
amwaterhouse
<Andrew Waterhouse>
Mon, 11 Jul 2005 13:48:03 +0000
(13:48 +0000)
committer
amwaterhouse
<Andrew Waterhouse>
Mon, 11 Jul 2005 13:48:03 +0000
(13:48 +0000)
src/jalview/bin/Cache.java
patch
|
blob
|
history
diff --git
a/src/jalview/bin/Cache.java
b/src/jalview/bin/Cache.java
index
d4c7e5d
..
8e5e240
100755
(executable)
--- a/
src/jalview/bin/Cache.java
+++ b/
src/jalview/bin/Cache.java
@@
-90,11
+90,22
@@
public class Cache
catch (Exception ex)
\r
{
\r
System.out.println("Error reading build details: "+ex);
\r
catch (Exception ex)
\r
{
\r
System.out.println("Error reading build details: "+ex);
\r
+ applicationProperties.remove("VERSION");
\r
}
\r
\r
String jnlpVersion = System.getProperty("jalview.version");
\r
String codeVersion = getProperty("VERSION");
\r
\r
}
\r
\r
String jnlpVersion = System.getProperty("jalview.version");
\r
String codeVersion = getProperty("VERSION");
\r
\r
+ if(codeVersion==null)
\r
+ {
\r
+ // THIS SHOULD ONLY BE THE CASE WHEN TESTING!!
\r
+ codeVersion = "Test";
\r
+ jnlpVersion = "Test";
\r
+ setProperty("jalview.version", jnlpVersion);
\r
+ setProperty("VERSION", codeVersion);
\r
+ }
\r
+
\r
+
\r
// jnlpVersion will be null if we're using InstallAnywhere
\r
if(jnlpVersion==null)
\r
{
\r
// jnlpVersion will be null if we're using InstallAnywhere
\r
if(jnlpVersion==null)
\r
{
\r
@@
-112,7
+123,7
@@
public class Cache
setProperty("jalview.version", line);
\r
}
\r
}catch(Exception ex)
\r
setProperty("jalview.version", line);
\r
}
\r
}catch(Exception ex)
\r
- {setProperty("jalview.version", codeVersion);}
\r
+ { setProperty("jalview.version", codeVersion); }
\r
}
\r
}
\r
\r
}
\r
}
\r
\r