| commit | 0da600e9ebf0b1c9b34f9c83c8688a14f0732da2 | [log] [tgz] |
|---|---|---|
| author | deboer <deboer> | Wed Sep 07 17:38:01 2005 +0000 |
| committer | deboer <deboer> | Wed Sep 07 17:38:01 2005 +0000 |
| tree | 49b3bdb7e520893b8a4f92e9975b609df8d85779 | |
| parent | 0a872649b649532cdf20a8eb5ec9a267bb9bfc30 [diff] |
[107539] Monitor dialog popup menu
diff --git a/plugins/org.eclipse.wst.server.ui/serverui/org/eclipse/wst/server/ui/internal/view/servers/MonitorServerPortAction.java b/plugins/org.eclipse.wst.server.ui/serverui/org/eclipse/wst/server/ui/internal/view/servers/MonitorServerPortAction.java index 7f8dc80..d63b630 100644 --- a/plugins/org.eclipse.wst.server.ui/serverui/org/eclipse/wst/server/ui/internal/view/servers/MonitorServerPortAction.java +++ b/plugins/org.eclipse.wst.server.ui/serverui/org/eclipse/wst/server/ui/internal/view/servers/MonitorServerPortAction.java
@@ -41,13 +41,14 @@ if (msps != null) { int size = msps.length; for (int i = 0; i < size; i++) { - if (port.equals(msps[i].getServerPort()) && msps[i].isStarted() && - (msps[i].getContentTypes() == null || (port.getContentTypes() != null && msps[i].getContentTypes().length == port.getContentTypes().length))) + if (port.equals(msps[i].getServerPort()) && // msps[i].isStarted() && + (msps[i].getContentTypes() == null || msps[i].getContentTypes().length == 0 || + (port.getContentTypes() != null && msps[i].getContentTypes().length == port.getContentTypes().length))) monitoredPort = msps[i]; } } - checked = monitoredPort != null && monitoredPort.isStarted(); + checked = monitoredPort != null; // && monitoredPort.isStarted(); setChecked(checked); }
diff --git a/plugins/org.eclipse.wst.server.ui/serverui/org/eclipse/wst/server/ui/internal/view/servers/ServersView.java b/plugins/org.eclipse.wst.server.ui/serverui/org/eclipse/wst/server/ui/internal/view/servers/ServersView.java index 5e8361e..2686116 100644 --- a/plugins/org.eclipse.wst.server.ui/serverui/org/eclipse/wst/server/ui/internal/view/servers/ServersView.java +++ b/plugins/org.eclipse.wst.server.ui/serverui/org/eclipse/wst/server/ui/internal/view/servers/ServersView.java
@@ -366,6 +366,9 @@ } } + if (!menuManager.isEmpty()) + menuManager.add(new Separator()); + menuManager.add(new MonitorServerAction(shell2, server2)); } });