Author: desruisseaux
Date: Sat Jul 29 14:19:40 2017
New Revision: 1803374
URL: http://svn.apache.org/viewvc?rev=1803374&view=rev
Log:
Move PixelIterator in an "image" package instead than "iterator". An "iterator"
name is too generic since most iterators (outside this package) are not
specifically for images.
Added:
sis/branches/JDK8/core/sis-raster/src/main/java/org/apache/sis/image/
sis/branches/JDK8/core/sis-raster/src/main/java/org/apache/sis/image/DefaultIterator.java
- copied, changed from r1803373,
sis/branches/JDK8/core/sis-raster/src/main/java/org/apache/sis/iterator/DefaultIterator.java
sis/branches/JDK8/core/sis-raster/src/main/java/org/apache/sis/image/PixelIterator.java
- copied, changed from r1803373,
sis/branches/JDK8/core/sis-raster/src/main/java/org/apache/sis/iterator/PixelIterator.java
sis/branches/JDK8/core/sis-raster/src/main/java/org/apache/sis/image/PixelIteratorFactory.java
- copied, changed from r1803373,
sis/branches/JDK8/core/sis-raster/src/main/java/org/apache/sis/iterator/PixelIteratorFactory.java
sis/branches/JDK8/core/sis-raster/src/main/java/org/apache/sis/image/RectIter.java
- copied, changed from r1803373,
sis/branches/JDK8/core/sis-raster/src/main/java/org/apache/sis/iterator/RectIter.java
sis/branches/JDK8/core/sis-raster/src/main/java/org/apache/sis/image/WritablePixelIterator.java
- copied, changed from r1803373,
sis/branches/JDK8/core/sis-raster/src/main/java/org/apache/sis/iterator/WritablePixelIterator.java
sis/branches/JDK8/core/sis-raster/src/test/java/org/apache/sis/image/
sis/branches/JDK8/core/sis-raster/src/test/java/org/apache/sis/image/IteratorTestImage.java
- copied, changed from r1803373,
sis/branches/JDK8/core/sis-raster/src/test/java/org/apache/sis/iterator/IteratorTestImage.java
sis/branches/JDK8/core/sis-raster/src/test/java/org/apache/sis/image/PixelIteratorTest.java
- copied, changed from r1803373,
sis/branches/JDK8/core/sis-raster/src/test/java/org/apache/sis/iterator/PixelIteratorTest.java
Removed:
sis/branches/JDK8/core/sis-raster/src/main/java/org/apache/sis/iterator/
sis/branches/JDK8/core/sis-raster/src/test/java/org/apache/sis/iterator/
Modified:
sis/branches/JDK8/core/sis-raster/ (props changed)
Propchange: sis/branches/JDK8/core/sis-raster/
------------------------------------------------------------------------------
--- svn:ignore (added)
+++ svn:ignore Sat Jul 29 14:19:40 2017
@@ -0,0 +1,10 @@
+.project
+.settings
+.classpath
+.jetproperties
+.wtpmodules
+target
+bin
+cobertura.ser
+nbproject
+nbactions.xml
Copied:
sis/branches/JDK8/core/sis-raster/src/main/java/org/apache/sis/image/DefaultIterator.java
(from r1803373,
sis/branches/JDK8/core/sis-raster/src/main/java/org/apache/sis/iterator/DefaultIterator.java)
URL:
http://svn.apache.org/viewvc/sis/branches/JDK8/core/sis-raster/src/main/java/org/apache/sis/image/DefaultIterator.java?p2=sis/branches/JDK8/core/sis-raster/src/main/java/org/apache/sis/image/DefaultIterator.java&p1=sis/branches/JDK8/core/sis-raster/src/main/java/org/apache/sis/iterator/DefaultIterator.java&r1=1803373&r2=1803374&rev=1803374&view=diff
==============================================================================
---
sis/branches/JDK8/core/sis-raster/src/main/java/org/apache/sis/iterator/DefaultIterator.java
[UTF-8] (original)
+++
sis/branches/JDK8/core/sis-raster/src/main/java/org/apache/sis/image/DefaultIterator.java
[UTF-8] Sat Jul 29 14:19:40 2017
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.sis.iterator;
+package org.apache.sis.image;
import java.awt.Rectangle;
import java.awt.image.Raster;
Copied:
sis/branches/JDK8/core/sis-raster/src/main/java/org/apache/sis/image/PixelIterator.java
(from r1803373,
sis/branches/JDK8/core/sis-raster/src/main/java/org/apache/sis/iterator/PixelIterator.java)
URL:
http://svn.apache.org/viewvc/sis/branches/JDK8/core/sis-raster/src/main/java/org/apache/sis/image/PixelIterator.java?p2=sis/branches/JDK8/core/sis-raster/src/main/java/org/apache/sis/image/PixelIterator.java&p1=sis/branches/JDK8/core/sis-raster/src/main/java/org/apache/sis/iterator/PixelIterator.java&r1=1803373&r2=1803374&rev=1803374&view=diff
==============================================================================
---
sis/branches/JDK8/core/sis-raster/src/main/java/org/apache/sis/iterator/PixelIterator.java
[UTF-8] (original)
+++
sis/branches/JDK8/core/sis-raster/src/main/java/org/apache/sis/image/PixelIterator.java
[UTF-8] Sat Jul 29 14:19:40 2017
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.sis.iterator;
+package org.apache.sis.image;
import java.awt.Dimension;
import java.awt.Rectangle;
@@ -48,7 +48,7 @@ import org.opengis.coverage.grid.Sequenc
* @author Rémi Marechal (Geomatys)
* @author Martin Desruisseaux (Geomatys)
*/
-abstract class PixelIterator implements Closeable {
+public abstract class PixelIterator implements Closeable {
/**
* Define boundary, in pixel coordinates, of area traveled by this
PixeIterator.
Copied:
sis/branches/JDK8/core/sis-raster/src/main/java/org/apache/sis/image/PixelIteratorFactory.java
(from r1803373,
sis/branches/JDK8/core/sis-raster/src/main/java/org/apache/sis/iterator/PixelIteratorFactory.java)
URL:
http://svn.apache.org/viewvc/sis/branches/JDK8/core/sis-raster/src/main/java/org/apache/sis/image/PixelIteratorFactory.java?p2=sis/branches/JDK8/core/sis-raster/src/main/java/org/apache/sis/image/PixelIteratorFactory.java&p1=sis/branches/JDK8/core/sis-raster/src/main/java/org/apache/sis/iterator/PixelIteratorFactory.java&r1=1803373&r2=1803374&rev=1803374&view=diff
==============================================================================
---
sis/branches/JDK8/core/sis-raster/src/main/java/org/apache/sis/iterator/PixelIteratorFactory.java
[UTF-8] (original)
+++
sis/branches/JDK8/core/sis-raster/src/main/java/org/apache/sis/image/PixelIteratorFactory.java
[UTF-8] Sat Jul 29 14:19:40 2017
@@ -14,18 +14,17 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.sis.iterator;
+package org.apache.sis.image;
import java.awt.Rectangle;
import java.awt.image.*;
-import java.util.Arrays;
/**
* Create an appropriate iterator.
*
* @author Rémi Marechal (Geomatys).
*/
-public final class PixelIteratorFactory {
+final class PixelIteratorFactory {
private PixelIteratorFactory() {
}
Copied:
sis/branches/JDK8/core/sis-raster/src/main/java/org/apache/sis/image/RectIter.java
(from r1803373,
sis/branches/JDK8/core/sis-raster/src/main/java/org/apache/sis/iterator/RectIter.java)
URL:
http://svn.apache.org/viewvc/sis/branches/JDK8/core/sis-raster/src/main/java/org/apache/sis/image/RectIter.java?p2=sis/branches/JDK8/core/sis-raster/src/main/java/org/apache/sis/image/RectIter.java&p1=sis/branches/JDK8/core/sis-raster/src/main/java/org/apache/sis/iterator/RectIter.java&r1=1803373&r2=1803374&rev=1803374&view=diff
==============================================================================
---
sis/branches/JDK8/core/sis-raster/src/main/java/org/apache/sis/iterator/RectIter.java
[UTF-8] (original)
+++
sis/branches/JDK8/core/sis-raster/src/main/java/org/apache/sis/image/RectIter.java
[UTF-8] Sat Jul 29 14:19:40 2017
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.sis.iterator;
+package org.apache.sis.image;
import java.awt.Rectangle;
Copied:
sis/branches/JDK8/core/sis-raster/src/main/java/org/apache/sis/image/WritablePixelIterator.java
(from r1803373,
sis/branches/JDK8/core/sis-raster/src/main/java/org/apache/sis/iterator/WritablePixelIterator.java)
URL:
http://svn.apache.org/viewvc/sis/branches/JDK8/core/sis-raster/src/main/java/org/apache/sis/image/WritablePixelIterator.java?p2=sis/branches/JDK8/core/sis-raster/src/main/java/org/apache/sis/image/WritablePixelIterator.java&p1=sis/branches/JDK8/core/sis-raster/src/main/java/org/apache/sis/iterator/WritablePixelIterator.java&r1=1803373&r2=1803374&rev=1803374&view=diff
==============================================================================
---
sis/branches/JDK8/core/sis-raster/src/main/java/org/apache/sis/iterator/WritablePixelIterator.java
[UTF-8] (original)
+++
sis/branches/JDK8/core/sis-raster/src/main/java/org/apache/sis/image/WritablePixelIterator.java
[UTF-8] Sat Jul 29 14:19:40 2017
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.sis.iterator;
+package org.apache.sis.image;
import java.awt.Rectangle;
import java.awt.image.WritableRaster;
Copied:
sis/branches/JDK8/core/sis-raster/src/test/java/org/apache/sis/image/IteratorTestImage.java
(from r1803373,
sis/branches/JDK8/core/sis-raster/src/test/java/org/apache/sis/iterator/IteratorTestImage.java)
URL:
http://svn.apache.org/viewvc/sis/branches/JDK8/core/sis-raster/src/test/java/org/apache/sis/image/IteratorTestImage.java?p2=sis/branches/JDK8/core/sis-raster/src/test/java/org/apache/sis/image/IteratorTestImage.java&p1=sis/branches/JDK8/core/sis-raster/src/test/java/org/apache/sis/iterator/IteratorTestImage.java&r1=1803373&r2=1803374&rev=1803374&view=diff
==============================================================================
---
sis/branches/JDK8/core/sis-raster/src/test/java/org/apache/sis/iterator/IteratorTestImage.java
[UTF-8] (original)
+++
sis/branches/JDK8/core/sis-raster/src/test/java/org/apache/sis/image/IteratorTestImage.java
[UTF-8] Sat Jul 29 14:19:40 2017
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.sis.iterator;
+package org.apache.sis.image;
import java.awt.Dimension;
import java.awt.Point;
Copied:
sis/branches/JDK8/core/sis-raster/src/test/java/org/apache/sis/image/PixelIteratorTest.java
(from r1803373,
sis/branches/JDK8/core/sis-raster/src/test/java/org/apache/sis/iterator/PixelIteratorTest.java)
URL:
http://svn.apache.org/viewvc/sis/branches/JDK8/core/sis-raster/src/test/java/org/apache/sis/image/PixelIteratorTest.java?p2=sis/branches/JDK8/core/sis-raster/src/test/java/org/apache/sis/image/PixelIteratorTest.java&p1=sis/branches/JDK8/core/sis-raster/src/test/java/org/apache/sis/iterator/PixelIteratorTest.java&r1=1803373&r2=1803374&rev=1803374&view=diff
==============================================================================
---
sis/branches/JDK8/core/sis-raster/src/test/java/org/apache/sis/iterator/PixelIteratorTest.java
[UTF-8] (original)
+++
sis/branches/JDK8/core/sis-raster/src/test/java/org/apache/sis/image/PixelIteratorTest.java
[UTF-8] Sat Jul 29 14:19:40 2017
@@ -14,8 +14,10 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.sis.iterator;
+package org.apache.sis.image;
+import org.apache.sis.image.PixelIteratorFactory;
+import org.apache.sis.image.PixelIterator;
import java.awt.Point;
import java.awt.Rectangle;
import java.awt.image.DataBuffer;
