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

removing workaround after swt upgrade

Browse Source
This commit is contained in:
Anton Keks 2014-04-28 18:05:24 +03:00
parent d0c9003c07
commit 6489b08d24
2 changed files with 2 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -14,7 +14,6 @@ import net.azib.ipscan.exporters.*;
import net.azib.ipscan.fetchers.*;
import net.azib.ipscan.gui.*;
import net.azib.ipscan.gui.MainMenu.CommandsMenu;
import net.azib.ipscan.gui.MainWindow.FeederSelectionCombo;
import net.azib.ipscan.gui.actions.*;
import net.azib.ipscan.gui.feeders.FeederGUIRegistry;
import net.azib.ipscan.gui.feeders.FileFeederGUI;
@ -101,8 +100,8 @@ public class ComponentRegistry {
new ComponentParameter("mainShell"), new ConstantParameter(SWT.NONE) });
container.registerComponentImplementation("startStopButton", Button.class, new Parameter[] {
new ComponentParameter("controlsArea"), new ConstantParameter(SWT.NONE) });
container.registerComponentImplementation("feederSelectionCombo", FeederSelectionCombo.class,
new Parameter[] { new ComponentParameter("controlsArea") });
container.registerComponentImplementation("feederSelectionCombo", Combo.class,
new Parameter[] { new ComponentParameter("controlsArea"), new ConstantParameter(SWT.READ_ONLY) });
// GUI Feeders
container.registerComponentImplementation(FeederGUIRegistry.class);

19
src/net/azib/ipscan/gui/MainWindow.java
View File

@ -251,23 +251,4 @@ public class MainWindow {
statusBar.setEnabled(enabled);
}
}
// TODO: remove this class with SWT > 3.5
public static class FeederSelectionCombo extends Combo {
public FeederSelectionCombo(Composite parent) {
super(parent, SWT.READ_ONLY);
}
@Override
public int getTextHeight() {
// fixes the problem described here: https://bugs.eclipse.org/bugs/show_bug.cgi?id=223015
return buttonHeight;
}
@Override
protected void checkSubclass() {
// allow subclassing
}
}
}