From cde76a32058aef5cd19b17f01aebb6715f97ec6b Mon Sep 17 00:00:00 2001 From: David Ostrovsky Date: Wed, 6 Mar 2013 01:10:53 +0100 Subject: fdo#61726 java class collision with new idl Change-Id: I90ea912fd0cc54068843d21cb2585e78e70a3d71 --- reportbuilder/Jar_reportbuilder.mk | 2 +- .../java/com/sun/star/report/ReportEngine.java | 46 ---------------------- .../java/com/sun/star/report/ReportEngine2.java | 46 ++++++++++++++++++++++ .../star/report/pentaho/PentahoReportEngine.java | 5 +-- 4 files changed, 49 insertions(+), 50 deletions(-) delete mode 100644 reportbuilder/java/com/sun/star/report/ReportEngine.java create mode 100644 reportbuilder/java/com/sun/star/report/ReportEngine2.java diff --git a/reportbuilder/Jar_reportbuilder.mk b/reportbuilder/Jar_reportbuilder.mk index 54e55e626c5b..d99c127820dc 100644 --- a/reportbuilder/Jar_reportbuilder.mk +++ b/reportbuilder/Jar_reportbuilder.mk @@ -68,7 +68,7 @@ $(eval $(call gb_Jar_add_sourcefiles,sun-report-builder,\ reportbuilder/java/com/sun/star/report/OutputRepository \ reportbuilder/java/com/sun/star/report/ParameterMap \ reportbuilder/java/com/sun/star/report/ReportAddIn \ - reportbuilder/java/com/sun/star/report/ReportEngine \ + reportbuilder/java/com/sun/star/report/ReportEngine2 \ reportbuilder/java/com/sun/star/report/ReportEngineMetaData \ reportbuilder/java/com/sun/star/report/ReportEngineParameterNames \ reportbuilder/java/com/sun/star/report/ReportExecutionException \ diff --git a/reportbuilder/java/com/sun/star/report/ReportEngine.java b/reportbuilder/java/com/sun/star/report/ReportEngine.java deleted file mode 100644 index dd88f6a30d86..000000000000 --- a/reportbuilder/java/com/sun/star/report/ReportEngine.java +++ /dev/null @@ -1,46 +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.report; - -/** - * The job factory collects all required properties to build a reportJob - * object. Implementors should define a suitable set of properties to allow - * the configuration of the created report jobs. - * - * How these properties are collected is beyond the scope of this interface. - * For each type of Job, there should be separate job-factory (remote jobs - * vs. local jobs etc). - * - */ -public interface ReportEngine -{ - - public ReportJobDefinition createJobDefinition(); - - public ReportEngineMetaData getMetaData(); - - /** - * Open points: How to define scheduling? - * - * @param definition - * @return the report job definition for the job description. - * @throws JobDefinitionException - */ - public ReportJob createJob(ReportJobDefinition definition) - throws JobDefinitionException; -} diff --git a/reportbuilder/java/com/sun/star/report/ReportEngine2.java b/reportbuilder/java/com/sun/star/report/ReportEngine2.java new file mode 100644 index 000000000000..07a2fa09c1fe --- /dev/null +++ b/reportbuilder/java/com/sun/star/report/ReportEngine2.java @@ -0,0 +1,46 @@ +/* + * 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.report; + +/** + * The job factory collects all required properties to build a reportJob + * object. Implementors should define a suitable set of properties to allow + * the configuration of the created report jobs. + * + * How these properties are collected is beyond the scope of this interface. + * For each type of Job, there should be separate job-factory (remote jobs + * vs. local jobs etc). + * + */ +public interface ReportEngine2 +{ + + public ReportJobDefinition createJobDefinition(); + + public ReportEngineMetaData getMetaData(); + + /** + * Open points: How to define scheduling? + * + * @param definition + * @return the report job definition for the job description. + * @throws JobDefinitionException + */ + public ReportJob createJob(ReportJobDefinition definition) + throws JobDefinitionException; +} diff --git a/reportbuilder/java/com/sun/star/report/pentaho/PentahoReportEngine.java b/reportbuilder/java/com/sun/star/report/pentaho/PentahoReportEngine.java index 2b8d451938a2..01f5480714d4 100644 --- a/reportbuilder/java/com/sun/star/report/pentaho/PentahoReportEngine.java +++ b/reportbuilder/java/com/sun/star/report/pentaho/PentahoReportEngine.java @@ -18,15 +18,14 @@ package com.sun.star.report.pentaho; import com.sun.star.report.JobDefinitionException; -import com.sun.star.report.ReportEngine; +import com.sun.star.report.ReportEngine2; import com.sun.star.report.ReportEngineMetaData; import com.sun.star.report.ReportJob; import com.sun.star.report.ReportJobDefinition; import com.sun.star.report.util.DefaultReportJobDefinition; - import org.jfree.report.JFreeReportBoot; -public class PentahoReportEngine implements ReportEngine +public class PentahoReportEngine implements ReportEngine2 { private final ReportEngineMetaData metaData; -- cgit v1.2.3