diff options
| author | Noel Grandin <noel@peralex.com> | 2014-08-13 17:05:54 +0200 |
|---|---|---|
| committer | Noel Grandin <noel@peralex.com> | 2014-08-20 11:45:28 +0200 |
| commit | 8c9fdc4a963fd55da59a93c979071f53b84fbc24 (patch) | |
| tree | e913f69cee6ec9e3e2072f73d58088ae74d2260d | |
| parent | 34352e7f1b0fe55da4d1d43921674344ae6deafc (diff) | |
java: remove modifiers implied by the context
found by PMD
Change-Id: I04cbf986ddbcffff987784f381b8a9f52f1b3f31
96 files changed, 478 insertions, 505 deletions
diff --git a/bean/com/sun/star/beans/NativeService.java b/bean/com/sun/star/beans/NativeService.java index 85a4b8a81478..9e06e798dcbc 100644 --- a/bean/com/sun/star/beans/NativeService.java +++ b/bean/com/sun/star/beans/NativeService.java @@ -21,7 +21,7 @@ package com.sun.star.beans; /* @deprecated */ /* package */ interface NativeService { - public String getIdentifier(); - public void startupService() throws java.io.IOException; - public int getStartupTime(); + String getIdentifier(); + void startupService() throws java.io.IOException; + int getStartupTime(); } diff --git a/bean/com/sun/star/comp/beans/NativeService.java b/bean/com/sun/star/comp/beans/NativeService.java index fb3a2ef76923..9df62f072976 100644 --- a/bean/com/sun/star/comp/beans/NativeService.java +++ b/bean/com/sun/star/comp/beans/NativeService.java @@ -22,7 +22,7 @@ package com.sun.star.comp.beans; * @deprecated */ interface NativeService { - public String getIdentifier(); - public void startupService() throws java.io.IOException; - public int getStartupTime(); + String getIdentifier(); + void startupService() throws java.io.IOException; + int getStartupTime(); } diff --git a/comphelper/qa/complex/comphelper/Map.java b/comphelper/qa/complex/comphelper/Map.java index a08c2c8855eb..af67b3c31365 100644 --- a/comphelper/qa/complex/comphelper/Map.java +++ b/comphelper/qa/complex/comphelper/Map.java @@ -354,7 +354,7 @@ public class Map /* extends complexlib.ComplexTestCase */ private interface CompareEqual { - public boolean areEqual( Object _lhs, Object _rhs ); + boolean areEqual( Object _lhs, Object _rhs ); } private class DefaultCompareEqual implements CompareEqual diff --git a/connectivity/qa/complex/connectivity/FlatFileAccess.java b/connectivity/qa/complex/connectivity/FlatFileAccess.java index bd2416fd9382..533bfa4a0d72 100644 --- a/connectivity/qa/complex/connectivity/FlatFileAccess.java +++ b/connectivity/qa/complex/connectivity/FlatFileAccess.java @@ -179,7 +179,7 @@ public class FlatFileAccess extends ComplexTestCase private interface RowSetValueGetter { - public Object getValue( final RowSet i_rowSet ) throws SQLException; + Object getValue( final RowSet i_rowSet ) throws SQLException; } private abstract class RowSetColumnValueGetter implements RowSetValueGetter diff --git a/connectivity/qa/complex/connectivity/TestCase.java b/connectivity/qa/complex/connectivity/TestCase.java index 36c80035a010..9261499af5a7 100644 --- a/connectivity/qa/complex/connectivity/TestCase.java +++ b/connectivity/qa/complex/connectivity/TestCase.java @@ -22,6 +22,6 @@ import share.LogWriter; public interface TestCase { - public void assure( final String i_message, final boolean i_condition ); - public LogWriter getLog(); + void assure( final String i_message, final boolean i_condition ); + LogWriter getLog(); } diff --git a/framework/qa/complex/XUserInputInterception/EventTest.java b/framework/qa/complex/XUserInputInterception/EventTest.java index f7e0f546a620..24a78cb13711 100644 --- a/framework/qa/complex/XUserInputInterception/EventTest.java +++ b/framework/qa/complex/XUserInputInterception/EventTest.java @@ -522,10 +522,10 @@ public class EventTest { private interface EventTriggerType{ /** klick the mouse into the scroll bar*/ - final public static int MOUSE_KLICK_INTO_DOC = 1; + int MOUSE_KLICK_INTO_DOC = 1; /** write some text into a spread sheet*/ - final public static int KEY_TEXT_INTO_DOC = 2; + int KEY_TEXT_INTO_DOC = 2; } diff --git a/framework/qa/complex/imageManager/_XUIConfiguration.java b/framework/qa/complex/imageManager/_XUIConfiguration.java index fa05dc07f47e..b3076c6077d1 100644 --- a/framework/qa/complex/imageManager/_XUIConfiguration.java +++ b/framework/qa/complex/imageManager/_XUIConfiguration.java @@ -32,11 +32,11 @@ public class _XUIConfiguration { private XUIConfiguration oObj; private XUIConfigurationListenerImpl xListener = null; - public static interface XUIConfigurationListenerImpl + public interface XUIConfigurationListenerImpl extends XUIConfigurationListener { - public void reset(); - public void fireEvent(); - public boolean actionWasTriggered(); + void reset(); + void fireEvent(); + boolean actionWasTriggered(); } diff --git a/jurt/com/sun/star/lib/uno/environments/remote/IThreadPool.java b/jurt/com/sun/star/lib/uno/environments/remote/IThreadPool.java index 385b79c2c230..f862655a643a 100644 --- a/jurt/com/sun/star/lib/uno/environments/remote/IThreadPool.java +++ b/jurt/com/sun/star/lib/uno/environments/remote/IThreadPool.java @@ -38,7 +38,7 @@ public interface IThreadPool { * * @see #enter */ - public void attach(); + void attach(); /** * As above, but hands in an already existing instance of the threadid of @@ -49,13 +49,13 @@ public interface IThreadPool { * @return Returns a handle which can be used in enter and detach calls. * @see #attach */ - public Object attach( ThreadId id ); + Object attach( ThreadId id ); /** * Detaches this thread from the thread pool. * @see #enter */ - public void detach(); + void detach(); /** * As above, but hands in an already existing instance of the threadid of @@ -66,7 +66,7 @@ public interface IThreadPool { * @see #attach() * @see #detach() */ - public void detach( Object handle, ThreadId id ); + void detach( Object handle, ThreadId id ); /** * Lets this thread enter the thread pool. @@ -76,7 +76,7 @@ public interface IThreadPool { * * @see #putJob */ - public Object enter() throws Throwable; + Object enter() throws Throwable; /** * As above but hands in an already existing instance of the threadid of @@ -87,7 +87,7 @@ public interface IThreadPool { * * @see #putJob */ - public Object enter( Object handle, ThreadId id ) throws Throwable; + Object enter( Object handle, ThreadId id ) throws Throwable; /** * Queues a job into the jobQueue of the thread belonging to the jobs @@ -95,7 +95,7 @@ public interface IThreadPool { * * @param job the job */ - public void putJob(Job job); + void putJob(Job job); /** * Disposes this thread pool, thus releasing all threads by throwing a @@ -103,12 +103,12 @@ public interface IThreadPool { * * @param throwable the cause */ - public void dispose(Throwable throwable); + void dispose(Throwable throwable); /** * Destroys the thread pool and tries to join all created threads immediately. */ - public void destroy(); + void destroy(); } diff --git a/jurt/test/com/sun/star/lib/uno/environments/remote/TestIWorkAt.java b/jurt/test/com/sun/star/lib/uno/environments/remote/TestIWorkAt.java index 58171bd35009..1adf15556cff 100644 --- a/jurt/test/com/sun/star/lib/uno/environments/remote/TestIWorkAt.java +++ b/jurt/test/com/sun/star/lib/uno/environments/remote/TestIWorkAt.java @@ -31,7 +31,7 @@ public interface TestIWorkAt extends XInterface { void notifyme(); - public static final TypeInfo UNOTYPEINFO[] = { + TypeInfo UNOTYPEINFO[] = { new MethodTypeInfo("increment", 0, 0), new MethodTypeInfo("notifyme", 1, 0), new MethodTypeInfo("syncCall", 2, 0), diff --git a/nlpsolver/ThirdParty/EvolutionarySolver/src/net/adaptivebox/encode/IEncodeEngine.java b/nlpsolver/ThirdParty/EvolutionarySolver/src/net/adaptivebox/encode/IEncodeEngine.java index 637d9d016088..ba3e20d69d5d 100644 --- a/nlpsolver/ThirdParty/EvolutionarySolver/src/net/adaptivebox/encode/IEncodeEngine.java +++ b/nlpsolver/ThirdParty/EvolutionarySolver/src/net/adaptivebox/encode/IEncodeEngine.java @@ -20,5 +20,5 @@ package net.adaptivebox.encode; public interface IEncodeEngine{ - abstract public double[] getEncodeInfo(); + double[] getEncodeInfo(); } diff --git a/nlpsolver/ThirdParty/EvolutionarySolver/src/net/adaptivebox/global/IUpdateCycleEngine.java b/nlpsolver/ThirdParty/EvolutionarySolver/src/net/adaptivebox/global/IUpdateCycleEngine.java index 5dd4b7ef8719..f7c06224a8f1 100644 --- a/nlpsolver/ThirdParty/EvolutionarySolver/src/net/adaptivebox/global/IUpdateCycleEngine.java +++ b/nlpsolver/ThirdParty/EvolutionarySolver/src/net/adaptivebox/global/IUpdateCycleEngine.java @@ -20,5 +20,5 @@ package net.adaptivebox.global; public interface IUpdateCycleEngine { - public void updateCycle(int t); + void updateCycle(int t); }
\ No newline at end of file diff --git a/nlpsolver/ThirdParty/EvolutionarySolver/src/net/adaptivebox/goodness/IGoodnessCompareEngine.java b/nlpsolver/ThirdParty/EvolutionarySolver/src/net/adaptivebox/goodness/IGoodnessCompareEngine.java index 1ff1dfb01923..6bd1444540d3 100644 --- a/nlpsolver/ThirdParty/EvolutionarySolver/src/net/adaptivebox/goodness/IGoodnessCompareEngine.java +++ b/nlpsolver/ThirdParty/EvolutionarySolver/src/net/adaptivebox/goodness/IGoodnessCompareEngine.java @@ -24,9 +24,9 @@ package net.adaptivebox.goodness; public abstract interface IGoodnessCompareEngine { - public static final int LARGER_THAN = 2; - public static final int EQUAL_TO = 1; - public static final int LESS_THAN = 0; + int LARGER_THAN = 2; + int EQUAL_TO = 1; + int LESS_THAN = 0; /** * check the magnitude of two IEncodeEngine @@ -34,5 +34,5 @@ public abstract interface IGoodnessCompareEngine { * LESS_THAN: goodness1 is better than goodness2 * EQUAL_TO : goodness1 is eqaul to goodness2 **/ - public abstract int compare(double[] goodness1, double[] goodness2); + int compare(double[] goodness1, double[] goodness2); } diff --git a/nlpsolver/ThirdParty/EvolutionarySolver/src/net/adaptivebox/knowledge/ILibEngine.java b/nlpsolver/ThirdParty/EvolutionarySolver/src/net/adaptivebox/knowledge/ILibEngine.java index 741cba313495..8a4d348a8c53 100644 --- a/nlpsolver/ThirdParty/EvolutionarySolver/src/net/adaptivebox/knowledge/ILibEngine.java +++ b/nlpsolver/ThirdParty/EvolutionarySolver/src/net/adaptivebox/knowledge/ILibEngine.java @@ -23,7 +23,7 @@ package net.adaptivebox.knowledge; public interface ILibEngine { - public void setLibrary(Library lib); + void setLibrary(Library lib); } diff --git a/nlpsolver/ThirdParty/EvolutionarySolver/src/net/adaptivebox/space/ILocationEngine.java b/nlpsolver/ThirdParty/EvolutionarySolver/src/net/adaptivebox/space/ILocationEngine.java index 33737339a383..8b32069a4ba6 100644 --- a/nlpsolver/ThirdParty/EvolutionarySolver/src/net/adaptivebox/space/ILocationEngine.java +++ b/nlpsolver/ThirdParty/EvolutionarySolver/src/net/adaptivebox/space/ILocationEngine.java @@ -21,5 +21,5 @@ package net.adaptivebox.space; public interface ILocationEngine{ - abstract public double[] getLocation(); + double[] getLocation(); } diff --git a/nlpsolver/src/com/sun/star/comp/Calc/NLPSolver/dialogs/IEvolutionarySolverStatusDialog.java b/nlpsolver/src/com/sun/star/comp/Calc/NLPSolver/dialogs/IEvolutionarySolverStatusDialog.java index 331aa05bc7aa..9ef12e09e461 100644 --- a/nlpsolver/src/com/sun/star/comp/Calc/NLPSolver/dialogs/IEvolutionarySolverStatusDialog.java +++ b/nlpsolver/src/com/sun/star/comp/Calc/NLPSolver/dialogs/IEvolutionarySolverStatusDialog.java @@ -28,21 +28,21 @@ package com.sun.star.comp.Calc.NLPSolver.dialogs; public interface IEvolutionarySolverStatusDialog { - public final static int WAITING = 0; - public final static int OK = 1; - public final static int CONTINUE = 2; - public final static int CANCEL = 3; + int WAITING = 0; + int OK = 1; + int CONTINUE = 2; + int CANCEL = 3; - public int getUserState(); + int getUserState(); - public void setBestSolution(double solution, boolean feasible); - public void setMaxIterations(int maxIterations); - public void setMaxStagnation(int maxStagnation); - public void setIteration(int iteration); - public void setStagnation(int stagnation); - public void setRuntime(long runtime); - public int waitForUser(); + void setBestSolution(double solution, boolean feasible); + void setMaxIterations(int maxIterations); + void setMaxStagnation(int maxStagnation); + void setIteration(int iteration); + void setStagnation(int stagnation); + void setRuntime(long runtime); + int waitForUser(); - public void setVisible(boolean visible); - public void dispose(); + void setVisible(boolean visible); + void dispose(); } diff --git a/odk/examples/DevelopersGuide/Config/ConfigExamples.java b/odk/examples/DevelopersGuide/Config/ConfigExamples.java index 5f786fe165f4..2cca38513f99 100644 --- a/odk/examples/DevelopersGuide/Config/ConfigExamples.java +++ b/odk/examples/DevelopersGuide/Config/ConfigExamples.java @@ -435,12 +435,12 @@ public class ConfigExamples // BROWSE example /// Interface to procees information when browsing the configuration tree - public static interface IConfigurationProcessor + public interface IConfigurationProcessor { /// process a value item - public abstract void processValueElement( String sPath_, Object aValue_ ); + void processValueElement( String sPath_, Object aValue_ ); /// process a structural item - public abstract void processStructuralElement( String sPath_, XInterface xElement_); + void processStructuralElement( String sPath_, XInterface xElement_); } /// Internal method to recursively browse a structural element in preorder diff --git a/odk/examples/DevelopersGuide/OfficeDev/DesktopEnvironment/IOnewayLink.java b/odk/examples/DevelopersGuide/OfficeDev/DesktopEnvironment/IOnewayLink.java index 1ad68bb82f4b..ff4bfe4cc65e 100644 --- a/odk/examples/DevelopersGuide/OfficeDev/DesktopEnvironment/IOnewayLink.java +++ b/odk/examples/DevelopersGuide/OfficeDev/DesktopEnvironment/IOnewayLink.java @@ -64,5 +64,5 @@ public interface IOnewayLink * Note: Atomic types (e.g. int, long) will be transported as objects * too (Integer, Long)! */ - public abstract void execOneway( int nRequest, ArrayList<Object> lParams ); + void execOneway( int nRequest, ArrayList<Object> lParams ); } diff --git a/odk/examples/DevelopersGuide/OfficeDev/DesktopEnvironment/IShutdownListener.java b/odk/examples/DevelopersGuide/OfficeDev/DesktopEnvironment/IShutdownListener.java index de9ac9fa43f2..bd7f3af0de94 100644 --- a/odk/examples/DevelopersGuide/OfficeDev/DesktopEnvironment/IShutdownListener.java +++ b/odk/examples/DevelopersGuide/OfficeDev/DesktopEnvironment/IShutdownListener.java @@ -41,5 +41,5 @@ */ public interface IShutdownListener { - public abstract void shutdown(); + void shutdown(); } diff --git a/qadevOOo/runner/base/TestBase.java b/qadevOOo/runner/base/TestBase.java index c4bc02d01885..0e4d94710198 100644 --- a/qadevOOo/runner/base/TestBase.java +++ b/qadevOOo/runner/base/TestBase.java @@ -25,6 +25,6 @@ import lib.TestParameters; */ public interface TestBase { - public boolean executeTest(TestParameters param); + boolean executeTest(TestParameters param); } diff --git a/qadevOOo/runner/convwatch/FilenameHelper.java b/qadevOOo/runner/convwatch/FilenameHelper.java index 8d7fcb08c755..54a159155e1d 100644 --- a/qadevOOo/runner/convwatch/FilenameHelper.java +++ b/qadevOOo/runner/convwatch/FilenameHelper.java @@ -31,11 +31,11 @@ import helper.StringHelper; interface Filenamer { - public String getSuffix(); - public String getFileURL(); - public String getAbsoluteSystemFilename(); - public String getFilename(); - public String getSystemPath(); + String getSuffix(); + String getFileURL(); + String getAbsoluteSystemFilename(); + String getFilename(); + String getSystemPath(); } diff --git a/qadevOOo/runner/convwatch/PropertyName.java b/qadevOOo/runner/convwatch/PropertyName.java index 4752fb3ad6f2..88269954c977 100644 --- a/qadevOOo/runner/convwatch/PropertyName.java +++ b/qadevOOo/runner/convwatch/PropertyName.java @@ -20,39 +20,39 @@ package convwatch; public interface PropertyName { - final public static String DOC_COMPARATOR_INPUT_PATH = "DOC_COMPARATOR_INPUT_PATH"; - final public static String DOC_COMPARATOR_OUTPUT_PATH = "DOC_COMPARATOR_OUTPUT_PATH"; - final public static String DOC_COMPARATOR_DIFF_PATH = "DOC_COMPARATOR_DIFF_PATH"; - final public static String DOC_COMPARATOR_REFERENCE_PATH = "DOC_COMPARATOR_REFERENCE_PATH"; - final public static String DOC_COMPARATOR_REFERENCE_INPUT_PATH = "DOC_COMPARATOR_REFERENCE_INPUT_PATH"; - final public static String DOC_COMPARATOR_REFERENCE_TYPE = "DOC_COMPARATOR_REFERENCE_CREATOR_TYPE"; - final public static String DOC_COMPARATOR_PRINTER_NAME = "DOC_COMPARATOR_PRINTER_NAME"; - final public static String DOC_COMPARATOR_DEFAULT_XML_FORMAT_APP = "DOC_COMPARATOR_DEFAULT_XML_FORMAT_APP"; - 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_COMPARATOR_GFXCMP_WITH_BORDERMOVE = "DOC_COMPARATOR_GFXCMP_WITH_BORDERMOVE"; - - 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_CONVERTER_REUSE_OFFICE = "DOC_CONVERTER_REUSE_OFFICE"; - - 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 TEMPPATH = "TEMPPATH"; + String DOC_COMPARATOR_INPUT_PATH = "DOC_COMPARATOR_INPUT_PATH"; + String DOC_COMPARATOR_OUTPUT_PATH = "DOC_COMPARATOR_OUTPUT_PATH"; + String DOC_COMPARATOR_DIFF_PATH = "DOC_COMPARATOR_DIFF_PATH"; + String DOC_COMPARATOR_REFERENCE_PATH = "DOC_COMPARATOR_REFERENCE_PATH"; + String DOC_COMPARATOR_REFERENCE_INPUT_PATH = "DOC_COMPARATOR_REFERENCE_INPUT_PATH"; + String DOC_COMPARATOR_REFERENCE_TYPE = "DOC_COMPARATOR_REFERENCE_CREATOR_TYPE"; + String DOC_COMPARATOR_PRINTER_NAME = "DOC_COMPARATOR_PRINTER_NAME"; + String DOC_COMPARATOR_DEFAULT_XML_FORMAT_APP = "DOC_COMPARATOR_DEFAULT_XML_FORMAT_APP"; + String DOC_COMPARATOR_INCLUDE_SUBDIRS = "DOC_COMPARATOR_INCLUDE_SUBDIRS"; + String DOC_COMPARATOR_PRINT_MAX_PAGE = "DOC_COMPARATOR_PRINT_MAX_PAGE"; + String DOC_COMPARATOR_PRINT_ONLY_PAGE = "DOC_COMPARATOR_PRINT_ONLY_PAGE"; + String DOC_COMPARATOR_GFX_OUTPUT_DPI_RESOLUTION = "DOC_COMPARATOR_GFX_OUTPUT_DPI_RESOLUTION"; + String DOC_COMPARATOR_OVERWRITE_REFERENCE = "DOC_COMPARATOR_OVERWRITE_REFERENCE"; + + String DOC_COMPARATOR_HTML_OUTPUT_PREFIX = "DOC_COMPARATOR_HTML_OUTPUT_PREFIX"; + String DOC_COMPARATOR_GFXCMP_WITH_BORDERMOVE = "DOC_COMPARATOR_GFXCMP_WITH_BORDERMOVE"; + + String DOC_CONVERTER_IMPORT_FILTER_NAME = "DOC_CONVERTER_IMPORT_FILTER_NAME"; + String DOC_CONVERTER_EXPORT_FILTER_NAME = "DOC_CONVERTER_EXPORT_FILTER_NAME"; + String DOC_CONVERTER_OFFICE_PROGRAM = "DOC_CONVERTER_OFFICE_PROGRAM"; + String DOC_CONVERTER_REUSE_OFFICE = "DOC_CONVERTER_REUSE_OFFICE"; + + String DOC_COMPARATOR_LEAVE_OUT_FILES = "DOC_COMPARATOR_LEAVE_OUT_FILES"; + + String DOC_COMPARATOR_DB_INFO_STRING = "DOC_COMPARATOR_DB_INFO_STRING"; + + String TEMPPATH = "TEMPPATH"; // set this variable to "true" or "yes" and loadComponentFromURL works with property Hidden=false - final public static String OFFICE_VIEWABLE = "OFFICE_VIEWABLE"; + String OFFICE_VIEWABLE = "OFFICE_VIEWABLE"; - final public static String DB_CONNECTION_STRING = "DB_CONNECTION_STRING"; - final public static String CHECK_NEED_TOOLS = "CHECK_NEED_TOOLS"; - final public static String CREATE_DEFAULT = "CREATE_DEFAULT_REFERENCE"; + String DB_CONNECTION_STRING = "DB_CONNECTION_STRING"; + String CHECK_NEED_TOOLS = "CHECK_NEED_TOOLS"; + String CREATE_DEFAULT = "CREATE_DEFAULT_REFERENCE"; } diff --git a/qadevOOo/runner/graphical/IDocument.java b/qadevOOo/runner/graphical/IDocument.java index ef07299d87d1..99105b3d0582 100644 --- a/qadevOOo/runner/graphical/IDocument.java +++ b/qadevOOo/runner/graphical/IDocument.java @@ -23,5 +23,5 @@ public interface IDocument /** * Call this for each document */ - public void checkOneFile(String _sDocument, String _sResult, ParameterHelper _aParams) throws OfficeException; + void checkOneFile(String _sDocument, String _sResult, ParameterHelper _aParams) throws OfficeException; } diff --git a/qadevOOo/runner/graphical/IOffice.java b/qadevOOo/runner/graphical/IOffice.java index 54d8cc24fea4..83094b8aa076 100644 --- a/qadevOOo/runner/graphical/IOffice.java +++ b/qadevOOo/runner/graphical/IOffice.java @@ -23,21 +23,21 @@ public interface IOffice /** * start an Office, if need */ - public void start() throws OfficeException; + void start() throws OfficeException; /** * Load a document by it's Name */ - public void load(String Name) throws OfficeException; + void load(String Name) throws OfficeException; /** * Create a postscript file in the DOC_COMPARATOR_OUTPUT_DIR directory from a loaded document */ - public void storeAsPostscript() throws OfficeException; + void storeAsPostscript() throws OfficeException; /** * Close the background office */ - public void close() throws OfficeException; + void close() throws OfficeException; } diff --git a/qadevOOo/runner/graphical/PropertyName.java b/qadevOOo/runner/graphical/PropertyName.java index 1c25b75003b2..bb71f95c8ed5 100644 --- a/qadevOOo/runner/graphical/PropertyName.java +++ b/qadevOOo/runner/graphical/PropertyName.java @@ -20,20 +20,20 @@ package graphical; public interface PropertyName { - final public static String DOC_COMPARATOR_INPUT_PATH = "DOC_COMPARATOR_INPUT_PATH"; - final public static String DOC_COMPARATOR_OUTPUT_PATH = "DOC_COMPARATOR_OUTPUT_PATH"; - final public static String DOC_COMPARATOR_REFERENCE_TYPE = "DOC_COMPARATOR_REFERENCE_CREATOR_TYPE"; - final public static String DOC_COMPARATOR_PRINTER_NAME = "DOC_COMPARATOR_PRINTER_NAME"; - 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"; + String DOC_COMPARATOR_INPUT_PATH = "DOC_COMPARATOR_INPUT_PATH"; + String DOC_COMPARATOR_OUTPUT_PATH = "DOC_COMPARATOR_OUTPUT_PATH"; + String DOC_COMPARATOR_REFERENCE_TYPE = "DOC_COMPARATOR_REFERENCE_CREATOR_TYPE"; + String DOC_COMPARATOR_PRINTER_NAME = "DOC_COMPARATOR_PRINTER_NAME"; + String DOC_COMPARATOR_INCLUDE_SUBDIRS = "DOC_COMPARATOR_INCLUDE_SUBDIRS"; + String DOC_COMPARATOR_PRINT_MAX_PAGE = "DOC_COMPARATOR_PRINT_MAX_PAGE"; + String DOC_COMPARATOR_PRINT_ONLY_PAGE = "DOC_COMPARATOR_PRINT_ONLY_PAGE"; - final public static String DOC_COMPARATOR_OVERWRITE_REFERENCE = "DOC_COMPARATOR_OVERWRITE_REFERENCE"; + String DOC_COMPARATOR_OVERWRITE_REFERENCE = "DOC_COMPARATOR_OVERWRITE_REFERENCE"; - final public static String DOC_COMPARATOR_HTML_OUTPUT_PREFIX = "DOC_COMPARATOR_HTML_OUTPUT_PREFIX"; + String DOC_COMPARATOR_HTML_OUTPUT_PREFIX = "DOC_COMPARATOR_HTML_OUTPUT_PREFIX"; - final public static String OFFICE_VIEWABLE = "OFFICE_VIEWABLE"; + String OFFICE_VIEWABLE = "OFFICE_VIEWABLE"; - final public static String NO_SMALL_PICTURES = "NoSmallPictures"; + String NO_SMALL_PICTURES = "NoSmallPictures"; } diff --git a/qadevOOo/runner/helper/AppProvider.java b/qadevOOo/runner/helper/AppProvider.java index 9e2a726e55c4..e8f77d1f059a 100644 --- a/qadevOOo/runner/helper/AppProvider.java +++ b/qadevOOo/runner/helper/AppProvider.java @@ -27,12 +27,12 @@ public interface AppProvider { /** * Method to get the desired Manager */ - public Object getManager(lib.TestParameters param); + Object getManager(lib.TestParameters param); /** * Method to dispose the desired Manager */ - public boolean disposeManager(lib.TestParameters param); + boolean disposeManager(lib.TestParameters param); /** * Close an office. @@ -41,6 +41,6 @@ public interface AppProvider { * it was running before the test * @return True, if close worked. */ - public boolean closeExistingOffice(lib.TestParameters param, + boolean closeExistingOffice(lib.TestParameters param, boolean closeIfPossible); } diff --git a/qadevOOo/runner/share/ComplexTest.java b/qadevOOo/runner/share/ComplexTest.java index 02abbe099f7e..a7b2412e5685 100644 --- a/qadevOOo/runner/share/ComplexTest.java +++ b/qadevOOo/runner/share/ComplexTest.java @@ -22,9 +22,9 @@ package share; */ public interface ComplexTest { - public String[] getTestMethodNames(); + String[] getTestMethodNames(); - public String getTestObjectName(); + String getTestObjectName(); } diff --git a/qadevOOo/runner/share/CwsDataExchange.java b/qadevOOo/runner/share/CwsDataExchange.java index 3b160a179a24..c59c54c87248 100644 --- a/qadevOOo/runner/share/CwsDataExchange.java +++ b/qadevOOo/runner/share/CwsDataExchange.java @@ -30,11 +30,11 @@ public interface CwsDataExchange { * Retunrs all module names which are added to the specified childworkspace * @return a String array of all added modules */ - public ArrayList<String> getModules(); + ArrayList<String> getModules(); /** * Set the test status of cws related UnoAPI tests to the EIS dabase * @param status the status of the UnoAPI test */ - public void setUnoApiCwsStatus(boolean status); + void setUnoApiCwsStatus(boolean status); } diff --git a/qadevOOo/runner/share/LogWriter.java b/qadevOOo/runner/share/LogWriter.java index 98e2fc11b71f..9edc95407318 100644 --- a/qadevOOo/runner/share/LogWriter.java +++ b/qadevOOo/runner/share/LogWriter.java @@ -23,21 +23,19 @@ public interface LogWriter { /** * Method to print */ - public void println(String msg); + void println(String msg); /** * initialization * */ - - public boolean initialize(share.DescEntry entry, boolean active); + boolean initialize(share.DescEntry entry, boolean active); /** * will mostly be used by outproducers to sum up * the information, maybe write them to a db */ - - public boolean summary(share.DescEntry entry); + boolean summary(share.DescEntry entry); /** @@ -45,7 +43,7 @@ public interface LogWriter { * @see share.Watcher * @return the associated <CODE>Watcher</CODE> */ - public Object getWatcher(); + Object getWatcher(); /** * Set a <CODE>Watcher</CODE> to the <CODE>LogWriter</CODE> @@ -54,6 +52,6 @@ public interface LogWriter { * @see share.Watcher * @param watcher the new <CODE>Watcher</CODE> */ - public void setWatcher(Object watcher); + void setWatcher(Object watcher); } diff --git a/qadevOOo/runner/share/Watcher.java b/qadevOOo/runner/share/Watcher.java index d5780b0e9f3e..07e8e6562404 100644 --- a/qadevOOo/runner/share/Watcher.java +++ b/qadevOOo/runner/share/Watcher.java @@ -23,11 +23,11 @@ public interface Watcher { /** * pings the watcher to check for changes */ - public void ping(); + void ping(); /** * returns the amount of pings */ - public int getPing(); + int getPing(); } diff --git a/qadevOOo/runner/util/PropertyName.java b/qadevOOo/runner/util/PropertyName.java index 4aa864dc4fcc..141fee9e305e 100644 --- a/qadevOOo/runner/util/PropertyName.java +++ b/qadevOOo/runner/util/PropertyName.java @@ -27,90 +27,90 @@ public interface PropertyName { * The AppExecutionCmd contains the full qualified<br> * command to an Application to be started. */ - final public static String APP_EXECUTION_COMMAND = "AppExecutionCommand"; + String APP_EXECUTION_COMMAND = "AppExecutionCommand"; /** * parameter name: "AppKillCommand" */ - final public static String APP_KILL_COMMAND = "AppKillCommand"; + String APP_KILL_COMMAND = "AppKillCommand"; /** * parameter name: "ConnectionString" */ - final public static String CONNECTION_STRING = "ConnectionString"; - final public static String PIPE_CONNECTION_STRING = "PipeConnectionString"; - final public static String USE_PIPE_CONNECTION = "UsePipeConnection"; + String CONNECTION_STRING = "ConnectionString"; + String PIPE_CONNECTION_STRING = "PipeConnectionString"; + String USE_PIPE_CONNECTION = "UsePipeConnection"; /** * parameter name: "TestBase" * The Testbase to be executed by the runner<br> * default is 'java_fat' */ - final public static String TEST_BASE = "TestBase"; + String TEST_BASE = "TestBase"; /** * parameter name: "TestDocumentPath" */ - final public static String TEST_DOCUMENT_PATH = "TestDocumentPath"; + String TEST_DOCUMENT_PATH = "TestDocumentPath"; /** * parameter name: "LoggingIsActive" * 'true' is a log should be written, 'false' elsewhere <br> * these will be provided by the testcases<br> * default is true */ - final public static String LOGGING_IS_ACTIVE = "LoggingIsActive"; + String LOGGING_IS_ACTIVE = "LoggingIsActive"; /** * parameter name: "DebugIsActive" */ - final public static String DEBUG_IS_ACTIVE = "DebugIsActive"; + String DEBUG_IS_ACTIVE = "DebugIsActive"; /** * parameter name: "OutProduceer" * This parameter contains the class used<br> * for Logging */ - final public static String OUT_PRODUCER = "OutProducer"; + String OUT_PRODUCER = "OutProducer"; /** * parameter name: "ShortWait" * Short wait time for the Office: default is 500 milliseconds */ - final public static String SHORT_WAIT= "ShortWait"; + String SHORT_WAIT= "ShortWait"; /** * internal only, no parameter * The OfficeProvider contains the full qualified * class that provides a connection to StarOffice<br> * default is helper.OfficeProvider */ - final public static String OFFICE_PROVIDER = "OfficeProvider"; + String OFFICE_PROVIDER = "OfficeProvider"; /** * internal only, no parameter */ - final public static String OFFICE_WATCHER = "Watcher"; + String OFFICE_WATCHER = "Watcher"; /** * internal only, no parameter * This parameter contains the class used<br> * for Logging */ - final public static String LOG_WRITER = "LogWriter"; + String LOG_WRITER = "LogWriter"; /** * parameter name: "TimeOut"<p> * time out given in milli seconds * This parameter contains the timeout used<br> * by the watcher */ - final public static String TIME_OUT = "TimeOut"; + String TIME_OUT = "TimeOut"; /** * parameter name: "ThreadTimeOut" * This parameter contains the timeout used<br> * by the complex tests */ - final public static String THREAD_TIME_OUT = "ThreadTimeOut"; + String THREAD_TIME_OUT = "ThreadTimeOut"; /** * parameter name: "OfficeCloseTimeOut" * This parameter contains the time which the office could use to close for * itself before it is destroyed. Default is 15000 ms */ - final public static String OFFICE_CLOSE_TIME_OUT = "OfficeCloseTimeOut"; + String OFFICE_CLOSE_TIME_OUT = "OfficeCloseTimeOut"; /** * parameter name: "OperatingSystem" */ - final public static String OPERATING_SYSTEM = "OperatingSystem"; + String OPERATING_SYSTEM = "OperatingSystem"; /** * parameter name: "AutoRestart" * If this parameter is <CODE>true</CODE> the <CODE>OfficeProvider</CODE> tries @@ -118,22 +118,22 @@ public interface PropertyName { * <CODE>AppExecutionCommand</CODE> with useful content if needed. * Default is false. */ - final public static String AUTO_RESTART = "AutoRestart"; + String AUTO_RESTART = "AutoRestart"; /** * parameter name: "NewOfficeInstance" */ - final public static String NEW_OFFICE_INSTANCE = "NewOfficeInstance"; + String NEW_OFFICE_INSTANCE = "NewOfficeInstance"; /** * parameter name: "SRC_ROOT"<p> * path to the source root of OpenOffice.org */ - final public static String SRC_ROOT = "SRC_ROOT"; + String SRC_ROOT = "SRC_ROOT"; /** * parameter name: "Version"<p> * the name of the version to test */ - final public static String VERSION = "Version"; + String VERSION = "Version"; /** * parameter name "Shell"<p> @@ -141,42 +141,42 @@ public interface PropertyName { * This shell is used to run some commands outside of Java * example: /bin/tcsh c:\\myShell\\myShell.exe */ - final public static String SHELL = "Shell"; + String SHELL = "Shell"; /** * parameter name "Cygwin"<p> * If Cygwin is set to TRUE it indicates if the runner runs in a Cygwin * environment */ - final public static String CYGWIN = "Cygwin"; + String CYGWIN = "Cygwin"; /** * parameter name: "NoCwsAttach"<p> * If this parameter is set to "true" , a status of CWS-UnoAPI-Tests was not attached to EIS<p> * @see complex.unoapi.CheckModuleAPI */ - final public static String NO_CWS_ATTACH = "NoCwsAttach"; + String NO_CWS_ATTACH = "NoCwsAttach"; /** * internal only, no parameter */ - final public static String WNTMSCI = "wntmsci"; + String WNTMSCI = "wntmsci"; /** * internal only, no parameter */ - final public static String UNXLNGI = "unxlngi"; + String UNXLNGI = "unxlngi"; /** * internal only, no parameter */ - final public static String UNXSOLS = "unxsols"; + String UNXSOLS = "unxsols"; /** * internal only, no parameter */ - final public static String UNXSOLI = "unxsoli"; + String UNXSOLI = "unxsoli"; /** * internal only, no parameter */ - final public static String UNXMACXI = "unxmacxi"; + String UNXMACXI = "unxmacxi"; /** * can be used to dont backup the user layer, faster office start/stop but less secure default is to backup the user layer */ - final public static String DONT_BACKUP_USERLAYER = "DontBackupUserLayer"; + String DONT_BACKUP_USERLAYER = "DontBackupUserLayer"; } diff --git a/qadevOOo/runner/util/compare/DocComparator.java b/qadevOOo/runner/util/compare/DocComparator.java index 8503fda8254a..f46e46a6012d 100644 --- a/qadevOOo/runner/util/compare/DocComparator.java +++ b/qadevOOo/runner/util/compare/DocComparator.java @@ -20,22 +20,12 @@ package util.compare; import java.io.IOException; -/** - * - * - */ - public interface DocComparator { - public boolean isReferenceExistent() throws IOException; - - - - - + boolean isReferenceExistent() throws IOException; - public boolean isDiffReferenceExistent() throws IOException; + boolean isDiffReferenceExistent() throws IOException; - public boolean compareDiff() throws IOException; + boolean compareDiff() throws IOException; } diff --git a/qadevOOo/tests/java/ifc/accessibility/_XAccessibleEventBroadcaster.java b/qadevOOo/tests/java/ifc/accessibility/_XAccessibleEventBroadcaster.java index 62e2aac1f3e6..e957cc3e6e76 100644 --- a/qadevOOo/tests/java/ifc/accessibility/_XAccessibleEventBroadcaster.java +++ b/qadevOOo/tests/java/ifc/accessibility/_XAccessibleEventBroadcaster.java @@ -51,7 +51,7 @@ import com.sun.star.uno.UnoRuntime; */ public class _XAccessibleEventBroadcaster extends MultiMethodTest { - public static interface EventProducer { + public interface EventProducer { void fireEvent(); } diff --git a/qadevOOo/tests/java/ifc/awt/_XUserInputInterception.java b/qadevOOo/tests/java/ifc/awt/_XUserInputInterception.java index 7440670bf68e..ff0102a89ddf 100644 --- a/qadevOOo/tests/java/ifc/awt/_XUserInputInterception.java +++ b/qadevOOo/tests/java/ifc/awt/_XUserInputInterception.java @@ -518,10 +518,10 @@ public class _XUserInputInterception extends MultiMethodTest { private interface EventTriggerType{ /** klick the mouse into the scroll bar*/ - final public static int MOUSE_KLICK_INTO_DOC = 1; + int MOUSE_KLICK_INTO_DOC = 1; /** write some text into a spread sheet*/ - final public static int KEY_TEXT_INTO_DOC = 2; + int KEY_TEXT_INTO_DOC = 2; } } diff --git a/qadevOOo/tests/java/ifc/awt/tree/_XMutableTreeNode.java b/qadevOOo/tests/java/ifc/awt/tree/_XMutableTreeNode.java index 1c8cd3c1be29..a231e7f224c7 100644 --- a/qadevOOo/tests/java/ifc/awt/tree/_XMutableTreeNode.java +++ b/qadevOOo/tests/java/ifc/awt/tree/_XMutableTreeNode.java @@ -47,8 +47,8 @@ public class _XMutableTreeNode extends MultiMethodTest { private XMutableTreeNodeCreator nodeCreator = null; - public static interface XMutableTreeNodeCreator{ - public XMutableTreeNode createNode(String name); + public interface XMutableTreeNodeCreator{ + XMutableTreeNode createNode(String name); } @Override diff --git a/qadevOOo/tests/java/ifc/awt/tree/_XTreeControl.java b/qadevOOo/tests/java/ifc/awt/tree/_XTreeControl.java index ff19b9cac4f2..c6c4b59d88b4 100644 --- a/qadevOOo/tests/java/ifc/awt/tree/_XTreeControl.java +++ b/qadevOOo/tests/java/ifc/awt/tree/_XTreeControl.java @@ -87,8 +87,8 @@ public class _XTreeControl extends MultiMethodTest { boolean mTreeNodeEditing2 = false; boolean mTreeNodeEdit2 = false; - public static interface XTreeDataModelListenerEvent{ - public void fireEvent(); + public interface XTreeDataModelListenerEvent{ + void fireEvent(); } public class TreeExpansionListenerImpl1 implements XTreeExpansionListener{ diff --git a/qadevOOo/tests/java/ifc/awt/tree/_XTreeDataModel.java b/qadevOOo/tests/java/ifc/awt/tree/_XTreeDataModel.java index 92e1d56714fc..3c544efd5405 100644 --- a/qadevOOo/tests/java/ifc/awt/tree/_XTreeDataModel.java +++ b/qadevOOo/tests/java/ifc/awt/tree/_XTreeDataModel.java @@ -51,8 +51,8 @@ public class _XTreeDataModel extends MultiMethodTest { boolean mTreeStructureChanged2 = false; - public static interface XTreeDataModelListenerEvent{ - public void fireEvent(); + public interface XTreeDataModelListenerEvent{ + void fireEvent(); } public class myEventListener1 implements XTreeDataModelListener{ diff --git a/qadevOOo/tests/java/ifc/document/_XFilter.java b/qadevOOo/tests/java/ifc/document/_XFilter.java index 9908c452cda3..991ef40b2af9 100644 --- a/qadevOOo/tests/java/ifc/document/_XFilter.java +++ b/qadevOOo/tests/java/ifc/document/_XFilter.java @@ -54,7 +54,7 @@ import com.sun.star.uno.UnoRuntime; */ public class _XFilter extends MultiMethodTest { - public static interface FilterChecker { + public interface FilterChecker { boolean checkFilter() ; } diff --git a/qadevOOo/tests/java/ifc/form/_XChangeBroadcaster.java b/qadevOOo/tests/java/ifc/form/_XChangeBroadcaster.java index 4bce8dcab931..70eccdc4f3a2 100644 --- a/qadevOOo/tests/java/ifc/form/_XChangeBroadcaster.java +++ b/qadevOOo/tests/java/ifc/form/_XChangeBroadcaster.java @@ -70,12 +70,12 @@ public class _XChangeBroadcaster extends MultiMethodTest { * in relation if it doesn't support <code>XTextComponent</code> * interface. It used to change the content of component. */ - public static interface Changer { + public interface Changer { /** * The method must change the component's content to * cause a listener call. */ - public void change() ; + void change() ; } /** diff --git a/qadevOOo/tests/java/ifc/form/_XDatabaseParameterBroadcaster.java b/qadevOOo/tests/java/ifc/form/_XDatabaseParameterBroadcaster.java index 4a9a8524b2ad..384493d588ec 100644 --- a/qadevOOo/tests/java/ifc/form/_XDatabaseParameterBroadcaster.java +++ b/qadevOOo/tests/java/ifc/form/_XDatabaseParameterBroadcaster.java @@ -36,16 +36,16 @@ public class _XDatabaseParameterBroadcaster extends MultiMethodTest { /** * Interface to implement so the call of the listener can be checked. */ - public static interface CheckParameterListener extends XDatabaseParameterListener { + public interface CheckParameterListener extends XDatabaseParameterListener { /** * Set a log of the listener, so messages of the listener get printed * into the file of the interface */ - public void setLog(PrintWriter log); + void setLog(PrintWriter log); /** * Return True, when the listener was called correctly. */ - public boolean checkListener(); + boolean checkListener(); } /** diff --git a/qadevOOo/tests/java/ifc/form/_XUpdateBroadcaster.java b/qadevOOo/tests/java/ifc/form/_XUpdateBroadcaster.java index badab75a22f3..e8cd10a36c1e 100644 --- a/qadevOOo/tests/java/ifc/form/_XUpdateBroadcaster.java +++ b/qadevOOo/tests/java/ifc/form/_XUpdateBroadcaster.java @@ -51,21 +51,21 @@ public class _XUpdateBroadcaster extends MultiMethodTest { * Interface for relation. Updating, committing and checking * if data was committed is object dependent behaviour. */ - public static interface UpdateChecker { + public interface UpdateChecker { /** * Method must make some data update in the object tested. */ - public void update() throws com.sun.star.uno.Exception ; + void update() throws com.sun.star.uno.Exception ; /** * Method must commit data change made by method <code>update</code>. */ - public void commit() throws com.sun.star.uno.Exception ; + void commit() throws com.sun.star.uno.Exception ; /** * Checks if the data committed by <code>commit</code> method * became permanent in data source. * @return <code>true</code> if data was committed. */ - public boolean wasCommited() throws com.sun.star.uno.Exception ; + boolean wasCommited() throws com.sun.star.uno.Exception ; } /** diff --git a/qadevOOo/tests/java/ifc/io/_XOutputStream.java b/qadevOOo/tests/java/ifc/io/_XOutputStream.java index 5a3b90e7726b..01caa6f48d20 100644 --- a/qadevOOo/tests/java/ifc/io/_XOutputStream.java +++ b/qadevOOo/tests/java/ifc/io/_XOutputStream.java @@ -51,9 +51,9 @@ public class _XOutputStream extends MultiMethodTest { StreamChecker checker = null; byte[] data = null; - public static interface StreamChecker { - public XInputStream getInStream(); - public void resetStreams(); + public interface StreamChecker { + XInputStream getInStream(); + void resetStreams(); } @Override diff --git a/qadevOOo/tests/java/ifc/sdb/_XCompletedExecution.java b/qadevOOo/tests/java/ifc/sdb/_XCompletedExecution.java index 4ff9f65fb211..548b86c96b32 100644 --- a/qadevOOo/tests/java/ifc/sdb/_XCompletedExecution.java +++ b/qadevOOo/tests/java/ifc/sdb/_XCompletedExecution.java @@ -35,16 +35,16 @@ public class _XCompletedExecution extends MultiMethodTest { /** * Interface to implement so the call of the listener can be checked. */ - public static interface CheckInteractionHandler extends XInteractionHandler { + public interface CheckInteractionHandler extends XInteractionHandler { /** * Set a log of the listener, so messages of the listener get printed * into the file of the interface */ - public void setLog(PrintWriter log); + void setLog(PrintWriter log); /** * Return True, when the listener was called correctly. */ - public boolean checkInteractionHandler(); + boolean checkInteractionHandler(); } @Override diff --git a/qadevOOo/tests/java/ifc/sdb/_XRowSetApproveBroadcaster.java b/qadevOOo/tests/java/ifc/sdb/_XRowSetApproveBroadcaster.java index 8f525182a413..9ac091b607e1 100644 --- a/qadevOOo/tests/java/ifc/sdb/_XRowSetApproveBroadcaster.java +++ b/qadevOOo/tests/java/ifc/sdb/_XRowSetApproveBroadcaster.java @@ -53,12 +53,12 @@ public class _XRowSetApproveBroadcaster extends MultiMethodTest { * on which <code>XRowSetApproveListener</code>s can react. * @see com.sun.star.sdb.XRowSetApproveListener */ - public static interface RowSetApproveChecker { + public interface RowSetApproveChecker { /** * Moves cursor within row set. Method <code>approveCursorMove</code> * of <code>XRowSetApproveListener</code> must be called. */ - public void moveCursor() ; + void moveCursor() ; /** * Change rows in row set. Method <code>approveRowChange</code> * of <code>XRowSetApproveListener</code> must be called. @@ -66,12 +66,12 @@ public class _XRowSetApproveBroadcaster extends MultiMethodTest { * what type of change was made and how many rows it affected. * @see com.sun.star.sdb.RowChangeEvent */ - public RowChangeEvent changeRow() ; + RowChangeEvent changeRow() ; /** * Change the whole row set. Method <code>approveRowSetChange</code> * of <code>XRowSetApproveListener</code> must be called. */ - public void changeRowSet() ; + void changeRowSet() ; } /** diff --git a/qadevOOo/tests/java/ifc/sdbc/_XResultSetUpdate.java b/qadevOOo/tests/java/ifc/sdbc/_XResultSetUpdate.java index b32e93dbdf8c..3723739107dc 100644 --- a/qadevOOo/tests/java/ifc/sdbc/_XResultSetUpdate.java +++ b/qadevOOo/tests/java/ifc/sdbc/_XResultSetUpdate.java @@ -61,26 +61,26 @@ public class _XResultSetUpdate extends MultiMethodTest { * test results. It's implementation must be passed * to this test. */ - public static interface UpdateTester { + public interface UpdateTester { /** * @return Current number of rows. */ - public int rowCount() throws SQLException ; + int rowCount() throws SQLException ; /** * Updates some data in the current row but doesn't commit * changes to the source. */ - public void update() throws SQLException ; + void update() throws SQLException ; /** * Checks if updates made by method <code>update</code> was * committed to the data source. */ - public boolean wasUpdated() throws SQLException ; + boolean wasUpdated() throws SQLException ; /** * Returns current row number. Really it must returns value * < 1 if the current position is on insert row. */ - public int currentRow() throws SQLException ; + int currentRow() throws SQLException ; } /** diff --git a/qadevOOo/tests/java/ifc/ui/_XUIConfiguration.java b/qadevOOo/tests/java/ifc/ui/_XUIConfiguration.java index 44682acf33ca..8b880e67cf7c 100644 --- a/qadevOOo/tests/java/ifc/ui/_XUIConfiguration.java +++ b/qadevOOo/tests/java/ifc/ui/_XUIConfiguration.java @@ -44,11 +44,11 @@ public class _XUIConfiguration extends MultiMethodTest { * <CODE>XUIConfiguration.XUIConfigurationListenerImpl</CODE> * @see com.sun.star.ui.XUIConfigurationListener */ - public static interface XUIConfigurationListenerImpl + public interface XUIConfigurationListenerImpl extends XUIConfigurationListener { - public void reset(); - public void fireEvent(); - public boolean actionWasTriggered(); + void reset(); + void fireEvent(); + boolean actionWasTriggered(); } diff --git a/qadevOOo/tests/java/ifc/util/_XSortable.java b/qadevOOo/tests/java/ifc/util/_XSortable.java index f6a60f740dab..e43c93c16ad9 100644 --- a/qadevOOo/tests/java/ifc/util/_XSortable.java +++ b/qadevOOo/tests/java/ifc/util/_XSortable.java @@ -211,13 +211,13 @@ public class _XSortable extends MultiMethodTest { /** * The interface for sort checking. */ - public static interface XSortChecker { - public void prepareToSort(); + public interface XSortChecker { + void prepareToSort(); - public boolean checkSort(boolean isSortNumbering, + boolean checkSort(boolean isSortNumbering, boolean isSortAscending); - public void setPrintWriter(PrintWriter log); + void setPrintWriter(PrintWriter log); } /** diff --git a/qadevOOo/tests/java/ifc/xml/sax/_XDocumentHandler.java b/qadevOOo/tests/java/ifc/xml/sax/_XDocumentHandler.java index fa1030a47f5c..177ca2fb5bd7 100644 --- a/qadevOOo/tests/java/ifc/xml/sax/_XDocumentHandler.java +++ b/qadevOOo/tests/java/ifc/xml/sax/_XDocumentHandler.java @@ -102,7 +102,7 @@ public class _XDocumentHandler extends MultiMethodTest { * This interface implementation must be passed by component test * for checking the whole import process. */ - public static interface ImportChecker { + public interface ImportChecker { /** * Returns <code>true</code> if the XML data was successfully * imported, <code>false</code> in other case. @@ -114,7 +114,7 @@ public class _XDocumentHandler extends MultiMethodTest { * This interface implementation must be passed by component test * for setting a target document to the import process */ - public static interface TargetDocumentSetter { + public interface TargetDocumentSetter { void setTargetDocument(); } diff --git a/reportbuilder/java/org/libreoffice/report/DataSourceFactory.java b/reportbuilder/java/org/libreoffice/report/DataSourceFactory.java index 9987a6a963e2..9f0eee8df677 100644 --- a/reportbuilder/java/org/libreoffice/report/DataSourceFactory.java +++ b/reportbuilder/java/org/libreoffice/report/DataSourceFactory.java @@ -28,6 +28,6 @@ import java.util.Map; public interface DataSourceFactory { - public DataSource queryData(String name, Map<String,Object> parameters) + DataSource queryData(String name, Map<String,Object> parameters) throws DataSourceException; } diff --git a/reportbuilder/java/org/libreoffice/report/pentaho/layoutprocessor/OfficeRepeatingStructureLayoutController.java b/reportbuilder/java/org/libreoffice/report/pentaho/layoutprocessor/OfficeRepeatingStructureLayoutController.java index a07aaf9a2b5c..2ca47ca2c1d1 100644 --- a/reportbuilder/java/org/libreoffice/report/pentaho/layoutprocessor/OfficeRepeatingStructureLayoutController.java +++ b/reportbuilder/java/org/libreoffice/report/pentaho/layoutprocessor/OfficeRepeatingStructureLayoutController.java @@ -28,7 +28,7 @@ import org.jfree.report.flow.layoutprocessor.LayoutController; public interface OfficeRepeatingStructureLayoutController extends LayoutController { - public boolean isNormalFlowProcessing(); + boolean isNormalFlowProcessing(); - public VariablesCollection getVariablesCollection(); + VariablesCollection getVariablesCollection(); } diff --git a/scripting/java/com/sun/star/script/framework/container/XMLParser.java b/scripting/java/com/sun/star/script/framework/container/XMLParser.java index 867df322234a..b8b64096c06e 100644 --- a/scripting/java/com/sun/star/script/framework/container/XMLParser.java +++ b/scripting/java/com/sun/star/script/framework/container/XMLParser.java @@ -24,6 +24,6 @@ import java.io.IOException; import org.w3c.dom.Document; public interface XMLParser { - public Document parse(InputStream inputStream) throws IOException; - public void write(Document doc, OutputStream out) throws IOException; + Document parse(InputStream inputStream) throws IOException; + void write(Document doc, OutputStream out) throws IOException; } diff --git a/scripting/java/com/sun/star/script/framework/provider/ScriptEditor.java b/scripting/java/com/sun/star/script/framework/provider/ScriptEditor.java index c9d777542914..834108bc62ba 100644 --- a/scripting/java/com/sun/star/script/framework/provider/ScriptEditor.java +++ b/scripting/java/com/sun/star/script/framework/provider/ScriptEditor.java @@ -23,9 +23,9 @@ import com.sun.star.script.framework.container.ScriptMetaData; public interface ScriptEditor { - public Object execute() throws Exception; - public void indicateErrorLine( int lineNum ); - public void edit(XScriptContext context, ScriptMetaData entry); - public String getTemplate(); - public String getExtension(); + Object execute() throws Exception; + void indicateErrorLine( int lineNum ); + void edit(XScriptContext context, ScriptMetaData entry); + String getTemplate(); + String getExtension(); } diff --git a/scripting/java/com/sun/star/script/framework/provider/beanshell/ScriptSourceView.java b/scripting/java/com/sun/star/script/framework/provider/beanshell/ScriptSourceView.java index 01448ac52c5b..0055d44889e8 100644 --- a/scripting/java/com/sun/star/script/framework/provider/beanshell/ScriptSourceView.java +++ b/scripting/java/com/sun/star/script/framework/provider/beanshell/ScriptSourceView.java @@ -18,9 +18,9 @@ package com.sun.star.script.framework.provider.beanshell; public interface ScriptSourceView { - public void clear(); - public void update(); - public boolean isModified(); - public void setModified(boolean value); - public String getText(); + void clear(); + void update(); + boolean isModified(); + void setModified(boolean value); + String getText(); } diff --git a/scripting/java/com/sun/star/script/framework/provider/java/Resolver.java b/scripting/java/com/sun/star/script/framework/provider/java/Resolver.java index 42666798645f..af35e3e4c233 100644 --- a/scripting/java/com/sun/star/script/framework/provider/java/Resolver.java +++ b/scripting/java/com/sun/star/script/framework/provider/java/Resolver.java @@ -32,7 +32,7 @@ public interface Resolver { * @param c A Class * @return The ScriptProxy value */ - public ScriptProxy getProxy( ScriptDescriptor sd, Class<?> c ) + ScriptProxy getProxy( ScriptDescriptor sd, Class<?> c ) throws NoSuchMethodException; } diff --git a/scripting/java/org/openoffice/idesupport/CommandLineTools.java b/scripting/java/org/openoffice/idesupport/CommandLineTools.java index 0b4747d1ccf9..8e2b39776176 100644 --- a/scripting/java/org/openoffice/idesupport/CommandLineTools.java +++ b/scripting/java/org/openoffice/idesupport/CommandLineTools.java @@ -86,7 +86,7 @@ public class CommandLineTools { } private interface Command { - public void execute() throws Exception; + void execute() throws Exception; } private void printUsage() { diff --git a/scripting/java/org/openoffice/idesupport/MethodFinder.java b/scripting/java/org/openoffice/idesupport/MethodFinder.java index 448149d776b9..83e81b8d2233 100644 --- a/scripting/java/org/openoffice/idesupport/MethodFinder.java +++ b/scripting/java/org/openoffice/idesupport/MethodFinder.java @@ -22,5 +22,5 @@ import java.io.File; import com.sun.star.script.framework.container.ScriptEntry; public interface MethodFinder { - public ScriptEntry[] findMethods(File basedir); + ScriptEntry[] findMethods(File basedir); } diff --git a/scripting/java/org/openoffice/idesupport/filter/FileFilter.java b/scripting/java/org/openoffice/idesupport/filter/FileFilter.java index 4f4f19a56afc..f64a902ab255 100644 --- a/scripting/java/org/openoffice/idesupport/filter/FileFilter.java +++ b/scripting/java/org/openoffice/idesupport/filter/FileFilter.java @@ -19,5 +19,5 @@ package org.openoffice.idesupport.filter; public interface FileFilter { - public boolean validate(String name); + boolean validate(String name); } diff --git a/scripting/java/org/openoffice/netbeans/modules/office/actions/OfficeDocumentCookie.java b/scripting/java/org/openoffice/netbeans/modules/office/actions/OfficeDocumentCookie.java index f29a419478aa..04ac91f3e741 100644 --- a/scripting/java/org/openoffice/netbeans/modules/office/actions/OfficeDocumentCookie.java +++ b/scripting/java/org/openoffice/netbeans/modules/office/actions/OfficeDocumentCookie.java @@ -24,10 +24,10 @@ import org.openide.nodes.Node; public interface OfficeDocumentCookie extends Node.Cookie { - public void mount(); - public Enumeration getParcels(); - public void removeParcel(String name); + void mount(); + Enumeration getParcels(); + void removeParcel(String name); - public void addChangeListener(ChangeListener cl); - public void removeChangeListener(ChangeListener cl); + void addChangeListener(ChangeListener cl); + void removeChangeListener(ChangeListener cl); } diff --git a/scripting/java/org/openoffice/netbeans/modules/office/actions/ParcelCookie.java b/scripting/java/org/openoffice/netbeans/modules/office/actions/ParcelCookie.java index 91ee95300560..1e4f701234bd 100644 --- a/scripting/java/org/openoffice/netbeans/modules/office/actions/ParcelCookie.java +++ b/scripting/java/org/openoffice/netbeans/modules/office/actions/ParcelCookie.java @@ -23,11 +23,11 @@ import org.openide.nodes.Node; public interface ParcelCookie extends Node.Cookie { - public File getFile(); + File getFile(); - public String getLanguage(); + String getLanguage(); - public void mount(); + void mount(); - public boolean deploy(File target); + boolean deploy(File target); } diff --git a/scripting/java/org/openoffice/netbeans/modules/office/actions/ParcelDescriptorParserCookie.java b/scripting/java/org/openoffice/netbeans/modules/office/actions/ParcelDescriptorParserCookie.java index c8604d89c25e..21091196b0e8 100644 --- a/scripting/java/org/openoffice/netbeans/modules/office/actions/ParcelDescriptorParserCookie.java +++ b/scripting/java/org/openoffice/netbeans/modules/office/actions/ParcelDescriptorParserCookie.java @@ -25,9 +25,9 @@ import org.openide.nodes.Node; public interface ParcelDescriptorParserCookie extends Node.Cookie { // should return a NodeList of org.w3c.dom.Element - public NodeList getScriptElements(); + NodeList getScriptElements(); - public void addChangeListener(ChangeListener cl); + void addChangeListener(ChangeListener cl); - public void removeChangeListener(ChangeListener cl); + void removeChangeListener(ChangeListener cl); } diff --git a/scripting/java/org/openoffice/netbeans/modules/office/actions/ParcelFolderCookie.java b/scripting/java/org/openoffice/netbeans/modules/office/actions/ParcelFolderCookie.java index 384864aef9de..778bd208b570 100644 --- a/scripting/java/org/openoffice/netbeans/modules/office/actions/ParcelFolderCookie.java +++ b/scripting/java/org/openoffice/netbeans/modules/office/actions/ParcelFolderCookie.java @@ -22,12 +22,12 @@ import org.openide.nodes.Node; public interface ParcelFolderCookie extends Node.Cookie { - public void generate(); + void generate(); - public boolean configure(); + boolean configure(); - public void setClasspath(String value); - public String getClasspath(); + void setClasspath(String value); + String getClasspath(); - public String getLanguage(); + String getLanguage(); } diff --git a/scripting/java/org/openoffice/netbeans/modules/office/filesystem/OpenOfficeDocFileSystem.java b/scripting/java/org/openoffice/netbeans/modules/office/filesystem/OpenOfficeDocFileSystem.java index 4ec771869fb5..5d7a65559dfd 100644 --- a/scripting/java/org/openoffice/netbeans/modules/office/filesystem/OpenOfficeDocFileSystem.java +++ b/scripting/java/org/openoffice/netbeans/modules/office/filesystem/OpenOfficeDocFileSystem.java @@ -783,7 +783,7 @@ System.out.println(" exception: " + ioe.getMessage()); */ private interface Strategy { - public boolean evaluate(Entry entry); + boolean evaluate(Entry entry); } /* ----------------------------------------------------------- diff --git a/scripting/workben/installer/InstallListener.java b/scripting/workben/installer/InstallListener.java index 92bd1b1ef399..6dd111559902 100644 --- a/scripting/workben/installer/InstallListener.java +++ b/scripting/workben/installer/InstallListener.java @@ -20,5 +20,5 @@ package installer; public interface InstallListener { - public void installationComplete(InstallationEvent e); + void installationComplete(InstallationEvent e); } diff --git a/wizards/com/sun/star/wizards/common/ConfigNode.java b/wizards/com/sun/star/wizards/common/ConfigNode.java index 7bb08aa89741..69cd96fc071f 100644 --- a/wizards/com/sun/star/wizards/common/ConfigNode.java +++ b/wizards/com/sun/star/wizards/common/ConfigNode.java @@ -35,9 +35,9 @@ public interface ConfigNode * to be used in a tree like way, reading objects and subobjects and so on, * it might be practical to be able to pass an extra parameter, for a free use. */ - public void readConfiguration(Object configurationView, Object param); + void readConfiguration(Object configurationView, Object param); - public void writeConfiguration(Object configurationView, Object param); + void writeConfiguration(Object configurationView, Object param); - public void setRoot(Object root); + void setRoot(Object root); } diff --git a/wizards/com/sun/star/wizards/common/IRenderer.java b/wizards/com/sun/star/wizards/common/IRenderer.java index c4513ea75ab1..c704ed6f49df 100644 --- a/wizards/com/sun/star/wizards/common/IRenderer.java +++ b/wizards/com/sun/star/wizards/common/IRenderer.java @@ -26,5 +26,5 @@ package com.sun.star.wizards.common; public interface IRenderer { - public String render(Object object); + String render(Object object); } diff --git a/wizards/com/sun/star/wizards/common/Indexable.java b/wizards/com/sun/star/wizards/common/Indexable.java index b20fd174c7f6..d838c35bbe07 100644 --- a/wizards/com/sun/star/wizards/common/Indexable.java +++ b/wizards/com/sun/star/wizards/common/Indexable.java @@ -25,6 +25,6 @@ package com.sun.star.wizards.common; public interface Indexable { - public int getIndex(); + int getIndex(); } diff --git a/wizards/com/sun/star/wizards/common/UCB.java b/wizards/com/sun/star/wizards/common/UCB.java index 6f6cf053a8d0..0c770cd37bf9 100644 --- a/wizards/com/sun/star/wizards/common/UCB.java +++ b/wizards/com/sun/star/wizards/common/UCB.java @@ -240,9 +240,9 @@ public class UCB XContentProvider.class,ucb).queryContent(id); } - private static interface Verifier + private interface Verifier { - public boolean verify(Object object); + boolean verify(Object object); } } diff --git a/wizards/com/sun/star/wizards/common/XMLProvider.java b/wizards/com/sun/star/wizards/common/XMLProvider.java index 063cb7a620a5..287e861ee714 100644 --- a/wizards/com/sun/star/wizards/common/XMLProvider.java +++ b/wizards/com/sun/star/wizards/common/XMLProvider.java @@ -28,5 +28,5 @@ import org.w3c.dom.Node; public interface XMLProvider { - public Node createDOM(Node parent); + Node createDOM(Node parent); } diff --git a/wizards/com/sun/star/wizards/db/QueryMetaData.java b/wizards/com/sun/star/wizards/db/QueryMetaData.java index 04852ae5c80e..58b005db90d8 100644 --- a/wizards/com/sun/star/wizards/db/QueryMetaData.java +++ b/wizards/com/sun/star/wizards/db/QueryMetaData.java @@ -41,11 +41,10 @@ public class QueryMetaData extends CommandMetaData }; public int Type = QueryType.SODETAILQUERY; - public static interface QueryType + public interface QueryType { - - final static int SOSUMMARYQUERY = 0; - final static int SODETAILQUERY = 1; + int SOSUMMARYQUERY = 0; + int SODETAILQUERY = 1; } public QueryMetaData(XMultiServiceFactory xMSF, Locale CharLocale, NumberFormatter oNumberFormatter) diff --git a/wizards/com/sun/star/wizards/report/IReportBuilderLayouter.java b/wizards/com/sun/star/wizards/report/IReportBuilderLayouter.java index 6ccb7c5db9f3..8f1446f0e1fc 100644 --- a/wizards/com/sun/star/wizards/report/IReportBuilderLayouter.java +++ b/wizards/com/sun/star/wizards/report/IReportBuilderLayouter.java @@ -29,78 +29,78 @@ public interface IReportBuilderLayouter * This name identifies the layout in the internal access list. * @return the internal layout name. */ - public String getName(); + String getName(); /** * Get the localized name of the layout, which is shown in the layout page of the report wizard. * This name comes out of the resource and will be translate in different languages. * @return localized name of the layout. */ - public String getLocalizedName(); + String getLocalizedName(); /** * For Landscape give nOrientation == com.sun.star.wizards.report.ReportLayouter.SOOPTLANDSCAPE * All other numbers are interpreted as portrait format. */ - public void setPageOrientation(int nOrientation); + void setPageOrientation(int nOrientation); /** * dispose the layouter */ - public void dispose(); + void dispose(); /** * Set the table name of the report * This is the name to the database table. * @param _nType something of com.sun.star.sdb.CommandType */ - public void setTableName(int _nType, String TableName); + void setTableName(int _nType, String TableName); /** * Insert the field names, these are the field names out of a given datebase table */ - public void insertFieldNames(final String[] FieldNames); + void insertFieldNames(final String[] FieldNames); /** * Insert the field type (Varchar, int, ...) as internal an int representation. */ - public void insertFieldTypes(int[] FieldTypes); + void insertFieldTypes(int[] FieldTypes); /** * Insert the field width in count of chars as given in the database. */ - public void insertFieldWidths(int[] FieldWidths); + void insertFieldWidths(int[] FieldWidths); /** * Insert the titles of the field names. This names are free formed */ - public void insertFieldTitles(String[] _aFieldTitles); + void insertFieldTitles(String[] _aFieldTitles); /** * Insert the names of the groups, the group names are names out of the field names. * * If a group name is given here, it will not shown in the fields/titles, but must be in the field string list. */ - public void insertGroupNames(String[] _aGroupFieldNames); + void insertGroupNames(String[] _aGroupFieldNames); /** * Insert the names of the groups which should be used as sorting, the group names are names out of the field names. * * If a group name is given here, it will not shown in the fields/titles, but must be in the field string list. */ - public void insertSortingNames(String[][] _aSortFieldNames); + void insertSortingNames(String[][] _aSortFieldNames); /** * This method redraws the whole layout with all its content */ - public void layout(); + void layout(); /** * Initialize the current Layouter with data's out of an other Layouter. * * This Method copies the internal fields, groups and titles */ - public void initializeData(IReportBuilderLayouter aOtherLayouter); + void initializeData(IReportBuilderLayouter aOtherLayouter); - public void loadAndSetBackgroundTemplate(String LayoutTemplatePath); + void loadAndSetBackgroundTemplate(String LayoutTemplatePath); } diff --git a/wizards/com/sun/star/wizards/report/IReportDefinitionReadAccess.java b/wizards/com/sun/star/wizards/report/IReportDefinitionReadAccess.java index 3038e4a1b22d..aa81c48984ec 100644 --- a/wizards/com/sun/star/wizards/report/IReportDefinitionReadAccess.java +++ b/wizards/com/sun/star/wizards/report/IReportDefinitionReadAccess.java @@ -32,17 +32,17 @@ public interface IReportDefinitionReadAccess * Gives access to a ReportDefinition, if initialized. * @return a ReportDefinition or null. */ - public XReportDefinition getReportDefinition(); /* should throw NullPointerException but does not. */ + XReportDefinition getReportDefinition(); /* should throw NullPointerException but does not. */ /** * This ServiceFactory is the 'global' Service Factory, which knows all and every thing in the program. * @return the global service factory of the program */ - public XMultiServiceFactory getGlobalMSF(); + XMultiServiceFactory getGlobalMSF(); /** * Returns the file path to the default report definition, we need this name for early initialisation */ - public String getDefaultHeaderLayout(); + String getDefaultHeaderLayout(); } diff --git a/wizards/com/sun/star/wizards/report/IReportDocument.java b/wizards/com/sun/star/wizards/report/IReportDocument.java index 662d3ff838bd..0c124a2c7a22 100644 --- a/wizards/com/sun/star/wizards/report/IReportDocument.java +++ b/wizards/com/sun/star/wizards/report/IReportDocument.java @@ -33,7 +33,7 @@ public interface IReportDocument // initialisation - public void initialize( + void initialize( final XDatabaseDocumentUI i_documentUI, final Resource i_resource ); @@ -44,22 +44,22 @@ public interface IReportDocument /** * Gives access to the DB Values */ - public com.sun.star.wizards.db.RecordParser getRecordParser(); + com.sun.star.wizards.db.RecordParser getRecordParser(); /** * Give access to the parent document * It is a document in the old Wizard * It is a Report Builder in the new Wizard */ - public com.sun.star.awt.XWindowPeer getWizardParent(); + com.sun.star.awt.XWindowPeer getWizardParent(); /** * * @return the Frame of the document Window or Report Builder Window */ - public com.sun.star.frame.XFrame getFrame(); + com.sun.star.frame.XFrame getFrame(); - public XComponent getComponent(); + XComponent getComponent(); // First step: After entering the table name, select fields @@ -67,17 +67,17 @@ public interface IReportDocument /** * Is called after first step, set Tablename and the fields, which should occur in the Report. */ - public void initializeFieldColumns(final int _aType, final String TableName, final String[] FieldNames); + void initializeFieldColumns(final int _aType, final String TableName, final String[] FieldNames); /** * Empties the report document */ - public void clearDocument(); + void clearDocument(); /** * Empties the report document, if we called back, don't remove Grouping/Sorting */ - public void removeTextTableAndTextSection(); + void removeTextTableAndTextSection(); // Second step: Label field titles @@ -85,7 +85,7 @@ public interface IReportDocument /** * Set new names for the titles */ - public void setFieldTitles(final String[] sFieldTitles); + void setFieldTitles(final String[] sFieldTitles); /** * Change a the name of the 'title' of one field. @@ -93,7 +93,7 @@ public interface IReportDocument * element title of a given element name. * This is only used as a preview */ - public void liveupdate_changeUserFieldContent(final String FieldName, final String TitleName); + void liveupdate_changeUserFieldContent(final String FieldName, final String TitleName); // Third step: Grouping @@ -102,52 +102,52 @@ public interface IReportDocument /** * Called by press ('greater then') add a group to the group list */ - public boolean liveupdate_addGroupNametoDocument(String[] GroupNames, String CurGroupTitle, ArrayList<String> GroupFieldVector, ArrayList<String> ReportPath, int iSelCount); + boolean liveupdate_addGroupNametoDocument(String[] GroupNames, String CurGroupTitle, ArrayList<String> GroupFieldVector, ArrayList<String> ReportPath, int iSelCount); - public void refreshGroupFields(String[] _sNewNames); + void refreshGroupFields(String[] _sNewNames); /** * Called by press ('less then') Removes an already set Groupname out of the list */ - public void liveupdate_removeGroupName(String[] NewSelGroupNames, String CurGroupTitle, java.util.ArrayList<String> GroupFieldVector); + void liveupdate_removeGroupName(String[] NewSelGroupNames, String CurGroupTitle, java.util.ArrayList<String> GroupFieldVector); /** * set the list how to group */ - public void setGrouping(String[] aGroupList); + void setGrouping(String[] aGroupList); // Fourth step: Sorting /** * Set the list how to sort */ - public void setSorting(String[][] aSort); + void setSorting(String[][] aSort); // Fivth step: Templates / Layout /* Template Page */ - public void setPageOrientation(int nOrientation) throws com.sun.star.lang.IllegalArgumentException; + void setPageOrientation(int nOrientation) throws com.sun.star.lang.IllegalArgumentException; - public int getDefaultPageOrientation(); + int getDefaultPageOrientation(); - public ArrayList<String> getReportPath(); + ArrayList<String> getReportPath(); - public String getLayoutPath(); + String getLayoutPath(); - public String getContentPath(); + String getContentPath(); /** * Called if a new Layout is selected */ - public void liveupdate_changeLayoutTemplate(String LayoutTemplatePath/*, String BitmapPath*/); + void liveupdate_changeLayoutTemplate(String LayoutTemplatePath/*, String BitmapPath*/); /** * Called if a new Template is selected */ - public void liveupdate_changeContentTemplate(String ContentTemplatePath); + void liveupdate_changeContentTemplate(String ContentTemplatePath); - public void layout_selectFirstPage(); + void layout_selectFirstPage(); - public void layout_setupRecordSection(String TemplateName); + void layout_setupRecordSection(String TemplateName); // finishing @@ -157,63 +157,63 @@ public interface IReportDocument * Set the Title into the document from the 'Create Report Page' * BUG: The Title is empty after create Report. */ - public void liveupdate_updateReportTitle(String _sTitleName); + void liveupdate_updateReportTitle(String _sTitleName); /** * Store the document by the given name */ - public void store(String Name, int OpenMode) throws com.sun.star.uno.Exception; + void store(String Name, int OpenMode) throws com.sun.star.uno.Exception; /** * The current report is added to the DB View under the given name * * TODO: add Name to this functionality */ - public void addReportToDBView(); + void addReportToDBView(); - public void importReportData(ReportWizard aWizard); + void importReportData(ReportWizard aWizard); /** * Create the final Report document */ - public void createAndOpenReportDocument( + void createAndOpenReportDocument( final String Name, final boolean _bAsTemplate, final boolean _bOpenInDesign ); - public void dispose(); + void dispose(); // Garbage dump /* DataImport */ // ??? // ??? - public boolean reconnectToDatabase(XMultiServiceFactory xMSF, PropertyValue[] Properties); + boolean reconnectToDatabase(XMultiServiceFactory xMSF, PropertyValue[] Properties); // ??? - public void insertDatabaseDatatoReportDocument(XMultiServiceFactory xMSF); + void insertDatabaseDatatoReportDocument(XMultiServiceFactory xMSF); // ??? /** * set a internal variable to stop a maybe longer DB access. */ - public void StopProcess(); // cancel + void StopProcess(); // cancel /** * Returns a string list of layouts. */ - public String[][] getDataLayout(); + String[][] getDataLayout(); /** * Returns a string list of header layouts */ - public String[][] getHeaderLayout(); + String[][] getHeaderLayout(); - public void setCommandType(int CommandType); + void setCommandType(int CommandType); - public void setCommand(String Command); + void setCommand(String Command); /** * check internal invariants */ - public void checkInvariants() throws java.lang.Exception; + void checkInvariants() throws java.lang.Exception; } diff --git a/wizards/com/sun/star/wizards/ui/ButtonList.java b/wizards/com/sun/star/wizards/ui/ButtonList.java index 81d4766535dc..fee21ebc229a 100644 --- a/wizards/com/sun/star/wizards/ui/ButtonList.java +++ b/wizards/com/sun/star/wizards/ui/ButtonList.java @@ -568,14 +568,14 @@ public class ButtonList implements XItemEventBroadcaster, XActionListener } - public static interface IImageRenderer extends IRenderer + public interface IImageRenderer extends IRenderer { /** * @return two resource ids for an image referenced in the imaglist resourcefile of the * wizards project; The second one of them is designed to be used for High Contrast Mode. */ - public Object[] getImageUrls(Object listItem); + Object[] getImageUrls(Object listItem); } private static class SimpleCounterRenderer implements IRenderer diff --git a/wizards/com/sun/star/wizards/ui/ImageList.java b/wizards/com/sun/star/wizards/ui/ImageList.java index f8cb5021eea3..f77a2845acaf 100644 --- a/wizards/com/sun/star/wizards/ui/ImageList.java +++ b/wizards/com/sun/star/wizards/ui/ImageList.java @@ -788,14 +788,14 @@ public class ImageList implements XItemEventBroadcaster, ListDataListener }; } - private static interface IImageRenderer extends IRenderer + private interface IImageRenderer extends IRenderer { /** * @return two resource ids for an image referenced in the imaglist resourcefile of the * wizards project; The second one of them is designed to be used for High Contrast Mode. */ - public Object[] getImageUrls(Object listItem); + Object[] getImageUrls(Object listItem); } private static class SimpleCounterRenderer implements IRenderer diff --git a/wizards/com/sun/star/wizards/ui/UIConsts.java b/wizards/com/sun/star/wizards/ui/UIConsts.java index 058b7852e56f..948b7251b7e0 100644 --- a/wizards/com/sun/star/wizards/ui/UIConsts.java +++ b/wizards/com/sun/star/wizards/ui/UIConsts.java @@ -21,55 +21,55 @@ package com.sun.star.wizards.ui; public interface UIConsts { - public static final int RID_COMMON = 500; - public static final int RID_DB_COMMON = 1000; - public static final int RID_FORM = 2200; - public static final int RID_QUERY = 2300; - public static final int RID_REPORT = 2400; - public static final int RID_TABLE = 2600; - public static final int RID_IMG_FORM = 1100; - public static final Integer INVISIBLESTEP = 99; - public static final String INFOIMAGEURL = "private:resource/dbu/image/19205"; - public static final String INFOIMAGEURL_HC = "private:resource/dbu/image/19230"; + int RID_COMMON = 500; + int RID_DB_COMMON = 1000; + int RID_FORM = 2200; + int RID_QUERY = 2300; + int RID_REPORT = 2400; + int RID_TABLE = 2600; + int RID_IMG_FORM = 1100; + Integer INVISIBLESTEP = 99; + String INFOIMAGEURL = "private:resource/dbu/image/19205"; + String INFOIMAGEURL_HC = "private:resource/dbu/image/19230"; /** * The tabindex of the navigation buttons in a wizard must be assigned a very * high tabindex because on every step their taborder must appear at the end */ - public static final short SOFIRSTWIZARDNAVITABINDEX = 30000; - public static final Integer INTEGER_12 = 12; + short SOFIRSTWIZARDNAVITABINDEX = 30000; + Integer INTEGER_12 = 12; /**Steps of the QueryWizard * */ - public static final int SOGROUPSELECTIONPAGE = 5; - public static final int SOGROUPFILTERPAGE = 6; - public static final int SOTITLESPAGE = 7; - public static final Integer[] INTEGERS = new Integer[] + int SOGROUPSELECTIONPAGE = 5; + int SOGROUPFILTERPAGE = 6; + int SOTITLESPAGE = 7; + Integer[] INTEGERS = new Integer[] { 0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10 }; - class CONTROLTYPE + public interface CONTROLTYPE { - public static final int BUTTON = 1; - public static final int IMAGECONTROL = 2; - public static final int LISTBOX = 3; - public static final int COMBOBOX = 4; - public static final int CHECKBOX = 5; - public static final int RADIOBUTTON = 6; - public static final int DATEFIELD = 7; - public static final int EDITCONTROL = 8; - public static final int FIXEDLINE = 10; - public static final int FIXEDTEXT = 11; - public static final int FORMATTEDFIELD = 12; - public static final int HYPERTEXT = 14; - public static final int NUMERICFIELD = 15; - public static final int PATTERNFIELD = 16; - public static final int PROGRESSBAR = 17; - public static final int ROADMAP = 18; - public static final int SCROLLBAR = 19; - public static final int TIMEFIELD = 20; - public static final int CURRENCYFIELD = 21; - public static final int UNKNOWN = -1; + int BUTTON = 1; + int IMAGECONTROL = 2; + int LISTBOX = 3; + int COMBOBOX = 4; + int CHECKBOX = 5; + int RADIOBUTTON = 6; + int DATEFIELD = 7; + int EDITCONTROL = 8; + int FIXEDLINE = 10; + int FIXEDTEXT = 11; + int FORMATTEDFIELD = 12; + int HYPERTEXT = 14; + int NUMERICFIELD = 15; + int PATTERNFIELD = 16; + int PROGRESSBAR = 17; + int ROADMAP = 18; + int SCROLLBAR = 19; + int TIMEFIELD = 20; + int CURRENCYFIELD = 21; + int UNKNOWN = -1; } } diff --git a/wizards/com/sun/star/wizards/ui/XCompletion.java b/wizards/com/sun/star/wizards/ui/XCompletion.java index fbcfd5670269..0b763484ac7e 100644 --- a/wizards/com/sun/star/wizards/ui/XCompletion.java +++ b/wizards/com/sun/star/wizards/ui/XCompletion.java @@ -20,11 +20,8 @@ package com.sun.star.wizards.ui; public interface XCompletion { - public void setcompleted(int _ndialogpage, boolean _biscompleted); - - public boolean iscompleted(int _ndialogpage); - - + void setcompleted(int _ndialogpage, boolean _biscompleted); + boolean iscompleted(int _ndialogpage); } diff --git a/wizards/com/sun/star/wizards/ui/XFieldSelectionListener.java b/wizards/com/sun/star/wizards/ui/XFieldSelectionListener.java index 3e0c0fe042f2..a0c3714b22af 100644 --- a/wizards/com/sun/star/wizards/ui/XFieldSelectionListener.java +++ b/wizards/com/sun/star/wizards/ui/XFieldSelectionListener.java @@ -21,15 +21,15 @@ package com.sun.star.wizards.ui; public interface XFieldSelectionListener { - public void shiftFromLeftToRight(String[] SelItems, String[] NewItems); + void shiftFromLeftToRight(String[] SelItems, String[] NewItems); - public void shiftFromRightToLeft(String[] OldSelItems, String[] NewItems); + void shiftFromRightToLeft(String[] OldSelItems, String[] NewItems); - public void moveItemUp(String Selitem); + void moveItemUp(String Selitem); - public void moveItemDown(String Selitem); + void moveItemDown(String Selitem); - public void setID(String sIncSuffix); + void setID(String sIncSuffix); - public int getID(); + int getID(); } diff --git a/wizards/com/sun/star/wizards/ui/XPathSelectionListener.java b/wizards/com/sun/star/wizards/ui/XPathSelectionListener.java index 248b46b03983..6a9d4ad9e7af 100644 --- a/wizards/com/sun/star/wizards/ui/XPathSelectionListener.java +++ b/wizards/com/sun/star/wizards/ui/XPathSelectionListener.java @@ -21,5 +21,5 @@ package com.sun.star.wizards.ui; public interface XPathSelectionListener { - public void validatePath(); + void validatePath(); } diff --git a/wizards/com/sun/star/wizards/ui/event/DataAware.java b/wizards/com/sun/star/wizards/ui/event/DataAware.java index 185cd3cb1a94..2b7b1966a0cb 100644 --- a/wizards/com/sun/star/wizards/ui/event/DataAware.java +++ b/wizards/com/sun/star/wizards/ui/event/DataAware.java @@ -116,7 +116,7 @@ public abstract class DataAware { } public interface Listener { - public void eventPerformed(Object event); + void eventPerformed(Object event); } /** @@ -163,13 +163,13 @@ public abstract class DataAware { * @param target the object to get the value from. * @return the value from the given object. */ - public Object get(Object target); + Object get(Object target); /** * sets a value to the given object. * @param value the value to set to the object. * @param target the object to set the value to. */ - public void set(Object value, Object target); + void set(Object value, Object target); /** * checks if this Value object can handle * the given object type as a target. @@ -177,7 +177,7 @@ public abstract class DataAware { * @return true if the given class is acceptable for * the Value object. False if not. */ - public boolean isAssignable(Class<?> type); + boolean isAssignable(Class<?> type); } /** diff --git a/wizards/com/sun/star/wizards/ui/event/EventNames.java b/wizards/com/sun/star/wizards/ui/event/EventNames.java index 0cf0f17ef5fb..31cd25cc7815 100644 --- a/wizards/com/sun/star/wizards/ui/event/EventNames.java +++ b/wizards/com/sun/star/wizards/ui/event/EventNames.java @@ -21,19 +21,19 @@ public interface EventNames { //common listener events - public static final String EVENT_ACTION_PERFORMED = "APR"; - public static final String EVENT_ITEM_CHANGED = "ICH"; - public static final String EVENT_TEXT_CHANGED = "TCH"; //window events (XWindow) - public static final String EVENT_WINDOW_RESIZED = "WRE"; - public static final String EVENT_WINDOW_MOVED = "WMO"; - public static final String EVENT_WINDOW_SHOWN = "WSH"; - public static final String EVENT_WINDOW_HIDDEN = "WHI"; //focus events (XWindow) - public static final String EVENT_FOCUS_GAINED = "FGA"; - public static final String EVENT_FOCUS_LOST = "FLO"; //keyboard events - public static final String EVENT_KEY_PRESSED = "KPR"; - public static final String EVENT_KEY_RELEASED = "KRE"; //mouse events - public static final String EVENT_MOUSE_PRESSED = "MPR"; + String EVENT_ACTION_PERFORMED = "APR"; + String EVENT_ITEM_CHANGED = "ICH"; + String EVENT_TEXT_CHANGED = "TCH"; //window events (XWindow) + String EVENT_WINDOW_RESIZED = "WRE"; + String EVENT_WINDOW_MOVED = "WMO"; + String EVENT_WINDOW_SHOWN = "WSH"; + String EVENT_WINDOW_HIDDEN = "WHI"; //focus events (XWindow) + String EVENT_FOCUS_GAINED = "FGA"; + String EVENT_FOCUS_LOST = "FLO"; //keyboard events + String EVENT_KEY_PRESSED = "KPR"; + String EVENT_KEY_RELEASED = "KRE"; //mouse events + String EVENT_MOUSE_PRESSED = "MPR"; - public static final String EVENT_MOUSE_ENTERED = "MEN"; - public static final String EVENT_MOUSE_EXITED = "MEX"; //other events + String EVENT_MOUSE_ENTERED = "MEN"; + String EVENT_MOUSE_EXITED = "MEX"; //other events } diff --git a/wizards/com/sun/star/wizards/ui/event/ListModelBinder.java b/wizards/com/sun/star/wizards/ui/event/ListModelBinder.java index 5ecc1c8c9a89..4ad1cff82884 100644 --- a/wizards/com/sun/star/wizards/ui/event/ListModelBinder.java +++ b/wizards/com/sun/star/wizards/ui/event/ListModelBinder.java @@ -134,10 +134,9 @@ public class ListModelBinder implements ListDataListener remove((short) lde.getIndex0(), (short) lde.getIndex1()); } - private static interface Renderer + private interface Renderer { - - public String render(Object item); + String render(Object item); } public static void fillList(Object list, Object[] items, Renderer renderer) diff --git a/wizards/com/sun/star/wizards/ui/event/TaskListener.java b/wizards/com/sun/star/wizards/ui/event/TaskListener.java index bb2292b95dd9..61c8b2bfd0d0 100644 --- a/wizards/com/sun/star/wizards/ui/event/TaskListener.java +++ b/wizards/com/sun/star/wizards/ui/event/TaskListener.java @@ -22,14 +22,14 @@ import java.util.EventListener; public interface TaskListener extends EventListener { - public void taskStarted(TaskEvent te); + void taskStarted(TaskEvent te); - public void taskFinished(TaskEvent te); + void taskFinished(TaskEvent te); /** * is called when the status of the task has advanced. */ - public void taskStatusChanged(TaskEvent te); + void taskStatusChanged(TaskEvent te); - public void subtaskNameChanged(TaskEvent te); + void subtaskNameChanged(TaskEvent te); } diff --git a/xmerge/source/xmerge/java/org/openoffice/xmerge/Document.java b/xmerge/source/xmerge/java/org/openoffice/xmerge/Document.java index ac9d4559731c..c1a5d7ba64d8 100644 --- a/xmerge/source/xmerge/java/org/openoffice/xmerge/Document.java +++ b/xmerge/source/xmerge/java/org/openoffice/xmerge/Document.java @@ -51,7 +51,7 @@ public interface Document { * * @throws IOException If any I/O error occurs. */ - public void write(OutputStream os) throws IOException; + void write(OutputStream os) throws IOException; /** @@ -68,7 +68,7 @@ public interface Document { * * @throws IOException If any I/O error occurs. */ - public void read(InputStream is) throws IOException; + void read(InputStream is) throws IOException; /** @@ -76,7 +76,7 @@ public interface Document { * * @return The <code>Document</code> name with no file extension. */ - public String getName(); + String getName(); /** @@ -84,6 +84,6 @@ public interface Document { * * @return The <code>Document</code> name with file extension. */ - public String getFileName(); + String getFileName(); } diff --git a/xmerge/source/xmerge/java/org/openoffice/xmerge/DocumentDeserializer.java b/xmerge/source/xmerge/java/org/openoffice/xmerge/DocumentDeserializer.java index b5438cdbda60..5429a16a34bd 100644 --- a/xmerge/source/xmerge/java/org/openoffice/xmerge/DocumentDeserializer.java +++ b/xmerge/source/xmerge/java/org/openoffice/xmerge/DocumentDeserializer.java @@ -50,6 +50,6 @@ public interface DocumentDeserializer { * @throws ConvertException If any Convert error occurs. * @throws IOException If any I/O error occurs. */ - public Document deserialize() throws ConvertException, IOException; + Document deserialize() throws ConvertException, IOException; } diff --git a/xmerge/source/xmerge/java/org/openoffice/xmerge/DocumentDeserializer2.java b/xmerge/source/xmerge/java/org/openoffice/xmerge/DocumentDeserializer2.java index 54e4667a4eb9..a866f8237dc5 100644 --- a/xmerge/source/xmerge/java/org/openoffice/xmerge/DocumentDeserializer2.java +++ b/xmerge/source/xmerge/java/org/openoffice/xmerge/DocumentDeserializer2.java @@ -55,7 +55,7 @@ public interface DocumentDeserializer2 extends DocumentSerializer { * @throws ConvertException If any Convert error occurs. * @throws IOException If any I/O error occurs. */ - public Document deserialize(String deviceURL, String officeURL) throws + Document deserialize(String deviceURL, String officeURL) throws ConvertException, IOException; } diff --git a/xmerge/source/xmerge/java/org/openoffice/xmerge/DocumentDeserializerFactory.java b/xmerge/source/xmerge/java/org/openoffice/xmerge/DocumentDeserializerFactory.java index 6f0d96aa01c4..1eccfded7a67 100644 --- a/xmerge/source/xmerge/java/org/openoffice/xmerge/DocumentDeserializerFactory.java +++ b/xmerge/source/xmerge/java/org/openoffice/xmerge/DocumentDeserializerFactory.java @@ -51,6 +51,6 @@ public interface DocumentDeserializerFactory { * @return A <code>DocumentDeserializer</code> object. */ - public DocumentDeserializer createDocumentDeserializer(ConvertData cd); + DocumentDeserializer createDocumentDeserializer(ConvertData cd); } diff --git a/xmerge/source/xmerge/java/org/openoffice/xmerge/DocumentMerger.java b/xmerge/source/xmerge/java/org/openoffice/xmerge/DocumentMerger.java index eae5e40026bb..c575ef892550 100644 --- a/xmerge/source/xmerge/java/org/openoffice/xmerge/DocumentMerger.java +++ b/xmerge/source/xmerge/java/org/openoffice/xmerge/DocumentMerger.java @@ -78,6 +78,6 @@ public interface DocumentMerger { * * @throws MergeException If any merge error occurs. */ - public void merge(Document modifiedDoc) throws MergeException; + void merge(Document modifiedDoc) throws MergeException; } diff --git a/xmerge/source/xmerge/java/org/openoffice/xmerge/DocumentMergerFactory.java b/xmerge/source/xmerge/java/org/openoffice/xmerge/DocumentMergerFactory.java index 06662ac4dcc6..3ddbc56569c7 100644 --- a/xmerge/source/xmerge/java/org/openoffice/xmerge/DocumentMergerFactory.java +++ b/xmerge/source/xmerge/java/org/openoffice/xmerge/DocumentMergerFactory.java @@ -49,6 +49,6 @@ public interface DocumentMergerFactory { * @return A <code>DocumentMerger</code> object or null if none * exists. */ - public DocumentMerger createDocumentMerger(Document doc); + DocumentMerger createDocumentMerger(Document doc); } diff --git a/xmerge/source/xmerge/java/org/openoffice/xmerge/DocumentSerializer.java b/xmerge/source/xmerge/java/org/openoffice/xmerge/DocumentSerializer.java index b3f6af69f757..6937fc4f28b0 100644 --- a/xmerge/source/xmerge/java/org/openoffice/xmerge/DocumentSerializer.java +++ b/xmerge/source/xmerge/java/org/openoffice/xmerge/DocumentSerializer.java @@ -51,6 +51,6 @@ public interface DocumentSerializer { * @throws ConvertException If any conversion error occurs. * @throws IOException If any I/O error occurs. */ - public ConvertData serialize() throws ConvertException, IOException; + ConvertData serialize() throws ConvertException, IOException; } diff --git a/xmerge/source/xmerge/java/org/openoffice/xmerge/DocumentSerializer2.java b/xmerge/source/xmerge/java/org/openoffice/xmerge/DocumentSerializer2.java index 6a22ad90acf7..e2aee8488d4a 100644 --- a/xmerge/source/xmerge/java/org/openoffice/xmerge/DocumentSerializer2.java +++ b/xmerge/source/xmerge/java/org/openoffice/xmerge/DocumentSerializer2.java @@ -57,7 +57,7 @@ public interface DocumentSerializer2 extends DocumentSerializer { * @throws ConvertException If any conversion error occurs. * @throws IOException If any I/O error occurs. */ - public ConvertData serialize(String officeURL, String deviceURL) throws + ConvertData serialize(String officeURL, String deviceURL) throws ConvertException, IOException; } diff --git a/xmerge/source/xmerge/java/org/openoffice/xmerge/DocumentSerializerFactory.java b/xmerge/source/xmerge/java/org/openoffice/xmerge/DocumentSerializerFactory.java index 0765792fc058..262256610c0e 100644 --- a/xmerge/source/xmerge/java/org/openoffice/xmerge/DocumentSerializerFactory.java +++ b/xmerge/source/xmerge/java/org/openoffice/xmerge/DocumentSerializerFactory.java @@ -49,6 +49,6 @@ public interface DocumentSerializerFactory { * * @return A <code>DocumentSerializer</code> object. */ - public DocumentSerializer createDocumentSerializer(Document doc); + DocumentSerializer createDocumentSerializer(Document doc); } diff --git a/xmerge/source/xmerge/java/org/openoffice/xmerge/converter/xml/OfficeConstants.java b/xmerge/source/xmerge/java/org/openoffice/xmerge/converter/xml/OfficeConstants.java index 94c1f35d018f..452869ce3cef 100644 --- a/xmerge/source/xmerge/java/org/openoffice/xmerge/converter/xml/OfficeConstants.java +++ b/xmerge/source/xmerge/java/org/openoffice/xmerge/converter/xml/OfficeConstants.java @@ -26,321 +26,321 @@ package org.openoffice.xmerge.converter.xml; public interface OfficeConstants { /** Element tag for <i>office:document</i>, this is the root tag. */ - public final static String TAG_OFFICE_DOCUMENT = "office:document"; + String TAG_OFFICE_DOCUMENT = "office:document"; /** * Element tag for <i>office:document-content</i>, this is the root * tag in content.xml. */ - public final static String TAG_OFFICE_DOCUMENT_CONTENT = "office:document-content"; + String TAG_OFFICE_DOCUMENT_CONTENT = "office:document-content"; /** * Element tag for <i>office:document-settings</i>, this is the root * tag in content.xml. */ - public final static String TAG_OFFICE_DOCUMENT_SETTINGS= "office:document-settings"; + String TAG_OFFICE_DOCUMENT_SETTINGS= "office:document-settings"; /** * Element tag for <i>office:document-meta</i>, this is the root * tag in content.xml. */ - public final static String TAG_OFFICE_DOCUMENT_META= "office:document-meta"; + String TAG_OFFICE_DOCUMENT_META= "office:document-meta"; /** * Element tag for <i>office:document-styles</i>, this is the root tag * in styles.xml. */ - public final static String TAG_OFFICE_DOCUMENT_STYLES = "office:document-styles"; + String TAG_OFFICE_DOCUMENT_STYLES = "office:document-styles"; /** Element tag for <i>office:styles</i>. */ - public final static String TAG_OFFICE_STYLES = "office:styles"; + String TAG_OFFICE_STYLES = "office:styles"; /** Element tag for <i>office:meta</i>. */ - public final static String TAG_OFFICE_META = "office:meta"; + String TAG_OFFICE_META = "office:meta"; /** Element tag for <i>office:automatic-styles</i>. */ - public final static String TAG_OFFICE_AUTOMATIC_STYLES = "office:automatic-styles"; + String TAG_OFFICE_AUTOMATIC_STYLES = "office:automatic-styles"; /** Element tag for <i>office:master-styles</i>. */ - public final static String TAG_OFFICE_MASTER_STYLES = "office:master-styles"; + String TAG_OFFICE_MASTER_STYLES = "office:master-styles"; /** Element tag for <i>office:body</i>. */ - public final static String TAG_OFFICE_BODY = "office:body"; + String TAG_OFFICE_BODY = "office:body"; /** Element tag for <i>office:settings</i>. */ - public final static String TAG_OFFICE_SETTINGS = "office:settings"; + String TAG_OFFICE_SETTINGS = "office:settings"; /** Element tag for <i>office:font-decls</i>. */ - public final static String TAG_OFFICE_FONT_DECLS = "office:font-decls"; + String TAG_OFFICE_FONT_DECLS = "office:font-decls"; /** Element tag for <i>style:font-decl</i>. */ - public final static String TAG_STYLE_FONT_DECL = "style:font-decl"; + String TAG_STYLE_FONT_DECL = "style:font-decl"; /** Attribute tag for <i>style:name</i> of element <i>style:name</i>. */ - public final static String ATTRIBUTE_STYLE_NAME = "style:name"; + String ATTRIBUTE_STYLE_NAME = "style:name"; /** * Attribute tag for <i>style:font-pitch</i> of element * <i>style:font-pitch</i>. */ - public final static String ATTRIBUTE_STYLE_FONT_PITCH = "style:font-pitch"; + String ATTRIBUTE_STYLE_FONT_PITCH = "style:font-pitch"; /** * Attribute tag for <i>fo:font-family</i> of element * <i>fo:font-family</i>. */ - public final static String ATTRIBUTE_FO_FONT_FAMILY = "fo:font-family"; + String ATTRIBUTE_FO_FONT_FAMILY = "fo:font-family"; /** * Attribute tag for <i>fo:font-family</i> of element * <i>fo:font-family</i>. */ - public final static String ATTRIBUTE_FO_FONT_FAMILY_GENERIC = "fo:font-family-generic"; + String ATTRIBUTE_FO_FONT_FAMILY_GENERIC = "fo:font-family-generic"; /** Element tag for <i>text:p</i>. */ - public final static String TAG_PARAGRAPH = "text:p"; + String TAG_PARAGRAPH = "text:p"; /** Element tag for <i>text:h</i>. */ - public final static String TAG_HEADING = "text:h"; + String TAG_HEADING = "text:h"; /** Element tag for <i>text:s</i>. */ - public final static String TAG_SPACE = "text:s"; + String TAG_SPACE = "text:s"; /** Element tag for <i>text:tab-stop</i>. */ - public final static String TAG_TAB_STOP = "text:tab-stop"; + String TAG_TAB_STOP = "text:tab-stop"; /** Element tag for <i>text:line-break</i>. */ - public final static String TAG_LINE_BREAK = "text:line-break"; + String TAG_LINE_BREAK = "text:line-break"; /** Element tag for <i>text:span</i>. */ - public final static String TAG_SPAN = "text:span"; + String TAG_SPAN = "text:span"; /** Element tag for <i>text:a</i>. */ - public final static String TAG_HYPERLINK = "text:a"; + String TAG_HYPERLINK = "text:a"; /** Element tag for <i>text:unordered-list</i>. */ - public final static String TAG_UNORDERED_LIST = "text:unordered-list"; + String TAG_UNORDERED_LIST = "text:unordered-list"; /** Element tag for <i>text:ordered-list</i>. */ - public final static String TAG_ORDERED_LIST = "text:ordered-list"; + String TAG_ORDERED_LIST = "text:ordered-list"; /** Element tag for <i>text:list-header</i>. */ - public final static String TAG_LIST_HEADER = "text:list-header"; + String TAG_LIST_HEADER = "text:list-header"; /** Element tag for <i>text:list-item</i>. */ - public final static String TAG_LIST_ITEM = "text:list-item"; + String TAG_LIST_ITEM = "text:list-item"; /** Attribute tag for <i>text:c</i> of element <i>text:s</i>. */ - public final static String ATTRIBUTE_SPACE_COUNT = "text:c"; + String ATTRIBUTE_SPACE_COUNT = "text:c"; /** Element tag for <i>table:table</i>. */ - public final static String TAG_TABLE = "table:table"; + String TAG_TABLE = "table:table"; /** Element tag for <i>table:named-expression</i>. */ - public final static String TAG_NAMED_EXPRESSIONS = "table:named-expressions"; + String TAG_NAMED_EXPRESSIONS = "table:named-expressions"; /** Element tag for <i>table:named-range</i>. */ - public final static String TAG_TABLE_NAMED_RANGE= "table:named-range"; + String TAG_TABLE_NAMED_RANGE= "table:named-range"; /** Element tag for <i>table:named-expression</i>. */ - public final static String TAG_TABLE_NAMED_EXPRESSION= "table:named-expression"; + String TAG_TABLE_NAMED_EXPRESSION= "table:named-expression"; /** * Attribute tag for <i>table:name</i> of element * <i>table:table</i>. */ - public final static String ATTRIBUTE_TABLE_NAME = "table:name"; + String ATTRIBUTE_TABLE_NAME = "table:name"; /** * Attribute tag for <i>table:expression</i> of element * <i>table:named-range</i>. */ - public final static String ATTRIBUTE_TABLE_EXPRESSION = "table:expression"; + String ATTRIBUTE_TABLE_EXPRESSION = "table:expression"; /** * Attribute tag for <i>table:base-cell-address</i> of element * <i>table:named-range</i>. */ - public final static String ATTRIBUTE_TABLE_BASE_CELL_ADDRESS = "table:base-cell-address"; + String ATTRIBUTE_TABLE_BASE_CELL_ADDRESS = "table:base-cell-address"; /** * Attribute tag for <i>table:cell-range-address</i> of element * <i>table:named-range</i>. */ - public final static String ATTRIBUTE_TABLE_CELL_RANGE_ADDRESS = "table:cell-range-address"; + String ATTRIBUTE_TABLE_CELL_RANGE_ADDRESS = "table:cell-range-address"; /** Element tag for <i>table:table-row</i>. */ - public final static String TAG_TABLE_ROW = "table:table-row"; + String TAG_TABLE_ROW = "table:table-row"; /** Element tag for <i>table:table-column</i>. */ - public final static String TAG_TABLE_COLUMN = "table:table-column"; + String TAG_TABLE_COLUMN = "table:table-column"; /** * Attribute tag for <i>table:default-cell-style-name</i> * of element <i>table:table-column</i>. */ - public final static String ATTRIBUTE_DEFAULT_CELL_STYLE = "table:default-cell-style-name"; + String ATTRIBUTE_DEFAULT_CELL_STYLE = "table:default-cell-style-name"; /** Element tag for <i>table:scenario</i>. */ - public final static String TAG_TABLE_SCENARIO = "table:scenario"; + String TAG_TABLE_SCENARIO = "table:scenario"; /** Element tag for <i>table:table-cell</i>. */ - public final static String TAG_TABLE_CELL = "table:table-cell"; + String TAG_TABLE_CELL = "table:table-cell"; /** * Attribute tag for <i>table:value-type</i> of element * <i>table:table-cell</i>. */ - public final static String ATTRIBUTE_TABLE_VALUE_TYPE = "table:value-type"; + String ATTRIBUTE_TABLE_VALUE_TYPE = "table:value-type"; /** * Attribute tag for <i>table:number-columns-repeated</i> * of element <i>table:table-cell</i>. */ - public final static String ATTRIBUTE_TABLE_NUM_COLUMNS_REPEATED = + String ATTRIBUTE_TABLE_NUM_COLUMNS_REPEATED = "table:number-columns-repeated"; /** * Attribute tag for <i>table:number-rows-repeated</i> * of element <i>table:table-row</i>. */ - public final static String ATTRIBUTE_TABLE_NUM_ROWS_REPEATED = + String ATTRIBUTE_TABLE_NUM_ROWS_REPEATED = "table:number-rows-repeated"; /** * Attribute tag for <i>table:formula</i> of element * <i>table:table-cell</i>. */ - public final static String ATTRIBUTE_TABLE_FORMULA = "table:formula"; + String ATTRIBUTE_TABLE_FORMULA = "table:formula"; /** * Attribute tag for <i>table:value</i> of element * <i>table:table-cell</i>. */ - public final static String ATTRIBUTE_TABLE_VALUE = "table:value"; + String ATTRIBUTE_TABLE_VALUE = "table:value"; /** * Attribute tag for <i>table:date-value</i> of element * <i>table:table-cell</i>. */ - public final static String ATTRIBUTE_TABLE_DATE_VALUE = "table:date-value"; + String ATTRIBUTE_TABLE_DATE_VALUE = "table:date-value"; /** * Attribute tag for <i>table:time-value</i> of element * <i>table:table-cell</i>. */ - public final static String ATTRIBUTE_TABLE_TIME_VALUE = "table:time-value"; + String ATTRIBUTE_TABLE_TIME_VALUE = "table:time-value"; /** * Attribute tag for <i>table:string-value</i> of element * <i>table:table-cell</i>. */ - public final static String ATTRIBUTE_TABLE_STRING_VALUE = + String ATTRIBUTE_TABLE_STRING_VALUE = "table:string-value"; /** * Attribute tag for <i>table:time-boolean-value</i> of element * <i>table:table-cell</i>. */ - public final static String ATTRIBUTE_TABLE_BOOLEAN_VALUE = + String ATTRIBUTE_TABLE_BOOLEAN_VALUE = "table:boolean-value"; /** Attribute tag for <i>table:style-name</i> of table elements. */ - public final static String ATTRIBUTE_TABLE_STYLE_NAME = "table:style-name"; + String ATTRIBUTE_TABLE_STYLE_NAME = "table:style-name"; /** * Attribute tag for <i>table:currency</i> of element * <i>table:table-cell</i>. */ - public final static String ATTRIBUTE_TABLE_CURRENCY = "table:currency"; + String ATTRIBUTE_TABLE_CURRENCY = "table:currency"; /** The cell contains data of type <i>string</i>. */ - public final static String CELLTYPE_STRING = "string"; + String CELLTYPE_STRING = "string"; /** The cell contains data of type <i>float</i>. */ - public final static String CELLTYPE_FLOAT = "float"; + String CELLTYPE_FLOAT = "float"; /** The cell contains data of type <i>time</i>. */ - public final static String CELLTYPE_TIME = "time"; + String CELLTYPE_TIME = "time"; /** The cell contains data of type <i>date</i>. */ - public final static String CELLTYPE_DATE = "date"; + String CELLTYPE_DATE = "date"; /** The cell contains data of type <i>currency</i>. */ - public final static String CELLTYPE_CURRENCY = "currency"; + String CELLTYPE_CURRENCY = "currency"; /** The cell contains data of type <i>boolean</i>. */ - public final static String CELLTYPE_BOOLEAN = "boolean"; + String CELLTYPE_BOOLEAN = "boolean"; /** The cell contains data of type <i>percent</i>. */ - public final static String CELLTYPE_PERCENT = "percentage"; + String CELLTYPE_PERCENT = "percentage"; /** StarWriter XML file extension. */ - public final static String SXW_FILE_EXTENSION = ".sxw"; + String SXW_FILE_EXTENSION = ".sxw"; /** StarWriter XML <i>office:class</i> value. */ - public final static String SXW_TYPE = "text"; + String SXW_TYPE = "text"; /** StarCalc XML file extension. */ - public final static String SXC_FILE_EXTENSION = ".sxc"; + String SXC_FILE_EXTENSION = ".sxc"; /** StarCalc XML <i>office:class</i> value. */ - public final static String SXC_TYPE = "spreadsheet"; + String SXC_TYPE = "spreadsheet"; /** Element tag for <i>manifest:manifest</i>entry in Manifest XML */ - public final static String TAG_MANIFEST_ROOT = "manifest:manifest"; + String TAG_MANIFEST_ROOT = "manifest:manifest"; /** Element tag for <i>manifest:file-entry</i> entry in Manifest XML. */ - public final static String TAG_MANIFEST_FILE = "manifest:file-entry"; + String TAG_MANIFEST_FILE = "manifest:file-entry"; /** * Attribute tag for <i>manifest:media-type</i> of element * <i>manifest:file-entry</i>. */ - public final static String ATTRIBUTE_MANIFEST_FILE_TYPE = "manifest:media-type"; + String ATTRIBUTE_MANIFEST_FILE_TYPE = "manifest:media-type"; /** * Attribute tag for <i>manifest:full-path</i> of element * <i>manifest:file-entry</i>. */ - public final static String ATTRIBUTE_MANIFEST_FILE_PATH = "manifest:full-path"; + String ATTRIBUTE_MANIFEST_FILE_PATH = "manifest:full-path"; // Tags and Elements for the settings.xml /** Element tag for <i>config:config-item</i>. */ - public final static String TAG_CONFIG_ITEM = "config:config-item"; + String TAG_CONFIG_ITEM = "config:config-item"; /** Element tag for <i>config:config-item-set</i>. */ - public final static String TAG_CONFIG_ITEM_SET = "config:config-item-set"; + String TAG_CONFIG_ITEM_SET = "config:config-item-set"; /** Element tag for <i>config:config-item-map-indexed</i>. */ - public final static String TAG_CONFIG_ITEM_MAP_INDEXED = "config:config-item-map-indexed"; + String TAG_CONFIG_ITEM_MAP_INDEXED = "config:config-item-map-indexed"; /** Element tag for <i>config:config-item-map-named</i>. */ - public final static String TAG_CONFIG_ITEM_MAP_NAMED = "config:config-item-map-named"; + String TAG_CONFIG_ITEM_MAP_NAMED = "config:config-item-map-named"; /** Element tag for <i>config:config-item-map-entry</i>. */ - public final static String TAG_CONFIG_ITEM_MAP_ENTRY= "config:config-item-map-entry"; + String TAG_CONFIG_ITEM_MAP_ENTRY= "config:config-item-map-entry"; /** * Attribute tag for <i>config:name</i> of element * <i>config:config-item</i>. */ - public final static String ATTRIBUTE_CONFIG_NAME = "config:name"; + String ATTRIBUTE_CONFIG_NAME = "config:name"; /** * Attribute tag for <i>config:type</i> of element * <i>config:config-item</i>. */ - public final static String ATTRIBUTE_CONFIG_TYPE = "config:type"; + String ATTRIBUTE_CONFIG_TYPE = "config:type"; /** StarWriter XML MIME type. */ - public final static String SXW_MIME_TYPE = "application/vnd.sun.xml.writer"; + String SXW_MIME_TYPE = "application/vnd.sun.xml.writer"; /** StarCalc XML MIME type. */ - public final static String SXC_MIME_TYPE = "application/vnd.sun.xml.calc"; + String SXC_MIME_TYPE = "application/vnd.sun.xml.calc"; } diff --git a/xmerge/source/xmerge/java/org/openoffice/xmerge/converter/xml/sxc/SxcConstants.java b/xmerge/source/xmerge/java/org/openoffice/xmerge/converter/xml/sxc/SxcConstants.java index 2ff98cbf69ab..dbf26291296d 100644 --- a/xmerge/source/xmerge/java/org/openoffice/xmerge/converter/xml/sxc/SxcConstants.java +++ b/xmerge/source/xmerge/java/org/openoffice/xmerge/converter/xml/sxc/SxcConstants.java @@ -26,14 +26,14 @@ package org.openoffice.xmerge.converter.xml.sxc; public interface SxcConstants { /** Family name for column styles. */ - public static final String COLUMN_STYLE_FAMILY = "table-column"; + String COLUMN_STYLE_FAMILY = "table-column"; /** Family name for row styles. */ - public static final String ROW_STYLE_FAMILY = "table-row"; + String ROW_STYLE_FAMILY = "table-row"; /** Family name for table-cell styles. */ - public static final String TABLE_CELL_STYLE_FAMILY = "table-cell"; + String TABLE_CELL_STYLE_FAMILY = "table-cell"; /** Name of the default style. */ - public static final String DEFAULT_STYLE = "Default"; + String DEFAULT_STYLE = "Default"; } diff --git a/xmerge/source/xmerge/java/org/openoffice/xmerge/merger/DiffAlgorithm.java b/xmerge/source/xmerge/java/org/openoffice/xmerge/merger/DiffAlgorithm.java index 0a2cc052b919..00969b038e1d 100644 --- a/xmerge/source/xmerge/java/org/openoffice/xmerge/merger/DiffAlgorithm.java +++ b/xmerge/source/xmerge/java/org/openoffice/xmerge/merger/DiffAlgorithm.java @@ -37,6 +37,6 @@ public interface DiffAlgorithm { * * @return A <code>Difference</code> array. */ - public Difference[] computeDiffs(Iterator orgSeq, Iterator modSeq); + Difference[] computeDiffs(Iterator orgSeq, Iterator modSeq); } diff --git a/xmerge/source/xmerge/java/org/openoffice/xmerge/merger/Iterator.java b/xmerge/source/xmerge/java/org/openoffice/xmerge/merger/Iterator.java index ae4988676052..a2f05f7e37df 100644 --- a/xmerge/source/xmerge/java/org/openoffice/xmerge/merger/Iterator.java +++ b/xmerge/source/xmerge/java/org/openoffice/xmerge/merger/Iterator.java @@ -34,11 +34,7 @@ public interface Iterator { * @return The <code>Object</code> of the next element in the sequence. * If there is no next element, then return null. */ - public Object next(); - - - - + Object next(); /** * Move to the beginning of the sequence. @@ -46,27 +42,21 @@ public interface Iterator { * @return The <code>Object</code> of the first element in the sequence. * If it is empty, then return null. */ - public Object start(); - - - - + Object start(); /** * Return the current element <code>Object</code> content. * * @return The <code>Object</code> at current position. */ - public Object currentElement(); - + Object currentElement(); /** * Return the total element count in the sequence. * * @return The total element count. */ - public int elementCount(); - + int elementCount(); /** * A method to allow the difference algorithm to test whether the @@ -84,7 +74,7 @@ public interface Iterator { * * @return true if equal, false otherwise. */ - public boolean equivalent(Object obj1, Object obj2); + boolean equivalent(Object obj1, Object obj2); /** @@ -95,6 +85,6 @@ public interface Iterator { * shot instead of dynamically transversing the tree. The current * position will be set to the beginning.</p> */ - public void refresh(); + void refresh(); } diff --git a/xmerge/source/xmerge/java/org/openoffice/xmerge/merger/MergeAlgorithm.java b/xmerge/source/xmerge/java/org/openoffice/xmerge/merger/MergeAlgorithm.java index 3e7360a665c3..e4164da4b611 100644 --- a/xmerge/source/xmerge/java/org/openoffice/xmerge/merger/MergeAlgorithm.java +++ b/xmerge/source/xmerge/java/org/openoffice/xmerge/merger/MergeAlgorithm.java @@ -41,7 +41,7 @@ public interface MergeAlgorithm { * * @throws MergeException If an error occurs during the merge. */ - public void applyDifference(Iterator orgSeq, Iterator modSeq, + void applyDifference(Iterator orgSeq, Iterator modSeq, Difference[] differences) throws MergeException; } diff --git a/xmerge/source/xmerge/java/org/openoffice/xmerge/merger/NodeMergeAlgorithm.java b/xmerge/source/xmerge/java/org/openoffice/xmerge/merger/NodeMergeAlgorithm.java index eed70495c21a..0cf32b2a9e2a 100644 --- a/xmerge/source/xmerge/java/org/openoffice/xmerge/merger/NodeMergeAlgorithm.java +++ b/xmerge/source/xmerge/java/org/openoffice/xmerge/merger/NodeMergeAlgorithm.java @@ -36,6 +36,6 @@ public interface NodeMergeAlgorithm { * @param modifyNode The <code>Node</code> to be merged. It may * be modified. */ - public void merge(Node originalNode, Node modifyNode); + void merge(Node originalNode, Node modifyNode); } |