From: Yegor Kozlov <yegor@apache.org>
Date: Tue, 19 Oct 2010 15:44:55 +0000 (+0000)
Subject: fixed packaging of files moved from contrib
X-Git-Tag: REL_3_8_BETA1~156
X-Git-Url: https://source.dussan.org/?a=commitdiff_plain;h=5e7c280797c5e3172709234db3510181d10b77d3;p=poi.git

fixed packaging of files moved from contrib

git-svn-id: https://svn.apache.org/repos/asf/poi/trunk@1024286 13f79535-47bb-0310-9956-ffa450edef68
---

diff --git a/src/examples/src/org/apache/poi/poifs/poibrowser/Codec.java b/src/examples/src/org/apache/poi/poifs/poibrowser/Codec.java
index 213fbecac7..2660f5cc67 100644
--- a/src/examples/src/org/apache/poi/poifs/poibrowser/Codec.java
+++ b/src/examples/src/org/apache/poi/poifs/poibrowser/Codec.java
@@ -15,7 +15,7 @@
    limitations under the License.
 ==================================================================== */
 
-package org.apache.poi.contrib.poibrowser;
+package org.apache.poi.poifs.poibrowser;
 
 import java.io.BufferedReader;
 import java.io.IOException;
diff --git a/src/examples/src/org/apache/poi/poifs/poibrowser/DocumentDescriptor.java b/src/examples/src/org/apache/poi/poifs/poibrowser/DocumentDescriptor.java
index 4f33a59a07..c9647f9a22 100644
--- a/src/examples/src/org/apache/poi/poifs/poibrowser/DocumentDescriptor.java
+++ b/src/examples/src/org/apache/poi/poifs/poibrowser/DocumentDescriptor.java
@@ -15,7 +15,7 @@
    limitations under the License.
 ==================================================================== */
 
-package org.apache.poi.contrib.poibrowser;
+package org.apache.poi.poifs.poibrowser;
 
 import java.io.*;
 import org.apache.poi.poifs.filesystem.*;
diff --git a/src/examples/src/org/apache/poi/poifs/poibrowser/DocumentDescriptorRenderer.java b/src/examples/src/org/apache/poi/poifs/poibrowser/DocumentDescriptorRenderer.java
index 710d1bc051..599ea7cc1c 100644
--- a/src/examples/src/org/apache/poi/poifs/poibrowser/DocumentDescriptorRenderer.java
+++ b/src/examples/src/org/apache/poi/poifs/poibrowser/DocumentDescriptorRenderer.java
@@ -15,7 +15,7 @@
    limitations under the License.
 ==================================================================== */
 
-package org.apache.poi.contrib.poibrowser;
+package org.apache.poi.poifs.poibrowser;
 
 import java.awt.*;
 import javax.swing.*;
diff --git a/src/examples/src/org/apache/poi/poifs/poibrowser/ExtendableTreeCellRenderer.java b/src/examples/src/org/apache/poi/poifs/poibrowser/ExtendableTreeCellRenderer.java
index 178fbf0a58..7f73ebce46 100644
--- a/src/examples/src/org/apache/poi/poifs/poibrowser/ExtendableTreeCellRenderer.java
+++ b/src/examples/src/org/apache/poi/poifs/poibrowser/ExtendableTreeCellRenderer.java
@@ -15,7 +15,7 @@
    limitations under the License.
 ==================================================================== */
 
-package org.apache.poi.contrib.poibrowser;
+package org.apache.poi.poifs.poibrowser;
 
 import java.awt.*;
 import javax.swing.*;
diff --git a/src/examples/src/org/apache/poi/poifs/poibrowser/POIBrowser.java b/src/examples/src/org/apache/poi/poifs/poibrowser/POIBrowser.java
index 416f135023..7dc487db85 100644
--- a/src/examples/src/org/apache/poi/poifs/poibrowser/POIBrowser.java
+++ b/src/examples/src/org/apache/poi/poifs/poibrowser/POIBrowser.java
@@ -15,7 +15,7 @@
    limitations under the License.
 ==================================================================== */
 
-package org.apache.poi.contrib.poibrowser;
+package org.apache.poi.poifs.poibrowser;
 
 import java.awt.event.WindowAdapter;
 import java.awt.event.WindowEvent;
diff --git a/src/examples/src/org/apache/poi/poifs/poibrowser/PropertySetDescriptor.java b/src/examples/src/org/apache/poi/poifs/poibrowser/PropertySetDescriptor.java
index 96a43be106..4596d0260d 100644
--- a/src/examples/src/org/apache/poi/poifs/poibrowser/PropertySetDescriptor.java
+++ b/src/examples/src/org/apache/poi/poifs/poibrowser/PropertySetDescriptor.java
@@ -15,7 +15,7 @@
    limitations under the License.
 ==================================================================== */
 
-package org.apache.poi.contrib.poibrowser;
+package org.apache.poi.poifs.poibrowser;
 
 import java.io.IOException;
 import java.io.UnsupportedEncodingException;
diff --git a/src/examples/src/org/apache/poi/poifs/poibrowser/PropertySetDescriptorRenderer.java b/src/examples/src/org/apache/poi/poifs/poibrowser/PropertySetDescriptorRenderer.java
index f50a3334b0..75277d2f34 100644
--- a/src/examples/src/org/apache/poi/poifs/poibrowser/PropertySetDescriptorRenderer.java
+++ b/src/examples/src/org/apache/poi/poifs/poibrowser/PropertySetDescriptorRenderer.java
@@ -15,7 +15,7 @@
    limitations under the License.
 ==================================================================== */
 
-package org.apache.poi.contrib.poibrowser;
+package org.apache.poi.poifs.poibrowser;
 
 import java.awt.Color;
 import java.awt.Component;
diff --git a/src/examples/src/org/apache/poi/poifs/poibrowser/TreeReaderListener.java b/src/examples/src/org/apache/poi/poifs/poibrowser/TreeReaderListener.java
index 5dd3af644b..34b59eb458 100644
--- a/src/examples/src/org/apache/poi/poifs/poibrowser/TreeReaderListener.java
+++ b/src/examples/src/org/apache/poi/poifs/poibrowser/TreeReaderListener.java
@@ -15,7 +15,7 @@
    limitations under the License.
 ==================================================================== */
 
-package org.apache.poi.contrib.poibrowser;
+package org.apache.poi.poifs.poibrowser;
 
 import java.util.HashMap;
 import java.util.Map;
diff --git a/src/examples/src/org/apache/poi/poifs/poibrowser/Util.java b/src/examples/src/org/apache/poi/poifs/poibrowser/Util.java
index dcb1c51cce..6f5bc6f424 100644
--- a/src/examples/src/org/apache/poi/poifs/poibrowser/Util.java
+++ b/src/examples/src/org/apache/poi/poifs/poibrowser/Util.java
@@ -15,7 +15,7 @@
    limitations under the License.
 ==================================================================== */
 
-package org.apache.poi.contrib.poibrowser;
+package org.apache.poi.poifs.poibrowser;
 
 import java.awt.*;
 import javax.swing.*;
diff --git a/src/java/org/apache/poi/hssf/util/HSSFCellUtil.java b/src/java/org/apache/poi/hssf/util/HSSFCellUtil.java
index 38e280254d..da69364ec0 100644
--- a/src/java/org/apache/poi/hssf/util/HSSFCellUtil.java
+++ b/src/java/org/apache/poi/hssf/util/HSSFCellUtil.java
@@ -15,7 +15,7 @@
    limitations under the License.
 ==================================================================== */
 
-package org.apache.poi.hssf.usermodel.contrib;
+package org.apache.poi.hssf.util;
 
 
 import org.apache.poi.hssf.usermodel.HSSFCell;
@@ -24,7 +24,7 @@ import org.apache.poi.hssf.usermodel.HSSFFont;
 import org.apache.poi.hssf.usermodel.HSSFRow;
 import org.apache.poi.hssf.usermodel.HSSFSheet;
 import org.apache.poi.hssf.usermodel.HSSFWorkbook;
-import org.apache.poi.ss.usermodel.contrib.CellUtil;
+import org.apache.poi.ss.util.CellUtil;
 
 /**
  *  Various utility functions that make working with a cells and rows easier.  The various
diff --git a/src/java/org/apache/poi/hssf/util/HSSFRegionUtil.java b/src/java/org/apache/poi/hssf/util/HSSFRegionUtil.java
index 52a5918535..f3ce0689b4 100644
--- a/src/java/org/apache/poi/hssf/util/HSSFRegionUtil.java
+++ b/src/java/org/apache/poi/hssf/util/HSSFRegionUtil.java
@@ -15,11 +15,11 @@
    limitations under the License.
 ==================================================================== */
 
-package org.apache.poi.hssf.usermodel.contrib;
+package org.apache.poi.hssf.util;
 
 import org.apache.poi.hssf.usermodel.HSSFSheet;
 import org.apache.poi.hssf.usermodel.HSSFWorkbook;
-import org.apache.poi.ss.usermodel.contrib.RegionUtil;
+import org.apache.poi.ss.util.RegionUtil;
 import org.apache.poi.ss.util.CellRangeAddress;
 import org.apache.poi.ss.util.Region;
 
diff --git a/src/java/org/apache/poi/ss/util/CellUtil.java b/src/java/org/apache/poi/ss/util/CellUtil.java
index f84a9d2924..7a1ce9e63b 100644
--- a/src/java/org/apache/poi/ss/util/CellUtil.java
+++ b/src/java/org/apache/poi/ss/util/CellUtil.java
@@ -15,7 +15,7 @@
    limitations under the License.
 ==================================================================== */
 
-package org.apache.poi.ss.usermodel.contrib;
+package org.apache.poi.ss.util;
 
 import java.util.HashMap;
 import java.util.Map;
diff --git a/src/java/org/apache/poi/ss/util/RegionUtil.java b/src/java/org/apache/poi/ss/util/RegionUtil.java
index 612d72aac1..9c425b4c75 100644
--- a/src/java/org/apache/poi/ss/util/RegionUtil.java
+++ b/src/java/org/apache/poi/ss/util/RegionUtil.java
@@ -15,13 +15,12 @@
    limitations under the License.
 ==================================================================== */
 
-package org.apache.poi.ss.usermodel.contrib;
+package org.apache.poi.ss.util;
 
 import org.apache.poi.ss.usermodel.Cell;
 import org.apache.poi.ss.usermodel.Row;
 import org.apache.poi.ss.usermodel.Sheet;
 import org.apache.poi.ss.usermodel.Workbook;
-import org.apache.poi.ss.util.CellRangeAddress;
 
 /**
  * Various utility functions that make working with a region of cells easier.
diff --git a/src/java/org/apache/poi/util/FontMetricsDumper.java b/src/java/org/apache/poi/util/FontMetricsDumper.java
index 068c1a98f3..c974c1e160 100644
--- a/src/java/org/apache/poi/util/FontMetricsDumper.java
+++ b/src/java/org/apache/poi/util/FontMetricsDumper.java
@@ -16,7 +16,7 @@
    limitations under the License.
 ==================================================================== */
         
-package org.apache.poi.contrib.metrics;
+package org.apache.poi.util;
 
 import java.awt.*;
 import java.io.FileOutputStream;