diff options
author | Noel Grandin <noel@peralex.com> | 2014-08-12 16:27:18 +0200 |
---|---|---|
committer | Noel Grandin <noel@peralex.com> | 2014-08-13 08:49:24 +0200 |
commit | 8583da1e934a49791ef8d86668f3d5c3c5dae1d7 (patch) | |
tree | f092f708b7bb9a0a23ae82c1dc499a6e3fde4518 /qadevOOo/runner | |
parent | 68cd011c907d00493bf2bfde531c1e244819596b (diff) |
java: remove unused fields
found by UCDetector
Change-Id: I4a7c56a9918054c23469de5680658e7b501f0165
Diffstat (limited to 'qadevOOo/runner')
-rw-r--r-- | qadevOOo/runner/complexlib/ComplexTestCase.java | 3 | ||||
-rw-r--r-- | qadevOOo/runner/convwatch/ConvWatch.java | 1 | ||||
-rw-r--r-- | qadevOOo/runner/convwatch/GraphicalTestArguments.java | 8 | ||||
-rw-r--r-- | qadevOOo/runner/convwatch/INIOutputter.java | 3 | ||||
-rw-r--r-- | qadevOOo/runner/convwatch/ImageHelper.java | 3 | ||||
-rw-r--r-- | qadevOOo/runner/convwatch/PRNCompare.java | 8 | ||||
-rw-r--r-- | qadevOOo/runner/convwatch/StatusHelper.java | 2 | ||||
-rw-r--r-- | qadevOOo/runner/graphical/ImageHelper.java | 3 | ||||
-rw-r--r-- | qadevOOo/runner/graphical/PropertyName.java | 10 | ||||
-rw-r--r-- | qadevOOo/runner/helper/StreamSimulator.java | 39 | ||||
-rw-r--r-- | qadevOOo/runner/helper/WindowListener.java | 20 | ||||
-rw-r--r-- | qadevOOo/runner/lib/SimpleStatus.java | 5 | ||||
-rw-r--r-- | qadevOOo/runner/util/PropertyName.java | 5 |
13 files changed, 22 insertions, 88 deletions
diff --git a/qadevOOo/runner/complexlib/ComplexTestCase.java b/qadevOOo/runner/complexlib/ComplexTestCase.java index 3df834d97236..7eacef28338e 100644 --- a/qadevOOo/runner/complexlib/ComplexTestCase.java +++ b/qadevOOo/runner/complexlib/ComplexTestCase.java @@ -44,8 +44,7 @@ public abstract class ComplexTestCase extends Assurance implements ComplexTest **/ private int m_nThreadTimeOut = 0; - /** End a test if it did fail **/ - public static final boolean BREAK = true; + private boolean m_bBeforeCalled; diff --git a/qadevOOo/runner/convwatch/ConvWatch.java b/qadevOOo/runner/convwatch/ConvWatch.java index d64de0543c12..7187ec5f52a3 100644 --- a/qadevOOo/runner/convwatch/ConvWatch.java +++ b/qadevOOo/runner/convwatch/ConvWatch.java @@ -166,7 +166,6 @@ public class ConvWatch String sInputPath = FileHelper.getPath(_sAbsoluteInputFile); String sReferencePath = FileHelper.getPath(_sAbsoluteReferenceFile); - a.setInputPath( sInputPath ); a.setReferencePath( sReferencePath ); a.setOutputPath( _sOutputPath ); a.setReferenceFile( sReferenceFile ); diff --git a/qadevOOo/runner/convwatch/GraphicalTestArguments.java b/qadevOOo/runner/convwatch/GraphicalTestArguments.java index 82083679afa3..b9b195afd9d3 100644 --- a/qadevOOo/runner/convwatch/GraphicalTestArguments.java +++ b/qadevOOo/runner/convwatch/GraphicalTestArguments.java @@ -91,9 +91,9 @@ public class GraphicalTestArguments private boolean m_bStoreFile = true; private boolean m_bResuseOffice = false; - boolean m_bDebugMode = false; - private String m_sLeaveOutNames = null; + + private String m_sDistinct = null; @@ -241,10 +241,6 @@ public class GraphicalTestArguments } String sLeaveOutNames = (String)param.get(PropertyName.DOC_COMPARATOR_LEAVE_OUT_FILES); - if (sLeaveOutNames != null) - { - m_sLeaveOutNames = sLeaveOutNames; - } String sDBInfoString = (String)param.get(PropertyName.DOC_COMPARATOR_DB_INFO_STRING); if (sDBInfoString != null) diff --git a/qadevOOo/runner/convwatch/INIOutputter.java b/qadevOOo/runner/convwatch/INIOutputter.java index dccef7351954..673b8789be46 100644 --- a/qadevOOo/runner/convwatch/INIOutputter.java +++ b/qadevOOo/runner/convwatch/INIOutputter.java @@ -25,7 +25,7 @@ public class INIOutputter { private FileWriter m_aOut; private String m_sFilename; - private String m_sNamePrefix; // the HTML files used a suffix to build it's right name + /** * ls is the current line separator (carridge return) @@ -52,7 +52,6 @@ public class INIOutputter return null; } a.m_sFilename = sFilename; - a.m_sNamePrefix = _sNamePrefix; return a; } diff --git a/qadevOOo/runner/convwatch/ImageHelper.java b/qadevOOo/runner/convwatch/ImageHelper.java index c5b2f11c0093..1a297704249a 100644 --- a/qadevOOo/runner/convwatch/ImageHelper.java +++ b/qadevOOo/runner/convwatch/ImageHelper.java @@ -30,7 +30,7 @@ class ImageHelper private int[] m_aPixels; private int m_w = 0; private int m_h = 0; - private boolean m_bGrabbed = false; + private ImageHelper(Image _aImage) { @@ -53,7 +53,6 @@ class ImageHelper System.err.println("image fetch aborted or errored"); return; } - m_bGrabbed = true; } public int getWidth() {return m_aImage.getWidth(null);} public int getHeight() {return m_aImage.getHeight(null);} diff --git a/qadevOOo/runner/convwatch/PRNCompare.java b/qadevOOo/runner/convwatch/PRNCompare.java index 4b3974840bfc..e7aea95609dc 100644 --- a/qadevOOo/runner/convwatch/PRNCompare.java +++ b/qadevOOo/runner/convwatch/PRNCompare.java @@ -91,10 +91,10 @@ public class PRNCompare return nMaxNumber; } - private String m_sInputPath; + private String m_sReferencePath; private String m_sOutputPath; - private String m_sDocFile; + private String m_sReferenceFile; private String m_sPostScriptFile; private int m_nMaxPages = 0; @@ -102,14 +102,10 @@ public class PRNCompare private TriState m_tUseBorderMove; private String m_sDocumentType; - public void setInputPath(String _sInputPath) { m_sInputPath = _sInputPath; } - public void setReferencePath(String _sReferencePath) { m_sReferencePath = _sReferencePath; } public void setOutputPath(String _sOutPath) { m_sOutputPath = _sOutPath; } - public void setDocFile(String _sDocFile) { m_sDocFile = _sDocFile;} - public void setReferenceFile(String _sPRNFile){ m_sReferenceFile = _sPRNFile;} public void setPostScriptFile(String _sPSFile){ m_sPostScriptFile = _sPSFile;} diff --git a/qadevOOo/runner/convwatch/StatusHelper.java b/qadevOOo/runner/convwatch/StatusHelper.java index bb494508128f..939a64ae8108 100644 --- a/qadevOOo/runner/convwatch/StatusHelper.java +++ b/qadevOOo/runner/convwatch/StatusHelper.java @@ -26,7 +26,7 @@ public class StatusHelper final static public int DIFF_AFTER_MOVE_DONE_NO_PROBLEMS = 4; final static public int DIFF_AFTER_MOVE_DONE_DIFFERENCES_FOUND = 5; - public String m_sMainName; + public String m_sOldGfx; public String m_sNewGfx; diff --git a/qadevOOo/runner/graphical/ImageHelper.java b/qadevOOo/runner/graphical/ImageHelper.java index ec2a5cee573d..b1ec0ca649de 100644 --- a/qadevOOo/runner/graphical/ImageHelper.java +++ b/qadevOOo/runner/graphical/ImageHelper.java @@ -30,7 +30,7 @@ class ImageHelper private int[] m_aPixels; private int m_w = 0; private int m_h = 0; - private boolean m_bGrabbed = false; + private ImageHelper(Image _aImage) { @@ -57,7 +57,6 @@ class ImageHelper System.err.println("image fetch aborted or errored"); return; } - m_bGrabbed = true; } public int getWidth() {return m_aImage.getWidth(null);} public int getHeight() {return m_aImage.getHeight(null);} diff --git a/qadevOOo/runner/graphical/PropertyName.java b/qadevOOo/runner/graphical/PropertyName.java index b95567fe7ba3..66f4d46e97fe 100644 --- a/qadevOOo/runner/graphical/PropertyName.java +++ b/qadevOOo/runner/graphical/PropertyName.java @@ -27,18 +27,18 @@ public interface PropertyName final public static String DOC_COMPARATOR_INCLUDE_SUBDIRS = "DOC_COMPARATOR_INCLUDE_SUBDIRS"; final public static String DOC_COMPARATOR_PRINT_MAX_PAGE = "DOC_COMPARATOR_PRINT_MAX_PAGE"; final public static String DOC_COMPARATOR_PRINT_ONLY_PAGE = "DOC_COMPARATOR_PRINT_ONLY_PAGE"; - final public static String DOC_COMPARATOR_GFX_OUTPUT_DPI_RESOLUTION = "DOC_COMPARATOR_GFX_OUTPUT_DPI_RESOLUTION"; + final public static String DOC_COMPARATOR_OVERWRITE_REFERENCE = "DOC_COMPARATOR_OVERWRITE_REFERENCE"; final public static String DOC_COMPARATOR_HTML_OUTPUT_PREFIX = "DOC_COMPARATOR_HTML_OUTPUT_PREFIX"; - final public static String DOC_CONVERTER_IMPORT_FILTER_NAME = "DOC_CONVERTER_IMPORT_FILTER_NAME"; + final public static String DOC_CONVERTER_EXPORT_FILTER_NAME = "DOC_CONVERTER_EXPORT_FILTER_NAME"; - final public static String DOC_CONVERTER_OFFICE_PROGRAM = "DOC_CONVERTER_OFFICE_PROGRAM"; - final public static String DOC_COMPARATOR_LEAVE_OUT_FILES = "DOC_COMPARATOR_LEAVE_OUT_FILES"; - final public static String DOC_COMPARATOR_DB_INFO_STRING = "DOC_COMPARATOR_DB_INFO_STRING"; + + + final public static String OFFICE_VIEWABLE = "OFFICE_VIEWABLE"; diff --git a/qadevOOo/runner/helper/StreamSimulator.java b/qadevOOo/runner/helper/StreamSimulator.java index 205925dcb9f1..b5b025932436 100644 --- a/qadevOOo/runner/helper/StreamSimulator.java +++ b/qadevOOo/runner/helper/StreamSimulator.java @@ -51,8 +51,8 @@ public class StreamSimulator implements com.sun.star.io.XInputStream , private com.sun.star.io.XOutputStream m_xOutStream ; private com.sun.star.io.XSeekable m_xSeek ; - private boolean m_bInWasUsed ; - private boolean m_bOutWasUsed ; + + /** @@ -81,8 +81,6 @@ public class StreamSimulator implements com.sun.star.io.XInputStream , { ////m_aProtocol = new ComplexTestEnvironment(); m_sFileName = sFileName ; - m_bInWasUsed = false ; - m_bOutWasUsed = false ; try { @@ -128,8 +126,6 @@ public class StreamSimulator implements com.sun.star.io.XInputStream , com.sun.star.io.BufferSizeExceededException, com.sun.star.io.IOException { - m_bInWasUsed = true; - if (m_xInStream == null) { throw new com.sun.star.io.NotConnectedException("stream not open"); @@ -160,7 +156,6 @@ public class StreamSimulator implements com.sun.star.io.XInputStream , com.sun.star.io.IOException { //m_aProtocol.log("readSomeBytes(lData["+lData.length+"]["+lData[0]+"],"+nMaxBytesToRead+")\n{\n"); - m_bInWasUsed = true; if (m_xInStream == null) { @@ -197,7 +192,6 @@ public class StreamSimulator implements com.sun.star.io.XInputStream , com.sun.star.io.IOException { //m_aProtocol.log("skipBytes("+nBytesToSkip+")\n{\n"); - m_bInWasUsed = true; if (m_xInStream == null) { @@ -227,7 +221,6 @@ public class StreamSimulator implements com.sun.star.io.XInputStream , com.sun.star.io.IOException { //m_aProtocol.log("available()\n{\n"); - m_bInWasUsed = true; if (m_xInStream == null) { @@ -257,7 +250,6 @@ public class StreamSimulator implements com.sun.star.io.XInputStream , com.sun.star.io.IOException { //m_aProtocol.log("closeInput()\n{\n"); - m_bInWasUsed = true; if (m_xInStream == null) { @@ -291,7 +283,6 @@ public class StreamSimulator implements com.sun.star.io.XInputStream , com.sun.star.io.IOException { //m_aProtocol.log("writeBytes(lData["+lData.length+"])\n{\n"); - m_bOutWasUsed = true; if (m_xOutStream == null) { @@ -322,7 +313,6 @@ public class StreamSimulator implements com.sun.star.io.XInputStream , com.sun.star.io.IOException { //m_aProtocol.log("flush()\n{\n"); - m_bOutWasUsed = true; if (m_xOutStream == null) { @@ -352,7 +342,6 @@ public class StreamSimulator implements com.sun.star.io.XInputStream , com.sun.star.io.IOException { //m_aProtocol.log("closeOutput()\n{\n"); - m_bOutWasUsed = true; if (m_xOutStream == null) { @@ -388,14 +377,6 @@ public class StreamSimulator implements com.sun.star.io.XInputStream , { //m_aProtocol.log("seek("+nLocation+")\n{\n"); - if (m_xInStream != null) - m_bInWasUsed = true; - else - if (m_xOutStream != null) - m_bOutWasUsed = true; - else - //m_aProtocol.log("\tno stream open!\n"); - if (m_xSeek == null) { //m_aProtocol.log("\tstream not seekable. throw IOException\n\tfailed\n}\n"); @@ -422,14 +403,6 @@ public class StreamSimulator implements com.sun.star.io.XInputStream , { //m_aProtocol.log("getPosition()\n{\n"); - if (m_xInStream != null) - m_bInWasUsed = true; - else - if (m_xOutStream != null) - m_bOutWasUsed = true; - else - //m_aProtocol.log("\tno stream open!\n"); - if (m_xSeek == null) { //m_aProtocol.log("\tstream not seekable. throw IOException\n\tfailed\n}\n"); @@ -456,14 +429,6 @@ public class StreamSimulator implements com.sun.star.io.XInputStream , { //m_aProtocol.log("getLength()\n{\n"); - if (m_xInStream != null) - m_bInWasUsed = true; - else - if (m_xOutStream != null) - m_bOutWasUsed = true; - else - //m_aProtocol.log("\tno stream open!\n"); - if (m_xSeek == null) { //m_aProtocol.log("\tstream not seekable. throw IOException\n\tfailed\n}\n"); diff --git a/qadevOOo/runner/helper/WindowListener.java b/qadevOOo/runner/helper/WindowListener.java index e1622327a069..00395c6f75cd 100644 --- a/qadevOOo/runner/helper/WindowListener.java +++ b/qadevOOo/runner/helper/WindowListener.java @@ -30,16 +30,12 @@ package helper; */ public class WindowListener implements com.sun.star.awt.XWindowListener { - // hidden called - private boolean hiddenTrigger; - // move called - private boolean movedTrigger; + + // resize called public boolean resizedTrigger; - // show called - private boolean shownTrigger; - // dispose called - private boolean disposeTrigger; + + /** * Creates a new WindowListener @@ -52,14 +48,12 @@ public class WindowListener implements com.sun.star.awt.XWindowListener { * The window hidden event */ public void windowHidden(com.sun.star.lang.EventObject eventObject) { - hiddenTrigger = true; } /** * The window move event */ public void windowMoved(com.sun.star.awt.WindowEvent windowEvent) { - movedTrigger = true; } /** @@ -73,24 +67,18 @@ public class WindowListener implements com.sun.star.awt.XWindowListener { * The window show event */ public void windowShown(com.sun.star.lang.EventObject eventObject) { - shownTrigger = true; } /** * The dispose event */ public void disposing(com.sun.star.lang.EventObject eventObject) { - disposeTrigger = true; } /** * Reset all triggers to "not fired". */ public void resetTrigger() { - hiddenTrigger = false; - movedTrigger = false; resizedTrigger = false; - shownTrigger = false; - disposeTrigger = false; } } diff --git a/qadevOOo/runner/lib/SimpleStatus.java b/qadevOOo/runner/lib/SimpleStatus.java index 2639faea50d1..631ecc5b2f2f 100644 --- a/qadevOOo/runner/lib/SimpleStatus.java +++ b/qadevOOo/runner/lib/SimpleStatus.java @@ -58,10 +58,7 @@ class SimpleStatus { */ public final static boolean FAILED = false; - /** - * The constant represents OK state. - */ - public final static boolean OK = true; + /** * The field is holding state of the status. diff --git a/qadevOOo/runner/util/PropertyName.java b/qadevOOo/runner/util/PropertyName.java index 21d78ec4393f..baeb78b1805b 100644 --- a/qadevOOo/runner/util/PropertyName.java +++ b/qadevOOo/runner/util/PropertyName.java @@ -98,10 +98,7 @@ public interface PropertyName { * parameter name: "NewOfficeInstance" */ final public static String NEW_OFFICE_INSTANCE = "NewOfficeInstance"; - /** - * parameter name: "KeepDocument" - */ - final public static String KEEP_DOCUMENT = "KeepDocument"; + /** * parameter name: "SRC_ROOT"<p> * path to the source root of OpenOffice.org |