Revision: 4625
http://sourceforge.net/p/jump-pilot/code/4625
Author: edso
Date: 2015-12-14 23:48:30 +0000 (Mon, 14 Dec 2015)
Log Message:
-----------
moved some astray famfam icons into the famfam folder
modded IconLoader to autosearch for images in famfam/ and fugue/ in case the
images moved from the base folder
used a more prominent icon in ConnectionPanel
Modified Paths:
--------------
core/trunk/src/com/vividsolutions/jump/workbench/ui/images/IconLoader.java
core/trunk/src/com/vividsolutions/jump/workbench/ui/plugin/datastore/ConnectionManagerPanel.java
core/trunk/src/com/vividsolutions/jump/workbench/ui/plugin/datastore/ConnectionPanel.java
Added Paths:
-----------
core/trunk/src/com/vividsolutions/jump/workbench/ui/images/famfam/add.png
core/trunk/src/com/vividsolutions/jump/workbench/ui/images/famfam/database.png
core/trunk/src/com/vividsolutions/jump/workbench/ui/images/famfam/database_add.png
core/trunk/src/com/vividsolutions/jump/workbench/ui/images/famfam/database_connect.png
core/trunk/src/com/vividsolutions/jump/workbench/ui/images/famfam/database_delete.png
core/trunk/src/com/vividsolutions/jump/workbench/ui/images/famfam/database_error.png
core/trunk/src/com/vividsolutions/jump/workbench/ui/images/famfam/database_go.png
core/trunk/src/com/vividsolutions/jump/workbench/ui/images/famfam/database_link.png
core/trunk/src/com/vividsolutions/jump/workbench/ui/images/famfam/database_refresh.png
core/trunk/src/com/vividsolutions/jump/workbench/ui/images/famfam/database_save.png
Removed Paths:
-------------
core/trunk/src/com/vividsolutions/jump/workbench/ui/images/add.png
core/trunk/src/com/vividsolutions/jump/workbench/ui/images/database.png
core/trunk/src/com/vividsolutions/jump/workbench/ui/images/database_add.png
core/trunk/src/com/vividsolutions/jump/workbench/ui/images/database_connect.png
core/trunk/src/com/vividsolutions/jump/workbench/ui/images/database_delete.png
core/trunk/src/com/vividsolutions/jump/workbench/ui/images/database_error.png
core/trunk/src/com/vividsolutions/jump/workbench/ui/images/database_gear.png
core/trunk/src/com/vividsolutions/jump/workbench/ui/images/database_go.png
core/trunk/src/com/vividsolutions/jump/workbench/ui/images/database_link.png
core/trunk/src/com/vividsolutions/jump/workbench/ui/images/database_refresh.png
core/trunk/src/com/vividsolutions/jump/workbench/ui/images/database_save.png
core/trunk/src/com/vividsolutions/jump/workbench/ui/images/famfam/database_gear.png
core/trunk/src/com/vividsolutions/jump/workbench/ui/images/ko_spatialite.png
Modified:
core/trunk/src/com/vividsolutions/jump/workbench/ui/images/IconLoader.java
===================================================================
--- core/trunk/src/com/vividsolutions/jump/workbench/ui/images/IconLoader.java
2015-12-14 22:47:54 UTC (rev 4624)
+++ core/trunk/src/com/vividsolutions/jump/workbench/ui/images/IconLoader.java
2015-12-14 23:48:30 UTC (rev 4625)
@@ -34,25 +34,47 @@
package com.vividsolutions.jump.workbench.ui.images;
import java.awt.image.BufferedImage;
+import java.io.File;
import java.io.IOException;
import javax.imageio.ImageIO;
import javax.swing.ImageIcon;
+import org.deegree.ogcwebservices.wcs.configuration.Resolution;
+
/**
* Gets an icon from this class' package.
*/
public class IconLoader {
public static ImageIcon icon(String filename) {
- return new ImageIcon(IconLoader.class.getResource(filename));
+ return new ImageIcon(IconLoader.class.getResource(resolveFile(
filename )));
}
public static BufferedImage image(String filename) {
try {
- return ImageIO.read(IconLoader.class.getResource(filename));
+ return ImageIO.read(IconLoader.class.getResource(resolveFile(
filename )));
} catch (IOException e) {
e.printStackTrace();
return null;
}
}
+
+ /**
+ * utility method to automagically resolve images that moved into their
+ * appropriate iconset subfolders for legacy code
+ *
+ * @param filename
+ * @return
+ */
+ private static String resolveFile( String filename ){
+ // iterate over each location, return on first hit
+ for (String path : new String[]{"","famfam/","fugue/"}) {
+ if (IconLoader.class.getResource( path + filename )!=null)
+ return path + filename;
+ }
+
+ // if push comes to shove, we let the calling method deal w/ the
+ // consequences, exactly as it was before
+ return filename;
+ }
}
Deleted: core/trunk/src/com/vividsolutions/jump/workbench/ui/images/add.png
===================================================================
(Binary files differ)
Deleted: core/trunk/src/com/vividsolutions/jump/workbench/ui/images/database.png
===================================================================
(Binary files differ)
Deleted:
core/trunk/src/com/vividsolutions/jump/workbench/ui/images/database_add.png
===================================================================
(Binary files differ)
Deleted:
core/trunk/src/com/vividsolutions/jump/workbench/ui/images/database_connect.png
===================================================================
(Binary files differ)
Deleted:
core/trunk/src/com/vividsolutions/jump/workbench/ui/images/database_delete.png
===================================================================
(Binary files differ)
Deleted:
core/trunk/src/com/vividsolutions/jump/workbench/ui/images/database_error.png
===================================================================
(Binary files differ)
Deleted:
core/trunk/src/com/vividsolutions/jump/workbench/ui/images/database_gear.png
===================================================================
(Binary files differ)
Deleted:
core/trunk/src/com/vividsolutions/jump/workbench/ui/images/database_go.png
===================================================================
(Binary files differ)
Deleted:
core/trunk/src/com/vividsolutions/jump/workbench/ui/images/database_link.png
===================================================================
(Binary files differ)
Deleted:
core/trunk/src/com/vividsolutions/jump/workbench/ui/images/database_refresh.png
===================================================================
(Binary files differ)
Deleted:
core/trunk/src/com/vividsolutions/jump/workbench/ui/images/database_save.png
===================================================================
(Binary files differ)
Copied:
core/trunk/src/com/vividsolutions/jump/workbench/ui/images/famfam/add.png (from
rev 4623, core/trunk/src/com/vividsolutions/jump/workbench/ui/images/add.png)
===================================================================
(Binary files differ)
Copied:
core/trunk/src/com/vividsolutions/jump/workbench/ui/images/famfam/database.png
(from rev 4623,
core/trunk/src/com/vividsolutions/jump/workbench/ui/images/database.png)
===================================================================
(Binary files differ)
Copied:
core/trunk/src/com/vividsolutions/jump/workbench/ui/images/famfam/database_add.png
(from rev 4623,
core/trunk/src/com/vividsolutions/jump/workbench/ui/images/database_add.png)
===================================================================
(Binary files differ)
Copied:
core/trunk/src/com/vividsolutions/jump/workbench/ui/images/famfam/database_connect.png
(from rev 4623,
core/trunk/src/com/vividsolutions/jump/workbench/ui/images/database_connect.png)
===================================================================
(Binary files differ)
Copied:
core/trunk/src/com/vividsolutions/jump/workbench/ui/images/famfam/database_delete.png
(from rev 4623,
core/trunk/src/com/vividsolutions/jump/workbench/ui/images/database_delete.png)
===================================================================
(Binary files differ)
Copied:
core/trunk/src/com/vividsolutions/jump/workbench/ui/images/famfam/database_error.png
(from rev 4623,
core/trunk/src/com/vividsolutions/jump/workbench/ui/images/database_error.png)
===================================================================
(Binary files differ)
Deleted:
core/trunk/src/com/vividsolutions/jump/workbench/ui/images/famfam/database_gear.png
===================================================================
(Binary files differ)
Copied:
core/trunk/src/com/vividsolutions/jump/workbench/ui/images/famfam/database_go.png
(from rev 4623,
core/trunk/src/com/vividsolutions/jump/workbench/ui/images/database_go.png)
===================================================================
(Binary files differ)
Copied:
core/trunk/src/com/vividsolutions/jump/workbench/ui/images/famfam/database_link.png
(from rev 4623,
core/trunk/src/com/vividsolutions/jump/workbench/ui/images/database_link.png)
===================================================================
(Binary files differ)
Copied:
core/trunk/src/com/vividsolutions/jump/workbench/ui/images/famfam/database_refresh.png
(from rev 4623,
core/trunk/src/com/vividsolutions/jump/workbench/ui/images/database_refresh.png)
===================================================================
(Binary files differ)
Copied:
core/trunk/src/com/vividsolutions/jump/workbench/ui/images/famfam/database_save.png
(from rev 4623,
core/trunk/src/com/vividsolutions/jump/workbench/ui/images/database_save.png)
===================================================================
(Binary files differ)
Deleted:
core/trunk/src/com/vividsolutions/jump/workbench/ui/images/ko_spatialite.png
===================================================================
(Binary files differ)
Modified:
core/trunk/src/com/vividsolutions/jump/workbench/ui/plugin/datastore/ConnectionManagerPanel.java
===================================================================
---
core/trunk/src/com/vividsolutions/jump/workbench/ui/plugin/datastore/ConnectionManagerPanel.java
2015-12-14 22:47:54 UTC (rev 4624)
+++
core/trunk/src/com/vividsolutions/jump/workbench/ui/plugin/datastore/ConnectionManagerPanel.java
2015-12-14 23:48:30 UTC (rev 4625)
@@ -64,8 +64,8 @@
// private final Icon SQLSERVER_DISCONNECTED_ICON =
IconLoader.icon("ok_sqlserver.png");
private final Icon DBS_ICON = IconLoader.icon("famfam/database_edit.png");
- private final Icon NEW_DB_ICON = IconLoader.icon("database_add.png");
- private final Icon DELETE_DB_ICON = IconLoader.icon("database_delete.png");
+ private final Icon NEW_DB_ICON = IconLoader.icon("famfam/database_add.png");
+ private final Icon DELETE_DB_ICON =
IconLoader.icon("famfam/database_delete.png");
// Partially generated using Eclipse Visual Editor [Jon Aquino 2005-03-08]
Modified:
core/trunk/src/com/vividsolutions/jump/workbench/ui/plugin/datastore/ConnectionPanel.java
===================================================================
---
core/trunk/src/com/vividsolutions/jump/workbench/ui/plugin/datastore/ConnectionPanel.java
2015-12-14 22:47:54 UTC (rev 4624)
+++
core/trunk/src/com/vividsolutions/jump/workbench/ui/plugin/datastore/ConnectionPanel.java
2015-12-14 23:48:30 UTC (rev 4625)
@@ -33,7 +33,7 @@
* Base class for panels with a Connection combobox.
*/
public class ConnectionPanel extends JPanel {
- protected final static ImageIcon DB_ICON = IconLoader.icon(
"famfam/database_gear.png" );
+ protected final static ImageIcon ADD_DB_ICON = IconLoader.icon(
"famfam/add.png" );
protected final static int MAIN_COLUMN_WIDTH = 550;
@@ -177,7 +177,7 @@
private JButton getChooseConnectionButton() {
if ( chooseConnectionButton == null ) {
chooseConnectionButton = new JButton();
- chooseConnectionButton.setIcon( DB_ICON );
+ chooseConnectionButton.setIcon( ADD_DB_ICON );
chooseConnectionButton.setToolTipText(
I18N.get("jump.workbench.ui.plugin.datastore.ConnectionPanel.Connection-Manager"));
chooseConnectionButton.setMargin( new Insets( 0, 0, 0, 0 ) );
chooseConnectionButton.addActionListener(
------------------------------------------------------------------------------
_______________________________________________
Jump-pilot-devel mailing list
Jump-pilot-devel@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/jump-pilot-devel
