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 213fbecac7d158143a0b62b80ade50fadb78eab8..2660f5cc67831a6d7be04aeabf5b3d171aefd220 100644 (file)
--- 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 4f33a59a07487a7ef49da22e647142b81f5aa22b..c9647f9a221727bbe214ac926024b3567e9b3c0a 100644 (file)
--- 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 710d1bc0518bac42e4b5f1e7b0f590c098e097f0..599ea7cc1cdbab629f6d904ecbf8d54c984bcb8f 100644 (file)
--- 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 178fbf0a587cf3330e2303d3c89a4098b2eca331..7f73ebce4643c4c84aaa529bce080512ba6a50ff 100644 (file)
--- 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 416f1350239d957ba0cea911843ef5d8a5d22e4a..7dc487db851a6cc334f45a7f3d9e95f85ebad407 100644 (file)
--- 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 96a43be106d0053bf1a869c97ad955e674cd0c75..4596d0260dc003b3de632ef42ac19629c5385a06 100644 (file)
--- 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 f50a3334b0621741b62a7a9874d0a23cfed062f2..75277d2f34cc75b7fb42806ad89e2e2cb681cc25 100644 (file)
--- 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 5dd3af644bd7adcf0783aa29278260ce8bfb989e..34b59eb4587fcf8520e1e69f7415ae5d9937301a 100644 (file)
--- 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 dcb1c51cce2174a15452c510d0c48bf5a0f5a674..6f5bc6f424f6ca654eba2d0bb7f193a151af0427 100644 (file)
--- 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 38e280254ddefc874fa94a7640e34966f94d2121..da69364ec081cf9aa9988d398448d91b5b4acd5c 100644 (file)
--- 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 52a59185354800332a80c9d064b39afce381b6c6..f3ce0689b44e6adc28fc85dfd7a51756f6993a63 100644 (file)
--- 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 f84a9d2924b4227d60189bda441098bfed80d031..7a1ce9e63bda82b457553b4d2a422aac38517ef0 100644 (file)
--- 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 612d72aac1f42e035d13284ae31b519d0dfd57d3..9c425b4c757e8fb535f9ffea8d86c1b2afb11461 100644 (file)
--- 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 068c1a98f3406aeb659850854346e0b82d501fdf..c974c1e160f870716a0691059502c80c8adb0db9 100644 (file)
--- 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;