summaryrefslogtreecommitdiff
path: root/sdext/source/pdfimport/inc/pdfparse.hxx
blob: 683c438bdf54eeca7adca830d21ea9a2f05469df (plain)
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
87
88
89
90
91
92
93
94
95
96
97
98
99
100
101
102
103
104
105
106
107
108
109
110
111
112
113
114
115
116
117
118
119
120
121
122
123
124
125
126
127
128
129
130
131
132
133
134
135
136
137
138
139
140
141
142
143
144
145
146
147
148
149
150
151
152
153
154
155
156
157
158
159
160
161
162
163
164
165
166
167
168
169
170
171
172
173
174
175
176
177
178
179
180
181
182
183
184
185
186
187
188
189
190
191
192
193
194
195
196
197
198
199
200
201
202
203
204
205
206
207
208
209
210
211
212
213
214
215
216
217
218
219
220
221
222
223
224
225
226
227
228
229
230
231
232
233
234
235
236
237
238
239
240
241
242
243
244
245
246
247
248
249
250
251
252
253
254
255
256
257
258
259
260
261
262
263
264
265
266
267
268
269
270
271
272
273
274
275
276
277
278
279
280
281
282
283
284
285
286
287
288
289
290
291
292
293
294
295
296
297
298
299
300
301
302
303
304
305
306
307
308
309
310
311
/*************************************************************************
 *
 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
 *
 * Copyright 2000, 2010 Oracle and/or its affiliates.
 *
 * OpenOffice.org - a multi-platform office productivity suite
 *
 * This file is part of OpenOffice.org.
 *
 * OpenOffice.org is free software: you can redistribute it and/or modify
 * it under the terms of the GNU Lesser General Public License version 3
 * only, as published by the Free Software Foundation.
 *
 * OpenOffice.org is distributed in the hope that it will be useful,
 * but WITHOUT ANY WARRANTY; without even the implied warranty of
 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 * GNU Lesser General Public License version 3 for more details
 * (a copy is included in the LICENSE file that accompanied this code).
 *
 * You should have received a copy of the GNU Lesser General Public License
 * version 3 along with OpenOffice.org.  If not, see
 * <http://www.openoffice.org/license.html>
 * for a copy of the LGPLv3 License.
 *
 ************************************************************************/

#ifndef INCLUDED_PDFI_PDFPARSE_HXX
#define INCLUDED_PDFI_PDFPARSE_HXX

#include <sal/types.h>
#include <rtl/ustring.hxx>
#include <rtl/string.hxx>

#include <vector>
#include <hash_map>

namespace pdfparse
{

struct EmitImplData;
struct PDFContainer;
class EmitContext
{
    public:
    virtual bool write( const void* pBuf, unsigned int nLen ) = 0;
    virtual unsigned int getCurPos() = 0;
    virtual bool copyOrigBytes( unsigned int nOrigOffset, unsigned int nLen ) = 0;
    virtual unsigned int readOrigBytes( unsigned int nOrigOffset, unsigned int nLen, void* pBuf ) = 0;

    EmitContext( const PDFContainer* pTop = NULL );
    virtual ~EmitContext();

    // set this to deflate contained streams
    bool m_bDeflate;
    // set this to decrypt the PDF file
    bool m_bDecrypt;

    private:
    friend struct PDFEntry;
    EmitImplData* m_pImplData;
};

struct PDFEntry
{
    PDFEntry() {}
    virtual ~PDFEntry();

    virtual bool emit( EmitContext& rWriteContext ) const = 0;
    virtual PDFEntry* clone() const = 0;

    protected:
    EmitImplData* getEmitData( EmitContext& rContext ) const;
    void setEmitData( EmitContext& rContext, EmitImplData* pNewEmitData ) const;
};

struct PDFComment : public PDFEntry
{
    rtl::OString  m_aComment;

    PDFComment( const rtl::OString& rComment )
    : PDFEntry(), m_aComment( rComment ) {}
    virtual ~PDFComment();
    virtual bool emit( EmitContext& rWriteContext ) const;
    virtual PDFEntry* clone() const;
};

struct PDFValue : public PDFEntry
{
    // abstract base class for simple values
    PDFValue() : PDFEntry() {}
    virtual ~PDFValue();
};

struct PDFName : public PDFValue
{
    rtl::OString  m_aName;

    PDFName( const rtl::OString& rName )
    : PDFValue(), m_aName( rName ) {}
    virtual ~PDFName();
    virtual bool emit( EmitContext& rWriteContext ) const;
    virtual PDFEntry* clone() const;

    rtl::OUString getFilteredName() const;
};

struct PDFString : public PDFValue
{
    rtl::OString  m_aString;

    PDFString( const rtl::OString& rString )
    : PDFValue(), m_aString( rString ) {}
    virtual ~PDFString();
    virtual bool emit( EmitContext& rWriteContext ) const;
    virtual PDFEntry* clone() const;

    rtl::OString getFilteredString() const;
};

struct PDFNumber : public PDFValue
{
    double m_fValue;

    PDFNumber( double fVal )
    : PDFValue(), m_fValue( fVal ) {}
    virtual ~PDFNumber();
    virtual bool emit( EmitContext& rWriteContext ) const;
    virtual PDFEntry* clone() const;
};

struct PDFBool : public PDFValue
{
    bool m_bValue;

    PDFBool( bool bVal )
    : PDFValue(), m_bValue( bVal ) {}
    virtual ~PDFBool();
    virtual bool emit( EmitContext& rWriteContext ) const;
    virtual PDFEntry* clone() const;
};

struct PDFObjectRef : public PDFValue
{
    unsigned int    m_nNumber;
    unsigned int    m_nGeneration;

    PDFObjectRef( unsigned int nNr, unsigned int nGen )
    : PDFValue(), m_nNumber( nNr ), m_nGeneration( nGen ) {}
    virtual ~PDFObjectRef();
    virtual bool emit( EmitContext& rWriteContext ) const;
    virtual PDFEntry* clone() const;
};

struct PDFNull : public PDFValue
{
    PDFNull() {}
    virtual ~PDFNull();
    virtual bool emit( EmitContext& rWriteContext ) const;
    virtual PDFEntry* clone() const;
};

struct PDFObject;
struct PDFContainer : public PDFEntry
{
    sal_Int32              m_nOffset;
    std::vector<PDFEntry*> m_aSubElements;

    // this is an abstract base class for identifying
    // entries that can contain sub elements besides comments
    PDFContainer() : PDFEntry(), m_nOffset( 0 ) {}
    virtual ~PDFContainer();
    virtual bool emitSubElements( EmitContext& rWriteContext ) const;
    virtual void cloneSubElements( std::vector<PDFEntry*>& rNewSubElements ) const;

    PDFObject* findObject( unsigned int nNumber, unsigned int nGeneration ) const;
    PDFObject* findObject( PDFObjectRef* pRef ) const
    { return findObject( pRef->m_nNumber, pRef->m_nGeneration ); }
};

struct PDFArray : public PDFContainer
{
    PDFArray() {}
    virtual ~PDFArray();
    virtual bool emit( EmitContext& rWriteContext ) const;
    virtual PDFEntry* clone() const;
};

struct PDFDict : public PDFContainer
{
    typedef std::hash_map<rtl::OString,PDFEntry*,rtl::OStringHash> Map;
    Map m_aMap;

    PDFDict() {}
    virtual ~PDFDict();
    virtual bool emit( EmitContext& rWriteContext ) const;
    virtual PDFEntry* clone() const;

    // inserting a value of NULL will remove rName and the previous value
    // from the dictionary
    void insertValue( const rtl::OString& rName, PDFEntry* pValue );
    // removes a name/value pair from the dict
    void eraseValue( const rtl::OString& rName );
    // builds new map as of sub elements
    // returns NULL if successfull, else the first offending element
    PDFEntry* buildMap();
};

struct PDFStream : public PDFEntry
{
    unsigned int    m_nBeginOffset;
    unsigned int    m_nEndOffset; // offset of the byte after the stream
    PDFDict*        m_pDict;

    PDFStream( unsigned int nBegin, unsigned int nEnd, PDFDict* pStreamDict )
    : PDFEntry(), m_nBeginOffset( nBegin ), m_nEndOffset( nEnd ), m_pDict( pStreamDict ) {}
    virtual ~PDFStream();
    virtual bool emit( EmitContext& rWriteContext ) const;
    virtual PDFEntry* clone() const;

    unsigned int getDictLength( const PDFContainer* pObjectContainer = NULL ) const; // get contents of the "Length" entry of the dict
};

struct PDFTrailer : public PDFContainer
{
    PDFDict*        m_pDict;

    PDFTrailer() : PDFContainer(), m_pDict( NULL ) {}
    virtual ~PDFTrailer();
    virtual bool emit( EmitContext& rWriteContext ) const;
    virtual PDFEntry* clone() const;
};

struct PDFFileImplData;
struct PDFFile : public PDFContainer
{
    private:
    mutable PDFFileImplData*    m_pData;
    PDFFileImplData*            impl_getData() const;
    public:
    unsigned int        m_nMajor;           // PDF major
    unsigned int        m_nMinor;           // PDF minor

    PDFFile()
    : PDFContainer(),
      m_pData( NULL ),
      m_nMajor( 0 ), m_nMinor( 0 )
    {}
    virtual ~PDFFile();

    virtual bool emit( EmitContext& rWriteContext ) const;
    virtual PDFEntry* clone() const;

    bool isEncrypted() const;
    // this method checks whether rPwd is compatible with
    // either user or owner password and sets up decrypt data in that case
    // returns true if decryption can be done
    bool setupDecryptionData( const rtl::OString& rPwd ) const;

    bool decrypt( const sal_uInt8* pInBuffer, sal_uInt32 nLen,
                  sal_uInt8* pOutBuffer,
                  unsigned int nObject, unsigned int nGeneration ) const;

    rtl::OUString getDecryptionKey() const;
};

struct PDFObject : public PDFContainer
{
    PDFEntry*       m_pObject;
    PDFStream*      m_pStream;
    unsigned int    m_nNumber;
    unsigned int    m_nGeneration;

    PDFObject( unsigned int nNr, unsigned int nGen )
    : m_pObject( NULL ), m_pStream( NULL ), m_nNumber( nNr ), m_nGeneration( nGen ) {}
    virtual ~PDFObject();
    virtual bool emit( EmitContext& rWriteContext ) const;
    virtual PDFEntry* clone() const;

    // writes only the contained stream, deflated if necessary
    bool writeStream( EmitContext& rContext, const PDFFile* pPDFFile ) const;

    private:
    // returns true if stream is deflated
    // fills *ppStream and *pBytes with start of stream and count of bytes
    // memory returned in *ppStream must be freed with rtl_freeMemory afterwards
    // fills in NULL and 0 in case of error
    bool getDeflatedStream( char** ppStream, unsigned int* pBytes, const PDFContainer* pObjectContainer, EmitContext& rContext ) const;
};

struct PDFPart : public PDFContainer
{
    PDFPart() : PDFContainer() {}
    virtual ~PDFPart();
    virtual bool emit( EmitContext& rWriteContext ) const;
    virtual PDFEntry* clone() const;
};

class PDFReader
{
    public:
    PDFReader() {}
    ~PDFReader() {}

    PDFEntry* read( const char* pFileName );
    PDFEntry* read( const char* pBuffer, unsigned int nLen );
};

} // namespace

#endif
/tr> -rw-r--r--framework/qa/complex/framework/autosave/ConfigHelper.java2
-rw-r--r--framework/qa/complex/framework/autosave/Protocol.java16
-rw-r--r--framework/qa/complex/framework/recovery/CrashThread.java4
-rw-r--r--framework/qa/complex/framework/recovery/KlickButtonThread.java6
-rw-r--r--framework/qa/complex/framework/recovery/RecoveryTest.java2
-rw-r--r--framework/qa/complex/imageManager/_XComponent.java10
-rw-r--r--framework/qa/complex/imageManager/_XImageManager.java2
-rw-r--r--framework/qa/complex/imageManager/_XInitialization.java2
-rw-r--r--framework/qa/complex/imageManager/_XUIConfiguration.java4
-rw-r--r--framework/qa/complex/imageManager/_XUIConfigurationPersistence.java4
-rw-r--r--javaunohelper/com/sun/star/comp/helper/ComponentContext.java2
-rw-r--r--javaunohelper/com/sun/star/lib/uno/adapter/InputStreamToXInputStreamAdapter.java2
-rw-r--r--javaunohelper/com/sun/star/lib/uno/adapter/XInputStreamToInputStreamAdapter.java2
-rw-r--r--javaunohelper/com/sun/star/lib/uno/adapter/XOutputStreamToByteArrayAdapter.java2
-rw-r--r--javaunohelper/com/sun/star/lib/uno/helper/Factory.java6
-rw-r--r--javaunohelper/com/sun/star/lib/uno/helper/MultiTypeInterfaceContainer.java2
-rw-r--r--javaunohelper/com/sun/star/lib/uno/helper/UnoUrl.java12
-rw-r--r--javaunohelper/com/sun/star/lib/uno/helper/WeakAdapter.java4
-rw-r--r--jurt/com/sun/star/comp/urlresolver/UrlResolver.java2
-rw-r--r--jurt/com/sun/star/lib/uno/environments/remote/ThreadId.java5
-rw-r--r--nlpsolver/ThirdParty/EvolutionarySolver/src/net/adaptivebox/deps/behavior/DEGTBehavior.java2
-rw-r--r--nlpsolver/ThirdParty/EvolutionarySolver/src/net/adaptivebox/encode/EvalElement.java2
-rw-r--r--nlpsolver/ThirdParty/EvolutionarySolver/src/net/adaptivebox/goodness/ACRComparator.java16
-rw-r--r--nlpsolver/ThirdParty/EvolutionarySolver/src/net/adaptivebox/knowledge/Library.java2
-rw-r--r--nlpsolver/ThirdParty/EvolutionarySolver/src/net/adaptivebox/knowledge/SearchPoint.java2
-rw-r--r--nlpsolver/ThirdParty/EvolutionarySolver/src/net/adaptivebox/problem/ProblemEncoder.java8
-rw-r--r--nlpsolver/ThirdParty/EvolutionarySolver/src/net/adaptivebox/sco/SCAgent.java4
-rw-r--r--nlpsolver/ThirdParty/EvolutionarySolver/src/net/adaptivebox/space/BasicPoint.java2
-rw-r--r--nlpsolver/src/com/sun/star/comp/Calc/NLPSolver/BaseEvolutionarySolver.java20
-rw-r--r--nlpsolver/src/com/sun/star/comp/Calc/NLPSolver/DEPSSolverImpl.java14
-rw-r--r--nlpsolver/src/com/sun/star/comp/Calc/NLPSolver/dialogs/EvolutionarySolverStatusUno.java24
-rw-r--r--odk/examples/DevelopersGuide/Charts/CalcHelper.java2
-rw-r--r--odk/examples/DevelopersGuide/Charts/ChartHelper.java2
-rw-r--r--odk/examples/DevelopersGuide/Charts/ChartInCalc.java4
-rw-r--r--odk/examples/DevelopersGuide/Charts/ChartInDraw.java4
-rw-r--r--odk/examples/DevelopersGuide/Charts/ChartInWriter.java4
-rw-r--r--odk/examples/DevelopersGuide/Charts/ListenAtCalcRangeInDraw.java6
-rw-r--r--odk/examples/DevelopersGuide/Charts/SelectionChangeListener.java6
-rw-r--r--odk/examples/DevelopersGuide/Components/Addons/ProtocolHandlerAddon_java/ProtocolHandlerAddon.java2
-rw-r--r--odk/examples/DevelopersGuide/Components/JavaComponent/TestComponentB.java2
-rw-r--r--odk/examples/DevelopersGuide/Components/dialogcomponent/DialogComponent.java2
-rw-r--r--odk/examples/DevelopersGuide/Config/ConfigExamples.java4
-rw-r--r--odk/examples/DevelopersGuide/Database/Sales.java2
-rw-r--r--odk/examples/DevelopersGuide/Database/SalesMan.java2
-rw-r--r--odk/examples/DevelopersGuide/Database/sdbcx.java5
-rw-r--r--odk/examples/DevelopersGuide/GUI/RoadmapItemStateChangeListener.java2
-rw-r--r--odk/examples/DevelopersGuide/OfficeDev/DesktopEnvironment/CustomizeView.java10
-rw-r--r--odk/examples/DevelopersGuide/OfficeDev/DesktopEnvironment/DocumentView.java6
-rw-r--r--odk/examples/DevelopersGuide/OfficeDev/DesktopEnvironment/JavaWindowPeerFake.java2
-rw-r--r--odk/examples/DevelopersGuide/OfficeDev/DesktopEnvironment/OnewayExecutor.java6
-rw-r--r--odk/examples/DevelopersGuide/OfficeDev/DesktopEnvironment/StatusListener.java6
-rw-r--r--odk/examples/DevelopersGuide/OfficeDev/DesktopEnvironment/StatusView.java10
-rw-r--r--odk/examples/DevelopersGuide/OfficeDev/FilterDevelopment/AsciiFilter/AsciiReplaceFilter.java2
-rw-r--r--odk/examples/DevelopersGuide/OfficeDev/FilterDevelopment/AsciiFilter/FilterOptions.java4
-rw-r--r--odk/examples/DevelopersGuide/OfficeDev/FilterDevelopment/FlatXmlFilter_java/FlatXml.java4
-rw-r--r--odk/examples/DevelopersGuide/OfficeDev/Linguistic/OneInstanceFactory.java8
-rw-r--r--odk/examples/DevelopersGuide/OfficeDev/Linguistic/PropChgHelper.java6
-rw-r--r--odk/examples/DevelopersGuide/OfficeDev/Linguistic/XHyphenatedWord_impl.java6
-rw-r--r--odk/examples/DevelopersGuide/OfficeDev/Linguistic/XSpellAlternatives_impl.java2
-rw-r--r--odk/examples/DevelopersGuide/OfficeDev/Number_Formats.java2
-rw-r--r--odk/examples/DevelopersGuide/OfficeDev/OfficeConnect.java4
-rw-r--r--odk/examples/DevelopersGuide/ProfUNO/InterprocessConn/ConnectionAwareClient.java8
-rw-r--r--odk/examples/DevelopersGuide/ScriptingFramework/ScriptSelector/ScriptSelector/ScriptSelector.java8
-rw-r--r--odk/examples/DevelopersGuide/Spreadsheet/ExampleAddIn.java6
-rw-r--r--odk/examples/DevelopersGuide/Spreadsheet/ExampleDataPilotSource.java30
-rw-r--r--odk/examples/DevelopersGuide/Text/TextDocuments.java2
-rw-r--r--odk/examples/java/ConverterServlet/ConverterServlet.java7
-rw-r--r--odk/examples/java/EmbedDocument/EmbeddedObject/EditorFrame.java6
-rw-r--r--odk/examples/java/Spreadsheet/ChartTypeChange.java4
-rw-r--r--odk/source/com/sun/star/lib/loader/WinRegKey.java4
-rw-r--r--qadevOOo/runner/base/java_cmp.java2
-rw-r--r--qadevOOo/runner/complexlib/MethodThread.java6
-rw-r--r--qadevOOo/runner/convwatch/BorderRemover.java8
-rw-r--r--qadevOOo/runner/convwatch/DBHelper.java4
-rw-r--r--qadevOOo/runner/convwatch/DirectoryHelper.java2
-rw-r--r--qadevOOo/runner/convwatch/GraphicalTestArguments.java8
-rw-r--r--qadevOOo/runner/convwatch/ImageHelper.java6
-rw-r--r--qadevOOo/runner/convwatch/IniFile.java6
-rw-r--r--qadevOOo/runner/convwatch/PRNCompare.java2
-rw-r--r--qadevOOo/runner/convwatch/TriState.java2
-rw-r--r--qadevOOo/runner/graphical/DirectoryHelper.java2
-rw-r--r--qadevOOo/runner/graphical/ImageHelper.java6
-rw-r--r--qadevOOo/runner/graphical/IniFile.java4
-rw-r--r--qadevOOo/runner/graphical/JPEGComparator.java2
-rw-r--r--qadevOOo/runner/graphical/MSOfficePostscriptCreator.java11
-rw-r--r--qadevOOo/runner/graphical/Office.java4
-rw-r--r--qadevOOo/runner/graphical/OpenOfficeDatabaseReportExtractor.java2
-rw-r--r--qadevOOo/runner/graphical/OpenOfficePostscriptCreator.java4
-rw-r--r--qadevOOo/runner/graphical/ParameterHelper.java4
-rw-r--r--qadevOOo/runner/graphical/Tolerance.java2
-rw-r--r--qadevOOo/runner/helper/BuildEnvTools.java2
-rw-r--r--qadevOOo/runner/helper/ConfigHelper.java2
-rw-r--r--qadevOOo/runner/helper/LoggingThread.java6
-rw-r--r--qadevOOo/runner/helper/OfficeWatcher.java8
-rw-r--r--qadevOOo/runner/helper/ProcessHandler.java14
-rw-r--r--qadevOOo/runner/lib/MultiMethodTest.java2
-rw-r--r--qadevOOo/runner/lib/StatusException.java2
-rw-r--r--qadevOOo/runner/lib/TestParameters.java2
-rw-r--r--qadevOOo/runner/stats/DataBaseOutProducer.java2
-rw-r--r--qadevOOo/runner/stats/SQLExecution.java8
-rw-r--r--qadevOOo/runner/util/ControlDsc.java2
-rw-r--r--qadevOOo/runner/util/DBTools.java6
-rw-r--r--qadevOOo/runner/util/DefaultDsc.java7
-rw-r--r--qadevOOo/runner/util/InstCreator.java10
-rw-r--r--qadevOOo/runner/util/SOfficeFactory.java2
-rw-r--r--qadevOOo/runner/util/ShapeDsc.java25
-rw-r--r--qadevOOo/runner/util/StyleFamilyDsc.java2
-rw-r--r--qadevOOo/runner/util/XLayerHandlerImpl.java2
-rw-r--r--qadevOOo/runner/util/XMLTools.java20
-rw-r--r--qadevOOo/runner/util/XSchemaHandlerImpl.java2
-rw-r--r--qadevOOo/runner/util/compare/GraphicalComparator.java2
-rw-r--r--qadevOOo/runner/util/db/DataSource.java6
-rw-r--r--qadevOOo/runner/util/db/DataSourceDescriptor.java2
-rw-r--r--qadevOOo/runner/util/db/DatabaseDocument.java8
-rw-r--r--qadevOOo/tests/java/ifc/accessibility/_XAccessibleComponent.java2
-rw-r--r--qadevOOo/tests/java/ifc/accessibility/_XAccessibleValue.java2
-rw-r--r--qadevOOo/tests/java/ifc/awt/_XComboBox.java4
-rw-r--r--qadevOOo/tests/java/ifc/awt/_XRadioButton.java2
-rw-r--r--qadevOOo/tests/java/ifc/awt/_XSpinField.java2
-rw-r--r--qadevOOo/tests/java/ifc/awt/_XTopWindow.java2
-rw-r--r--qadevOOo/tests/java/ifc/awt/_XUserInputInterception.java4
-rw-r--r--qadevOOo/tests/java/ifc/awt/_XWindow.java12
-rw-r--r--qadevOOo/tests/java/ifc/beans/_XFastPropertySet.java2
-rw-r--r--qadevOOo/tests/java/ifc/beans/_XMultiPropertySet.java2
-rw-r--r--qadevOOo/tests/java/ifc/bridge/_XBridgeFactory.java2
-rw-r--r--qadevOOo/tests/java/ifc/bridge/_XUnoUrlResolver.java13
-rw-r--r--qadevOOo/tests/java/ifc/connection/_XAcceptor.java2
-rw-r--r--qadevOOo/tests/java/ifc/connection/_XConnector.java2
-rw-r--r--qadevOOo/tests/java/ifc/document/_XFilter.java4
-rw-r--r--qadevOOo/tests/java/ifc/form/_XApproveActionBroadcaster.java2
-rw-r--r--qadevOOo/tests/java/ifc/form/_XLoadable.java2
-rw-r--r--qadevOOo/tests/java/ifc/form/_XUpdateBroadcaster.java2
-rw-r--r--qadevOOo/tests/java/ifc/form/binding/_XBindableValue.java2
-rw-r--r--qadevOOo/tests/java/ifc/frame/_XDispatch.java4
-rw-r--r--qadevOOo/tests/java/ifc/frame/_XDispatchProviderInterception.java2
-rw-r--r--qadevOOo/tests/java/ifc/frame/_XLayoutManager.java2
-rw-r--r--qadevOOo/tests/java/ifc/frame/_XNotifyingDispatch.java2
-rw-r--r--qadevOOo/tests/java/ifc/frame/_XUIControllerRegistration.java2
-rw-r--r--qadevOOo/tests/java/ifc/i18n/_XExtendedTransliteration.java2
-rw-r--r--qadevOOo/tests/java/ifc/i18n/_XTransliteration.java2
-rw-r--r--qadevOOo/tests/java/ifc/io/_XActiveDataControl.java2
-rw-r--r--qadevOOo/tests/java/ifc/sdb/_XSingleSelectQueryAnalyzer.java2
-rw-r--r--qadevOOo/tests/java/ifc/sdbc/_XRow.java2
-rw-r--r--qadevOOo/tests/java/ifc/sdbc/_XRowSet.java2
-rw-r--r--qadevOOo/tests/java/ifc/text/_XDefaultNumberingProvider.java2
-rw-r--r--qadevOOo/tests/java/ifc/ucb/_XDataContainer.java2
-rw-r--r--qadevOOo/tests/java/ifc/ui/_XUIConfigurationManager.java4
-rw-r--r--qadevOOo/tests/java/ifc/ui/dialogs/_XExecutableDialog.java4
-rw-r--r--qadevOOo/tests/java/ifc/ui/dialogs/_XFilePicker.java2
-rw-r--r--qadevOOo/tests/java/ifc/ui/dialogs/_XFilePickerNotifier.java2
-rw-r--r--qadevOOo/tests/java/ifc/util/_XFlushable.java2
-rw-r--r--qadevOOo/tests/java/ifc/util/_XModifyBroadcaster.java2
-rw-r--r--qadevOOo/tests/java/ifc/util/_XReplaceable.java2
-rw-r--r--qadevOOo/tests/java/ifc/xml/sax/_XDocumentHandler.java2
-rw-r--r--qadevOOo/tests/java/mod/_fwk/ModuleUIConfigurationManager.java6
-rw-r--r--qadevOOo/tests/java/mod/_fwk/UIConfigurationManager.java6
-rw-r--r--qadevOOo/tests/java/mod/_remotebridge/uno/various.java10
-rw-r--r--qadevOOo/tests/java/mod/_remotebridge/various.java6
-rw-r--r--qadevOOo/tests/java/mod/_sc/ScAccessibleCsvCell.java4
-rw-r--r--qadevOOo/tests/java/mod/_sc/ScAccessibleCsvGrid.java4
-rw-r--r--qadevOOo/tests/java/mod/_sc/ScAccessibleCsvRuler.java4
-rw-r--r--qadevOOo/tests/java/mod/_sc/ScDataPilotFieldGroupItemObj.java2
-rw-r--r--qadevOOo/tests/java/mod/_sc/ScDataPilotFieldGroupObj.java2
-rw-r--r--qadevOOo/tests/java/mod/_sc/ScDataPilotFieldGroupsObj.java2
-rw-r--r--qadevOOo/tests/java/mod/_sc/ScDataPilotFieldObj.java2
-rw-r--r--qadevOOo/tests/java/mod/_sc/ScDataPilotItemObj.java2
-rw-r--r--qadevOOo/tests/java/mod/_sc/ScDataPilotItemsObj.java2
-rw-r--r--qadevOOo/tests/java/mod/_sc/ScIndexEnumeration_DataPilotItemsEnumeration.java2
-rw-r--r--qadevOOo/tests/java/mod/_toolkit/UnoTreeControl.java2
-rw-r--r--reportbuilder/java/org/libreoffice/report/SDBCReportDataFactory.java2
-rw-r--r--reportdesign/qa/complex/reportdesign/FileURL.java2
-rw-r--r--ridljar/com/sun/star/uno/Enum.java2
-rw-r--r--sc/qa/complex/dataPilot/CheckDataPilot.java2
-rw-r--r--sc/qa/complex/dataPilot/_XDataPilotDescriptor.java8
-rw-r--r--sc/qa/complex/dataPilot/_XDataPilotTable.java4
-rw-r--r--sc/qa/complex/dataPilot/_XNamed.java2
-rw-r--r--sc/qa/complex/dataPilot/_XPropertySet.java10
-rw-r--r--scripting/java/Framework/com/sun/star/script/framework/security/SecurityDialog.java4
-rw-r--r--scripting/java/com/sun/star/script/framework/browse/DialogFactory.java2
-rw-r--r--scripting/java/com/sun/star/script/framework/browse/ParcelBrowseNode.java4
-rw-r--r--scripting/java/com/sun/star/script/framework/browse/ProviderBrowseNode.java6
-rw-r--r--scripting/java/com/sun/star/script/framework/browse/ScriptBrowseNode.java4
-rw-r--r--scripting/java/com/sun/star/script/framework/container/ParcelContainer.java2
-rw-r--r--scripting/java/com/sun/star/script/framework/container/ParcelDescriptor.java2
-rw-r--r--scripting/java/com/sun/star/script/framework/container/ScriptMetaData.java4
-rw-r--r--scripting/java/com/sun/star/script/framework/container/UnoPkgContainer.java7
-rw-r--r--scripting/java/com/sun/star/script/framework/container/XMLParserFactory.java2
-rw-r--r--scripting/java/com/sun/star/script/framework/io/UCBStreamHandler.java5
-rw-r--r--scripting/java/com/sun/star/script/framework/io/XInputStreamImpl.java2
-rw-r--r--scripting/java/com/sun/star/script/framework/io/XInputStreamWrapper.java2
-rw-r--r--scripting/java/com/sun/star/script/framework/io/XOutputStreamWrapper.java2
-rw-r--r--scripting/java/com/sun/star/script/framework/provider/EditorScriptContext.java4
-rw-r--r--scripting/java/com/sun/star/script/framework/provider/ScriptContext.java8
-rw-r--r--scripting/java/com/sun/star/script/framework/provider/beanshell/PlainSourceView.java4
-rw-r--r--scripting/java/com/sun/star/script/framework/provider/beanshell/ScriptProviderForBeanShell.java8
-rw-r--r--scripting/java/com/sun/star/script/framework/provider/beanshell/ScriptSourceModel.java2
-rw-r--r--scripting/java/com/sun/star/script/framework/provider/java/ScriptDescriptor.java8
-rw-r--r--scripting/java/com/sun/star/script/framework/provider/java/ScriptProviderForJava.java12
-rw-r--r--scripting/java/com/sun/star/script/framework/provider/java/ScriptProxy.java2
-rw-r--r--scripting/java/com/sun/star/script/framework/provider/javascript/ScriptEditorForJavaScript.java2
-rw-r--r--scripting/java/com/sun/star/script/framework/provider/javascript/ScriptProviderForJavaScript.java8
-rw-r--r--svl/qa/complex/passwordcontainer/MasterPasswdHandler.java2
-rw-r--r--sw/qa/complex/writer/LoadSaveTest.java6
-rw-r--r--sw/qa/complex/writer/TextPortionEnumerationTest.java48
-rw-r--r--swext/mediawiki/src/com/sun/star/wiki/Settings.java6
-rw-r--r--swext/mediawiki/src/com/sun/star/wiki/WikiArticle.java6
-rw-r--r--swext/mediawiki/src/com/sun/star/wiki/WikiEditSettingDialog.java6
-rw-r--r--swext/mediawiki/src/com/sun/star/wiki/WikiEditorImpl.java4
-rw-r--r--swext/mediawiki/src/com/sun/star/wiki/WikiOptionsEventHandlerImpl.java2
-rw-r--r--swext/mediawiki/src/com/sun/star/wiki/WikiPropDialog.java2
-rw-r--r--toolkit/qa/complex/toolkit/accessibility/_XAccessibleComponent.java2
-rw-r--r--toolkit/qa/complex/toolkit/accessibility/_XAccessibleContext.java2
-rw-r--r--toolkit/qa/complex/toolkit/accessibility/_XAccessibleEventBroadcaster.java8
-rw-r--r--toolkit/qa/complex/toolkit/accessibility/_XAccessibleExtendedComponent.java2
-rw-r--r--toolkit/qa/complex/toolkit/accessibility/_XAccessibleText.java8
-rw-r--r--toolkit/test/accessibility/AccessibilityTree.java16
-rw-r--r--toolkit/test/accessibility/AccessibilityTreeModel.java2
-rw-r--r--toolkit/test/accessibility/AccessibleActionNode.java2
-rw-r--r--toolkit/test/accessibility/AccessibleTreeNode.java2
-rw-r--r--toolkit/test/accessibility/Canvas.java6
-rw-r--r--toolkit/test/accessibility/CanvasShape.java29
-rw-r--r--toolkit/test/accessibility/ChildEventHandler.java4
-rw-r--r--toolkit/test/accessibility/EventListener.java2
-rw-r--r--toolkit/test/accessibility/EventQueue.java6
-rw-r--r--toolkit/test/accessibility/MessageArea.java2
-rw-r--r--toolkit/test/accessibility/NodeFactory.java45
-rw-r--r--toolkit/test/accessibility/NodeMap.java2
-rw-r--r--toolkit/test/accessibility/OfficeConnection.java2
-rw-r--r--toolkit/test/accessibility/QueuedListener.java2
-rw-r--r--toolkit/test/accessibility/QueuedTopWindowListener.java2
-rw-r--r--toolkit/test/accessibility/SelectionDialog.java2
-rw-r--r--toolkit/test/accessibility/TopWindowListener.java4
-rw-r--r--toolkit/test/accessibility/VectorNode.java2
-rw-r--r--toolkit/test/accessibility/ov/ContextView.java2
-rw-r--r--toolkit/test/accessibility/ov/FocusView.java4
-rw-r--r--toolkit/test/accessibility/ov/ObjectViewContainer.java4
-rw-r--r--toolkit/test/accessibility/ov/StateSetView.java2
-rw-r--r--toolkit/test/accessibility/ov/TextView.java2
-rw-r--r--ucb/qa/complex/tdoc/_XChild.java2
-rw-r--r--ucb/qa/complex/tdoc/_XCommandInfoChangeNotifier.java2
-rw-r--r--ucb/qa/complex/tdoc/_XCommandProcessor.java2
-rw-r--r--ucb/qa/complex/tdoc/_XComponent.java6
-rw-r--r--ucb/qa/complex/tdoc/_XContent.java2
-rw-r--r--ucb/qa/complex/tdoc/_XPropertiesChangeNotifier.java4
-rw-r--r--ucb/qa/complex/tdoc/_XPropertyContainer.java2
-rw-r--r--ucb/qa/complex/tdoc/_XPropertySetInfoChangeNotifier.java2
-rw-r--r--ucb/qa/complex/tdoc/_XServiceInfo.java2
-rw-r--r--ucb/qa/complex/tdoc/_XTypeProvider.java2
-rw-r--r--ucb/test/com/sun/star/comp/ucb/GlobalTransfer_Test.java4
-rw-r--r--unotest/source/java/org/openoffice/test/tools/OfficeDocument.java2
-rw-r--r--unotest/source/java/org/openoffice/test/tools/OfficeDocumentView.java6
-rw-r--r--vcl/qa/complex/memCheck/CheckMemoryUsage.java6
-rw-r--r--vcl/qa/complex/persistent_window_states/DocumentHandle.java4
-rw-r--r--wizards/com/sun/star/wizards/common/ConfigSet.java6
-rw-r--r--wizards/com/sun/star/wizards/common/Helper.java8
-rw-r--r--wizards/com/sun/star/wizards/common/NumberFormatter.java4
-rw-r--r--wizards/com/sun/star/wizards/common/NumericalHelper.java2
-rw-r--r--wizards/com/sun/star/wizards/common/UCB.java4
-rw-r--r--wizards/com/sun/star/wizards/db/RelationController.java16
-rw-r--r--wizards/com/sun/star/wizards/db/TableDescriptor.java8
-rw-r--r--wizards/com/sun/star/wizards/db/TypeInspector.java2
-rw-r--r--wizards/com/sun/star/wizards/form/CallFormWizard.java2
-rw-r--r--wizards/com/sun/star/wizards/form/DataEntrySetter.java8
-rw-r--r--wizards/com/sun/star/wizards/form/FormControlArranger.java10
-rw-r--r--wizards/com/sun/star/wizards/form/StyleApplier.java12
-rw-r--r--wizards/com/sun/star/wizards/form/UIControlArranger.java20
-rw-r--r--wizards/com/sun/star/wizards/query/CallQueryWizard.java2
-rw-r--r--wizards/com/sun/star/wizards/query/Finalizer.java10
-rw-r--r--wizards/com/sun/star/wizards/query/QuerySummary.java8
-rw-r--r--wizards/com/sun/star/wizards/report/CallReportWizard.java2
-rw-r--r--wizards/com/sun/star/wizards/report/GroupFieldHandler.java2
-rw-r--r--wizards/com/sun/star/wizards/report/ReportFinalizer.java2
-rw-r--r--wizards/com/sun/star/wizards/report/ReportImplementationHelper.java2
-rw-r--r--wizards/com/sun/star/wizards/report/ReportLayouter.java4
-rw-r--r--wizards/com/sun/star/wizards/reportbuilder/layout/ReportBuilderLayouter.java2
-rw-r--r--wizards/com/sun/star/wizards/table/CallTableWizard.java2
-rw-r--r--wizards/com/sun/star/wizards/table/FieldDescription.java2
-rw-r--r--wizards/com/sun/star/wizards/table/PrimaryKeyHandler.java24
-rw-r--r--wizards/com/sun/star/wizards/table/ScenarioSelector.java18
-rw-r--r--wizards/com/sun/star/wizards/text/TextDocument.java2
-rw-r--r--wizards/com/sun/star/wizards/text/TextFieldHandler.java2
-rw-r--r--wizards/com/sun/star/wizards/text/TextSectionHandler.java4
-rw-r--r--wizards/com/sun/star/wizards/text/ViewHandler.java6
-rw-r--r--wizards/com/sun/star/wizards/ui/ButtonList.java4
-rw-r--r--wizards/com/sun/star/wizards/ui/CommandFieldSelection.java4
-rw-r--r--wizards/com/sun/star/wizards/ui/DocumentPreview.java2
-rw-r--r--wizards/com/sun/star/wizards/ui/FilterComponent.java20
-rw-r--r--wizards/com/sun/star/wizards/ui/ImageList.java6
-rw-r--r--wizards/com/sun/star/wizards/ui/PeerConfig.java2
-rw-r--r--wizards/com/sun/star/wizards/ui/WizardDialog.java6
-rw-r--r--wizards/com/sun/star/wizards/ui/event/AbstractListener.java2
-rw-r--r--wizards/com/sun/star/wizards/ui/event/DataAware.java4
-rw-r--r--wizards/com/sun/star/wizards/ui/event/DataAwareFields.java8
-rw-r--r--wizards/com/sun/star/wizards/ui/event/ListModelBinder.java6
-rw-r--r--wizards/com/sun/star/wizards/ui/event/Task.java4
-rw-r--r--wizards/com/sun/star/wizards/ui/event/TaskEvent.java2
-rw-r--r--xmerge/source/xmerge/java/org/openoffice/xmerge/Convert.java6
-rw-r--r--xmerge/source/xmerge/java/org/openoffice/xmerge/ConvertData.java2
-rw-r--r--xmerge/source/xmerge/java/org/openoffice/xmerge/PluginFactory.java2
-rw-r--r--xmerge/source/xmerge/java/org/openoffice/xmerge/converter/palm/PdbEncoder.java4
-rw-r--r--xmerge/source/xmerge/java/org/openoffice/xmerge/converter/xml/OfficeZip.java2
-rw-r--r--xmerge/source/xmerge/java/org/openoffice/xmerge/converter/xml/ParaStyle.java4
-rw-r--r--xmerge/source/xmerge/java/org/openoffice/xmerge/converter/xml/StyleCatalog.java2
-rw-r--r--xmerge/source/xmerge/java/org/openoffice/xmerge/converter/xml/sxc/DocumentMergerImpl.java4
-rw-r--r--xmerge/source/xmerge/java/org/openoffice/xmerge/converter/xml/sxc/SxcDocumentDeserializer.java2
-rw-r--r--xmerge/source/xmerge/java/org/openoffice/xmerge/converter/xml/xslt/DocumentDeserializerImpl.java4
-rw-r--r--xmerge/source/xmerge/java/org/openoffice/xmerge/converter/xml/xslt/DocumentMergerImpl.java4
-rw-r--r--xmerge/source/xmerge/java/org/openoffice/xmerge/converter/xml/xslt/DocumentSerializerImpl.java6
-rw-r--r--xmerge/source/xmerge/java/org/openoffice/xmerge/merger/Difference.java6
-rw-r--r--xmerge/source/xmerge/java/org/openoffice/xmerge/merger/diff/CharacterParser.java4
-rw-r--r--xmerge/source/xmerge/java/org/openoffice/xmerge/merger/diff/NodeIterator.java4
-rw-r--r--xmerge/source/xmerge/java/org/openoffice/xmerge/merger/diff/TextNodeEntry.java6
-rw-r--r--xmerge/source/xmerge/java/org/openoffice/xmerge/merger/merge/DocumentMerge.java2
-rw-r--r--xmerge/source/xmerge/java/org/openoffice/xmerge/merger/merge/PositionBaseRowMerge.java2
-rw-r--r--xmerge/source/xmerge/java/org/openoffice/xmerge/test/Driver.java4
-rw-r--r--xmerge/source/xmerge/java/org/openoffice/xmerge/util/IntArrayList.java2
-rw-r--r--xmerge/source/xmerge/java/org/openoffice/xmerge/util/Resources.java2
-rw-r--r--xmerge/source/xmerge/java/org/openoffice/xmerge/util/registry/ConverterInfo.java18
-rw-r--r--xmerge/source/xmerge/java/org/openoffice/xmerge/util/registry/ConverterInfoReader.java6
357 files changed, 863 insertions, 926 deletions
diff --git a/bean/com/sun/star/comp/beans/Controller.java b/bean/com/sun/star/comp/beans/Controller.java
index 9e93c5878b2f..91f64db874c4 100644
--- a/bean/com/sun/star/comp/beans/Controller.java
+++ b/bean/com/sun/star/comp/beans/Controller.java
@@ -29,8 +29,8 @@ public class Controller
implements
com.sun.star.frame.XController
{
- private com.sun.star.frame.XController xController;
- private com.sun.star.frame.XDispatchProvider xDispatchProvider;
+ private final com.sun.star.frame.XController xController;
+ private final com.sun.star.frame.XDispatchProvider xDispatchProvider;
Controller( com.sun.star.frame.XController xController )
{
diff --git a/bean/com/sun/star/comp/beans/Frame.java b/bean/com/sun/star/comp/beans/Frame.java
index 59ccf2613245..fbf9ca97ef51 100644
--- a/bean/com/sun/star/comp/beans/Frame.java
+++ b/bean/com/sun/star/comp/beans/Frame.java
@@ -31,9 +31,9 @@ public class Frame
com.sun.star.frame.XDispatchProvider,
com.sun.star.frame.XDispatchProviderInterception
{
- private com.sun.star.frame.XFrame xFrame;
- private com.sun.star.frame.XDispatchProvider xDispatchProvider;
- private com.sun.star.frame.XDispatchProviderInterception xDispatchProviderInterception;
+ private final com.sun.star.frame.XFrame xFrame;
+ private final com.sun.star.frame.XDispatchProvider xDispatchProvider;
+ private final com.sun.star.frame.XDispatchProviderInterception xDispatchProviderInterception;
public Frame( com.sun.star.frame.XFrame xFrame )
{
diff --git a/bean/com/sun/star/comp/beans/LocalOfficeConnection.java b/bean/com/sun/star/comp/beans/LocalOfficeConnection.java
index c81796daebe7..5a57dcdc8e79 100644
--- a/bean/com/sun/star/comp/beans/LocalOfficeConnection.java
+++ b/bean/com/sun/star/comp/beans/LocalOfficeConnection.java
@@ -62,7 +62,7 @@ public class LocalOfficeConnection
private String mProtocol;
private String mInitialObject;
- private List<XEventListener> mComponents = new ArrayList<XEventListener>();
+ private final List<XEventListener> mComponents = new ArrayList<XEventListener>();
private static long m_nBridgeCounter = 0;
@@ -742,8 +742,8 @@ public class LocalOfficeConnection
private class StreamProcessor extends Thread
{
- private java.io.InputStream m_in;
- private java.io.PrintStream m_print;
+ private final java.io.InputStream m_in;
+ private final java.io.PrintStream m_print;
public StreamProcessor(final java.io.InputStream in, final java.io.PrintStream out)
{
diff --git a/bean/com/sun/star/comp/beans/OfficeDocument.java b/bean/com/sun/star/comp/beans/OfficeDocument.java
index a84689901f5c..10ee1ef24061 100644
--- a/bean/com/sun/star/comp/beans/OfficeDocument.java
+++ b/bean/com/sun/star/comp/beans/OfficeDocument.java
@@ -37,10 +37,10 @@ public class OfficeDocument extends Wrapper
com.sun.star.frame.XStorable,
com.sun.star.view.XPrintable
{
- private com.sun.star.frame.XModel xModel;
- private com.sun.star.util.XModifiable xModifiable;
- private com.sun.star.view.XPrintable xPrintable;
- private com.sun.star.frame.XStorable xStorable;
+ private final com.sun.star.frame.XModel xModel;
+ private final com.sun.star.util.XModifiable xModifiable;
+ private final com.sun.star.view.XPrintable xPrintable;
+ private final com.sun.star.frame.XStorable xStorable;
public OfficeDocument( com.sun.star.frame.XModel xModel )
{
diff --git a/bean/com/sun/star/comp/beans/Wrapper.java b/bean/com/sun/star/comp/beans/Wrapper.java
index 837601842e48..001770b9b230 100644
--- a/bean/com/sun/star/comp/beans/Wrapper.java
+++ b/bean/com/sun/star/comp/beans/Wrapper.java
@@ -45,8 +45,8 @@ class Wrapper
com.sun.star.uno.IQueryInterface,
com.sun.star.lang.XComponent
{
- private com.sun.star.uno.IQueryInterface xQueryInterface;
- private com.sun.star.lang.XComponent xComponent;
+ private final com.sun.star.uno.IQueryInterface xQueryInterface;
+ private final com.sun.star.lang.XComponent xComponent;
public Wrapper( com.sun.star.uno.XInterface xProxy )
{
diff --git a/bridges/source/jni_uno/java/com/sun/star/bridges/jni_uno/JNI_proxy.java b/bridges/source/jni_uno/java/com/sun/star/bridges/jni_uno/JNI_proxy.java
index e49deff6bd18..d3a7425d83c6 100644
--- a/bridges/source/jni_uno/java/com/sun/star/bridges/jni_uno/JNI_proxy.java
+++ b/bridges/source/jni_uno/java/com/sun/star/bridges/jni_uno/JNI_proxy.java
@@ -56,13 +56,13 @@ public final class JNI_proxy implements java.lang.reflect.InvocationHandler
new Class [] { java.lang.reflect.InvocationHandler.class };
private long m_bridge_handle;
- private IEnvironment m_java_env;
+ private final IEnvironment m_java_env;
/** these 2 fields are accessed directly from C++ */
private long m_receiver_handle; // on the C++ side, this is a "UNO_Interface *"
private long m_td_handle; // on the C++ side, this is a "typelib_TypeDescription *"
- private Type m_type;
- private String m_oid;
- private Class m_class;
+ private final Type m_type;
+ private final String m_oid;
+ private final Class m_class;
public static String get_stack_trace( Throwable throwable )
diff --git a/cli_ure/qa/climaker/ClimakerTestCase.java b/cli_ure/qa/climaker/ClimakerTestCase.java
index 5285ad4a1b70..e994d014e1eb 100644
--- a/cli_ure/qa/climaker/ClimakerTestCase.java
+++ b/cli_ure/qa/climaker/ClimakerTestCase.java
@@ -69,7 +69,7 @@ public class ClimakerTestCase extends ComplexTestCase
*/
class Reader extends Thread
{
- private java.io.InputStream is;
+ private final java.io.InputStream is;
public Reader(java.io.InputStream stream)
{
is = stream;
diff --git a/connectivity/com/sun/star/sdbcx/comp/hsqldb/NativeInputStreamHelper.java b/connectivity/com/sun/star/sdbcx/comp/hsqldb/NativeInputStreamHelper.java
index c8e7d5d84b03..66b6f5489862 100644
--- a/connectivity/com/sun/star/sdbcx/comp/hsqldb/NativeInputStreamHelper.java
+++ b/connectivity/com/sun/star/sdbcx/comp/hsqldb/NativeInputStreamHelper.java
@@ -15,18 +15,13 @@
* except in compliance with the License. You may obtain a copy of
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
- /*
- * NativeInputStreamHelper.java
- *
- * Created on 9. September 2004, 11:51
- */
package com.sun.star.sdbcx.comp.hsqldb;
public class NativeInputStreamHelper extends java.io.InputStream{
- private String key;
- private String file;
- private StorageNativeInputStream in;
+ private final String key;
+ private final String file;
+ private final StorageNativeInputStream in;
/** Creates a new instance of NativeInputStreamHelper */
public NativeInputStreamHelper(String key,String _file) {
file = _file;
diff --git a/connectivity/com/sun/star/sdbcx/comp/hsqldb/NativeOutputStreamHelper.java b/connectivity/com/sun/star/sdbcx/comp/hsqldb/NativeOutputStreamHelper.java
index 24776f25c2f4..6445f24139d4 100644
--- a/connectivity/com/sun/star/sdbcx/comp/hsqldb/NativeOutputStreamHelper.java
+++ b/connectivity/com/sun/star/sdbcx/comp/hsqldb/NativeOutputStreamHelper.java
@@ -15,20 +15,13 @@
* except in compliance with the License. You may obtain a copy of
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-
-/*
- * NativeOutputStreamHelper.java
- *
- * Created on 1. September 2004, 10:39
- */
-
package com.sun.star.sdbcx.comp.hsqldb;
public class NativeOutputStreamHelper extends java.io.OutputStream{
- private String key;
- private String file;
- private StorageNativeOutputStream out;
+ private final String key;
+ private final String file;
+ private final StorageNativeOutputStream out;
/** Creates a new instance of NativeOutputStreamHelper */
public NativeOutputStreamHelper(String key,String _file) {
file = _file;
diff --git a/connectivity/com/sun/star/sdbcx/comp/hsqldb/StorageFileAccess.java b/connectivity/com/sun/star/sdbcx/comp/hsqldb/StorageFileAccess.java
index 9248cdf5a546..2f3d99be6655 100644
--- a/connectivity/com/sun/star/sdbcx/comp/hsqldb/StorageFileAccess.java
+++ b/connectivity/com/sun/star/sdbcx/comp/hsqldb/StorageFileAccess.java
@@ -72,7 +72,7 @@ public class StorageFileAccess implements org.hsqldb.lib.FileAccess{
private class FileSync implements FileAccess.FileSync
{
- private NativeOutputStreamHelper os;
+ private final NativeOutputStreamHelper os;
private FileSync(NativeOutputStreamHelper _os)
{
os = _os;
diff --git a/connectivity/qa/complex/connectivity/hsqldb/DatabaseMetaData.java b/connectivity/qa/complex/connectivity/hsqldb/DatabaseMetaData.java
index 457b037c74fb..905ddc1e50e6 100644
--- a/connectivity/qa/complex/connectivity/hsqldb/DatabaseMetaData.java
+++ b/connectivity/qa/complex/connectivity/hsqldb/DatabaseMetaData.java
@@ -30,8 +30,8 @@ import java.lang.reflect.Method;
public class DatabaseMetaData {
- private java.sql.DatabaseMetaData m_xMD;
- private HsqlDriverTest m_TestCase;
+ private final java.sql.DatabaseMetaData m_xMD;
+ private final HsqlDriverTest m_TestCase;
/** Creates a new instance of DatabaseMetaData */
public DatabaseMetaData(HsqlDriverTest _testCase,java.sql.DatabaseMetaData _xmd) {
diff --git a/connectivity/qa/connectivity/tools/DataSource.java b/connectivity/qa/connectivity/tools/DataSource.java
index 6b6048c44a96..748ee61cdefe 100644
--- a/connectivity/qa/connectivity/tools/DataSource.java
+++ b/connectivity/qa/connectivity/tools/DataSource.java
@@ -36,7 +36,7 @@ public class DataSource
{
// the service factory
- private XDataSource m_dataSource;
+ private final XDataSource m_dataSource;
public DataSource(final XMultiServiceFactory _orb, final String _registeredName) throws Exception
{
diff --git a/connectivity/qa/connectivity/tools/HsqlColumnDescriptor.java b/connectivity/qa/connectivity/tools/HsqlColumnDescriptor.java
index 19fb59ce7427..5d9311882379 100644
--- a/connectivity/qa/connectivity/tools/HsqlColumnDescriptor.java
+++ b/connectivity/qa/connectivity/tools/HsqlColumnDescriptor.java
@@ -22,12 +22,12 @@ package connectivity.tools;
*/
public class HsqlColumnDescriptor
{
- private String Name;
- private String TypeName;
- private boolean Required;
- private boolean PrimaryKey;
- private String ForeignTable;
- private String ForeignColumn;
+ private final String Name;
+ private final String TypeName;
+ private final boolean Required;
+ private final boolean PrimaryKey;
+ private final String ForeignTable;
+ private final String ForeignColumn;
public final String getName() { return Name; }
public final String getTypeName() { return TypeName; }
diff --git a/connectivity/qa/connectivity/tools/HsqlTableDescriptor.java b/connectivity/qa/connectivity/tools/HsqlTableDescriptor.java
index 992619b7c675..626f62eb8321 100644
--- a/connectivity/qa/connectivity/tools/HsqlTableDescriptor.java
+++ b/connectivity/qa/connectivity/tools/HsqlTableDescriptor.java
@@ -31,8 +31,8 @@ import connectivity.tools.sdb.Connection;
*/
public class HsqlTableDescriptor
{
- private String m_name;
- private HsqlColumnDescriptor[] m_columns;
+ private final String m_name;
+ private final HsqlColumnDescriptor[] m_columns;
/** Creates a new instance of HsqlTableDescriptor */
public HsqlTableDescriptor( String _name, HsqlColumnDescriptor[] _columns )
diff --git a/connectivity/qa/connectivity/tools/QueryDefinition.java b/connectivity/qa/connectivity/tools/QueryDefinition.java
index ab5fe513988f..b939fdbb22e3 100644
--- a/connectivity/qa/connectivity/tools/QueryDefinition.java
+++ b/connectivity/qa/connectivity/tools/QueryDefinition.java
@@ -26,7 +26,7 @@ import com.sun.star.lang.IllegalArgumentException;
public class QueryDefinition
{
- private XPropertySet m_queryDef;
+ private final XPropertySet m_queryDef;
public QueryDefinition( XPropertySet _queryDef )
{
diff --git a/dbaccess/qa/complex/dbaccess/RowSet.java b/dbaccess/qa/complex/dbaccess/RowSet.java
index 66749fb30233..ad0968a3d3eb 100644
--- a/dbaccess/qa/complex/dbaccess/RowSet.java
+++ b/dbaccess/qa/complex/dbaccess/RowSet.java
@@ -73,9 +73,9 @@ public class RowSet extends TestCase
private class ResultSetMovementStress implements Runnable
{
- private XResultSet m_resultSet;
- private XRow m_row;
- private int m_id;
+ private final XResultSet m_resultSet;
+ private final XRow m_row;
+ private final int m_id;
private ResultSetMovementStress(XResultSet _resultSet, int _id) throws java.lang.Exception
{
diff --git a/desktop/test/deployment/options/handler/com/sun/star/comp/extensionoptions/OptionsEventHandler.java b/desktop/test/deployment/options/handler/com/sun/star/comp/extensionoptions/OptionsEventHandler.java
index 86b168abc55d..f7499ceef5f7 100644
--- a/desktop/test/deployment/options/handler/com/sun/star/comp/extensionoptions/OptionsEventHandler.java
+++ b/desktop/test/deployment/options/handler/com/sun/star/comp/extensionoptions/OptionsEventHandler.java
@@ -49,13 +49,13 @@ public class OptionsEventHandler {
static private final String __serviceName =
"com.sun.star.comp.extensionoptions.OptionsEventHandler";
- private XComponentContext m_cmpCtx;
+ private final XComponentContext m_cmpCtx;
private XNameAccess m_xAccessLeaves;
/**Names of supported options pages.
*/
- private String[] m_arWindowNames = {
+ private final String[] m_arWindowNames = {
"Writer1", "Writer2", "Writer3", "Calc1", "Calc2", "Calc3",
"Draw1", "Draw2", "Draw3", "Node1_1", "Node1_2", "Node1_3",
"Node2_1", "Node2_2", "Node2_3", "Node3_1", "Node3_2", "Node3_3"};
@@ -63,7 +63,7 @@ public class OptionsEventHandler {
/**Names of the controls which are supported by this handler. All these
*controls must have a "Text" property.
*/
- private String[] m_arStringControls = {
+ private final String[] m_arStringControls = {
"String0", "String1", "String2", "String3", "String4"};
public _OptionsEventHandler(XComponentContext xCompContext) {
diff --git a/extensions/qa/integration/extensions/ComponentFactory.java b/extensions/qa/integration/extensions/ComponentFactory.java
index 170e19a43667..ec848c4dfb06 100644
--- a/extensions/qa/integration/extensions/ComponentFactory.java
+++ b/extensions/qa/integration/extensions/ComponentFactory.java
@@ -24,7 +24,7 @@ import java.lang.reflect.Constructor;
public class ComponentFactory implements XSingleComponentFactory
{
- private Class m_handlerClass;
+ private final Class m_handlerClass;
private Constructor m_defaultConstructor;
private Constructor m_initConstructor;
diff --git a/extensions/qa/integration/extensions/ConsoleWait.java b/extensions/qa/integration/extensions/ConsoleWait.java
index b68290c83acd..bda281d2902b 100644
--- a/extensions/qa/integration/extensions/ConsoleWait.java
+++ b/extensions/qa/integration/extensions/ConsoleWait.java
@@ -23,14 +23,14 @@ import com.sun.star.lang.XComponent;
public class ConsoleWait implements com.sun.star.lang.XEventListener
{
- private Object m_disposable;
+ private final Object m_disposable;
/** a helper class which waits for a console ENTER key event in a dedicated thread,
and notifies a ConsoleWait object if this event happened
*/
private class WaitForEnter extends java.lang.Thread
{
- private ConsoleWait m_toNotify;
+ private final ConsoleWait m_toNotify;
private boolean m_done;
public WaitForEnter( ConsoleWait _toNotify )
diff --git a/extensions/qa/integration/extensions/HelpTextProvider.java b/extensions/qa/integration/extensions/HelpTextProvider.java
index 73cda71eef2a..8bd6596bc9b5 100644
--- a/extensions/qa/integration/extensions/HelpTextProvider.java
+++ b/extensions/qa/integration/extensions/HelpTextProvider.java
@@ -15,13 +15,6 @@
* except in compliance with the License. You may obtain a copy of
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-
-/*
- * HelpTextProvider.java
- *
- * Created on 16. November 2006, 09:44
- */
-
package integration.extensions;
import com.sun.star.inspection.XObjectInspectorUI;
@@ -33,7 +26,7 @@ import com.sun.star.lang.NoSupportException;
*/
public class HelpTextProvider implements XPropertyControlObserver
{
- private XObjectInspectorUI m_inspectorUI;
+ private final XObjectInspectorUI m_inspectorUI;
/**
* Creates a new instance of HelpTextProvider
diff --git a/extensions/qa/integration/extensions/ServicesHandler.java b/extensions/qa/integration/extensions/ServicesHandler.java
index 87ebb270ae84..516f2a25cc06 100644
--- a/extensions/qa/integration/extensions/ServicesHandler.java
+++ b/extensions/qa/integration/extensions/ServicesHandler.java
@@ -26,13 +26,13 @@ import com.sun.star.lang.XServiceInfo;
public class ServicesHandler implements XPropertyHandler
{
- private XComponentContext m_context;
+ private final XComponentContext m_context;
private String[] m_supportedServices;
private class ClickHandler implements com.sun.star.awt.XActionListener
{
XComponentContext m_context;
- private String m_serviceName;
+ private final String m_serviceName;
public ClickHandler( XComponentContext _context, String _serviceName )
{
diff --git a/filter/qa/complex/filter/detection/typeDetection/Helper.java b/filter/qa/complex/filter/detection/typeDetection/Helper.java
index 83026fd75997..e8e5a8171086 100644
--- a/filter/qa/complex/filter/detection/typeDetection/Helper.java
+++ b/filter/qa/complex/filter/detection/typeDetection/Helper.java
@@ -53,17 +53,17 @@ public class Helper {
* @member m_param the test parameters
*/
- private LogWriter m_log = null;
+ private final LogWriter m_log;
- private String m_sTestDocPath = null;
+ private final String m_sTestDocPath;
- private ArrayList<ArrayList<String>> m_vFiles = null;
+ private final ArrayList<ArrayList<String>> m_vFiles;
- private HashMap<String,String> m_hFileURLs = new HashMap<String,String>();
+ private final HashMap<String,String> m_hFileURLs = new HashMap<String,String>();
- private HashMap<String,String> m_hFileTypes = new HashMap<String,String>();
+ private final HashMap<String,String> m_hFileTypes = new HashMap<String,String>();
- private TestParameters m_param = null;
+ private final TestParameters m_param;
/**
* construct a new instance of this class
diff --git a/forms/qa/integration/forms/BooleanValidator.java b/forms/qa/integration/forms/BooleanValidator.java
index 8201fe99f5ae..9d85a86161cf 100644
--- a/forms/qa/integration/forms/BooleanValidator.java
+++ b/forms/qa/integration/forms/BooleanValidator.java
@@ -15,20 +15,13 @@
* except in compliance with the License. You may obtain a copy of
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-
-/*
- * BooleanValidator.java
- *
- * Created on 10. Maerz 2004, 16:27
- */
-
package integration.forms;
import com.sun.star.uno.AnyConverter;
public class BooleanValidator extends integration.forms.ControlValidator
{
- private boolean m_preventChecked;
+ private final boolean m_preventChecked;
/** Creates a new instance of BooleanValidator */
public BooleanValidator( boolean preventChecked )
diff --git a/forms/qa/integration/forms/DocumentHelper.java b/forms/qa/integration/forms/DocumentHelper.java
index a86bc6bca40e..64caf0a152e6 100644
--- a/forms/qa/integration/forms/DocumentHelper.java
+++ b/forms/qa/integration/forms/DocumentHelper.java
@@ -46,7 +46,7 @@ import com.sun.star.util.XModifiable;
*/
public class DocumentHelper
{
- private XMultiServiceFactory m_orb;
+ private final XMultiServiceFactory m_orb;
private XComponent m_documentComponent;
/* ================================================================== */
diff --git a/forms/qa/integration/forms/DocumentViewHelper.java b/forms/qa/integration/forms/DocumentViewHelper.java
index 5c82fa40b51e..90aa18a39636 100644
--- a/forms/qa/integration/forms/DocumentViewHelper.java
+++ b/forms/qa/integration/forms/DocumentViewHelper.java
@@ -41,9 +41,9 @@ import org.openoffice.xforms.XMLDocument;
*/
public class DocumentViewHelper
{
- private XMultiServiceFactory m_orb;
- private XController m_controller;
- private DocumentHelper m_document;
+ private final XMultiServiceFactory m_orb;
+ private final XController m_controller;
+ private final DocumentHelper m_document;
/* ------------------------------------------------------------------ */
final protected XController getController()
diff --git a/forms/qa/integration/forms/FormComponent.java b/forms/qa/integration/forms/FormComponent.java
index eb7467a55e59..301472760f29 100644
--- a/forms/qa/integration/forms/FormComponent.java
+++ b/forms/qa/integration/forms/FormComponent.java
@@ -28,11 +28,11 @@ import com.sun.star.lang.XServiceInfo;
public class FormComponent
{
- private Object m_component;
- private XNameAccess m_nameAccess;
- private XIndexAccess m_indexAccess;
- private XChild m_child;
- private XNamed m_named;
+ private final Object m_component;
+ private final XNameAccess m_nameAccess;
+ private final XIndexAccess m_indexAccess;
+ private final XChild m_child;
+ private final XNamed m_named;
/* ------------------------------------------------------------------ */
private FormComponent()
diff --git a/forms/qa/integration/forms/FormLayer.java b/forms/qa/integration/forms/FormLayer.java
index e7c33a0a61f2..06806897d00a 100644
--- a/forms/qa/integration/forms/FormLayer.java
+++ b/forms/qa/integration/forms/FormLayer.java
@@ -36,7 +36,7 @@ import com.sun.star.drawing.XDrawPage;
public class FormLayer
{
- private DocumentHelper m_document;
+ private final DocumentHelper m_document;
private XDrawPage m_page;
/* ------------------------------------------------------------------ */
diff --git a/forms/qa/integration/forms/ImageComparison.java b/forms/qa/integration/forms/ImageComparison.java
index 76784c36991c..034f4e550efc 100644
--- a/forms/qa/integration/forms/ImageComparison.java
+++ b/forms/qa/integration/forms/ImageComparison.java
@@ -27,9 +27,9 @@ package integration.forms;
public final class ImageComparison implements com.sun.star.awt.XImageConsumer
{
- private byte[] m_referenceBytes;
+ private final byte[] m_referenceBytes;
private int m_referencePosition;
- private Object m_notifyDone;
+ private final Object m_notifyDone;
public boolean imagesEqual( )
{
diff --git a/forms/qa/integration/forms/SingleControlValidation.java b/forms/qa/integration/forms/SingleControlValidation.java
index a24639b5d09f..0873d34ac8ae 100644
--- a/forms/qa/integration/forms/SingleControlValidation.java
+++ b/forms/qa/integration/forms/SingleControlValidation.java
@@ -24,14 +24,14 @@ import com.sun.star.form.validation.*;
public class SingleControlValidation implements XFormComponentValidityListener
{
- private DocumentHelper m_document; /// our current test document
- private FormLayer m_formLayer; /// quick access to the form layer
+ private final DocumentHelper m_document; /// our current test document
+ private final FormLayer m_formLayer; /// quick access to the form layer
private XPropertySet m_inputField;
private XPropertySet m_inputLabel;
private XPropertySet m_statusField;
private XPropertySet m_explanationField;
- private XValidator m_validator;
+ private final XValidator m_validator;
/* ------------------------------------------------------------------ */
public SingleControlValidation( DocumentHelper document, int columnPos, int rowPos, String formComponentService, XValidator validator )
diff --git a/forms/qa/integration/forms/TableCellTextBinding.java b/forms/qa/integration/forms/TableCellTextBinding.java
index 475ceb6fbd2a..70649602039f 100644
--- a/forms/qa/integration/forms/TableCellTextBinding.java
+++ b/forms/qa/integration/forms/TableCellTextBinding.java
@@ -43,12 +43,12 @@ public class TableCellTextBinding
implements com.sun.star.form.binding.XValueBinding,
com.sun.star.util.XModifyBroadcaster
{
- private XTextRange m_cellText;
+ private final XTextRange m_cellText;
private Object m_writeSignal;
private String m_newCellText;
private String m_lastKnownCellText;
private boolean m_haveNewCellText;
- private java.util.List<com.sun.star.util.XModifyListener> m_listeners;
+ private final java.util.List<com.sun.star.util.XModifyListener> m_listeners;
/** Creates a new instance of TableCellTextBinding */
public TableCellTextBinding( XCell cell )
diff --git a/forms/qa/integration/forms/WaitForInput.java b/forms/qa/integration/forms/WaitForInput.java
index 4c56b6eda746..c04c4dbe39d5 100644
--- a/forms/qa/integration/forms/WaitForInput.java
+++ b/forms/qa/integration/forms/WaitForInput.java
@@ -19,7 +19,7 @@ package integration.forms;
class WaitForInput extends java.lang.Thread
{
- private Object m_aToNotify;
+ private final Object m_aToNotify;
private boolean m_bDone;
public WaitForInput( Object aToNotify )
diff --git a/forms/qa/org/openoffice/xforms/Instance.java b/forms/qa/org/openoffice/xforms/Instance.java
index e60a8e4ec448..d98c647a959f 100644
--- a/forms/qa/org/openoffice/xforms/Instance.java
+++ b/forms/qa/org/openoffice/xforms/Instance.java
@@ -26,8 +26,8 @@ import java.util.NoSuchElementException;
public class Instance
{
- private Model m_model;
- private XDocument m_domInstance;
+ private final Model m_model;
+ private final XDocument m_domInstance;
protected Instance( Model _model, XDocument _domInstance )
{
diff --git a/forms/qa/org/openoffice/xforms/Model.java b/forms/qa/org/openoffice/xforms/Model.java
index a573fe5bf974..37c3915b2a07 100644
--- a/forms/qa/org/openoffice/xforms/Model.java
+++ b/forms/qa/org/openoffice/xforms/Model.java
@@ -26,9 +26,9 @@ import com.sun.star.xml.dom.XNode;
public class Model
{
- private XModel m_model;
- private XPropertySet m_modelProps;
- private XFormsUIHelper1 m_helper;
+ private final XModel m_model;
+ private final XPropertySet m_modelProps;
+ private final XFormsUIHelper1 m_helper;
protected Model( Object _model )
{
diff --git a/framework/qa/complex/XUserInputInterception/EventTest.java b/framework/qa/complex/XUserInputInterception/EventTest.java
index 350a2216e5d1..0efb10c2dc9a 100644
--- a/framework/qa/complex/XUserInputInterception/EventTest.java
+++ b/framework/qa/complex/XUserInputInterception/EventTest.java
@@ -406,11 +406,11 @@ public class EventTest {
* represents an <CODE>EventType</CODE>
* @see EventTest.EventTriggerType
*/
- private int eventType = 0;
+ private final int eventType;
/**
* represents a <CODE>XModel</CODE> of a document
*/
- private XModel xModel = null;
+ private final XModel xModel;
/**
* Creates an instacne of this class. The parameter <CODE>eType</CODE> represents
diff --git a/framework/qa/complex/accelerators/KeyMapping.java b/framework/qa/complex/accelerators/KeyMapping.java
index 0eb23b08b452..79e562a39a0b 100644
--- a/framework/qa/complex/accelerators/KeyMapping.java
+++ b/framework/qa/complex/accelerators/KeyMapping.java
@@ -42,8 +42,8 @@ class CodeHashMap extends HashMap<Short,String>
public class KeyMapping
{
- private IdentifierHashMap aIdentifierHashMap;
- private CodeHashMap aCodeHashMap;
+ private final IdentifierHashMap aIdentifierHashMap;
+ private final CodeHashMap aCodeHashMap;
public KeyMapping()
{
diff --git a/framework/qa/complex/contextMenuInterceptor/ContextMenuInterceptor.java b/framework/qa/complex/contextMenuInterceptor/ContextMenuInterceptor.java
index d3430486560c..fa3a999ad25c 100644
--- a/framework/qa/complex/contextMenuInterceptor/ContextMenuInterceptor.java
+++ b/framework/qa/complex/contextMenuInterceptor/ContextMenuInterceptor.java
@@ -25,7 +25,7 @@ import com.sun.star.uno.UnoRuntime;
public class ContextMenuInterceptor implements XContextMenuInterceptor
{
- private com.sun.star.awt.XBitmap myBitmap;
+ private final com.sun.star.awt.XBitmap myBitmap;
public ContextMenuInterceptor(com.sun.star.awt.XBitmap aBitmap)
{
diff --git a/framework/qa/complex/desktop/DesktopTerminate.java b/framework/qa/complex/desktop/DesktopTerminate.java
index 82e753e71e31..347eb749b56f 100644
--- a/framework/qa/complex/desktop/DesktopTerminate.java
+++ b/framework/qa/complex/desktop/DesktopTerminate.java
@@ -38,7 +38,7 @@ public class DesktopTerminate
{
private XMultiServiceFactory xMSF;
- private int iOfficeCloseTime = 1000;
+ private final int iOfficeCloseTime = 1000;
/**
* Test if all available document types change the
diff --git a/framework/qa/complex/framework/autosave/AutoSave.java b/framework/qa/complex/framework/autosave/AutoSave.java
index 33effb441304..f2a937e0c67f 100644
--- a/framework/qa/complex/framework/autosave/AutoSave.java
+++ b/framework/qa/complex/framework/autosave/AutoSave.java
@@ -66,7 +66,7 @@ public class AutoSave
{
private XDispatch m_xAutoSave;
private URL m_aRegistration;
- private Protocol m_aLog;
+ private final Protocol m_aLog;
private AutoSaveListener(XMultiServiceFactory xSMGR ,
XDispatch xAutoSave,
diff --git a/framework/qa/complex/framework/autosave/ConfigHelper.java b/framework/qa/complex/framework/autosave/ConfigHelper.java
index 204be38935bc..3e7fc394fc19 100644
--- a/framework/qa/complex/framework/autosave/ConfigHelper.java
+++ b/framework/qa/complex/framework/autosave/ConfigHelper.java
@@ -27,7 +27,7 @@ import com.sun.star.util.*;
class ConfigHelper
{
- private XHierarchicalNameAccess m_xConfig = null;
+ private final XHierarchicalNameAccess m_xConfig;
public ConfigHelper(XComponentContext context,
diff --git a/framework/qa/complex/framework/autosave/Protocol.java b/framework/qa/complex/framework/autosave/Protocol.java
index ac2a61dce79b..6748fc3ad6b1 100644
--- a/framework/qa/complex/framework/autosave/Protocol.java
+++ b/framework/qa/complex/framework/autosave/Protocol.java
@@ -139,9 +139,9 @@ public class Protocol extends JComponent
* @member m_nWarnings count warnings in protocol
* @member m_nTestMarks count test marker in protocol
*/
- private int m_nMode ;
- private int m_nFilter ;
- private String m_sFileName ;
+ private final int m_nMode ;
+ private final int m_nFilter ;
+ private final String m_sFileName ;
private long m_nLine ;
private long m_nScope ;
private long m_nErrors ;
@@ -158,15 +158,15 @@ public class Protocol extends JComponent
private class ProtocolLine
{
/// the line number of this protocol line (size of the vector of all protocol lines cn be used to count such lines!)
- private long m_nLine;
+ private final long m_nLine;
/// deepness of the current scope
- private long m_nScope;
+ private final long m_nScope;
/// mark line as an error, warning, data entry ... (see const definitions before)
- private int m_nType;
+ private final int m_nType;
/// of course, we have to know the logged message too :-)
- private String m_sMessage;
+ private final String m_sMessage;
/// and it can be useful to know the current time, when this line was created
- private Timestamp m_aStamp;
+ private final Timestamp m_aStamp;
/** ctor for fast initializing of such line */
private ProtocolLine( long nLine ,
diff --git a/framework/qa/complex/framework/recovery/CrashThread.java b/framework/qa/complex/framework/recovery/CrashThread.java
index 437b1309605c..8a16f83c6aa5 100644
--- a/framework/qa/complex/framework/recovery/CrashThread.java
+++ b/framework/qa/complex/framework/recovery/CrashThread.java
@@ -33,8 +33,8 @@ import com.sun.star.util.XURLTransformer;
* is nopt longer available.
*/
public class CrashThread extends Thread {
- private XComponent xDoc = null;
- private XMultiServiceFactory msf = null;
+ private final XComponent xDoc;
+ private final XMultiServiceFactory msf;
public CrashThread(XComponent xDoc, XMultiServiceFactory msf) {
this.xDoc = xDoc;
diff --git a/framework/qa/complex/framework/recovery/KlickButtonThread.java b/framework/qa/complex/framework/recovery/KlickButtonThread.java
index e5683efc6b6d..0b7e2cef67b6 100644
--- a/framework/qa/complex/framework/recovery/KlickButtonThread.java
+++ b/framework/qa/complex/framework/recovery/KlickButtonThread.java
@@ -27,9 +27,9 @@ import util.UITools;
* is nopt longer available.
*/
public class KlickButtonThread extends Thread {
- private XWindow xWindow = null;
- private XMultiServiceFactory xMSF = null;
- private String buttonName = null;
+ private final XWindow xWindow;
+ private final XMultiServiceFactory xMSF;
+ private final String buttonName;
public KlickButtonThread(XMultiServiceFactory xMSF, XWindow xWindow, String buttonName) {
this.xWindow = xWindow;
diff --git a/framework/qa/complex/framework/recovery/RecoveryTest.java b/framework/qa/complex/framework/recovery/RecoveryTest.java
index cfb767790b6d..b85f519078f5 100644
--- a/framework/qa/complex/framework/recovery/RecoveryTest.java
+++ b/framework/qa/complex/framework/recovery/RecoveryTest.java
@@ -69,7 +69,7 @@ public class RecoveryTest extends ComplexTestCase {
* and the values are com sun.star.awt.Rectangle.
* @see com.sun.star.awt.Rectangle
*/
- private HashMap<String, Rectangle> windowsPosSize = new HashMap<String, Rectangle>();
+ private final HashMap<String, Rectangle> windowsPosSize = new HashMap<String, Rectangle>();
/**
* A function to tell the framework, which test functions are available.
diff --git a/framework/qa/complex/imageManager/_XComponent.java b/framework/qa/complex/imageManager/_XComponent.java
index 54ac164a6f34..8b7cdb5404e7 100644
--- a/framework/qa/complex/imageManager/_XComponent.java
+++ b/framework/qa/complex/imageManager/_XComponent.java
@@ -40,7 +40,7 @@ public class _XComponent {
private static XComponent oObj = null;
private XComponent altDispose = null;
- private TestParameters tEnv = null;
+ private final TestParameters tEnv;
private boolean listenerDisposed[] = new boolean[2];
private String[] Loutput = new String[2];
@@ -49,8 +49,8 @@ public class _XComponent {
* on <code>dispose</code> call.
*/
private class MyEventListener implements XEventListener {
- private int number = 0;
- private String message = null;
+ private final int number;
+ private final String message;
private MyEventListener(int number, String message) {
this.message = message;
this.number = number;
@@ -61,8 +61,8 @@ public class _XComponent {
}
}
- private XEventListener listener1 = new MyEventListener(0, "EV1");
- private XEventListener listener2 = new MyEventListener(1, "EV2");
+ private final XEventListener listener1 = new MyEventListener(0, "EV1");
+ private final XEventListener listener2 = new MyEventListener(1, "EV2");
public _XComponent(TestParameters tEnv, XComponent oObj) {
this.tEnv = tEnv;
diff --git a/framework/qa/complex/imageManager/_XImageManager.java b/framework/qa/complex/imageManager/_XImageManager.java
index 96ea2a3f9ead..42d8055c4679 100644
--- a/framework/qa/complex/imageManager/_XImageManager.java
+++ b/framework/qa/complex/imageManager/_XImageManager.java
@@ -31,7 +31,7 @@ public class _XImageManager {
private String[]imageNames = null;
private XGraphic[] xGraphicArray = null;
- private XImageManager oObj;
+ private final XImageManager oObj;
public _XImageManager( TestParameters tEnv, XImageManager oObj) {
this.oObj = oObj;
diff --git a/framework/qa/complex/imageManager/_XInitialization.java b/framework/qa/complex/imageManager/_XInitialization.java
index fce31d4a3835..14cab34d4ca0 100644
--- a/framework/qa/complex/imageManager/_XInitialization.java
+++ b/framework/qa/complex/imageManager/_XInitialization.java
@@ -40,7 +40,7 @@ import lib.TestParameters;
public class _XInitialization {
- private TestParameters tEnv = null;
+ private final TestParameters tEnv;
private static XInitialization oObj = null;
public _XInitialization(TestParameters tEnv, XInitialization oObj) {
diff --git a/framework/qa/complex/imageManager/_XUIConfiguration.java b/framework/qa/complex/imageManager/_XUIConfiguration.java
index b3076c6077d1..486989535c5e 100644
--- a/framework/qa/complex/imageManager/_XUIConfiguration.java
+++ b/framework/qa/complex/imageManager/_XUIConfiguration.java
@@ -28,8 +28,8 @@ import lib.TestParameters;
public class _XUIConfiguration {
- private TestParameters tEnv = null;
- private XUIConfiguration oObj;
+ private final TestParameters tEnv;
+ private final XUIConfiguration oObj;
private XUIConfigurationListenerImpl xListener = null;
public interface XUIConfigurationListenerImpl
diff --git a/framework/qa/complex/imageManager/_XUIConfigurationPersistence.java b/framework/qa/complex/imageManager/_XUIConfigurationPersistence.java
index aa00c59b57c7..23735a1797bc 100644
--- a/framework/qa/complex/imageManager/_XUIConfigurationPersistence.java
+++ b/framework/qa/complex/imageManager/_XUIConfigurationPersistence.java
@@ -27,8 +27,8 @@ import lib.TestParameters;
public class _XUIConfigurationPersistence {
- private TestParameters tEnv = null;
- private XUIConfigurationPersistence oObj;
+ private final TestParameters tEnv;
+ private final XUIConfigurationPersistence oObj;
private XStorage xStore = null;
public _XUIConfigurationPersistence(TestParameters tEnv, XUIConfigurationPersistence oObj) {
diff --git a/javaunohelper/com/sun/star/comp/helper/ComponentContext.java b/javaunohelper/com/sun/star/comp/helper/ComponentContext.java
index 0326ffa77464..9d327ec8a8ce 100644
--- a/javaunohelper/com/sun/star/comp/helper/ComponentContext.java
+++ b/javaunohelper/com/sun/star/comp/helper/ComponentContext.java
@@ -36,7 +36,7 @@ import java.util.Map;
class Disposer implements XEventListener
{
- private XComponent m_xComp;
+ private final XComponent m_xComp;
Disposer( XComponent xComp )
diff --git a/javaunohelper/com/sun/star/lib/uno/adapter/InputStreamToXInputStreamAdapter.java b/javaunohelper/com/sun/star/lib/uno/adapter/InputStreamToXInputStreamAdapter.java
index 1fa4286214c4..feaca77cc9a6 100644
--- a/javaunohelper/com/sun/star/lib/uno/adapter/InputStreamToXInputStreamAdapter.java
+++ b/javaunohelper/com/sun/star/lib/uno/adapter/InputStreamToXInputStreamAdapter.java
@@ -34,7 +34,7 @@ public final class InputStreamToXInputStreamAdapter implements XInputStream {
/**
* Internal store to the InputStream
*/
- private InputStream iIn;
+ private final InputStream iIn;
/**
* Constructor.
diff --git a/javaunohelper/com/sun/star/lib/uno/adapter/XInputStreamToInputStreamAdapter.java b/javaunohelper/com/sun/star/lib/uno/adapter/XInputStreamToInputStreamAdapter.java
index 432cfdc0baed..c77c57b5adc1 100644
--- a/javaunohelper/com/sun/star/lib/uno/adapter/XInputStreamToInputStreamAdapter.java
+++ b/javaunohelper/com/sun/star/lib/uno/adapter/XInputStreamToInputStreamAdapter.java
@@ -35,7 +35,7 @@ public final class XInputStreamToInputStreamAdapter extends InputStream {
/**
* Internal handle to the XInputStream
*/
- private XInputStream xin;
+ private final XInputStream xin;
/**
* Constructor.
diff --git a/javaunohelper/com/sun/star/lib/uno/adapter/XOutputStreamToByteArrayAdapter.java b/javaunohelper/com/sun/star/lib/uno/adapter/XOutputStreamToByteArrayAdapter.java
index f8e738d0d8f8..d8f5740eb32a 100644
--- a/javaunohelper/com/sun/star/lib/uno/adapter/XOutputStreamToByteArrayAdapter.java
+++ b/javaunohelper/com/sun/star/lib/uno/adapter/XOutputStreamToByteArrayAdapter.java
@@ -31,7 +31,7 @@ public final class XOutputStreamToByteArrayAdapter
extends ComponentBase
implements XOutputStream
{
- private int initialSize = 100240; // 10 kb
+ private final int initialSize = 100240; // 10 kb
private int size = 0;
private int position = 0;
private boolean externalBuffer = false;
diff --git a/javaunohelper/com/sun/star/lib/uno/helper/Factory.java b/javaunohelper/com/sun/star/lib/uno/helper/Factory.java
index ca0bf84212c2..89cf42e3703a 100644
--- a/javaunohelper/com/sun/star/lib/uno/helper/Factory.java
+++ b/javaunohelper/com/sun/star/lib/uno/helper/Factory.java
@@ -116,9 +116,9 @@ public class Factory
}
- private String m_impl_name;
- private String [] m_supported_services;
- private Class<?> m_impl_class;
+ private final String m_impl_name;
+ private final String [] m_supported_services;
+ private final Class<?> m_impl_class;
private java.lang.reflect.Method m_method;
private java.lang.reflect.Constructor m_ctor;
diff --git a/javaunohelper/com/sun/star/lib/uno/helper/MultiTypeInterfaceContainer.java b/javaunohelper/com/sun/star/lib/uno/helper/MultiTypeInterfaceContainer.java
index 25c0ff997001..6ba3a4892c87 100644
--- a/javaunohelper/com/sun/star/lib/uno/helper/MultiTypeInterfaceContainer.java
+++ b/javaunohelper/com/sun/star/lib/uno/helper/MultiTypeInterfaceContainer.java
@@ -26,7 +26,7 @@ import java.util.Iterator;
public class MultiTypeInterfaceContainer
{
- private Map<Object,InterfaceContainer> map= new HashMap<Object,InterfaceContainer>();
+ private final Map<Object,InterfaceContainer> map= new HashMap<Object,InterfaceContainer>();
/** only returns types which have at least one value in InterfaceContainer
* return value can contain an element null, if someone called
diff --git a/javaunohelper/com/sun/star/lib/uno/helper/UnoUrl.java b/javaunohelper/com/sun/star/lib/uno/helper/UnoUrl.java
index 95d401440b3d..ca5e7a0aadd2 100644
--- a/javaunohelper/com/sun/star/lib/uno/helper/UnoUrl.java
+++ b/javaunohelper/com/sun/star/lib/uno/helper/UnoUrl.java
@@ -57,15 +57,15 @@ public class UnoUrl {
private static final String VALUE_CHAR_SET = "!$&'()*+-./:?@_~";
private static final String OID_CHAR_SET = VALUE_CHAR_SET + ",=";
- private UnoUrlPart connection;
- private UnoUrlPart protocol;
- private String rootOid;
+ private final UnoUrlPart connection;
+ private final UnoUrlPart protocol;
+ private final String rootOid;
static private class UnoUrlPart {
- private String partTypeName;
- private HashMap<String,String> partParameters;
- private String uninterpretedParameterString;
+ private final String partTypeName;
+ private final HashMap<String,String> partParameters;
+ private final String uninterpretedParameterString;
public UnoUrlPart(
String uninterpretedParameterString,
diff --git a/javaunohelper/com/sun/star/lib/uno/helper/WeakAdapter.java b/javaunohelper/com/sun/star/lib/uno/helper/WeakAdapter.java
index 0239959f619b..67e01ac3276d 100644
--- a/javaunohelper/com/sun/star/lib/uno/helper/WeakAdapter.java
+++ b/javaunohelper/com/sun/star/lib/uno/helper/WeakAdapter.java
@@ -33,9 +33,9 @@ import java.util.LinkedList;
public class WeakAdapter implements XAdapter
{
// references the XWeak implementation
- private WeakReference<Object> m_weakRef;
+ private final WeakReference<Object> m_weakRef;
// contains XReference objects registered by addReference
- private List<XReference> m_xreferenceList;
+ private final List<XReference> m_xreferenceList;
/**
*@param component the object that is to be held weak
diff --git a/jurt/com/sun/star/comp/urlresolver/UrlResolver.java b/jurt/com/sun/star/comp/urlresolver/UrlResolver.java
index 5a7e91c77fe5..76058e95a6b4 100644
--- a/jurt/com/sun/star/comp/urlresolver/UrlResolver.java
+++ b/jurt/com/sun/star/comp/urlresolver/UrlResolver.java
@@ -50,7 +50,7 @@ public class UrlResolver {
static public class _UrlResolver implements XUnoUrlResolver {
static private final String __serviceName = "com.sun.star.bridge.UnoUrlResolver";
- private XMultiServiceFactory _xMultiServiceFactory;
+ private final XMultiServiceFactory _xMultiServiceFactory;
public _UrlResolver(XMultiServiceFactory xMultiServiceFactory) {
_xMultiServiceFactory = xMultiServiceFactory;
diff --git a/jurt/com/sun/star/lib/uno/environments/remote/ThreadId.java b/jurt/com/sun/star/lib/uno/environments/remote/ThreadId.java
index b652aaf130c0..24d1572f866c 100644
--- a/jurt/com/sun/star/lib/uno/environments/remote/ThreadId.java
+++ b/jurt/com/sun/star/lib/uno/environments/remote/ThreadId.java
@@ -101,10 +101,9 @@ public final class ThreadId {
return id;
}
- private static final String PREFIX
- = "java:" + UnoRuntime.getUniqueKey() + ":";
+ private static final String PREFIX = "java:" + UnoRuntime.getUniqueKey() + ":";
private static BigInteger count = BigInteger.ZERO;
- private byte[] id;
+ private final byte[] id;
private int hash = 0;
}
diff --git a/nlpsolver/ThirdParty/EvolutionarySolver/src/net/adaptivebox/deps/behavior/DEGTBehavior.java b/nlpsolver/ThirdParty/EvolutionarySolver/src/net/adaptivebox/deps/behavior/DEGTBehavior.java
index c9879c099e61..c40f2c1ec258 100644
--- a/nlpsolver/ThirdParty/EvolutionarySolver/src/net/adaptivebox/deps/behavior/DEGTBehavior.java
+++ b/nlpsolver/ThirdParty/EvolutionarySolver/src/net/adaptivebox/deps/behavior/DEGTBehavior.java
@@ -35,7 +35,7 @@ import net.adaptivebox.problem.*;
import net.adaptivebox.space.*;
public class DEGTBehavior extends AbsGTBehavior implements ILibEngine {
- private int DVNum = 2; //Number of differential vectors, normally be 1 or 2
+ private final int DVNum = 2; //Number of differential vectors, normally be 1 or 2
public double FACTOR = 0.5; //scale constant: (0, 1.2], normally be 0.5
public double CR = 0.9; //crossover constant: [0, 1], normally be 0.1 or 0.9
diff --git a/nlpsolver/ThirdParty/EvolutionarySolver/src/net/adaptivebox/encode/EvalElement.java b/nlpsolver/ThirdParty/EvolutionarySolver/src/net/adaptivebox/encode/EvalElement.java
index b61046d34d92..1ad1adefd08c 100644
--- a/nlpsolver/ThirdParty/EvolutionarySolver/src/net/adaptivebox/encode/EvalElement.java
+++ b/nlpsolver/ThirdParty/EvolutionarySolver/src/net/adaptivebox/encode/EvalElement.java
@@ -25,7 +25,7 @@ import net.adaptivebox.global.*;
public class EvalElement {
//The weight for each response (target)
- private double weight = 1;
+ private final double weight = 1;
/**
* The expected range of the response value, forms the following objective:
*
diff --git a/nlpsolver/ThirdParty/EvolutionarySolver/src/net/adaptivebox/goodness/ACRComparator.java b/nlpsolver/ThirdParty/EvolutionarySolver/src/net/adaptivebox/goodness/ACRComparator.java
index ae8d4d130f8c..2d9f55fc2ac4 100644
--- a/nlpsolver/ThirdParty/EvolutionarySolver/src/net/adaptivebox/goodness/ACRComparator.java
+++ b/nlpsolver/ThirdParty/EvolutionarySolver/src/net/adaptivebox/goodness/ACRComparator.java
@@ -36,18 +36,18 @@ import net.adaptivebox.global.*;
public class ACRComparator implements IGoodnessCompareEngine, IUpdateCycleEngine {
- private Library socialPool;
+ private final Library socialPool;
private double epsilon_t = 0;
- private double RU = 0.75;
- private double RL = 0.25;
- private double BETAF = 0.618;
- private double BETAL = 0.618;
- private double BETAU = 1.382;
+ private final double RU = 0.75;
+ private final double RL = 0.25;
+ private final double BETAF = 0.618;
+ private final double BETAL = 0.618;
+ private final double BETAU = 1.382;
- private double T = -1;
+ private final double T;
- private double TthR = 0.5;
+ private final double TthR = 0.5;
public ACRComparator(Library lib, int T) {
socialPool = lib;
diff --git a/nlpsolver/ThirdParty/EvolutionarySolver/src/net/adaptivebox/knowledge/Library.java b/nlpsolver/ThirdParty/EvolutionarySolver/src/net/adaptivebox/knowledge/Library.java
index 6b6574bcc081..d4c202c989fc 100644
--- a/nlpsolver/ThirdParty/EvolutionarySolver/src/net/adaptivebox/knowledge/Library.java
+++ b/nlpsolver/ThirdParty/EvolutionarySolver/src/net/adaptivebox/knowledge/Library.java
@@ -29,7 +29,7 @@ import net.adaptivebox.goodness.*;
import net.adaptivebox.problem.*;
public class Library {
- private SearchPoint[] libPoints = new SearchPoint[0];
+ private final SearchPoint[] libPoints;
private int gIndex = -1;
public Library(SearchPoint[] points){
diff --git a/nlpsolver/ThirdParty/EvolutionarySolver/src/net/adaptivebox/knowledge/SearchPoint.java b/nlpsolver/ThirdParty/EvolutionarySolver/src/net/adaptivebox/knowledge/SearchPoint.java
index ea37e1e5cd0b..dbd472f043e3 100644
--- a/nlpsolver/ThirdParty/EvolutionarySolver/src/net/adaptivebox/knowledge/SearchPoint.java
+++ b/nlpsolver/ThirdParty/EvolutionarySolver/src/net/adaptivebox/knowledge/SearchPoint.java
@@ -27,7 +27,7 @@ public class SearchPoint extends BasicPoint implements IEncodeEngine {
//store the encode information for goodness evaluation
//encodeInfo[0]: the sum of constraints (if it equals to 0, then be a feasible point)
//encodeInfo[1]: the value of objective function
- private double[] encodeInfo = new double[2];
+ private final double[] encodeInfo = new double[2];
private double objectiveValue;
public SearchPoint(int dim) {
diff --git a/nlpsolver/ThirdParty/EvolutionarySolver/src/net/adaptivebox/problem/ProblemEncoder.java b/nlpsolver/ThirdParty/EvolutionarySolver/src/net/adaptivebox/problem/ProblemEncoder.java
index 603648e8428d..bc32c1c8d78b 100644
--- a/nlpsolver/ThirdParty/EvolutionarySolver/src/net/adaptivebox/problem/ProblemEncoder.java
+++ b/nlpsolver/ThirdParty/EvolutionarySolver/src/net/adaptivebox/problem/ProblemEncoder.java
@@ -33,14 +33,14 @@ import net.adaptivebox.knowledge.*;
public abstract class ProblemEncoder {
//Store the calculated results for the responses
- private double[] tempResponseSet; //temp values
- private double[] tempLocation; //temp values
+ private final double[] tempResponseSet; //temp values
+ private final double[] tempLocation; //temp values
//the search space (S)
- private DesignSpace designSpace = null;
+ private final DesignSpace designSpace;
// For evaluate the response vector into encoded vector double[2]
- private EvalStruct evalStruct = null;
+ private final EvalStruct evalStruct;
protected ProblemEncoder(int paramNum, int targetNum) throws Exception {
designSpace = new DesignSpace(paramNum);
diff --git a/nlpsolver/ThirdParty/EvolutionarySolver/src/net/adaptivebox/sco/SCAgent.java b/nlpsolver/ThirdParty/EvolutionarySolver/src/net/adaptivebox/sco/SCAgent.java
index 2bebff6f7fda..b473ae0a3807 100644
--- a/nlpsolver/ThirdParty/EvolutionarySolver/src/net/adaptivebox/sco/SCAgent.java
+++ b/nlpsolver/ThirdParty/EvolutionarySolver/src/net/adaptivebox/sco/SCAgent.java
@@ -48,9 +48,9 @@ public class SCAgent {
private IGoodnessCompareEngine specComparator;
//the coefficients of SCAgent
- private int TaoB = 2;
+ private final int TaoB = 2;
//The early version set TaoW as the size of external library (NL), but 4 is often enough
- private int TaoW = 4;
+ private final int TaoW = 4;
//The referred external library
private Library externalLib;
diff --git a/nlpsolver/ThirdParty/EvolutionarySolver/src/net/adaptivebox/space/BasicPoint.java b/nlpsolver/ThirdParty/EvolutionarySolver/src/net/adaptivebox/space/BasicPoint.java
index 1cf1b8592a44..a590a69742f7 100644
--- a/nlpsolver/ThirdParty/EvolutionarySolver/src/net/adaptivebox/space/BasicPoint.java
+++ b/nlpsolver/ThirdParty/EvolutionarySolver/src/net/adaptivebox/space/BasicPoint.java
@@ -22,7 +22,7 @@ package net.adaptivebox.space;
public class BasicPoint implements Cloneable, ILocationEngine {
//store the location information in the search space (S)
- private double[] location;
+ private final double[] location;
public BasicPoint(int dim) {
location = new double[dim];
diff --git a/nlpsolver/src/com/sun/star/comp/Calc/NLPSolver/BaseEvolutionarySolver.java b/nlpsolver/src/com/sun/star/comp/Calc/NLPSolver/BaseEvolutionarySolver.java
index 9d779afe7225..2d93dca6e4bf 100644
--- a/nlpsolver/src/com/sun/star/comp/Calc/NLPSolver/BaseEvolutionarySolver.java
+++ b/nlpsolver/src/com/sun/star/comp/Calc/NLPSolver/BaseEvolutionarySolver.java
@@ -61,8 +61,8 @@ public abstract class BaseEvolutionarySolver extends BaseNLPSolver {
}
private class Variable {
- private CellMap CellMap;
- private int OriginalVariable;
+ private final CellMap CellMap;
+ private final int OriginalVariable;
private double MinValue;
private double MaxValue;
private double Granularity;
@@ -78,8 +78,8 @@ public abstract class BaseEvolutionarySolver extends BaseNLPSolver {
private class CalcProblemEncoder extends ProblemEncoder {
- private ArrayList<Variable> m_variables;
- private ArrayList<ExtSolverConstraint> m_constraints;
+ private final ArrayList<Variable> m_variables;
+ private final ArrayList<ExtSolverConstraint> m_constraints;
private CalcProblemEncoder(ArrayList<Variable> variables,
ArrayList<ExtSolverConstraint> constraints) throws Exception {
@@ -152,19 +152,19 @@ public abstract class BaseEvolutionarySolver extends BaseNLPSolver {
protected double m_toleratedMin;
protected double m_toleratedMax;
- private ArrayList<Variable> m_variables = new ArrayList<Variable>();
+ private final ArrayList<Variable> m_variables = new ArrayList<Variable>();
//properties
protected PropertyInfo<Integer> m_swarmSize = new PropertyInfo<Integer>("SwarmSize", 70, "Size of Swam");
protected PropertyInfo<Integer> m_librarySize = new PropertyInfo<Integer>("LibrarySize", 210, "Size of Library");
protected PropertyInfo<Integer> m_learningCycles = new PropertyInfo<Integer>("LearningCycles", 2000, "Learning Cycles");
- private PropertyInfo<Boolean> m_guessVariableRange = new PropertyInfo<Boolean>("GuessVariableRange", true, "Variable Bounds Guessing");
- private PropertyInfo<Double> m_variableRangeThreshold = new PropertyInfo<Double>("VariableRangeThreshold", 3.0, "Variable Bounds Threshold (when guessing)"); //to approximate the variable bounds
- private PropertyInfo<Boolean> m_useACRComperator = new PropertyInfo<Boolean>("UseACRComparator", false, "Use ACR Comparator (instead of BCH)");
- private PropertyInfo<Boolean> m_useRandomStartingPoint = new PropertyInfo<Boolean>("UseRandomStartingPoint", false, "Use Random starting point");
+ private final PropertyInfo<Boolean> m_guessVariableRange = new PropertyInfo<Boolean>("GuessVariableRange", true, "Variable Bounds Guessing");
+ private final PropertyInfo<Double> m_variableRangeThreshold = new PropertyInfo<Double>("VariableRangeThreshold", 3.0, "Variable Bounds Threshold (when guessing)"); //to approximate the variable bounds
+ private final PropertyInfo<Boolean> m_useACRComperator = new PropertyInfo<Boolean>("UseACRComparator", false, "Use ACR Comparator (instead of BCH)");
+ private final PropertyInfo<Boolean> m_useRandomStartingPoint = new PropertyInfo<Boolean>("UseRandomStartingPoint", false, "Use Random starting point");
protected PropertyInfo<Integer> m_required = new PropertyInfo<Integer>("StagnationLimit", 70, "Stagnation Limit");
protected PropertyInfo<Double> m_tolerance = new PropertyInfo<Double>("Tolerance", 1e-6, "Stagnation Tolerance");
- private PropertyInfo<Boolean> m_enhancedSolverStatus = new PropertyInfo<Boolean>("EnhancedSolverStatus", true, "Show enhanced solver status");
+ private final PropertyInfo<Boolean> m_enhancedSolverStatus = new PropertyInfo<Boolean>("EnhancedSolverStatus", true, "Show enhanced solver status");
protected IEvolutionarySolverStatusDialog m_solverStatusDialog;
diff --git a/nlpsolver/src/com/sun/star/comp/Calc/NLPSolver/DEPSSolverImpl.java b/nlpsolver/src/com/sun/star/comp/Calc/NLPSolver/DEPSSolverImpl.java
index f7fc741fc6bf..716a79b79438 100644
--- a/nlpsolver/src/com/sun/star/comp/Calc/NLPSolver/DEPSSolverImpl.java
+++ b/nlpsolver/src/com/sun/star/comp/Calc/NLPSolver/DEPSSolverImpl.java
@@ -100,15 +100,15 @@ public final class DEPSSolverImpl extends BaseEvolutionarySolver
return m_serviceNames;
}
- private PropertyInfo<Double> m_agentSwitchRate = new PropertyInfo<Double>("AgentSwitchRate", 0.5, "Agent Switch Rate (DE Probability)");
+ private final PropertyInfo<Double> m_agentSwitchRate = new PropertyInfo<Double>("AgentSwitchRate", 0.5, "Agent Switch Rate (DE Probability)");
// --DE
- private PropertyInfo<Double> m_factor = new PropertyInfo<Double>("DEFactor", 0.5, "DE: Scaling Factor (0-1.2)");
- private PropertyInfo<Double> m_CR = new PropertyInfo<Double>("DECR", 0.9, "DE: Crossover Probability (0-1)");
+ private final PropertyInfo<Double> m_factor = new PropertyInfo<Double>("DEFactor", 0.5, "DE: Scaling Factor (0-1.2)");
+ private final PropertyInfo<Double> m_CR = new PropertyInfo<Double>("DECR", 0.9, "DE: Crossover Probability (0-1)");
// --PS
- private PropertyInfo<Double> m_c1 = new PropertyInfo<Double>("PSC1", 1.494, "PS: Cognitive Constant");
- private PropertyInfo<Double> m_c2 = new PropertyInfo<Double>("PSC2", 1.494, "PS: Social Constant");
- private PropertyInfo<Double> m_weight = new PropertyInfo<Double>("PSWeight", 0.729, "PS: Constriction Coefficient");
- private PropertyInfo<Double> m_CL = new PropertyInfo<Double>("PSCL", 0.0, "PS: Mutation Probability (0-0.005)");
+ private final PropertyInfo<Double> m_c1 = new PropertyInfo<Double>("PSC1", 1.494, "PS: Cognitive Constant");
+ private final PropertyInfo<Double> m_c2 = new PropertyInfo<Double>("PSC2", 1.494, "PS: Social Constant");
+ private final PropertyInfo<Double> m_weight = new PropertyInfo<Double>("PSWeight", 0.729, "PS: Constriction Coefficient");
+ private final PropertyInfo<Double> m_CL = new PropertyInfo<Double>("PSCL", 0.0, "PS: Mutation Probability (0-0.005)");
public void solve() {
try {
diff --git a/nlpsolver/src/com/sun/star/comp/Calc/NLPSolver/dialogs/EvolutionarySolverStatusUno.java b/nlpsolver/src/com/sun/star/comp/Calc/NLPSolver/dialogs/EvolutionarySolverStatusUno.java
index cd3dc0c3c7cb..da8dbb22e997 100644
--- a/nlpsolver/src/com/sun/star/comp/Calc/NLPSolver/dialogs/EvolutionarySolverStatusUno.java
+++ b/nlpsolver/src/com/sun/star/comp/Calc/NLPSolver/dialogs/EvolutionarySolverStatusUno.java
@@ -45,18 +45,18 @@ public class EvolutionarySolverStatusUno extends BaseDialog
XActionListener {
private int userState;
- private Label lblSolutionValue;
- private Label lblIteration;
- private ProgressBar pbIteration;
- private Label lblIterationValue;
- private Label lblStagnation;
- private ProgressBar pbStagnation;
- private Label lblStagnationValue;
- private Label lblRuntimeValue;
- private Button btnStop;
- private Button btnOK;
- private Button btnContinue;
- private int defaultTextColor;
+ private final Label lblSolutionValue;
+ private final Label lblIteration;
+ private final ProgressBar pbIteration;
+ private final Label lblIterationValue;
+ private final Label lblStagnation;
+ private final ProgressBar pbStagnation;
+ private final Label lblStagnationValue;
+ private final Label lblRuntimeValue;
+ private final Button btnStop;
+ private final Button btnOK;
+ private final Button btnContinue;
+ private final int defaultTextColor;
private int maxIterations;
private int maxStagnation;
diff --git a/odk/examples/DevelopersGuide/Charts/CalcHelper.java b/odk/examples/DevelopersGuide/Charts/CalcHelper.java
index 50364bdc0fbd..242e7676853d 100644
--- a/odk/examples/DevelopersGuide/Charts/CalcHelper.java
+++ b/odk/examples/DevelopersGuide/Charts/CalcHelper.java
@@ -342,7 +342,7 @@ public class CalcHelper
private static final String msDataSheetName = "Data";
private static final String msChartSheetName = "Chart";
- private XSpreadsheetDocument maSpreadSheetDoc;
+ private final XSpreadsheetDocument maSpreadSheetDoc;
diff --git a/odk/examples/DevelopersGuide/Charts/ChartHelper.java b/odk/examples/DevelopersGuide/Charts/ChartHelper.java
index 043635fe169e..1a79560fa94b 100644
--- a/odk/examples/DevelopersGuide/Charts/ChartHelper.java
+++ b/odk/examples/DevelopersGuide/Charts/ChartHelper.java
@@ -237,5 +237,5 @@ public class ChartHelper
private static final String msChartClassID = "12dcae26-281f-416f-a234-c3086127382e";
- private XModel maContainerDocument;
+ private final XModel maContainerDocument;
}
diff --git a/odk/examples/DevelopersGuide/Charts/ChartInCalc.java b/odk/examples/DevelopersGuide/Charts/ChartInCalc.java
index 76791e3bb9f9..ed55332e6128 100644
--- a/odk/examples/DevelopersGuide/Charts/ChartInCalc.java
+++ b/odk/examples/DevelopersGuide/Charts/ChartInCalc.java
@@ -409,6 +409,6 @@ public class ChartInCalc
// private members
- private XChartDocument maChartDocument;
- private XDiagram maDiagram;
+ private final XChartDocument maChartDocument;
+ private final XDiagram maDiagram;
}
diff --git a/odk/examples/DevelopersGuide/Charts/ChartInDraw.java b/odk/examples/DevelopersGuide/Charts/ChartInDraw.java
index 19e4855461e5..eec3be116244 100644
--- a/odk/examples/DevelopersGuide/Charts/ChartInDraw.java
+++ b/odk/examples/DevelopersGuide/Charts/ChartInDraw.java
@@ -286,6 +286,6 @@ public class ChartInDraw
// private members
- private XChartDocument maChartDocument;
- private XDiagram maDiagram;
+ private final XChartDocument maChartDocument;
+ private final XDiagram maDiagram;
}
diff --git a/odk/examples/DevelopersGuide/Charts/ChartInWriter.java b/odk/examples/DevelopersGuide/Charts/ChartInWriter.java
index 124616db46be..940a8cfc056b 100644
--- a/odk/examples/DevelopersGuide/Charts/ChartInWriter.java
+++ b/odk/examples/DevelopersGuide/Charts/ChartInWriter.java
@@ -155,6 +155,6 @@ public class ChartInWriter
// private members
- private XChartDocument maChartDocument;
- private XDiagram maDiagram;
+ private final XChartDocument maChartDocument;
+ private final XDiagram maDiagram;
}
diff --git a/odk/examples/DevelopersGuide/Charts/ListenAtCalcRangeInDraw.java b/odk/examples/DevelopersGuide/Charts/ListenAtCalcRangeInDraw.java
index 48108d8b21d1..36e7b3e4ec92 100644
--- a/odk/examples/DevelopersGuide/Charts/ListenAtCalcRangeInDraw.java
+++ b/odk/examples/DevelopersGuide/Charts/ListenAtCalcRangeInDraw.java
@@ -184,7 +184,7 @@ public class ListenAtCalcRangeInDraw implements XChartDataChangeEventListener
// __________ private __________
- private XSpreadsheetDocument maSheetDoc;
- private XChartDocument maChartDocument;
- private XChartData maChartData;
+ private final XSpreadsheetDocument maSheetDoc;
+ private final XChartDocument maChartDocument;
+ private final XChartData maChartData;
}
diff --git a/odk/examples/DevelopersGuide/Charts/SelectionChangeListener.java b/odk/examples/DevelopersGuide/Charts/SelectionChangeListener.java
index 9cfeb9e81f1f..190f8214fb03 100644
--- a/odk/examples/DevelopersGuide/Charts/SelectionChangeListener.java
+++ b/odk/examples/DevelopersGuide/Charts/SelectionChangeListener.java
@@ -177,7 +177,7 @@ public class SelectionChangeListener implements XSelectionChangeListener {
// __________ private __________
private class MyMessageBox extends Thread{
- private XMultiComponentFactory mMCF;
+ private final XMultiComponentFactory mMCF;
public MyMessageBox(XMultiComponentFactory xMCF){
mMCF = xMCF;
@@ -212,6 +212,6 @@ public class SelectionChangeListener implements XSelectionChangeListener {
}
}
- private XChartDocument maChartDocument;
- private XComponentContext maContext;
+ private final XChartDocument maChartDocument;
+ private final XComponentContext maContext;
}
diff --git a/odk/examples/DevelopersGuide/Components/Addons/ProtocolHandlerAddon_java/ProtocolHandlerAddon.java b/odk/examples/DevelopersGuide/Components/Addons/ProtocolHandlerAddon_java/ProtocolHandlerAddon.java
index 239296cc30e5..a969253bc9c4 100644
--- a/odk/examples/DevelopersGuide/Components/Addons/ProtocolHandlerAddon_java/ProtocolHandlerAddon.java
+++ b/odk/examples/DevelopersGuide/Components/Addons/ProtocolHandlerAddon_java/ProtocolHandlerAddon.java
@@ -68,7 +68,7 @@ public class ProtocolHandlerAddon {
/** The component context, that gives access to the service manager and all registered services.
*/
- private XComponentContext m_xCmpCtx;
+ private final XComponentContext m_xCmpCtx;
/** The toolkit, that we can create UNO dialogs.
*/
diff --git a/odk/examples/DevelopersGuide/Components/JavaComponent/TestComponentB.java b/odk/examples/DevelopersGuide/Components/JavaComponent/TestComponentB.java
index 15589707be4d..cf28e4c5ae86 100644
--- a/odk/examples/DevelopersGuide/Components/JavaComponent/TestComponentB.java
+++ b/odk/examples/DevelopersGuide/Components/JavaComponent/TestComponentB.java
@@ -43,7 +43,7 @@ import com.sun.star.uno.Type;
public class TestComponentB implements XTypeProvider, XServiceInfo, XSomethingB {
static final String __serviceName= "com.sun.star.test.SomethingB";
- private Object[] args;
+ private final Object[] args;
public TestComponentB(XComponentContext context, Object[] args) {
this.args= args;
diff --git a/odk/examples/DevelopersGuide/Components/dialogcomponent/DialogComponent.java b/odk/examples/DevelopersGuide/Components/dialogcomponent/DialogComponent.java
index e184400d8fb9..083347cb69b9 100644
--- a/odk/examples/DevelopersGuide/Components/dialogcomponent/DialogComponent.java
+++ b/odk/examples/DevelopersGuide/Components/dialogcomponent/DialogComponent.java
@@ -71,7 +71,7 @@ public class DialogComponent {
private static final String __serviceName= "com.sun.star.test.TestDialogHandler";
- private XComponentContext m_xCmpCtx;
+ private final XComponentContext m_xCmpCtx;
private XFrame m_xFrame;
private XToolkit m_xToolkit;
diff --git a/odk/examples/DevelopersGuide/Config/ConfigExamples.java b/odk/examples/DevelopersGuide/Config/ConfigExamples.java
index 2cca38513f99..510425d57e32 100644
--- a/odk/examples/DevelopersGuide/Config/ConfigExamples.java
+++ b/odk/examples/DevelopersGuide/Config/ConfigExamples.java
@@ -82,10 +82,10 @@ import com.sun.star.util.ChangesEvent;
public class ConfigExamples
{
// The ComponentContext interface of the remote component context
- private XComponentContext mxContext = null;
+ private final XComponentContext mxContext;
// The MultiComponentFactory interface of the ServiceManager
- private XMultiComponentFactory mxServiceManager = null;
+ private final XMultiComponentFactory mxServiceManager;
// The MultiServiceFactory interface of the ConfigurationProvider
private XMultiServiceFactory mxProvider = null;
diff --git a/odk/examples/DevelopersGuide/Database/Sales.java b/odk/examples/DevelopersGuide/Database/Sales.java
index 1733d21930b0..11a22a4fab86 100644
--- a/odk/examples/DevelopersGuide/Database/Sales.java
+++ b/odk/examples/DevelopersGuide/Database/Sales.java
@@ -38,7 +38,7 @@ import com.sun.star.sdbc.*;
public class Sales
{
- private XConnection con;
+ private final XConnection con;
public Sales(XConnection connection )
{
diff --git a/odk/examples/DevelopersGuide/Database/SalesMan.java b/odk/examples/DevelopersGuide/Database/SalesMan.java
index 5aead056c4c6..c88e5c86ab63 100644
--- a/odk/examples/DevelopersGuide/Database/SalesMan.java
+++ b/odk/examples/DevelopersGuide/Database/SalesMan.java
@@ -38,7 +38,7 @@ import com.sun.star.sdbc.*;
public class SalesMan
{
- private XConnection con;
+ private final XConnection con;
public SalesMan(XConnection connection )
{
diff --git a/odk/examples/DevelopersGuide/Database/sdbcx.java b/odk/examples/DevelopersGuide/Database/sdbcx.java
index fb498591f2ac..ddb263cd938d 100644
--- a/odk/examples/DevelopersGuide/Database/sdbcx.java
+++ b/odk/examples/DevelopersGuide/Database/sdbcx.java
@@ -44,11 +44,12 @@ import com.sun.star.lang.XMultiServiceFactory;
public class sdbcx
{
- private XMultiServiceFactory xORB;
+ private final XMultiServiceFactory xORB;
private static XConnection con;
private XTablesSupplier xTabSup;
- public static XMultiServiceFactory rSmgr;
+ public static XMultiServiceFactory rSmgr;
+
public static void main(String argv[]) throws java.lang.Exception
{
try{
diff --git a/odk/examples/DevelopersGuide/GUI/RoadmapItemStateChangeListener.java b/odk/examples/DevelopersGuide/GUI/RoadmapItemStateChangeListener.java
index 61fbf5f6958b..caa62f5220f1 100644
--- a/odk/examples/DevelopersGuide/GUI/RoadmapItemStateChangeListener.java
+++ b/odk/examples/DevelopersGuide/GUI/RoadmapItemStateChangeListener.java
@@ -39,7 +39,7 @@ import com.sun.star.uno.UnoRuntime;
public class RoadmapItemStateChangeListener implements XItemListener {
- private com.sun.star.lang.XMultiServiceFactory m_xMSFDialogModel;
+ private final com.sun.star.lang.XMultiServiceFactory m_xMSFDialogModel;
public RoadmapItemStateChangeListener(com.sun.star.lang.XMultiServiceFactory xMSFDialogModel) {
m_xMSFDialogModel = xMSFDialogModel;
diff --git a/odk/examples/DevelopersGuide/OfficeDev/DesktopEnvironment/CustomizeView.java b/odk/examples/DevelopersGuide/OfficeDev/DesktopEnvironment/CustomizeView.java
index 3f86aeff0581..1acb6eae6a40 100644
--- a/odk/examples/DevelopersGuide/OfficeDev/DesktopEnvironment/CustomizeView.java
+++ b/odk/examples/DevelopersGuide/OfficeDev/DesktopEnvironment/CustomizeView.java
@@ -80,9 +80,9 @@ public class CustomizeView extends JPanel
* @member m_aToolBarListener listener for status events of the tool bar
* @member m_aObjectBarListener listener for status events of the object bar
*/
- private JCheckBox m_cbMenuBar ;
- private JCheckBox m_cbToolBar ;
- private JCheckBox m_cbObjectBar ;
+ private final JCheckBox m_cbMenuBar ;
+ private final JCheckBox m_cbToolBar ;
+ private final JCheckBox m_cbObjectBar ;
private StatusListener m_aMenuBarListener ;
private StatusListener m_aToolBarListener ;
@@ -175,9 +175,9 @@ public class CustomizeView extends JPanel
com.sun.star.lang.XEventListener
{
/// URL, to toogle the requested UI item
- private String m_sURL;
+ private final String m_sURL;
/// name of the property which must be used in combination with the URL
- private String m_sProp;
+ private final String m_sProp;
/// we must use this frame to dispatch a request
private com.sun.star.frame.XFrame m_xFrame;
diff --git a/odk/examples/DevelopersGuide/OfficeDev/DesktopEnvironment/DocumentView.java b/odk/examples/DevelopersGuide/OfficeDev/DesktopEnvironment/DocumentView.java
index 2a3bad305c94..c6e657c06483 100644
--- a/odk/examples/DevelopersGuide/OfficeDev/DesktopEnvironment/DocumentView.java
+++ b/odk/examples/DevelopersGuide/OfficeDev/DesktopEnvironment/DocumentView.java
@@ -99,10 +99,10 @@ public class DocumentView extends JFrame
private CustomizeView maCustomizeView ;
private Interceptor maInterceptor ;
- private String msName ;
+ private final String msName;
- private JButton mbtSave ;
- private JButton mbtExport ;
+ private final JButton mbtSave;
+ private final JButton mbtExport;
private boolean mbDead ;
diff --git a/odk/examples/DevelopersGuide/OfficeDev/DesktopEnvironment/JavaWindowPeerFake.java b/odk/examples/DevelopersGuide/OfficeDev/DesktopEnvironment/JavaWindowPeerFake.java
index 2d07f9642d9c..51fba4d12725 100644
--- a/odk/examples/DevelopersGuide/OfficeDev/DesktopEnvironment/JavaWindowPeerFake.java
+++ b/odk/examples/DevelopersGuide/OfficeDev/DesktopEnvironment/JavaWindowPeerFake.java
@@ -40,7 +40,7 @@
class JavaWindowPeerFake implements com.sun.star.awt.XSystemDependentWindowPeer,
com.sun.star.awt.XWindowPeer
{
- private NativeView maView;
+ private final NativeView maView;
public JavaWindowPeerFake(NativeView aNative)
{
diff --git a/odk/examples/DevelopersGuide/OfficeDev/DesktopEnvironment/OnewayExecutor.java b/odk/examples/DevelopersGuide/OfficeDev/DesktopEnvironment/OnewayExecutor.java
index cc3b79cf19ea..815355114bc0 100644
--- a/odk/examples/DevelopersGuide/OfficeDev/DesktopEnvironment/OnewayExecutor.java
+++ b/odk/examples/DevelopersGuide/OfficeDev/DesktopEnvironment/OnewayExecutor.java
@@ -74,9 +74,9 @@ class OnewayExecutor extends Thread
* called oneyway method)
* @member m_lParams list of parameters of the original request
*/
- private IOnewayLink m_rLink ;
- private int m_nRequest ;
- private ArrayList<Object> m_lParams ;
+ private final IOnewayLink m_rLink ;
+ private final int m_nRequest ;
+ private final ArrayList<Object> m_lParams ;
diff --git a/odk/examples/DevelopersGuide/OfficeDev/DesktopEnvironment/StatusListener.java b/odk/examples/DevelopersGuide/OfficeDev/DesktopEnvironment/StatusListener.java
index 02fc79d337e9..038c80ff92f1 100644
--- a/odk/examples/DevelopersGuide/OfficeDev/DesktopEnvironment/StatusListener.java
+++ b/odk/examples/DevelopersGuide/OfficeDev/DesktopEnvironment/StatusListener.java
@@ -80,9 +80,9 @@ class StatusListener implements com.sun.star.frame.XStatusListener,
* @member m_bIsStatusListener indicates if we are currently registered as a listener for status events or not
* @member m_bDead there exist more than one way to finish an object of this class - we must know it sometimes
*/
- private Component m_rControl ;
- private String m_sTrueText ;
- private String m_sFalseText ;
+ private final Component m_rControl ;
+ private final String m_sTrueText ;
+ private final String m_sFalseText ;
private com.sun.star.frame.XDispatch m_xDispatch ;
private com.sun.star.frame.XFrame m_xFrame ;
private com.sun.star.util.URL m_aURL ;
diff --git a/odk/examples/DevelopersGuide/OfficeDev/DesktopEnvironment/StatusView.java b/odk/examples/DevelopersGuide/OfficeDev/DesktopEnvironment/StatusView.java
index ae7625bfff7e..c4eb32ed4adb 100644
--- a/odk/examples/DevelopersGuide/OfficeDev/DesktopEnvironment/StatusView.java
+++ b/odk/examples/DevelopersGuide/OfficeDev/DesktopEnvironment/StatusView.java
@@ -105,11 +105,11 @@ public class StatusView extends JPanel
* @member maUnderlineListener threadsafe(!) helper to listen for status event which describe font style underline
* @member maItalicListener threadsafe(!) helper to listen for status event which describe font style italic
*/
- private JLabel m_laFontValue ;
- private JLabel m_laSizeValue ;
- private JLabel m_laBoldValue ;
- private JLabel m_laUnderlineValue ;
- private JLabel m_laItalicValue ;
+ private final JLabel m_laFontValue ;
+ private final JLabel m_laSizeValue ;
+ private final JLabel m_laBoldValue ;
+ private final JLabel m_laUnderlineValue ;
+ private final JLabel m_laItalicValue ;
private StatusListener m_aFontListener ;
private StatusListener m_aSizeListener ;
diff --git a/odk/examples/DevelopersGuide/OfficeDev/FilterDevelopment/AsciiFilter/AsciiReplaceFilter.java b/odk/examples/DevelopersGuide/OfficeDev/FilterDevelopment/AsciiFilter/AsciiReplaceFilter.java
index 04e9b771c391..7930f8595601 100644
--- a/odk/examples/DevelopersGuide/OfficeDev/FilterDevelopment/AsciiFilter/AsciiReplaceFilter.java
+++ b/odk/examples/DevelopersGuide/OfficeDev/FilterDevelopment/AsciiFilter/AsciiReplaceFilter.java
@@ -112,7 +112,7 @@ public class AsciiReplaceFilter
* To see the output inside an office environment
* use "soffice ...params... >output.txt"
*/
- private long m_nStart;
+ private final long m_nStart;
private long m_nLast ;
private void measure( String sText )
diff --git a/odk/examples/DevelopersGuide/OfficeDev/FilterDevelopment/AsciiFilter/FilterOptions.java b/odk/examples/DevelopersGuide/OfficeDev/FilterDevelopment/AsciiFilter/FilterOptions.java
index d821313ca00d..c740bc4d276d 100644
--- a/odk/examples/DevelopersGuide/OfficeDev/FilterDevelopment/AsciiFilter/FilterOptions.java
+++ b/odk/examples/DevelopersGuide/OfficeDev/FilterDevelopment/AsciiFilter/FilterOptions.java
@@ -69,8 +69,8 @@ public class FilterOptions
// private members for internal things
- private XMultiComponentFactory m_xMCF ;
- private XComponentContext m_Ctx ;
+ private final XMultiComponentFactory m_xMCF;
+ private final XComponentContext m_Ctx;
// interface
diff --git a/odk/examples/DevelopersGuide/OfficeDev/FilterDevelopment/FlatXmlFilter_java/FlatXml.java b/odk/examples/DevelopersGuide/OfficeDev/FilterDevelopment/FlatXmlFilter_java/FlatXml.java
index e096eb4660b8..e510d7ddf70d 100644
--- a/odk/examples/DevelopersGuide/OfficeDev/FilterDevelopment/FlatXmlFilter_java/FlatXml.java
+++ b/odk/examples/DevelopersGuide/OfficeDev/FilterDevelopment/FlatXmlFilter_java/FlatXml.java
@@ -55,9 +55,9 @@ public class FlatXml implements XImportFilter, XExportFilter, XServiceName,
/*
* private data members
*/
- private XMultiServiceFactory m_xServiceFactory;
+ private final XMultiServiceFactory m_xServiceFactory;
private XExtendedDocumentHandler m_xHandler;
- private boolean m_bPrettyPrint = true;
+ private final boolean m_bPrettyPrint = true;
static private final String __serviceName = "devguide.officedev.samples.filter.FlatXmlJava";
static private final String __implName = "FlatXml";
diff --git a/odk/examples/DevelopersGuide/OfficeDev/Linguistic/OneInstanceFactory.java b/odk/examples/DevelopersGuide/OfficeDev/Linguistic/OneInstanceFactory.java
index 9c9978da3ac2..1c3489d5be44 100644
--- a/odk/examples/DevelopersGuide/OfficeDev/Linguistic/OneInstanceFactory.java
+++ b/odk/examples/DevelopersGuide/OfficeDev/Linguistic/OneInstanceFactory.java
@@ -52,10 +52,10 @@ public class OneInstanceFactory implements
XSingleComponentFactory,
XServiceInfo
{
- private Class aMyClass;
- private String aSvcImplName;
- private String[] aSupportedSvcNames;
- private XInterface xInstantiatedService;
+ private final Class aMyClass;
+ private final String aSvcImplName;
+ private final String[] aSupportedSvcNames;
+ private XInterface xInstantiatedService;
public OneInstanceFactory(
Class aMyClass,
diff --git a/odk/examples/DevelopersGuide/OfficeDev/Linguistic/PropChgHelper.java b/odk/examples/DevelopersGuide/OfficeDev/Linguistic/PropChgHelper.java
index 45b2d04d04f7..bc29513e73fe 100644
--- a/odk/examples/DevelopersGuide/OfficeDev/Linguistic/PropChgHelper.java
+++ b/odk/examples/DevelopersGuide/OfficeDev/Linguistic/PropChgHelper.java
@@ -47,10 +47,10 @@ public class PropChgHelper implements
XPropertyChangeListener,
XLinguServiceEventBroadcaster
{
- private XInterface xEvtSource;
- private String[] aPropNames;
+ private final XInterface xEvtSource;
+ private final String[] aPropNames;
private XPropertySet xPropSet;
- private ArrayList<XLinguServiceEventListener> aLngSvcEvtListeners;
+ private final ArrayList<XLinguServiceEventListener> aLngSvcEvtListeners;
public PropChgHelper(
XInterface xEvtSource,
diff --git a/odk/examples/DevelopersGuide/OfficeDev/Linguistic/XHyphenatedWord_impl.java b/odk/examples/DevelopersGuide/OfficeDev/Linguistic/XHyphenatedWord_impl.java
index f0200973dfdc..44c8b6239465 100644
--- a/odk/examples/DevelopersGuide/OfficeDev/Linguistic/XHyphenatedWord_impl.java
+++ b/odk/examples/DevelopersGuide/OfficeDev/Linguistic/XHyphenatedWord_impl.java
@@ -39,10 +39,10 @@ public class XHyphenatedWord_impl implements
{
private String aWord;
private String aHyphenatedWord;
- private short nHyphenPos;
- private short nHyphenationPos;
+ private final short nHyphenPos;
+ private final short nHyphenationPos;
private Locale aLang;
- private boolean bIsAltSpelling;
+ private final boolean bIsAltSpelling;
public XHyphenatedWord_impl(
String aWord,
diff --git a/odk/examples/DevelopersGuide/OfficeDev/Linguistic/XSpellAlternatives_impl.java b/odk/examples/DevelopersGuide/OfficeDev/Linguistic/XSpellAlternatives_impl.java
index aeb0275c978c..318aba8f6abb 100644
--- a/odk/examples/DevelopersGuide/OfficeDev/Linguistic/XSpellAlternatives_impl.java
+++ b/odk/examples/DevelopersGuide/OfficeDev/Linguistic/XSpellAlternatives_impl.java
@@ -41,7 +41,7 @@ public class XSpellAlternatives_impl implements
private String aWord;
private Locale aLanguage;
private String[] aAlt; // list of alternatives, may be empty.
- private short nType; // type of failure
+ private final short nType; // type of failure
public XSpellAlternatives_impl(
String aWord,
diff --git a/odk/examples/DevelopersGuide/OfficeDev/Number_Formats.java b/odk/examples/DevelopersGuide/OfficeDev/Number_Formats.java
index 4a406a0305a5..5cc323ebb289 100644
--- a/odk/examples/DevelopersGuide/OfficeDev/Number_Formats.java
+++ b/odk/examples/DevelopersGuide/OfficeDev/Number_Formats.java
@@ -207,7 +207,7 @@ public class Number_Formats
// __________ private members and methods __________
- private XSpreadsheetDocument maSpreadsheetDoc;
+ private final XSpreadsheetDocument maSpreadsheetDoc;
private XSpreadsheet maSheet; // the first sheet
diff --git a/odk/examples/DevelopersGuide/OfficeDev/OfficeConnect.java b/odk/examples/DevelopersGuide/OfficeDev/OfficeConnect.java
index f6ec7bf5a280..94936d6a248a 100644
--- a/odk/examples/DevelopersGuide/OfficeDev/OfficeConnect.java
+++ b/odk/examples/DevelopersGuide/OfficeDev/OfficeConnect.java
@@ -131,8 +131,8 @@ public class OfficeConnect
private static OfficeConnect maConnection;
// reference to remote office context
- private com.sun.star.uno.XComponentContext mxOfficeContext;
+ private final com.sun.star.uno.XComponentContext mxOfficeContext;
// reference to remote service manager
- private com.sun.star.lang.XMultiComponentFactory mxServiceManager;
+ private final com.sun.star.lang.XMultiComponentFactory mxServiceManager;
}
diff --git a/odk/examples/DevelopersGuide/ProfUNO/InterprocessConn/ConnectionAwareClient.java b/odk/examples/DevelopersGuide/ProfUNO/InterprocessConn/ConnectionAwareClient.java
index 35b15635fbf6..6b1dead7d8fe 100644
--- a/odk/examples/DevelopersGuide/ProfUNO/InterprocessConn/ConnectionAwareClient.java
+++ b/odk/examples/DevelopersGuide/ProfUNO/InterprocessConn/ConnectionAwareClient.java
@@ -53,11 +53,11 @@ import com.sun.star.bridge.XBridge;
public class ConnectionAwareClient extends java.awt.Frame
implements ActionListener , com.sun.star.lang.XEventListener
{
- private Button _btnWriter;
- private Label _txtLabel;
- private String _url;
+ private final Button _btnWriter;
+ private final Label _txtLabel;
+ private final String _url;
- private XComponentContext _ctx;
+ private final XComponentContext _ctx;
private com.sun.star.frame.XComponentLoader _officeComponentLoader;
diff --git a/odk/examples/DevelopersGuide/ScriptingFramework/ScriptSelector/ScriptSelector/ScriptSelector.java b/odk/examples/DevelopersGuide/ScriptingFramework/ScriptSelector/ScriptSelector/ScriptSelector.java
index b117d7f35c86..2fb6f3c68f24 100644
--- a/odk/examples/DevelopersGuide/ScriptingFramework/ScriptSelector/ScriptSelector/ScriptSelector.java
+++ b/odk/examples/DevelopersGuide/ScriptingFramework/ScriptSelector/ScriptSelector/ScriptSelector.java
@@ -196,7 +196,7 @@ public class ScriptSelector {
class ScriptSelectorPanel extends JPanel {
- private XBrowseNode myrootnode = null;
+ private final XBrowseNode myrootnode;
public JTextField textField;
public JTree tree;
@@ -308,9 +308,9 @@ class ScriptSelectorPanel extends JPanel {
class ScriptTreeRenderer extends DefaultTreeCellRenderer {
- private ImageIcon sofficeIcon;
- private ImageIcon scriptIcon;
- private ImageIcon containerIcon;
+ private final ImageIcon sofficeIcon;
+ private final ImageIcon scriptIcon;
+ private final ImageIcon containerIcon;
public ScriptTreeRenderer() {
sofficeIcon = new ImageIcon(getClass().getResource("soffice.gif"));
diff --git a/odk/examples/DevelopersGuide/Spreadsheet/ExampleAddIn.java b/odk/examples/DevelopersGuide/Spreadsheet/ExampleAddIn.java
index c30115770325..a3a2e0975204 100644
--- a/odk/examples/DevelopersGuide/Spreadsheet/ExampleAddIn.java
+++ b/odk/examples/DevelopersGuide/Spreadsheet/ExampleAddIn.java
@@ -36,9 +36,9 @@ import com.sun.star.sheet.XResultListener;
class ExampleAddInResult implements com.sun.star.sheet.XVolatileResult
{
- private String aName;
+ private final String aName;
private int nValue;
- private java.util.ArrayList<XResultListener> aListeners = new java.util.ArrayList<XResultListener>();
+ private final java.util.ArrayList<XResultListener> aListeners = new java.util.ArrayList<XResultListener>();
public ExampleAddInResult( String aNewName )
{
@@ -79,7 +79,7 @@ class ExampleAddInResult implements com.sun.star.sheet.XVolatileResult
class ExampleAddInThread extends Thread
{
- private java.util.HashMap<String, ExampleAddInResult> aCounters;
+ private final java.util.HashMap<String, ExampleAddInResult> aCounters;
public ExampleAddInThread( java.util.HashMap<String, ExampleAddInResult> aResults )
{
diff --git a/odk/examples/DevelopersGuide/Spreadsheet/ExampleDataPilotSource.java b/odk/examples/DevelopersGuide/Spreadsheet/ExampleDataPilotSource.java
index 593e8e572f48..445b75da053e 100644
--- a/odk/examples/DevelopersGuide/Spreadsheet/ExampleDataPilotSource.java
+++ b/odk/examples/DevelopersGuide/Spreadsheet/ExampleDataPilotSource.java
@@ -60,7 +60,7 @@ class ExampleSettings
class ExamplePropertySetInfo implements com.sun.star.beans.XPropertySetInfo
{
- private com.sun.star.beans.Property[] aProperties;
+ private final com.sun.star.beans.Property[] aProperties;
public ExamplePropertySetInfo( com.sun.star.beans.Property[] aProps )
{
@@ -95,7 +95,7 @@ class ExamplePropertySetInfo implements com.sun.star.beans.XPropertySetInfo
class ExampleMember implements com.sun.star.container.XNamed,
com.sun.star.beans.XPropertySet
{
- private int nMember;
+ private final int nMember;
public ExampleMember( int nMbr )
{
@@ -171,7 +171,7 @@ class ExampleMember implements com.sun.star.container.XNamed,
class ExampleMembers implements com.sun.star.container.XNameAccess
{
- private ExampleSettings aSettings;
+ private final ExampleSettings aSettings;
private ExampleMember[] aMembers;
public ExampleMembers( ExampleSettings aSet )
@@ -233,8 +233,8 @@ class ExampleLevel implements
com.sun.star.sheet.XDataPilotMemberResults,
com.sun.star.beans.XPropertySet
{
- private ExampleSettings aSettings;
- private int nDimension;
+ private final ExampleSettings aSettings;
+ private final int nDimension;
private ExampleMembers aMembers;
public ExampleLevel( ExampleSettings aSet, int nDim )
@@ -379,8 +379,8 @@ class ExampleLevel implements
class ExampleLevels implements com.sun.star.container.XNameAccess
{
- private ExampleSettings aSettings;
- private int nDimension;
+ private final ExampleSettings aSettings;
+ private final int nDimension;
private ExampleLevel aLevel;
public ExampleLevels( ExampleSettings aSet, int nDim )
@@ -432,8 +432,8 @@ class ExampleLevels implements com.sun.star.container.XNameAccess
class ExampleHierarchy implements com.sun.star.container.XNamed,
com.sun.star.sheet.XLevelsSupplier
{
- private ExampleSettings aSettings;
- private int nDimension;
+ private final ExampleSettings aSettings;
+ private final int nDimension;
private ExampleLevels aLevels;
public ExampleHierarchy( ExampleSettings aSet, int nDim )
@@ -468,8 +468,8 @@ class ExampleHierarchy implements com.sun.star.container.XNamed,
class ExampleHierarchies implements com.sun.star.container.XNameAccess
{
- private ExampleSettings aSettings;
- private int nDimension;
+ private final ExampleSettings aSettings;
+ private final int nDimension;
private ExampleHierarchy aHierarchy;
public ExampleHierarchies( ExampleSettings aSet, int nDim )
@@ -524,8 +524,8 @@ class ExampleDimension implements
com.sun.star.util.XCloneable,
com.sun.star.beans.XPropertySet
{
- private ExampleSettings aSettings;
- private int nDimension;
+ private final ExampleSettings aSettings;
+ private final int nDimension;
private ExampleHierarchies aHierarchies;
private com.sun.star.sheet.DataPilotFieldOrientation eOrientation;
@@ -694,7 +694,7 @@ class ExampleDimension implements
class ExampleDimensions implements com.sun.star.container.XNameAccess
{
- private ExampleSettings aSettings;
+ private final ExampleSettings aSettings;
private ExampleDimension[] aDimensions;
public ExampleDimensions( ExampleSettings aSet )
@@ -763,7 +763,7 @@ public class ExampleDataPilotSource
static private final String aServiceName = "com.sun.star.sheet.DataPilotSource";
static private final String aImplName = _ExampleDataPilotSource.class.getName();
- private ExampleSettings aSettings = new ExampleSettings();
+ private final ExampleSettings aSettings = new ExampleSettings();
private ExampleDimensions aDimensions;
public _ExampleDataPilotSource( com.sun.star.lang.XMultiServiceFactory xFactory )
diff --git a/odk/examples/DevelopersGuide/Text/TextDocuments.java b/odk/examples/DevelopersGuide/Text/TextDocuments.java
index d1d09442e6ab..e70e5a640f34 100644
--- a/odk/examples/DevelopersGuide/Text/TextDocuments.java
+++ b/odk/examples/DevelopersGuide/Text/TextDocuments.java
@@ -110,7 +110,7 @@ public class TextDocuments {
// adjust these constant to your local printer!
private static String sOutputDir;
- private String aPrinterName = "\\\\so-print\\xml3sof";
+ private final String aPrinterName = "\\\\so-print\\xml3sof";
private XComponentContext mxRemoteContext = null;
private XMultiComponentFactory mxRemoteServiceManager = null;
diff --git a/odk/examples/java/ConverterServlet/ConverterServlet.java b/odk/examples/java/ConverterServlet/ConverterServlet.java
index 0870f7d75e28..6a22837a7f0b 100644
--- a/odk/examples/java/ConverterServlet/ConverterServlet.java
+++ b/odk/examples/java/ConverterServlet/ConverterServlet.java
@@ -68,16 +68,15 @@ import com.sun.star.lang.XMultiComponentFactory;
public class ConverterServlet extends HttpServlet {
/** Specifies the temporary directory on the web server.
*/
- private String stringWorkingDirectory =
- System.getProperty( "java.io.tmpdir" ).replace( '\\', '/' );
+ private String stringWorkingDirectory = System.getProperty( "java.io.tmpdir" ).replace( '\\', '/' );
/** Specifies the host for the office server.
*/
- private String stringHost = "localhost";
+ private final String stringHost = "localhost";
/** Specifies the port for the office server.
*/
- private String stringPort = "2083";
+ private final String stringPort = "2083";
/** Called by the server (via the service method) to allow a servlet to handle
* a POST request. The file from the client will be uploaded to the web server
diff --git a/odk/examples/java/EmbedDocument/EmbeddedObject/EditorFrame.java b/odk/examples/java/EmbedDocument/EmbeddedObject/EditorFrame.java
index f923b15ab9fc..003fd572077e 100644
--- a/odk/examples/java/EmbedDocument/EmbeddedObject/EditorFrame.java
+++ b/odk/examples/java/EmbedDocument/EmbeddedObject/EditorFrame.java
@@ -26,11 +26,11 @@ import javax.imageio.ImageIO;
public class EditorFrame extends JFrame
{
- private OwnEmbeddedObject m_aEmbObj;
- private JTextArea m_aTextArea;
+ private final OwnEmbeddedObject m_aEmbObj;
+ private final JTextArea m_aTextArea;
private BufferedImage m_aBufImage;
- private WindowListener m_aCloser = new WindowAdapter()
+ private final WindowListener m_aCloser = new WindowAdapter()
{
@Override
public void windowClosing( WindowEvent e )
diff --git a/odk/examples/java/Spreadsheet/ChartTypeChange.java b/odk/examples/java/Spreadsheet/ChartTypeChange.java
index 271433890617..44673e2b6a50 100644
--- a/odk/examples/java/Spreadsheet/ChartTypeChange.java
+++ b/odk/examples/java/Spreadsheet/ChartTypeChange.java
@@ -79,11 +79,11 @@ public class ChartTypeChange {
/** Service factory
*/
- private XMultiComponentFactory xMCF = null;
+ private final XMultiComponentFactory xMCF;
/** Component context
*/
- private XComponentContext xCompContext = null;
+ private final XComponentContext xCompContext;
/** Beginning of the program.
* @param args No arguments will be passed to the class.
diff --git a/odk/source/com/sun/star/lib/loader/WinRegKey.java b/odk/source/com/sun/star/lib/loader/WinRegKey.java
index 9c51fbf95f26..fad5d34a8a76 100644
--- a/odk/source/com/sun/star/lib/loader/WinRegKey.java
+++ b/odk/source/com/sun/star/lib/loader/WinRegKey.java
@@ -31,8 +31,8 @@ import java.io.InputStream;
*/
final class WinRegKey {
- private String m_rootKeyName;
- private String m_subKeyName;
+ private final String m_rootKeyName;
+ private final String m_subKeyName;
// native methods to access the windows registry
private static native boolean winreg_RegOpenClassesRoot( long[] hkresult );
diff --git a/qadevOOo/runner/base/java_cmp.java b/qadevOOo/runner/base/java_cmp.java
index bb94269f985d..86927bc598d6 100644
--- a/qadevOOo/runner/base/java_cmp.java
+++ b/qadevOOo/runner/base/java_cmp.java
@@ -28,7 +28,7 @@ package base;
*/
public class java_cmp implements TestBase {
- private TestBase mWrappedTestBase = new java_fat();
+ private final TestBase mWrappedTestBase = new java_fat();
public boolean executeTest(lib.TestParameters param) {
param.put("OfficeProvider", "helper.UnoProvider");
diff --git a/qadevOOo/runner/complexlib/MethodThread.java b/qadevOOo/runner/complexlib/MethodThread.java
index 11bdcb61ded1..d30df06609f8 100644
--- a/qadevOOo/runner/complexlib/MethodThread.java
+++ b/qadevOOo/runner/complexlib/MethodThread.java
@@ -29,11 +29,11 @@ public class MethodThread extends Thread
{
/** The method that should be executed **/
- private Method mTestMethod = null;
+ private final Method mTestMethod;
/** The object that implements the method **/
- private Object mInvokeClass = null;
+ private final Object mInvokeClass;
/** A PrintWriter for debug Output **/
- private PrintWriter mLog = null;
+ private final PrintWriter mLog;
/** An Error String **/
private String mErrMessage = null;
/** Did an Exception happen? **/
diff --git a/qadevOOo/runner/convwatch/BorderRemover.java b/qadevOOo/runner/convwatch/BorderRemover.java
index af7ee46a99bc..dbd933b3ad35 100644
--- a/qadevOOo/runner/convwatch/BorderRemover.java
+++ b/qadevOOo/runner/convwatch/BorderRemover.java
@@ -26,10 +26,10 @@ import java.lang.reflect.Method;
class Rect
{
- private int x;
- private int y;
- private int w;
- private int h;
+ private final int x;
+ private final int y;
+ private final int w;
+ private final int h;
public Rect(int _x, int _y, int _w, int _h)
{
diff --git a/qadevOOo/runner/convwatch/DBHelper.java b/qadevOOo/runner/convwatch/DBHelper.java
index 03128eafa0ba..dc76af3ad9d2 100644
--- a/qadevOOo/runner/convwatch/DBHelper.java
+++ b/qadevOOo/runner/convwatch/DBHelper.java
@@ -49,8 +49,8 @@ class ShareConnection
class MySQLThread extends Thread
{
- private Connection m_aCon = null;
- private String m_sSQL;
+ private final Connection m_aCon;
+ private final String m_sSQL;
public MySQLThread(Connection _aCon, String _sSQL)
{
m_aCon = _aCon;
diff --git a/qadevOOo/runner/convwatch/DirectoryHelper.java b/qadevOOo/runner/convwatch/DirectoryHelper.java
index 26cd831a7042..9d322c52fb5e 100644
--- a/qadevOOo/runner/convwatch/DirectoryHelper.java
+++ b/qadevOOo/runner/convwatch/DirectoryHelper.java
@@ -27,7 +27,7 @@ import java.util.ArrayList;
*/
public class DirectoryHelper
{
- private ArrayList<String> m_aFileList = new ArrayList<String>();
+ private final ArrayList<String> m_aFileList = new ArrayList<String>();
private boolean m_bRecursiveIsAllowed = true;
private void setRecursiveIsAllowed(boolean _bValue)
diff --git a/qadevOOo/runner/convwatch/GraphicalTestArguments.java b/qadevOOo/runner/convwatch/GraphicalTestArguments.java
index e4dd7c0b6028..d5cc3c4f5800 100644
--- a/qadevOOo/runner/convwatch/GraphicalTestArguments.java
+++ b/qadevOOo/runner/convwatch/GraphicalTestArguments.java
@@ -81,15 +81,15 @@ public class GraphicalTestArguments
private boolean m_bIncludeSubdirectories;
- private TestParameters m_aCurrentParams;
+ private final TestParameters m_aCurrentParams;
- private int m_nMaxPages = 0; // default is 0 (print all pages)
- private String m_sOnlyPage = ""; // default is "", there is no page which we want to print only.
+ private final int m_nMaxPages; // default is 0 (print all pages)
+ private final String m_sOnlyPage; // default is "", there is no page which we want to print only.
private int m_nResolutionInDPI = 0;
private boolean m_bStoreFile = true;
- private boolean m_bResuseOffice = false;
+ private final boolean m_bResuseOffice;
diff --git a/qadevOOo/runner/convwatch/ImageHelper.java b/qadevOOo/runner/convwatch/ImageHelper.java
index 2644223e2ebb..5723c3fc85fb 100644
--- a/qadevOOo/runner/convwatch/ImageHelper.java
+++ b/qadevOOo/runner/convwatch/ImageHelper.java
@@ -26,9 +26,9 @@ import java.lang.reflect.Method;
class ImageHelper
{
- private Image m_aImage;
- private int[] m_aPixels;
- private int m_w = 0;
+ private final Image m_aImage;
+ private final int[] m_aPixels;
+ private final int m_w;
private ImageHelper(Image _aImage)
diff --git a/qadevOOo/runner/convwatch/IniFile.java b/qadevOOo/runner/convwatch/IniFile.java
index 8e1747bf1308..08e9629883ad 100644
--- a/qadevOOo/runner/convwatch/IniFile.java
+++ b/qadevOOo/runner/convwatch/IniFile.java
@@ -32,9 +32,9 @@ class IniFile
* internal representation of the ini file content.
* Problem, if ini file changed why other write something difference, we don't realise this.
*/
- private String m_sFilename;
- private ArrayList<String> m_aList;
- private boolean m_bListContainUnsavedChanges = false;
+ private final String m_sFilename;
+ private final ArrayList<String> m_aList;
+ private final boolean m_bListContainUnsavedChanges = false;
/**
open a ini file by its name
diff --git a/qadevOOo/runner/convwatch/PRNCompare.java b/qadevOOo/runner/convwatch/PRNCompare.java
index bc542752cc2b..1dac4c8eed97 100644
--- a/qadevOOo/runner/convwatch/PRNCompare.java
+++ b/qadevOOo/runner/convwatch/PRNCompare.java
@@ -30,7 +30,7 @@ import java.util.ArrayList;
public class PRNCompare
{
- private String fs;
+ private final String fs;
public PRNCompare()
{
diff --git a/qadevOOo/runner/convwatch/TriState.java b/qadevOOo/runner/convwatch/TriState.java
index c72e06c2b913..ec9dfd194336 100644
--- a/qadevOOo/runner/convwatch/TriState.java
+++ b/qadevOOo/runner/convwatch/TriState.java
@@ -24,7 +24,7 @@ public class TriState
public static final TriState FALSE = new TriState(0);
public static final TriState UNSET = new TriState(-1);
- private int m_nValue;
+ private final int m_nValue;
/**
Allocates a <code>TriState</code> object representing the
diff --git a/qadevOOo/runner/graphical/DirectoryHelper.java b/qadevOOo/runner/graphical/DirectoryHelper.java
index 6ba7e6cdfdd6..0d0462795433 100644
--- a/qadevOOo/runner/graphical/DirectoryHelper.java
+++ b/qadevOOo/runner/graphical/DirectoryHelper.java
@@ -27,7 +27,7 @@ import java.util.ArrayList;
*/
public class DirectoryHelper
{
- private ArrayList<String> m_aFileList = new ArrayList<String>();
+ private final ArrayList<String> m_aFileList = new ArrayList<String>();
private boolean m_bRecursiveIsAllowed = true;
private void setRecursiveIsAllowed(boolean _bValue)
diff --git a/qadevOOo/runner/graphical/ImageHelper.java b/qadevOOo/runner/graphical/ImageHelper.java
index 8f4249697192..f625b3d95cff 100644
--- a/qadevOOo/runner/graphical/ImageHelper.java
+++ b/qadevOOo/runner/graphical/ImageHelper.java
@@ -26,9 +26,9 @@ import java.lang.reflect.Method;
class ImageHelper
{
- private Image m_aImage;
- private int[] m_aPixels;
- private int m_w = 0;
+ private final Image m_aImage;
+ private final int[] m_aPixels;
+ private final int m_w;
private ImageHelper(Image _aImage)
diff --git a/qadevOOo/runner/graphical/IniFile.java b/qadevOOo/runner/graphical/IniFile.java
index fe2df6e62878..cc82ce4c86db 100644
--- a/qadevOOo/runner/graphical/IniFile.java
+++ b/qadevOOo/runner/graphical/IniFile.java
@@ -35,8 +35,8 @@ public class IniFile implements Enumeration<String>
* internal representation of the ini file content.
* Problem, if ini file changed why other write something difference, we don't realise this.
*/
- private String m_sFilename;
- private ArrayList<String> m_aList;
+ private final String m_sFilename;
+ private final ArrayList<String> m_aList;
private boolean m_bListContainUnsavedChanges = false;
private int m_aEnumerationPos = 0;
diff --git a/qadevOOo/runner/graphical/JPEGComparator.java b/qadevOOo/runner/graphical/JPEGComparator.java
index f793b527e607..4d07a03d3428 100644
--- a/qadevOOo/runner/graphical/JPEGComparator.java
+++ b/qadevOOo/runner/graphical/JPEGComparator.java
@@ -88,7 +88,7 @@ class NameDPIPage
class CountNotXXXPixelsFromImage extends Thread
{
- private String m_sFilename;
+ private final String m_sFilename;
protected int m_nValue;
CountNotXXXPixelsFromImage(String _sFilename)
diff --git a/qadevOOo/runner/graphical/MSOfficePostscriptCreator.java b/qadevOOo/runner/graphical/MSOfficePostscriptCreator.java
index a5c1667e7eb1..ba9a7ba25c64 100644
--- a/qadevOOo/runner/graphical/MSOfficePostscriptCreator.java
+++ b/qadevOOo/runner/graphical/MSOfficePostscriptCreator.java
@@ -32,12 +32,6 @@ import helper.OSHelper;
* *.xls as excel
* *.ppt as powerpoint
*/
-
-//class ProcessHelper
-//{
-// ArrayList m_aArray;
-//}
-
public class MSOfficePostscriptCreator implements IOffice
{
private String m_sPrinterName; // within Windows the tools need a printer name;
@@ -47,11 +41,10 @@ public class MSOfficePostscriptCreator implements IOffice
m_sPrinterName = _s;
}
- private ParameterHelper m_aParameterHelper;
+ private final ParameterHelper m_aParameterHelper;
private String m_sDocumentName;
- private String m_sResult;
+ private final String m_sResult;
- // CTor
public MSOfficePostscriptCreator(ParameterHelper _aParam, String _sResult)
{
m_aParameterHelper = _aParam;
diff --git a/qadevOOo/runner/graphical/Office.java b/qadevOOo/runner/graphical/Office.java
index 0cba0f63fd70..85785b2f3dad 100644
--- a/qadevOOo/runner/graphical/Office.java
+++ b/qadevOOo/runner/graphical/Office.java
@@ -22,9 +22,9 @@ import java.util.ArrayList;
public class Office implements IOffice
{
- private ParameterHelper m_aParameterHelper;
+ private final ParameterHelper m_aParameterHelper;
private String m_sDocumentName;
- private String m_sResult;
+ private final String m_sResult;
private IOffice m_aOffice = null;
public Office(ParameterHelper _aParam, String _sResult)
diff --git a/qadevOOo/runner/graphical/OpenOfficeDatabaseReportExtractor.java b/qadevOOo/runner/graphical/OpenOfficeDatabaseReportExtractor.java
index 96a6d0a69f77..199b169c88af 100644
--- a/qadevOOo/runner/graphical/OpenOfficeDatabaseReportExtractor.java
+++ b/qadevOOo/runner/graphical/OpenOfficeDatabaseReportExtractor.java
@@ -81,7 +81,7 @@ class PropertySetHelper
public class OpenOfficeDatabaseReportExtractor extends Assurance
{
- private ParameterHelper m_aParameterHelper;
+ private final ParameterHelper m_aParameterHelper;
public OpenOfficeDatabaseReportExtractor(ParameterHelper _aParameter)
{
diff --git a/qadevOOo/runner/graphical/OpenOfficePostscriptCreator.java b/qadevOOo/runner/graphical/OpenOfficePostscriptCreator.java
index cd0dde453ade..dfbdfd8a648c 100644
--- a/qadevOOo/runner/graphical/OpenOfficePostscriptCreator.java
+++ b/qadevOOo/runner/graphical/OpenOfficePostscriptCreator.java
@@ -50,8 +50,8 @@ import java.io.File;
*/
public class OpenOfficePostscriptCreator implements IOffice
{
- private ParameterHelper m_aParameterHelper;
- private String m_sOutputURL;
+ private final ParameterHelper m_aParameterHelper;
+ private final String m_sOutputURL;
private String m_sBasename;
private String m_sDocumentName;
private XComponent m_aDocument;
diff --git a/qadevOOo/runner/graphical/ParameterHelper.java b/qadevOOo/runner/graphical/ParameterHelper.java
index 0f3c06d8aa83..2c9e95217ed9 100644
--- a/qadevOOo/runner/graphical/ParameterHelper.java
+++ b/qadevOOo/runner/graphical/ParameterHelper.java
@@ -67,12 +67,12 @@ public class ParameterHelper
private String m_sPrinterName = null;
- private int m_nResolutionInDPI = 180;
+ private final int m_nResolutionInDPI = 180;
private String m_sInputPath = null;
private String m_sOutputPath = null;
- private TestParameters m_aCurrentParams;
+ private final TestParameters m_aCurrentParams;
public ParameterHelper(TestParameters param)
{
diff --git a/qadevOOo/runner/graphical/Tolerance.java b/qadevOOo/runner/graphical/Tolerance.java
index 80857168de7d..647dfb750760 100644
--- a/qadevOOo/runner/graphical/Tolerance.java
+++ b/qadevOOo/runner/graphical/Tolerance.java
@@ -20,7 +20,7 @@ package graphical;
public class Tolerance
{
- private int m_nTolerance;
+ private final int m_nTolerance;
public Tolerance(int _nAccept)
{
m_nTolerance = _nAccept;
diff --git a/qadevOOo/runner/helper/BuildEnvTools.java b/qadevOOo/runner/helper/BuildEnvTools.java
index 3cd50a823397..826832276683 100644
--- a/qadevOOo/runner/helper/BuildEnvTools.java
+++ b/qadevOOo/runner/helper/BuildEnvTools.java
@@ -35,7 +35,7 @@ public class BuildEnvTools {
private final boolean mDebug;
private final String mPlatform;
private final String mShell;
- private boolean mCygwin;
+ private final boolean mCygwin;
/**
* This constructor creates an instance of BuildEncTools. It is verifying for all neccesarry
diff --git a/qadevOOo/runner/helper/ConfigHelper.java b/qadevOOo/runner/helper/ConfigHelper.java
index d0fd6c9839c5..2adadaf2e146 100644
--- a/qadevOOo/runner/helper/ConfigHelper.java
+++ b/qadevOOo/runner/helper/ConfigHelper.java
@@ -85,7 +85,7 @@ import com.sun.star.util.*;
*/
public class ConfigHelper
{
- private XHierarchicalNameAccess m_xConfig = null;
+ private final XHierarchicalNameAccess m_xConfig;
public ConfigHelper(XMultiServiceFactory xSMGR ,
diff --git a/qadevOOo/runner/helper/LoggingThread.java b/qadevOOo/runner/helper/LoggingThread.java
index 9869e7885b9d..590a467a7134 100644
--- a/qadevOOo/runner/helper/LoggingThread.java
+++ b/qadevOOo/runner/helper/LoggingThread.java
@@ -36,10 +36,10 @@ import util.utils;
*/
public class LoggingThread extends Thread {
- private TestParameters param;
- private LogWriter log = null;
+ private final TestParameters param;
+ private final LogWriter log;
private boolean finished = false;
- private boolean debug = false;
+ private final boolean debug;
public LoggingThread(LogWriter log, TestParameters tParam) {
this.log = log;
diff --git a/qadevOOo/runner/helper/OfficeWatcher.java b/qadevOOo/runner/helper/OfficeWatcher.java
index 624e5c0238d1..60900c0052bd 100644
--- a/qadevOOo/runner/helper/OfficeWatcher.java
+++ b/qadevOOo/runner/helper/OfficeWatcher.java
@@ -24,14 +24,14 @@ import util.utils;
public class OfficeWatcher extends Thread implements share.Watcher {
public boolean finish;
- private TestParameters params;
+ private final TestParameters params;
private int StoredPing = 0;
- private boolean debug = false;
+ private final boolean debug;
public OfficeWatcher(TestParameters param) {
- finish = false;
+ this.finish = false;
this.params = param;
- debug = params.getBool(util.PropertyName.DEBUG_IS_ACTIVE);
+ this.debug = params.getBool(util.PropertyName.DEBUG_IS_ACTIVE);
}
/**
diff --git a/qadevOOo/runner/helper/ProcessHandler.java b/qadevOOo/runner/helper/ProcessHandler.java
index fb3ff77e8f28..332eb52f5a83 100644
--- a/qadevOOo/runner/helper/ProcessHandler.java
+++ b/qadevOOo/runner/helper/ProcessHandler.java
@@ -43,11 +43,11 @@ import util.utils;
class Pump extends Thread
{
- private LineNumberReader reader;
- private String pref;
- private StringBuffer buf = new StringBuffer(256);
- private PrintWriter log;
- private boolean bOutput;
+ private final LineNumberReader reader;
+ private final String pref;
+ private final StringBuffer buf = new StringBuffer(256);
+ private final PrintWriter log;
+ private final boolean bOutput;
/**
* Creates Pump for specified <code>InputStream</code>.
@@ -782,8 +782,8 @@ public class ProcessHandler
{
private int m_nTimeoutInSec;
- private String m_sProcessToStart;
- private boolean m_bInterrupt;
+ private final String m_sProcessToStart;
+ private final boolean m_bInterrupt;
private ProcessWatcher(int _nTimeOut, String _sProcess)
{
diff --git a/qadevOOo/runner/lib/MultiMethodTest.java b/qadevOOo/runner/lib/MultiMethodTest.java
index 0493b4bbf37e..c1f0b308f07b 100644
--- a/qadevOOo/runner/lib/MultiMethodTest.java
+++ b/qadevOOo/runner/lib/MultiMethodTest.java
@@ -95,7 +95,7 @@ public class MultiMethodTest
/**
* Contains names of the methods have been already called
*/
- private ArrayList<String> methCalled = new ArrayList<String>(10);
+ private final ArrayList<String> methCalled = new ArrayList<String>(10);
/**
* Disposes the test environment, which was corrupted by the test.
diff --git a/qadevOOo/runner/lib/StatusException.java b/qadevOOo/runner/lib/StatusException.java
index a4bf07f4703f..328fc4ff1899 100644
--- a/qadevOOo/runner/lib/StatusException.java
+++ b/qadevOOo/runner/lib/StatusException.java
@@ -27,7 +27,7 @@ public class StatusException extends RuntimeException {
/**
* The Status contained in the StatusException.
*/
- private Status status;
+ private final Status status;
/**
* Constructs a StatusException containing an exception Status.
diff --git a/qadevOOo/runner/lib/TestParameters.java b/qadevOOo/runner/lib/TestParameters.java
index 69bf9fcd2980..abd1dc29097b 100644
--- a/qadevOOo/runner/lib/TestParameters.java
+++ b/qadevOOo/runner/lib/TestParameters.java
@@ -51,7 +51,7 @@ public class TestParameters extends HashMap<String,Object> {
* Debug information will always be written on standard out.<br>
* default is true
*/
- private boolean DebugIsActive = false;
+ private final boolean DebugIsActive = false;
/**
* Wrapper around "get()" with some debug output
diff --git a/qadevOOo/runner/stats/DataBaseOutProducer.java b/qadevOOo/runner/stats/DataBaseOutProducer.java
index 6ffe9b705c39..f362d7e7e498 100644
--- a/qadevOOo/runner/stats/DataBaseOutProducer.java
+++ b/qadevOOo/runner/stats/DataBaseOutProducer.java
@@ -24,7 +24,7 @@ import java.util.HashMap;
public abstract class DataBaseOutProducer implements LogWriter {
protected HashMap<String,Object> mSqlInput = null;
- private HashMap<String, String[]> mSqlOutput = null;
+ private final HashMap<String, String[]> mSqlOutput = null;
private String[] mWriteableEntryTypes = null;
private SQLExecution mSqlExec;
protected boolean m_bDebug = false;
diff --git a/qadevOOo/runner/stats/SQLExecution.java b/qadevOOo/runner/stats/SQLExecution.java
index 34f8949b7772..487716c0e8c6 100644
--- a/qadevOOo/runner/stats/SQLExecution.java
+++ b/qadevOOo/runner/stats/SQLExecution.java
@@ -35,10 +35,10 @@ public class SQLExecution {
private Connection mConnection = null;
private Statement mStatement = null;
- private String mJdbcClass = null;
- private String mDbURL = null;
- private String mUser = null;
- private String mPassword = null;
+ private final String mJdbcClass;
+ private final String mDbURL;
+ private final String mUser;
+ private final String mPassword;
private boolean m_bConnectionOpen = false;
private boolean m_bDebug = false;
diff --git a/qadevOOo/runner/util/ControlDsc.java b/qadevOOo/runner/util/ControlDsc.java
index e5eb0d2ea62b..736fe01b0351 100644
--- a/qadevOOo/runner/util/ControlDsc.java
+++ b/qadevOOo/runner/util/ControlDsc.java
@@ -28,7 +28,7 @@ import com.sun.star.uno.UnoRuntime;
public class ControlDsc extends InstDescr {
- private String name = null;
+ private String name;
static final String ifcName = "com.sun.star.form.XFormComponent";
String service = "com.sun.star.form.component.CommandButton";
diff --git a/qadevOOo/runner/util/DBTools.java b/qadevOOo/runner/util/DBTools.java
index f6e7c815bc81..15aa1d926514 100644
--- a/