mirrors/ipscan
2
0
Fork 0
mirror of https://github.com/angryip/ipscan.git synced 2025-10-26 11:18:17 +00:00
Code Issues Packages Projects Releases Wiki Activity

Get rid of 'new' for TXTExporter and ExporterRegistry

Browse Source
This commit is contained in:
Andriy Kryvtsun 2015-08-12 18:58:01 -04:00
parent 0824f3dc42
commit 36e2f04973
4 changed files with 15 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
src/net/azib/ipscan/exporters/ExporterModule.java
View File

@ -3,6 +3,7 @@ package net.azib.ipscan.exporters;
import dagger.Module;
import dagger.Provides;
import javax.inject.Inject;
import java.util.ArrayList;
import java.util.List;
@ -13,12 +14,7 @@ import java.util.List;
public class ExporterModule {
@Provides
public Exporter[] provideExporters() {
return new Exporter[] {new TXTExporter(), new CSVExporter(), new XMLExporter(), new IPListExporter()};
}
@Provides
public ExporterRegistry provideExporterRegistry(Exporter[] exporters) {
return new ExporterRegistry(exporters);
public Exporter[] provideExporters(TXTExporter txtExporter) {
return new Exporter[] {txtExporter, new CSVExporter(), new XMLExporter(), new IPListExporter()};
}
}

4
src/net/azib/ipscan/exporters/ExporterRegistry.java
View File

@ -5,6 +5,7 @@
*/
package net.azib.ipscan.exporters;
import javax.inject.Inject;
import java.util.Iterator;
import java.util.LinkedHashMap;
import java.util.Map;
@ -19,7 +20,8 @@ public class ExporterRegistry implements Iterable<Exporter> {
/** All available Exporter implementations, Map of Exporter instances (prototypes) */
private Map<String, Exporter> exporters;
@Inject
public ExporterRegistry(Exporter[] registeredExporters) {
exporters = new LinkedHashMap<String, Exporter>();

5
src/net/azib/ipscan/exporters/TXTExporter.java
View File

@ -11,6 +11,7 @@ import net.azib.ipscan.fetchers.PingFetcher;
import net.azib.ipscan.fetchers.PortsFetcher;
import net.azib.ipscan.gui.feeders.AbstractFeederGUI;
import javax.inject.Inject;
import java.io.BufferedReader;
import java.io.FileReader;
import java.io.IOException;
@ -34,6 +35,10 @@ public class TXTExporter extends AbstractExporter {
int[] padLengths;
@Inject
public TXTExporter() {
}
public String getId() {
return "exporter.txt";
}

7
src/net/azib/ipscan/gui/actions/ScanMenuActions.java
View File

@ -26,6 +26,7 @@ import org.eclipse.swt.widgets.FileDialog;
import org.eclipse.swt.widgets.Listener;
import org.eclipse.swt.widgets.MessageBox;
import javax.inject.Inject;
import java.io.File;
import java.util.ArrayList;
import java.util.List;
@ -46,14 +47,14 @@ public class ScanMenuActions {
}
public static class LoadFromFile implements Listener {
private TXTExporter txtExporter;
@Inject TXTExporter txtExporter;
private final ExporterRegistry exporterRegistry;
private FeederGUIRegistry feederRegistry;
private final ResultTable resultTable;
private final StateMachine stateMachine;
public LoadFromFile(TXTExporter txtExporter, ExporterRegistry exporterRegistry, FeederGUIRegistry feederRegistry, ResultTable resultTable, StateMachine stateMachine) {
this.txtExporter = txtExporter;
public LoadFromFile(ExporterRegistry exporterRegistry, FeederGUIRegistry feederRegistry, ResultTable resultTable, StateMachine stateMachine) {
this.exporterRegistry = exporterRegistry;
this.feederRegistry = feederRegistry;
this.resultTable = resultTable;