Move icon to the factory class, and use it there.

tinevez · tinevez · commit 3339906fee3a · 2025-07-18T21:00:08.000+02:00
diff --git a/src/main/java/fiji/plugin/trackmate/weka/WekaDetectorConfigurationPanel.java b/src/main/java/fiji/plugin/trackmate/weka/WekaDetectorConfigurationPanel.java
@@ -8,12 +8,12 @@
  * it under the terms of the GNU General Public License as
  * published by the Free Software Foundation, either version 3 of the
  * License, or (at your option) any later version.
- * 
+ *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  * GNU General Public License for more details.
- * 
+ *
  * You should have received a copy of the GNU General Public
  * License along with this program.  If not, see
  * <http://www.gnu.org/licenses/gpl-3.0.html>.
@@ -26,6 +26,7 @@
 import static fiji.plugin.trackmate.gui.Fonts.FONT;
 import static fiji.plugin.trackmate.gui.Fonts.SMALL_FONT;
 import static fiji.plugin.trackmate.gui.Icons.MAGNIFIER_ICON;
+import static fiji.plugin.trackmate.weka.WekaDetectorFactory.ICON;
 import static fiji.plugin.trackmate.weka.WekaDetectorFactory.KEY_CLASSIFIER_FILEPATH;
 import static fiji.plugin.trackmate.weka.WekaDetectorFactory.KEY_CLASS_INDEX;
 import static fiji.plugin.trackmate.weka.WekaDetectorFactory.KEY_PROBA_THRESHOLD;
@@ -36,7 +37,6 @@
 import java.awt.Insets;
 import java.beans.PropertyChangeListener;
 import java.io.File;
-import java.net.URL;
 import java.text.DecimalFormat;
 import java.text.NumberFormat;
 import java.util.Arrays;
@@ -46,7 +46,6 @@
 import java.util.Vector;
 
 import javax.swing.DefaultComboBoxModel;
-import javax.swing.ImageIcon;
 import javax.swing.JButton;
 import javax.swing.JComboBox;
 import javax.swing.JFormattedTextField;
@@ -80,8 +79,6 @@ public class WekaDetectorConfigurationPanel extends ConfigurationPanel
 
 	private static final NumberFormat THRESHOLD_FORMAT = new DecimalFormat( "#.##" );
 
-	protected static final ImageIcon ICON = new ImageIcon( getResource( "images/TrackMateWeka-logo-100px.png" ) );
-
 	private static final String TITLE = WekaDetectorFactory.NAME;
 
 	private static final FileFilter fileFilter = new FileNameExtensionFilter( "Weka classifier files.", "model" );
@@ -433,9 +430,4 @@ public void run()
 			}
 		}.start();
 	}
-
-	protected static URL getResource( final String name )
-	{
-		return WekaDetectorFactory.class.getClassLoader().getResource( name );
-	}
 }
diff --git a/src/main/java/fiji/plugin/trackmate/weka/WekaDetectorFactory.java b/src/main/java/fiji/plugin/trackmate/weka/WekaDetectorFactory.java
@@ -27,12 +27,15 @@
 import java.util.HashMap;
 import java.util.Map;
 
+import javax.swing.ImageIcon;
+
 import org.scijava.plugin.Plugin;
 
 import fiji.plugin.trackmate.Model;
 import fiji.plugin.trackmate.Settings;
 import fiji.plugin.trackmate.detection.SpotDetector;
 import fiji.plugin.trackmate.detection.SpotDetectorFactory;
+import fiji.plugin.trackmate.gui.GuiUtils;
 import fiji.plugin.trackmate.gui.components.ConfigurationPanel;
 import fiji.plugin.trackmate.io.IOUtils;
 import fiji.plugin.trackmate.util.TMUtils;
@@ -77,6 +80,8 @@ public class WekaDetectorFactory< T extends RealType< T > & NativeType< T > > im
 
 	public static final String DOC_URL = "https://imagej.net/plugins/trackmate/detectors/trackmate-weka";
 
+	public static final ImageIcon ICON = new ImageIcon( GuiUtils.getResource( "images/TrackMateWeka-logo-100px.png", WekaDetectorFactory.class ) );
+
 	/** An html information text. */
 	public static final String INFO_TEXT = "<html>"
 			+ "This detector relies on the 'Trainable Weka segmentation' plugin to detect objects."
@@ -175,6 +180,12 @@ public Map< String, Object > getDefaultSettings()
 		return settings;
 	}
 
+	@Override
+	public ImageIcon getIcon()
+	{
+		return ICON;
+	}
+
 	@Override
 	public String getInfoText()
 	{
