|
From: Logs S. c. messages. <gvs...@li...> - 2013-11-23 15:58:09
|
Revision: 1080
http://sourceforge.net/p/gvsigce/code/1080
Author: vicgonco
Date: 2013-11-23 15:58:07 +0000 (Sat, 23 Nov 2013)
Log Message:
-----------
Applying https://devel.gvsig.org/redmine/projects/gvsig-desktop/repository/revisions/38372
Modified Paths:
--------------
trunk/applications/appgvSIG/src/com/iver/cit/gvsig/project/documents/layout/fframes/FFramePicture.java
Modified: trunk/applications/appgvSIG/src/com/iver/cit/gvsig/project/documents/layout/fframes/FFramePicture.java
===================================================================
--- trunk/applications/appgvSIG/src/com/iver/cit/gvsig/project/documents/layout/fframes/FFramePicture.java 2013-11-23 15:57:01 UTC (rev 1079)
+++ trunk/applications/appgvSIG/src/com/iver/cit/gvsig/project/documents/layout/fframes/FFramePicture.java 2013-11-23 15:58:07 UTC (rev 1080)
@@ -355,21 +355,24 @@
if (file == null || !f.exists()) {
return null;
}
- setPath(file);
- String iString = file.toLowerCase();
- if (iString.endsWith("jpg") || iString.endsWith("jpeg") ||
- iString.endsWith("gif")) {
- tmpIcon = new ImageIcon(Jimi.getImage(file, Jimi.VIRTUAL_MEMORY)); //((File)main.allImages.elementAt(x)).getAbsolutePath());
- } else if (iString.endsWith("png") || iString.endsWith("tif") ||
- iString.endsWith("ico") || iString.endsWith("xpm") ||
- iString.endsWith("bmp")) {
- tmpIcon = new ImageIcon(Jimi.getImage(file, Jimi.VIRTUAL_MEMORY)); //new ImageIcon(f.getPath());
- } else if (iString.endsWith("svg")) {
- isSVG = true;
- obtainStaticRenderer(new File(file));
- }else {
- tmpIcon=new ImageIcon(file);
+ if (new File(file).isFile()) {
+ setPath(file);
+ String iString = file.toLowerCase();
+
+ if (iString.endsWith("jpg") || iString.endsWith("jpeg") ||
+ iString.endsWith("gif")) {
+ tmpIcon = new ImageIcon(Jimi.getImage(file, Jimi.VIRTUAL_MEMORY)); //((File)main.allImages.elementAt(x)).getAbsolutePath());
+ } else if (iString.endsWith("png") || iString.endsWith("tif") ||
+ iString.endsWith("ico") || iString.endsWith("xpm") ||
+ iString.endsWith("bmp")) {
+ tmpIcon = new ImageIcon(Jimi.getImage(file, Jimi.VIRTUAL_MEMORY)); //new ImageIcon(f.getPath());
+ } else if (iString.endsWith("svg")) {
+ isSVG = true;
+ obtainStaticRenderer(new File(file));
+ }else {
+ tmpIcon=new ImageIcon(file);
+ }
}
if (!isSVG && (tmpIcon != null)) {
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|