summaryrefslogtreecommitdiff
path: root/xmerge
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 /xmerge
parentb73db446ac9681fdfc4ad602c6da7ce3e36a8588 (diff)
java: remove ((unnecessary)) parentheses
Change-Id: I39fbe3a260c8dbfc203662c54eec4db064b88195
Diffstat (limited to 'xmerge')
-rw-r--r--xmerge/source/bridge/java/XMergeBridge.java2
-rw-r--r--xmerge/source/xmerge/java/org/openoffice/xmerge/Convert.java2
-rw-r--r--xmerge/source/xmerge/java/org/openoffice/xmerge/converter/xml/ParaStyle.java2
-rw-r--r--xmerge/source/xmerge/java/org/openoffice/xmerge/converter/xml/sxc/SheetSettings.java6
-rw-r--r--xmerge/source/xmerge/java/org/openoffice/xmerge/merger/merge/CharacterBaseParagraphMerge.java2
-rw-r--r--xmerge/source/xmerge/java/org/openoffice/xmerge/util/XmlUtil.java2
-rw-r--r--xmerge/source/xmerge/java/org/openoffice/xmerge/util/registry/ConverterInfo.java2
-rw-r--r--xmerge/source/xmerge/java/org/openoffice/xmerge/util/registry/ConverterInfoMgr.java2
-rw-r--r--xmerge/source/xmerge/java/org/openoffice/xmerge/util/registry/ConverterInfoReader.java2
9 files changed, 11 insertions, 11 deletions
diff --git a/xmerge/source/bridge/java/XMergeBridge.java b/xmerge/source/bridge/java/XMergeBridge.java
index 5793f4fd78a6..391232c90207 100644
--- a/xmerge/source/bridge/java/XMergeBridge.java
+++ b/xmerge/source/bridge/java/XMergeBridge.java
@@ -121,7 +121,7 @@ public class XMergeBridge {
origName=origName.substring(origName.lastIndexOf("/")+1,origName.length());
}
if (origName.lastIndexOf(".")>=0){
- name = origName.substring(0,(origName.lastIndexOf(".")));
+ name = origName.substring(0, origName.lastIndexOf("."));
}
else{
name=origName;
diff --git a/xmerge/source/xmerge/java/org/openoffice/xmerge/Convert.java b/xmerge/source/xmerge/java/org/openoffice/xmerge/Convert.java
index 8d0eb79b38ca..728aa05ae120 100644
--- a/xmerge/source/xmerge/java/org/openoffice/xmerge/Convert.java
+++ b/xmerge/source/xmerge/java/org/openoffice/xmerge/Convert.java
@@ -228,6 +228,6 @@ public class Convert implements Cloneable {
*/
public Document getOfficeDocument(String name, InputStream is)
throws IOException {
- return(ci.getPluginFactory().createOfficeDocument(name, is));
+ return ci.getPluginFactory().createOfficeDocument(name, is);
}
} \ No newline at end of file
diff --git a/xmerge/source/xmerge/java/org/openoffice/xmerge/converter/xml/ParaStyle.java b/xmerge/source/xmerge/java/org/openoffice/xmerge/converter/xml/ParaStyle.java
index 2163fc658b96..786e82b77cf9 100644
--- a/xmerge/source/xmerge/java/org/openoffice/xmerge/converter/xml/ParaStyle.java
+++ b/xmerge/source/xmerge/java/org/openoffice/xmerge/converter/xml/ParaStyle.java
@@ -322,7 +322,7 @@ public class ParaStyle extends Style implements Cloneable {
private void setAttribute(int attr, String value) {
isSet[attr] = true;
try {
- this.value[attr] = (((conversionAlgorithm)algor[attr].newInstance())).I(value);
+ this.value[attr] = ((conversionAlgorithm)algor[attr].newInstance()).I(value);
} catch (Exception e) {
Debug.log(Debug.ERROR, "Instantiation error", e);
}
diff --git a/xmerge/source/xmerge/java/org/openoffice/xmerge/converter/xml/sxc/SheetSettings.java b/xmerge/source/xmerge/java/org/openoffice/xmerge/converter/xml/sxc/SheetSettings.java
index 8f6603a458ac..28a63cb7d713 100644
--- a/xmerge/source/xmerge/java/org/openoffice/xmerge/converter/xml/sxc/SheetSettings.java
+++ b/xmerge/source/xmerge/java/org/openoffice/xmerge/converter/xml/sxc/SheetSettings.java
@@ -89,7 +89,7 @@ public class SheetSettings implements OfficeConstants {
* @return The position as a {@code Point}.
*/
public Point getCursor() {
- return (new Point(cursorX, cursorY));
+ return new Point(cursorX, cursorY);
}
/**
@@ -124,7 +124,7 @@ public class SheetSettings implements OfficeConstants {
*/
public Point getSplit() {
- return (new Point(splitPointX, splitPointY));
+ return new Point(splitPointX, splitPointY);
}
/**
@@ -134,7 +134,7 @@ public class SheetSettings implements OfficeConstants {
*/
public Point getSplitType() {
- return (new Point(splitTypeX, splitTypeY));
+ return new Point(splitTypeX, splitTypeY);
}
/**
diff --git a/xmerge/source/xmerge/java/org/openoffice/xmerge/merger/merge/CharacterBaseParagraphMerge.java b/xmerge/source/xmerge/java/org/openoffice/xmerge/merger/merge/CharacterBaseParagraphMerge.java
index 98c0d8a420dc..6ce425d205c7 100644
--- a/xmerge/source/xmerge/java/org/openoffice/xmerge/merger/merge/CharacterBaseParagraphMerge.java
+++ b/xmerge/source/xmerge/java/org/openoffice/xmerge/merger/merge/CharacterBaseParagraphMerge.java
@@ -76,7 +76,7 @@ public final class CharacterBaseParagraphMerge implements NodeMergeAlgorithm {
int extraChar = 0;
int orgDiffCount = diffCount;
- TextNodeEntry orgTextNode = (orgNodeList.get(i));
+ TextNodeEntry orgTextNode = orgNodeList.get(i);
Debug.log(Debug.INFO, "checking node " + (i + 1) + " of " + numNode);
diff --git a/xmerge/source/xmerge/java/org/openoffice/xmerge/util/XmlUtil.java b/xmerge/source/xmerge/java/org/openoffice/xmerge/util/XmlUtil.java
index 9cf24bf42fdf..fd39536b3082 100644
--- a/xmerge/source/xmerge/java/org/openoffice/xmerge/util/XmlUtil.java
+++ b/xmerge/source/xmerge/java/org/openoffice/xmerge/util/XmlUtil.java
@@ -95,7 +95,7 @@ public final class XmlUtil {
case Node.ELEMENT_NODE:
Element oldElem = (Element)newNode;
String tagName = newNode.getNodeName();
- Element newElem = (docNode.createElement(tagName));
+ Element newElem = docNode.createElement(tagName);
// copy the attributes
NamedNodeMap attrs = oldElem.getAttributes();
diff --git a/xmerge/source/xmerge/java/org/openoffice/xmerge/util/registry/ConverterInfo.java b/xmerge/source/xmerge/java/org/openoffice/xmerge/util/registry/ConverterInfo.java
index 192777bd50b1..b549743fe308 100644
--- a/xmerge/source/xmerge/java/org/openoffice/xmerge/util/registry/ConverterInfo.java
+++ b/xmerge/source/xmerge/java/org/openoffice/xmerge/util/registry/ConverterInfo.java
@@ -260,7 +260,7 @@ public class ConverterInfo {
* device mime-type.
*/
public Iterator<String> getDeviceMime() {
- return(piDeviceMime.iterator());
+ return piDeviceMime.iterator();
}
/**
diff --git a/xmerge/source/xmerge/java/org/openoffice/xmerge/util/registry/ConverterInfoMgr.java b/xmerge/source/xmerge/java/org/openoffice/xmerge/util/registry/ConverterInfoMgr.java
index 09fd70f41d7a..0fd2320271dc 100644
--- a/xmerge/source/xmerge/java/org/openoffice/xmerge/util/registry/ConverterInfoMgr.java
+++ b/xmerge/source/xmerge/java/org/openoffice/xmerge/util/registry/ConverterInfoMgr.java
@@ -114,7 +114,7 @@ public final class ConverterInfoMgr {
* exist.
*/
private static Iterator<ConverterInfo> getConverterInfoEnumeration() {
- return (converterInfoList.iterator());
+ return converterInfoList.iterator();
}
/**
diff --git a/xmerge/source/xmerge/java/org/openoffice/xmerge/util/registry/ConverterInfoReader.java b/xmerge/source/xmerge/java/org/openoffice/xmerge/util/registry/ConverterInfoReader.java
index 00eaf9d8abbd..acc4d8eabc6e 100644
--- a/xmerge/source/xmerge/java/org/openoffice/xmerge/util/registry/ConverterInfoReader.java
+++ b/xmerge/source/xmerge/java/org/openoffice/xmerge/util/registry/ConverterInfoReader.java
@@ -247,6 +247,6 @@ public class ConverterInfoReader {
* @return An {@code Enumeration} of {@code ConverterInfo} objects.
*/
public Iterator<ConverterInfo> getConverterInfoEnumeration() {
- return (converterInfoList.iterator());
+ return converterInfoList.iterator();
}
} \ No newline at end of file