1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
|
Author: Gert Wollny <gewo@debian.org>
Description: Make code compatible with java 1.7
Debian-Bug: https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=872945
Last-Changed: 2023-11-17
--- a/tkgui/CMakeLists.txt
+++ b/tkgui/CMakeLists.txt
@@ -7,7 +7,7 @@
add_custom_command(
OUTPUT ${DICOMSCOPE_SOURCE_DIR}/DICOMscope/DICOMscope.class
- COMMAND ${JAVA_COMPILE} ARGS -encoding Latin1 -d ../DICOMscope -classpath . -source 1.5 -target 1.5 dicomscope/DICOMscope.java
+ COMMAND ${JAVA_COMPILE} ARGS -encoding Latin1 -d ../DICOMscope -classpath . -source $ENV{JAVA_COMPAT_LEVEL} -target $ENV{JAVA_COMPAT_LEVEL} dicomscope/DICOMscope.java
WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}
DEPENDS ${javafiles}
COMMENT "javac *.java"
--- a/tkgui/processCommunication/ProcessTable.java
+++ b/tkgui/processCommunication/ProcessTable.java
@@ -211,7 +211,7 @@
*/
public void swapRows(int row1, int row2)
{
- Object dummy = dataVector.elementAt(row1);
+ Vector dummy = (Vector)dataVector.elementAt(row1);
dataVector.setElementAt(dataVector.elementAt(row2), row1);
dataVector.setElementAt(dummy, row2);
}
--- a/tkgui/viewer/sr/VerificationDialog.java
+++ b/tkgui/viewer/sr/VerificationDialog.java
@@ -289,7 +289,7 @@
*/
public void swapRows(int row1, int row2)
{
- Object dummy = dataVector.elementAt(row1);
+ Vector dummy = (Vector)dataVector.elementAt(row1);
dataVector.setElementAt(dataVector.elementAt(row2), row1);
dataVector.setElementAt(dummy, row2);
}
|
