Skip to content

Commit

Permalink
Fix minor issues
Browse files Browse the repository at this point in the history
  • Loading branch information
@nroduit
nroduit committed Mar 22, 2024
1 parent 3b87f51 commit e87d2ba
Show file tree
Hide file tree
Showing 6 changed files with 76 additions and 57 deletions.
3 changes: 3 additions & 0 deletions annotations/idea/org/slf4j/annotations.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -50,6 +50,9 @@
<item name='org.slf4j.Logger void trace(java.lang.String, java.lang.Object)'>
<annotation name='org.jetbrains.annotations.NonNls'/>
</item>
<item name='org.slf4j.Logger void trace(java.lang.String, java.lang.Object, java.lang.Object)'>
<annotation name='org.jetbrains.annotations.NonNls'/>
</item>
<item name='org.slf4j.Logger void warn(java.lang.String)'>
<annotation name='org.jetbrains.annotations.NonNls'/>
</item>
Expand Down
40 changes: 20 additions & 20 deletions weasis-distributions/etc/config/base.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -444,55 +444,55 @@
"value": "true",
"description": "Start to download series immediately",
"type": "F",
"JavaType": "BOOLEAN",
"javaType": "BOOLEAN",
"category": "DICOM"
},
{
"code": "download.concurrent.series",
"value": "3",
"description": "The number of concurrently downloaded series",
"type": "A",
"JavaType": "INT",
"javaType": "INT",
"category": "DICOM"
},
{
"code": "download.concurrent.series.images",
"value": "4",
"description": "The number of concurrently downloaded images in a series",
"type": "A",
"JavaType": "INT",
"javaType": "INT",
"category": "DICOM"
},
{
"code": "weasis.color.wl.apply",
"value": "true",
"description": "Allow applying Window/Level on color images",
"type": "F",
"JavaType": "BOOLEAN",
"javaType": "BOOLEAN",
"category": "VIEWER"
},
{
"code": "weasis.level.inverse",
"value": "true",
"description": "Inverse level direction (moving the cursor down to increase brightness",
"type": "F",
"JavaType": "BOOLEAN",
"javaType": "BOOLEAN",
"category": "VIEWER"
},
{
"code": "weasis.apply.latest.pr",
"value": "false",
"description": "Apply by default the most recent Presentation State to the related image",
"type": "F",
"JavaType": "BOOLEAN",
"javaType": "BOOLEAN",
"category": "VIEWER"
},
{
"code": "weasis.force.3d",
"value": "false",
"description": "Force to detect a graphic card at every launch",
"type": "A",
"JavaType": "BOOLEAN",
"javaType": "BOOLEAN",
"category": "VIEWER"
},
{
Expand Down Expand Up @@ -528,96 +528,96 @@
"value": "true",
"description": "Show the import image toolbar and menu",
"type": "A",
"JavaType": "BOOLEAN",
"javaType": "BOOLEAN",
"category": "UI"
},
{
"code": "weasis.import.dicom",
"value": "true",
"description": "Show the DICOM import menu and dialog",
"type": "A",
"JavaType": "BOOLEAN",
"javaType": "BOOLEAN",
"category": "UI"
},
{
"code": "weasis.import.dicom.qr",
"value": "true",
"description": "Show the DICOM Q/R page in the DICOM Export dialog",
"type": "A",
"JavaType": "BOOLEAN",
"javaType": "BOOLEAN",
"category": "UI"
},
{
"code": "weasis.export.dicom",
"value": "true",
"description": "Show the DICOM export menu and dialog",
"type": "A",
"JavaType": "BOOLEAN",
"javaType": "BOOLEAN",
"category": "UI"
},
{
"code": "weasis.export.dicom.send",
"value": "true",
"description": "Show the send page in the DICOM Export dialog",
"type": "A",
"JavaType": "BOOLEAN",
"javaType": "BOOLEAN",
"category": "UI"
},
{
"code": "weasis.toolbar.mouse.buttons",
"value": "7170",
"description": "Show all mouse buttons. Sum of LEFT=1024 + MIDDLE=2048 + RIGHT=4096 + SCROLL=2. Show all:7170 and show none:0.",
"type": "A",
"JavaType": "INT",
"javaType": "INT",
"category": "UI"
},
{
"code": "weasis.all.cinetoolbar.visible",
"value": "false",
"description": "Show all the cine toolbars",
"type": "A",
"JavaType": "BOOLEAN",
"javaType": "BOOLEAN",
"category": "UI"
},
{
"code": "weasis.all.keyobjecttoolbar.visible",
"value": "false",
"description": "Show all the key object toolbars",
"type": "A",
"JavaType": "BOOLEAN",
"javaType": "BOOLEAN",
"category": "UI"
},
{
"code": "weasis-dicom-viewer2d.all.rotationtoolbar.visible",
"value": "false",
"description": "Show the rotation toolbars in DICOM 2D viewer",
"type": "A",
"JavaType": "BOOLEAN",
"javaType": "BOOLEAN",
"category": "UI"
},
{
"code": "weasis.contextmenu.lutShape",
"value": "false",
"description": "Show LUT Shape in the contextual menu",
"type": "A",
"JavaType": "BOOLEAN",
"javaType": "BOOLEAN",
"category": "UI"
},
{
"code": "weasis.contextmenu.lut",
"value": "false",
"description": "Show LUT in the contextual menu",
"type": "A",
"JavaType": "BOOLEAN",
"javaType": "BOOLEAN",
"category": "UI"
},
{
"code": "weasis.contextmenu.filter",
"value": "false",
"description": "Show Filter in the contextual menu",
"type": "A",
"JavaType": "BOOLEAN",
"javaType": "BOOLEAN",
"category": "UI"
}
]
}
}
34 changes: 17 additions & 17 deletions weasis-launcher/conf/base.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -475,31 +475,31 @@
"value": "true",
"description": "Allow applying Window/Level on color images",
"type": "F",
"JavaType": "BOOLEAN",
"javaType": "BOOLEAN",
"category": "VIEWER"
},
{
"code": "weasis.level.inverse",
"value": "true",
"description": "Inverse level direction (moving the cursor down to increase brightness",
"type": "F",
"JavaType": "BOOLEAN",
"javaType": "BOOLEAN",
"category": "VIEWER"
},
{
"code": "weasis.apply.latest.pr",
"value": "false",
"description": "Apply by default the most recent Presentation State to the related image",
"type": "F",
"JavaType": "BOOLEAN",
"javaType": "BOOLEAN",
"category": "VIEWER"
},
{
"code": "weasis.force.3d",
"value": "false",
"description": "Force to detect a graphic card at every launch",
"type": "A",
"JavaType": "BOOLEAN",
"javaType": "BOOLEAN",
"category": "VIEWER"
},
{
Expand Down Expand Up @@ -535,96 +535,96 @@
"value": "true",
"description": "Show the import image toolbar and menu",
"type": "A",
"JavaType": "BOOLEAN",
"javaType": "BOOLEAN",
"category": "UI"
},
{
"code": "weasis.import.dicom",
"value": "true",
"description": "Show the DICOM import menu and dialog",
"type": "A",
"JavaType": "BOOLEAN",
"javaType": "BOOLEAN",
"category": "UI"
},
{
"code": "weasis.import.dicom.qr",
"value": "true",
"description": "Show the DICOM Q/R page in the DICOM Export dialog",
"type": "A",
"JavaType": "BOOLEAN",
"javaType": "BOOLEAN",
"category": "UI"
},
{
"code": "weasis.export.dicom",
"value": "true",
"description": "Show the DICOM export menu and dialog",
"type": "A",
"JavaType": "BOOLEAN",
"javaType": "BOOLEAN",
"category": "UI"
},
{
"code": "weasis.export.dicom.send",
"value": "true",
"description": "Show the send page in the DICOM Export dialog",
"type": "A",
"JavaType": "BOOLEAN",
"javaType": "BOOLEAN",
"category": "UI"
},
{
"code": "weasis.toolbar.mouse.buttons",
"value": "7170",
"description": "Show all mouse buttons. Sum of LEFT=1024 + MIDDLE=2048 + RIGHT=4096 + SCROLL=2. Show all:7170 and show none:0.",
"type": "A",
"JavaType": "INT",
"javaType": "INT",
"category": "UI"
},
{
"code": "weasis.all.cinetoolbar.visible",
"value": "false",
"description": "Show all the cine toolbars",
"type": "A",
"JavaType": "BOOLEAN",
"javaType": "BOOLEAN",
"category": "UI"
},
{
"code": "weasis.all.keyobjecttoolbar.visible",
"value": "false",
"description": "Show all the key object toolbars",
"type": "A",
"JavaType": "BOOLEAN",
"javaType": "BOOLEAN",
"category": "UI"
},
{
"code": "weasis-dicom-viewer2d.all.rotationtoolbar.visible",
"value": "false",
"description": "Show the rotation toolbars in DICOM 2D viewer",
"type": "A",
"JavaType": "BOOLEAN",
"javaType": "BOOLEAN",
"category": "UI"
},
{
"code": "weasis.contextmenu.lutShape",
"value": "false",
"description": "Show LUT Shape in the contextual menu",
"type": "A",
"JavaType": "BOOLEAN",
"javaType": "BOOLEAN",
"category": "UI"
},
{
"code": "weasis.contextmenu.lut",
"value": "false",
"description": "Show LUT in the contextual menu",
"type": "A",
"JavaType": "BOOLEAN",
"javaType": "BOOLEAN",
"category": "UI"
},
{
"code": "weasis.contextmenu.filter",
"value": "false",
"description": "Show Filter in the contextual menu",
"type": "A",
"JavaType": "BOOLEAN",
"javaType": "BOOLEAN",
"category": "UI"
}
]
}
}
2 changes: 1 addition & 1 deletion weasis-launcher/src/main/java/org/weasis/launcher/Singleton.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -100,7 +100,7 @@ public static void stop() {

try (Socket socket = new Socket(LOCALHOST, siServer.getPort());
OutputStream os = socket.getOutputStream();
PrintStream out = new PrintStream(os, true, Charset.defaultCharset().name())) {
PrintStream out = new PrintStream(os, true, Charset.defaultCharset())) {
byte[] encoding = new byte[1];
encoding[0] = ENCODING_PLATFORM;
os.write(encoding);
Expand Down
2 changes: 1 addition & 1 deletion weasis-launcher/src/main/java/org/weasis/launcher/WeasisLauncher.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -1183,7 +1183,7 @@ private void shutdownHook() {
mFelix.waitForStop(30_000);
}
} catch (Exception ex) {
System.err.println("Error stopping framework: " + ex); // NON-NLS
System.err.println(STR."Error stopping framework: \{ex}"); // NON-NLS
if (ex instanceof InterruptedException) {
Thread.currentThread().interrupt();
}
Expand Down
Loading

0 comments on commit e87d2ba

Please sign in to comment.