diff options
author | Noel Grandin <noel@peralex.com> | 2014-08-04 13:51:59 +0200 |
---|---|---|
committer | Noel Grandin <noel@peralex.com> | 2014-08-04 14:50:59 +0200 |
commit | 0781dad870cb48b8604e84df1750422c91d70f1a (patch) | |
tree | b49948231d0fde9a46eb060457fcf44a6fd0de26 /odk | |
parent | 66c34ff3e7cb940536b7257033c097491862d04f (diff) |
java: remove commented out code for OpenOffice 3.3
Specifically the comment says:
This method not longer necessary since OOo 3.4 where the component registration
was changed to passive component registration. For more details see
http://wiki.openoffice.org/wiki/Passive_Component_Registration
Change-Id: Icfeec634ebc30a270533787b94e2a9a4318778db
Diffstat (limited to 'odk')
19 files changed, 0 insertions, 331 deletions
diff --git a/odk/examples/DevelopersGuide/Charts/JavaSampleChartAddIn.java b/odk/examples/DevelopersGuide/Charts/JavaSampleChartAddIn.java index c71496547374..1af68e7cf570 100644 --- a/odk/examples/DevelopersGuide/Charts/JavaSampleChartAddIn.java +++ b/odk/examples/DevelopersGuide/Charts/JavaSampleChartAddIn.java @@ -445,30 +445,4 @@ public class JavaSampleChartAddIn extends WeakBase implements return xSingleServiceFactory; } - /** - * Writes the service information into the given registry key. - * This method is called by the <code>JavaLoader</code> - * <p> - * @return returns true if the operation succeeded - * @param regKey the registryKey - * @see com.sun.star.comp.loader.JavaLoader - */ - // This method not longer necessary since OOo 3.4 where the component registration - // was changed to passive component registration. For more details see - // http://wiki.openoffice.org/wiki/Passive_Component_Registration - -// public static boolean __writeRegistryServiceInfo( com.sun.star.registry.XRegistryKey regKey ) -// { -// boolean bResult = true; - -// String[] aServices = getSupportedServiceNames_Static(); -// int i, nLength = aServices.length; - -// for( i = 0; i < nLength; ++i ) -// { -// bResult = bResult && com.sun.star.comp.loader.FactoryHelper.writeRegistryServiceInfo( -// JavaSampleChartAddIn.class.getName(), aServices[ i ], regKey ); -// } -// return bResult; -// } } diff --git a/odk/examples/DevelopersGuide/Components/Addons/JobsAddon/AsyncJob.java b/odk/examples/DevelopersGuide/Components/Addons/JobsAddon/AsyncJob.java index 422de9f820d7..a7bd3b9b1f35 100644 --- a/odk/examples/DevelopersGuide/Components/Addons/JobsAddon/AsyncJob.java +++ b/odk/examples/DevelopersGuide/Components/Addons/JobsAddon/AsyncJob.java @@ -419,15 +419,4 @@ public class AsyncJob extends WeakBase implements XServiceInfo, XAsyncJob } - // This method not longer necessary since OOo 3.4 where the component registration - // was changed to passive component registration. For more details see - // http://wiki.openoffice.org/wiki/Passive_Component_Registration - -// public synchronized static boolean __writeRegistryServiceInfo(com.sun.star.registry.XRegistryKey xRegKey) -// { -// return Factory.writeRegistryServiceInfo( -// AsyncJob.IMPLEMENTATIONNAME, -// AsyncJob.SERVICENAMES, -// xRegKey); -// } } diff --git a/odk/examples/DevelopersGuide/Components/Addons/ProtocolHandlerAddon_java/ProtocolHandlerAddon.java b/odk/examples/DevelopersGuide/Components/Addons/ProtocolHandlerAddon_java/ProtocolHandlerAddon.java index 0653ee11055d..d93944728fd0 100644 --- a/odk/examples/DevelopersGuide/Components/Addons/ProtocolHandlerAddon_java/ProtocolHandlerAddon.java +++ b/odk/examples/DevelopersGuide/Components/Addons/ProtocolHandlerAddon_java/ProtocolHandlerAddon.java @@ -255,25 +255,4 @@ public class ProtocolHandlerAddon { return xFactory; } - - /** Writes the service information into the given registry key. - * This method is called by the <code>JavaLoader</code>. - * @return returns true if the operation succeeded - * @see com.sun.star.comp.loader.JavaLoader# - * @see com.sun.star.lib.uno.helper.Factory# - * @param xregistrykey Makes structural information (except regarding tree - * structures) of a single - * registry key accessible. - */ - // This method not longer necessary since OOo 3.4 where the component registration - // was changed to passive component registration. For more details see - // http://wiki.openoffice.org/wiki/Passive_Component_Registration - -// public static boolean __writeRegistryServiceInfo( -// XRegistryKey xRegistryKey ) { -// return Factory.writeRegistryServiceInfo( -// ProtocolHandlerAddonImpl.class.getName(), -// ProtocolHandlerAddonImpl.getServiceNames(), -// xRegistryKey ); -// } } diff --git a/odk/examples/DevelopersGuide/Components/JavaComponent/TestServiceProvider.java b/odk/examples/DevelopersGuide/Components/JavaComponent/TestServiceProvider.java index 65c2d117d058..1a3b27f338b7 100644 --- a/odk/examples/DevelopersGuide/Components/JavaComponent/TestServiceProvider.java +++ b/odk/examples/DevelopersGuide/Components/JavaComponent/TestServiceProvider.java @@ -54,20 +54,6 @@ public class TestServiceProvider multiFactory, regKey); return xSingleServiceFactory; } - - // This method not longer necessary since OOo 3.4 where the component registration - // was changed to passive component registration. For more details see - // http://wiki.openoffice.org/wiki/Passive_Component_Registration - -// public static boolean __writeRegistryServiceInfo(XRegistryKey regKey){ -// boolean bregA= FactoryHelper.writeRegistryServiceInfo( -// TestComponentA.class.getName(), -// TestComponentA.__serviceName, regKey); -// boolean bregB= FactoryHelper.writeRegistryServiceInfo( -// TestComponentB.class.getName(), -// TestComponentB.__serviceName, regKey); -// return bregA && bregB; -// } } diff --git a/odk/examples/DevelopersGuide/Components/SimpleLicense/LicenseTest.java b/odk/examples/DevelopersGuide/Components/SimpleLicense/LicenseTest.java index b3bc1e302e22..d02c9672be55 100644 --- a/odk/examples/DevelopersGuide/Components/SimpleLicense/LicenseTest.java +++ b/odk/examples/DevelopersGuide/Components/SimpleLicense/LicenseTest.java @@ -135,23 +135,6 @@ public class LicenseTest { return xFactory; } - /** - * Writes the service information into the given registry key. - * This method is called by the <code>JavaLoader</code> - * <p> - * @return returns true if the operation succeeded - * @param regKey the registryKey - * @see com.sun.star.comp.loader.JavaLoader - */ - // This method not longer necessary since OOo 3.4 where the component registration - // was changed to passive component registration. For more details see - // http://wiki.openoffice.org/wiki/Passive_Component_Registration - -// public static boolean __writeRegistryServiceInfo(XRegistryKey regKey) { -// return Factory.writeRegistryServiceInfo(_LicenseTest.class.getName(), -// _LicenseTest.getServiceNames(), -// regKey); -// } /** This method is a member of the interface for initializing an object * directly after its creation. * @param object This array of arbitrary objects will be passed to the diff --git a/odk/examples/DevelopersGuide/Components/Thumbs/org/openoffice/comp/test/ImageShrink.java b/odk/examples/DevelopersGuide/Components/Thumbs/org/openoffice/comp/test/ImageShrink.java index 44fe05699188..684a95dfdb9e 100644 --- a/odk/examples/DevelopersGuide/Components/Thumbs/org/openoffice/comp/test/ImageShrink.java +++ b/odk/examples/DevelopersGuide/Components/Thumbs/org/openoffice/comp/test/ImageShrink.java @@ -81,17 +81,6 @@ public class ImageShrink extends WeakBase return xSingleServiceFactory; } - // This method not longer necessary since OOo 3.4 where the component registration - // was changed to passive component registration. For more details see - // http://wiki.openoffice.org/wiki/Passive_Component_Registration - -// public static boolean __writeRegistryServiceInfo(XRegistryKey regKey) { -// //System.out.println(ImageShrink.class.getName()); -// return FactoryHelper.writeRegistryServiceInfo( ImageShrink.class.getName(), -// __serviceName, -// regKey); -// } - // XFilter implementation (a sub-interface of XImageShrinkFilter) public void cancel() { cancel = true; diff --git a/odk/examples/DevelopersGuide/Components/dialogcomponent/DialogComponent.java b/odk/examples/DevelopersGuide/Components/dialogcomponent/DialogComponent.java index e408843ed8ae..32473a3ce10a 100644 --- a/odk/examples/DevelopersGuide/Components/dialogcomponent/DialogComponent.java +++ b/odk/examples/DevelopersGuide/Components/dialogcomponent/DialogComponent.java @@ -290,22 +290,4 @@ public class DialogComponent { return xFactory; } - - /** - * Writes the service information into the given registry key. - * This method is called by the <code>JavaLoader</code> - * <p> - * @return returns true if the operation succeeded - * @param regKey the registryKey - * @see com.sun.star.comp.loader.JavaLoader - */ - // This method not longer necessary since OOo 3.4 where the component registration - // was changed to passive component registration. For more details see - // http://wiki.openoffice.org/wiki/Passive_Component_Registration - -// public static boolean __writeRegistryServiceInfo(XRegistryKey regKey) { -// return Factory.writeRegistryServiceInfo(_DialogComponent.class.getName(), -// _DialogComponent.getServiceNames(), -// regKey); -// } } diff --git a/odk/examples/DevelopersGuide/OfficeDev/FilterDevelopment/AsciiFilter/AsciiReplaceFilter.java b/odk/examples/DevelopersGuide/OfficeDev/FilterDevelopment/AsciiFilter/AsciiReplaceFilter.java index 4dce982fba3f..1cade50192f8 100644 --- a/odk/examples/DevelopersGuide/OfficeDev/FilterDevelopment/AsciiFilter/AsciiReplaceFilter.java +++ b/odk/examples/DevelopersGuide/OfficeDev/FilterDevelopment/AsciiFilter/AsciiReplaceFilter.java @@ -697,29 +697,4 @@ public class AsciiReplaceFilter _AsciiReplaceFilter.m_serviceNames); return xFactory; } - - - /** - * Writes the service information into the given registry key. - * This method is called by the <code>JavaLoader</code>. - * - * @param xRegistryKey - * Makes structural information (except regarding tree - * structures) of a single registry key accessible. - * - * @return returns true if the operation succeeded - * - * @see com.sun.star.comp.loader.JavaLoader - */ - // This method not longer necessary since OOo 3.4 where the component registration - // was changed to passive component registration. For more details see - // http://wiki.openoffice.org/wiki/Passive_Component_Registration - -// public static boolean __writeRegistryServiceInfo( com.sun.star.registry.XRegistryKey xRegistryKey ) -// { -// return Factory.writeRegistryServiceInfo( -// _AsciiReplaceFilter.class.getName(), -// _AsciiReplaceFilter.m_serviceNames, -// xRegistryKey ); -// } } diff --git a/odk/examples/DevelopersGuide/OfficeDev/FilterDevelopment/FlatXmlFilter_java/FlatXml.java b/odk/examples/DevelopersGuide/OfficeDev/FilterDevelopment/FlatXmlFilter_java/FlatXml.java index 942c97a6802c..e096eb4660b8 100644 --- a/odk/examples/DevelopersGuide/OfficeDev/FilterDevelopment/FlatXmlFilter_java/FlatXml.java +++ b/odk/examples/DevelopersGuide/OfficeDev/FilterDevelopment/FlatXmlFilter_java/FlatXml.java @@ -261,15 +261,4 @@ public class FlatXml implements XImportFilter, XExportFilter, XServiceName, } return xSingleServiceFactory; } - - // This method not longer necessary since OOo 3.4 where the component registration - // was changed to passive component registration. For more details see - // http://wiki.openoffice.org/wiki/Passive_Component_Registration - -// public static boolean __writeRegistryServiceInfo(XRegistryKey regKey) -// { -// return FactoryHelper.writeRegistryServiceInfo(__implName, -// __serviceName, regKey); -// } - } diff --git a/odk/examples/DevelopersGuide/OfficeDev/Linguistic/SampleHyphenator.java b/odk/examples/DevelopersGuide/OfficeDev/Linguistic/SampleHyphenator.java index f74c5a7d8884..f7f156feed98 100644 --- a/odk/examples/DevelopersGuide/OfficeDev/Linguistic/SampleHyphenator.java +++ b/odk/examples/DevelopersGuide/OfficeDev/Linguistic/SampleHyphenator.java @@ -508,31 +508,5 @@ public class SampleHyphenator extends ComponentBase implements } return xSingleComponentFactory; } - - /** - * Writes the service information into the given registry key. - * This method is called by the <code>JavaLoader</code> - * <p> - * @return returns true if the operation succeeded - * @param xRegKey the registryKey - * @see com.sun.star.comp.loader.JavaLoader - */ - // This method not longer necessary since OOo 3.4 where the component registration - // was changed to passive component registration. For more details see - // http://wiki.openoffice.org/wiki/Passive_Component_Registration - -// public static boolean __writeRegistryServiceInfo( -// com.sun.star.registry.XRegistryKey xRegKey ) -// { -// boolean bResult = true; -// String[] aServices = getSupportedServiceNames_Static(); -// int i, nLength = aServices.length; -// for( i = 0; i < nLength; ++i ) -// { -// bResult = bResult && com.sun.star.comp.loader.FactoryHelper.writeRegistryServiceInfo( -// _aSvcImplName, aServices[i], xRegKey ); -// } -// return bResult; -// } } diff --git a/odk/examples/DevelopersGuide/OfficeDev/Linguistic/SampleSpellChecker.java b/odk/examples/DevelopersGuide/OfficeDev/Linguistic/SampleSpellChecker.java index 7887fa06af30..0b6be21573f2 100644 --- a/odk/examples/DevelopersGuide/OfficeDev/Linguistic/SampleSpellChecker.java +++ b/odk/examples/DevelopersGuide/OfficeDev/Linguistic/SampleSpellChecker.java @@ -451,31 +451,5 @@ public class SampleSpellChecker extends ComponentBase implements } return xSingleComponentFactory; } - - /** - * Writes the service information into the given registry key. - * This method is called by the <code>JavaLoader</code> - * <p> - * @return returns true if the operation succeeded - * @param xRegKey the registryKey - * @see com.sun.star.comp.loader.JavaLoader - */ - // This method not longer necessary since OOo 3.4 where the component registration - // was changed to passive component registration. For more details see - // http://wiki.openoffice.org/wiki/Passive_Component_Registration - -// public static boolean __writeRegistryServiceInfo( -// com.sun.star.registry.XRegistryKey xRegKey ) -// { -// boolean bResult = true; -// String[] aServices = getSupportedServiceNames_Static(); -// int i, nLength = aServices.length; -// for( i = 0; i < nLength; ++i ) -// { -// bResult = bResult && com.sun.star.comp.loader.FactoryHelper.writeRegistryServiceInfo( -// _aSvcImplName, aServices[i], xRegKey ); -// } -// return bResult; -// } } diff --git a/odk/examples/DevelopersGuide/OfficeDev/Linguistic/SampleThesaurus.java b/odk/examples/DevelopersGuide/OfficeDev/Linguistic/SampleThesaurus.java index 5feb49bd3e99..9491421b4466 100644 --- a/odk/examples/DevelopersGuide/OfficeDev/Linguistic/SampleThesaurus.java +++ b/odk/examples/DevelopersGuide/OfficeDev/Linguistic/SampleThesaurus.java @@ -287,31 +287,5 @@ public class SampleThesaurus extends ComponentBase implements } return xSingleComponentFactory; } - - /** - * Writes the service information into the given registry key. - * This method is called by the <code>JavaLoader</code> - * <p> - * @return returns true if the operation succeeded - * @param xRegKey the registryKey - * @see com.sun.star.comp.loader.JavaLoader - */ - // This method not longer necessary since OOo 3.4 where the component registration - // was changed to passive component registration. For more details see - // http://wiki.openoffice.org/wiki/Passive_Component_Registration - -// public static boolean __writeRegistryServiceInfo( -// com.sun.star.registry.XRegistryKey xRegKey ) -// { -// boolean bResult = true; -// String[] aServices = getSupportedServiceNames_Static(); -// int i, nLength = aServices.length; -// for( i = 0; i < nLength; ++i ) -// { -// bResult = bResult && com.sun.star.comp.loader.FactoryHelper.writeRegistryServiceInfo( -// _aSvcImplName, aServices[i], xRegKey ); -// } -// return bResult; -// } } diff --git a/odk/examples/DevelopersGuide/Spreadsheet/ExampleAddIn.java b/odk/examples/DevelopersGuide/Spreadsheet/ExampleAddIn.java index eefe3bb9a486..cb78f88e3992 100644 --- a/odk/examples/DevelopersGuide/Spreadsheet/ExampleAddIn.java +++ b/odk/examples/DevelopersGuide/Spreadsheet/ExampleAddIn.java @@ -299,19 +299,5 @@ public class ExampleAddIn multiFactory, regKey); return xSingleServiceFactory; } - - // This method not longer necessary since OOo 3.4 where the component registration - // was changed to passive component registration. For more details see - // http://wiki.openoffice.org/wiki/Passive_Component_Registration - -// public static boolean __writeRegistryServiceInfo( -// com.sun.star.registry.XRegistryKey regKey) -// { -// // register for both the base AddIn and the own service -// return com.sun.star.comp.loader.FactoryHelper.writeRegistryServiceInfo( -// _ExampleAddIn.aImplName, _ExampleAddIn.aExampleService, regKey) -// && com.sun.star.comp.loader.FactoryHelper.writeRegistryServiceInfo( -// _ExampleAddIn.aImplName, _ExampleAddIn.aAddInService, regKey); -// } } diff --git a/odk/examples/DevelopersGuide/Spreadsheet/ExampleDataPilotSource.java b/odk/examples/DevelopersGuide/Spreadsheet/ExampleDataPilotSource.java index 0ef2a09d44fd..b28daf1cc118 100644 --- a/odk/examples/DevelopersGuide/Spreadsheet/ExampleDataPilotSource.java +++ b/odk/examples/DevelopersGuide/Spreadsheet/ExampleDataPilotSource.java @@ -983,17 +983,5 @@ public class ExampleDataPilotSource return xSingleServiceFactory; } - - // This method not longer necessary since OOo 3.4 where the component registration - // was changed to passive component registration. For more details see - // http://wiki.openoffice.org/wiki/Passive_Component_Registration - -// public static boolean __writeRegistryServiceInfo( -// com.sun.star.registry.XRegistryKey regKey) -// { -// return com.sun.star.comp.loader.FactoryHelper.writeRegistryServiceInfo( -// _ExampleDataPilotSource.aImplName, -// _ExampleDataPilotSource.aServiceName, regKey); -// } } diff --git a/odk/examples/java/EmbedDocument/EmbeddedObject/OwnEmbeddedObjectFactory.java b/odk/examples/java/EmbedDocument/EmbeddedObject/OwnEmbeddedObjectFactory.java index 983f65172d47..84547be8b1a4 100644 --- a/odk/examples/java/EmbedDocument/EmbeddedObject/OwnEmbeddedObjectFactory.java +++ b/odk/examples/java/EmbedDocument/EmbeddedObject/OwnEmbeddedObjectFactory.java @@ -45,16 +45,6 @@ public final class OwnEmbeddedObjectFactory extends WeakBase return xFactory; } - // This method not longer necessary since OOo 3.4 where the component registration - // was changed to passive component registration. For more details see - // http://wiki.openoffice.org/wiki/Passive_Component_Registration - -// public static boolean __writeRegistryServiceInfo( XRegistryKey xRegistryKey ) { -// return Factory.writeRegistryServiceInfo(m_implementationName, -// m_serviceNames, -// xRegistryKey); -// } - // com.sun.star.lang.XServiceInfo: public String getImplementationName() { return m_implementationName; diff --git a/odk/examples/java/MinimalComponent/MinimalComponent.java b/odk/examples/java/MinimalComponent/MinimalComponent.java index a54048298054..1a585dfdfb91 100644 --- a/odk/examples/java/MinimalComponent/MinimalComponent.java +++ b/odk/examples/java/MinimalComponent/MinimalComponent.java @@ -150,22 +150,4 @@ public class MinimalComponent { return xFactory; } - - /** - * Writes the service information into the given registry key. - * This method is called by the <code>JavaLoader</code> - * <p> - * @return returns true if the operation succeeded - * @param regKey the registryKey - * @see com.sun.star.comp.loader.JavaLoader - */ - // This method not longer necessary since OOo 3.4 where the component registration - // was changed to passive component registration. For more details see - // http://wiki.openoffice.org/wiki/Passive_Component_Registration - -// public static boolean __writeRegistryServiceInfo(XRegistryKey regKey) { -// return Factory.writeRegistryServiceInfo(_MinimalComponent.class.getName(), -// _MinimalComponent.getServiceNames(), -// regKey); -// } } diff --git a/odk/examples/java/PropertySet/PropTest.java b/odk/examples/java/PropertySet/PropTest.java index 6749b4fd56eb..fd77886a6678 100644 --- a/odk/examples/java/PropertySet/PropTest.java +++ b/odk/examples/java/PropertySet/PropTest.java @@ -256,14 +256,4 @@ public class PropTest extends PropertySet implements XServiceInfo return xSingleServiceFactory; } - - // This method not longer necessary since OOo 3.4 where the component registration - // was changed to passive component registration. For more details see - // http://wiki.openoffice.org/wiki/Passive_Component_Registration - -// public static boolean __writeRegistryServiceInfo(XRegistryKey regKey) -// { -// return FactoryHelper.writeRegistryServiceInfo( PropTest.class.getName(), -// PropTest.__serviceName, regKey); -// } } diff --git a/odk/examples/java/Spreadsheet/CalcAddins.java b/odk/examples/java/Spreadsheet/CalcAddins.java index e0387a481d1e..7b4a2853a264 100644 --- a/odk/examples/java/Spreadsheet/CalcAddins.java +++ b/odk/examples/java/Spreadsheet/CalcAddins.java @@ -281,22 +281,4 @@ public class CalcAddins { return xSingleServiceFactory; } - /** - * Writes the service information into the given registry key. - * This method is called by the <code>JavaLoader</code> - * <p> - * @return returns true if the operation succeeded - * @param regKey the registryKey - * @see com.sun.star.comp.loader.JavaLoader - */ - // This method not longer necessary since OOo 3.4 where the component registration - // was changed to passive component registration. For more details see - // http://wiki.openoffice.org/wiki/Passive_Component_Registration - -// public static boolean __writeRegistryServiceInfo(XRegistryKey regKey) { -// return FactoryHelper.writeRegistryServiceInfo(_CalcAddins.class.getName(), -// _CalcAddins.__serviceName, regKey) -// && FactoryHelper.writeRegistryServiceInfo(_CalcAddins.class.getName(), -// _CalcAddins.ADDIN_SERVICE, regKey); -// } } diff --git a/odk/examples/java/ToDo/ToDo.java b/odk/examples/java/ToDo/ToDo.java index 8b1f8743fb5c..99af7047a77f 100644 --- a/odk/examples/java/ToDo/ToDo.java +++ b/odk/examples/java/ToDo/ToDo.java @@ -929,22 +929,5 @@ public class ToDo { return xFactory; } - - /** - * Writes the service information into the given registry key. - * This method is called by the <code>JavaLoader</code> - * <p> - * @return returns true if the operation succeeded - * @param regKey the registryKey - * @see com.sun.star.comp.loader.JavaLoader - */ - // This method not longer necessary since OOo 3.4 where the component registration - // was changed to passive component registration. For more details see - // http://wiki.openoffice.org/wiki/Passive_Component_Registration - -// public static boolean __writeRegistryServiceInfo(XRegistryKey regKey) { -// return Factory.writeRegistryServiceInfo(ToDoImpl.class.getName(), -// ToDoImpl.getServiceNames(), regKey); -// } } |