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

simplify code, remove sout

Browse Source
This commit is contained in:
Anton Keks 2014-05-15 23:35:36 +03:00
parent 04095e14f7
commit 26fa4a8c7b
1 changed files with 71 additions and 84 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -76,77 +76,65 @@ public class ScanMenuActions {
fileDialog.setFilterNames(descriptions.toArray(new String[descriptions.size()]));
String fileName = fileDialog.open();
if (fileName == null) return;
int i = 0;
// check the received file name
if (fileName != null) {
BufferedReader br = null;
BufferedReader reader = null;
try {
int i = 0;
isLoadedFromFile = true;
String line;
reader = new BufferedReader(new FileReader(fileName));
resultTable.removeAll();
String originalStartIP = null;
String startIPAfterLoad = null;
String endIp = null;
while ((line = reader.readLine()) != null) {
i++;
if (i == 1) {
continue;
}
String[] sp = line.split("\\s+");
if (i == 4) {
originalStartIP = sp[1];
startIPAfterLoad = sp[1];
endIp = sp[3];
}
if (sp.length < 3 || i < 8) {
continue;
}
InetAddress addr = InetAddress.getByName(sp[0]);
startIPAfterLoad = sp[0];
ScanningResult r = new ScanningResult(addr, 1);
r.setType(ScanningResult.ResultType.ALIVE);
if (sp[1].contains("[n/a]")) {
r.setType(ScanningResult.ResultType.DEAD);
}
List<String> values = new ArrayList<String>();
int j = 1;
for (String s : sp) {
j++;
values.add(s);
}
r.setValues(values.toArray());
resultTable.addOrUpdateResultRow(r);
}
RangeFeederGUI.startIPText.setText(startIPAfterLoad);
RangeFeederGUI.endIPText.setText(endIp);
stateMachine.transitionToNext();
} catch (IOException e) {
e.printStackTrace();
} finally {
try {
List<ScanningResult> results = new ArrayList<ScanningResult>();
String line;
br = new BufferedReader(new FileReader(fileName));
resultTable.removeAll();
String originalStartIP = null;
String startIPAfterLoad = null;
String endIp = null;
while ((line = br.readLine()) != null) {
i++;
if (i == 1) {
continue;
}
String[] sp = line.split("\\s+");
if (i == 4) {
originalStartIP = sp[1];
startIPAfterLoad = sp[1];
endIp = sp[3];
}
System.out.println(i + ": " + sp.length + " : " + line);
if (sp.length < 3 || i < 8) {
continue;
}
InetAddress addr = InetAddress.getByName(sp[0]);
startIPAfterLoad = sp[0];
ScanningResult r = new ScanningResult(addr, 1);
r.setType(ScanningResult.ResultType.ALIVE);
if (sp[1].contains("[n/a]")) {
r.setType(ScanningResult.ResultType.DEAD);
}
List<String> values = new ArrayList<String>();
int j = 1;
for (String s : sp) {
j++;
// if (s.contains("[n/")) {
// values.add(null);
// } else {
values.add(s);
// }
}
r.setValues(values.toArray());
resultTable.addOrUpdateResultRow(r);
}
RangeFeederGUI.startIPText.setText(startIPAfterLoad);
RangeFeederGUI.endIPText.setText(endIp);
stateMachine.transitionToNext();
} catch (IOException e) {
e.printStackTrace();
} finally {
try {
if (br != null)br.close();
} catch (IOException ex) {
ex.printStackTrace();
}
if (reader != null)reader.close();
} catch (IOException ex) {
ex.printStackTrace();
}
}
}
@ -206,28 +194,27 @@ public class ScanMenuActions {
fileDialog.setFilterNames(descriptions.toArray(new String[descriptions.size()]));
String fileName = fileDialog.open();
if (fileName != null) {
Exporter exporter = exporterRegistry.createExporter(fileName);
if (fileName == null) return;
statusBar.setStatusText(Labels.getLabel("state.exporting"));
Exporter exporter = exporterRegistry.createExporter(fileName);
// TODO: expose appending feature in the GUI
ExportProcessor exportProcessor = new ExportProcessor(exporter, new File(fileName), false);
statusBar.setStatusText(Labels.getLabel("state.exporting"));
// in case of isSelection we need to create our filter
ScanningResultFilter filter = null;
if (isSelection) {
filter = new ScanningResultFilter() {
public boolean apply(int index, ScanningResult result) {
return resultTable.isSelected(index);
}
};
}
// TODO: expose appending feature in the GUI
ExportProcessor exportProcessor = new ExportProcessor(exporter, new File(fileName), false);
exportProcessor.process(resultTable.getScanningResults(), filter);
statusBar.setStatusText(null);
// in case of isSelection we need to create our filter
ScanningResultFilter filter = null;
if (isSelection) {
filter = new ScanningResultFilter() {
public boolean apply(int index, ScanningResult result) {
return resultTable.isSelected(index);
}
};
}
exportProcessor.process(resultTable.getScanningResults(), filter);
statusBar.setStatusText(null);
}
private void addFileExtensions(List<String> extensions, List<String> descriptions, StringBuffer sb) {