summaryrefslogtreecommitdiff
path: root/wizards
diff options
context:
space:
mode:
authorNoel Grandin <noel@peralex.com>2014-08-06 08:38:10 +0200
committerNoel Grandin <noel@peralex.com>2014-08-11 12:33:02 +0200
commitd5a31b221510a506a9c43d2c9f44c55405ce13fd (patch)
tree16c4444d46fb439a1601d2d4535e1770da318e05 /wizards
parent41709cc2688738f091a4b17839fe853caa5a0bfd (diff)
java: remove unused parameters
Change-Id: Ifc44c51ddbd21fabaad686bc3d38e2dab54d97aa
Diffstat (limited to 'wizards')
-rw-r--r--wizards/com/sun/star/wizards/db/ColumnPropertySet.java4
-rw-r--r--wizards/com/sun/star/wizards/db/CommandMetaData.java8
-rw-r--r--wizards/com/sun/star/wizards/db/QueryMetaData.java2
-rw-r--r--wizards/com/sun/star/wizards/document/Control.java8
-rw-r--r--wizards/com/sun/star/wizards/document/OfficeDocument.java2
-rw-r--r--wizards/com/sun/star/wizards/form/FormControlArranger.java2
-rw-r--r--wizards/com/sun/star/wizards/form/FormDocument.java10
-rw-r--r--wizards/com/sun/star/wizards/form/FormWizard.java6
-rw-r--r--wizards/com/sun/star/wizards/form/StyleApplier.java3
-rw-r--r--wizards/com/sun/star/wizards/query/QueryWizard.java6
-rw-r--r--wizards/com/sun/star/wizards/report/Dataimport.java4
-rw-r--r--wizards/com/sun/star/wizards/table/FieldFormatter.java7
-rw-r--r--wizards/com/sun/star/wizards/table/PrimaryKeyHandler.java2
-rw-r--r--wizards/com/sun/star/wizards/table/TableWizard.java4
-rw-r--r--wizards/com/sun/star/wizards/text/ViewHandler.java1
-rw-r--r--wizards/com/sun/star/wizards/ui/CommandFieldSelection.java6
-rw-r--r--wizards/com/sun/star/wizards/ui/FilterComponent.java7
17 files changed, 33 insertions, 49 deletions
diff --git a/wizards/com/sun/star/wizards/db/ColumnPropertySet.java b/wizards/com/sun/star/wizards/db/ColumnPropertySet.java
index e8c2f108c234..10458ac87204 100644
--- a/wizards/com/sun/star/wizards/db/ColumnPropertySet.java
+++ b/wizards/com/sun/star/wizards/db/ColumnPropertySet.java
@@ -76,7 +76,7 @@ public class ColumnPropertySet
{
xPropertySet.setPropertyValue("Precision", precision);
}
- setType(nType, sTypeName, precision);
+ setType(sTypeName, precision);
for (int i = 0; i < _aNewColPropertyValues.length; i++)
{
String sPropName = _aNewColPropertyValues[i].Name;
@@ -124,7 +124,7 @@ public class ColumnPropertySet
}
}
- private void setType(int _nType, String _sTypeName, Integer precision)
+ private void setType(String _sTypeName, Integer precision)
{
if (_sTypeName.equals(PropertyNames.EMPTY_STRING))
{
diff --git a/wizards/com/sun/star/wizards/db/CommandMetaData.java b/wizards/com/sun/star/wizards/db/CommandMetaData.java
index a4fe38852e9c..ef1b026468a9 100644
--- a/wizards/com/sun/star/wizards/db/CommandMetaData.java
+++ b/wizards/com/sun/star/wizards/db/CommandMetaData.java
@@ -82,7 +82,7 @@ public class CommandMetaData extends DBMetaData
super(xMSF);
}
- public void initializeFieldColumns(boolean _bgetDefaultValue, String _CommandName, String[] _FieldNames)
+ public void initializeFieldColumns(String _CommandName, String[] _FieldNames)
{
this.setCommandName(_CommandName);
FieldColumns = new FieldColumn[_FieldNames.length];
@@ -271,7 +271,7 @@ public class CommandMetaData extends DBMetaData
throw new com.sun.star.uno.RuntimeException();
}
- public boolean getFieldNamesOfCommand(String _commandname, int _commandtype, boolean _bAppendMode)
+ public boolean getFieldNamesOfCommand(String _commandname, int _commandtype)
{
try
{
@@ -660,10 +660,6 @@ public class CommandMetaData extends DBMetaData
return skeycolumnnames;
}
- public void openFormDocument(boolean _bReadOnly)
- {
- }
-
public void setCommandComposingAttributes()
{
try
diff --git a/wizards/com/sun/star/wizards/db/QueryMetaData.java b/wizards/com/sun/star/wizards/db/QueryMetaData.java
index 4b994ac667d9..3db987015417 100644
--- a/wizards/com/sun/star/wizards/db/QueryMetaData.java
+++ b/wizards/com/sun/star/wizards/db/QueryMetaData.java
@@ -200,7 +200,7 @@ public class QueryMetaData extends CommandMetaData
return oTable.getColumns().getElementNames();
}
- public void initializeFieldTitleSet(boolean _bAppendMode)
+ public void initializeFieldTitleSet()
{
try
{
diff --git a/wizards/com/sun/star/wizards/document/Control.java b/wizards/com/sun/star/wizards/document/Control.java
index b581898dd5a5..c29266578cc3 100644
--- a/wizards/com/sun/star/wizards/document/Control.java
+++ b/wizards/com/sun/star/wizards/document/Control.java
@@ -67,23 +67,23 @@ public class Control extends Shape
{
super(_oFormHandler, _aPoint, _aSize);
xFormName = _xFormName;
- createControl(_icontroltype, _aPoint, _aSize, null, _FieldName);
+ createControl(_icontroltype, null, _FieldName);
}
public Control(FormHandler _oFormHandler, XShapes _xGroupShapes, XNameContainer _xFormName, int _icontroltype, Point _aPoint, Size _aSize)
{
super(_oFormHandler, _aPoint, _aSize);
xFormName = _xFormName;
- createControl(_icontroltype, _aPoint, _aSize, _xGroupShapes, null);
+ createControl(_icontroltype, _xGroupShapes, null);
}
public Control(FormHandler _oFormHandler, int _icontroltype, Point _aPoint, Size _aSize)
{
super(_oFormHandler, _aPoint, _aSize);
- createControl(_icontroltype, _aPoint, _aSize, null, null);
+ createControl(_icontroltype, null, null);
}
- public void createControl(int _icontroltype, Point _aPoint, Size _aSize, XShapes _xGroupShapes, String _FieldName)
+ public void createControl(int _icontroltype, XShapes _xGroupShapes, String _FieldName)
{
try
{
diff --git a/wizards/com/sun/star/wizards/document/OfficeDocument.java b/wizards/com/sun/star/wizards/document/OfficeDocument.java
index 540c503bdf0f..35f00c6ed500 100644
--- a/wizards/com/sun/star/wizards/document/OfficeDocument.java
+++ b/wizards/com/sun/star/wizards/document/OfficeDocument.java
@@ -62,7 +62,7 @@ public class OfficeDocument
private XWindowPeer xWindowPeer;
/** Creates a new instance of OfficeDocument */
- public OfficeDocument(XMultiServiceFactory _xMSF)
+ public OfficeDocument()
{
}
diff --git a/wizards/com/sun/star/wizards/form/FormControlArranger.java b/wizards/com/sun/star/wizards/form/FormControlArranger.java
index 4b49ebc737b6..1527c0665d90 100644
--- a/wizards/com/sun/star/wizards/form/FormControlArranger.java
+++ b/wizards/com/sun/star/wizards/form/FormControlArranger.java
@@ -329,7 +329,7 @@ public class FormControlArranger
}
}
- public void positionControls(int _icurArrangement, Point _aStartPoint, Size _aFormSize, short _iAlign, Short _NBorderType)
+ public void positionControls(int _icurArrangement, Point _aStartPoint, short _iAlign, Short _NBorderType)
{
try
{
diff --git a/wizards/com/sun/star/wizards/form/FormDocument.java b/wizards/com/sun/star/wizards/form/FormDocument.java
index bd89cbc1d3ba..55f4f9f011e3 100644
--- a/wizards/com/sun/star/wizards/form/FormDocument.java
+++ b/wizards/com/sun/star/wizards/form/FormDocument.java
@@ -240,8 +240,8 @@ public class FormDocument extends TextDocument
{
oMainControlForm.oFormController.positionControls(oMainControlForm.curArrangement,
oMainControlForm.aStartPoint,
- oMainControlForm.getFormSize(),
- curUIControlArranger.getAlignValue(), _NBorderType);
+ curUIControlArranger.getAlignValue(),
+ _NBorderType);
}
}
@@ -262,7 +262,7 @@ public class FormDocument extends TextDocument
{
// oSubControlForm.oFormController.adjustYPositions(_idiffheight);
oSubControlForm.setStartPoint(new Point(oSubControlForm.aStartPoint.X, oMainControlForm.getActualFormHeight() + oMainControlForm.aStartPoint.Y + SOFORMGAP));
- oSubControlForm.oFormController.positionControls(oSubControlForm.curArrangement, oSubControlForm.aStartPoint, oSubControlForm.getAvailableFormSize(), curUIControlArranger.getAlignValue(), _NBorderType);
+ oSubControlForm.oFormController.positionControls(oSubControlForm.curArrangement, oSubControlForm.aStartPoint, curUIControlArranger.getAlignValue(), _NBorderType);
}
}
@@ -404,11 +404,11 @@ public class FormDocument extends TextDocument
else
{
adaptControlStyles = !oFormController.areControlsexisting();
- oFormController.positionControls(_curArrangement, aStartPoint, getAvailableFormSize(), curUIControlArranger.getAlignValue(), _NBorderType);
+ oFormController.positionControls(_curArrangement, aStartPoint, curUIControlArranger.getAlignValue(), _NBorderType);
}
if (adaptControlStyles)
{
- curStyleApplier.applyStyle(false, true);
+ curStyleApplier.applyStyle(true);
}
if ((Name.equals(SOMAINFORM)) && (oControlForms.size() > 1))
{
diff --git a/wizards/com/sun/star/wizards/form/FormWizard.java b/wizards/com/sun/star/wizards/form/FormWizard.java
index eda38213af72..5d2407213d73 100644
--- a/wizards/com/sun/star/wizards/form/FormWizard.java
+++ b/wizards/com/sun/star/wizards/form/FormWizard.java
@@ -120,7 +120,7 @@ public class FormWizard extends DatabaseObjectWizard
{
final String sTableName = curSubFormFieldSelection.getSelectedCommandName();
String[] aFieldNames = curSubFormFieldSelection.getSelectedFieldNames();
- curFormDocument.oSubFormDBMetaData.initializeFieldColumns(true, sTableName, aFieldNames);
+ curFormDocument.oSubFormDBMetaData.initializeFieldColumns(sTableName, aFieldNames);
}
else
{
@@ -172,7 +172,7 @@ public class FormWizard extends DatabaseObjectWizard
{
final String sTableName = curDBCommandFieldSelection.getSelectedCommandName();
final String[] aFieldNames = curDBCommandFieldSelection.getSelectedFieldNames();
- curFormDocument.oMainFormDBMetaData.initializeFieldColumns(true, sTableName, aFieldNames);
+ curFormDocument.oMainFormDBMetaData.initializeFieldColumns(sTableName, aFieldNames);
final String[] aMainFieldNames = curFormDocument.oMainFormDBMetaData.getFieldNames();
try
@@ -190,7 +190,7 @@ public class FormWizard extends DatabaseObjectWizard
{
final String sTableName = curSubFormFieldSelection.getSelectedCommandName();
final String[] aFieldNames = curSubFormFieldSelection.getSelectedFieldNames();
- curFormDocument.oSubFormDBMetaData.initializeFieldColumns(true, sTableName, aFieldNames);
+ curFormDocument.oSubFormDBMetaData.initializeFieldColumns(sTableName, aFieldNames);
final String[] aSubFieldNames = curFormDocument.oSubFormDBMetaData.getFieldNames();
try
diff --git a/wizards/com/sun/star/wizards/form/StyleApplier.java b/wizards/com/sun/star/wizards/form/StyleApplier.java
index 40f551592561..2a8b19a78931 100644
--- a/wizards/com/sun/star/wizards/form/StyleApplier.java
+++ b/wizards/com/sun/star/wizards/form/StyleApplier.java
@@ -21,7 +21,6 @@ import com.sun.star.awt.XListBox;
import com.sun.star.awt.XRadioButton;
import com.sun.star.beans.XPropertySet;
import com.sun.star.container.XNameAccess;
-import com.sun.star.lang.EventObject;
import com.sun.star.lang.IllegalArgumentException;
import com.sun.star.lang.XMultiServiceFactory;
import com.sun.star.uno.AnyConverter;
@@ -186,7 +185,7 @@ public class StyleApplier
return (short) -1;
}
- public void applyStyle(boolean _bmodifyBackground, boolean _bapplyalways)
+ public void applyStyle(boolean _bapplyalways)
{
short iStyle = getStyleIndex();
if ((iStyle != iOldLayoutPos) || _bapplyalways)
diff --git a/wizards/com/sun/star/wizards/query/QueryWizard.java b/wizards/com/sun/star/wizards/query/QueryWizard.java
index f082d8fc5d3a..2ab4b9217fe5 100644
--- a/wizards/com/sun/star/wizards/query/QueryWizard.java
+++ b/wizards/com/sun/star/wizards/query/QueryWizard.java
@@ -139,7 +139,7 @@ public class QueryWizard extends DatabaseObjectWizard
return m_createdQuery;
}
- public void enableRoadmapItems(String[] _FieldNames, boolean _bEnabled)
+ public void enableRoadmapItems(boolean _bEnabled)
{
try
{
@@ -324,7 +324,7 @@ public class QueryWizard extends DatabaseObjectWizard
{
case SOFIELDSELECTION_PAGE:
m_DBMetaData.reorderFieldColumns(m_DBCommandFieldSelectio.getSelectedFieldNames());
- m_DBMetaData.initializeFieldTitleSet(true);
+ m_DBMetaData.initializeFieldTitleSet();
m_DBMetaData.setNumericFields();
searchForOutdatedFields();
break;
@@ -387,7 +387,7 @@ public class QueryWizard extends DatabaseObjectWizard
boolean bEnabled = NewItems.length > 0;
setControlProperty("btnWizardNext", PropertyNames.PROPERTY_ENABLED, bEnabled);
setControlProperty("btnWizardFinish", PropertyNames.PROPERTY_ENABLED, bEnabled);
- enableRoadmapItems(NewItems, bEnabled); // Note: Performancewise this could be improved
+ enableRoadmapItems(bEnabled); // Note: Performancewise this could be improved
}
public class FieldSelectionListener implements com.sun.star.wizards.ui.XFieldSelectionListener
diff --git a/wizards/com/sun/star/wizards/report/Dataimport.java b/wizards/com/sun/star/wizards/report/Dataimport.java
index 593b63529a61..77ed2f34e8ad 100644
--- a/wizards/com/sun/star/wizards/report/Dataimport.java
+++ b/wizards/com/sun/star/wizards/report/Dataimport.java
@@ -149,7 +149,7 @@ public class Dataimport extends UnoDialog2 implements com.sun.star.awt.XActionLi
}
}
- public void importReportData(final XMultiServiceFactory _xMSF, final Dataimport _CurDataimport, IReportDocument _CurReportDocument, PropertyValue[] _properties)
+ public void importReportData(final XMultiServiceFactory _xMSF, PropertyValue[] _properties)
{
if (CurReportDocument.reconnectToDatabase(_xMSF, _properties))
{
@@ -167,6 +167,6 @@ public class Dataimport extends UnoDialog2 implements com.sun.star.awt.XActionLi
{
CurReportDocument = ReportTextImplementation.create( xMSF, i_documentUI, _textDocument, m_oResource );
showProgressDisplay(true);
- importReportData(xMSF, this, CurReportDocument, properties);
+ importReportData(xMSF, properties);
}
}
diff --git a/wizards/com/sun/star/wizards/table/FieldFormatter.java b/wizards/com/sun/star/wizards/table/FieldFormatter.java
index e64375b0b1af..f5ceb87fed1b 100644
--- a/wizards/com/sun/star/wizards/table/FieldFormatter.java
+++ b/wizards/com/sun/star/wizards/table/FieldFormatter.java
@@ -55,7 +55,7 @@ public class FieldFormatter implements XItemListener
String suntitled;
Integer IFieldFormatStep;
- public FieldFormatter(TableWizard _CurUnoDialog, TableDescriptor _curTableDescriptor)
+ public FieldFormatter(TableWizard _CurUnoDialog)
{
this.CurUnoDialog = _CurUnoDialog;
curtabindex = (short) (TableWizard.SOFIELDSFORMATPAGE * 100);
@@ -390,11 +390,6 @@ public class FieldFormatter implements XItemListener
txtfieldname.setText(_ColumnName);
}
- public XPropertySet clonePropertySet(XPropertySet _xPropertySet)
- {
- return null;
- }
-
public void itemStateChanged(ItemEvent arg0)
{
String fieldname = xlstFieldNames.getSelectedItem();
diff --git a/wizards/com/sun/star/wizards/table/PrimaryKeyHandler.java b/wizards/com/sun/star/wizards/table/PrimaryKeyHandler.java
index d7ac335dfb6b..e58b5cc2a549 100644
--- a/wizards/com/sun/star/wizards/table/PrimaryKeyHandler.java
+++ b/wizards/com/sun/star/wizards/table/PrimaryKeyHandler.java
@@ -381,7 +381,7 @@ public class PrimaryKeyHandler implements XFieldSelectionListener
Helper.setUnoPropertyValue(UnoDialog.getModel(chkApplyAutoValueExisting), PropertyNames.PROPERTY_ENABLED, Boolean.valueOf(bdoenableAutoValueCheckBox));
}
- public String[] getPrimaryKeyFields(TableDescriptor _curtabledescriptor)
+ public String[] getPrimaryKeyFields()
{
if (chkcreatePrimaryKey.getState() == 0)
{
diff --git a/wizards/com/sun/star/wizards/table/TableWizard.java b/wizards/com/sun/star/wizards/table/TableWizard.java
index 70ce06bccaa2..f3e74be9abf2 100644
--- a/wizards/com/sun/star/wizards/table/TableWizard.java
+++ b/wizards/com/sun/star/wizards/table/TableWizard.java
@@ -237,7 +237,7 @@ public class TableWizard extends DatabaseObjectWizard implements XTextListener
public void buildSteps()
{
curScenarioSelector = new ScenarioSelector(this, this.curTableDescriptor, slblFields, slblSelFields);
- curFieldFormatter = new FieldFormatter(this, curTableDescriptor);
+ curFieldFormatter = new FieldFormatter(this);
if ( this.curTableDescriptor.supportsPrimaryKeys() )
{
curPrimaryKeyHandler = new PrimaryKeyHandler(this, curTableDescriptor);
@@ -254,7 +254,7 @@ public class TableWizard extends DatabaseObjectWizard implements XTextListener
String catalogname = curFinalizer.getCatalogName();
if (curTableDescriptor.supportsPrimaryKeys())
{
- String[] keyfieldnames = curPrimaryKeyHandler.getPrimaryKeyFields(curTableDescriptor);
+ String[] keyfieldnames = curPrimaryKeyHandler.getPrimaryKeyFields();
if (keyfieldnames != null)
{
if (keyfieldnames.length > 0)
diff --git a/wizards/com/sun/star/wizards/text/ViewHandler.java b/wizards/com/sun/star/wizards/text/ViewHandler.java
index 3a014aa22cce..0b3712e00c73 100644
--- a/wizards/com/sun/star/wizards/text/ViewHandler.java
+++ b/wizards/com/sun/star/wizards/text/ViewHandler.java
@@ -23,7 +23,6 @@ import com.sun.star.container.XIndexAccess;
import com.sun.star.container.XNameAccess;
import com.sun.star.lang.IllegalArgumentException;
import com.sun.star.lang.WrappedTargetException;
-import com.sun.star.lang.XMultiServiceFactory;
import com.sun.star.style.XStyleFamiliesSupplier;
import com.sun.star.text.XPageCursor;
import com.sun.star.text.XTextContent;
diff --git a/wizards/com/sun/star/wizards/ui/CommandFieldSelection.java b/wizards/com/sun/star/wizards/ui/CommandFieldSelection.java
index 80b5b9c3ae03..437f3ac39ca4 100644
--- a/wizards/com/sun/star/wizards/ui/CommandFieldSelection.java
+++ b/wizards/com/sun/star/wizards/ui/CommandFieldSelection.java
@@ -222,7 +222,7 @@ public class CommandFieldSelection extends FieldSelection implements Comparator<
{
curCommandName = sSelectedTableName; // sLocList[iSelPos];
CurDBMetaData.setTableByName(curCommandName);
- binitialize = CurDBMetaData.getFieldNamesOfCommand(curCommandName, CommandType.TABLE, AppendMode);
+ binitialize = CurDBMetaData.getFieldNamesOfCommand(curCommandName, CommandType.TABLE);
}
else
{
@@ -231,14 +231,14 @@ public class CommandFieldSelection extends FieldSelection implements Comparator<
CurDBMetaData.setCommandType(CommandType.TABLE);
curCommandName = JavaTools.replaceSubString(sSelectedTableName, PropertyNames.EMPTY_STRING, sTablePrefix);
CurDBMetaData.setTableByName(curCommandName);
- binitialize = CurDBMetaData.getFieldNamesOfCommand(curCommandName, CommandType.TABLE, AppendMode);
+ binitialize = CurDBMetaData.getFieldNamesOfCommand(curCommandName, CommandType.TABLE);
}
else
{
CurDBMetaData.setCommandType(CommandType.QUERY);
curCommandName = JavaTools.replaceSubString(sSelectedTableName, PropertyNames.EMPTY_STRING, sQueryPrefix);
CurDBMetaData.setQueryByName(curCommandName);
- binitialize = CurDBMetaData.getFieldNamesOfCommand(curCommandName, CommandType.QUERY, AppendMode);
+ binitialize = CurDBMetaData.getFieldNamesOfCommand(curCommandName, CommandType.QUERY);
}
}
if (binitialize)
diff --git a/wizards/com/sun/star/wizards/ui/FilterComponent.java b/wizards/com/sun/star/wizards/ui/FilterComponent.java
index 7bc43dd540db..dbcba18b2b9a 100644
--- a/wizards/com/sun/star/wizards/ui/FilterComponent.java
+++ b/wizards/com/sun/star/wizards/ui/FilterComponent.java
@@ -179,11 +179,6 @@ public class FilterComponent
public void disposing(EventObject eventObject)
{
}
-
- public void actionPerformed(com.sun.star.awt.ActionEvent actionEvent)
- {
- getfilterstate();
- }
}
public static String getIndexNumber(String _sStr)
@@ -948,7 +943,7 @@ public class FilterComponent
return (Helper.getUnoPropertyValue(UnoDialog.getModel(ControlElements[SOTXTVALUE]), "Text"));
}
- protected String getDateTimeString(boolean bgetDate)
+ protected String getDateTimeString()
{
double dblValue = ((Double) getValue()).doubleValue();
NumberFormatter oNumberFormatter = oQueryMetaData.getNumberFormatter();