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

trying to aut-create all required classes

Browse Source
This commit is contained in:
Anton Keks 2020-05-16 11:06:59 +03:00
parent 19acce525b
commit 12efb95432
4 changed files with 48 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

35
src/net/azib/ipscan/config/ComponentRegistry.java
View File

@ -8,13 +8,16 @@ package net.azib.ipscan.config;
import dagger.Module;
import dagger.Provides;
import net.azib.ipscan.core.Plugin;
import net.azib.ipscan.core.PluginLoader;
import net.azib.ipscan.core.state.StateMachine;
import net.azib.ipscan.exporters.*;
import net.azib.ipscan.feeders.FeederCreator;
import net.azib.ipscan.feeders.FeederRegistry;
import net.azib.ipscan.fetchers.*;
import net.azib.ipscan.gui.MainWindow;
import net.azib.ipscan.gui.SWTAwareStateMachine;
import net.azib.ipscan.gui.feeders.*;
import net.azib.ipscan.util.Injector;
import org.eclipse.swt.SWT;
import org.eclipse.swt.widgets.*;
@ -32,6 +35,36 @@ import static java.util.Arrays.asList;
*/
@Module
public class ComponentRegistry {
public void register(Injector i) {
Display display = Display.getDefault();
i.register(Display.class, display);
Shell shell = new Shell();
i.register(Shell.class, shell);
i.register(Menu.class, "mainMenu", new Menu(shell, SWT.BAR));
i.register(Composite.class, "feederArea", new Composite(shell, SWT.NONE));
Composite controlsArea = new Composite(shell, SWT.NONE);
i.register(Composite.class, "controlsArea", controlsArea);
i.register(Button.class, "startStopButton", new Button(controlsArea, SWT.NONE));
i.register(Combo.class, "feederSelectionCombo", new Combo(controlsArea, SWT.READ_ONLY));
SWTAwareStateMachine stateMachine = new SWTAwareStateMachine(display);
i.register(SWTAwareStateMachine.class, stateMachine);
i.register(StateMachine.class, stateMachine);
i.register(RangeFeederGUI.class, RandomFeederGUI.class, FileFeederGUI.class);
i.register(TXTExporter.class, CSVExporter.class, XMLExporter.class, IPListExporter.class);
i.register(IPFetcher.class, PingFetcher.class, PingTTLFetcher.class, HostnameFetcher.class, PortsFetcher.class,
FilteredPortsFetcher.class, WebDetectFetcher.class, HTTPSenderFetcher.class, CommentFetcher.class,
NetBIOSInfoFetcher.class, PacketLossFetcher.class, HTTPProxyFetcher.class);
i.register(MACFetcher.class, Platform.WINDOWS ? new WinMACFetcher() : new UnixMACFetcher());
i.register(MACVendorFetcher.class);
}
public static void main(String[] args) {
Injector i = new Injector();
new ConfigModule().register(i);
new ComponentRegistry().register(i);
new PluginLoader().getClasses().forEach(i::require);
System.out.println(i.require(MainWindow.class));
}
@Provides @Singleton public Display getDisplay() {
return Display.getDefault();
@ -91,7 +124,7 @@ public class ComponentRegistry {
@SuppressWarnings("unchecked")
private <T extends Plugin> List<T> addPlugins(List<T> original, Class<T> type, List<Class<? extends Plugin>> classes) {
List<T> result = new ArrayList<>(original);
for (Class clazz: classes) {
for (Class<?> clazz: classes) {
try {
if (type.isAssignableFrom(clazz))
result.add((T)clazz.newInstance());

12
src/net/azib/ipscan/config/ConfigModule.java
View File

@ -2,11 +2,23 @@ package net.azib.ipscan.config;
import dagger.Module;
import dagger.Provides;
import net.azib.ipscan.util.Injector;
import java.util.prefs.Preferences;
@Module
public class ConfigModule {
public void register(Injector i) {
Config config = Config.getConfig();
i.register(Config.class, config);
i.register(Labels.class, Labels.getInstance());
i.register(Preferences.class, config.getPreferences());
i.register(ScannerConfig.class, config.forScanner());
i.register(OpenersConfig.class, config.forOpeners());
i.register(FavoritesConfig.class, config.forFavorites());
i.register(GUIConfig.class, config.forGUI());
}
@Provides Config getConfig() {
return Config.getConfig();
}

1
src/net/azib/ipscan/config/GUIConfig.java
View File

@ -36,7 +36,6 @@ public class GUIConfig {
public enum DisplayMethod {ALL, ALIVE, PORTS}
// package local constructor
GUIConfig(Preferences preferences) {
this.preferences = preferences;
load();

5
src/net/azib/ipscan/util/Injector.java
View File

@ -45,12 +45,11 @@ public class Injector {
Constructor<T> constructor = (Constructor<T>) stream(type.getConstructors())
.filter(c -> c.isAnnotationPresent(Inject.class)).findAny()
.orElseThrow(() -> new InjectException(type.getName() + " has no constructors annotated with @Inject"));
Object[] deps = deps(constructor);
try {
return constructor.newInstance(deps);
return constructor.newInstance(deps(constructor));
}
catch (Exception e) {
throw new InjectException("Cannot create " + type.getName() + ", deps: " + Arrays.toString(deps), e);
throw new InjectException("Cannot create " + type.getName() + ", deps: " + Arrays.toString(constructor.getGenericParameterTypes()), e);
}
}