From 6a50c4fe1f872e4aa536099794235d524c3819d5 Mon Sep 17 00:00:00 2001 From: Diana Norgaard Date: Mon, 22 May 2017 09:52:35 -0700 Subject: [PATCH 1/2] fix Version import --- .../java/gov/usgs/volcanoes/swarm/event/EventDialog.java | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/src/main/java/gov/usgs/volcanoes/swarm/event/EventDialog.java b/src/main/java/gov/usgs/volcanoes/swarm/event/EventDialog.java index d244a1ad..2616db86 100644 --- a/src/main/java/gov/usgs/volcanoes/swarm/event/EventDialog.java +++ b/src/main/java/gov/usgs/volcanoes/swarm/event/EventDialog.java @@ -4,7 +4,6 @@ import com.jgoodies.forms.factories.Borders; import com.jgoodies.forms.layout.FormLayout; -import gov.usgs.volcanoes.core.Version; import gov.usgs.volcanoes.core.quakeml.Event; import gov.usgs.volcanoes.core.quakeml.EventType; import gov.usgs.volcanoes.core.quakeml.EventTypeCertainty; @@ -13,6 +12,7 @@ import gov.usgs.volcanoes.swarm.Swarm; import gov.usgs.volcanoes.swarm.SwarmConfig; import gov.usgs.volcanoes.swarm.SwarmModalDialog; +import gov.usgs.volcanoes.swarm.Version; import gov.usgs.volcanoes.swarm.wave.WaveClipboardFrame; import gov.usgs.volcanoes.swarm.wave.WaveViewPanel; @@ -52,7 +52,7 @@ public class EventDialog extends SwarmModalDialog { private static final long serialVersionUID = 4870724789310886277L; private static EventDialog dialog; - public static final String QUAKEML_RESOURCE_ID = "quakeml:volcanoes.usgs.gov/Swarm/v" + public static String QUAKEML_RESOURCE_ID = "quakeml:volcanoes.usgs.gov/Swarm/v" + Version.POM_VERSION + "/" + SwarmConfig.getInstance().getUser(); private JComboBox eventType; private JComboBox eventTypeCertainty; @@ -67,6 +67,8 @@ private EventDialog() { super(Swarm.getApplicationFrame(), "Save Event"); setSizeAndLocation(); user = SwarmConfig.getInstance().getUser(); + QUAKEML_RESOURCE_ID = "quakeml:volcanoes.usgs.gov/Swarm/v" + + Version.POM_VERSION + "/" + SwarmConfig.getInstance().getUser(); } /** From 71c1ce6b1b8641f485f03b259b2e42587cdba702 Mon Sep 17 00:00:00 2001 From: Diana Norgaard Date: Mon, 22 May 2017 09:54:27 -0700 Subject: [PATCH 2/2] remove setting of QUAKEML_RESOURCE_ID in constructor --- src/main/java/gov/usgs/volcanoes/swarm/event/EventDialog.java | 2 -- 1 file changed, 2 deletions(-) diff --git a/src/main/java/gov/usgs/volcanoes/swarm/event/EventDialog.java b/src/main/java/gov/usgs/volcanoes/swarm/event/EventDialog.java index 2616db86..9290947d 100644 --- a/src/main/java/gov/usgs/volcanoes/swarm/event/EventDialog.java +++ b/src/main/java/gov/usgs/volcanoes/swarm/event/EventDialog.java @@ -67,8 +67,6 @@ private EventDialog() { super(Swarm.getApplicationFrame(), "Save Event"); setSizeAndLocation(); user = SwarmConfig.getInstance().getUser(); - QUAKEML_RESOURCE_ID = "quakeml:volcanoes.usgs.gov/Swarm/v" - + Version.POM_VERSION + "/" + SwarmConfig.getInstance().getUser(); } /**