diff options
author | Stephan Bergmann <sbergman@redhat.com> | 2013-05-07 16:46:46 +0200 |
---|---|---|
committer | Stephan Bergmann <sbergman@redhat.com> | 2013-05-07 16:48:19 +0200 |
commit | ff9fbfd9c9e9a1caa72601df951a7fd85eb8fcc1 (patch) | |
tree | 430ecd9b82337cb7f1815fee538a9e7e1af1fc92 /javaunohelper | |
parent | Fix style renaming confusion in ww8 filter (solves fdo#63603) (diff) | |
download | core-ff9fbfd9c9e9a1caa72601df951a7fd85eb8fcc1.tar.gz core-ff9fbfd9c9e9a1caa72601df951a7fd85eb8fcc1.zip |
Extract SmoketestCommandEnvironment.java from juh.jar
...into a new smoketest.jar, so that URE juh.jar no longer depends on non-URE
unoil.jar.
Change-Id: I8937c78d8af6e2f82ada5dd80c322f8bca5ec2f5
Diffstat (limited to 'javaunohelper')
-rw-r--r-- | javaunohelper/Jar_juh.mk | 5 | ||||
-rw-r--r-- | javaunohelper/com/sun/star/comp/JavaUNOHelperServices.java | 52 | ||||
-rw-r--r-- | javaunohelper/com/sun/star/comp/juhtest/SmoketestCommandEnvironment.java | 142 | ||||
-rw-r--r-- | javaunohelper/util/juh.component | 25 | ||||
-rw-r--r-- | javaunohelper/util/manifest | 1 |
5 files changed, 0 insertions, 225 deletions
diff --git a/javaunohelper/Jar_juh.mk b/javaunohelper/Jar_juh.mk index 1df8c67ac57e..a4f1f4c9fbe7 100644 --- a/javaunohelper/Jar_juh.mk +++ b/javaunohelper/Jar_juh.mk @@ -12,7 +12,6 @@ $(eval $(call gb_Jar_Jar,juh)) $(eval $(call gb_Jar_use_jars,juh,\ jurt \ ridl \ - unoil \ )) $(eval $(call gb_Jar_set_packageroot,juh,com)) @@ -21,17 +20,13 @@ $(eval $(call gb_Jar_add_manifest_classpath,juh,ridl.jar jurt.jar ../../lib/ ../ $(eval $(call gb_Jar_set_manifest,juh,$(SRCDIR)/javaunohelper/util/manifest)) -$(eval $(call gb_Jar_set_componentfile,juh,javaunohelper/util/juh,URE)) - $(eval $(call gb_Jar_add_sourcefiles,juh,\ - javaunohelper/com/sun/star/comp/JavaUNOHelperServices \ javaunohelper/com/sun/star/comp/helper/Bootstrap \ javaunohelper/com/sun/star/comp/helper/BootstrapException \ javaunohelper/com/sun/star/comp/helper/ComponentContext \ javaunohelper/com/sun/star/comp/helper/ComponentContextEntry \ javaunohelper/com/sun/star/comp/helper/SharedLibraryLoader \ javaunohelper/com/sun/star/comp/helper/UnoInfo \ - javaunohelper/com/sun/star/comp/juhtest/SmoketestCommandEnvironment \ javaunohelper/com/sun/star/lib/uno/adapter/ByteArrayToXInputStreamAdapter \ javaunohelper/com/sun/star/lib/uno/adapter/InputStreamToXInputStreamAdapter \ javaunohelper/com/sun/star/lib/uno/adapter/OutputStreamToXOutputStreamAdapter \ diff --git a/javaunohelper/com/sun/star/comp/JavaUNOHelperServices.java b/javaunohelper/com/sun/star/comp/JavaUNOHelperServices.java deleted file mode 100644 index 7ed846e2b9a7..000000000000 --- a/javaunohelper/com/sun/star/comp/JavaUNOHelperServices.java +++ /dev/null @@ -1,52 +0,0 @@ -/* - * This file is part of the LibreOffice project. - * - * This Source Code Form is subject to the terms of the Mozilla Public - * License, v. 2.0. If a copy of the MPL was not distributed with this - * file, You can obtain one at http://mozilla.org/MPL/2.0/. - * - * This file incorporates work covered by the following license notice: - * - * Licensed to the Apache Software Foundation (ASF) under one or more - * contributor license agreements. See the NOTICE file distributed - * with this work for additional information regarding copyright - * ownership. The ASF licenses this file to you under the Apache - * License, Version 2.0 (the "License"); you may not use this file - * except in compliance with the License. You may obtain a copy of - * the License at http://www.apache.org/licenses/LICENSE-2.0 . - */ -package com.sun.star.comp; - -import com.sun.star.lib.uno.helper.Factory; -import com.sun.star.lang.XSingleComponentFactory; -import com.sun.star.comp.juhtest.SmoketestCommandEnvironment; - - -/** This class is the registration class for all services in this module. - * - * Note that not all files which can be used as service need to be registered - * by this class. - */ -public class JavaUNOHelperServices { - - /** - * Gives a factory for creating the service. - * This method is called by the <code>JavaLoader</code> - * <p> - * @return returns a <code>XSingleComponentFactory</code> for creating - * the component - * @param sImplName the name of the implementation for which a - * service is desired - * @see com.sun.star.comp.loader.JavaLoader - */ - public static XSingleComponentFactory __getComponentFactory(String sImplName) - { - XSingleComponentFactory xFactory = null; - - if ( sImplName.equals( SmoketestCommandEnvironment.class.getName() ) ) - xFactory = Factory.createComponentFactory(SmoketestCommandEnvironment.class, - SmoketestCommandEnvironment.getServiceNames()); - - return xFactory; - } -} diff --git a/javaunohelper/com/sun/star/comp/juhtest/SmoketestCommandEnvironment.java b/javaunohelper/com/sun/star/comp/juhtest/SmoketestCommandEnvironment.java deleted file mode 100644 index fa2cc18adab4..000000000000 --- a/javaunohelper/com/sun/star/comp/juhtest/SmoketestCommandEnvironment.java +++ /dev/null @@ -1,142 +0,0 @@ -/* - * This file is part of the LibreOffice project. - * - * This Source Code Form is subject to the terms of the Mozilla Public - * License, v. 2.0. If a copy of the MPL was not distributed with this - * file, You can obtain one at http://mozilla.org/MPL/2.0/. - * - * This file incorporates work covered by the following license notice: - * - * Licensed to the Apache Software Foundation (ASF) under one or more - * contributor license agreements. See the NOTICE file distributed - * with this work for additional information regarding copyright - * ownership. The ASF licenses this file to you under the Apache - * License, Version 2.0 (the "License"); you may not use this file - * except in compliance with the License. You may obtain a copy of - * the License at http://www.apache.org/licenses/LICENSE-2.0 . - */ -package com.sun.star.comp.juhtest; - -import com.sun.star.lang.XMultiComponentFactory; -import com.sun.star.lib.uno.helper.WeakBase; -import com.sun.star.uno.UnoRuntime; -import com.sun.star.uno.XComponentContext; -import com.sun.star.lang.XServiceInfo; -import com.sun.star.ucb.XCommandEnvironment; - -/** This service is for use by the smoketest which checks the installation of - * extensions. The service provides the XCommandEnvironment interface, which - * is needed for adding extensions. - */ -public class SmoketestCommandEnvironment extends WeakBase - implements XServiceInfo, XCommandEnvironment { - - static private final String __serviceName = - "com.sun.star.deployment.test.SmoketestCommandEnvironment"; - - private XComponentContext m_cmpCtx; - private XMultiComponentFactory m_xMCF; - - - public SmoketestCommandEnvironment(XComponentContext xCompContext) { - try { - m_cmpCtx = xCompContext; - m_xMCF = m_cmpCtx.getServiceManager(); - } - catch( Exception e ) { - e.printStackTrace(); - } - } - - public static String[] getServiceNames() { - String[] sSupportedServiceNames = { __serviceName}; - return sSupportedServiceNames; - } - - //XServiceInfo ------------------------------------------------------------- - public String[] getSupportedServiceNames() { - return getServiceNames(); - } - - - public boolean supportsService( String sServiceName ) { - boolean bSupported = false; - if (sServiceName.equals(__serviceName)) - bSupported = true; - return bSupported; - } - - public String getImplementationName() { - return SmoketestCommandEnvironment.class.getName(); - } - - //XCommandEnvironment ================================================ - public com.sun.star.task.XInteractionHandler getInteractionHandler() - { - return new InteractionImpl(); - } - - public com.sun.star.ucb.XProgressHandler getProgressHandler() - { - return new ProgressImpl(); - } -} - - - - -class InteractionImpl implements com.sun.star.task.XInteractionHandler -{ - public void handle( com.sun.star.task.XInteractionRequest xRequest ) - { - Object request = xRequest.getRequest(); - - boolean approve = true; - boolean abort = false; -// Object install_Exception = -// AnyConverter.toObject( -// com.sun.star.deployment.InstallException.class, request); -// if (install_Exception != null) -// { -// approve = true; -// } - - com.sun.star.task.XInteractionContinuation[] conts = xRequest.getContinuations(); - for (int i = 0; i < conts.length; i++) - { - if (approve) - { - com.sun.star.task.XInteractionApprove xApprove = - UnoRuntime.queryInterface(com.sun.star.task.XInteractionApprove.class, conts[i]); - if (xApprove != null) - xApprove.select(); - //don't query again for ongoing extensions - approve = false; - } - else if (abort) - { - com.sun.star.task.XInteractionAbort xAbort = - UnoRuntime.queryInterface(com.sun.star.task.XInteractionAbort.class, conts[i]); - if (xAbort != null) - xAbort.select(); - //don't query again for ongoing extensions - abort = false; - } - } - } -} - -class ProgressImpl implements com.sun.star.ucb.XProgressHandler -{ - public void push(Object status) - { - } - - public void update(Object status) - { - } - - public void pop() - { - } -} diff --git a/javaunohelper/util/juh.component b/javaunohelper/util/juh.component deleted file mode 100644 index 5da5a702540b..000000000000 --- a/javaunohelper/util/juh.component +++ /dev/null @@ -1,25 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<!-- - * This file is part of the LibreOffice project. - * - * This Source Code Form is subject to the terms of the Mozilla Public - * License, v. 2.0. If a copy of the MPL was not distributed with this - * file, You can obtain one at http://mozilla.org/MPL/2.0/. - * - * This file incorporates work covered by the following license notice: - * - * Licensed to the Apache Software Foundation (ASF) under one or more - * contributor license agreements. See the NOTICE file distributed - * with this work for additional information regarding copyright - * ownership. The ASF licenses this file to you under the Apache - * License, Version 2.0 (the "License"); you may not use this file - * except in compliance with the License. You may obtain a copy of - * the License at http://www.apache.org/licenses/LICENSE-2.0 . - --> - -<component loader="com.sun.star.loader.Java2" - xmlns="http://openoffice.org/2010/uno-components"> - <implementation name="com.sun.star.comp.juhtest.SmoketestCommandEnvironment"> - <service name="com.sun.star.deployment.test.SmoketestCommandEnvironment"/> - </implementation> -</component> diff --git a/javaunohelper/util/manifest b/javaunohelper/util/manifest index 2620d3330912..f89dc5414f0c 100644 --- a/javaunohelper/util/manifest +++ b/javaunohelper/util/manifest @@ -1,3 +1,2 @@ Sealed: true -RegistrationClassName: com.sun.star.comp.JavaUNOHelperServices UNO-Type-Path: |