diff options
70 files changed, 52 insertions, 10 deletions
diff --git a/java/resources/icons/16x16/adapter_active.png b/java/resources/icons/16x16/adapter_active.png Binary files differindex b156abf9bde..c2a7ecb8b70 100755 --- a/java/resources/icons/16x16/adapter_active.png +++ b/java/resources/icons/16x16/adapter_active.png diff --git a/java/resources/icons/16x16/adapter_inactive.png b/java/resources/icons/16x16/adapter_inactive.png Binary files differindex 29e7bdde9d4..127b4e13dd0 100755 --- a/java/resources/icons/16x16/adapter_inactive.png +++ b/java/resources/icons/16x16/adapter_inactive.png diff --git a/java/resources/icons/16x16/icebox_server_disabled.png b/java/resources/icons/16x16/application_closed.png Binary files differindex 9f49132f157..a6b1be9c16b 100755 --- a/java/resources/icons/16x16/icebox_server_disabled.png +++ b/java/resources/icons/16x16/application_closed.png diff --git a/java/resources/icons/16x16/server_disabled.png b/java/resources/icons/16x16/application_open.png Binary files differindex 8dc7600b5da..d9dc843c2e9 100755 --- a/java/resources/icons/16x16/server_disabled.png +++ b/java/resources/icons/16x16/application_open.png diff --git a/java/resources/icons/16x16/database.png b/java/resources/icons/16x16/database.png Binary files differindex b17ae1090ac..37f076b152f 100755 --- a/java/resources/icons/16x16/database.png +++ b/java/resources/icons/16x16/database.png diff --git a/java/resources/icons/16x16/application.png b/java/resources/icons/16x16/disable.png Binary files differindex 25a6f03927f..85d2df343fa 100755 --- a/java/resources/icons/16x16/application.png +++ b/java/resources/icons/16x16/disable.png diff --git a/java/resources/icons/24x24/enable.png b/java/resources/icons/16x16/enable.png Binary files differindex fe12de84135..a5846da73af 100755 --- a/java/resources/icons/24x24/enable.png +++ b/java/resources/icons/16x16/enable.png diff --git a/java/resources/icons/16x16/icebox_server_activating.png b/java/resources/icons/16x16/icebox_server_activating.png Binary files differindex 0f36d924299..6a4f325b618 100755 --- a/java/resources/icons/16x16/icebox_server_activating.png +++ b/java/resources/icons/16x16/icebox_server_activating.png diff --git a/java/resources/icons/16x16/icebox_server_active.png b/java/resources/icons/16x16/icebox_server_active.png Binary files differindex 27e315d1e42..dfb1c40f997 100755 --- a/java/resources/icons/16x16/icebox_server_active.png +++ b/java/resources/icons/16x16/icebox_server_active.png diff --git a/java/resources/icons/16x16/icebox_server_deactivating.png b/java/resources/icons/16x16/icebox_server_deactivating.png Binary files differindex b25db5166c7..6ec037a11eb 100755 --- a/java/resources/icons/16x16/icebox_server_deactivating.png +++ b/java/resources/icons/16x16/icebox_server_deactivating.png diff --git a/java/resources/icons/16x16/icebox_server_destroyed.png b/java/resources/icons/16x16/icebox_server_destroyed.png Binary files differindex 412e644740b..775464df161 100755 --- a/java/resources/icons/16x16/icebox_server_destroyed.png +++ b/java/resources/icons/16x16/icebox_server_destroyed.png diff --git a/java/resources/icons/16x16/icebox_server_destroying.png b/java/resources/icons/16x16/icebox_server_destroying.png Binary files differindex 412e644740b..775464df161 100755 --- a/java/resources/icons/16x16/icebox_server_destroying.png +++ b/java/resources/icons/16x16/icebox_server_destroying.png diff --git a/java/resources/icons/16x16/icebox_server_disabled_activating.png b/java/resources/icons/16x16/icebox_server_disabled_activating.png Binary files differnew file mode 100755 index 00000000000..59253ff7d76 --- /dev/null +++ b/java/resources/icons/16x16/icebox_server_disabled_activating.png diff --git a/java/resources/icons/16x16/icebox_server_disabled_active.png b/java/resources/icons/16x16/icebox_server_disabled_active.png Binary files differnew file mode 100755 index 00000000000..0406e5a5ce9 --- /dev/null +++ b/java/resources/icons/16x16/icebox_server_disabled_active.png diff --git a/java/resources/icons/16x16/icebox_server_disabled_deactivating.png b/java/resources/icons/16x16/icebox_server_disabled_deactivating.png Binary files differnew file mode 100755 index 00000000000..3aa4001df91 --- /dev/null +++ b/java/resources/icons/16x16/icebox_server_disabled_deactivating.png diff --git a/java/resources/icons/16x16/icebox_server_disabled_destroyed.png b/java/resources/icons/16x16/icebox_server_disabled_destroyed.png Binary files differnew file mode 100755 index 00000000000..4e9afa0e2ea --- /dev/null +++ b/java/resources/icons/16x16/icebox_server_disabled_destroyed.png diff --git a/java/resources/icons/16x16/icebox_server_disabled_destroying.png b/java/resources/icons/16x16/icebox_server_disabled_destroying.png Binary files differnew file mode 100755 index 00000000000..4e9afa0e2ea --- /dev/null +++ b/java/resources/icons/16x16/icebox_server_disabled_destroying.png diff --git a/java/resources/icons/16x16/icebox_server_disabled_inactive.png b/java/resources/icons/16x16/icebox_server_disabled_inactive.png Binary files differnew file mode 100755 index 00000000000..3686ddc8b82 --- /dev/null +++ b/java/resources/icons/16x16/icebox_server_disabled_inactive.png diff --git a/java/resources/icons/16x16/icebox_server_inactive.png b/java/resources/icons/16x16/icebox_server_inactive.png Binary files differindex 4a5ce6e48e7..531ef245307 100755 --- a/java/resources/icons/16x16/icebox_server_inactive.png +++ b/java/resources/icons/16x16/icebox_server_inactive.png diff --git a/java/resources/icons/16x16/icebox_server_template.png b/java/resources/icons/16x16/icebox_server_template.png Binary files differindex da5d646475c..6a0a97752ef 100755 --- a/java/resources/icons/16x16/icebox_server_template.png +++ b/java/resources/icons/16x16/icebox_server_template.png diff --git a/java/resources/icons/16x16/icebox_server_unknown.png b/java/resources/icons/16x16/icebox_server_unknown.png Binary files differindex 2f39348eb57..b1e1820f36f 100755 --- a/java/resources/icons/16x16/icebox_server_unknown.png +++ b/java/resources/icons/16x16/icebox_server_unknown.png diff --git a/java/resources/icons/16x16/node_down.png b/java/resources/icons/16x16/node_down.png Binary files differindex 53e86b32aa7..44c340c4906 100755 --- a/java/resources/icons/16x16/node_down.png +++ b/java/resources/icons/16x16/node_down.png diff --git a/java/resources/icons/16x16/node_up.png b/java/resources/icons/16x16/node_up.png Binary files differindex 162a7a45f39..27a716235da 100755 --- a/java/resources/icons/16x16/node_up.png +++ b/java/resources/icons/16x16/node_up.png diff --git a/java/resources/icons/16x16/replica_group.png b/java/resources/icons/16x16/replica_group.png Binary files differindex 41628b1b833..5f856c87a51 100755 --- a/java/resources/icons/16x16/replica_group.png +++ b/java/resources/icons/16x16/replica_group.png diff --git a/java/resources/icons/16x16/server_activating.png b/java/resources/icons/16x16/server_activating.png Binary files differindex 52be09f6bad..99376cf5528 100755 --- a/java/resources/icons/16x16/server_activating.png +++ b/java/resources/icons/16x16/server_activating.png diff --git a/java/resources/icons/16x16/server_active.png b/java/resources/icons/16x16/server_active.png Binary files differindex 0344bbdc199..68ab5a3194a 100755 --- a/java/resources/icons/16x16/server_active.png +++ b/java/resources/icons/16x16/server_active.png diff --git a/java/resources/icons/16x16/server_deactivating.png b/java/resources/icons/16x16/server_deactivating.png Binary files differindex fccde9a4172..f748152297c 100755 --- a/java/resources/icons/16x16/server_deactivating.png +++ b/java/resources/icons/16x16/server_deactivating.png diff --git a/java/resources/icons/16x16/server_destroyed.png b/java/resources/icons/16x16/server_destroyed.png Binary files differindex 9e947cc61e3..27d09a72eab 100755 --- a/java/resources/icons/16x16/server_destroyed.png +++ b/java/resources/icons/16x16/server_destroyed.png diff --git a/java/resources/icons/16x16/server_destroying.png b/java/resources/icons/16x16/server_destroying.png Binary files differindex 9e947cc61e3..27d09a72eab 100755 --- a/java/resources/icons/16x16/server_destroying.png +++ b/java/resources/icons/16x16/server_destroying.png diff --git a/java/resources/icons/16x16/server_disabled_activating.png b/java/resources/icons/16x16/server_disabled_activating.png Binary files differnew file mode 100755 index 00000000000..a126dbfd798 --- /dev/null +++ b/java/resources/icons/16x16/server_disabled_activating.png diff --git a/java/resources/icons/16x16/server_disabled_active.png b/java/resources/icons/16x16/server_disabled_active.png Binary files differnew file mode 100755 index 00000000000..4579ae9063f --- /dev/null +++ b/java/resources/icons/16x16/server_disabled_active.png diff --git a/java/resources/icons/16x16/server_disabled_deactivating.png b/java/resources/icons/16x16/server_disabled_deactivating.png Binary files differnew file mode 100755 index 00000000000..6637d6685f6 --- /dev/null +++ b/java/resources/icons/16x16/server_disabled_deactivating.png diff --git a/java/resources/icons/16x16/server_disabled_destroyed.png b/java/resources/icons/16x16/server_disabled_destroyed.png Binary files differnew file mode 100755 index 00000000000..e50bb39a9b0 --- /dev/null +++ b/java/resources/icons/16x16/server_disabled_destroyed.png diff --git a/java/resources/icons/16x16/server_disabled_destroying.png b/java/resources/icons/16x16/server_disabled_destroying.png Binary files differnew file mode 100755 index 00000000000..e50bb39a9b0 --- /dev/null +++ b/java/resources/icons/16x16/server_disabled_destroying.png diff --git a/java/resources/icons/16x16/server_disabled_inactive.png b/java/resources/icons/16x16/server_disabled_inactive.png Binary files differnew file mode 100755 index 00000000000..a7bc21a0eae --- /dev/null +++ b/java/resources/icons/16x16/server_disabled_inactive.png diff --git a/java/resources/icons/16x16/server_template.png b/java/resources/icons/16x16/server_template.png Binary files differindex 08d058238ae..35b8a59f69a 100755 --- a/java/resources/icons/16x16/server_template.png +++ b/java/resources/icons/16x16/server_template.png diff --git a/java/resources/icons/16x16/server_unknown.png b/java/resources/icons/16x16/server_unknown.png Binary files differindex 952ba93b41e..ef5713e372f 100755 --- a/java/resources/icons/16x16/server_unknown.png +++ b/java/resources/icons/16x16/server_unknown.png diff --git a/java/resources/icons/16x16/service.png b/java/resources/icons/16x16/service.png Binary files differindex a3865c32c91..7b662ae7150 100755 --- a/java/resources/icons/16x16/service.png +++ b/java/resources/icons/16x16/service.png diff --git a/java/resources/icons/16x16/service_template.png b/java/resources/icons/16x16/service_template.png Binary files differindex 137b62f9008..8eb1b164ec9 100755 --- a/java/resources/icons/16x16/service_template.png +++ b/java/resources/icons/16x16/service_template.png diff --git a/java/resources/icons/16x16/start.png b/java/resources/icons/16x16/start.png Binary files differnew file mode 100755 index 00000000000..4dfa4c84b7a --- /dev/null +++ b/java/resources/icons/16x16/start.png diff --git a/java/resources/icons/24x24/disable.png b/java/resources/icons/16x16/stop.png Binary files differindex 963e1982686..dd0b29956f9 100755 --- a/java/resources/icons/24x24/disable.png +++ b/java/resources/icons/16x16/stop.png diff --git a/java/resources/icons/grid.png b/java/resources/icons/24x24/grid.png Binary files differindex 5fac9aa44dc..5fac9aa44dc 100755 --- a/java/resources/icons/grid.png +++ b/java/resources/icons/24x24/grid.png diff --git a/java/resources/icons/24x24/login.png b/java/resources/icons/24x24/login.png Binary files differindex d957f151f7f..00ade4a94ff 100755 --- a/java/resources/icons/24x24/login.png +++ b/java/resources/icons/24x24/login.png diff --git a/java/resources/icons/24x24/start.png b/java/resources/icons/24x24/start.png Binary files differdeleted file mode 100755 index b6f2e99984a..00000000000 --- a/java/resources/icons/24x24/start.png +++ /dev/null diff --git a/java/resources/icons/24x24/stop.png b/java/resources/icons/24x24/stop.png Binary files differdeleted file mode 100755 index 62ce79ab56e..00000000000 --- a/java/resources/icons/24x24/stop.png +++ /dev/null diff --git a/java/resources/icons/activating.png b/java/resources/icons/activating.png Binary files differdeleted file mode 100755 index d2354c461c0..00000000000 --- a/java/resources/icons/activating.png +++ /dev/null diff --git a/java/resources/icons/active.png b/java/resources/icons/active.png Binary files differdeleted file mode 100755 index 99ebc7117ee..00000000000 --- a/java/resources/icons/active.png +++ /dev/null diff --git a/java/resources/icons/connect.gif b/java/resources/icons/connect.gif Binary files differdeleted file mode 100755 index c2c72a72e0e..00000000000 --- a/java/resources/icons/connect.gif +++ /dev/null diff --git a/java/resources/icons/copy_edit.gif b/java/resources/icons/copy_edit.gif Binary files differdeleted file mode 100755 index 71d7c95aa8c..00000000000 --- a/java/resources/icons/copy_edit.gif +++ /dev/null diff --git a/java/resources/icons/cut_edit.gif b/java/resources/icons/cut_edit.gif Binary files differdeleted file mode 100755 index d044e59777b..00000000000 --- a/java/resources/icons/cut_edit.gif +++ /dev/null diff --git a/java/resources/icons/deactivating.png b/java/resources/icons/deactivating.png Binary files differdeleted file mode 100755 index a65915d8cae..00000000000 --- a/java/resources/icons/deactivating.png +++ /dev/null diff --git a/java/resources/icons/delete_edit.gif b/java/resources/icons/delete_edit.gif Binary files differdeleted file mode 100755 index b6922ac11cf..00000000000 --- a/java/resources/icons/delete_edit.gif +++ /dev/null diff --git a/java/resources/icons/destroyed.png b/java/resources/icons/destroyed.png Binary files differdeleted file mode 100755 index 6adb852434e..00000000000 --- a/java/resources/icons/destroyed.png +++ /dev/null diff --git a/java/resources/icons/destroying.png b/java/resources/icons/destroying.png Binary files differdeleted file mode 100755 index 7fc30e837d2..00000000000 --- a/java/resources/icons/destroying.png +++ /dev/null diff --git a/java/resources/icons/error_st_obj.gif b/java/resources/icons/error_st_obj.gif Binary files differdeleted file mode 100755 index 0bc60689c6d..00000000000 --- a/java/resources/icons/error_st_obj.gif +++ /dev/null diff --git a/java/resources/icons/inactive.png b/java/resources/icons/inactive.png Binary files differdeleted file mode 100755 index 34962ce5268..00000000000 --- a/java/resources/icons/inactive.png +++ /dev/null diff --git a/java/resources/icons/node_down_closed.png b/java/resources/icons/node_down_closed.png Binary files differdeleted file mode 100755 index 45202a9273d..00000000000 --- a/java/resources/icons/node_down_closed.png +++ /dev/null diff --git a/java/resources/icons/node_down_open.png b/java/resources/icons/node_down_open.png Binary files differdeleted file mode 100755 index f3132fd4762..00000000000 --- a/java/resources/icons/node_down_open.png +++ /dev/null diff --git a/java/resources/icons/node_up_closed.png b/java/resources/icons/node_up_closed.png Binary files differdeleted file mode 100755 index f2e769670b2..00000000000 --- a/java/resources/icons/node_up_closed.png +++ /dev/null diff --git a/java/resources/icons/node_up_open.png b/java/resources/icons/node_up_open.png Binary files differdeleted file mode 100755 index e88459ddcde..00000000000 --- a/java/resources/icons/node_up_open.png +++ /dev/null diff --git a/java/resources/icons/paste_edit.gif b/java/resources/icons/paste_edit.gif Binary files differdeleted file mode 100755 index 39dd4d9d38a..00000000000 --- a/java/resources/icons/paste_edit.gif +++ /dev/null diff --git a/java/resources/icons/save_edit.gif b/java/resources/icons/save_edit.gif Binary files differdeleted file mode 100755 index 499dd0ca602..00000000000 --- a/java/resources/icons/save_edit.gif +++ /dev/null diff --git a/java/resources/icons/undo_edit.gif b/java/resources/icons/undo_edit.gif Binary files differdeleted file mode 100755 index eae118ad168..00000000000 --- a/java/resources/icons/undo_edit.gif +++ /dev/null diff --git a/java/resources/icons/unknown.png b/java/resources/icons/unknown.png Binary files differdeleted file mode 100755 index 0cad6860de4..00000000000 --- a/java/resources/icons/unknown.png +++ /dev/null diff --git a/java/resources/icons/warning.gif b/java/resources/icons/warning.gif Binary files differdeleted file mode 100755 index 2f1c5a8fa7b..00000000000 --- a/java/resources/icons/warning.gif +++ /dev/null diff --git a/java/src/IceGrid/AdminGUI.java b/java/src/IceGrid/AdminGUI.java index c3a85696587..8fcdfd2cb2d 100755 --- a/java/src/IceGrid/AdminGUI.java +++ b/java/src/IceGrid/AdminGUI.java @@ -79,7 +79,7 @@ public class AdminGUI extends JFrame AdminGUI(String[] args)
{
super("IceGrid Admin");
- setIconImage(Utils.getIcon("/icons/grid.png").getImage());
+ setIconImage(Utils.getIcon("/icons/24x24/grid.png").getImage());
setDefaultCloseOperation(JFrame.DO_NOTHING_ON_CLOSE);
addWindowListener(new WindowAdapter()
diff --git a/java/src/IceGrid/Model.java b/java/src/IceGrid/Model.java index 97c7f5d70f3..e53e6f6e164 100755 --- a/java/src/IceGrid/Model.java +++ b/java/src/IceGrid/Model.java @@ -1462,7 +1462,7 @@ public class Model };
_actions[CommonBase.START] = new AbstractAction(
- "Start", Utils.getIcon("/icons/24x24/start.png"))
+ "Start", Utils.getIcon("/icons/16x16/start.png"))
{
public void actionPerformed(ActionEvent e)
{
@@ -1471,7 +1471,7 @@ public class Model };
_actions[CommonBase.STOP] = new AbstractAction(
- "Stop", Utils.getIcon("/icons/24x24/stop.png"))
+ "Stop", Utils.getIcon("/icons/16x16/stop.png"))
{
public void actionPerformed(ActionEvent e)
{
@@ -1480,7 +1480,7 @@ public class Model };
_actions[CommonBase.ENABLE] = new AbstractAction(
- "Enable", Utils.getIcon("/icons/24x24/enable.png"))
+ "Enable", Utils.getIcon("/icons/16x16/enable.png"))
{
public void actionPerformed(ActionEvent e)
{
@@ -1490,7 +1490,7 @@ public class Model };
_actions[CommonBase.DISABLE] = new AbstractAction(
- "Disable", Utils.getIcon("/icons/24x24/disable.png"))
+ "Disable", Utils.getIcon("/icons/16x16/disable.png"))
{
public void actionPerformed(ActionEvent e)
{
diff --git a/java/src/IceGrid/TreeNode/Application.java b/java/src/IceGrid/TreeNode/Application.java index 204ba0c50f9..9c90f5fdb10 100755 --- a/java/src/IceGrid/TreeNode/Application.java +++ b/java/src/IceGrid/TreeNode/Application.java @@ -69,9 +69,9 @@ public class Application extends EditableParent {
_cellRenderer = new DefaultTreeCellRenderer();
_cellRenderer.setOpenIcon(
- Utils.getIcon("/icons/16x16/application.png"));
+ Utils.getIcon("/icons/16x16/application_open.png"));
_cellRenderer.setClosedIcon(
- Utils.getIcon("/icons/16x16/application.png"));
+ Utils.getIcon("/icons/16x16/application_closed.png"));
}
return _cellRenderer.getTreeCellRendererComponent(
diff --git a/java/src/IceGrid/TreeNode/Server.java b/java/src/IceGrid/TreeNode/Server.java index 7410d2b8301..f6bfe511eb1 100755 --- a/java/src/IceGrid/TreeNode/Server.java +++ b/java/src/IceGrid/TreeNode/Server.java @@ -556,10 +556,45 @@ class Server extends EditableParent Utils.getIcon("/icons/16x16/icebox_server_destroying.png");
_icons[ServerState.Destroyed.value() + 1][1][0] =
Utils.getIcon("/icons/16x16/icebox_server_destroyed.png");
+
+ //
+ // Regular servers (disabled)
+ //
+ _icons[0][0][1] = Utils.getIcon("/icons/16x16/server_unknown.png");
+ _icons[ServerState.Inactive.value() + 1][0][1]
+ = Utils.getIcon("/icons/16x16/server_disabled_inactive.png");
+ _icons[ServerState.Activating.value() + 1][0][1] =
+ Utils.getIcon("/icons/16x16/server_disabled_activating.png");
+ _icons[ServerState.Active.value() + 1][0][1] =
+ Utils.getIcon("/icons/16x16/server_disabled_active.png");
+ _icons[ServerState.Deactivating.value() + 1][0][1] =
+ Utils.getIcon("/icons/16x16/server_disabled_deactivating.png");
+ _icons[ServerState.Destroying.value() + 1][0][1] =
+ Utils.getIcon("/icons/16x16/server_disabled_destroying.png");
+ _icons[ServerState.Destroyed.value() + 1][0][1] =
+ Utils.getIcon("/icons/16x16/server_disabled_destroyed.png");
+
+ //
+ // IceBox servers (disabled)
+ //
+ _icons[0][1][1] = Utils.getIcon("/icons/16x16/icebox_server_unknown.png");
+ _icons[ServerState.Inactive.value() + 1][1][1]
+ = Utils.getIcon("/icons/16x16/icebox_server_disabled_inactive.png");
+ _icons[ServerState.Activating.value() + 1][1][1] =
+ Utils.getIcon("/icons/16x16/icebox_server_disabled_activating.png");
+ _icons[ServerState.Active.value() + 1][1][1] =
+ Utils.getIcon("/icons/16x16/icebox_server_disabled_active.png");
+ _icons[ServerState.Deactivating.value() + 1][1][1] =
+ Utils.getIcon("/icons/16x16/icebox_server_disabled_deactivating.png");
+ _icons[ServerState.Destroying.value() + 1][1][1] =
+ Utils.getIcon("/icons/16x16/icebox_server_disabled_destroying.png");
+ _icons[ServerState.Destroyed.value() + 1][1][1] =
+ Utils.getIcon("/icons/16x16/icebox_server_disabled_destroyed.png");
+
}
int icebox = _serverDescriptor instanceof IceBoxDescriptor ? 1 : 0;
- int disabled = 0;
+ int disabled = _enabled ? 0 : 1;
if(expanded)
{
diff --git a/java/src/IceGrid/Utils.java b/java/src/IceGrid/Utils.java index 07804f2a003..ac51a6e2a16 100755 --- a/java/src/IceGrid/Utils.java +++ b/java/src/IceGrid/Utils.java @@ -15,8 +15,15 @@ public class Utils static public ImageIcon getIcon(String path)
{
java.net.URL imgURL = Utils.class.getResource(path);
- assert(imgURL != null);
- return new ImageIcon(imgURL);
+ if(imgURL == null)
+ {
+ System.err.println("Could not find icon " + path);
+ return null;
+ }
+ else
+ {
+ return new ImageIcon(imgURL);
+ }
}
static public interface Stringifier
|
