Mercurial > dive4elements > river
diff flys-client/src/main/java/de/intevation/flys/client/server/ArtifactDescriptionFactory.java @ 1367:ab8eb2f544f2
Replaced stdout and stderr logging with log4j loggers in server classes.
flys-client/trunk@3069 c6561f87-3c4e-4783-a992-168aeb5c3f6f
author | Ingo Weinzierl <ingo.weinzierl@intevation.de> |
---|---|
date | Tue, 25 Oct 2011 12:31:15 +0000 |
parents | 6a1cd38e6e18 |
children | df9baca681a0 |
line wrap: on
line diff
--- a/flys-client/src/main/java/de/intevation/flys/client/server/ArtifactDescriptionFactory.java Tue Oct 25 11:07:14 2011 +0000 +++ b/flys-client/src/main/java/de/intevation/flys/client/server/ArtifactDescriptionFactory.java Tue Oct 25 12:31:15 2011 +0000 @@ -10,6 +10,8 @@ import org.w3c.dom.Node; import org.w3c.dom.NodeList; +import org.apache.log4j.Logger; + import de.intevation.artifacts.common.ArtifactNamespaceContext; import de.intevation.artifacts.common.utils.ClientProtocolUtils; import de.intevation.artifacts.common.utils.XMLUtils; @@ -36,6 +38,10 @@ */ public class ArtifactDescriptionFactory { + private static final Logger logger = + Logger.getLogger(ArtifactDescriptionFactory.class); + + public static final String XPATH_STATE_NAME = "@art:name"; public static final String XPATH_UIPROVIDER = "@art:uiprovider"; @@ -60,7 +66,7 @@ * @return the {@link ArtifactDescription}. */ public static ArtifactDescription createArtifactDescription(Document doc) { - System.out.println("ArtifactDescriptionFactory - create()"); + logger.debug("ArtifactDescriptionFactory.createArtifactDescription"); Node currentState = ClientProtocolUtils.getCurrentState(doc); Node staticNode = ClientProtocolUtils.getStaticUI(doc); @@ -73,7 +79,8 @@ XPATH_STATE_NAME, XPathConstants.STRING, ArtifactNamespaceContext.INSTANCE); - System.out.println("Current state name: " + state); + + logger.debug("Current state name: " + state); DataList currentData = extractCurrentData(dynamicNode, state); DataList[] old = extractOldData(staticNode); @@ -103,7 +110,7 @@ * entered. */ protected static DataList extractCurrentData(Node dynamicNode, String state) { - System.out.println("ArtifactDescriptionFactory - extractCurrentData()"); + logger.debug("ArtifactDescriptionFactory.extractCurrentData"); NodeList data = ClientProtocolUtils.getSelectNode(dynamicNode); String uiProvider = extractUIProvider(dynamicNode); @@ -141,8 +148,7 @@ * @return the default DataItem. */ protected static DataItem extractDefaultDataItem(Node data) { - System.out.println( - "ArtifactDescriptionFactory - extractSelectedDataItem"); + logger.debug("ArtifactDescriptionFactory.extractDefaultDataItem"); String value = XMLUtils.xpathString( data, "@art:defaultValue", ArtifactNamespaceContext.INSTANCE); @@ -166,11 +172,10 @@ * @return the {@link DataItem}s. */ protected static DataItem[] extractCurrentDataItems(NodeList items) { - System.out.println( - "ArtifactDescriptionFactory - extractCurrentDataItems()"); + logger.debug("ArtifactDescriptionFactory.extractCurrentDataItems"); if (items == null || items.getLength() == 0) { - System.out.println("No data items found."); + logger.debug("No data items found."); return null; } @@ -199,10 +204,10 @@ protected static double[] extractMinMaxQValues(Node item) { - System.out.println("ArtifactDescriptionFactory - extractMinMaxQValues"); + logger.debug("ArtifactDescriptionFactory.extractMinMaxQValues"); if (item == null) { - System.err.println("This node is empty - no min/max Q values."); + logger.debug("This node is empty - no min/max Q values."); return null; } @@ -213,7 +218,7 @@ ArtifactNamespaceContext.INSTANCE); if (node == null) { - System.out.println("No min/max Q values found."); + logger.debug("No min/max Q values found."); return null; } @@ -222,10 +227,10 @@ protected static double[] extractMinMaxWValues(Node item) { - System.out.println("ArtifactDescriptionFactory - extractMinMaxWValues"); + logger.debug("ArtifactDescriptionFactory.extractMinMaxWValues"); if (item == null) { - System.err.println("This node is empty - no min/max W values."); + logger.debug("This node is empty - no min/max W values."); return null; } @@ -236,7 +241,7 @@ ArtifactNamespaceContext.INSTANCE); if (node == null) { - System.out.println("No min/max W values found."); + logger.debug("No min/max W values found."); return null; } @@ -245,7 +250,7 @@ protected static double[] extractMinMaxValues(Node node) { - System.out.println("ArtifactDescriptionFactory.extractMinMaxValues"); + logger.debug("ArtifactDescriptionFactory.extractMinMaxValues"); String minStr = XMLUtils.xpathString( node, "art:min/text()", ArtifactNamespaceContext.INSTANCE); @@ -254,7 +259,7 @@ node, "art:max/text()", ArtifactNamespaceContext.INSTANCE); if (maxStr == null || minStr == null) { - System.err.println("No min/max values found."); + logger.debug("No min/max values found."); return null; } @@ -265,7 +270,7 @@ return new double[] { min, max }; } catch (NumberFormatException nfe) { - System.err.println("Error while parsing min/max values."); + logger.debug("Error while parsing min/max values."); } return null; @@ -281,7 +286,7 @@ * @return the DataList objects. */ protected static DataList[] extractOldData(Node staticNode) { - System.out.println("ArtifactDescriptionFactory - extractOldData()"); + logger.debug("ArtifactDescriptionFactory.extractOldData()"); NodeList stateNodes = (NodeList) XMLUtils.xpath( staticNode, @@ -290,7 +295,7 @@ ArtifactNamespaceContext.INSTANCE); if (stateNodes == null || stateNodes.getLength() == 0) { - System.out.println("No old items found."); + logger.debug("No old items found."); return null; } @@ -356,7 +361,7 @@ ArtifactNamespaceContext.INSTANCE); if (itemList == null || itemList.getLength() == 0) { - System.out.println("No old data items found."); + logger.debug("No old data items found."); return null; } @@ -403,7 +408,7 @@ * @return an array with identifiers of reachable states. */ protected static String[] extractReachableStates(Node reachable) { - System.out.println("ArtifactDescriptionFactory - extractReachableStates()"); + logger.debug("ArtifactDescriptionFactory.extractReachableStates()"); NodeList list = (NodeList) XMLUtils.xpath( reachable, @@ -441,7 +446,7 @@ * @return an array of Output modes. */ protected static OutputMode[] extractOutputModes(NodeList outputs) { - System.out.println("ArtifactDescriptionFactory - extractOutputModes()"); + logger.debug("ArtifactDescriptionFactory.extractOutputModes"); if (outputs == null || outputs.getLength() == 0) { return null; @@ -465,7 +470,7 @@ outs.add(new DefaultOutputMode(name, desc, mimeType)); } else { - System.err.println("Found an invalid output mode."); + logger.debug("Found an invalid output mode."); } } @@ -474,7 +479,7 @@ protected static Recommendation[] extractRecommendedArtifacts(Document doc){ - System.out.println("ArtifactDescriptionFactory - extract recommended."); + logger.debug("ArtifactDescriptionFactory.extractRecommendedArtifacts."); NodeList list = (NodeList) XMLUtils.xpath( doc,