add license header; organize imports

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

diff --git a/src/java/org/apache/poi/hpsf/Array.java b/src/java/org/apache/poi/hpsf/Array.java
index cdb78f6f92c988cf0399f9e1ca501106353e0087..8850ab9cd639f7ab2d0e58de7be9c7cddf70facd 100644 (file)
--- a/src/java/org/apache/poi/hpsf/Array.java
+++ b/src/java/org/apache/poi/hpsf/Array.java
@@ -1,3 +1,19 @@
+/* ====================================================================
+   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
+
+   Unless required by applicable law or agreed to in writing, software
+   distributed under the License is distributed on an "AS IS" BASIS,
+   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+   See the License for the specific language governing permissions and
+   limitations under the License.
+==================================================================== */
 package org.apache.poi.hpsf;
 
 import org.apache.poi.util.Internal;

diff --git a/src/java/org/apache/poi/hpsf/Blob.java b/src/java/org/apache/poi/hpsf/Blob.java
index 5ece25f3278f9404285ed2be6709d0fc4fd756e9..547e2392ba35afd95864161e0f2bdbc981aae82d 100644 (file)
--- a/src/java/org/apache/poi/hpsf/Blob.java
+++ b/src/java/org/apache/poi/hpsf/Blob.java
@@ -1,3 +1,19 @@
+/* ====================================================================
+   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
+
+   Unless required by applicable law or agreed to in writing, software
+   distributed under the License is distributed on an "AS IS" BASIS,
+   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+   See the License for the specific language governing permissions and
+   limitations under the License.
+==================================================================== */
 package org.apache.poi.hpsf;
 
 import org.apache.poi.util.Internal;

diff --git a/src/java/org/apache/poi/hpsf/ClipboardData.java b/src/java/org/apache/poi/hpsf/ClipboardData.java
index 72e680489fcdfc4356c09d55704881b5241efdd2..cf04733efa9a5a6ce4d31ee2a2e7364abcfabec5 100644 (file)
--- a/src/java/org/apache/poi/hpsf/ClipboardData.java
+++ b/src/java/org/apache/poi/hpsf/ClipboardData.java
@@ -1,3 +1,19 @@
+/* ====================================================================
+   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
+
+   Unless required by applicable law or agreed to in writing, software
+   distributed under the License is distributed on an "AS IS" BASIS,
+   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+   See the License for the specific language governing permissions and
+   limitations under the License.
+==================================================================== */
 package org.apache.poi.hpsf;
 
 import java.io.IOException;

diff --git a/src/java/org/apache/poi/hpsf/CodePageString.java b/src/java/org/apache/poi/hpsf/CodePageString.java
index 89f3684832d2e8fa74026a9f308612aa689bf61d..3fe4fec9a06bdb5f2bfff5079f9bae96bf1dc6b3 100644 (file)
--- a/src/java/org/apache/poi/hpsf/CodePageString.java
+++ b/src/java/org/apache/poi/hpsf/CodePageString.java
@@ -1,3 +1,19 @@
+/* ====================================================================
+   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
+
+   Unless required by applicable law or agreed to in writing, software
+   distributed under the License is distributed on an "AS IS" BASIS,
+   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+   See the License for the specific language governing permissions and
+   limitations under the License.
+==================================================================== */
 package org.apache.poi.hpsf;
 
 import java.io.IOException;

diff --git a/src/java/org/apache/poi/hpsf/Currency.java b/src/java/org/apache/poi/hpsf/Currency.java
index 204cb91db844ea0b401ef27d8ce72362f71e3b51..8928a56a036ae52621608c3fd6abc6b40475d5db 100644 (file)
--- a/src/java/org/apache/poi/hpsf/Currency.java
+++ b/src/java/org/apache/poi/hpsf/Currency.java
@@ -1,8 +1,23 @@
-package org.apache.poi.hpsf;
+/* ====================================================================
+   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
 
-import org.apache.poi.util.LittleEndian;
+       http://www.apache.org/licenses/LICENSE-2.0
+
+   Unless required by applicable law or agreed to in writing, software
+   distributed under the License is distributed on an "AS IS" BASIS,
+   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+   See the License for the specific language governing permissions and
+   limitations under the License.
+==================================================================== */
+package org.apache.poi.hpsf;
 
 import org.apache.poi.util.Internal;
+import org.apache.poi.util.LittleEndian;
 
 @Internal
 class Currency

diff --git a/src/java/org/apache/poi/hpsf/Date.java b/src/java/org/apache/poi/hpsf/Date.java
index ede62ee5753643cd3ac20067a990a10d7d22d599..237420fcc06b6d530575366718acc2df932c2327 100644 (file)
--- a/src/java/org/apache/poi/hpsf/Date.java
+++ b/src/java/org/apache/poi/hpsf/Date.java
@@ -1,8 +1,23 @@
-package org.apache.poi.hpsf;
+/* ====================================================================
+   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
 
-import org.apache.poi.util.LittleEndian;
+       http://www.apache.org/licenses/LICENSE-2.0
+
+   Unless required by applicable law or agreed to in writing, software
+   distributed under the License is distributed on an "AS IS" BASIS,
+   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+   See the License for the specific language governing permissions and
+   limitations under the License.
+==================================================================== */
+package org.apache.poi.hpsf;
 
 import org.apache.poi.util.Internal;
+import org.apache.poi.util.LittleEndian;
 
 @Internal
 class Date

diff --git a/src/java/org/apache/poi/hpsf/Decimal.java b/src/java/org/apache/poi/hpsf/Decimal.java
index 7572945f802d0be9619cdae095fc982dd001b906..8897d3d5b2ec60f82e4a1e73858d5b47d82d1d87 100644 (file)
--- a/src/java/org/apache/poi/hpsf/Decimal.java
+++ b/src/java/org/apache/poi/hpsf/Decimal.java
@@ -1,7 +1,22 @@
+/* ====================================================================
+   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
+
+   Unless required by applicable law or agreed to in writing, software
+   distributed under the License is distributed on an "AS IS" BASIS,
+   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+   See the License for the specific language governing permissions and
+   limitations under the License.
+==================================================================== */
 package org.apache.poi.hpsf;
 
 import org.apache.poi.util.Internal;
-
 import org.apache.poi.util.LittleEndian;
 
 @Internal

diff --git a/src/java/org/apache/poi/hpsf/Filetime.java b/src/java/org/apache/poi/hpsf/Filetime.java
index bb7c3ff1793125b3d8b7ec06a0947ec4e429ec17..84a58bb1dbaf41d88ea107eb93afd15cf8c32c72 100644 (file)
--- a/src/java/org/apache/poi/hpsf/Filetime.java
+++ b/src/java/org/apache/poi/hpsf/Filetime.java
@@ -1,3 +1,19 @@
+/* ====================================================================
+   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
+
+   Unless required by applicable law or agreed to in writing, software
+   distributed under the License is distributed on an "AS IS" BASIS,
+   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+   See the License for the specific language governing permissions and
+   limitations under the License.
+==================================================================== */
 package org.apache.poi.hpsf;
 
 import java.io.IOException;

diff --git a/src/java/org/apache/poi/hpsf/GUID.java b/src/java/org/apache/poi/hpsf/GUID.java
index 050cb9327dbe8803f1bcbd1e93335b2875b256ce..4bbd7f34148e2987e81be5269c14dc3c7dc2b956 100644 (file)
--- a/src/java/org/apache/poi/hpsf/GUID.java
+++ b/src/java/org/apache/poi/hpsf/GUID.java
@@ -1,7 +1,22 @@
+/* ====================================================================
+   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
+
+   Unless required by applicable law or agreed to in writing, software
+   distributed under the License is distributed on an "AS IS" BASIS,
+   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+   See the License for the specific language governing permissions and
+   limitations under the License.
+==================================================================== */
 package org.apache.poi.hpsf;
 
 import org.apache.poi.util.Internal;
-
 import org.apache.poi.util.LittleEndian;
 
 @Internal

diff --git a/src/java/org/apache/poi/hpsf/IndirectPropertyName.java b/src/java/org/apache/poi/hpsf/IndirectPropertyName.java
index 826136ccdd6ec77cd44801a78ce5e6f190aa6e26..d0dea877f5a63d3eaa4b5d5e2bf4ac22180f9c13 100644 (file)
--- a/src/java/org/apache/poi/hpsf/IndirectPropertyName.java
+++ b/src/java/org/apache/poi/hpsf/IndirectPropertyName.java
@@ -1,3 +1,19 @@
+/* ====================================================================
+   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
+
+   Unless required by applicable law or agreed to in writing, software
+   distributed under the License is distributed on an "AS IS" BASIS,
+   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+   See the License for the specific language governing permissions and
+   limitations under the License.
+==================================================================== */
 package org.apache.poi.hpsf;
 
 import org.apache.poi.util.Internal;

diff --git a/src/java/org/apache/poi/hpsf/UnicodeString.java b/src/java/org/apache/poi/hpsf/UnicodeString.java
index 5d107400684a8faf606e8f599c587f5b4317b0bb..dbb82528a24211c9fc3899f0f458aad8d72e37b9 100644 (file)
--- a/src/java/org/apache/poi/hpsf/UnicodeString.java
+++ b/src/java/org/apache/poi/hpsf/UnicodeString.java
@@ -1,3 +1,19 @@
+/* ====================================================================
+   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
+
+   Unless required by applicable law or agreed to in writing, software
+   distributed under the License is distributed on an "AS IS" BASIS,
+   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+   See the License for the specific language governing permissions and
+   limitations under the License.
+==================================================================== */
 package org.apache.poi.hpsf;
 
 import org.apache.poi.util.Internal;
@@ -28,15 +44,6 @@ class UnicodeString
                             + " is not NULL-terminated" );
     }
 
-    String toJavaString()
-    {
-        if ( _value.length == 0 )
-            return null;
-
-        return StringUtil.getFromUnicodeLE( _value, 0,
-                ( _value.length - 2 ) >> 1 );
-    }
-
     int getSize()
     {
         return LittleEndian.INT_SIZE + _value.length;
@@ -46,4 +53,13 @@ class UnicodeString
     {
         return _value;
     }
+
+    String toJavaString()
+    {
+        if ( _value.length == 0 )
+            return null;
+
+        return StringUtil.getFromUnicodeLE( _value, 0,
+                ( _value.length - 2 ) >> 1 );
+    }
 }

diff --git a/src/java/org/apache/poi/hpsf/VariantBool.java b/src/java/org/apache/poi/hpsf/VariantBool.java
index 6b1dabc96cdd77ca363e237df504cd17fa6b0937..667b1047d923b89386147cab3b04be85ae201a5f 100644 (file)
--- a/src/java/org/apache/poi/hpsf/VariantBool.java
+++ b/src/java/org/apache/poi/hpsf/VariantBool.java
@@ -1,3 +1,19 @@
+/* ====================================================================
+   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
+
+   Unless required by applicable law or agreed to in writing, software
+   distributed under the License is distributed on an "AS IS" BASIS,
+   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+   See the License for the specific language governing permissions and
+   limitations under the License.
+==================================================================== */
 package org.apache.poi.hpsf;
 
 import org.apache.poi.util.Internal;
@@ -8,8 +24,9 @@ import org.apache.poi.util.POILogger;
 @Internal
 class VariantBool
 {
-    private final static POILogger logger = POILogFactory.getLogger( VariantBool.class );
-    
+    private final static POILogger logger = POILogFactory
+            .getLogger( VariantBool.class );
+
     static final int SIZE = 2;
 
     private boolean _value;

diff --git a/src/java/org/apache/poi/hpsf/Vector.java b/src/java/org/apache/poi/hpsf/Vector.java
index 65caad3b987c1194f0f5d55103aef4fdb47d6760..9cfa14310baa180773881461500ec5a6c0cd0d95 100644 (file)
--- a/src/java/org/apache/poi/hpsf/Vector.java
+++ b/src/java/org/apache/poi/hpsf/Vector.java
@@ -1,3 +1,19 @@
+/* ====================================================================
+   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
+
+   Unless required by applicable law or agreed to in writing, software
+   distributed under the License is distributed on an "AS IS" BASIS,
+   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+   See the License for the specific language governing permissions and
+   limitations under the License.
+==================================================================== */
 package org.apache.poi.hpsf;
 
 import org.apache.poi.util.Internal;
@@ -15,15 +31,15 @@ class Vector
 
     private TypedPropertyValue[] _values;
 
-    Vector( short type )
+    Vector( byte[] data, int startOffset, short type )
     {
         this._type = type;
+        read( data, startOffset );
     }
 
-    Vector( byte[] data, int startOffset, short type )
+    Vector( short type )
     {
         this._type = type;
-        read( data, startOffset );
     }
 
     int read( byte[] data, int startOffset )