[Hyperic-hq-discuss] hq r3901 - trunk/src/org/hyperic/hq/product

[<do...@hy...>]

Author: dougm
Date: 2007-03-25 18:17:41 -0800 (Sun, 25 Mar 2007)
New Revision: 3901
URL: http://svn.hyperic.org/?view=rev&root=Hyperic+HQ&revision=3901

Modified:
   trunk/src/org/hyperic/hq/product/ProcessControlPlugin.java
Log:
make signal mapping re-useable

Modified: trunk/src/org/hyperic/hq/product/ProcessControlPlugin.java
===================================================================
--- trunk/src/org/hyperic/hq/product/ProcessControlPlugin.java	2007-03-26 02:04:07 UTC (rev 3900)
+++ trunk/src/org/hyperic/hq/product/ProcessControlPlugin.java	2007-03-26 02:17:41 UTC (rev 3901)
@@ -124,6 +124,28 @@
         return false;
     }
 
+    public static int getSignal(String signal)
+        throws PluginException {
+
+        if (Character.isDigit(signal.charAt(0))) {
+            try {
+                return Integer.parseInt(signal);
+            } catch (NumberFormatException e) {
+                throw new PluginException(signal + ": " + e);
+            }
+        }
+        else {
+            Integer num = (Integer)SIGNALS.get(signal);
+            if (num == null) {
+                num = (Integer)SIGNALS.get("SIG" + signal);
+            }
+            if (num == null) {
+                throw new PluginException("Invalid signal: " + signal);
+            }
+            return num.intValue();
+        }
+    }
+
     public void doAction(String action, String[] args)
         throws PluginException {
 
@@ -150,25 +172,7 @@
             throw new PluginException("Too many arguments");
         }
 
-        int signum;
-        if (Character.isDigit(signal.charAt(0))) {
-            try {
-                signum = Integer.parseInt(signal);
-            } catch (NumberFormatException e) {
-                throw new PluginException(signal + ": " + e);
-            }
-        }
-        else {
-            Integer num = (Integer)SIGNALS.get(signal);
-            if (num == null) {
-                num = (Integer)SIGNALS.get("SIG" + signal);
-            }
-            if (num == null) {
-                throw new PluginException("Invalid signal: " + signal);
-            }
-            signum = num.intValue();
-        }
-
+        int signum = getSignal(signal);
         Sigar sigar = new Sigar();
         long[] pids;
         List killed = new ArrayList();