diff --git a/.classpath b/.classpath
index 834385d8..0968c5dc 100755
--- a/.classpath
+++ b/.classpath
@@ -1,27 +1,26 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/.settings/org.eclipse.jdt.core.prefs b/.settings/org.eclipse.jdt.core.prefs
index 45a8784d..91773527 100755
--- a/.settings/org.eclipse.jdt.core.prefs
+++ b/.settings/org.eclipse.jdt.core.prefs
@@ -1,4 +1,4 @@
-#Thu Dec 14 22:09:10 EET 2006
+#Tue Dec 26 20:43:25 EET 2006
eclipse.preferences.version=1
org.eclipse.jdt.core.codeComplete.argumentPrefixes=
org.eclipse.jdt.core.codeComplete.argumentSuffixes=
@@ -8,6 +8,16 @@ org.eclipse.jdt.core.codeComplete.localPrefixes=
org.eclipse.jdt.core.codeComplete.localSuffixes=
org.eclipse.jdt.core.codeComplete.staticFieldPrefixes=
org.eclipse.jdt.core.codeComplete.staticFieldSuffixes=
+org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=disabled
+org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.4
+org.eclipse.jdt.core.compiler.codegen.unusedLocal=preserve
+org.eclipse.jdt.core.compiler.compliance=1.4
+org.eclipse.jdt.core.compiler.debug.lineNumber=generate
+org.eclipse.jdt.core.compiler.debug.localVariable=generate
+org.eclipse.jdt.core.compiler.debug.sourceFile=generate
+org.eclipse.jdt.core.compiler.problem.assertIdentifier=error
+org.eclipse.jdt.core.compiler.problem.enumIdentifier=warning
+org.eclipse.jdt.core.compiler.source=1.4
org.eclipse.jdt.core.formatter.align_type_members_on_columns=false
org.eclipse.jdt.core.formatter.alignment_for_arguments_in_allocation_expression=16
org.eclipse.jdt.core.formatter.alignment_for_arguments_in_enum_constant=16
diff --git a/.settings/org.eclipse.jdt.ui.prefs b/.settings/org.eclipse.jdt.ui.prefs
index d5cbab0b..0ab89d23 100755
--- a/.settings/org.eclipse.jdt.ui.prefs
+++ b/.settings/org.eclipse.jdt.ui.prefs
@@ -1,8 +1,7 @@
-#Thu Dec 14 22:09:10 EET 2006
+#Tue Dec 26 20:43:25 EET 2006
eclipse.preferences.version=1
formatter_profile=_Angry IP Scanner
formatter_settings_version=10
-internal.default.compliance=user
org.eclipse.jdt.ui.exception.name=e
org.eclipse.jdt.ui.gettersetter.use.is=true
org.eclipse.jdt.ui.javadoc=true
diff --git a/resources/Labels.txt b/resources/Labels.txt
index 52cbf4c8..3b87a474 100755
--- a/resources/Labels.txt
+++ b/resources/Labels.txt
@@ -139,6 +139,7 @@ fetcher.ping.ttl=TTL
fetcher.hostname=Hostname
fetcher.ports=Ports
fetcher.ports.filtered=Filtered Ports
+fetcher.comment=Comments
fetcher.value.ms= ms
fetcher.value.notAvailable=[n/a]
fetcher.value.notScanned=[n/s]
diff --git a/src/net/azib/ipscan/fetchers/CommentFetcher.java b/src/net/azib/ipscan/fetchers/CommentFetcher.java
index 27769716..79019f69 100755
--- a/src/net/azib/ipscan/fetchers/CommentFetcher.java
+++ b/src/net/azib/ipscan/fetchers/CommentFetcher.java
@@ -20,7 +20,7 @@ public class CommentFetcher implements Fetcher {
* @see net.azib.ipscan.fetchers.Fetcher#getLabel()
*/
public String getLabel() {
- return "fetcher.ip";
+ return "fetcher.comment";
}
/**
diff --git a/src/net/azib/ipscan/fetchers/FetcherRegistryImpl.java b/src/net/azib/ipscan/fetchers/FetcherRegistryImpl.java
index e1d5bcdd..4a2e1c6f 100755
--- a/src/net/azib/ipscan/fetchers/FetcherRegistryImpl.java
+++ b/src/net/azib/ipscan/fetchers/FetcherRegistryImpl.java
@@ -52,14 +52,15 @@ public class FetcherRegistryImpl implements FetcherRegistry {
}
public int getSelectedFetcherIndex(String label) {
- int index = -1;
+ int index = 0;
for (Iterator i = selectedFetchers.values().iterator(); i.hasNext();) {
- if (((Fetcher)i.next()).getLabel().equals(label))
- break;
+ Fetcher fetcher = (Fetcher)i.next();
+ if (fetcher.getLabel().equals(label)) {
+ return index;
+ }
index++;
-
}
- return index;
+ return -1;
}
public void updateSelectedFetchers(String[] labels) {
diff --git a/src/net/azib/ipscan/gui/feeders/AbstractFeederGUITest.java b/src/net/azib/ipscan/gui/feeders/AbstractFeederGUITest.java
deleted file mode 100755
index 4c1b25a1..00000000
--- a/src/net/azib/ipscan/gui/feeders/AbstractFeederGUITest.java
+++ /dev/null
@@ -1,51 +0,0 @@
-/**
- *
- */
-package net.azib.ipscan.gui.feeders;
-
-import org.eclipse.swt.widgets.Shell;
-
-import net.azib.ipscan.feeders.Feeder;
-import net.azib.ipscan.feeders.RangeFeeder;
-import junit.framework.TestCase;
-
-/**
- * AbstractFeederGUITest
- *
- * @author anton
- */
-public class AbstractFeederGUITest extends TestCase {
-
- private AbstractFeederGUI feederGUI;
-
- protected void setUp() throws Exception {
- feederGUI = new AbstractFeederGUI(new Shell()) {
-
- protected void initialize() {
- }
-
- public String getFeederName() {
- return "Mega Feeder";
- }
-
- public Feeder getFeeder() {
- feeder = new RangeFeeder();
- feeder.initialize(new String[] {"127.0.0.1", "127.0.0.2"});
- return feeder;
- }
-
- public String serialize() {
- return "";
- }
-
- public void unserialize(String serialized) {
- }
-
- };
- }
-
- public void testGetInfo() {
- assertEquals("Mega Feeder: 127.0.0.1 - 127.0.0.2", feederGUI.getInfo());
- }
-
-}