Revision: 4622
http://sourceforge.net/p/jump-pilot/code/4622
Author: elnico
Date: 2015-12-14 17:42:19 +0000 (Mon, 14 Dec 2015)
Log Message:
-----------
New images for spatial datastore connections: loaded with OJ method, moved to
the right folder.
Licenses added to readme.txt
Modified Paths:
--------------
core/trunk/etc/readme.txt
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/connect.png
core/trunk/src/com/vividsolutions/jump/workbench/ui/images/databases.gif
core/trunk/src/com/vividsolutions/jump/workbench/ui/images/deleteDatabase.gif
core/trunk/src/com/vividsolutions/jump/workbench/ui/images/disconnect.png
core/trunk/src/com/vividsolutions/jump/workbench/ui/images/famfam/database_edit.png
core/trunk/src/com/vividsolutions/jump/workbench/ui/images/famfam/database_gear.png
core/trunk/src/com/vividsolutions/jump/workbench/ui/images/green_circle.png
core/trunk/src/com/vividsolutions/jump/workbench/ui/images/ko_mariadb.png
core/trunk/src/com/vividsolutions/jump/workbench/ui/images/ko_oracle.png
core/trunk/src/com/vividsolutions/jump/workbench/ui/images/ko_pg.png
core/trunk/src/com/vividsolutions/jump/workbench/ui/images/ko_spatialite.png
core/trunk/src/com/vividsolutions/jump/workbench/ui/images/newDatabase.gif
core/trunk/src/com/vividsolutions/jump/workbench/ui/images/ok_mariadb.png
core/trunk/src/com/vividsolutions/jump/workbench/ui/images/ok_oracle.png
core/trunk/src/com/vividsolutions/jump/workbench/ui/images/ok_pg.png
core/trunk/src/com/vividsolutions/jump/workbench/ui/images/ok_spatialite.png
core/trunk/src/com/vividsolutions/jump/workbench/ui/images/small_red_x.png
Removed Paths:
-------------
core/trunk/src/com/vividsolutions/jump/workbench/ui/plugin/datastore/databases.gif
core/trunk/src/com/vividsolutions/jump/workbench/ui/plugin/datastore/deleteDatabase.gif
core/trunk/src/com/vividsolutions/jump/workbench/ui/plugin/datastore/green_circle.png
core/trunk/src/com/vividsolutions/jump/workbench/ui/plugin/datastore/ko_mysql.png
core/trunk/src/com/vividsolutions/jump/workbench/ui/plugin/datastore/ko_oracle.png
core/trunk/src/com/vividsolutions/jump/workbench/ui/plugin/datastore/ko_pg.png
core/trunk/src/com/vividsolutions/jump/workbench/ui/plugin/datastore/ko_sqlite.png
core/trunk/src/com/vividsolutions/jump/workbench/ui/plugin/datastore/ko_sqlserver.png
core/trunk/src/com/vividsolutions/jump/workbench/ui/plugin/datastore/newDatabase.gif
core/trunk/src/com/vividsolutions/jump/workbench/ui/plugin/datastore/ok_mysql.png
core/trunk/src/com/vividsolutions/jump/workbench/ui/plugin/datastore/ok_oracle.png
core/trunk/src/com/vividsolutions/jump/workbench/ui/plugin/datastore/ok_pg.png
core/trunk/src/com/vividsolutions/jump/workbench/ui/plugin/datastore/ok_sqlite.png
core/trunk/src/com/vividsolutions/jump/workbench/ui/plugin/datastore/ok_sqlserver.png
core/trunk/src/com/vividsolutions/jump/workbench/ui/plugin/datastore/small_red_x.png
Modified: core/trunk/etc/readme.txt
===================================================================
--- core/trunk/etc/readme.txt 2015-12-13 23:09:23 UTC (rev 4621)
+++ core/trunk/etc/readme.txt 2015-12-14 17:42:19 UTC (rev 4622)
@@ -33,6 +33,9 @@
Fugue by Yusuke Kamiyamane http://p.yusukekamiyamane.com - CC BY 3.0
- http://creativecommons.org/licenses/by/3.0/
OJ icon v3 and others by Edgar Soldin http://soldin.de - GPL2 - gpl-2.txt
+ PostgreSQL logo - Trademark Policy -
https://wiki.postgresql.org/wiki/Trademark_Policy
+ MariaDB logo - Branding Guidelines -
https://mariadb.com/kb/en/mariadb/branding-guidelines/
+ Spatialite logo: The Spatialite logo was kindly contributed by Massimo
Zedda - Creative Commons Attribution-NonCommercial-NoDerivs 3.0 -
http://creativecommons.org/licenses/by-nc-nd/3.0/
ImageIO Ext - LGPL3 - lgpl-3.0.txt
except the following dependencies/components:
commons-codec, commons-io, commons-lang, commons-logging (see above)
Added: core/trunk/src/com/vividsolutions/jump/workbench/ui/images/connect.png
===================================================================
(Binary files differ)
Index: core/trunk/src/com/vividsolutions/jump/workbench/ui/images/connect.png
===================================================================
--- core/trunk/src/com/vividsolutions/jump/workbench/ui/images/connect.png
2015-12-13 23:09:23 UTC (rev 4621)
+++ core/trunk/src/com/vividsolutions/jump/workbench/ui/images/connect.png
2015-12-14 17:42:19 UTC (rev 4622)
Property changes on:
core/trunk/src/com/vividsolutions/jump/workbench/ui/images/connect.png
___________________________________________________________________
Added: svn:executable
## -0,0 +1 ##
+*
\ No newline at end of property
Added: svn:mime-type
## -0,0 +1 ##
+application/octet-stream
\ No newline at end of property
Copied:
core/trunk/src/com/vividsolutions/jump/workbench/ui/images/databases.gif (from
rev 4621,
core/trunk/src/com/vividsolutions/jump/workbench/ui/plugin/datastore/databases.gif)
===================================================================
(Binary files differ)
Copied:
core/trunk/src/com/vividsolutions/jump/workbench/ui/images/deleteDatabase.gif
(from rev 4621,
core/trunk/src/com/vividsolutions/jump/workbench/ui/plugin/datastore/deleteDatabase.gif)
===================================================================
(Binary files differ)
Added: core/trunk/src/com/vividsolutions/jump/workbench/ui/images/disconnect.png
===================================================================
(Binary files differ)
Index: core/trunk/src/com/vividsolutions/jump/workbench/ui/images/disconnect.png
===================================================================
--- core/trunk/src/com/vividsolutions/jump/workbench/ui/images/disconnect.png
2015-12-13 23:09:23 UTC (rev 4621)
+++ core/trunk/src/com/vividsolutions/jump/workbench/ui/images/disconnect.png
2015-12-14 17:42:19 UTC (rev 4622)
Property changes on:
core/trunk/src/com/vividsolutions/jump/workbench/ui/images/disconnect.png
___________________________________________________________________
Added: svn:executable
## -0,0 +1 ##
+*
\ No newline at end of property
Added: svn:mime-type
## -0,0 +1 ##
+application/octet-stream
\ No newline at end of property
Added:
core/trunk/src/com/vividsolutions/jump/workbench/ui/images/famfam/database_edit.png
===================================================================
(Binary files differ)
Index:
core/trunk/src/com/vividsolutions/jump/workbench/ui/images/famfam/database_edit.png
===================================================================
---
core/trunk/src/com/vividsolutions/jump/workbench/ui/images/famfam/database_edit.png
2015-12-13 23:09:23 UTC (rev 4621)
+++
core/trunk/src/com/vividsolutions/jump/workbench/ui/images/famfam/database_edit.png
2015-12-14 17:42:19 UTC (rev 4622)
Property changes on:
core/trunk/src/com/vividsolutions/jump/workbench/ui/images/famfam/database_edit.png
___________________________________________________________________
Added: svn:executable
## -0,0 +1 ##
+*
\ No newline at end of property
Added: svn:mime-type
## -0,0 +1 ##
+application/octet-stream
\ No newline at end of property
Added:
core/trunk/src/com/vividsolutions/jump/workbench/ui/images/famfam/database_gear.png
===================================================================
(Binary files differ)
Index:
core/trunk/src/com/vividsolutions/jump/workbench/ui/images/famfam/database_gear.png
===================================================================
---
core/trunk/src/com/vividsolutions/jump/workbench/ui/images/famfam/database_gear.png
2015-12-13 23:09:23 UTC (rev 4621)
+++
core/trunk/src/com/vividsolutions/jump/workbench/ui/images/famfam/database_gear.png
2015-12-14 17:42:19 UTC (rev 4622)
Property changes on:
core/trunk/src/com/vividsolutions/jump/workbench/ui/images/famfam/database_gear.png
___________________________________________________________________
Added: svn:executable
## -0,0 +1 ##
+*
\ No newline at end of property
Added: svn:mime-type
## -0,0 +1 ##
+application/octet-stream
\ No newline at end of property
Copied:
core/trunk/src/com/vividsolutions/jump/workbench/ui/images/green_circle.png
(from rev 4621,
core/trunk/src/com/vividsolutions/jump/workbench/ui/plugin/datastore/green_circle.png)
===================================================================
(Binary files differ)
Added: core/trunk/src/com/vividsolutions/jump/workbench/ui/images/ko_mariadb.png
===================================================================
(Binary files differ)
Index: core/trunk/src/com/vividsolutions/jump/workbench/ui/images/ko_mariadb.png
===================================================================
--- core/trunk/src/com/vividsolutions/jump/workbench/ui/images/ko_mariadb.png
2015-12-13 23:09:23 UTC (rev 4621)
+++ core/trunk/src/com/vividsolutions/jump/workbench/ui/images/ko_mariadb.png
2015-12-14 17:42:19 UTC (rev 4622)
Property changes on:
core/trunk/src/com/vividsolutions/jump/workbench/ui/images/ko_mariadb.png
___________________________________________________________________
Added: svn:mime-type
## -0,0 +1 ##
+application/octet-stream
\ No newline at end of property
Copied:
core/trunk/src/com/vividsolutions/jump/workbench/ui/images/ko_oracle.png (from
rev 4621,
core/trunk/src/com/vividsolutions/jump/workbench/ui/plugin/datastore/ko_oracle.png)
===================================================================
(Binary files differ)
Copied: core/trunk/src/com/vividsolutions/jump/workbench/ui/images/ko_pg.png
(from rev 4621,
core/trunk/src/com/vividsolutions/jump/workbench/ui/plugin/datastore/ko_pg.png)
===================================================================
(Binary files differ)
Added:
core/trunk/src/com/vividsolutions/jump/workbench/ui/images/ko_spatialite.png
===================================================================
(Binary files differ)
Index:
core/trunk/src/com/vividsolutions/jump/workbench/ui/images/ko_spatialite.png
===================================================================
---
core/trunk/src/com/vividsolutions/jump/workbench/ui/images/ko_spatialite.png
2015-12-13 23:09:23 UTC (rev 4621)
+++
core/trunk/src/com/vividsolutions/jump/workbench/ui/images/ko_spatialite.png
2015-12-14 17:42:19 UTC (rev 4622)
Property changes on:
core/trunk/src/com/vividsolutions/jump/workbench/ui/images/ko_spatialite.png
___________________________________________________________________
Added: svn:mime-type
## -0,0 +1 ##
+application/octet-stream
\ No newline at end of property
Copied:
core/trunk/src/com/vividsolutions/jump/workbench/ui/images/newDatabase.gif
(from rev 4621,
core/trunk/src/com/vividsolutions/jump/workbench/ui/plugin/datastore/newDatabase.gif)
===================================================================
(Binary files differ)
Added: core/trunk/src/com/vividsolutions/jump/workbench/ui/images/ok_mariadb.png
===================================================================
(Binary files differ)
Index: core/trunk/src/com/vividsolutions/jump/workbench/ui/images/ok_mariadb.png
===================================================================
--- core/trunk/src/com/vividsolutions/jump/workbench/ui/images/ok_mariadb.png
2015-12-13 23:09:23 UTC (rev 4621)
+++ core/trunk/src/com/vividsolutions/jump/workbench/ui/images/ok_mariadb.png
2015-12-14 17:42:19 UTC (rev 4622)
Property changes on:
core/trunk/src/com/vividsolutions/jump/workbench/ui/images/ok_mariadb.png
___________________________________________________________________
Added: svn:mime-type
## -0,0 +1 ##
+application/octet-stream
\ No newline at end of property
Copied:
core/trunk/src/com/vividsolutions/jump/workbench/ui/images/ok_oracle.png (from
rev 4621,
core/trunk/src/com/vividsolutions/jump/workbench/ui/plugin/datastore/ok_oracle.png)
===================================================================
(Binary files differ)
Copied: core/trunk/src/com/vividsolutions/jump/workbench/ui/images/ok_pg.png
(from rev 4621,
core/trunk/src/com/vividsolutions/jump/workbench/ui/plugin/datastore/ok_pg.png)
===================================================================
(Binary files differ)
Added:
core/trunk/src/com/vividsolutions/jump/workbench/ui/images/ok_spatialite.png
===================================================================
(Binary files differ)
Index:
core/trunk/src/com/vividsolutions/jump/workbench/ui/images/ok_spatialite.png
===================================================================
---
core/trunk/src/com/vividsolutions/jump/workbench/ui/images/ok_spatialite.png
2015-12-13 23:09:23 UTC (rev 4621)
+++
core/trunk/src/com/vividsolutions/jump/workbench/ui/images/ok_spatialite.png
2015-12-14 17:42:19 UTC (rev 4622)
Property changes on:
core/trunk/src/com/vividsolutions/jump/workbench/ui/images/ok_spatialite.png
___________________________________________________________________
Added: svn:mime-type
## -0,0 +1 ##
+application/octet-stream
\ No newline at end of property
Copied:
core/trunk/src/com/vividsolutions/jump/workbench/ui/images/small_red_x.png
(from rev 4621,
core/trunk/src/com/vividsolutions/jump/workbench/ui/plugin/datastore/small_red_x.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-13 23:09:23 UTC (rev 4621)
+++
core/trunk/src/com/vividsolutions/jump/workbench/ui/plugin/datastore/ConnectionManagerPanel.java
2015-12-14 17:42:19 UTC (rev 4622)
@@ -37,10 +37,6 @@
import com.vividsolutions.jump.datastore.DataStoreConnection;
import com.vividsolutions.jump.datastore.DataStoreDriver;
import com.vividsolutions.jump.datastore.DataStoreException;
-import com.vividsolutions.jump.datastore.mariadb.MariadbDataStoreDriver;
-import com.vividsolutions.jump.datastore.oracle.OracleDataStoreDriver;
-import com.vividsolutions.jump.datastore.postgis.PostgisDataStoreDriver;
-import com.vividsolutions.jump.datastore.spatialite.SpatialiteDataStoreDriver;
import com.vividsolutions.jump.util.Block;
import com.vividsolutions.jump.workbench.WorkbenchContext;
import com.vividsolutions.jump.workbench.datastore.ConnectionDescriptor;
@@ -48,26 +44,27 @@
import com.vividsolutions.jump.workbench.registry.Registry;
import com.vividsolutions.jump.workbench.ui.ErrorHandler;
import com.vividsolutions.jump.workbench.ui.OKCancelDialog;
+import com.vividsolutions.jump.workbench.ui.images.IconLoader;
public class ConnectionManagerPanel extends JPanel {
// Nicolas Ribot, 07 dec 2015:
// add icons according to database source
- private Icon CONNECTED_ICON = new
ImageIcon(ConnectionManagerPanel.class.getResource("green_circle.png"));
- private Icon DISCONNECTED_ICON = new
ImageIcon(ConnectionManagerPanel.class.getResource("small_red_x.png"));
- private Icon PG_CONNECTED_ICON = new
ImageIcon(ConnectionManagerPanel.class.getResource("ok_pg.png"));
- private Icon PG_DISCONNECTED_ICON = new
ImageIcon(ConnectionManagerPanel.class.getResource("ko_pg.png"));
- private Icon ORA_CONNECTED_ICON = new
ImageIcon(ConnectionManagerPanel.class.getResource("ok_oracle.png"));
- private Icon ORA_DISCONNECTED_ICON = new
ImageIcon(ConnectionManagerPanel.class.getResource("ko_oracle.png"));
- private Icon MARIA_CONNECTED_ICON = new
ImageIcon(ConnectionManagerPanel.class.getResource("ok_mysql.png"));
- private Icon MARIA_DISCONNECTED_ICON = new
ImageIcon(ConnectionManagerPanel.class.getResource("ko_mysql.png"));
- private Icon SQLITE_CONNECTED_ICON = new
ImageIcon(ConnectionManagerPanel.class.getResource("ok_sqlite.png"));
- private Icon SQLITE_DISCONNECTED_ICON = new
ImageIcon(ConnectionManagerPanel.class.getResource("ko_sqlite.png"));
- private Icon SQLSERVER_CONNECTED_ICON = new
ImageIcon(ConnectionManagerPanel.class.getResource("ok_sqlserver.png"));
- private Icon SQLSERVER_DISCONNECTED_ICON = new
ImageIcon(ConnectionManagerPanel.class.getResource("ok_sqlserver.png"));
+ private final Icon CONNECTED_ICON = IconLoader.icon("connect.png");
+ private final Icon DISCONNECTED_ICON = IconLoader.icon("disconnect.png");
+ private final Icon PG_CONNECTED_ICON = IconLoader.icon("ok_pg.png");
+ private final Icon PG_DISCONNECTED_ICON = IconLoader.icon("ko_pg.png");
+ private final Icon ORA_CONNECTED_ICON = IconLoader.icon("ok_oracle.png");
+ private final Icon ORA_DISCONNECTED_ICON = IconLoader.icon("ko_oracle.png");
+ private final Icon MARIA_CONNECTED_ICON = IconLoader.icon("ok_mariadb.png");
+ private final Icon MARIA_DISCONNECTED_ICON =
IconLoader.icon("ko_mariadb.png");
+ private final Icon SQLITE_CONNECTED_ICON =
IconLoader.icon("ok_spatialite.png");
+ private final Icon SQLITE_DISCONNECTED_ICON =
IconLoader.icon("ko_spatialite.png");
+ private final Icon SQLSERVER_CONNECTED_ICON =
IconLoader.icon("ok_sqlserver.png");
+ private final Icon SQLSERVER_DISCONNECTED_ICON =
IconLoader.icon("ok_sqlserver.png");
- private Icon DBS_ICON = new
ImageIcon(ConnectionManagerPanel.class.getResource("databases.gif"));
- private Icon NEW_DB_ICON = new
ImageIcon(ConnectionManagerPanel.class.getResource("newDatabase.gif"));
- private Icon DELETE_DB_ICON = new
ImageIcon(ConnectionManagerPanel.class.getResource("deleteDatabase.gif"));
+ 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");
// 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-13 23:09:23 UTC (rev 4621)
+++
core/trunk/src/com/vividsolutions/jump/workbench/ui/plugin/datastore/ConnectionPanel.java
2015-12-14 17:42:19 UTC (rev 4622)
@@ -26,12 +26,14 @@
import com.vividsolutions.jump.workbench.datastore.ConnectionDescriptor;
import com.vividsolutions.jump.workbench.datastore.ConnectionManager;
import com.vividsolutions.jump.workbench.ui.OKCancelDialog;
+import com.vividsolutions.jump.workbench.ui.images.IconLoader;
/**
* 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 int MAIN_COLUMN_WIDTH = 550;
@@ -175,9 +177,7 @@
private JButton getChooseConnectionButton() {
if ( chooseConnectionButton == null ) {
chooseConnectionButton = new JButton();
- ImageIcon icon = new ImageIcon( ConnectionManagerPanel.class
- .getResource( "databases.gif" ) );
- chooseConnectionButton.setIcon( icon );
+ chooseConnectionButton.setIcon( DB_ICON );
chooseConnectionButton.setToolTipText(
I18N.get("jump.workbench.ui.plugin.datastore.ConnectionPanel.Connection-Manager"));
chooseConnectionButton.setMargin( new Insets( 0, 0, 0, 0 ) );
chooseConnectionButton.addActionListener(
Deleted:
core/trunk/src/com/vividsolutions/jump/workbench/ui/plugin/datastore/databases.gif
===================================================================
(Binary files differ)
Deleted:
core/trunk/src/com/vividsolutions/jump/workbench/ui/plugin/datastore/deleteDatabase.gif
===================================================================
(Binary files differ)
Deleted:
core/trunk/src/com/vividsolutions/jump/workbench/ui/plugin/datastore/green_circle.png
===================================================================
(Binary files differ)
Deleted:
core/trunk/src/com/vividsolutions/jump/workbench/ui/plugin/datastore/ko_mysql.png
===================================================================
(Binary files differ)
Deleted:
core/trunk/src/com/vividsolutions/jump/workbench/ui/plugin/datastore/ko_oracle.png
===================================================================
(Binary files differ)
Deleted:
core/trunk/src/com/vividsolutions/jump/workbench/ui/plugin/datastore/ko_pg.png
===================================================================
(Binary files differ)
Deleted:
core/trunk/src/com/vividsolutions/jump/workbench/ui/plugin/datastore/ko_sqlite.png
===================================================================
(Binary files differ)
Deleted:
core/trunk/src/com/vividsolutions/jump/workbench/ui/plugin/datastore/ko_sqlserver.png
===================================================================
(Binary files differ)
Deleted:
core/trunk/src/com/vividsolutions/jump/workbench/ui/plugin/datastore/newDatabase.gif
===================================================================
(Binary files differ)
Deleted:
core/trunk/src/com/vividsolutions/jump/workbench/ui/plugin/datastore/ok_mysql.png
===================================================================
(Binary files differ)
Deleted:
core/trunk/src/com/vividsolutions/jump/workbench/ui/plugin/datastore/ok_oracle.png
===================================================================
(Binary files differ)
Deleted:
core/trunk/src/com/vividsolutions/jump/workbench/ui/plugin/datastore/ok_pg.png
===================================================================
(Binary files differ)
Deleted:
core/trunk/src/com/vividsolutions/jump/workbench/ui/plugin/datastore/ok_sqlite.png
===================================================================
(Binary files differ)
Deleted:
core/trunk/src/com/vividsolutions/jump/workbench/ui/plugin/datastore/ok_sqlserver.png
===================================================================
(Binary files differ)
Deleted:
core/trunk/src/com/vividsolutions/jump/workbench/ui/plugin/datastore/small_red_x.png
===================================================================
(Binary files differ)
------------------------------------------------------------------------------
_______________________________________________
Jump-pilot-devel mailing list
Jump-pilot-devel@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/jump-pilot-devel
