[Libreoffice-commits] core.git: 4 commits - bean/com bean/test bridges/source cli_ure/qa connectivity/com connectivity/qa dbaccess/qa desktop/test extensions/qa filter/qa forms/qa framework/qa javaunohelper/com javaunohelper/test jurt/com nlpsolver/src nlpsolver/ThirdParty odk/examples odk/source qadevOOo/runner qadevOOo/tests reportbuilder/java reportdesign/qa ridljar/com sc/qa scripting/java svl/qa swext/mediawiki sw/qa toolkit/qa toolkit/test ucb/qa ucb/test unotest/source vcl/qa wizards/com xmerge/source
Noel Grandin
noel at peralex.com
Tue Nov 18 02:45:49 PST 2014
bean/com/sun/star/comp/beans/Controller.java | 4
bean/com/sun/star/comp/beans/Frame.java | 6
bean/com/sun/star/comp/beans/LocalOfficeConnection.java | 6
bean/com/sun/star/comp/beans/OfficeDocument.java | 8 -
bean/com/sun/star/comp/beans/Wrapper.java | 4
bean/test/applet/oooapplet/OOoViewer.java | 4
bridges/source/jni_uno/java/com/sun/star/bridges/jni_uno/JNI_proxy.java | 10 -
cli_ure/qa/climaker/ClimakerTestCase.java | 2
connectivity/com/sun/star/sdbcx/comp/hsqldb/NativeInputStreamHelper.java | 11 -
connectivity/com/sun/star/sdbcx/comp/hsqldb/NativeOutputStreamHelper.java | 13 -
connectivity/com/sun/star/sdbcx/comp/hsqldb/StorageFileAccess.java | 2
connectivity/qa/complex/connectivity/hsqldb/DatabaseMetaData.java | 4
connectivity/qa/connectivity/tools/DataSource.java | 2
connectivity/qa/connectivity/tools/HsqlColumnDescriptor.java | 12 -
connectivity/qa/connectivity/tools/HsqlTableDescriptor.java | 4
connectivity/qa/connectivity/tools/QueryDefinition.java | 2
dbaccess/qa/complex/dbaccess/RowSet.java | 6
desktop/test/deployment/options/handler/com/sun/star/comp/extensionoptions/OptionsEventHandler.java | 6
extensions/qa/integration/extensions/ComponentFactory.java | 2
extensions/qa/integration/extensions/ConsoleWait.java | 4
extensions/qa/integration/extensions/HelpTextProvider.java | 9 -
extensions/qa/integration/extensions/ServicesHandler.java | 4
filter/qa/complex/filter/detection/typeDetection/Helper.java | 12 -
forms/qa/integration/forms/BooleanValidator.java | 9 -
forms/qa/integration/forms/DocumentHelper.java | 2
forms/qa/integration/forms/DocumentViewHelper.java | 6
forms/qa/integration/forms/FormComponent.java | 10 -
forms/qa/integration/forms/FormLayer.java | 2
forms/qa/integration/forms/ImageComparison.java | 4
forms/qa/integration/forms/SingleControlValidation.java | 6
forms/qa/integration/forms/TableCellTextBinding.java | 4
forms/qa/integration/forms/WaitForInput.java | 2
forms/qa/org/openoffice/xforms/Instance.java | 4
forms/qa/org/openoffice/xforms/Model.java | 6
framework/qa/complex/XUserInputInterception/EventTest.java | 4
framework/qa/complex/accelerators/KeyMapping.java | 4
framework/qa/complex/contextMenuInterceptor/ContextMenuInterceptor.java | 2
framework/qa/complex/desktop/DesktopTerminate.java | 2
framework/qa/complex/framework/autosave/AutoSave.java | 2
framework/qa/complex/framework/autosave/ConfigHelper.java | 2
framework/qa/complex/framework/autosave/Protocol.java | 16 +-
framework/qa/complex/framework/recovery/CrashThread.java | 4
framework/qa/complex/framework/recovery/KlickButtonThread.java | 6
framework/qa/complex/framework/recovery/RecoveryTest.java | 2
framework/qa/complex/imageManager/_XComponent.java | 10 -
framework/qa/complex/imageManager/_XImageManager.java | 2
framework/qa/complex/imageManager/_XInitialization.java | 2
framework/qa/complex/imageManager/_XUIConfiguration.java | 4
framework/qa/complex/imageManager/_XUIConfigurationPersistence.java | 4
javaunohelper/com/sun/star/comp/helper/ComponentContext.java | 2
javaunohelper/com/sun/star/lib/uno/adapter/InputStreamToXInputStreamAdapter.java | 2
javaunohelper/com/sun/star/lib/uno/adapter/XInputStreamToInputStreamAdapter.java | 2
javaunohelper/com/sun/star/lib/uno/adapter/XOutputStreamToByteArrayAdapter.java | 2
javaunohelper/com/sun/star/lib/uno/helper/Factory.java | 6
javaunohelper/com/sun/star/lib/uno/helper/MultiTypeInterfaceContainer.java | 2
javaunohelper/com/sun/star/lib/uno/helper/UnoUrl.java | 12 -
javaunohelper/com/sun/star/lib/uno/helper/WeakAdapter.java | 4
javaunohelper/test/com/sun/star/lib/uno/helper/PropertySet_Test.java | 76 +++++-----
jurt/com/sun/star/comp/urlresolver/UrlResolver.java | 2
jurt/com/sun/star/lib/uno/environments/remote/ThreadId.java | 5
nlpsolver/ThirdParty/EvolutionarySolver/src/net/adaptivebox/deps/behavior/DEGTBehavior.java | 2
nlpsolver/ThirdParty/EvolutionarySolver/src/net/adaptivebox/encode/EvalElement.java | 2
nlpsolver/ThirdParty/EvolutionarySolver/src/net/adaptivebox/goodness/ACRComparator.java | 16 +-
nlpsolver/ThirdParty/EvolutionarySolver/src/net/adaptivebox/knowledge/Library.java | 2
nlpsolver/ThirdParty/EvolutionarySolver/src/net/adaptivebox/knowledge/SearchPoint.java | 2
nlpsolver/ThirdParty/EvolutionarySolver/src/net/adaptivebox/problem/ProblemEncoder.java | 8 -
nlpsolver/ThirdParty/EvolutionarySolver/src/net/adaptivebox/sco/SCAgent.java | 4
nlpsolver/ThirdParty/EvolutionarySolver/src/net/adaptivebox/space/BasicPoint.java | 2
nlpsolver/src/com/sun/star/comp/Calc/NLPSolver/BaseEvolutionarySolver.java | 20 +-
nlpsolver/src/com/sun/star/comp/Calc/NLPSolver/DEPSSolverImpl.java | 14 -
nlpsolver/src/com/sun/star/comp/Calc/NLPSolver/dialogs/EvolutionarySolverStatusUno.java | 24 +--
odk/examples/DevelopersGuide/Charts/CalcHelper.java | 2
odk/examples/DevelopersGuide/Charts/ChartHelper.java | 2
odk/examples/DevelopersGuide/Charts/ChartInCalc.java | 4
odk/examples/DevelopersGuide/Charts/ChartInDraw.java | 4
odk/examples/DevelopersGuide/Charts/ChartInWriter.java | 4
odk/examples/DevelopersGuide/Charts/ListenAtCalcRangeInDraw.java | 6
odk/examples/DevelopersGuide/Charts/SelectionChangeListener.java | 6
odk/examples/DevelopersGuide/Components/Addons/ProtocolHandlerAddon_java/ProtocolHandlerAddon.java | 2
odk/examples/DevelopersGuide/Components/JavaComponent/TestComponentB.java | 2
odk/examples/DevelopersGuide/Components/dialogcomponent/DialogComponent.java | 2
odk/examples/DevelopersGuide/Config/ConfigExamples.java | 4
odk/examples/DevelopersGuide/Database/Sales.java | 2
odk/examples/DevelopersGuide/Database/SalesMan.java | 2
odk/examples/DevelopersGuide/Database/sdbcx.java | 5
odk/examples/DevelopersGuide/GUI/RoadmapItemStateChangeListener.java | 2
odk/examples/DevelopersGuide/OfficeDev/DesktopEnvironment/CustomizeView.java | 10 -
odk/examples/DevelopersGuide/OfficeDev/DesktopEnvironment/DocumentView.java | 6
odk/examples/DevelopersGuide/OfficeDev/DesktopEnvironment/JavaWindowPeerFake.java | 2
odk/examples/DevelopersGuide/OfficeDev/DesktopEnvironment/OnewayExecutor.java | 6
odk/examples/DevelopersGuide/OfficeDev/DesktopEnvironment/StatusListener.java | 6
odk/examples/DevelopersGuide/OfficeDev/DesktopEnvironment/StatusView.java | 10 -
odk/examples/DevelopersGuide/OfficeDev/FilterDevelopment/AsciiFilter/AsciiReplaceFilter.java | 2
odk/examples/DevelopersGuide/OfficeDev/FilterDevelopment/AsciiFilter/FilterOptions.java | 4
odk/examples/DevelopersGuide/OfficeDev/FilterDevelopment/FlatXmlFilter_java/FlatXml.java | 4
odk/examples/DevelopersGuide/OfficeDev/Linguistic/OneInstanceFactory.java | 8 -
odk/examples/DevelopersGuide/OfficeDev/Linguistic/PropChgHelper.java | 6
odk/examples/DevelopersGuide/OfficeDev/Linguistic/XHyphenatedWord_impl.java | 6
odk/examples/DevelopersGuide/OfficeDev/Linguistic/XSpellAlternatives_impl.java | 2
odk/examples/DevelopersGuide/OfficeDev/Number_Formats.java | 2
odk/examples/DevelopersGuide/OfficeDev/OfficeConnect.java | 4
odk/examples/DevelopersGuide/ProfUNO/InterprocessConn/ConnectionAwareClient.java | 8 -
odk/examples/DevelopersGuide/ScriptingFramework/ScriptSelector/ScriptSelector/ScriptSelector.java | 8 -
odk/examples/DevelopersGuide/Spreadsheet/ExampleAddIn.java | 6
odk/examples/DevelopersGuide/Spreadsheet/ExampleDataPilotSource.java | 30 +--
odk/examples/DevelopersGuide/Text/TextDocuments.java | 2
odk/examples/java/ConverterServlet/ConverterServlet.java | 7
odk/examples/java/EmbedDocument/EmbeddedObject/EditorFrame.java | 6
odk/examples/java/Spreadsheet/ChartTypeChange.java | 4
odk/source/com/sun/star/lib/loader/Loader.java | 4
odk/source/com/sun/star/lib/loader/WinRegKey.java | 4
qadevOOo/runner/base/java_cmp.java | 2
qadevOOo/runner/complexlib/MethodThread.java | 6
qadevOOo/runner/convwatch/BorderRemover.java | 8 -
qadevOOo/runner/convwatch/DBHelper.java | 4
qadevOOo/runner/convwatch/DirectoryHelper.java | 2
qadevOOo/runner/convwatch/GraphicalTestArguments.java | 8 -
qadevOOo/runner/convwatch/ImageHelper.java | 6
qadevOOo/runner/convwatch/IniFile.java | 6
qadevOOo/runner/convwatch/PRNCompare.java | 2
qadevOOo/runner/convwatch/TriState.java | 2
qadevOOo/runner/graphical/DirectoryHelper.java | 2
qadevOOo/runner/graphical/ImageHelper.java | 6
qadevOOo/runner/graphical/IniFile.java | 4
qadevOOo/runner/graphical/JPEGComparator.java | 2
qadevOOo/runner/graphical/MSOfficePostscriptCreator.java | 11 -
qadevOOo/runner/graphical/Office.java | 4
qadevOOo/runner/graphical/OpenOfficeDatabaseReportExtractor.java | 2
qadevOOo/runner/graphical/OpenOfficePostscriptCreator.java | 4
qadevOOo/runner/graphical/ParameterHelper.java | 4
qadevOOo/runner/graphical/Tolerance.java | 2
qadevOOo/runner/helper/BuildEnvTools.java | 2
qadevOOo/runner/helper/ConfigHelper.java | 2
qadevOOo/runner/helper/LoggingThread.java | 6
qadevOOo/runner/helper/OfficeWatcher.java | 8 -
qadevOOo/runner/helper/ProcessHandler.java | 14 -
qadevOOo/runner/lib/MultiMethodTest.java | 2
qadevOOo/runner/lib/StatusException.java | 2
qadevOOo/runner/lib/TestParameters.java | 2
qadevOOo/runner/stats/DataBaseOutProducer.java | 2
qadevOOo/runner/stats/SQLExecution.java | 8 -
qadevOOo/runner/util/ControlDsc.java | 2
qadevOOo/runner/util/DBTools.java | 6
qadevOOo/runner/util/DefaultDsc.java | 7
qadevOOo/runner/util/InstCreator.java | 10 -
qadevOOo/runner/util/SOfficeFactory.java | 2
qadevOOo/runner/util/ShapeDsc.java | 25 +--
qadevOOo/runner/util/StyleFamilyDsc.java | 2
qadevOOo/runner/util/XLayerHandlerImpl.java | 2
qadevOOo/runner/util/XMLTools.java | 20 +-
qadevOOo/runner/util/XSchemaHandlerImpl.java | 2
qadevOOo/runner/util/compare/GraphicalComparator.java | 2
qadevOOo/runner/util/db/DataSource.java | 6
qadevOOo/runner/util/db/DataSourceDescriptor.java | 2
qadevOOo/runner/util/db/DatabaseDocument.java | 8 -
qadevOOo/tests/java/ifc/accessibility/_XAccessibleComponent.java | 2
qadevOOo/tests/java/ifc/accessibility/_XAccessibleValue.java | 2
qadevOOo/tests/java/ifc/awt/_XComboBox.java | 4
qadevOOo/tests/java/ifc/awt/_XRadioButton.java | 2
qadevOOo/tests/java/ifc/awt/_XSpinField.java | 2
qadevOOo/tests/java/ifc/awt/_XTopWindow.java | 2
qadevOOo/tests/java/ifc/awt/_XUserInputInterception.java | 4
qadevOOo/tests/java/ifc/awt/_XWindow.java | 12 -
qadevOOo/tests/java/ifc/beans/_XFastPropertySet.java | 2
qadevOOo/tests/java/ifc/beans/_XMultiPropertySet.java | 2
qadevOOo/tests/java/ifc/bridge/_XBridgeFactory.java | 2
qadevOOo/tests/java/ifc/bridge/_XUnoUrlResolver.java | 13 -
qadevOOo/tests/java/ifc/connection/_XAcceptor.java | 2
qadevOOo/tests/java/ifc/connection/_XConnector.java | 2
qadevOOo/tests/java/ifc/document/_XFilter.java | 4
qadevOOo/tests/java/ifc/form/_XApproveActionBroadcaster.java | 2
qadevOOo/tests/java/ifc/form/_XLoadable.java | 2
qadevOOo/tests/java/ifc/form/_XUpdateBroadcaster.java | 2
qadevOOo/tests/java/ifc/form/binding/_XBindableValue.java | 2
qadevOOo/tests/java/ifc/frame/_XDispatch.java | 4
qadevOOo/tests/java/ifc/frame/_XDispatchProviderInterception.java | 2
qadevOOo/tests/java/ifc/frame/_XLayoutManager.java | 2
qadevOOo/tests/java/ifc/frame/_XNotifyingDispatch.java | 2
qadevOOo/tests/java/ifc/frame/_XUIControllerRegistration.java | 2
qadevOOo/tests/java/ifc/i18n/_XExtendedTransliteration.java | 2
qadevOOo/tests/java/ifc/i18n/_XTransliteration.java | 2
qadevOOo/tests/java/ifc/io/_XActiveDataControl.java | 2
qadevOOo/tests/java/ifc/sdb/_XSingleSelectQueryAnalyzer.java | 2
qadevOOo/tests/java/ifc/sdbc/_XRow.java | 2
qadevOOo/tests/java/ifc/sdbc/_XRowSet.java | 2
qadevOOo/tests/java/ifc/text/_XDefaultNumberingProvider.java | 2
qadevOOo/tests/java/ifc/ucb/_XDataContainer.java | 2
qadevOOo/tests/java/ifc/ui/_XUIConfigurationManager.java | 4
qadevOOo/tests/java/ifc/ui/dialogs/_XExecutableDialog.java | 4
qadevOOo/tests/java/ifc/ui/dialogs/_XFilePicker.java | 2
qadevOOo/tests/java/ifc/ui/dialogs/_XFilePickerNotifier.java | 2
qadevOOo/tests/java/ifc/util/_XFlushable.java | 2
qadevOOo/tests/java/ifc/util/_XModifyBroadcaster.java | 2
qadevOOo/tests/java/ifc/util/_XReplaceable.java | 2
qadevOOo/tests/java/ifc/xml/sax/_XDocumentHandler.java | 2
qadevOOo/tests/java/mod/_fwk/ModuleUIConfigurationManager.java | 6
qadevOOo/tests/java/mod/_fwk/UIConfigurationManager.java | 6
qadevOOo/tests/java/mod/_remotebridge/uno/various.java | 10 -
qadevOOo/tests/java/mod/_remotebridge/various.java | 6
qadevOOo/tests/java/mod/_sc/ScAccessibleCsvCell.java | 4
qadevOOo/tests/java/mod/_sc/ScAccessibleCsvGrid.java | 4
qadevOOo/tests/java/mod/_sc/ScAccessibleCsvRuler.java | 4
qadevOOo/tests/java/mod/_sc/ScDataPilotFieldGroupItemObj.java | 2
qadevOOo/tests/java/mod/_sc/ScDataPilotFieldGroupObj.java | 2
qadevOOo/tests/java/mod/_sc/ScDataPilotFieldGroupsObj.java | 2
qadevOOo/tests/java/mod/_sc/ScDataPilotFieldObj.java | 2
qadevOOo/tests/java/mod/_sc/ScDataPilotItemObj.java | 2
qadevOOo/tests/java/mod/_sc/ScDataPilotItemsObj.java | 2
qadevOOo/tests/java/mod/_sc/ScIndexEnumeration_DataPilotItemsEnumeration.java | 2
qadevOOo/tests/java/mod/_toolkit/UnoTreeControl.java | 2
reportbuilder/java/org/libreoffice/report/SDBCReportDataFactory.java | 2
reportdesign/qa/complex/reportdesign/FileURL.java | 2
ridljar/com/sun/star/uno/Enum.java | 2
sc/qa/complex/dataPilot/CheckDataPilot.java | 2
sc/qa/complex/dataPilot/_XDataPilotDescriptor.java | 8 -
sc/qa/complex/dataPilot/_XDataPilotTable.java | 4
sc/qa/complex/dataPilot/_XNamed.java | 2
sc/qa/complex/dataPilot/_XPropertySet.java | 10 -
scripting/java/Framework/com/sun/star/script/framework/security/SecurityDialog.java | 4
scripting/java/com/sun/star/script/framework/browse/DialogFactory.java | 2
scripting/java/com/sun/star/script/framework/browse/ParcelBrowseNode.java | 4
scripting/java/com/sun/star/script/framework/browse/ProviderBrowseNode.java | 6
scripting/java/com/sun/star/script/framework/browse/ScriptBrowseNode.java | 4
scripting/java/com/sun/star/script/framework/container/ParcelContainer.java | 2
scripting/java/com/sun/star/script/framework/container/ParcelDescriptor.java | 2
scripting/java/com/sun/star/script/framework/container/ScriptMetaData.java | 4
scripting/java/com/sun/star/script/framework/container/UnoPkgContainer.java | 7
scripting/java/com/sun/star/script/framework/container/XMLParserFactory.java | 2
scripting/java/com/sun/star/script/framework/io/UCBStreamHandler.java | 5
scripting/java/com/sun/star/script/framework/io/XInputStreamImpl.java | 2
scripting/java/com/sun/star/script/framework/io/XInputStreamWrapper.java | 2
scripting/java/com/sun/star/script/framework/io/XOutputStreamWrapper.java | 2
scripting/java/com/sun/star/script/framework/provider/EditorScriptContext.java | 4
scripting/java/com/sun/star/script/framework/provider/ScriptContext.java | 8 -
scripting/java/com/sun/star/script/framework/provider/beanshell/PlainSourceView.java | 4
scripting/java/com/sun/star/script/framework/provider/beanshell/ScriptProviderForBeanShell.java | 8 -
scripting/java/com/sun/star/script/framework/provider/beanshell/ScriptSourceModel.java | 2
scripting/java/com/sun/star/script/framework/provider/java/ScriptDescriptor.java | 8 -
scripting/java/com/sun/star/script/framework/provider/java/ScriptProviderForJava.java | 12 -
scripting/java/com/sun/star/script/framework/provider/java/ScriptProxy.java | 2
scripting/java/com/sun/star/script/framework/provider/javascript/ScriptEditorForJavaScript.java | 2
scripting/java/com/sun/star/script/framework/provider/javascript/ScriptProviderForJavaScript.java | 8 -
svl/qa/complex/passwordcontainer/MasterPasswdHandler.java | 2
sw/qa/complex/writer/LoadSaveTest.java | 6
sw/qa/complex/writer/TextPortionEnumerationTest.java | 48 +++---
swext/mediawiki/src/com/sun/star/wiki/Settings.java | 6
swext/mediawiki/src/com/sun/star/wiki/WikiArticle.java | 6
swext/mediawiki/src/com/sun/star/wiki/WikiEditSettingDialog.java | 6
swext/mediawiki/src/com/sun/star/wiki/WikiEditorImpl.java | 4
swext/mediawiki/src/com/sun/star/wiki/WikiOptionsEventHandlerImpl.java | 2
swext/mediawiki/src/com/sun/star/wiki/WikiPropDialog.java | 2
toolkit/qa/complex/toolkit/accessibility/_XAccessibleComponent.java | 2
toolkit/qa/complex/toolkit/accessibility/_XAccessibleContext.java | 2
toolkit/qa/complex/toolkit/accessibility/_XAccessibleEventBroadcaster.java | 8 -
toolkit/qa/complex/toolkit/accessibility/_XAccessibleExtendedComponent.java | 2
toolkit/qa/complex/toolkit/accessibility/_XAccessibleText.java | 8 -
toolkit/test/accessibility/AccessibilityTree.java | 16 +-
toolkit/test/accessibility/AccessibilityTreeModel.java | 2
toolkit/test/accessibility/AccessibleActionNode.java | 2
toolkit/test/accessibility/AccessibleTreeNode.java | 2
toolkit/test/accessibility/Canvas.java | 6
toolkit/test/accessibility/CanvasShape.java | 29 +--
toolkit/test/accessibility/ChildEventHandler.java | 4
toolkit/test/accessibility/EventListener.java | 2
toolkit/test/accessibility/EventQueue.java | 6
toolkit/test/accessibility/MessageArea.java | 2
toolkit/test/accessibility/NodeFactory.java | 45 +----
toolkit/test/accessibility/NodeMap.java | 2
toolkit/test/accessibility/OfficeConnection.java | 2
toolkit/test/accessibility/QueuedListener.java | 2
toolkit/test/accessibility/QueuedTopWindowListener.java | 2
toolkit/test/accessibility/SelectionDialog.java | 2
toolkit/test/accessibility/TopWindowListener.java | 4
toolkit/test/accessibility/VectorNode.java | 2
toolkit/test/accessibility/ov/ContextView.java | 2
toolkit/test/accessibility/ov/FocusView.java | 4
toolkit/test/accessibility/ov/ObjectViewContainer.java | 4
toolkit/test/accessibility/ov/StateSetView.java | 2
toolkit/test/accessibility/ov/TextView.java | 2
ucb/qa/complex/tdoc/_XChild.java | 2
ucb/qa/complex/tdoc/_XCommandInfoChangeNotifier.java | 2
ucb/qa/complex/tdoc/_XCommandProcessor.java | 2
ucb/qa/complex/tdoc/_XComponent.java | 6
ucb/qa/complex/tdoc/_XContent.java | 2
ucb/qa/complex/tdoc/_XPropertiesChangeNotifier.java | 4
ucb/qa/complex/tdoc/_XPropertyContainer.java | 2
ucb/qa/complex/tdoc/_XPropertySetInfoChangeNotifier.java | 2
ucb/qa/complex/tdoc/_XServiceInfo.java | 2
ucb/qa/complex/tdoc/_XTypeProvider.java | 2
ucb/test/com/sun/star/comp/ucb/GlobalTransfer_Test.java | 4
unotest/source/java/org/openoffice/test/tools/OfficeDocument.java | 2
unotest/source/java/org/openoffice/test/tools/OfficeDocumentView.java | 6
vcl/qa/complex/memCheck/CheckMemoryUsage.java | 6
vcl/qa/complex/persistent_window_states/DocumentHandle.java | 4
wizards/com/sun/star/wizards/common/ConfigSet.java | 6
wizards/com/sun/star/wizards/common/Desktop.java | 4
wizards/com/sun/star/wizards/common/FileAccess.java | 11 -
wizards/com/sun/star/wizards/common/Helper.java | 10 -
wizards/com/sun/star/wizards/common/NumberFormatter.java | 4
wizards/com/sun/star/wizards/common/NumericalHelper.java | 2
wizards/com/sun/star/wizards/common/Resource.java | 2
wizards/com/sun/star/wizards/common/SystemDialog.java | 4
wizards/com/sun/star/wizards/common/TerminateWizardException.java | 2
wizards/com/sun/star/wizards/common/UCB.java | 10 -
wizards/com/sun/star/wizards/db/CommandMetaData.java | 2
wizards/com/sun/star/wizards/db/DBMetaData.java | 6
wizards/com/sun/star/wizards/db/RecordParser.java | 1
wizards/com/sun/star/wizards/db/RelationController.java | 17 +-
wizards/com/sun/star/wizards/db/SQLQueryComposer.java | 3
wizards/com/sun/star/wizards/db/TableDescriptor.java | 9 -
wizards/com/sun/star/wizards/db/TypeInspector.java | 2
wizards/com/sun/star/wizards/document/Control.java | 1
wizards/com/sun/star/wizards/document/GridControl.java | 5
wizards/com/sun/star/wizards/form/CallFormWizard.java | 2
wizards/com/sun/star/wizards/form/DataEntrySetter.java | 8 -
wizards/com/sun/star/wizards/form/FormControlArranger.java | 12 -
wizards/com/sun/star/wizards/form/FormDocument.java | 9 -
wizards/com/sun/star/wizards/form/StyleApplier.java | 16 +-
wizards/com/sun/star/wizards/form/UIControlArranger.java | 20 +-
wizards/com/sun/star/wizards/query/CallQueryWizard.java | 2
wizards/com/sun/star/wizards/query/Finalizer.java | 10 -
wizards/com/sun/star/wizards/query/QuerySummary.java | 8 -
wizards/com/sun/star/wizards/query/QueryWizard.java | 4
wizards/com/sun/star/wizards/report/CallReportWizard.java | 2
wizards/com/sun/star/wizards/report/Dataimport.java | 4
wizards/com/sun/star/wizards/report/GroupFieldHandler.java | 2
wizards/com/sun/star/wizards/report/RecordTable.java | 1
wizards/com/sun/star/wizards/report/ReportFinalizer.java | 23 ---
wizards/com/sun/star/wizards/report/ReportImplementationHelper.java | 2
wizards/com/sun/star/wizards/report/ReportLayouter.java | 4
wizards/com/sun/star/wizards/report/ReportTextDocument.java | 4
wizards/com/sun/star/wizards/report/ReportTextImplementation.java | 2
wizards/com/sun/star/wizards/reportbuilder/ReportBuilderImplementation.java | 4
wizards/com/sun/star/wizards/reportbuilder/layout/DesignTemplate.java | 1
wizards/com/sun/star/wizards/reportbuilder/layout/ReportBuilderLayouter.java | 2
wizards/com/sun/star/wizards/table/CallTableWizard.java | 2
wizards/com/sun/star/wizards/table/FieldDescription.java | 2
wizards/com/sun/star/wizards/table/PrimaryKeyHandler.java | 24 +--
wizards/com/sun/star/wizards/table/ScenarioSelector.java | 19 +-
wizards/com/sun/star/wizards/text/TextDocument.java | 5
wizards/com/sun/star/wizards/text/TextFieldHandler.java | 2
wizards/com/sun/star/wizards/text/TextSectionHandler.java | 5
wizards/com/sun/star/wizards/text/TextStyleHandler.java | 2
wizards/com/sun/star/wizards/text/TextTableHandler.java | 1
wizards/com/sun/star/wizards/text/ViewHandler.java | 9 -
wizards/com/sun/star/wizards/ui/ButtonList.java | 4
wizards/com/sun/star/wizards/ui/CommandFieldSelection.java | 4
wizards/com/sun/star/wizards/ui/DocumentPreview.java | 8 -
wizards/com/sun/star/wizards/ui/FilterComponent.java | 22 +-
wizards/com/sun/star/wizards/ui/ImageList.java | 6
wizards/com/sun/star/wizards/ui/PeerConfig.java | 2
wizards/com/sun/star/wizards/ui/SortingComponent.java | 4
wizards/com/sun/star/wizards/ui/UnoDialog.java | 7
wizards/com/sun/star/wizards/ui/WizardDialog.java | 8 -
wizards/com/sun/star/wizards/ui/event/AbstractListener.java | 2
wizards/com/sun/star/wizards/ui/event/DataAware.java | 4
wizards/com/sun/star/wizards/ui/event/DataAwareFields.java | 8 -
wizards/com/sun/star/wizards/ui/event/ListModelBinder.java | 6
wizards/com/sun/star/wizards/ui/event/Task.java | 4
wizards/com/sun/star/wizards/ui/event/TaskEvent.java | 2
xmerge/source/xmerge/java/org/openoffice/xmerge/Convert.java | 6
xmerge/source/xmerge/java/org/openoffice/xmerge/ConvertData.java | 2
xmerge/source/xmerge/java/org/openoffice/xmerge/PluginFactory.java | 2
xmerge/source/xmerge/java/org/openoffice/xmerge/converter/palm/PdbEncoder.java | 4
xmerge/source/xmerge/java/org/openoffice/xmerge/converter/xml/OfficeZip.java | 2
xmerge/source/xmerge/java/org/openoffice/xmerge/converter/xml/ParaStyle.java | 4
xmerge/source/xmerge/java/org/openoffice/xmerge/converter/xml/StyleCatalog.java | 2
xmerge/source/xmerge/java/org/openoffice/xmerge/converter/xml/sxc/DocumentMergerImpl.java | 4
xmerge/source/xmerge/java/org/openoffice/xmerge/converter/xml/sxc/SxcDocumentDeserializer.java | 2
xmerge/source/xmerge/java/org/openoffice/xmerge/converter/xml/xslt/DocumentDeserializerImpl.java | 4
xmerge/source/xmerge/java/org/openoffice/xmerge/converter/xml/xslt/DocumentMergerImpl.java | 4
xmerge/source/xmerge/java/org/openoffice/xmerge/converter/xml/xslt/DocumentSerializerImpl.java | 6
xmerge/source/xmerge/java/org/openoffice/xmerge/merger/Difference.java | 6
xmerge/source/xmerge/java/org/openoffice/xmerge/merger/diff/CharacterParser.java | 4
xmerge/source/xmerge/java/org/openoffice/xmerge/merger/diff/NodeIterator.java | 4
xmerge/source/xmerge/java/org/openoffice/xmerge/merger/diff/TextNodeEntry.java | 6
xmerge/source/xmerge/java/org/openoffice/xmerge/merger/merge/DocumentMerge.java | 2
xmerge/source/xmerge/java/org/openoffice/xmerge/merger/merge/PositionBaseRowMerge.java | 2
xmerge/source/xmerge/java/org/openoffice/xmerge/test/Driver.java | 4
xmerge/source/xmerge/java/org/openoffice/xmerge/util/IntArrayList.java | 2
xmerge/source/xmerge/java/org/openoffice/xmerge/util/Resources.java | 2
xmerge/source/xmerge/java/org/openoffice/xmerge/util/registry/ConverterInfo.java | 18 +-
xmerge/source/xmerge/java/org/openoffice/xmerge/util/registry/ConverterInfoReader.java | 6
383 files changed, 951 insertions(+), 1063 deletions(-)
New commits:
commit f5d1368659fdead1ae7ff5dc625a8c0d56d4da9a
Author: Noel Grandin <noel at peralex.com>
Date: Tue Nov 18 12:05:53 2014 +0200
java, wizards: remove unused local variables and fields
Change-Id: I77dfcaae8950397e0f22c9a3e744e744055b6cf3
diff --git a/wizards/com/sun/star/wizards/common/Desktop.java b/wizards/com/sun/star/wizards/common/Desktop.java
index 665b23e..70ef5a7 100644
--- a/wizards/com/sun/star/wizards/common/Desktop.java
+++ b/wizards/com/sun/star/wizards/common/Desktop.java
@@ -93,7 +93,7 @@ public class Desktop
return UnoRuntime.queryInterface(XSpreadsheetDocument.class, xComponent);
}
- public static XDispatch getDispatcher(XMultiServiceFactory xMSF, XFrame xFrame, String _stargetframe, com.sun.star.util.URL oURL)
+ public static XDispatch getDispatcher(XFrame xFrame, String _stargetframe, com.sun.star.util.URL oURL)
{
try
{
@@ -131,7 +131,7 @@ public class Desktop
public static void dispatchURL(XMultiServiceFactory xMSF, String sURL, XFrame xFrame, String _stargetframe)
{
com.sun.star.util.URL oURL = getDispatchURL(xMSF, sURL);
- XDispatch xDispatch = getDispatcher(xMSF, xFrame, _stargetframe, oURL);
+ XDispatch xDispatch = getDispatcher(xFrame, _stargetframe, oURL);
dispatchURL(xDispatch, oURL);
}
diff --git a/wizards/com/sun/star/wizards/common/FileAccess.java b/wizards/com/sun/star/wizards/common/FileAccess.java
index 6935c1f..3afc8ec 100644
--- a/wizards/com/sun/star/wizards/common/FileAccess.java
+++ b/wizards/com/sun/star/wizards/common/FileAccess.java
@@ -54,8 +54,7 @@ public class FileAccess
public static void addOfficePath(XMultiServiceFactory xMSF, String sPath, String sAddPath)
{
- XSimpleFileAccess xSimpleFileAccess = null;
- String ResultPath = getOfficePath(xMSF, sPath, xSimpleFileAccess);
+ String ResultPath = getOfficePath(xMSF, sPath);
// As there are several conventions about the look of Url (e.g. with " " or with "%20") you cannot make a
// simple String comparison to find out, if a path is already in "ResultPath"
String[] PathList = JavaTools.ArrayoutofString(ResultPath, PropertyNames.SEMI_COLON);
@@ -92,7 +91,7 @@ public class FileAccess
* chapter 6.2.7
* @return the respective path of the office application. A probable following "/" at the end is trimmed.
*/
- public static String getOfficePath(XMultiServiceFactory xMSF, String sPath, XSimpleFileAccess xSimpleFileAccess)
+ public static String getOfficePath(XMultiServiceFactory xMSF, String sPath)
{
try
{
@@ -187,7 +186,7 @@ public class FileAccess
return ResultPath;
}
- public static ArrayList<String> getOfficePaths(XMultiServiceFactory xMSF, String _sPath, String sType, String sSearchDir)
+ public static ArrayList<String> getOfficePaths(XMultiServiceFactory xMSF, String _sPath)
{
//This method currently only works with sPath="Template"
@@ -366,7 +365,7 @@ public class FileAccess
String sNoDirCreation = PropertyNames.EMPTY_STRING;
try
{
- Resource oResource = new Resource(xMSF, "ImportWizard", "imp");
+ Resource oResource = new Resource(xMSF, "imp");
sNoDirCreation = oResource.getResText(1050);
String sMsgDirNotThere = oResource.getResText(1051);
String sQueryForNewCreation = oResource.getResText(1052);
@@ -416,7 +415,7 @@ public class FileAccess
{
if (xSimpleFileAccess.exists(Path))
{
- Resource oResource = new Resource(xMSF, "ImportWizard", "imp");
+ Resource oResource = new Resource(xMSF, "imp");
String sFileexists = oResource.getResText(1053);
String NewString = JavaTools.convertfromURLNotation(Path);
sFileexists = JavaTools.replaceSubString(sFileexists, NewString, "<1>");
diff --git a/wizards/com/sun/star/wizards/common/Helper.java b/wizards/com/sun/star/wizards/common/Helper.java
index 9d6b79a..556d750 100644
--- a/wizards/com/sun/star/wizards/common/Helper.java
+++ b/wizards/com/sun/star/wizards/common/Helper.java
@@ -21,7 +21,6 @@ import com.sun.star.uno.XComponentContext;
import com.sun.star.util.XMacroExpander;
import java.util.Calendar;
-import com.sun.star.beans.Property;
import com.sun.star.beans.PropertyValue;
import com.sun.star.beans.XPropertySet;
import com.sun.star.lang.Locale;
@@ -56,7 +55,6 @@ public class Helper
}
else
{
- Property[] selementnames = xPSet.getPropertySetInfo().getProperties();
throw new java.lang.IllegalArgumentException("No Such Property: '" + PropertyName + "'");
}
}
diff --git a/wizards/com/sun/star/wizards/common/Resource.java b/wizards/com/sun/star/wizards/common/Resource.java
index 657e750..c54cb3f 100644
--- a/wizards/com/sun/star/wizards/common/Resource.java
+++ b/wizards/com/sun/star/wizards/common/Resource.java
@@ -35,7 +35,7 @@ public class Resource
/** Creates a new instance of Resource
*/
- public Resource(XMultiServiceFactory _xMSF, String _Unit /* unused */, String _Module)
+ public Resource(XMultiServiceFactory _xMSF, String _Module)
{
this.xMSF = _xMSF;
this.Module = _Module;
diff --git a/wizards/com/sun/star/wizards/common/SystemDialog.java b/wizards/com/sun/star/wizards/common/SystemDialog.java
index 62ebeb5..2486db8 100644
--- a/wizards/com/sun/star/wizards/common/SystemDialog.java
+++ b/wizards/com/sun/star/wizards/common/SystemDialog.java
@@ -279,7 +279,7 @@ public class SystemDialog
{
Resource oResource;
String ProductName = Configuration.getProductName(xMSF);
- oResource = new Resource(xMSF, ResName, ResPrefix);
+ oResource = new Resource(xMSF, ResPrefix);
String sErrorMessage = oResource.getResText(ResID);
sErrorMessage = JavaTools.replaceSubString(sErrorMessage, ProductName, "%PRODUCTNAME");
sErrorMessage = JavaTools.replaceSubString(sErrorMessage, String.valueOf((char) 13), "<BR>");
@@ -291,7 +291,7 @@ public class SystemDialog
{
Resource oResource;
String ProductName = Configuration.getProductName(xMSF);
- oResource = new Resource(xMSF, ResName, ResPrefix);
+ oResource = new Resource(xMSF, ResPrefix);
String sErrorMessage = oResource.getResText(ResID);
sErrorMessage = JavaTools.replaceSubString(sErrorMessage, ProductName, "%PRODUCTNAME");
sErrorMessage = JavaTools.replaceSubString(sErrorMessage, String.valueOf((char) 13), "<BR>");
diff --git a/wizards/com/sun/star/wizards/common/TerminateWizardException.java b/wizards/com/sun/star/wizards/common/TerminateWizardException.java
index 507836c..ba8e571 100644
--- a/wizards/com/sun/star/wizards/common/TerminateWizardException.java
+++ b/wizards/com/sun/star/wizards/common/TerminateWizardException.java
@@ -24,7 +24,7 @@ public class TerminateWizardException extends Exception
public TerminateWizardException(XMultiServiceFactory xMSF)
{
- Resource oResource = new Resource(xMSF, "AutoPilot", "dbw");
+ Resource oResource = new Resource(xMSF, "dbw");
String sErrorMessage = oResource.getResText(1006);
SystemDialog.showMessageBox(xMSF, "ErrorBox", com.sun.star.awt.VclWindowPeerAttribute.OK, sErrorMessage);
printStackTrace(System.out);
diff --git a/wizards/com/sun/star/wizards/common/UCB.java b/wizards/com/sun/star/wizards/common/UCB.java
index e7500a6..c73eee6 100644
--- a/wizards/com/sun/star/wizards/common/UCB.java
+++ b/wizards/com/sun/star/wizards/common/UCB.java
@@ -32,7 +32,6 @@ import com.sun.star.ucb.OpenCommandArgument2;
import com.sun.star.ucb.OpenMode;
import com.sun.star.ucb.TransferCommandOperation;
import com.sun.star.ucb.XCommandProcessor;
-import com.sun.star.ucb.XContentAccess;
import com.sun.star.ucb.XContentIdentifier;
import com.sun.star.ucb.XContentIdentifierFactory;
import com.sun.star.ucb.XContentProvider;
@@ -161,14 +160,9 @@ public class UCB
if (xResultSet.first())
{
- // obtain XContentAccess interface for child content access and XRow for properties
- XContentAccess xContentAccess = UnoRuntime.queryInterface(
- XContentAccess.class, xResultSet);
XRow xRow = UnoRuntime.queryInterface(XRow.class, xResultSet);
do
{
- // Obtain URL of child.
- String aId = xContentAccess.queryContentIdentifierString();
// First column: Title (column numbers are 1-based!)
String aTitle = xRow.getString(1);
if (aTitle.length() == 0 && xRow.wasNull())
diff --git a/wizards/com/sun/star/wizards/db/CommandMetaData.java b/wizards/com/sun/star/wizards/db/CommandMetaData.java
index 87e26b6..02929b9 100644
--- a/wizards/com/sun/star/wizards/db/CommandMetaData.java
+++ b/wizards/com/sun/star/wizards/db/CommandMetaData.java
@@ -305,7 +305,7 @@ public class CommandMetaData extends DBMetaData
{
exception.printStackTrace(System.err);
}
- Resource oResource = new Resource(xMSF, "Database", "dbw");
+ Resource oResource = new Resource(xMSF, "dbw");
String sMsgNoFieldsFromCommand = oResource.getResText(RID_DB_COMMON + 45);
sMsgNoFieldsFromCommand = JavaTools.replaceSubString(sMsgNoFieldsFromCommand, _commandname, "%NAME");
showMessageBox("ErrorBox", VclWindowPeerAttribute.OK, sMsgNoFieldsFromCommand);
diff --git a/wizards/com/sun/star/wizards/db/DBMetaData.java b/wizards/com/sun/star/wizards/db/DBMetaData.java
index a4c49c2..dc6b0fb 100644
--- a/wizards/com/sun/star/wizards/db/DBMetaData.java
+++ b/wizards/com/sun/star/wizards/db/DBMetaData.java
@@ -668,7 +668,7 @@ public class DBMetaData
private boolean getConnection(XDataSource _dataSource)
{
- Resource oResource = new Resource(xMSF, "Database", "dbw");
+ Resource oResource = new Resource(xMSF, "dbw");
try
{
int iMsg = 0;
@@ -1003,9 +1003,7 @@ public class DBMetaData
{
try
{
- XInterface xInterface = (XInterface) xMSF.createInstance("com.sun.star.ucb.SimpleFileAccess");
- XSimpleFileAccess xSimpleFileAccess = UnoRuntime.queryInterface( XSimpleFileAccess.class, xInterface );
- String storepath = FileAccess.getOfficePath(xMSF, "Temp", xSimpleFileAccess) + "/" + _storename;
+ String storepath = FileAccess.getOfficePath(xMSF, "Temp") + "/" + _storename;
XStorable xStoreable = UnoRuntime.queryInterface( XStorable.class, _xcomponent );
PropertyValue[] oStoreProperties = new PropertyValue[1];
oStoreProperties[0] = Properties.createProperty("FilterName", "writer8");
diff --git a/wizards/com/sun/star/wizards/db/RecordParser.java b/wizards/com/sun/star/wizards/db/RecordParser.java
index 0f83ef1..cbca3d0 100644
--- a/wizards/com/sun/star/wizards/db/RecordParser.java
+++ b/wizards/com/sun/star/wizards/db/RecordParser.java
@@ -191,7 +191,6 @@ public class RecordParser extends QueryMetaData
initializeFieldColumns(_sFieldNames, xColumns);
}
String[] AllQueryFieldNames = xColumns.getElementNames();
- String[] sFieldNames = getFieldNames();
for (int i = 0; i < FieldColumns.length; i++)
{
String sFieldName = FieldColumns[i].getFieldName();
diff --git a/wizards/com/sun/star/wizards/db/RelationController.java b/wizards/com/sun/star/wizards/db/RelationController.java
index d08a13a..a25b796 100644
--- a/wizards/com/sun/star/wizards/db/RelationController.java
+++ b/wizards/com/sun/star/wizards/db/RelationController.java
@@ -59,7 +59,6 @@ public class RelationController extends CommandName
};
try
{
- String[] sTableNames = super.getCommandMetaData().getTableNames();
ArrayList<String> aReferencedTableVector = new ArrayList<String>();
XResultSet xResultSet = super.getCommandMetaData().xDBMetaData.getExportedKeys((getCatalogName(this)), getSchemaName(), getTableName());
XRow xRow = UnoRuntime.queryInterface(XRow.class, xResultSet);
diff --git a/wizards/com/sun/star/wizards/db/SQLQueryComposer.java b/wizards/com/sun/star/wizards/db/SQLQueryComposer.java
index de25e25..897e4bc 100644
--- a/wizards/com/sun/star/wizards/db/SQLQueryComposer.java
+++ b/wizards/com/sun/star/wizards/db/SQLQueryComposer.java
@@ -21,7 +21,6 @@ package com.sun.star.wizards.db;
import com.sun.star.lang.XMultiServiceFactory;
import com.sun.star.beans.*;
import com.sun.star.container.XIndexAccess;
-import com.sun.star.container.XNameAccess;
import com.sun.star.sdbcx.XColumnsSupplier;
import com.sun.star.sdb.XSingleSelectQueryComposer;
import com.sun.star.sdb.XSingleSelectQueryAnalyzer;
@@ -229,8 +228,6 @@ public class SQLQueryComposer
private PropertyValue[][] replaceConditionsByAlias(PropertyValue _filterconditions[][])
{
- XColumnsSupplier columnSup = UnoRuntime.queryInterface(XColumnsSupplier.class, m_xQueryAnalyzer);
- XNameAccess columns = columnSup.getColumns();
for (int n = 0; n < _filterconditions.length; n++)
{
for (int m = 0; m < _filterconditions[n].length; m++)
diff --git a/wizards/com/sun/star/wizards/db/TableDescriptor.java b/wizards/com/sun/star/wizards/db/TableDescriptor.java
index 68b2e95..4b28e84 100644
--- a/wizards/com/sun/star/wizards/db/TableDescriptor.java
+++ b/wizards/com/sun/star/wizards/db/TableDescriptor.java
@@ -709,7 +709,6 @@ public class TableDescriptor extends CommandMetaData implements XContainerListen
{
ColumnDescriptor oColumnDescriptor = columncontainer.get(i);
XPropertySet xColPropertySet = getByName(oColumnDescriptor.Name);
- Property[] aProperties = xColPropertySet.getPropertySetInfo().getProperties();
int itype;
try
{
diff --git a/wizards/com/sun/star/wizards/document/Control.java b/wizards/com/sun/star/wizards/document/Control.java
index e07b784..e9b2695 100644
--- a/wizards/com/sun/star/wizards/document/Control.java
+++ b/wizards/com/sun/star/wizards/document/Control.java
@@ -276,7 +276,6 @@ public class Control extends Shape
double dblEffMax = 0;
if (xPropertySet.getPropertySetInfo().hasPropertyByName("EffectiveMax"))
{
- Object oValue = xPropertySet.getPropertyValue("EffectiveMax");
if (xPropertySet.getPropertyValue("EffectiveMax") != com.sun.star.uno.Any.VOID)
{
dblEffMax = AnyConverter.toDouble(xPropertySet.getPropertyValue("EffectiveMax"));
diff --git a/wizards/com/sun/star/wizards/document/GridControl.java b/wizards/com/sun/star/wizards/document/GridControl.java
index 5d25a74..ad11636 100644
--- a/wizards/com/sun/star/wizards/document/GridControl.java
+++ b/wizards/com/sun/star/wizards/document/GridControl.java
@@ -61,17 +61,16 @@ public class GridControl extends Shape
xGridColumnFactory = UnoRuntime.queryInterface( XGridColumnFactory.class, oGridModel );
xComponent = UnoRuntime.queryInterface( XComponent.class, oGridModel );
-// Helper.setUnoPropertyValue(oGridModel, PropertyNames.PROPERTY_NAME, _sname);
for (int i = 0; i < fieldcolumns.length; i++)
{
FieldColumn curfieldcolumn = fieldcolumns[i];
if (curfieldcolumn.getFieldType() == DataType.TIMESTAMP)
{
- TimeStampControl oControl = new TimeStampControl(new Resource(_xMSF, PropertyNames.EMPTY_STRING, "dbw"), this, curfieldcolumn);
+ new TimeStampControl(new Resource(_xMSF, "dbw"), this, curfieldcolumn);
}
else
{
- Control oControl = new DatabaseControl(this, curfieldcolumn);
+ new DatabaseControl(this, curfieldcolumn);
}
}
diff --git a/wizards/com/sun/star/wizards/form/FormControlArranger.java b/wizards/com/sun/star/wizards/form/FormControlArranger.java
index b2ac659..4e26134 100644
--- a/wizards/com/sun/star/wizards/form/FormControlArranger.java
+++ b/wizards/com/sun/star/wizards/form/FormControlArranger.java
@@ -597,7 +597,7 @@ public class FormControlArranger
{
if (nFieldType == DataType.TIMESTAMP)
{
- DBControlList[i] = new TimeStampControl(new Resource(xMSF, "FormWizard", "dbw"), oFormHandler, xFormName, sFieldName, aPoint);
+ DBControlList[i] = new TimeStampControl(new Resource(xMSF, "dbw"), oFormHandler, xFormName, sFieldName, aPoint);
}
else
{
diff --git a/wizards/com/sun/star/wizards/form/FormDocument.java b/wizards/com/sun/star/wizards/form/FormDocument.java
index 37b2063..9fe8752 100644
--- a/wizards/com/sun/star/wizards/form/FormDocument.java
+++ b/wizards/com/sun/star/wizards/form/FormDocument.java
@@ -46,7 +46,6 @@ public class FormDocument extends TextDocument
protected String[][] LinkFieldNames;
private FormHandler oFormHandler;
- private ViewHandler oViewHandler;
private XPropertySet xPropPageStyle;
private static final int SOFORMGAP = 2000;
private boolean bhasSubForm;
@@ -67,12 +66,12 @@ public class FormDocument extends TextDocument
{
oFormHandler = new FormHandler(xMSF, xTextDocument);
oFormHandler.setDrawObjectsCaptureMode(false);
- TextStyleHandler oTextStyleHandler = new TextStyleHandler(xMSFDoc, xTextDocument);
- oViewHandler = new ViewHandler(xMSFDoc, xTextDocument);
+ TextStyleHandler oTextStyleHandler = new TextStyleHandler(xTextDocument);
+ new ViewHandler(xTextDocument);
oMainFormDBMetaData = new CommandMetaData(xMSF);// , CharLocale);
oSubFormDBMetaData = new CommandMetaData(xMSF);// , CharLocale);
- ViewHandler oViewHandler = new ViewHandler(xMSF, xTextDocument);
- TextStyleHandler oTextStyleSupplier = new TextStyleHandler(xMSFDoc, xTextDocument);
+ ViewHandler oViewHandler = new ViewHandler(xTextDocument);
+ TextStyleHandler oTextStyleSupplier = new TextStyleHandler(xTextDocument);
Helper.setUnoPropertyValue(xTextDocument, "ApplyFormDesignMode", Boolean.FALSE);
oViewHandler.setViewSetting("ShowTableBoundaries", Boolean.FALSE);
oViewHandler.setViewSetting("ShowOnlineLayout", Boolean.TRUE);
diff --git a/wizards/com/sun/star/wizards/form/StyleApplier.java b/wizards/com/sun/star/wizards/form/StyleApplier.java
index 699d202..262fc4f 100644
--- a/wizards/com/sun/star/wizards/form/StyleApplier.java
+++ b/wizards/com/sun/star/wizards/form/StyleApplier.java
@@ -65,7 +65,7 @@ public class StyleApplier
this.curFormDocument = _curFormDocument;
xMSF = curFormDocument.xMSF;
- TextStyleHandler oTextStyleHandler = new TextStyleHandler(xMSF, curFormDocument.xTextDocument);
+ TextStyleHandler oTextStyleHandler = new TextStyleHandler(curFormDocument.xTextDocument);
xPageStylePropertySet = oTextStyleHandler.getStyleByName("PageStyles", "Standard");
short curtabindex = (short) (FormWizard.SOSTYLE_PAGE * 100);
Integer IStyleStep = Integer.valueOf(FormWizard.SOSTYLE_PAGE);
@@ -121,7 +121,7 @@ public class StyleApplier
UIConsts.INTEGERS[10], "HID:WIZARDS_HID_DLGFORM_CMD3DBORDER", s3DLook, 196, 53, Short.valueOf((short) 1), IStyleStep, Short.valueOf(curtabindex++), "1", 93
});
- XRadioButton optFlat = CurUnoDialog.insertRadioButton("otpFlat", SCHANGEBORDERTYPE, this,
+ CurUnoDialog.insertRadioButton("otpFlat", SCHANGEBORDERTYPE, this,
new String[]
{
PropertyNames.PROPERTY_HEIGHT, PropertyNames.PROPERTY_HELPURL, PropertyNames.PROPERTY_LABEL, PropertyNames.PROPERTY_POSITION_X, PropertyNames.PROPERTY_POSITION_Y, PropertyNames.PROPERTY_STEP, PropertyNames.PROPERTY_TABINDEX, "Tag", PropertyNames.PROPERTY_WIDTH
diff --git a/wizards/com/sun/star/wizards/query/QueryWizard.java b/wizards/com/sun/star/wizards/query/QueryWizard.java
index e109458..1e068af 100644
--- a/wizards/com/sun/star/wizards/query/QueryWizard.java
+++ b/wizards/com/sun/star/wizards/query/QueryWizard.java
@@ -231,7 +231,7 @@ public class QueryWizard extends DatabaseObjectWizard
m_DBCommandFieldSelectio.setAppendMode(true);
m_DBCommandFieldSelectio.addFieldSelectionListener(new FieldSelectionListener());
m_sortingComponent = new SortingComponent(this, SOSORTING_PAGE, 95, 27, 210, 40865);
- m_filterComponent = new FilterComponent(this, xMSF, SOFILTER_PAGE, 97, 27, 209, 3, m_DBMetaData, 40878);
+ m_filterComponent = new FilterComponent(this, xMSF, SOFILTER_PAGE, 97, 27, 3, m_DBMetaData, 40878);
m_filterComponent.addNumberFormats();
if (m_DBMetaData.xDBMetaData.supportsCoreSQLGrammar())
@@ -242,7 +242,7 @@ public class QueryWizard extends DatabaseObjectWizard
{
m_groupFieldSelection = new FieldSelection(this, SOGROUPSELECTION_PAGE, 95, 27, 210, 150, reslblFields, this.reslblGroupBy, 40915, false);
m_groupFieldSelection.addFieldSelectionListener(new FieldSelectionListener());
- m_groupFilterComponent = new FilterComponent(this, xMSF, SOGROUPFILTER_PAGE, 97, 27, 209, 3, m_DBMetaData, 40923);
+ m_groupFilterComponent = new FilterComponent(this, xMSF, SOGROUPFILTER_PAGE, 97, 27, 3, m_DBMetaData, 40923);
}
m_titlesComponent = new TitlesComponent(this, SOTITLES_PAGE, 97, 37, 207, 7, reslblFieldHeader, reslblAliasHeader, 40940);
m_finalizer = new Finalizer(this, m_DBMetaData);
diff --git a/wizards/com/sun/star/wizards/report/Dataimport.java b/wizards/com/sun/star/wizards/report/Dataimport.java
index cbb98ee..3eecd4c 100644
--- a/wizards/com/sun/star/wizards/report/Dataimport.java
+++ b/wizards/com/sun/star/wizards/report/Dataimport.java
@@ -64,7 +64,7 @@ public class Dataimport extends UnoDialog2 implements com.sun.star.awt.XActionLi
CurReportDocument.StopProcess();
}
- public void showProgressDisplay(XMultiServiceFactory xMSF, boolean bgetConnection)
+ public void showProgressDisplay(boolean bgetConnection)
{
try
{
@@ -166,7 +166,7 @@ public class Dataimport extends UnoDialog2 implements com.sun.star.awt.XActionLi
PropertyValue[] properties)
{
CurReportDocument = ReportTextImplementation.create( xMSF, i_documentUI, _textDocument, m_oResource );
- showProgressDisplay(xMSF, true);
+ showProgressDisplay(true);
importReportData(xMSF, this, CurReportDocument, properties);
}
}
diff --git a/wizards/com/sun/star/wizards/report/RecordTable.java b/wizards/com/sun/star/wizards/report/RecordTable.java
index 7b4cd1a..f0079b1 100644
--- a/wizards/com/sun/star/wizards/report/RecordTable.java
+++ b/wizards/com/sun/star/wizards/report/RecordTable.java
@@ -47,7 +47,6 @@ public class RecordTable
try
{
this.oTextTableHandler = _oTextTableHandler;
- String[] TableNames = oTextTableHandler.xTextTablesSupplier.getTextTables().getElementNames();
XNameAccess xAllTextTables = oTextTableHandler.xTextTablesSupplier.getTextTables();
if ((xAllTextTables.hasByName(ReportTextDocument.TBLRECORDSECTION)) || (xAllTextTables.hasByName(ReportTextDocument.COPYOFTBLRECORDSECTION)))
{
diff --git a/wizards/com/sun/star/wizards/report/ReportFinalizer.java b/wizards/com/sun/star/wizards/report/ReportFinalizer.java
index 415b7f5..4386d8a 100644
--- a/wizards/com/sun/star/wizards/report/ReportFinalizer.java
+++ b/wizards/com/sun/star/wizards/report/ReportFinalizer.java
@@ -16,10 +16,7 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
package com.sun.star.wizards.report;
-import com.sun.star.ucb.XSimpleFileAccess;
import com.sun.star.uno.Exception;
-import com.sun.star.uno.UnoRuntime;
-import com.sun.star.uno.XInterface;
import com.sun.star.wizards.common.*;
import com.sun.star.wizards.ui.*;
import com.sun.star.awt.VclWindowPeerAttribute;
@@ -52,7 +49,6 @@ public class ReportFinalizer
this.CurUnoDialog = _CurUnoDialog;
this.CurReportDocument = _CurReportDocument;
short curtabindex = (short) (ReportWizard.SOSTOREPAGE * 100);
- Desktop odesktop = new Desktop();
String sSaveAsTemplate = CurUnoDialog.m_oResource.getResText(UIConsts.RID_REPORT + 40);
String sUseTemplate = CurUnoDialog.m_oResource.getResText(UIConsts.RID_REPORT + 41);
@@ -188,20 +184,9 @@ public class ReportFinalizer
public String getStorePath()
{
- try
- {
- StoreName = getStoreName();
- String StorePath;
- XInterface xInterface = (XInterface) m_xMSF.createInstance("com.sun.star.ucb.SimpleFileAccess");
- XSimpleFileAccess xSimpleFileAccess = UnoRuntime.queryInterface(XSimpleFileAccess.class, xInterface);
- StorePath = FileAccess.getOfficePath(m_xMSF, "Temp", xSimpleFileAccess) + "/" + StoreName;
- return StorePath;
- }
- catch (Exception e)
- {
- e.printStackTrace(System.err);
- return PropertyNames.EMPTY_STRING;
- }
+ StoreName = getStoreName();
+ String StorePath = FileAccess.getOfficePath(m_xMSF, "Temp") + "/" + StoreName;
+ return StorePath;
}
public void changeReportTitle()
diff --git a/wizards/com/sun/star/wizards/report/ReportTextDocument.java b/wizards/com/sun/star/wizards/report/ReportTextDocument.java
index c761d24..7582da8 100644
--- a/wizards/com/sun/star/wizards/report/ReportTextDocument.java
+++ b/wizards/com/sun/star/wizards/report/ReportTextDocument.java
@@ -92,8 +92,8 @@ class ReportTextDocument extends com.sun.star.wizards.text.TextDocument implemen
oTextTableHandler = new TextTableHandler(xMSFDoc, xTextDocument);
oTextSectionHandler = new TextSectionHandler(xMSFDoc, xTextDocument);
oFormHandler = new FormHandler(xMSFDoc, xTextDocument);
- oTextStyleHandler = new TextStyleHandler(xMSFDoc, xTextDocument);
- oViewHandler = new ViewHandler(xMSFDoc, xTextDocument);
+ oTextStyleHandler = new TextStyleHandler(xTextDocument);
+ oViewHandler = new ViewHandler(xTextDocument);
oTextFieldHandler = new TextFieldHandler(xMSFDoc, xTextDocument);
DBColumnsVector = new java.util.ArrayList<DBColumn>();
oNumberFormatter = oTextTableHandler.getNumberFormatter();
diff --git a/wizards/com/sun/star/wizards/report/ReportTextImplementation.java b/wizards/com/sun/star/wizards/report/ReportTextImplementation.java
index da043ee..8ccf7a6 100644
--- a/wizards/com/sun/star/wizards/report/ReportTextImplementation.java
+++ b/wizards/com/sun/star/wizards/report/ReportTextImplementation.java
@@ -600,7 +600,7 @@ public class ReportTextImplementation extends ReportImplementationHelper impleme
// Check general availability of office paths
try
{
- m_aReportPath = FileAccess.getOfficePaths(getMSF(), "Template", "share", "/wizard");
+ m_aReportPath = FileAccess.getOfficePaths(getMSF(), "Template");
FileAccess.combinePaths(getMSF(), m_aReportPath, "/wizard/report");
}
catch (Exception e)
diff --git a/wizards/com/sun/star/wizards/reportbuilder/ReportBuilderImplementation.java b/wizards/com/sun/star/wizards/reportbuilder/ReportBuilderImplementation.java
index e3e2520..42c15d4 100644
--- a/wizards/com/sun/star/wizards/reportbuilder/ReportBuilderImplementation.java
+++ b/wizards/com/sun/star/wizards/reportbuilder/ReportBuilderImplementation.java
@@ -504,7 +504,7 @@ public class ReportBuilderImplementation extends ReportImplementationHelper
if (m_aReportPath == null)
{
// Check general availability of office paths
- m_aReportPath = FileAccess.getOfficePaths(getMSF(), "Template", "share", "/wizard");
+ m_aReportPath = FileAccess.getOfficePaths(getMSF(), "Template");
FileAccess.combinePaths(getMSF(), m_aReportPath, "/wizard/report");
}
return m_aReportPath;
@@ -631,7 +631,7 @@ public class ReportBuilderImplementation extends ReportImplementationHelper
try
{
// TODO: check different languages in header layouts
- ArrayList<String> aReportPath = FileAccess.getOfficePaths(getMSF(), "Template", "share", "/wizard");
+ ArrayList<String> aReportPath = FileAccess.getOfficePaths(getMSF(), "Template");
FileAccess.combinePaths(getMSF(), aReportPath, "/wizard/report");
LayoutFiles = FileAccess.getFolderTitles(getMSF(), null, aReportPath, ".otr");
diff --git a/wizards/com/sun/star/wizards/reportbuilder/layout/DesignTemplate.java b/wizards/com/sun/star/wizards/reportbuilder/layout/DesignTemplate.java
index 02548d0..32a0f07 100644
--- a/wizards/com/sun/star/wizards/reportbuilder/layout/DesignTemplate.java
+++ b/wizards/com/sun/star/wizards/reportbuilder/layout/DesignTemplate.java
@@ -225,7 +225,6 @@ public class DesignTemplate
m_aGroupTextField[nGroup] = SectionTextField.create(aFormattedField);
}
}
- int dummy = 0;
}
catch (com.sun.star.lang.IndexOutOfBoundsException ex)
{
diff --git a/wizards/com/sun/star/wizards/table/ScenarioSelector.java b/wizards/com/sun/star/wizards/table/ScenarioSelector.java
index 3d13ad9..dd39e3e 100644
--- a/wizards/com/sun/star/wizards/table/ScenarioSelector.java
+++ b/wizards/com/sun/star/wizards/table/ScenarioSelector.java
@@ -20,7 +20,6 @@ package com.sun.star.wizards.table;
import java.util.ArrayList;
import com.sun.star.awt.ItemEvent;
-import com.sun.star.awt.XFixedText;
import com.sun.star.awt.XItemListener;
import com.sun.star.awt.XListBox;
import com.sun.star.awt.XRadioButton;
diff --git a/wizards/com/sun/star/wizards/text/TextDocument.java b/wizards/com/sun/star/wizards/text/TextDocument.java
index e836a81..43b2a56 100644
--- a/wizards/com/sun/star/wizards/text/TextDocument.java
+++ b/wizards/com/sun/star/wizards/text/TextDocument.java
@@ -266,7 +266,7 @@ public class TextDocument
DocSize = getPageSize();
xMSFDoc = UnoRuntime.queryInterface(XMultiServiceFactory.class, xTextDocument);
- ViewHandler myViewHandler = new ViewHandler(xMSFDoc, xTextDocument);
+ ViewHandler myViewHandler = new ViewHandler(xTextDocument);
try
{
myViewHandler.setViewSetting("ZoomType", Short.valueOf(com.sun.star.view.DocumentZoomType.ENTIRE_PAGE));
@@ -307,7 +307,6 @@ public class TextDocument
public TextDocument(XMultiServiceFactory xMSF, String URL, PropertyValue[] xArgs, XTerminateListener listener)
{
this.xMSF = xMSF;
- XDesktop xDesktop = Desktop.getDesktop(xMSF);
xFrame = OfficeDocument.createNewFrame(xMSF, listener);
Object oDoc = OfficeDocument.load(xFrame, URL, "_self", xArgs);
diff --git a/wizards/com/sun/star/wizards/text/TextSectionHandler.java b/wizards/com/sun/star/wizards/text/TextSectionHandler.java
index d8bc579..dfc3485 100644
--- a/wizards/com/sun/star/wizards/text/TextSectionHandler.java
+++ b/wizards/com/sun/star/wizards/text/TextSectionHandler.java
@@ -133,7 +133,6 @@ public class TextSectionHandler
for (int i = TextSectionCount - 1; i >= 0; i--)
{
XTextContent xTextContentTextSection = UnoRuntime.queryInterface(XTextContent.class, xAllTextSections.getByIndex(i));
- XPropertySet xTextSectionPropertySet = UnoRuntime.queryInterface(XPropertySet.class, xTextContentTextSection);
xText.removeTextContent(xTextContentTextSection);
}
}
diff --git a/wizards/com/sun/star/wizards/text/TextStyleHandler.java b/wizards/com/sun/star/wizards/text/TextStyleHandler.java
index 58e8584..c36bdc6 100644
--- a/wizards/com/sun/star/wizards/text/TextStyleHandler.java
+++ b/wizards/com/sun/star/wizards/text/TextStyleHandler.java
@@ -34,7 +34,7 @@ public class TextStyleHandler
public XStyleFamiliesSupplier xStyleFamiliesSupplier;
/** Creates a new instance of TextStyleHandler */
- public TextStyleHandler(com.sun.star.lang.XMultiServiceFactory xMSF, XTextDocument xTextDocument)
+ public TextStyleHandler(XTextDocument xTextDocument)
{
xStyleFamiliesSupplier = UnoRuntime.queryInterface(XStyleFamiliesSupplier.class, xTextDocument);
}
diff --git a/wizards/com/sun/star/wizards/text/TextTableHandler.java b/wizards/com/sun/star/wizards/text/TextTableHandler.java
index 112dd44..1be1e67 100644
--- a/wizards/com/sun/star/wizards/text/TextTableHandler.java
+++ b/wizards/com/sun/star/wizards/text/TextTableHandler.java
@@ -207,7 +207,6 @@ public class TextTableHandler
public static BreakType resetBreakTypeofTextTable(Object oTextTable)
{
- BreakType BreakValue = (BreakType) com.sun.star.wizards.common.Helper.getUnoStructValue(oTextTable, "BreakType");
Helper.setUnoPropertyValue(oTextTable, "BreakType", BreakType.NONE);
return BreakType.NONE;
}
diff --git a/wizards/com/sun/star/wizards/text/ViewHandler.java b/wizards/com/sun/star/wizards/text/ViewHandler.java
index 11134f1..fc78429 100644
--- a/wizards/com/sun/star/wizards/text/ViewHandler.java
+++ b/wizards/com/sun/star/wizards/text/ViewHandler.java
@@ -23,7 +23,6 @@ import com.sun.star.container.XIndexAccess;
import com.sun.star.container.XNameAccess;
import com.sun.star.lang.IllegalArgumentException;
import com.sun.star.lang.WrappedTargetException;
-import com.sun.star.lang.XMultiServiceFactory;
import com.sun.star.style.XStyleFamiliesSupplier;
import com.sun.star.text.XPageCursor;
import com.sun.star.text.XTextContent;
@@ -44,7 +43,7 @@ public class ViewHandler
private final XViewSettingsSupplier xViewSettingsSupplier;
/** Creates a new instance of View */
- public ViewHandler(XMultiServiceFactory xMSF, XTextDocument xTextDocument)
+ public ViewHandler(XTextDocument xTextDocument)
{
xTextViewCursorSupplier = UnoRuntime.queryInterface(XTextViewCursorSupplier.class, xTextDocument.getCurrentController());
xViewSettingsSupplier = UnoRuntime.queryInterface(XViewSettingsSupplier.class, xTextDocument.getCurrentController());
diff --git a/wizards/com/sun/star/wizards/ui/DocumentPreview.java b/wizards/com/sun/star/wizards/ui/DocumentPreview.java
index d989b10..4d7cfeb 100644
--- a/wizards/com/sun/star/wizards/ui/DocumentPreview.java
+++ b/wizards/com/sun/star/wizards/ui/DocumentPreview.java
@@ -37,10 +37,6 @@ public class DocumentPreview
* The frame service which is used to show the preview
*/
private XFrame xFrame;
- /**
- * The content component of the frame.
- */
- private XComponent xComponent;
private final XControl xControl;
private PropertyValue[] loadArgs;
private String url;
@@ -78,7 +74,7 @@ public class DocumentPreview
loadArgs = lArgs;
XComponentLoader xCompLoader = UnoRuntime.queryInterface(XComponentLoader.class, xFrame);
xFrame.activate();
- return xComponent = xCompLoader.loadComponentFromURL(url, "_self", 0, loadArgs);
+ return xCompLoader.loadComponentFromURL(url, "_self", 0, loadArgs);
}
public void reload(XMultiServiceFactory xmsf) throws com.sun.star.lang.IllegalArgumentException, IOException, CloseVetoException, com.sun.star.uno.Exception
diff --git a/wizards/com/sun/star/wizards/ui/FilterComponent.java b/wizards/com/sun/star/wizards/ui/FilterComponent.java
index 155a0c1..52b4f56 100644
--- a/wizards/com/sun/star/wizards/ui/FilterComponent.java
+++ b/wizards/com/sun/star/wizards/ui/FilterComponent.java
@@ -374,7 +374,7 @@ public class FilterComponent
/** Creates a new instance of FilterComponent
*/
- public FilterComponent(WizardDialog CurUnoDialog, XMultiServiceFactory _xMSF, int iStep, int iPosX, int iPosY, int iWidth, int FilterCount, QueryMetaData _oQueryMetaData, int _firstHelpID)
+ public FilterComponent(WizardDialog CurUnoDialog, XMultiServiceFactory _xMSF, int iStep, int iPosX, int iPosY, int FilterCount, QueryMetaData _oQueryMetaData, int _firstHelpID)
{
this.curHelpID = _firstHelpID;
this.xMSF = _xMSF;
diff --git a/wizards/com/sun/star/wizards/ui/SortingComponent.java b/wizards/com/sun/star/wizards/ui/SortingComponent.java
index 1d8c3c5..7f9d476 100644
--- a/wizards/com/sun/star/wizards/ui/SortingComponent.java
+++ b/wizards/com/sun/star/wizards/ui/SortingComponent.java
@@ -105,7 +105,7 @@ public class SortingComponent
}); //Short.valueOf((short) (17+i*4))
HIDString = HelpIds.getHelpIdString(FirstHelpIndex + 1);
- XRadioButton xRadioButtonAsc = CurUnoDialog.insertRadioButton("optAscend" + Integer.toString(i + 1), 0, new String[]
+ CurUnoDialog.insertRadioButton("optAscend" + Integer.toString(i + 1), 0, new String[]
{
PropertyNames.PROPERTY_ENABLED, PropertyNames.PROPERTY_HEIGHT, PropertyNames.PROPERTY_HELPURL, PropertyNames.PROPERTY_LABEL, PropertyNames.PROPERTY_POSITION_X, PropertyNames.PROPERTY_POSITION_Y, PropertyNames.PROPERTY_STATE, PropertyNames.PROPERTY_STEP, PropertyNames.PROPERTY_TABINDEX, "Tag", PropertyNames.PROPERTY_WIDTH
}, new Object[]
@@ -114,7 +114,7 @@ public class SortingComponent
}); //, Short.valueOf((short) (18+i*4))
HIDString = HelpIds.getHelpIdString(FirstHelpIndex + 2);
- XRadioButton xRadioButtonDesc = CurUnoDialog.insertRadioButton("optDescend" + Integer.toString(i + 1), 0, new String[]
+ CurUnoDialog.insertRadioButton("optDescend" + Integer.toString(i + 1), 0, new String[]
{
PropertyNames.PROPERTY_ENABLED, PropertyNames.PROPERTY_HEIGHT, PropertyNames.PROPERTY_HELPURL, PropertyNames.PROPERTY_LABEL, PropertyNames.PROPERTY_POSITION_X, PropertyNames.PROPERTY_POSITION_Y, PropertyNames.PROPERTY_STATE, PropertyNames.PROPERTY_STEP, PropertyNames.PROPERTY_TABINDEX, "Tag", PropertyNames.PROPERTY_WIDTH
}, new Object[]
diff --git a/wizards/com/sun/star/wizards/ui/UnoDialog.java b/wizards/com/sun/star/wizards/ui/UnoDialog.java
index 1f53e45..6ba5822 100644
--- a/wizards/com/sun/star/wizards/ui/UnoDialog.java
+++ b/wizards/com/sun/star/wizards/ui/UnoDialog.java
@@ -504,7 +504,7 @@ public class UnoDialog implements EventNames
/**
* The problem with setting the visibility of controls is that changing the current step
* of a dialog will automatically make all controls visible. The PropertyNames.PROPERTY_STEP property always wins against
- * the property "visible". Therfor a control meant to be invisible is placed on a step far far away.
+ * the property "visible". Therefore a control meant to be invisible is placed on a step far far away.
* Afterwards the step property of the dialog has to be set with "repaintDialogStep". As the performance
* of that method is very bad it should be used only once for all controls
* @param controlname the name of the control
@@ -514,7 +514,6 @@ public class UnoDialog implements EventNames
{
try
{
- int iCurControlStep = AnyConverter.toInt(getControlProperty(controlname, PropertyNames.PROPERTY_STEP));
int iCurDialogStep = AnyConverter.toInt(Helper.getUnoPropertyValue(this.xDialogModel, PropertyNames.PROPERTY_STEP));
if (bIsVisible)
{
@@ -664,7 +663,6 @@ public class UnoDialog implements EventNames
{
createWindowPeer();
}
- XVclWindowPeer xVclWindowPeer = UnoRuntime.queryInterface(XVclWindowPeer.class, xWindowPeer);
xDialog = UnoRuntime.queryInterface(XDialog.class, xUnoDialog);
this.xWindow.setVisible(true);
}
@@ -884,7 +882,6 @@ public class UnoDialog implements EventNames
*/
public static String getDisplayProperty(Object oControlModel)
{
- XServiceInfo xServiceInfo = UnoRuntime.queryInterface(XServiceInfo.class, oControlModel);
int itype = getControlModelType(oControlModel);
return getDisplayProperty(itype);
}
@@ -938,7 +935,7 @@ public class UnoDialog implements EventNames
public void addResourceHandler(String _Unit, String _Module)
{
- m_oResource = new Resource(xMSF, _Unit, _Module);
+ m_oResource = new Resource(xMSF, _Module);
}
public static short setInitialTabindex(int _istep)
diff --git a/wizards/com/sun/star/wizards/ui/WizardDialog.java b/wizards/com/sun/star/wizards/ui/WizardDialog.java
index 81d05e7..abc1522 100644
--- a/wizards/com/sun/star/wizards/ui/WizardDialog.java
+++ b/wizards/com/sun/star/wizards/ui/WizardDialog.java
@@ -78,7 +78,7 @@ public abstract class WizardDialog extends UnoDialog2 implements VetoableChangeL
{
super(xMSF);
hid = hid_;
- oWizardResource = new Resource(xMSF, "Common", "dbw");
+ oWizardResource = new Resource(xMSF, "dbw");
sMsgEndAutopilot = oWizardResource.getResText(UIConsts.RID_DB_COMMON + 33);
}
commit a3a57bebcd761a0c0910e482ffdc4a3f11cbcde5
Author: Noel Grandin <noel at peralex.com>
Date: Tue Nov 18 11:46:50 2014 +0200
java: fix some raw types warnings
Change-Id: I0e00739ac36ccc8704ad3c4e4adfa377a6b01f43
diff --git a/bean/test/applet/oooapplet/OOoViewer.java b/bean/test/applet/oooapplet/OOoViewer.java
index f2571ba..933df3c 100644
--- a/bean/test/applet/oooapplet/OOoViewer.java
+++ b/bean/test/applet/oooapplet/OOoViewer.java
@@ -132,7 +132,7 @@ final class CustomURLClassLoader extends URLClassLoader {
}
@Override
- protected Class findClass( String name ) throws ClassNotFoundException {
+ protected Class<?> findClass( String name ) throws ClassNotFoundException {
// This is only called via this.loadClass -> super.loadClass ->
// this.findClass, after this.loadClass has already called
// super.findClass, so no need to call super.findClass again:
@@ -142,7 +142,7 @@ final class CustomURLClassLoader extends URLClassLoader {
@Override
- protected Class loadClass( String name, boolean resolve )
+ protected Class<?> loadClass( String name, boolean resolve )
throws ClassNotFoundException
{
Class c = findLoadedClass( name );
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 d3a7425..732d30b 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
@@ -150,7 +150,7 @@ public final class JNI_proxy implements java.lang.reflect.InvocationHandler
Object proxy, java.lang.reflect.Method method, Object args [] )
throws Throwable
{
- Class decl_class = method.getDeclaringClass();
+ Class<?> decl_class = method.getDeclaringClass();
String method_name = method.getName();
if (Object.class.equals( decl_class ))
diff --git a/odk/source/com/sun/star/lib/loader/Loader.java b/odk/source/com/sun/star/lib/loader/Loader.java
index 908e3f0..4982bf3 100644
--- a/odk/source/com/sun/star/lib/loader/Loader.java
+++ b/odk/source/com/sun/star/lib/loader/Loader.java
@@ -299,7 +299,7 @@ public final class Loader {
}
@Override
- protected Class findClass( String name ) throws ClassNotFoundException {
+ protected Class<?> findClass( String name ) throws ClassNotFoundException {
// This is only called via this.loadClass -> super.loadClass ->
// this.findClass, after this.loadClass has already called
// super.findClass, so no need to call super.findClass again:
@@ -307,7 +307,7 @@ public final class Loader {
}
@Override
- protected Class loadClass( String name, boolean resolve )
+ protected Class<?> loadClass( String name, boolean resolve )
throws ClassNotFoundException
{
Class c = findLoadedClass( name );
commit b2196c1426af30855e7ff124351d4026ae33367c
Author: Noel Grandin <noel at peralex.com>
Date: Tue Nov 18 11:37:35 2014 +0200
java: remove some unnecessary casts
Change-Id: I30f316ee87bd8fe4bc56f6e928fb36d3ab0c8e94
diff --git a/javaunohelper/test/com/sun/star/lib/uno/helper/PropertySet_Test.java b/javaunohelper/test/com/sun/star/lib/uno/helper/PropertySet_Test.java
index 62ccaa4..f074694 100644
--- a/javaunohelper/test/com/sun/star/lib/uno/helper/PropertySet_Test.java
+++ b/javaunohelper/test/com/sun/star/lib/uno/helper/PropertySet_Test.java
@@ -74,47 +74,47 @@ public class PropertySet_Test
value= Boolean.TRUE;
cl.setPropertyValue("PropBoolA", value);
- assertEquals((Boolean) cl.getPropertyValue("PropBoolA"), value);
+ assertEquals(cl.getPropertyValue("PropBoolA"), value);
value= new Character('A');
cl.setPropertyValue("PropCharA",value);
- assertEquals((Character) cl.getPropertyValue("PropCharA"), value);
+ assertEquals(cl.getPropertyValue("PropCharA"), value);
value= Byte.valueOf((byte) 111);
cl.setPropertyValue("PropByteA",value);
- assertEquals((Byte) cl.getPropertyValue("PropByteA"), value);
+ assertEquals(cl.getPropertyValue("PropByteA"), value);
value= Short.valueOf((short)112);
cl.setPropertyValue("PropShortA", value);
- assertEquals((Short) cl.getPropertyValue("PropShortA"), value);
+ assertEquals(cl.getPropertyValue("PropShortA"), value);
value= Integer.valueOf(113);
cl.setPropertyValue("PropIntA", value);
- assertEquals((Integer) cl.getPropertyValue("PropIntA"), value);
+ assertEquals(cl.getPropertyValue("PropIntA"), value);
value= Long.valueOf(115);
cl.setPropertyValue("PropLongA", value);
- assertEquals((Long) cl.getPropertyValue("PropLongA"), value);
+ assertEquals(cl.getPropertyValue("PropLongA"), value);
value= new Float(3.14);
cl.setPropertyValue("PropFloatA", value);
- assertEquals((Float) cl.getPropertyValue("PropFloatA"), value);
+ assertEquals(cl.getPropertyValue("PropFloatA"), value);
value= new Double(3.145);
cl.setPropertyValue("PropDoubleA",value);
- assertEquals((Double) cl.getPropertyValue("PropDoubleA"), value);
+ assertEquals(cl.getPropertyValue("PropDoubleA"), value);
value= "string";
cl.setPropertyValue("PropStringA",value);
- assertEquals((String) cl.getPropertyValue("PropStringA"), value);
+ assertEquals(cl.getPropertyValue("PropStringA"), value);
value= new ComponentBase();
cl.setPropertyValue("PropXInterfaceA",value);
- assertEquals((XInterface) cl.getPropertyValue("PropXInterfaceA"), value);
+ assertEquals(cl.getPropertyValue("PropXInterfaceA"), value);
value= new ComponentBase();
cl.setPropertyValue("PropXWeakA",value);
- assertEquals((XWeak) cl.getPropertyValue("PropXWeakA"), value);
+ assertEquals(cl.getPropertyValue("PropXWeakA"), value);
value = com.sun.star.beans.PropertyState.AMBIGUOUS_VALUE;
cl.setPropertyValue("PropEnum",value);
@@ -122,19 +122,19 @@ public class PropertySet_Test
value= new byte[]{1,2,3};
cl.setPropertyValue("PropArrayByteA", value);
- assertEquals((byte[]) cl.getPropertyValue("PropArrayByteA"), value);
+ assertEquals(cl.getPropertyValue("PropArrayByteA"), value);
value= new Type(String.class);
cl.setPropertyValue("PropTypeA", value);
- assertEquals((Type) cl.getPropertyValue("PropTypeA"), value);
+ assertEquals(cl.getPropertyValue("PropTypeA"), value);
// test protected,package,private members
value= Boolean.TRUE;
cl.setPropertyValue("PropBoolB", value);
- assertEquals((Boolean) cl.getPropertyValue("PropBoolB"), value);
+ assertEquals(cl.getPropertyValue("PropBoolB"), value);
cl.setPropertyValue("PropBoolC", value);
- assertEquals((Boolean) cl.getPropertyValue("PropBoolC"), value);
+ assertEquals(cl.getPropertyValue("PropBoolC"), value);
try {
cl.setPropertyValue("PropBoolD", value);
@@ -147,55 +147,55 @@ public class PropertySet_Test
value= Boolean.TRUE;
cl.setPropertyValue("PropObjectA", value);
- assertEquals((Boolean) cl.getPropertyValue("PropObjectA"), value);
+ assertEquals(cl.getPropertyValue("PropObjectA"), value);
value= new Character('A');
cl.setPropertyValue("PropObjectA",value);
- assertEquals((Character) cl.getPropertyValue("PropObjectA"), value);
+ assertEquals(cl.getPropertyValue("PropObjectA"), value);
value= Byte.valueOf((byte) 111);
cl.setPropertyValue("PropObjectA",value);
- assertEquals((Byte) cl.getPropertyValue("PropObjectA"), value);
+ assertEquals(cl.getPropertyValue("PropObjectA"), value);
value= Short.valueOf((short)112);
cl.setPropertyValue("PropObjectA", value);
- assertEquals((Short) cl.getPropertyValue("PropObjectA"), value);
+ assertEquals(cl.getPropertyValue("PropObjectA"), value);
value= Integer.valueOf(113);
cl.setPropertyValue("PropObjectA", value);
- assertEquals((Integer) cl.getPropertyValue("PropObjectA"), value);
+ assertEquals(cl.getPropertyValue("PropObjectA"), value);
value= Long.valueOf(115);
cl.setPropertyValue("PropObjectA", value);
- assertEquals((Long) cl.getPropertyValue("PropObjectA"), value);
+ assertEquals(cl.getPropertyValue("PropObjectA"), value);
value= new Float(3.14);
cl.setPropertyValue("PropObjectA", value);
- assertEquals((Float) cl.getPropertyValue("PropObjectA"), value);
+ assertEquals(cl.getPropertyValue("PropObjectA"), value);
value= new Double(3.145);
cl.setPropertyValue("PropObjectA",value);
- assertEquals((Double) cl.getPropertyValue("PropObjectA"), value);
+ assertEquals(cl.getPropertyValue("PropObjectA"), value);
value= "string";
cl.setPropertyValue("PropObjectA",value);
- assertEquals((String) cl.getPropertyValue("PropObjectA"), value);
+ assertEquals(cl.getPropertyValue("PropObjectA"), value);
value= new ComponentBase();
cl.setPropertyValue("PropObjectA",value);
- assertEquals((XInterface) cl.getPropertyValue("PropObjectA"), value);
+ assertEquals(cl.getPropertyValue("PropObjectA"), value);
value= new ComponentBase();
cl.setPropertyValue("PropObjectA",value);
- assertEquals((XWeak) cl.getPropertyValue("PropObjectA"), value);
+ assertEquals(cl.getPropertyValue("PropObjectA"), value);
value= new byte[]{1,2,3};
cl.setPropertyValue("PropObjectA", value);
- assertEquals((byte[]) cl.getPropertyValue("PropObjectA"), value);
+ assertEquals(cl.getPropertyValue("PropObjectA"), value);
value= new Type(String.class);
cl.setPropertyValue("PropObjectA", value);
- assertEquals((Type) cl.getPropertyValue("PropObjectA"), value);
+ assertEquals(cl.getPropertyValue("PropObjectA"), value);
cl.setPropertyValue("PropObjectA", new Any( new Type(byte.class), Byte.valueOf((byte)1)));
assertEquals(((Byte) cl.getPropertyValue("PropObjectA")).byteValue(), 1);
@@ -444,35 +444,35 @@ public class PropertySet_Test
value= Boolean.TRUE;
cl.setPropertyValue("PropBoolClass", value);
- assertEquals((Boolean) cl.getPropertyValue("PropBoolClass"), value);
+ assertEquals(cl.getPropertyValue("PropBoolClass"), value);
value= new Character('A');
cl.setPropertyValue("PropCharClass",value);
- assertEquals((Character) cl.getPropertyValue("PropCharClass"), value);
+ assertEquals(cl.getPropertyValue("PropCharClass"), value);
value= Byte.valueOf((byte) 111);
cl.setPropertyValue("PropByteClass",value);
- assertEquals((Byte) cl.getPropertyValue("PropByteClass"), value);
+ assertEquals(cl.getPropertyValue("PropByteClass"), value);
value= Short.valueOf((short)112);
cl.setPropertyValue("PropShortClass", value);
- assertEquals((Short) cl.getPropertyValue("PropShortClass"), value);
+ assertEquals(cl.getPropertyValue("PropShortClass"), value);
value= Integer.valueOf(113);
cl.setPropertyValue("PropIntClass", value);
- assertEquals((Integer) cl.getPropertyValue("PropIntClass"), value);
+ assertEquals(cl.getPropertyValue("PropIntClass"), value);
value= Long.valueOf(115);
cl.setPropertyValue("PropLongClass", value);
- assertEquals((Long) cl.getPropertyValue("PropLongClass"), value);
+ assertEquals(cl.getPropertyValue("PropLongClass"), value);
value= new Float(3.14);
cl.setPropertyValue("PropFloatClass", value);
- assertEquals((Float) cl.getPropertyValue("PropFloatClass"), value);
+ assertEquals(cl.getPropertyValue("PropFloatClass"), value);
value= new Double(3.145);
cl.setPropertyValue("PropDoubleClass",value);
- assertEquals((Double) cl.getPropertyValue("PropDoubleClass"), value);
+ assertEquals(cl.getPropertyValue("PropDoubleClass"), value);
cl.resetPropertyMembers();
@@ -1270,12 +1270,12 @@ class TestClass extends PropertySet
value= new Any( new Type(Integer.class),Integer.valueOf(111));
assertTrue(convertPropertyValue(propIntA, outNewVal, outOldVal, value));
assertTrue(outNewVal[0] instanceof Integer);
- assertEquals((Integer) outNewVal[0], ((Any) value).getObject());
+ assertEquals(outNewVal[0], ((Any) value).getObject());
value= new Any(new Type(Boolean.class), Boolean.TRUE);
assertTrue(convertPropertyValue(propBoolA, outNewVal, outOldVal, value));
assertTrue(outNewVal[0] instanceof Boolean);
- assertEquals((Boolean) outNewVal[0], ((Any) value).getObject());
+ assertEquals(outNewVal[0], ((Any) value).getObject());
//Character, Byte, Short, Long
// must fail
commit 0063cf285696951e336b9cec1da8881997b286ce
Author: Noel Grandin <noel at peralex.com>
Date: Tue Nov 18 10:01:21 2014 +0200
java: make fields final where possible
found by PMD
Change-Id: I87780366119c141cd2dafe6ca1bf2d9798b10aec
diff --git a/bean/com/sun/star/comp/beans/Controller.java b/bean/com/sun/star/comp/beans/Controller.java
index 9e93c58..91f64db 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 59ccf26..fbf9ca9 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 c81796d..5a57dcd 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 a846899..10ee1ef 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 8376018..001770b 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 e49deff..d3a7425 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 5285ad4..e994d01 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 c8e7d5d..66b6f54 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 24776f2..6445f24 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 9248cdf..2f3d99b 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 457b037..905ddc1 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 6b6048c..748ee61 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 19fb59c..5d93118 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 992619b..626f62e 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 ab5fe51..b939fdb 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 66749fb..ad0968a 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 86b168a..f7499ce 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 170e19a..ec848c4 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 b68290c..bda281d 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 73cda71..8bd6596 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 87ebb27..516f2a2 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 83026fd..e8e5a81 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 8201fe9..9d85a86 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 a86bc6b..64caf0a 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 5c82fa4..90aa18a 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 eb7467a..3014727 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 e7c33a0..0680689 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 76784c3..034f4e5 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 a24639b..0873d34 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 475ceb6..7064960 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 4c56b6e..c04c4db 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 e60a8e4..d98c647 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 a573fe5..37c3915 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 350a221..0efb10c 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 0eb23b0..79e562a 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 d343048..fa3a999 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 82e753e..347eb74 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 33effb4..f2a937e 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 204be38..3e7fc39 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 ac2a61d..6748fc3 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 437b130..8a16f83 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 e5683ef..0b7e2ce 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 cfb7677..b85f519 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 54ac164..8b7cdb5 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 96ea2a3..42d8055 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 fce31d4..14cab34 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 b3076c6..4869895 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 aa00c59..23735a1 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 0326ffa..9d327ec 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 1fa4286..feaca77 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 432cfdc..c77c57b 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 f8e738d..d8f5740 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 ca0bf84..89cf42e 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 25c0ff9..6ba3a48 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 95d4014..ca5e7a0 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 0239959..67e01ac 100644
--- a/javaunohelper/com/sun/star/lib/uno/helper/WeakAdapter.java
... etc. - the rest is truncated
More information about the Libreoffice-commits
mailing list