From 986aa62ed00bee39363bab41b4eeb8259d446efd Mon Sep 17 00:00:00 2001
From: ludc <ludc@vci-tech.com>
Date: 星期四, 16 一月 2025 18:20:32 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'

---
 Source/Client/PLTClient/src/com/vci/client/ui/swing/VCISwingUtil.java |   27 +++++++++++++++++----------
 1 files changed, 17 insertions(+), 10 deletions(-)

diff --git a/Source/Client/PLTClient/src/com/vci/client/ui/swing/VCISwingUtil.java b/Source/Client/PLTClient/src/com/vci/client/ui/swing/VCISwingUtil.java
index 6232750..1ab632b 100644
--- a/Source/Client/PLTClient/src/com/vci/client/ui/swing/VCISwingUtil.java
+++ b/Source/Client/PLTClient/src/com/vci/client/ui/swing/VCISwingUtil.java
@@ -35,15 +35,11 @@
 import javax.swing.filechooser.FileNameExtensionFilter;
 import javax.swing.plaf.FontUIResource;
 
-import org.springframework.core.io.Resource;
-import org.springframework.core.io.support.PathMatchingResourcePatternResolver;
-import org.springframework.core.io.support.ResourcePatternResolver;
-
-import com.vci.client.ui.excel.ExcelFileOperation;
 import com.vci.client.ui.swing.components.VCIJButton;
 import com.vci.client.ui.swing.components.VCIJLabel;
 import com.vci.client.ui.swing.components.VCIJMenuItem;
 import com.vci.client.ui.swing.components.VCIJOptionPane;
+import com.vci.client.utils.excel.ExcelFileOperation;
 
 import edu.stanford.smi.protege.util.LookAndFeelUtil;
 
@@ -203,23 +199,34 @@
 	
 	public static String[] getImages() {
 		try {
-			ResourcePatternResolver resourceResolver = new PathMatchingResourcePatternResolver();
+			//ResourcePatternResolver resourceResolver = new PathMatchingResourcePatternResolver();
 			
-	        Resource[] resources = resourceResolver.getResources("resource/images/*.*");
+	        //Resource[] resources = resourceResolver.getResources("resource/images/*.*");
+			
+			String path = "resource/images/*.*";
+	    	Enumeration<?> urlEnumeration = VCISwingUtil.class.getClassLoader().getResources(path);
 	        List<String> lstImage = new ArrayList<String>();
-	        for (int i = 0; i < resources.length; i++) {
-	            String name = resources[i].getFilename();
+	        while (urlEnumeration.hasMoreElements()) {
+	            URL url = (URL)urlEnumeration.nextElement();
+	            File file = new File(url.toString());
+	            String name = file.getName();
 	            lstImage.add(name);
 	        }
+
+//	        for (int i = 0; i < resources.length; i++) {
+//	            String name = resources[i].getFilename();
+//	            lstImage.add(name);
+//	        }
 	        
 	        return lstImage.toArray(new String[0]);
 	        
 	    } catch (IOException e) {
-			// TODO Auto-generated catch block
 			e.printStackTrace();
 		}
 		return new String[0];
 	}
+	
+	
 	/**
 	 * 
 	 * <p>Description: </p>

--
Gitblit v1.9.3