From 29fe0b438b01fbf3139a3c49a7a6d66ed5bea59c Mon Sep 17 00:00:00 2001
From: Daniel Gonzalez <dgonzale@pasteur.fr>
Date: Wed, 3 Jun 2020 15:16:10 +0200
Subject: [PATCH] Fixed: Get file name without extension does not remove
extension
---
src/plugins/tprovoost/sequenceblocks/infos/GetFileName.java | 2 +-
src/plugins/tprovoost/sequenceblocks/infos/VarColormap.java | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/src/plugins/tprovoost/sequenceblocks/infos/GetFileName.java b/src/plugins/tprovoost/sequenceblocks/infos/GetFileName.java
index 477a915..2bf3699 100644
--- a/src/plugins/tprovoost/sequenceblocks/infos/GetFileName.java
+++ b/src/plugins/tprovoost/sequenceblocks/infos/GetFileName.java
@@ -42,7 +42,7 @@ public class GetFileName extends Plugin implements SequenceBlock, PluginBundled
result = FileUtil.getFileName(result);
// remove extension ?
if (!withExtension.getValue().booleanValue())
- FileUtil.setExtension(result, "");
+ result = FileUtil.setExtension(result, "");
filename.setValue(result);
}
diff --git a/src/plugins/tprovoost/sequenceblocks/infos/VarColormap.java b/src/plugins/tprovoost/sequenceblocks/infos/VarColormap.java
index 017f8b9..d177683 100644
--- a/src/plugins/tprovoost/sequenceblocks/infos/VarColormap.java
+++ b/src/plugins/tprovoost/sequenceblocks/infos/VarColormap.java
@@ -50,7 +50,7 @@ public class VarColormap extends Var<IcyColorMap>
// create the var editor (combo box type here)
final ComboBox<IcyColorMap> result = new ComboBox<IcyColorMap>(this);
// get the editor component
- final JComboBox combo = result.getEditorComponent();
+ final JComboBox<?> combo = result.getEditorComponent();
// and set a specific renderer
combo.setRenderer(new ColormapComboBoxRenderer(combo));
--
GitLab