From f8686cb8b622c5047db943704958efd508603171 Mon Sep 17 00:00:00 2001 From: Nick Burch Date: Sat, 8 Mar 2008 18:09:07 +0000 Subject: [PATCH] Start to rename hslf and hwpf in ooxml to xslf and xwpf git-svn-id: https://svn.apache.org/repos/asf/poi/branches/ooxml@635031 13f79535-47bb-0310-9956-ffa450edef68 --- src/ooxml/java/org/apache/poi/{hslf => xslf}/HSLFXML.java | 0 .../{hslf => xslf}/extractor/HXFPowerPointExtractor.java | 2 +- .../poi/{hslf => xslf}/usermodel/HSLFXMLSlideShow.java | 6 +++--- src/ooxml/java/org/apache/poi/{hwpf => xwpf}/HWPFXML.java | 0 .../poi/{hwpf => xwpf}/extractor/HXFWordExtractor.java | 0 .../poi/{hwpf => xwpf}/usermodel/HWPFXMLDocument.java | 0 .../org/apache/poi/{hslf => xslf}/TestHSLFXML.java | 0 .../extractor/TestHXFPowerPointExtractor.java | 0 .../org/apache/poi/{hwpf => xwpf}/TestHWPFXML.java | 0 .../poi/{hwpf => xwpf}/extractor/TestHXFWordExtractor.java | 0 10 files changed, 4 insertions(+), 4 deletions(-) rename src/ooxml/java/org/apache/poi/{hslf => xslf}/HSLFXML.java (100%) rename src/ooxml/java/org/apache/poi/{hslf => xslf}/extractor/HXFPowerPointExtractor.java (99%) rename src/ooxml/java/org/apache/poi/{hslf => xslf}/usermodel/HSLFXMLSlideShow.java (92%) rename src/ooxml/java/org/apache/poi/{hwpf => xwpf}/HWPFXML.java (100%) rename src/ooxml/java/org/apache/poi/{hwpf => xwpf}/extractor/HXFWordExtractor.java (100%) rename src/ooxml/java/org/apache/poi/{hwpf => xwpf}/usermodel/HWPFXMLDocument.java (100%) rename src/ooxml/testcases/org/apache/poi/{hslf => xslf}/TestHSLFXML.java (100%) rename src/ooxml/testcases/org/apache/poi/{hslf => xslf}/extractor/TestHXFPowerPointExtractor.java (100%) rename src/ooxml/testcases/org/apache/poi/{hwpf => xwpf}/TestHWPFXML.java (100%) rename src/ooxml/testcases/org/apache/poi/{hwpf => xwpf}/extractor/TestHXFWordExtractor.java (100%) diff --git a/src/ooxml/java/org/apache/poi/hslf/HSLFXML.java b/src/ooxml/java/org/apache/poi/xslf/HSLFXML.java similarity index 100% rename from src/ooxml/java/org/apache/poi/hslf/HSLFXML.java rename to src/ooxml/java/org/apache/poi/xslf/HSLFXML.java diff --git a/src/ooxml/java/org/apache/poi/hslf/extractor/HXFPowerPointExtractor.java b/src/ooxml/java/org/apache/poi/xslf/extractor/HXFPowerPointExtractor.java similarity index 99% rename from src/ooxml/java/org/apache/poi/hslf/extractor/HXFPowerPointExtractor.java rename to src/ooxml/java/org/apache/poi/xslf/extractor/HXFPowerPointExtractor.java index 1d4b1a2bd4..bfa59e32cd 100644 --- a/src/ooxml/java/org/apache/poi/hslf/extractor/HXFPowerPointExtractor.java +++ b/src/ooxml/java/org/apache/poi/xslf/extractor/HXFPowerPointExtractor.java @@ -42,7 +42,7 @@ public class HXFPowerPointExtractor extends POIXMLTextExtractor { public HXFPowerPointExtractor(Package container) throws XmlException, OpenXML4JException, IOException { this(new HSLFXMLSlideShow( - new HSLFXML(container) + new XSLFXML(container) )); } public HXFPowerPointExtractor(HSLFXMLSlideShow slideshow) { diff --git a/src/ooxml/java/org/apache/poi/hslf/usermodel/HSLFXMLSlideShow.java b/src/ooxml/java/org/apache/poi/xslf/usermodel/HSLFXMLSlideShow.java similarity index 92% rename from src/ooxml/java/org/apache/poi/hslf/usermodel/HSLFXMLSlideShow.java rename to src/ooxml/java/org/apache/poi/xslf/usermodel/HSLFXMLSlideShow.java index b8a5fcde35..f4360bfff5 100644 --- a/src/ooxml/java/org/apache/poi/hslf/usermodel/HSLFXMLSlideShow.java +++ b/src/ooxml/java/org/apache/poi/xslf/usermodel/HSLFXMLSlideShow.java @@ -26,14 +26,14 @@ import org.apache.poi.hslf.HSLFXML; * top level object for creating new slides/etc. */ public class HSLFXMLSlideShow extends POIXMLDocument { - private org.apache.poi.hslf.HSLFXML hslfXML; + private org.apache.poi.hslf.XSLFXML hslfXML; - public HSLFXMLSlideShow(HSLFXML xml) { + public HSLFXMLSlideShow(XSLFXML xml) { super(xml); this.hslfXML = xml; } - public HSLFXML _getHSLFXML() { + public XSLFXML _getHSLFXML() { return hslfXML; } } diff --git a/src/ooxml/java/org/apache/poi/hwpf/HWPFXML.java b/src/ooxml/java/org/apache/poi/xwpf/HWPFXML.java similarity index 100% rename from src/ooxml/java/org/apache/poi/hwpf/HWPFXML.java rename to src/ooxml/java/org/apache/poi/xwpf/HWPFXML.java diff --git a/src/ooxml/java/org/apache/poi/hwpf/extractor/HXFWordExtractor.java b/src/ooxml/java/org/apache/poi/xwpf/extractor/HXFWordExtractor.java similarity index 100% rename from src/ooxml/java/org/apache/poi/hwpf/extractor/HXFWordExtractor.java rename to src/ooxml/java/org/apache/poi/xwpf/extractor/HXFWordExtractor.java diff --git a/src/ooxml/java/org/apache/poi/hwpf/usermodel/HWPFXMLDocument.java b/src/ooxml/java/org/apache/poi/xwpf/usermodel/HWPFXMLDocument.java similarity index 100% rename from src/ooxml/java/org/apache/poi/hwpf/usermodel/HWPFXMLDocument.java rename to src/ooxml/java/org/apache/poi/xwpf/usermodel/HWPFXMLDocument.java diff --git a/src/ooxml/testcases/org/apache/poi/hslf/TestHSLFXML.java b/src/ooxml/testcases/org/apache/poi/xslf/TestHSLFXML.java similarity index 100% rename from src/ooxml/testcases/org/apache/poi/hslf/TestHSLFXML.java rename to src/ooxml/testcases/org/apache/poi/xslf/TestHSLFXML.java diff --git a/src/ooxml/testcases/org/apache/poi/hslf/extractor/TestHXFPowerPointExtractor.java b/src/ooxml/testcases/org/apache/poi/xslf/extractor/TestHXFPowerPointExtractor.java similarity index 100% rename from src/ooxml/testcases/org/apache/poi/hslf/extractor/TestHXFPowerPointExtractor.java rename to src/ooxml/testcases/org/apache/poi/xslf/extractor/TestHXFPowerPointExtractor.java diff --git a/src/ooxml/testcases/org/apache/poi/hwpf/TestHWPFXML.java b/src/ooxml/testcases/org/apache/poi/xwpf/TestHWPFXML.java similarity index 100% rename from src/ooxml/testcases/org/apache/poi/hwpf/TestHWPFXML.java rename to src/ooxml/testcases/org/apache/poi/xwpf/TestHWPFXML.java diff --git a/src/ooxml/testcases/org/apache/poi/hwpf/extractor/TestHXFWordExtractor.java b/src/ooxml/testcases/org/apache/poi/xwpf/extractor/TestHXFWordExtractor.java similarity index 100% rename from src/ooxml/testcases/org/apache/poi/hwpf/extractor/TestHXFWordExtractor.java rename to src/ooxml/testcases/org/apache/poi/xwpf/extractor/TestHXFWordExtractor.java -- 2.39.5