Author: desruisseaux
Date: Thu Jun 6 08:11:57 2013
New Revision: 1490188
URL: http://svn.apache.org/r1490188
Log:
Moved QuadTree and related classes in its own package, namely
org.apache.sis.index.tree.
Also moved from "sis-referencing" to "sis-storage" module. The only changes in
this commit
are import statements, dependencies in pom.xml files, and removal of trailing
whitespaces.
There is no other code change in this commit.
Added:
sis/branches/JDK7/application/sis-webapp/src/main/java/org/apache/sis/index/
sis/branches/JDK7/application/sis-webapp/src/main/java/org/apache/sis/index/tree/
sis/branches/JDK7/application/sis-webapp/src/main/java/org/apache/sis/index/tree/QuadTreeReader.java
- copied, changed from r1490057,
sis/branches/JDK7/application/sis-webapp/src/main/java/org/apache/sis/storage/QuadTreeReader.java
sis/branches/JDK7/storage/sis-storage/src/main/java/org/apache/sis/index/
sis/branches/JDK7/storage/sis-storage/src/main/java/org/apache/sis/index/tree/
- copied from r1490057,
sis/branches/JDK7/core/sis-referencing/src/main/java/org/apache/sis/storage/
sis/branches/JDK7/storage/sis-storage/src/test/java/org/apache/sis/index/
sis/branches/JDK7/storage/sis-storage/src/test/java/org/apache/sis/index/tree/
- copied from r1490057,
sis/branches/JDK7/core/sis-referencing/src/test/java/org/apache/sis/storage/
Removed:
sis/branches/JDK7/application/sis-webapp/src/main/java/org/apache/sis/storage/QuadTreeReader.java
sis/branches/JDK7/core/sis-referencing/src/main/java/org/apache/sis/storage/
sis/branches/JDK7/core/sis-referencing/src/test/java/org/apache/sis/storage/
Modified:
sis/branches/JDK7/CHANGES
sis/branches/JDK7/application/sis-webapp/pom.xml
sis/branches/JDK7/application/sis-webapp/src/main/java/org/apache/sis/services/LocationServlet.java
sis/branches/JDK7/application/sis-webapp/src/main/java/org/apache/sis/storage/GeoRSSData.java
sis/branches/JDK7/storage/pom.xml
sis/branches/JDK7/storage/sis-storage/src/main/java/org/apache/sis/index/tree/NodeType.java
sis/branches/JDK7/storage/sis-storage/src/main/java/org/apache/sis/index/tree/QuadTree.java
sis/branches/JDK7/storage/sis-storage/src/main/java/org/apache/sis/index/tree/QuadTreeData.java
sis/branches/JDK7/storage/sis-storage/src/main/java/org/apache/sis/index/tree/QuadTreeNode.java
sis/branches/JDK7/storage/sis-storage/src/main/java/org/apache/sis/index/tree/QuadTreeWriter.java
sis/branches/JDK7/storage/sis-storage/src/main/java/org/apache/sis/index/tree/Quadrant.java
sis/branches/JDK7/storage/sis-storage/src/test/java/org/apache/sis/index/tree/TestQuadTreeNode.java
Modified: sis/branches/JDK7/CHANGES
URL:
http://svn.apache.org/viewvc/sis/branches/JDK7/CHANGES?rev=1490188&r1=1490187&r2=1490188&view=diff
==============================================================================
--- sis/branches/JDK7/CHANGES (original)
+++ sis/branches/JDK7/CHANGES Thu Jun 6 08:11:57 2013
@@ -1,7 +1,10 @@
Apache SIS Change Log
======================
-Release 0.3-incubating - Current Development
+Release 0.3 - Current Development
+
+* SIS-101 Moved QuadTree and related classes to its own package,
+ namely org.apache.sis.index.tree.
* SIS-31 Website needs a facelift (aestrada, Ross Laidlaw,
Suresh Marru, mattmann)
Modified: sis/branches/JDK7/application/sis-webapp/pom.xml
URL:
http://svn.apache.org/viewvc/sis/branches/JDK7/application/sis-webapp/pom.xml?rev=1490188&r1=1490187&r2=1490188&view=diff
==============================================================================
--- sis/branches/JDK7/application/sis-webapp/pom.xml (original)
+++ sis/branches/JDK7/application/sis-webapp/pom.xml Thu Jun 6 08:11:57 2013
@@ -53,8 +53,8 @@
module only. -->
</dependency>
<dependency>
- <groupId>org.apache.sis</groupId>
- <artifactId>sis-referencing</artifactId>
+ <groupId>org.apache.sis.storage</groupId>
+ <artifactId>sis-storage</artifactId>
<version>${project.version}</version>
</dependency>
</dependencies>
Copied:
sis/branches/JDK7/application/sis-webapp/src/main/java/org/apache/sis/index/tree/QuadTreeReader.java
(from r1490057,
sis/branches/JDK7/application/sis-webapp/src/main/java/org/apache/sis/storage/QuadTreeReader.java)
URL:
http://svn.apache.org/viewvc/sis/branches/JDK7/application/sis-webapp/src/main/java/org/apache/sis/index/tree/QuadTreeReader.java?p2=sis/branches/JDK7/application/sis-webapp/src/main/java/org/apache/sis/index/tree/QuadTreeReader.java&p1=sis/branches/JDK7/application/sis-webapp/src/main/java/org/apache/sis/storage/QuadTreeReader.java&r1=1490057&r2=1490188&rev=1490188&view=diff
==============================================================================
---
sis/branches/JDK7/application/sis-webapp/src/main/java/org/apache/sis/storage/QuadTreeReader.java
[UTF-8] (original)
+++
sis/branches/JDK7/application/sis-webapp/src/main/java/org/apache/sis/index/tree/QuadTreeReader.java
[UTF-8] Thu Jun 6 08:11:57 2013
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-package org.apache.sis.storage;
+package org.apache.sis.index.tree;
//JDK imports
import java.io.BufferedReader;
@@ -25,16 +25,17 @@ import java.io.IOException;
//SIS imports
import org.apache.sis.core.LatLon;
+import org.apache.sis.storage.GeoRSSData;
/**
* Class to reload the quad tree index from file.
- *
+ *
*/
public class QuadTreeReader {
/**
* Loads the quad tree index from file.
- *
+ *
* @param directory
* the directory where the index files are located
* @param treeConfigFile
@@ -53,7 +54,7 @@ public class QuadTreeReader {
/**
* Read the quad tree configuration from file.
- *
+ *
* @param tree
* the quad tree
* @param directory
@@ -85,11 +86,11 @@ public class QuadTreeReader {
/**
* Read the quad tree index from file.
- *
+ *
* @param tree
- * the quad tree
+ * the quad tree
* @param parent
- * the quad tree parent node
+ * the quad tree parent node
* @param directory
* the directory where the index files are located
* @param filename
Modified:
sis/branches/JDK7/application/sis-webapp/src/main/java/org/apache/sis/services/LocationServlet.java
URL:
http://svn.apache.org/viewvc/sis/branches/JDK7/application/sis-webapp/src/main/java/org/apache/sis/services/LocationServlet.java?rev=1490188&r1=1490187&r2=1490188&view=diff
==============================================================================
---
sis/branches/JDK7/application/sis-webapp/src/main/java/org/apache/sis/services/LocationServlet.java
[UTF-8] (original)
+++
sis/branches/JDK7/application/sis-webapp/src/main/java/org/apache/sis/services/LocationServlet.java
[UTF-8] Thu Jun 6 08:11:57 2013
@@ -56,10 +56,10 @@ import org.apache.sis.core.LatLon;
import org.apache.sis.core.LatLonRect;
import org.apache.sis.distance.DistanceUtils;
import org.apache.sis.storage.GeoRSSData;
-import org.apache.sis.storage.QuadTree;
-import org.apache.sis.storage.QuadTreeData;
-import org.apache.sis.storage.QuadTreeReader;
-import org.apache.sis.storage.QuadTreeWriter;
+import org.apache.sis.index.tree.QuadTree;
+import org.apache.sis.index.tree.QuadTreeData;
+import org.apache.sis.index.tree.QuadTreeReader;
+import org.apache.sis.index.tree.QuadTreeWriter;
//ROME imports
import com.sun.syndication.feed.WireFeed;
@@ -70,11 +70,11 @@ import com.sun.syndication.io.WireFeedIn
import com.sun.syndication.io.XmlReader;
/**
- *
+ *
* A location web service that loads data from GeoRSS format (configured via a
* provided config.xml file), and then loads up a {@link QuadTree} with this
* information, making it queryable for callers.
- *
+ *
*/
public class LocationServlet extends HttpServlet {
@@ -88,7 +88,7 @@ public class LocationServlet extends Htt
/**
* Read GeoRSS data (location information provide sis-location-config.xml )
* and build quad-tree.
- *
+ *
* @param config
* Servlet configuration file
* @exception ServletException
@@ -233,7 +233,7 @@ public class LocationServlet extends Htt
/**
* Provide GET requests for Bounding-box and Point-radius search queries.
* Return search results to client in xml format.
- *
+ *
* @param request
* Http Servlet Request
* @param response
@@ -335,7 +335,7 @@ public class LocationServlet extends Htt
/**
* Provide Post requests for build GeoRSS data html file.
- *
+ *
* @param request
* Http Servlet Request
* @param response
@@ -386,7 +386,7 @@ public class LocationServlet extends Htt
/**
* Builds the XML file to return to client.
- *
+ *
* @param filterList
* list of QuadTreeData that are within the search region
* @param regions
@@ -474,7 +474,7 @@ public class LocationServlet extends Htt
/**
* Replace all non-alphanumeric characters with empty strings.
- *
+ *
* @param id
* @return String without any non-alphanumeric characters
*/
Modified:
sis/branches/JDK7/application/sis-webapp/src/main/java/org/apache/sis/storage/GeoRSSData.java
URL:
http://svn.apache.org/viewvc/sis/branches/JDK7/application/sis-webapp/src/main/java/org/apache/sis/storage/GeoRSSData.java?rev=1490188&r1=1490187&r2=1490188&view=diff
==============================================================================
---
sis/branches/JDK7/application/sis-webapp/src/main/java/org/apache/sis/storage/GeoRSSData.java
[UTF-8] (original)
+++
sis/branches/JDK7/application/sis-webapp/src/main/java/org/apache/sis/storage/GeoRSSData.java
[UTF-8] Thu Jun 6 08:11:57 2013
@@ -29,6 +29,7 @@ import java.util.HashMap;
//SIS imports
import org.apache.sis.core.LatLon;
+import org.apache.sis.index.tree.QuadTreeData;
//ROME imports
import com.sun.syndication.feed.module.georss.GeoRSSModule;
@@ -37,7 +38,7 @@ import com.sun.syndication.feed.rss.Item
/**
* Implements QuadTreeData to store GeoRSS items into quad tree. Provides
* methods to save and load GeoRSS items to and from file.
- *
+ *
*/
public class GeoRSSData implements QuadTreeData {
@@ -47,7 +48,7 @@ public class GeoRSSData implements QuadT
/**
* Creates a GeoRSSData object that stores the name of the file that the
* entry's information is written to and the geo location of the entry.
- *
+ *
* @param filename
* filename where rss entry's info is stored
* @param latLon
@@ -60,7 +61,7 @@ public class GeoRSSData implements QuadT
/**
* Returns the Java 2D x-coordinate for the longitude.
- *
+ *
* @return the Java 2D x-coordinate
*/
public double getX() {
@@ -69,7 +70,7 @@ public class GeoRSSData implements QuadT
/**
* Returns the Java 2D y-coordinate for the latitude.
- *
+ *
* @return the Java 2D y-coordinate
*/
public double getY() {
@@ -87,7 +88,7 @@ public class GeoRSSData implements QuadT
/**
* Returns the name of the file where the entry's info is saved.
- *
+ *
* @return the name of the file where the entry's info is saved
*/
public String getFileName() {
@@ -96,7 +97,7 @@ public class GeoRSSData implements QuadT
/**
* Saves the GeoRSS entry to file.
- *
+ *
* @param item
* the Item object from Java ROME API containing the GeoRSS
entry
* @param geoRSSModule
@@ -147,7 +148,7 @@ public class GeoRSSData implements QuadT
* Reads the file that contains the GeoRSS entry's information and
returns a
* HashMap of key, value pairs where the key is the name of the element
e.g.
* title, author.
- *
+ *
* @param fullFileName
* the full path to the file
* @return HashMap where the key is the name of the element and the
value is
@@ -174,5 +175,5 @@ public class GeoRSSData implements QuadT
return map;
}
-
+
}
Modified: sis/branches/JDK7/storage/pom.xml
URL:
http://svn.apache.org/viewvc/sis/branches/JDK7/storage/pom.xml?rev=1490188&r1=1490187&r2=1490188&view=diff
==============================================================================
--- sis/branches/JDK7/storage/pom.xml (original)
+++ sis/branches/JDK7/storage/pom.xml Thu Jun 6 08:11:57 2013
@@ -84,6 +84,11 @@
<version>${project.version}</version>
</dependency>
<dependency>
+ <groupId>org.apache.sis</groupId>
+ <artifactId>sis-referencing</artifactId>
+ <version>${project.version}</version>
+ </dependency>
+ <dependency>
<groupId>org.opengis</groupId>
<artifactId>geoapi-pending</artifactId>
</dependency>
Modified:
sis/branches/JDK7/storage/sis-storage/src/main/java/org/apache/sis/index/tree/NodeType.java
URL:
http://svn.apache.org/viewvc/sis/branches/JDK7/storage/sis-storage/src/main/java/org/apache/sis/index/tree/NodeType.java?rev=1490188&r1=1490057&r2=1490188&view=diff
==============================================================================
---
sis/branches/JDK7/storage/sis-storage/src/main/java/org/apache/sis/index/tree/NodeType.java
[UTF-8] (original)
+++
sis/branches/JDK7/storage/sis-storage/src/main/java/org/apache/sis/index/tree/NodeType.java
[UTF-8] Thu Jun 6 08:11:57 2013
@@ -15,12 +15,12 @@
* limitations under the License.
*/
-package org.apache.sis.storage;
+package org.apache.sis.index.tree;
/**
* Enum to represent node type of quad tree. Black means node contains data.
* White means node is empty. Gray means node is parent.
- *
+ *
*/
public enum NodeType {
BLACK, WHITE, GRAY
Modified:
sis/branches/JDK7/storage/sis-storage/src/main/java/org/apache/sis/index/tree/QuadTree.java
URL:
http://svn.apache.org/viewvc/sis/branches/JDK7/storage/sis-storage/src/main/java/org/apache/sis/index/tree/QuadTree.java?rev=1490188&r1=1490057&r2=1490188&view=diff
==============================================================================
---
sis/branches/JDK7/storage/sis-storage/src/main/java/org/apache/sis/index/tree/QuadTree.java
[UTF-8] (original)
+++
sis/branches/JDK7/storage/sis-storage/src/main/java/org/apache/sis/index/tree/QuadTree.java
[UTF-8] Thu Jun 6 08:11:57 2013
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-package org.apache.sis.storage;
+package org.apache.sis.index.tree;
//JDK imports
import java.awt.geom.Rectangle2D;
@@ -32,7 +32,7 @@ import org.apache.sis.distance.DistanceU
* Implementation of Quad Tree Index. Insertion algorithm implemented based on
* design of quad tree index in H. Samet, The Design and Analysis of Spatial
* Data Structures. Massachusetts: Addison Wesley Publishing Company, 1989.
- *
+ *
*/
public class QuadTree {
@@ -55,7 +55,7 @@ public class QuadTree {
/**
* Creates a quad tree.
- *
+ *
* @param capacity
* the capacity of each node in the quad tree
* @param maxDepth
@@ -83,7 +83,7 @@ public class QuadTree {
/**
* Inserts the specified data into the quad tree.
- *
+ *
* @param data
* specified data to be inserted
* @return true if the data was inserted into the quad tree; false if data
@@ -102,7 +102,7 @@ public class QuadTree {
/**
* Calculates the quadrant that the data lies in.
- *
+ *
* @param data
* specifed data
* @param x
@@ -126,7 +126,7 @@ public class QuadTree {
/**
* Inserts the data into the quad tree with the specified root.
- *
+ *
* @param data
* data to be inserted
* @param root
@@ -231,7 +231,7 @@ public class QuadTree {
/**
* Determines if insertion of the data will cause the depth of the quad tree
* to be exceeded.
- *
+ *
* @param originalData
* array containing the data that is already stored in the node
* @param toBeAddedData
@@ -287,7 +287,7 @@ public class QuadTree {
/**
* Returns true if all data (new and old) have to be stored in the same
* quadrant of the node.
- *
+ *
* @param originalData
* array of data already stored in the node
* @param newNode
@@ -314,7 +314,7 @@ public class QuadTree {
/**
* Performs point radius search.
- *
+ *
* @param point
* the center of the circular region
* @param radiusKM
@@ -332,7 +332,7 @@ public class QuadTree {
/**
* Performs point radius search.
- *
+ *
* @param point
* the center of the circular region
* @param radiusKM
@@ -415,7 +415,7 @@ public class QuadTree {
/**
* Performs bounding box search.
- *
+ *
* @param searchRegion
* LatLonRect representing the rectangular search region
* @return a list of QuadTreeData that are within the given radius from the
@@ -446,7 +446,7 @@ public class QuadTree {
/**
* Performs bounding box search.
- *
+ *
* @param searchRegion
* Rectangle2D representing the rectangular search region
* @return a list of QuadTreeData that are within the given radius from the
@@ -459,7 +459,7 @@ public class QuadTree {
/**
* Performs bounding box search.
- *
+ *
* @param node
* quad tree root node
* @param nodeRegion
@@ -537,7 +537,7 @@ public class QuadTree {
/**
* Returns the size of the quad tree.
- *
+ *
* @return size of the quad tree.
*/
public int size() {
@@ -546,7 +546,7 @@ public class QuadTree {
/**
* Returns the root node of the quad tree.
- *
+ *
* @return root node of the quad tree.
*/
final QuadTreeNode getRoot() {
@@ -555,7 +555,7 @@ public class QuadTree {
/**
* Sets the size of the quad tree.
- *
+ *
* @param size
*/
public void setSize(int size) {
@@ -564,7 +564,7 @@ public class QuadTree {
/**
* Returns the size of the quad tree.
- *
+ *
* @return size of quad tree
*/
public int getSize() {
@@ -573,7 +573,7 @@ public class QuadTree {
/**
* Sets the node size of the quad tree.
- *
+ *
* @param nodeSize
*/
public void setNodeSize(int nodeSize) {
@@ -582,7 +582,7 @@ public class QuadTree {
/**
* Returns the node size of the quad tree.
- *
+ *
* @return node size of the quad tree.
*/
public int getNodeSize() {
@@ -591,7 +591,7 @@ public class QuadTree {
/**
* Returns the capacity of node in the quad tree.
- *
+ *
* @return capacity of node in the quad tree.
*/
public int getCapacity() {
@@ -600,7 +600,7 @@ public class QuadTree {
/**
* Returns the maximum depth of the quad tree.
- *
+ *
* @return maximum depth of the quad tree.
*/
public int getDepth() {
@@ -609,7 +609,7 @@ public class QuadTree {
/**
* Sets the capacity of node in the quad tree.
- *
+ *
* @param capacity
*/
public void setCapacity(int capacity) {
@@ -618,7 +618,7 @@ public class QuadTree {
/**
* Sets the maximum depth of the quad tree.
- *
+ *
* @param depth
*/
public void setDepth(int depth) {
Modified:
sis/branches/JDK7/storage/sis-storage/src/main/java/org/apache/sis/index/tree/QuadTreeData.java
URL:
http://svn.apache.org/viewvc/sis/branches/JDK7/storage/sis-storage/src/main/java/org/apache/sis/index/tree/QuadTreeData.java?rev=1490188&r1=1490057&r2=1490188&view=diff
==============================================================================
---
sis/branches/JDK7/storage/sis-storage/src/main/java/org/apache/sis/index/tree/QuadTreeData.java
[UTF-8] (original)
+++
sis/branches/JDK7/storage/sis-storage/src/main/java/org/apache/sis/index/tree/QuadTreeData.java
[UTF-8] Thu Jun 6 08:11:57 2013
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-package org.apache.sis.storage;
+package org.apache.sis.index.tree;
//SIS imports
import org.apache.sis.core.LatLon;
@@ -24,33 +24,33 @@ import org.apache.sis.core.LatLon;
* Interface representing data stored in quad tree. All data to be stored in
* quad tree must implement this interface, so that quad tree can access
* location and store name of file in which data is saved.
- *
+ *
*/
public interface QuadTreeData {
/**
* Returns the Java 2D x-coordinate for the longitude.
- *
+ *
* @return the Java 2D x-coordinate
*/
public double getX();
/**
* Returns the Java 2D y-coordinate for the latitude.
- *
+ *
* @return the Java 2D y-coordinate
*/
public double getY();
/**
* Returns the latitude/longitude pair.
- *
+ *
* @return the latitude/longitude pair.
*/
public LatLon getLatLon();
/**
* Returns the name of the file where the entry's info is saved.
- *
+ *
* @return the name of the file where the entry's info is saved
*/
public String getFileName();
Modified:
sis/branches/JDK7/storage/sis-storage/src/main/java/org/apache/sis/index/tree/QuadTreeNode.java
URL:
http://svn.apache.org/viewvc/sis/branches/JDK7/storage/sis-storage/src/main/java/org/apache/sis/index/tree/QuadTreeNode.java?rev=1490188&r1=1490057&r2=1490188&view=diff
==============================================================================
---
sis/branches/JDK7/storage/sis-storage/src/main/java/org/apache/sis/index/tree/QuadTreeNode.java
[UTF-8] (original)
+++
sis/branches/JDK7/storage/sis-storage/src/main/java/org/apache/sis/index/tree/QuadTreeNode.java
[UTF-8] Thu Jun 6 08:11:57 2013
@@ -15,11 +15,11 @@
* limitations under the License.
*/
-package org.apache.sis.storage;
+package org.apache.sis.index.tree;
/**
* Implementation of quad tree node.
- *
+ *
*/
final class QuadTreeNode {
@@ -36,7 +36,7 @@ final class QuadTreeNode {
/**
* Constructs a quad tree node that can store data
- *
+ *
* @param id
* node's id
* @param capacity
@@ -56,7 +56,7 @@ final class QuadTreeNode {
/**
* Constructs a quad tree node that acts as a parent.
- *
+ *
* @param type
* node's type
* @param id
@@ -74,7 +74,7 @@ final class QuadTreeNode {
/**
* Add data to the node.
- *
+ *
* @param data
* data to be added
*/
@@ -87,7 +87,7 @@ final class QuadTreeNode {
/**
* Gets the number of data stored in the node
- *
+ *
* @return number of data stored in the node
*/
public int getCount() {
@@ -96,7 +96,7 @@ final class QuadTreeNode {
/**
* Gets the node type.
- *
+ *
* @return node type
*/
public NodeType getNodeType() {
@@ -105,7 +105,7 @@ final class QuadTreeNode {
/**
* Sets the node's quadrant to point to the specified child.
- *
+ *
* @param child
* child of this node
* @param q
@@ -130,7 +130,7 @@ final class QuadTreeNode {
/**
* Returns the child of this node that resides in the specified quadrant.
- *
+ *
* @param q
* specified quadrant
* @return child in the specified quadrant
@@ -152,7 +152,7 @@ final class QuadTreeNode {
/**
* Returns the data stored in this node.
- *
+ *
* @return data stored in this node
*/
public QuadTreeData[] getData() {
@@ -161,7 +161,7 @@ final class QuadTreeNode {
/**
* Returns node's id.
- *
+ *
* @return node's id
*/
public int getId() {
@@ -170,7 +170,7 @@ final class QuadTreeNode {
/**
* Returns node's capacity.
- *
+ *
* @return node's capacity
*/
public int getCapacity() {
Modified:
sis/branches/JDK7/storage/sis-storage/src/main/java/org/apache/sis/index/tree/QuadTreeWriter.java
URL:
http://svn.apache.org/viewvc/sis/branches/JDK7/storage/sis-storage/src/main/java/org/apache/sis/index/tree/QuadTreeWriter.java?rev=1490188&r1=1490057&r2=1490188&view=diff
==============================================================================
---
sis/branches/JDK7/storage/sis-storage/src/main/java/org/apache/sis/index/tree/QuadTreeWriter.java
[UTF-8] (original)
+++
sis/branches/JDK7/storage/sis-storage/src/main/java/org/apache/sis/index/tree/QuadTreeWriter.java
[UTF-8] Thu Jun 6 08:11:57 2013
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-package org.apache.sis.storage;
+package org.apache.sis.index.tree;
//JDK imports
import java.io.BufferedWriter;
@@ -25,14 +25,14 @@ import java.io.IOException;
/**
* Class to save the quad tree index from file.
- *
+ *
*/
public class QuadTreeWriter {
/**
* Writes the entire quad tree index to file with each node in saved in a
* separate file.
- *
+ *
* @param tree
* the quad tree
* @param directory
@@ -46,7 +46,7 @@ public class QuadTreeWriter {
/**
* Creating quad tree index file.
- *
+ *
* @param directory
* the directory where the index file is located
*/
@@ -60,7 +60,7 @@ public class QuadTreeWriter {
/**
* Write quad tree configerations to file.
- *
+ *
* @param tree
* the quad tree
* @param directory
@@ -81,7 +81,7 @@ public class QuadTreeWriter {
/**
* Write quad tree node to index file.
- *
+ *
* @param node
* the quad tree node
* @param directory
@@ -146,7 +146,7 @@ public class QuadTreeWriter {
/**
* Get the quad tree data string
- *
+ *
* @param quadrant
* specified quadrant
* @param node
Modified:
sis/branches/JDK7/storage/sis-storage/src/main/java/org/apache/sis/index/tree/Quadrant.java
URL:
http://svn.apache.org/viewvc/sis/branches/JDK7/storage/sis-storage/src/main/java/org/apache/sis/index/tree/Quadrant.java?rev=1490188&r1=1490057&r2=1490188&view=diff
==============================================================================
---
sis/branches/JDK7/storage/sis-storage/src/main/java/org/apache/sis/index/tree/Quadrant.java
[UTF-8] (original)
+++
sis/branches/JDK7/storage/sis-storage/src/main/java/org/apache/sis/index/tree/Quadrant.java
[UTF-8] Thu Jun 6 08:11:57 2013
@@ -15,11 +15,11 @@
* limitations under the License.
*/
-package org.apache.sis.storage;
+package org.apache.sis.index.tree;
/**
* Enum to represent the 4 quadrants of a quad tree node.
- *
+ *
*/
enum Quadrant {
@@ -32,7 +32,7 @@ enum Quadrant {
/**
* Returns the index of the quadrant.
- *
+ *
* @return index of the quadrant
*/
public int index() {
@@ -41,7 +41,7 @@ enum Quadrant {
/**
* Retrieves the quadrant matching specified index.
- *
+ *
* @param index
* specified index
* @return quadrant matching specified index
Modified:
sis/branches/JDK7/storage/sis-storage/src/test/java/org/apache/sis/index/tree/TestQuadTreeNode.java
URL:
http://svn.apache.org/viewvc/sis/branches/JDK7/storage/sis-storage/src/test/java/org/apache/sis/index/tree/TestQuadTreeNode.java?rev=1490188&r1=1490057&r2=1490188&view=diff
==============================================================================
---
sis/branches/JDK7/storage/sis-storage/src/test/java/org/apache/sis/index/tree/TestQuadTreeNode.java
[UTF-8] (original)
+++
sis/branches/JDK7/storage/sis-storage/src/test/java/org/apache/sis/index/tree/TestQuadTreeNode.java
[UTF-8] Thu Jun 6 08:11:57 2013
@@ -15,14 +15,14 @@
* limitations under the License.
*/
-package org.apache.sis.storage;
+package org.apache.sis.index.tree;
import junit.framework.TestCase;
public class TestQuadTreeNode extends TestCase{
/**
- * @since SIS-39
+ * @since SIS-39
*/
public void testCapacityGreaterThanZero(){
QuadTreeNode node = new QuadTreeNode(-1, -5);
