From db203e59d6b54112cbf42923d4f02940b15e3c9f Mon Sep 17 00:00:00 2001 From: Noel Grandin Date: Fri, 5 Dec 2014 10:53:55 +0200 Subject: java: remove some unused fields Change-Id: I1b6fb6b47439c448ac31983702772e2115c70d56 --- bean/com/sun/star/comp/beans/OOoBean.java | 18 +++++------ .../src/net/adaptivebox/global/GlobalString.java | 35 ++++++++++------------ .../framework/container/ParcelDescriptor.java | 4 --- swext/mediawiki/src/com/sun/star/wiki/Helper.java | 3 -- .../com/sun/star/comp/bridge/TestComponent.java | 5 ---- .../com/sun/star/wizards/document/FormHandler.java | 1 - 6 files changed, 23 insertions(+), 43 deletions(-) diff --git a/bean/com/sun/star/comp/beans/OOoBean.java b/bean/com/sun/star/comp/beans/OOoBean.java index ddf20b23c62a..964ff80ed08e 100644 --- a/bean/com/sun/star/comp/beans/OOoBean.java +++ b/bean/com/sun/star/comp/beans/OOoBean.java @@ -64,7 +64,6 @@ public class OOoBean private transient OfficeDocument aDocument; // slot command execution environment - private transient com.sun.star.frame.XDispatchProvider xDispatcher; private transient com.sun.star.util.XURLTransformer xURLTransformer; // properties @@ -389,7 +388,6 @@ public class OOoBean } aDocument = null; - xDispatcher = null; aFrame = null; // clear xFrameWindow @@ -589,14 +587,14 @@ public class OOoBean com.sun.star.util.XURLTransformer.class, xServiceFactory.createInstance( "com.sun.star.util.URLTransformer") ); - try - { - xDispatcher = UnoRuntime.queryInterface(com.sun.star.frame.XDispatchProvider.class, aFrame); - } - catch (Exception e) - { - /*ignore!*/ - } + try + { + UnoRuntime.queryInterface(com.sun.star.frame.XDispatchProvider.class, aFrame); + } + catch (Exception e) + { + /*ignore!*/ + } // get XComponentLoader from frame com.sun.star.frame.XComponentLoader xLoader = UnoRuntime.queryInterface( com.sun.star.frame.XComponentLoader.class, aFrame ); diff --git a/nlpsolver/ThirdParty/EvolutionarySolver/src/net/adaptivebox/global/GlobalString.java b/nlpsolver/ThirdParty/EvolutionarySolver/src/net/adaptivebox/global/GlobalString.java index 975b2eba8331..d7dafebb091a 100644 --- a/nlpsolver/ThirdParty/EvolutionarySolver/src/net/adaptivebox/global/GlobalString.java +++ b/nlpsolver/ThirdParty/EvolutionarySolver/src/net/adaptivebox/global/GlobalString.java @@ -26,27 +26,22 @@ package net.adaptivebox.global; import java.util.*; public class GlobalString { - private static final String NEGLECT_TAG = "#$@"; - -/** - * Tokenize a String with given key. - * @param input the String to be tokenized. - * @param tokenKey the delimiters. - * @return a String array that include the elements of input string that - * divided by the tokenKey. - */ - public static String[] tokenize(String input , String tokenKey) { - ArrayList v = new ArrayList(); - StringTokenizer t = new StringTokenizer(input, tokenKey); - while (t.hasMoreTokens()) { - v.add(t.nextToken()); + /** + * Tokenize a String with given key. + * + * @param input the String to be tokenized. + * @param tokenKey the delimiters. + * @return a String array that include the elements of input string that + * divided by the tokenKey. + */ + public static String[] tokenize(String input, String tokenKey) { + ArrayList v = new ArrayList(); + StringTokenizer t = new StringTokenizer(input, tokenKey); + while (t.hasMoreTokens()) { + v.add(t.nextToken()); + } + return v.toArray(new String[v.size()]); } - return v.toArray(new String[v.size()]); - } - - - - } \ No newline at end of file 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 b6db2397ce40..529332e4eb70 100644 --- a/scripting/java/com/sun/star/script/framework/container/ParcelDescriptor.java +++ b/scripting/java/com/sun/star/script/framework/container/ParcelDescriptor.java @@ -41,10 +41,6 @@ public class ParcelDescriptor { public static final String PARCEL_DESCRIPTOR_NAME = "parcel-descriptor.xml"; - // Collection of all ParcelDescriptor created for files - private static final Map PARCEL_DESCRIPTOR_MAP = - new HashMap(5); - // This is the default contents of a parcel descriptor to be used when // creating empty descriptors private static final byte[] EMPTY_DOCUMENT = diff --git a/swext/mediawiki/src/com/sun/star/wiki/Helper.java b/swext/mediawiki/src/com/sun/star/wiki/Helper.java index 6aad820af421..fa48a3500076 100644 --- a/swext/mediawiki/src/com/sun/star/wiki/Helper.java +++ b/swext/mediawiki/src/com/sun/star/wiki/Helper.java @@ -142,9 +142,6 @@ public class Helper private static String[] m_pConfigStrings; - private static final String sHTMLHeader = ""; - private static final String sHTMLFooter = ""; - private static MultiThreadedHttpConnectionManager m_aConnectionManager; private static HttpClient m_aClient; private static boolean m_bAllowConnection = true; diff --git a/testtools/com/sun/star/comp/bridge/TestComponent.java b/testtools/com/sun/star/comp/bridge/TestComponent.java index bee487bc4ef2..bf1524dd18ca 100644 --- a/testtools/com/sun/star/comp/bridge/TestComponent.java +++ b/testtools/com/sun/star/comp/bridge/TestComponent.java @@ -67,12 +67,7 @@ public class TestComponent { static public class _PerformancTestObject implements XPerformanceTest, XServiceInfo, XTypeProvider { static private final String __serviceName = "com.sun.star.comp.benchmark.JavaTestObject"; - private boolean _bool; - private char _char; - private byte _byte; - private short _short; private int _long; - private int _ulong; private long _hyper; private float _float; private double _double; diff --git a/wizards/com/sun/star/wizards/document/FormHandler.java b/wizards/com/sun/star/wizards/document/FormHandler.java index 39aaa57f26ff..3f9d3702f53a 100644 --- a/wizards/com/sun/star/wizards/document/FormHandler.java +++ b/wizards/com/sun/star/wizards/document/FormHandler.java @@ -57,7 +57,6 @@ public class FormHandler private static final String CHECKBOX = "CheckBox"; private static final String DATEFIELD = "DateField"; private static final String FORMATTEDFIELD = "FormattedField"; - private static final String IMAGECONTROL = "ImageControl"; private static final String TEXTFIELD = "TextField"; private static final String TIMEFIELD = "TimeField"; -- cgit v1.2.3