summaryrefslogtreecommitdiff
path: root/xmerge
diff options
context:
space:
mode:
authorNoel Grandin <noel@peralex.com>2014-08-19 14:18:44 +0200
committerNoel Grandin <noel@peralex.com>2014-08-19 14:57:16 +0200
commit56ef5533fc1bce2134721ae64d4d6c18a3526a7a (patch)
treeeafaa8b3c9c7fd4bbeb03fdb1be091f94c870953 /xmerge
parent1e6f0b2d8b35f856637eedf91729e522fcc633e8 (diff)
java: classes in java.lang package do not need to be fully qualified
Change-Id: I7b18f62336c3a8ca4c538b30ce04c99f202a4756
Diffstat (limited to 'xmerge')
-rw-r--r--xmerge/source/bridge/java/XMergeBridge.java10
-rw-r--r--xmerge/source/xmerge/java/org/openoffice/xmerge/converter/xml/xslt/PluginFactoryImpl.java2
-rw-r--r--xmerge/source/xmerge/java/org/openoffice/xmerge/util/IntArrayList.java1
3 files changed, 6 insertions, 7 deletions
diff --git a/xmerge/source/bridge/java/XMergeBridge.java b/xmerge/source/bridge/java/XMergeBridge.java
index 65e8504fd4a5..30fe66b48d99 100644
--- a/xmerge/source/bridge/java/XMergeBridge.java
+++ b/xmerge/source/bridge/java/XMergeBridge.java
@@ -143,7 +143,7 @@ public class XMergeBridge {
public boolean importer(com.sun.star.beans.PropertyValue[] aSourceData,
com.sun.star.xml.sax.XDocumentHandler xDocHandler,
- java.lang.String[] msUserData) throws com.sun.star.uno.RuntimeException {
+ String[] msUserData) throws com.sun.star.uno.RuntimeException {
sFileName="";
sURL="";
@@ -161,7 +161,7 @@ public class XMergeBridge {
xis=(com.sun.star.io.XInputStream)AnyConverter.toObject(new Type(com.sun.star.io.XInputStream.class), pValue[i].Value);
}
if (pValue[i].Name.equals("FileName")){
- sFileName=(String)AnyConverter.toObject(new Type(java.lang.String.class), pValue[i].Value);
+ sFileName=(String)AnyConverter.toObject(new Type(String.class), pValue[i].Value);
}
}
@@ -220,7 +220,7 @@ public class XMergeBridge {
}
public boolean exporter(com.sun.star.beans.PropertyValue[] aSourceData,
- java.lang.String[] msUserData) throws com.sun.star.uno.RuntimeException{
+ String[] msUserData) throws com.sun.star.uno.RuntimeException{
sFileName=null;
sURL=null;
@@ -239,11 +239,11 @@ public class XMergeBridge {
}
if (pValue[i].Name.equals("FileName")){
- sFileName=(String)AnyConverter.toObject(new Type(java.lang.String.class), pValue[i].Value);
+ sFileName=(String)AnyConverter.toObject(new Type(String.class), pValue[i].Value);
}
if (pValue[i].Name.equals("URL")){
- sURL=(String)AnyConverter.toObject(new Type(java.lang.String.class), pValue[i].Value);
+ sURL=(String)AnyConverter.toObject(new Type(String.class), pValue[i].Value);
}
}
catch(com.sun.star.lang.IllegalArgumentException AnyExec){
diff --git a/xmerge/source/xmerge/java/org/openoffice/xmerge/converter/xml/xslt/PluginFactoryImpl.java b/xmerge/source/xmerge/java/org/openoffice/xmerge/converter/xml/xslt/PluginFactoryImpl.java
index 11c29459a2e2..593ed3402c5c 100644
--- a/xmerge/source/xmerge/java/org/openoffice/xmerge/converter/xml/xslt/PluginFactoryImpl.java
+++ b/xmerge/source/xmerge/java/org/openoffice/xmerge/converter/xml/xslt/PluginFactoryImpl.java
@@ -96,7 +96,7 @@ public final class PluginFactoryImpl extends PluginFactory
}
@Override
- public org.openoffice.xmerge.Document createDeviceDocument(java.lang.String str, java.io.InputStream inputStream) throws java.io.IOException {
+ public org.openoffice.xmerge.Document createDeviceDocument(String str, java.io.InputStream inputStream) throws java.io.IOException {
String ext = this.getDeviceFileExtension();
DOMDocument domDoc = new DOMDocument(str,ext);
domDoc.read(inputStream);
diff --git a/xmerge/source/xmerge/java/org/openoffice/xmerge/util/IntArrayList.java b/xmerge/source/xmerge/java/org/openoffice/xmerge/util/IntArrayList.java
index aa903f2cf348..f66c71abed06 100644
--- a/xmerge/source/xmerge/java/org/openoffice/xmerge/util/IntArrayList.java
+++ b/xmerge/source/xmerge/java/org/openoffice/xmerge/util/IntArrayList.java
@@ -19,7 +19,6 @@
package org.openoffice.xmerge.util;
import java.util.ArrayList;
-import java.lang.Integer;
/**
* This is a convenience class used to create an