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 (from parent 1:
df111c6
)
JAL-629 Change getdown not to add -open argument
author
Ben Soares
<b.soares@dundee.ac.uk>
Wed, 11 Oct 2023 12:35:26 +0000
(13:35 +0100)
committer
Ben Soares
<b.soares@dundee.ac.uk>
Wed, 11 Oct 2023 12:35:26 +0000
(13:35 +0100)
13 files changed:
getdown/lib/FJVL_VERSION
patch
|
blob
|
history
getdown/lib/JVL_VERSION
patch
|
blob
|
history
getdown/lib/getdown-core.jar
patch
|
blob
|
history
getdown/lib/getdown-launcher-local.jar
patch
|
blob
|
history
getdown/lib/getdown-launcher.jar
patch
|
blob
|
history
getdown/src/getdown/ant/pom.xml
patch
|
blob
|
history
getdown/src/getdown/core/pom.xml
patch
|
blob
|
history
getdown/src/getdown/core/src/main/java/com/threerings/getdown/data/Application.java
patch
|
blob
|
history
getdown/src/getdown/launcher/pom.xml
patch
|
blob
|
history
getdown/src/getdown/mvn_cmd
patch
|
blob
|
history
getdown/src/getdown/pom.xml
patch
|
blob
|
history
j11lib/getdown-core.jar
patch
|
blob
|
history
j8lib/getdown-core.jar
patch
|
blob
|
history
diff --git
a/getdown/lib/FJVL_VERSION
b/getdown/lib/FJVL_VERSION
index
25d39f4
..
2d83e61
100644
(file)
--- a/
getdown/lib/FJVL_VERSION
+++ b/
getdown/lib/FJVL_VERSION
@@
-1
+1
@@
-1.8.3-1.3.0_FJVL
+1.8.3-1.3.1_FJVL
diff --git
a/getdown/lib/JVL_VERSION
b/getdown/lib/JVL_VERSION
index
12110b2
..
7d618e2
100644
(file)
--- a/
getdown/lib/JVL_VERSION
+++ b/
getdown/lib/JVL_VERSION
@@
-1
+1
@@
-1.8.3-1.3.0_JVL
+1.8.3-1.3.1_JVL
diff --git
a/getdown/lib/getdown-core.jar
b/getdown/lib/getdown-core.jar
index
fb8f1bc
..
3fc97b5
100644
(file)
Binary files a/getdown/lib/getdown-core.jar and b/getdown/lib/getdown-core.jar differ
diff --git
a/getdown/lib/getdown-launcher-local.jar
b/getdown/lib/getdown-launcher-local.jar
index
c74dcc5
..
6ba0a6d
100644
(file)
Binary files a/getdown/lib/getdown-launcher-local.jar and b/getdown/lib/getdown-launcher-local.jar differ
diff --git
a/getdown/lib/getdown-launcher.jar
b/getdown/lib/getdown-launcher.jar
index
e1f1726
..
7c75a34
100644
(file)
Binary files a/getdown/lib/getdown-launcher.jar and b/getdown/lib/getdown-launcher.jar differ
diff --git
a/getdown/src/getdown/ant/pom.xml
b/getdown/src/getdown/ant/pom.xml
index
d8bb7e9
..
4c91f74
100644
(file)
--- a/
getdown/src/getdown/ant/pom.xml
+++ b/
getdown/src/getdown/ant/pom.xml
@@
-4,7
+4,7
@@
<parent>
<groupId>com.threerings.getdown</groupId>
<artifactId>getdown</artifactId>
<parent>
<groupId>com.threerings.getdown</groupId>
<artifactId>getdown</artifactId>
- <version>1.8.3-1.3.0_FJVL</version>
+ <version>1.8.3-1.3.1_FJVL</version>
</parent>
<artifactId>getdown-ant</artifactId>
</parent>
<artifactId>getdown-ant</artifactId>
diff --git
a/getdown/src/getdown/core/pom.xml
b/getdown/src/getdown/core/pom.xml
index
6126686
..
2e43522
100644
(file)
--- a/
getdown/src/getdown/core/pom.xml
+++ b/
getdown/src/getdown/core/pom.xml
@@
-4,7
+4,7
@@
<parent>
<groupId>com.threerings.getdown</groupId>
<artifactId>getdown</artifactId>
<parent>
<groupId>com.threerings.getdown</groupId>
<artifactId>getdown</artifactId>
- <version>1.8.3-1.3.0_FJVL</version>
+ <version>1.8.3-1.3.1_FJVL</version>
</parent>
<artifactId>getdown-core</artifactId>
</parent>
<artifactId>getdown-core</artifactId>
diff --git
a/getdown/src/getdown/core/src/main/java/com/threerings/getdown/data/Application.java
b/getdown/src/getdown/core/src/main/java/com/threerings/getdown/data/Application.java
index
9d9fe14
..
435ebbd
100644
(file)
--- a/
getdown/src/getdown/core/src/main/java/com/threerings/getdown/data/Application.java
+++ b/
getdown/src/getdown/core/src/main/java/com/threerings/getdown/data/Application.java
@@
-1137,7
+1137,6
@@
public class Application
String query = jalviewUri.getQuery();
_appargs.clear();
String query = jalviewUri.getQuery();
_appargs.clear();
- _appargs.add("-open");
if (host != null && host.length() > 0) {
URL newUrl = new URL(
(https?"https":"http")
if (host != null && host.length() > 0) {
URL newUrl = new URL(
(https?"https":"http")
@@
-1253,8
+1252,6
@@
public class Application
}
if (ext != null && LOCATOR_FILE_EXTENSION.equals(ext.toLowerCase(Locale.ROOT))) {
// this file extension should have been dealt with in Getdown class
}
if (ext != null && LOCATOR_FILE_EXTENSION.equals(ext.toLowerCase(Locale.ROOT))) {
// this file extension should have been dealt with in Getdown class
- } else {
- _appargs.add(0, "-open");
}
}
}
}
diff --git
a/getdown/src/getdown/launcher/pom.xml
b/getdown/src/getdown/launcher/pom.xml
index
4374899
..
c6b9ff3
100644
(file)
--- a/
getdown/src/getdown/launcher/pom.xml
+++ b/
getdown/src/getdown/launcher/pom.xml
@@
-4,7
+4,7
@@
<parent>
<groupId>com.threerings.getdown</groupId>
<artifactId>getdown</artifactId>
<parent>
<groupId>com.threerings.getdown</groupId>
<artifactId>getdown</artifactId>
- <version>1.8.3-1.3.0_FJVL</version>
+ <version>1.8.3-1.3.1_FJVL</version>
</parent>
<artifactId>getdown-launcher</artifactId>
</parent>
<artifactId>getdown-launcher</artifactId>
diff --git
a/getdown/src/getdown/mvn_cmd
b/getdown/src/getdown/mvn_cmd
index
ba092a7
..
10942f8
100755
(executable)
--- a/
getdown/src/getdown/mvn_cmd
+++ b/
getdown/src/getdown/mvn_cmd
@@
-3,7
+3,7
@@
if [ x$JVLVERSION != x ]; then
export VERSION=$JVLVERSION
else
if [ x$JVLVERSION != x ]; then
export VERSION=$JVLVERSION
else
- export VERSION=1.8.3-1.3.0_JVL
+ export VERSION=1.8.3-1.3.1_JVL
fi
if [ x${VERSION%_JVL} = x$VERSION ]; then
fi
if [ x${VERSION%_JVL} = x$VERSION ]; then
diff --git
a/getdown/src/getdown/pom.xml
b/getdown/src/getdown/pom.xml
index
51e9514
..
cf32333
100644
(file)
--- a/
getdown/src/getdown/pom.xml
+++ b/
getdown/src/getdown/pom.xml
@@
-10,7
+10,7
@@
<groupId>com.threerings.getdown</groupId>
<artifactId>getdown</artifactId>
<packaging>pom</packaging>
<groupId>com.threerings.getdown</groupId>
<artifactId>getdown</artifactId>
<packaging>pom</packaging>
- <version>1.8.3-1.3.0_FJVL</version>
+ <version>1.8.3-1.3.1_FJVL</version>
<name>getdown</name>
<description>An application installer and updater.</description>
<name>getdown</name>
<description>An application installer and updater.</description>
diff --git
a/j11lib/getdown-core.jar
b/j11lib/getdown-core.jar
index
fb8f1bc
..
3fc97b5
100644
(file)
Binary files a/j11lib/getdown-core.jar and b/j11lib/getdown-core.jar differ
diff --git
a/j8lib/getdown-core.jar
b/j8lib/getdown-core.jar
index
fb8f1bc
..
3fc97b5
100644
(file)
Binary files a/j8lib/getdown-core.jar and b/j8lib/getdown-core.jar differ