diff options
author | Noel Grandin <noel@peralex.com> | 2014-08-08 14:53:00 +0200 |
---|---|---|
committer | Noel Grandin <noel@peralex.com> | 2014-08-11 12:33:02 +0200 |
commit | 41709cc2688738f091a4b17839fe853caa5a0bfd (patch) | |
tree | 2e12ca2d594ce6767146c25862869ab7e9d2bc14 /scripting/workben | |
parent | 2b9ad46b23fdb39cd456cdc543cce346c6f325c3 (diff) |
java: remove unused parameters
Change-Id: I47c618117e079bb2ef90d92c449c8166ea957fa5
Diffstat (limited to 'scripting/workben')
-rw-r--r-- | scripting/workben/installer/Final.java | 2 | ||||
-rw-r--r-- | scripting/workben/installer/IdeFinal.java | 2 | ||||
-rw-r--r-- | scripting/workben/installer/IdeUpdater.java | 2 | ||||
-rw-r--r-- | scripting/workben/installer/InstallWizard.java | 8 | ||||
-rw-r--r-- | scripting/workben/installer/NavPanel.java | 2 | ||||
-rw-r--r-- | scripting/workben/installer/Version.java | 10 | ||||
-rw-r--r-- | scripting/workben/installer/XmlUpdater.java | 2 | ||||
-rw-r--r-- | scripting/workben/installer/ZipData.java | 2 |
8 files changed, 14 insertions, 16 deletions
diff --git a/scripting/workben/installer/Final.java b/scripting/workben/installer/Final.java index e81fa1233b7d..9fcf6b96cf3e 100644 --- a/scripting/workben/installer/Final.java +++ b/scripting/workben/installer/Final.java @@ -96,7 +96,7 @@ public class Final extends javax.swing.JPanel implements ActionListener, Install int answer = JOptionPane.showConfirmDialog(wizard, "Are you sure you want to exit?"); if (answer == JOptionPane.YES_OPTION) { - wizard.exitForm(null); + wizard.exitForm(); } else { diff --git a/scripting/workben/installer/IdeFinal.java b/scripting/workben/installer/IdeFinal.java index 8d0ecc1786a9..e1969bc54f1d 100644 --- a/scripting/workben/installer/IdeFinal.java +++ b/scripting/workben/installer/IdeFinal.java @@ -91,7 +91,7 @@ public class IdeFinal extends javax.swing.JPanel implements ActionListener, Inst int answer = JOptionPane.showConfirmDialog(wizard, "Are you sure you want to exit?"); if (answer == JOptionPane.YES_OPTION) { - wizard.exitForm(null); + wizard.exitForm(); } else { diff --git a/scripting/workben/installer/IdeUpdater.java b/scripting/workben/installer/IdeUpdater.java index e3100d8565d6..1de610656121 100644 --- a/scripting/workben/installer/IdeUpdater.java +++ b/scripting/workben/installer/IdeUpdater.java @@ -115,7 +115,7 @@ public class IdeUpdater extends Thread { internalThread = Thread.currentThread(); progressBar.setString("Unzipping Required Files"); - ZipData zd = new ZipData("SFrameworkInstall.jar"); + ZipData zd = new ZipData(); // Adding IDE support if( isNetbeansPath ) { diff --git a/scripting/workben/installer/InstallWizard.java b/scripting/workben/installer/InstallWizard.java index 1134fc4ad237..3d4e92064722 100644 --- a/scripting/workben/installer/InstallWizard.java +++ b/scripting/workben/installer/InstallWizard.java @@ -84,7 +84,7 @@ public class InstallWizard extends javax.swing.JFrame implements ActionListener catch( FileNotFoundException fnfe ) { System.err.println("Office Scripting Framework Installer - Error: "); System.err.println("Unable to create log file for installation."); - exitForm(null); + exitForm(); } //setBackground(Color.WHITE); @@ -112,7 +112,7 @@ public class InstallWizard extends javax.swing.JFrame implements ActionListener addWindowListener(new java.awt.event.WindowAdapter() { public void windowClosing(java.awt.event.WindowEvent evt) { - exitForm(evt); + exitForm(); } }); @@ -180,7 +180,7 @@ public class InstallWizard extends javax.swing.JFrame implements ActionListener }// initComponents /** Exit the Application */ - public void exitForm(java.awt.event.WindowEvent evt) { + public void exitForm() { System.exit(0); } @@ -194,7 +194,7 @@ public class InstallWizard extends javax.swing.JFrame implements ActionListener if (e.getSource() == navCancel) { - exitForm(null); + exitForm(); } if (e.getSource() == navBack) diff --git a/scripting/workben/installer/NavPanel.java b/scripting/workben/installer/NavPanel.java index cee9fc53ead8..ea35660dc1c5 100644 --- a/scripting/workben/installer/NavPanel.java +++ b/scripting/workben/installer/NavPanel.java @@ -85,7 +85,7 @@ public class NavPanel extends JPanel implements ActionListener { wizard.show(InstallWizard.IDEWELCOME); } else { - wizard.exitForm(null); + wizard.exitForm(); } enableIDE(false); } diff --git a/scripting/workben/installer/Version.java b/scripting/workben/installer/Version.java index 1f2a84644662..8ff366dc00bc 100644 --- a/scripting/workben/installer/Version.java +++ b/scripting/workben/installer/Version.java @@ -57,7 +57,7 @@ public class Version extends javax.swing.JPanel implements ActionListener, Table { System.err.println("Cannot find sversion.ini/.sversionrc"); JOptionPane.showMessageDialog(this, eFnF.getMessage(), "File not Found", JOptionPane.ERROR_MESSAGE); - wizard.exitForm(null); + wizard.exitForm(); } try { @@ -67,14 +67,14 @@ public class Version extends javax.swing.JPanel implements ActionListener, Table //Message about no installed versions found System.err.println("Failed to parse SVERSION"); JOptionPane.showMessageDialog(this, "There was a problem reading from the Office settings file.", "Parse Error", JOptionPane.ERROR_MESSAGE); - wizard.exitForm(null); + wizard.exitForm(); } - tableModel = new MyTableModel(props, versions); + tableModel = new MyTableModel(props); if (tableModel.getRowCount() == 0) { JOptionPane.showMessageDialog(this, "No compatible versions of Office were found.", "Invalid versions", JOptionPane.ERROR_MESSAGE); - wizard.exitForm(null); + wizard.exitForm(); } tableModel.addTableModelListener(this); @@ -241,7 +241,7 @@ class MyTableModel extends AbstractTableModel { String colNames[] = {"", "Name", "Location"}; Object[] longValues = new Object[] {Boolean.TRUE, "Name", "Location"}; - MyTableModel (Properties properties, String [] validVersions) { + MyTableModel (Properties properties) { data = new ArrayList<ArrayList<Object>>(); boolean isWindows = (System.getProperty("os.name").indexOf("Windows") != -1); diff --git a/scripting/workben/installer/XmlUpdater.java b/scripting/workben/installer/XmlUpdater.java index 30ef794fbe0e..5b0d14d3fc2f 100644 --- a/scripting/workben/installer/XmlUpdater.java +++ b/scripting/workben/installer/XmlUpdater.java @@ -163,7 +163,7 @@ public class XmlUpdater extends Thread { regSchemaOfficePath= regSchemaOfficePath.concat(File.separator+"share"+File.separator+"registry"+File.separator+"schema"+File.separator+"org"+File.separator+"openoffice"+File.separator+"Office"+File.separator); progressBar.setString("Unzipping Required Files"); - ZipData zd = new ZipData("SFrameworkInstall.jar"); + ZipData zd = new ZipData(); if( (!netInstall) || bindingsInstall) { diff --git a/scripting/workben/installer/ZipData.java b/scripting/workben/installer/ZipData.java index 0cd144a7abfd..abdf8a6641c2 100644 --- a/scripting/workben/installer/ZipData.java +++ b/scripting/workben/installer/ZipData.java @@ -22,8 +22,6 @@ import java.io.*; import javax.swing.*; public class ZipData { - public ZipData(String file) { - } public boolean extractEntry(String entry, String destination, JLabel statusLabel) { |