From 907a61c12bd8a34f2f579b79180b74ffa615239b Mon Sep 17 00:00:00 2001 From: englishman Date: Wed, 12 Aug 2015 21:48:45 -0400 Subject: [PATCH] CommentsConfig extracting --- src/net/azib/ipscan/config/CommentsConfig.java | 2 ++ src/net/azib/ipscan/config/ComponentRegistry.java | 1 - src/net/azib/ipscan/gui/DetailsWindow.java | 9 ++++++--- 3 files changed, 8 insertions(+), 4 deletions(-) diff --git a/src/net/azib/ipscan/config/CommentsConfig.java b/src/net/azib/ipscan/config/CommentsConfig.java index d8cfe110..d8e96747 100644 --- a/src/net/azib/ipscan/config/CommentsConfig.java +++ b/src/net/azib/ipscan/config/CommentsConfig.java @@ -10,6 +10,7 @@ import net.azib.ipscan.core.ScanningResult; import net.azib.ipscan.core.ScanningResultList; import net.azib.ipscan.fetchers.MACFetcher; +import javax.inject.Inject; import java.net.InetAddress; import java.util.prefs.Preferences; @@ -21,6 +22,7 @@ import java.util.prefs.Preferences; public class CommentsConfig { private Preferences preferences; + @Inject public CommentsConfig(Preferences preferences) { // use a separate node for comments - they can get large this.preferences = preferences.node("comments"); diff --git a/src/net/azib/ipscan/config/ComponentRegistry.java b/src/net/azib/ipscan/config/ComponentRegistry.java index c39f7f97..50ecd132 100644 --- a/src/net/azib/ipscan/config/ComponentRegistry.java +++ b/src/net/azib/ipscan/config/ComponentRegistry.java @@ -56,7 +56,6 @@ public class ComponentRegistry { container.registerComponentInstance(globalConfig.forOpeners()); container.registerComponentInstance(globalConfig.forFavorites()); container.registerComponentInstance(Labels.getInstance()); - container.registerComponentImplementation(CommentsConfig.class); container.registerComponentInstance(DaggerExporterComponent.create().get()); container.registerComponentInstance(DaggerFetcherComponent.create().get()); diff --git a/src/net/azib/ipscan/gui/DetailsWindow.java b/src/net/azib/ipscan/gui/DetailsWindow.java index cc725ff1..515989ce 100644 --- a/src/net/azib/ipscan/gui/DetailsWindow.java +++ b/src/net/azib/ipscan/gui/DetailsWindow.java @@ -20,6 +20,8 @@ import org.eclipse.swt.widgets.Event; import org.eclipse.swt.widgets.Listener; import org.eclipse.swt.widgets.Text; +import javax.inject.Inject; + /** * The "Show IP Details" Window * @@ -27,17 +29,18 @@ import org.eclipse.swt.widgets.Text; */ public class DetailsWindow extends AbstractModalDialog { + @Inject + CommentsConfig commentsConfig; + private GUIConfig guiConfig; - private CommentsConfig commentsConfig; private ResultTable resultTable; private ScanningResultList scanningResults; int resultIndex; private Text commentsText; - public DetailsWindow(GUIConfig guiConfig, CommentsConfig commentsConfig, ResultTable resultTable, ScanningResultList scanningResults) { + public DetailsWindow(GUIConfig guiConfig, ResultTable resultTable, ScanningResultList scanningResults) { this.guiConfig = guiConfig; - this.commentsConfig = commentsConfig; this.resultTable = resultTable; this.scanningResults = scanningResults; }