summaryrefslogtreecommitdiff
path: root/wizards
diff options
context:
space:
mode:
authorNoel Grandin <noel@peralex.com>2015-11-05 14:53:35 +0200
committerNoel Grandin <noel@peralex.com>2015-11-05 14:55:16 +0200
commit3f50c6e050ea922cb720ec88a9f38c991b1906cd (patch)
tree3142aef5dcdb47f4de7b1dab7efa855ce391a477 /wizards
parentb73db446ac9681fdfc4ad602c6da7ce3e36a8588 (diff)
java: remove ((unnecessary)) parentheses
Change-Id: I39fbe3a260c8dbfc203662c54eec4db064b88195
Diffstat (limited to 'wizards')
-rw-r--r--wizards/com/sun/star/wizards/db/RelationController.java2
-rw-r--r--wizards/com/sun/star/wizards/document/Control.java4
-rw-r--r--wizards/com/sun/star/wizards/report/ReportFinalizer.java2
-rw-r--r--wizards/com/sun/star/wizards/table/PrimaryKeyHandler.java8
-rw-r--r--wizards/com/sun/star/wizards/ui/AggregateComponent.java2
-rw-r--r--wizards/com/sun/star/wizards/ui/CommandFieldSelection.java2
-rw-r--r--wizards/com/sun/star/wizards/ui/FilterComponent.java8
-rw-r--r--wizards/com/sun/star/wizards/ui/UnoDialog.java2
8 files changed, 15 insertions, 15 deletions
diff --git a/wizards/com/sun/star/wizards/db/RelationController.java b/wizards/com/sun/star/wizards/db/RelationController.java
index 639338047d15..0c77d92bb146 100644
--- a/wizards/com/sun/star/wizards/db/RelationController.java
+++ b/wizards/com/sun/star/wizards/db/RelationController.java
@@ -55,7 +55,7 @@ public class RelationController extends CommandName
try
{
ArrayList<String> aReferencedTableVector = new ArrayList<String>();
- XResultSet xResultSet = super.getCommandMetaData().xDBMetaData.getExportedKeys((getCatalogName(this)), getSchemaName(), getTableName());
+ XResultSet xResultSet = super.getCommandMetaData().xDBMetaData.getExportedKeys(getCatalogName(this), getSchemaName(), getTableName());
XRow xRow = UnoRuntime.queryInterface(XRow.class, xResultSet);
while (xResultSet.next())
{
diff --git a/wizards/com/sun/star/wizards/document/Control.java b/wizards/com/sun/star/wizards/document/Control.java
index 1b6075577cd8..17d12f0a4b32 100644
--- a/wizards/com/sun/star/wizards/document/Control.java
+++ b/wizards/com/sun/star/wizards/document/Control.java
@@ -189,11 +189,11 @@ public class Control extends Shape
// when we change the border from "3D" to "Flat"
if (getControlType() == FormHandler.SOCHECKBOX)
{
- return ((aPeerSize.Width * oFormHandler.getXPixelFactor()));
+ return aPeerSize.Width * oFormHandler.getXPixelFactor();
}
else
{
- return ((aPeerSize.Width * oFormHandler.getXPixelFactor()) + 200);
+ return (aPeerSize.Width * oFormHandler.getXPixelFactor()) + 200;
}
}
}
diff --git a/wizards/com/sun/star/wizards/report/ReportFinalizer.java b/wizards/com/sun/star/wizards/report/ReportFinalizer.java
index 1c1b5ef06e7d..2ed8d286f10a 100644
--- a/wizards/com/sun/star/wizards/report/ReportFinalizer.java
+++ b/wizards/com/sun/star/wizards/report/ReportFinalizer.java
@@ -182,7 +182,7 @@ public class ReportFinalizer
}
public void initialize(RecordParser _CurDBMetaData)
{
- String FirstCommandName = (_CurDBMetaData.getIncludedCommandNames())[0];
+ String FirstCommandName = _CurDBMetaData.getIncludedCommandNames()[0];
String DefaultName = Desktop.getUniqueName(_CurDBMetaData.getReportDocuments(), FirstCommandName);
if (!DefaultName.equals(OldDefaultName))
{
diff --git a/wizards/com/sun/star/wizards/table/PrimaryKeyHandler.java b/wizards/com/sun/star/wizards/table/PrimaryKeyHandler.java
index e45c3dab97c0..c9d776140fd6 100644
--- a/wizards/com/sun/star/wizards/table/PrimaryKeyHandler.java
+++ b/wizards/com/sun/star/wizards/table/PrimaryKeyHandler.java
@@ -420,17 +420,17 @@ public class PrimaryKeyHandler implements XFieldSelectionListener
}
else if (optUseExisting.getState())
{
- return (new String[]
+ return new String[]
{
lstSinglePrimeKey.getSelectedItem()
- });
+ };
}
else if (optAddAutomatically.getState())
{
- return (new String[]
+ return new String[]
{
SAUTOMATICKEYFIELDNAME
- });
+ };
}
return null;
}
diff --git a/wizards/com/sun/star/wizards/ui/AggregateComponent.java b/wizards/com/sun/star/wizards/ui/AggregateComponent.java
index 759e2f4b3f79..584ab57846a7 100644
--- a/wizards/com/sun/star/wizards/ui/AggregateComponent.java
+++ b/wizards/com/sun/star/wizards/ui/AggregateComponent.java
@@ -241,7 +241,7 @@ public class AggregateComponent extends ControlScroller
oControlRow = ControlRowVector.get(fieldcount);
oControlRow.setVisible(false);
}
- super.setScrollValue(getScrollValue() - 1, (fieldcount));
+ super.setScrollValue(getScrollValue() - 1, fieldcount);
super.unregisterControlGroup(fieldcount);
}
diff --git a/wizards/com/sun/star/wizards/ui/CommandFieldSelection.java b/wizards/com/sun/star/wizards/ui/CommandFieldSelection.java
index 5638da4f5fbf..738b7145a9d6 100644
--- a/wizards/com/sun/star/wizards/ui/CommandFieldSelection.java
+++ b/wizards/com/sun/star/wizards/ui/CommandFieldSelection.java
@@ -331,7 +331,7 @@ public class CommandFieldSelection extends FieldSelection implements Comparator<
{
return sCommandname.substring(sTablePrefix.length());
}
- else if ((sCommandname.startsWith(this.sQueryPrefix)))
+ else if (sCommandname.startsWith(this.sQueryPrefix))
{
return sCommandname.substring(sQueryPrefix.length());
}
diff --git a/wizards/com/sun/star/wizards/ui/FilterComponent.java b/wizards/com/sun/star/wizards/ui/FilterComponent.java
index 38af3bc0f802..fd7664011c5e 100644
--- a/wizards/com/sun/star/wizards/ui/FilterComponent.java
+++ b/wizards/com/sun/star/wizards/ui/FilterComponent.java
@@ -334,7 +334,7 @@ public class FilterComponent
{
boolean bisany = true;
int ifilterstate = SOI_MATCHALL;
- bisany = (this.optMatchAny.getState());
+ bisany = this.optMatchAny.getState();
if (bisany)
{
ifilterstate = SOI_MATCHANY;
@@ -722,8 +722,8 @@ public class FilterComponent
Object oValue = Helper.getUnoPropertyValue(UnoDialog.getModel(ControlElements[SOTXTVALUE]), "EffectiveValue");
if (!AnyConverter.isVoid(oValue))
{
- String sValue = (String.valueOf(oValue));
- return (!sValue.equals(PropertyNames.EMPTY_STRING));
+ String sValue = String.valueOf(oValue);
+ return !sValue.equals(PropertyNames.EMPTY_STRING);
}
}
}
@@ -916,7 +916,7 @@ public class FilterComponent
// TODO make a difference between Text and Numbers
private Object getValue()
{
- return (Helper.getUnoPropertyValue(UnoDialog.getModel(ControlElements[SOTXTVALUE]), "EffectiveValue"));
+ return Helper.getUnoPropertyValue(UnoDialog.getModel(ControlElements[SOTXTVALUE]), "EffectiveValue");
}
diff --git a/wizards/com/sun/star/wizards/ui/UnoDialog.java b/wizards/com/sun/star/wizards/ui/UnoDialog.java
index 07560e0a12cd..7801169ca035 100644
--- a/wizards/com/sun/star/wizards/ui/UnoDialog.java
+++ b/wizards/com/sun/star/wizards/ui/UnoDialog.java
@@ -194,7 +194,7 @@ public class UnoDialog
XControl xControl2 = xDlgContainer.getControl(ControlName);
XView xView = UnoRuntime.queryInterface(XView.class, xControl2);
Size aSize = xView.getSize();
- double dblMAPWidth = (((Integer) Helper.getUnoPropertyValue(xControl2.getModel(), PropertyNames.PROPERTY_WIDTH)).intValue());
+ double dblMAPWidth = ((Integer) Helper.getUnoPropertyValue(xControl2.getModel(), PropertyNames.PROPERTY_WIDTH)).intValue();
return ((aSize.Width) / dblMAPWidth);
}