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

trim() the entered/pasted IPs without triggering modify listeners

Browse Source
This commit is contained in:
Anton Keks 2024-06-11 22:43:15 +03:00
parent 6069b1f745
commit 16bb80bd16
2 changed files with 11 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/net/azib/ipscan/gui/feeders/RandomFeederGUI.java
View File

@ -97,12 +97,12 @@ public class RandomFeederGUI extends AbstractFeederGUI {
}
public Feeder createFeeder() {
feeder = new RandomFeeder(ipPrototypeText.getText(), ipMaskCombo.getText(), countSpinner.getSelection());
feeder = new RandomFeeder(ipPrototypeText.getText().trim(), ipMaskCombo.getText().trim(), countSpinner.getSelection());
return feeder;
}
public String[] serialize() {
return new String[] {ipPrototypeText.getText(), ipMaskCombo.getText(), String.valueOf(countSpinner.getSelection())};
return new String[] {ipPrototypeText.getText().trim(), ipMaskCombo.getText().trim(), String.valueOf(countSpinner.getSelection())};
}
public void unserialize(String[] parts) {

23
src/net/azib/ipscan/gui/feeders/RangeFeederGUI.java
View File

@ -11,7 +11,9 @@ import net.azib.ipscan.feeders.FeederException;
import net.azib.ipscan.feeders.RangeFeeder;
import net.azib.ipscan.gui.actions.FeederActions;
import org.eclipse.swt.SWT;
import org.eclipse.swt.events.*;
import org.eclipse.swt.events.ModifyEvent;
import org.eclipse.swt.events.ModifyListener;
import org.eclipse.swt.events.SelectionEvent;
import org.eclipse.swt.graphics.Rectangle;
import org.eclipse.swt.layout.GridData;
import org.eclipse.swt.layout.GridLayout;
@ -76,7 +78,7 @@ public class RangeFeederGUI extends AbstractFeederGUI {
toLabel.setText(getLabel("feeder.range.to"));
startIPText.addModifyListener(new StartIPModifyListener());
endIPText.addKeyListener(new EndIPKeyListener());
endIPText.addModifyListener(new EndIPModifyListener());
FeederActions.HostnameButton hostnameListener = new FeederActions.HostnameButton(hostnameText, startIPText, netmaskCombo) {
public void widgetSelected(SelectionEvent event) {
@ -130,13 +132,11 @@ public class RangeFeederGUI extends AbstractFeederGUI {
}
public Feeder createFeeder() {
startIPText.setText(startIPText.getText().trim());
endIPText.setText(endIPText.getText().trim());
return feeder = new RangeFeeder(startIPText.getText(), endIPText.getText());
return feeder = new RangeFeeder(startIPText.getText().trim(), endIPText.getText().trim());
}
public String[] serialize() {
return new String[] {startIPText.getText(), endIPText.getText()};
return new String[] {startIPText.getText().trim(), endIPText.getText().trim()};
}
public void unserialize(String[] parts) {
@ -150,13 +150,10 @@ public class RangeFeederGUI extends AbstractFeederGUI {
return new String[] {"feeder.range.startIP", "feeder.range.endIP"};
}
final class EndIPKeyListener implements KeyListener {
public void keyPressed(KeyEvent e) {
final class EndIPModifyListener implements ModifyListener {
@Override public void modifyText(ModifyEvent modifyEvent) {
isEndIPUnedited = false;
}
public void keyReleased(KeyEvent e) {
}
}
final class NetmaskResetListener implements Listener {
@ -169,9 +166,7 @@ public class RangeFeederGUI extends AbstractFeederGUI {
final class StartIPModifyListener implements ModifyListener {
public void modifyText(ModifyEvent e) {
if (isEndIPUnedited) {
endIPText.setText(startIPText.getText());
}
if (isEndIPUnedited) endIPText.setText(startIPText.getText());
}
}