some method renames

git-svn-id: https://ipscan.svn.sourceforge.net/svnroot/ipscan/trunk@352 375186e5-ef17-0410-b0b6-91563547dcda
This commit is contained in:
angryziber 2008-03-31 21:35:09 +00:00
parent 248c6929b6
commit b79f4fe5eb
4 changed files with 8 additions and 10 deletions

2
TODO
View File

@ -2,8 +2,6 @@ Before 3.0:
* bug: setComment() doesn't look good
* bug: Ctrl+D restars the feeder!!!
* Empty.NOT_SCANNED & Empty.NOT_AVAILABLE and write sorting tests!!!
* rename abortScanning() to something else
* command-line scanning start
* fetcher-specific options
* multiple port support web-detect

View File

@ -42,7 +42,7 @@ public class Scanner {
boolean isScanningInterrupted = false;
for (Fetcher fetcher : fetcherRegistry.getSelectedFetchers()) {
Object value = NotScanned.VALUE;
if (!scanningSubject.isAddressScanningAborted() && !isScanningInterrupted) {
if (!scanningSubject.isAddressAborted() && !isScanningInterrupted) {
// run the fetcher
value = fetcher.scan(scanningSubject);
// check if scanning was interrupted

View File

@ -35,7 +35,7 @@ public class ScanningSubject {
/** The result type constant value, can be modified by some Fetchers */
private ResultType resultType = ResultType.UNKNOWN;
/** Whether we need to continue scanning or it can be aborted */
private boolean isScanningAborted = false;
private boolean isAborted = false;
/** Adapted after pinging port timeout - any fetcher can make use of it */
int adaptedPortTimeout = -1;
@ -91,17 +91,17 @@ public class ScanningSubject {
}
/**
* @return true if a fetcher has instructed to abort scanning
* @return true if a fetcher has instructed to abort scanning of this address
*/
public boolean isAddressScanningAborted() {
return isScanningAborted;
public boolean isAddressAborted() {
return isAborted;
}
/**
* Can be used to inform the scanner to abort scanning
* Can be used to inform the scanner to abort scanning of this address
*/
public void abortAddressScanning() {
this.isScanningAborted = true;
this.isAborted = true;
}
/**

View File

@ -56,7 +56,7 @@ public class PortsFetcherTest extends AbstractFetcherTestCase {
}
@Test
public void scanAbortedOnInterrupt() throws Exception {
public void scanInterrupted() throws Exception {
// these ports are unlikely to be open :-)
config.portString = "65530-65535";
fetcher.init();