most fields initialized in constructors are now final

git-svn-id: https://ipscan.svn.sourceforge.net/svnroot/ipscan/trunk@238 375186e5-ef17-0410-b0b6-91563547dcda
This commit is contained in:
angryziber 2007-11-10 15:52:58 +00:00
parent f9a37558bf
commit b1367b0065
10 changed files with 43 additions and 44 deletions

View File

@ -50,7 +50,7 @@ public class ColumnsActions {
public static final class ColumnClick implements Listener {
private Menu columnsMenu;
private final Menu columnsMenu;
public ColumnClick(ColumnsMenu columnsMenu) {
this.columnsMenu = columnsMenu;
@ -81,7 +81,7 @@ public class ColumnsActions {
public static final class SortBy implements Listener {
private ScanningResultList scanningResultList;
private final ScanningResultList scanningResultList;
public SortBy(ScanningResultList scanningResultList) {
this.scanningResultList = scanningResultList;
@ -108,7 +108,7 @@ public class ColumnsActions {
public static final class FetcherPreferences implements Listener {
private PreferencesDialog preferencesDialog;
private final PreferencesDialog preferencesDialog;
public FetcherPreferences(PreferencesDialog preferencesDialog) {
this.preferencesDialog = preferencesDialog;

View File

@ -57,7 +57,7 @@ public class CommandsActions {
}
public static class Details implements Listener {
private ResultTable resultTable;
private final ResultTable resultTable;
public Details(ResultTable resultTable) {
this.resultTable = resultTable;
@ -95,8 +95,8 @@ public class CommandsActions {
}
public static final class Rescan implements Listener {
private ResultTable resultTable;
private StateMachine stateMachine;
private final ResultTable resultTable;
private final StateMachine stateMachine;
public Rescan(ResultTable resultTable, StateMachine stateMachine) {
this.resultTable = resultTable;
@ -114,7 +114,7 @@ public class CommandsActions {
* Used as both menu item listener and key down listener.
*/
public static final class CopyIP implements Listener {
private ResultTable resultTable;
private final ResultTable resultTable;
public CopyIP(ResultTable resultTable) {
this.resultTable = resultTable;
@ -137,7 +137,7 @@ public class CommandsActions {
}
public static final class CopyIPDetails implements Listener {
private ResultTable resultTable;
private final ResultTable resultTable;
public CopyIPDetails(ResultTable resultTable) {
this.resultTable = resultTable;
@ -153,7 +153,7 @@ public class CommandsActions {
public static final class ShowOpenersMenu implements Listener {
private Listener openersSelectListener;
private final Listener openersSelectListener;
public ShowOpenersMenu(SelectOpener selectOpener) {
this.openersSelectListener = selectOpener;
@ -187,10 +187,10 @@ public class CommandsActions {
}
public static final class EditComment implements Listener {
private ResultTable resultTable;
private ScanningResultList results;
private CommentsConfig commentsConfig;
private FetcherRegistry fetcherRegistry;
private final ResultTable resultTable;
private final ScanningResultList results;
private final CommentsConfig commentsConfig;
private final FetcherRegistry fetcherRegistry;
public EditComment(ResultTable resultTable, ScanningResultList results, CommentsConfig commentsConfig, FetcherRegistry fetcherRegistry) {
this.resultTable = resultTable;
@ -239,9 +239,9 @@ public class CommandsActions {
public static final class SelectOpener implements Listener {
private StatusBar statusBar;
private ResultTable resultTable;
private OpenerLauncher openerLauncher;
private final StatusBar statusBar;
private final ResultTable resultTable;
private final OpenerLauncher openerLauncher;
public SelectOpener(StatusBar statusBar, ResultTable resultTable, OpenerLauncher openerLauncher) {
this.statusBar = statusBar;

View File

@ -30,7 +30,7 @@ import org.eclipse.swt.widgets.MenuItem;
public class FavoritesActions {
public static final class Add implements Listener {
private FeederGUIRegistry feederRegistry;
private final FeederGUIRegistry feederRegistry;
public Add(FeederGUIRegistry feederRegistry) {
this.feederRegistry = feederRegistry;
@ -56,7 +56,7 @@ public class FavoritesActions {
}
public static final class Select implements Listener {
private FeederGUIRegistry feederRegistry;
private final FeederGUIRegistry feederRegistry;
public Select(FeederGUIRegistry feederRegistry) {
this.feederRegistry = feederRegistry;
@ -83,7 +83,7 @@ public class FavoritesActions {
}
public static final class ShowMenu implements Listener {
private Listener favoritesSelectListener;
private final Listener favoritesSelectListener;
public ShowMenu(Select favoritesSelectListener) {
// the listener for favorites selections from the menu

View File

@ -40,8 +40,8 @@ public class FeederActions {
public static class HostnameButton implements SelectionListener, TraverseListener {
private String localHostname;
private Text hostnameText;
private Text ipText;
private final Text hostnameText;
private final Text ipText;
public HostnameButton(Text hostnameText, Text ipText) {
this.hostnameText = hostnameText;
@ -102,7 +102,7 @@ public class FeederActions {
/**
* Asks user which local IP address they want to use
*/
private void askLocalIPAddress() {
private final void askLocalIPAddress() {
try {
Menu popupMenu = new Menu(Display.getCurrent().getActiveShell(), SWT.POP_UP);
Listener menuItemListener = new Listener() {

View File

@ -38,10 +38,10 @@ public class FileActions {
}
static abstract class SaveResults implements Listener {
private ExporterRegistry exporterRegistry;
private ResultTable resultTable;
private StatusBar statusBar;
private boolean isSelection;
private final ExporterRegistry exporterRegistry;
private final ResultTable resultTable;
private final StatusBar statusBar;
private final boolean isSelection;
SaveResults(ExporterRegistry exporterRegistry, ResultTable resultTable, StatusBar statusBar, boolean isSelection) {
this.exporterRegistry = exporterRegistry;
@ -98,7 +98,7 @@ public class FileActions {
}
}
private void addFileExtensions(List<String> extensions, List<String> descriptions, StringBuffer sb) {
private final void addFileExtensions(List<String> extensions, List<String> descriptions, StringBuffer sb) {
sb.append(" (");
for (Exporter exporter : exporterRegistry) {
extensions.add("*." + exporter.getFilenameExtension());

View File

@ -28,8 +28,8 @@ public class GotoActions {
static class NextHost implements Listener {
private ResultTable resultTable;
private ResultType whatToSearchFor;
private final ResultTable resultTable;
private final ResultType whatToSearchFor;
NextHost(ResultTable resultTable, ResultType whatToSearchFor) {
this.resultTable = resultTable;
@ -81,8 +81,8 @@ public class GotoActions {
public static final class Find implements Listener {
private ResultTable resultTable;
private StatusBar statusBar;
private final ResultTable resultTable;
private final StatusBar statusBar;
private String lastText = "";
public Find(StatusBar statusBar, ResultTable resultTable) {
@ -107,7 +107,7 @@ public class GotoActions {
}
}
private void findText(String text, Shell activeShell) {
private final void findText(String text, Shell activeShell) {
ScanningResultList results = resultTable.getScanningResults();
int startIndex = resultTable.getSelectionIndex() + 1;

View File

@ -61,7 +61,7 @@ public class HelpActions {
}
public static final class CheckVersion implements Listener {
private StatusBar statusBar;
private final StatusBar statusBar;
public CheckVersion(StatusBar statusBar) {
this.statusBar = statusBar;

View File

@ -25,8 +25,8 @@ public class OpenerLauncher {
static final Logger LOG = LoggerFactory.getLogger();
private FetcherRegistry fetcherRegistry;
private ScanningResultList scanningResults;
private final FetcherRegistry fetcherRegistry;
private final ScanningResultList scanningResults;
public OpenerLauncher(FetcherRegistry fetcherRegistry, ScanningResultList scanningResults) {
this.fetcherRegistry = fetcherRegistry;

View File

@ -53,7 +53,6 @@ public class StartStopScanningAction implements SelectionListener, ScanningProgr
String[] buttonTexts = new String[ScanningState.values().length];
private Display display;
private StateMachine stateMachine;
/**
@ -118,7 +117,7 @@ public class StartStopScanningAction implements SelectionListener, ScanningProgr
stateMachine.transitionToNext();
}
private boolean preScanChecks() {
private final boolean preScanChecks() {
// autodetect usable pingers and silently ignore any changes -
// user must see any errors only if they have explicitly selected a pinger
pingerRegistry.checkSelectedPinger();
@ -184,7 +183,7 @@ public class StartStopScanningAction implements SelectionListener, ScanningProgr
/**
* @return the appropriate ResultsCallback instance, depending on the configured display method.
*/
private ScanningResultsCallback createResultsCallback() {
private final ScanningResultsCallback createResultsCallback() {
switch (globalConfig.displayMethod) {
default: return new ScanningResultsCallback() {
public void prepareForResults(ScanningResult result) {

View File

@ -32,9 +32,9 @@ public class ToolsActions {
public static final class Preferences implements Listener {
private PreferencesDialog preferencesDialog;
private ResultTable resultTable;
private StatusBar statusBar;
private final PreferencesDialog preferencesDialog;
private final ResultTable resultTable;
private final StatusBar statusBar;
public Preferences(PreferencesDialog preferencesDialog, ResultTable resultTable, StatusBar statusBar) {
this.preferencesDialog = preferencesDialog;
@ -54,7 +54,7 @@ public class ToolsActions {
public static final class ChooseFetchers implements Listener {
private SelectFetchersDialog selectFetchersDialog;
private final SelectFetchersDialog selectFetchersDialog;
public ChooseFetchers(SelectFetchersDialog selectFetchersDialog) {
this.selectFetchersDialog = selectFetchersDialog;
@ -68,8 +68,8 @@ public class ToolsActions {
public static final class ScanInfo implements Listener, StateTransitionListener {
private StatisticsDialog statisticsDialog;
private GlobalConfig globalConfig;
private final StatisticsDialog statisticsDialog;
private final GlobalConfig globalConfig;
public ScanInfo(GlobalConfig globalConfig, StatisticsDialog statisticsDialog, StateMachine stateMachine) {
this.globalConfig = globalConfig;