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 | |
parent | 2b9ad46b23fdb39cd456cdc543cce346c6f325c3 (diff) |
java: remove unused parameters
Change-Id: I47c618117e079bb2ef90d92c449c8166ea957fa5
Diffstat (limited to 'scripting')
15 files changed, 30 insertions, 33 deletions
diff --git a/scripting/java/Framework/com/sun/star/script/framework/security/SecurityDialog.java b/scripting/java/Framework/com/sun/star/script/framework/security/SecurityDialog.java index 830c58a53faa..bb00331e6e78 100644 --- a/scripting/java/Framework/com/sun/star/script/framework/security/SecurityDialog.java +++ b/scripting/java/Framework/com/sun/star/script/framework/security/SecurityDialog.java @@ -398,13 +398,13 @@ XInitialization { Object objectButton = xControlCont.getControl( _runButtonName ); XButton xButton = UnoRuntime.queryInterface( XButton.class, objectButton ); - xButton.addActionListener( new ActionListenerImpl( xControlCont, _runButtonName ) ); + xButton.addActionListener( new ActionListenerImpl( _runButtonName ) ); // add to no button objectButton = xControlCont.getControl( _doNotRunButtonName ); xButton = UnoRuntime.queryInterface( XButton.class, objectButton ); - xButton.addActionListener( new ActionListenerImpl( xControlCont, _doNotRunButtonName ) ); + xButton.addActionListener( new ActionListenerImpl( _doNotRunButtonName ) ); if ( checkBoxDialog ) { @@ -489,7 +489,7 @@ XInitialization { public class ActionListenerImpl implements com.sun.star.awt.XActionListener { private String _buttonName; - public ActionListenerImpl( XControlContainer xControlCont, String buttonName ) { + public ActionListenerImpl( String buttonName ) { _buttonName = buttonName; } diff --git a/scripting/java/com/sun/star/script/framework/browse/ParcelBrowseNode.java b/scripting/java/com/sun/star/script/framework/browse/ParcelBrowseNode.java index 9d0283234b24..16ba11e8fe93 100644 --- a/scripting/java/com/sun/star/script/framework/browse/ParcelBrowseNode.java +++ b/scripting/java/com/sun/star/script/framework/browse/ParcelBrowseNode.java @@ -230,7 +230,7 @@ public class ParcelBrowseNode extends PropertySet String languageName = newName + "." + provider.getScriptEditor().getExtension(); String language = container.getLanguage(); - ScriptEntry entry = new ScriptEntry( language, languageName, languageName, "", new HashMap<String,String>() ); + ScriptEntry entry = new ScriptEntry( language, languageName, "", new HashMap<String,String>() ); Parcel parcel = (Parcel)container.getByName( getName() ); ScriptMetaData data = new ScriptMetaData( parcel, entry, source ); diff --git a/scripting/java/com/sun/star/script/framework/browse/ScriptBrowseNode.java b/scripting/java/com/sun/star/script/framework/browse/ScriptBrowseNode.java index 6760133595a6..5b6ef9d1d55e 100644 --- a/scripting/java/com/sun/star/script/framework/browse/ScriptBrowseNode.java +++ b/scripting/java/com/sun/star/script/framework/browse/ScriptBrowseNode.java @@ -260,7 +260,7 @@ public class ScriptBrowseNode extends PropertySet String language = provider.getName(); ScriptEntry entry = new ScriptEntry( - language, languageName, languageName, "", new HashMap<String,String>() ); + language, languageName, "", new HashMap<String,String>() ); ScriptMetaData data = new ScriptMetaData( parent, entry, oldSource ); diff --git a/scripting/java/com/sun/star/script/framework/container/ParcelDescriptor.java b/scripting/java/com/sun/star/script/framework/container/ParcelDescriptor.java index 87ed54b0242e..be1e2c808be2 100644 --- a/scripting/java/com/sun/star/script/framework/container/ParcelDescriptor.java +++ b/scripting/java/com/sun/star/script/framework/container/ParcelDescriptor.java @@ -279,7 +279,7 @@ public class ParcelDescriptor { } } } - ScriptEntry entry = new ScriptEntry(language, languagename, logicalname, "",langProps, description); + ScriptEntry entry = new ScriptEntry(language, languagename, "", langProps,description); scripts.add(entry); } return scripts.toArray(new ScriptEntry[scripts.size()]); diff --git a/scripting/java/com/sun/star/script/framework/container/ScriptEntry.java b/scripting/java/com/sun/star/script/framework/container/ScriptEntry.java index a5eadbe74898..b02e3624577f 100644 --- a/scripting/java/com/sun/star/script/framework/container/ScriptEntry.java +++ b/scripting/java/com/sun/star/script/framework/container/ScriptEntry.java @@ -30,7 +30,7 @@ public class ScriptEntry implements Cloneable { private Map<String,String> languagedepprops; public ScriptEntry(String language, String languagename, - String logicalname, String location) { + String location) { this.language = language; this.languagename = languagename; // logical name/ function name concept @@ -53,21 +53,21 @@ public class ScriptEntry implements Cloneable { } public ScriptEntry(String language, String languagename, - String logicalname, String location, Map<String,String> languagedepprops) { - this( language, languagename, logicalname, location ); + String location, Map<String,String> languagedepprops) { + this( language, languagename, location ); this.languagedepprops = languagedepprops; } public ScriptEntry(String language, String languagename, - String logicalname, String location, - Map<String,String> languagedepprops, String description) { - this( language, languagename, logicalname, location ); + String location, Map<String,String> languagedepprops, + String description) { + this( language, languagename, location ); this.languagedepprops = languagedepprops; this.description = description; } public ScriptEntry(String languagename, String location) { - this("Java", languagename, languagename, location); + this("Java", languagename, location); } public Object clone() throws CloneNotSupportedException { diff --git a/scripting/java/org/openoffice/idesupport/ExtensionFinder.java b/scripting/java/org/openoffice/idesupport/ExtensionFinder.java index 55ceeb13c247..bf39f2e519d1 100644 --- a/scripting/java/org/openoffice/idesupport/ExtensionFinder.java +++ b/scripting/java/org/openoffice/idesupport/ExtensionFinder.java @@ -67,7 +67,7 @@ public class ExtensionFinder implements MethodFinder { for (int j = 0; j < extensions.length; j++) { if (f.getName().endsWith(extensions[j])) { ScriptEntry entry = new ScriptEntry(language, - f.getName(), f.getName(), parcelName); + f.getName(), parcelName); list.add(entry); break; } diff --git a/scripting/java/org/openoffice/idesupport/ui/ScriptPanel.java b/scripting/java/org/openoffice/idesupport/ui/ScriptPanel.java index 9804e5920c7f..ffa1b61041ae 100644 --- a/scripting/java/org/openoffice/idesupport/ui/ScriptPanel.java +++ b/scripting/java/org/openoffice/idesupport/ui/ScriptPanel.java @@ -60,7 +60,6 @@ public class ScriptPanel extends JPanel { catch (CloneNotSupportedException cnse) { entry = new ScriptEntry(entries[i].getLanguage(), entries[i].getLanguageName(), - entries[i].getLogicalName(), entries[i].getLocation()); } @@ -91,7 +90,7 @@ public class ScriptPanel extends JPanel { table.addFocusListener(new FocusAdapter() { public void focusLost(FocusEvent evt) { - tableFocusLost(evt); + tableFocusLost(); } }); @@ -106,7 +105,7 @@ public class ScriptPanel extends JPanel { add(pane, BorderLayout.CENTER); } - private void tableFocusLost(FocusEvent evt) { + private void tableFocusLost() { TableCellEditor editor = table.getCellEditor(); if (editor != null) { Object value = editor.getCellEditorValue(); 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) { |