From 6599a3a1762d98094cb965e460dbf3b7ce6918e4 Mon Sep 17 00:00:00 2001 From: Julian Zobel Date: Tue, 21 Jan 2020 17:02:05 +0100 Subject: [PATCH] Made XML parsing error in configurator more definitive of the error (but still not very verbose about whats the "real" problem" --- .../tud/kom/p2psim/impl/scenario/DefaultConfigurator.java | 6 +++--- src/de/tud/kom/p2psim/impl/util/oracle/GlobalOracle.java | 2 -- 2 files changed, 3 insertions(+), 5 deletions(-) diff --git a/src/de/tud/kom/p2psim/impl/scenario/DefaultConfigurator.java b/src/de/tud/kom/p2psim/impl/scenario/DefaultConfigurator.java index 3ad50209..e7103b32 100644 --- a/src/de/tud/kom/p2psim/impl/scenario/DefaultConfigurator.java +++ b/src/de/tud/kom/p2psim/impl/scenario/DefaultConfigurator.java @@ -245,13 +245,13 @@ public class DefaultConfigurator implements Configurator { return componentList; } catch (DocumentException e) { throw new ConfigurationException( - "Failed to load configuration from file " + configFile, e); + "Failed to load configuration from file " + configFile + " (DocumentException)", e); } catch (ParserConfigurationException e) { throw new ConfigurationException( - "Failed to load configuration from file " + configFile, e); + "Failed to load configuration from file " + configFile + " (ParserConfigurationException)", e); } catch (SAXException e) { throw new ConfigurationException( - "Failed to load configuration from file " + configFile, e); + "Failed to load configuration from file " + configFile + " (SAXException)", e); } } diff --git a/src/de/tud/kom/p2psim/impl/util/oracle/GlobalOracle.java b/src/de/tud/kom/p2psim/impl/util/oracle/GlobalOracle.java index 7dcbc484..0d1084e0 100644 --- a/src/de/tud/kom/p2psim/impl/util/oracle/GlobalOracle.java +++ b/src/de/tud/kom/p2psim/impl/util/oracle/GlobalOracle.java @@ -33,11 +33,9 @@ import de.tud.kom.p2psim.api.common.SimHost; import de.tudarmstadt.maki.simonstrator.api.Graphs; import de.tudarmstadt.maki.simonstrator.api.Host; import de.tudarmstadt.maki.simonstrator.api.Randoms; -import de.tudarmstadt.maki.simonstrator.api.common.graph.DirectedEdge; import de.tudarmstadt.maki.simonstrator.api.common.graph.Graph; import de.tudarmstadt.maki.simonstrator.api.common.graph.IEdge; import de.tudarmstadt.maki.simonstrator.api.common.graph.INode; -import de.tudarmstadt.maki.simonstrator.api.common.graph.Node; import de.tudarmstadt.maki.simonstrator.api.component.ComponentNotAvailableException; import de.tudarmstadt.maki.simonstrator.api.component.core.OracleComponent; import de.tudarmstadt.maki.simonstrator.api.component.network.NetID; -- GitLab