From 388ac3a202611c47b2391d82f68bf3f4d30b89a3 Mon Sep 17 00:00:00 2001 From: pompert <sdos@astron.nl> Date: Tue, 23 May 2006 14:16:57 +0000 Subject: [PATCH] 725 Additions: -None Mods: -Modified the getRootNode argument from String[] to Object to support more possible types of user arguments --- .../lofar/sas/otb/util/treemanagers/ITreeManager.java | 2 +- .../sas/otb/util/treemanagers/OTDBNodeTreeManager.java | 4 ++-- .../sas/otb/util/treemanagers/OTDBParamTreeManager.java | 4 ++-- .../lofar/sas/otb/util/treemanagers/ParmDBTreeManager.java | 7 ++++--- 4 files changed, 9 insertions(+), 8 deletions(-) diff --git a/SAS/OTB/OTB/src/nl/astron/lofar/sas/otb/util/treemanagers/ITreeManager.java b/SAS/OTB/OTB/src/nl/astron/lofar/sas/otb/util/treemanagers/ITreeManager.java index 1c4d00f1a0e..e5b496b8179 100644 --- a/SAS/OTB/OTB/src/nl/astron/lofar/sas/otb/util/treemanagers/ITreeManager.java +++ b/SAS/OTB/OTB/src/nl/astron/lofar/sas/otb/util/treemanagers/ITreeManager.java @@ -26,5 +26,5 @@ public interface ITreeManager { public void defineChildsForNode(TreeNode aNode); - public TreeNode getRootNode(String[] arguments); + public TreeNode getRootNode(Object arguments); } diff --git a/SAS/OTB/OTB/src/nl/astron/lofar/sas/otb/util/treemanagers/OTDBNodeTreeManager.java b/SAS/OTB/OTB/src/nl/astron/lofar/sas/otb/util/treemanagers/OTDBNodeTreeManager.java index 5d67a1c5f63..0d9dc937b8c 100644 --- a/SAS/OTB/OTB/src/nl/astron/lofar/sas/otb/util/treemanagers/OTDBNodeTreeManager.java +++ b/SAS/OTB/OTB/src/nl/astron/lofar/sas/otb/util/treemanagers/OTDBNodeTreeManager.java @@ -108,11 +108,11 @@ public class OTDBNodeTreeManager extends GenericTreeManager implements ITreeMana logger.fatal("Exception during TreeManager OTDB-defineChildNodes",e); } } - public TreeNode getRootNode(String[] arguments){ + public TreeNode getRootNode(Object arguments){ jOTDBnode otdbNode=null; int itsTreeID = 0; try { - itsTreeID = Integer.parseInt(arguments[0]); + itsTreeID = Integer.parseInt(arguments.toString()); } catch (NumberFormatException ex) { logger.error("The OTDBNodeTreeManager received an incorrect TreeID! ",ex); } diff --git a/SAS/OTB/OTB/src/nl/astron/lofar/sas/otb/util/treemanagers/OTDBParamTreeManager.java b/SAS/OTB/OTB/src/nl/astron/lofar/sas/otb/util/treemanagers/OTDBParamTreeManager.java index af8f8f4ce98..3c44d885dbe 100644 --- a/SAS/OTB/OTB/src/nl/astron/lofar/sas/otb/util/treemanagers/OTDBParamTreeManager.java +++ b/SAS/OTB/OTB/src/nl/astron/lofar/sas/otb/util/treemanagers/OTDBParamTreeManager.java @@ -116,12 +116,12 @@ public class OTDBParamTreeManager extends GenericTreeManager implements ITreeMan logger.trace("Exit - TreeManager defineChildNodes("+toString()+")"); } - public TreeNode getRootNode(String[] arguments){ + public TreeNode getRootNode(Object arguments){ jOTDBparam aParam =null; jVICnodeDef aVICnodeDef=null; int itsComponentID = 0; try { - itsComponentID = Integer.parseInt(arguments[0]); + itsComponentID = Integer.parseInt(arguments.toString()); } catch (NumberFormatException ex) { logger.error("The OTDBParamTreeManager received an incorrect itsComponentID! ",ex); } diff --git a/SAS/OTB/OTB/src/nl/astron/lofar/sas/otb/util/treemanagers/ParmDBTreeManager.java b/SAS/OTB/OTB/src/nl/astron/lofar/sas/otb/util/treemanagers/ParmDBTreeManager.java index 55746bafd7f..925313edec1 100644 --- a/SAS/OTB/OTB/src/nl/astron/lofar/sas/otb/util/treemanagers/ParmDBTreeManager.java +++ b/SAS/OTB/OTB/src/nl/astron/lofar/sas/otb/util/treemanagers/ParmDBTreeManager.java @@ -127,9 +127,10 @@ public class ParmDBTreeManager extends GenericTreeManager implements ITreeManage logger.trace("Exit - TreeManager defineChildNodes("+toString()+")"); } - public TreeNode getRootNode(String[] arguments){ - jParmDBnode newPNode = new jParmDBnode(arguments[0],arguments[1]); - newPNode.name="ParmDB"; + public TreeNode getRootNode(Object arguments){ + String[] argumentArray = (String[])arguments; + jParmDBnode newPNode = new jParmDBnode(argumentArray[0],argumentArray[1]); + newPNode.name=argumentArray[0]; TreeNode parmDBnode = new TreeNode(this.instance,newPNode,newPNode.name); return parmDBnode; -- GitLab