Skip to content

Commit 956cd56

Browse files
committed
Update maven settings and remove bogus code lines
1 parent 76d8a09 commit 956cd56

File tree

3 files changed

+24
-23
lines changed

3 files changed

+24
-23
lines changed

pom.xml

+19-3
Original file line numberDiff line numberDiff line change
@@ -4,9 +4,15 @@
44

55
<groupId>at.jotschi</groupId>
66
<artifactId>QuadTree</artifactId>
7-
<version>0.0.1-SNAPSHOT</version>
7+
<version>0.5.0-SNAPSHOT</version>
88
<packaging>jar</packaging>
99

10+
<parent>
11+
<groupId>de.jotschi</groupId>
12+
<artifactId>oss-parent</artifactId>
13+
<version>1.0.0</version>
14+
</parent>
15+
1016
<name>QuadTree</name>
1117
<url>http://maven.apache.org</url>
1218

@@ -18,14 +24,24 @@
1824
<dependency>
1925
<groupId>junit</groupId>
2026
<artifactId>junit</artifactId>
21-
<version>4.8.2</version>
2227
<scope>test</scope>
2328
</dependency>
2429
<dependency>
2530
<groupId>log4j</groupId>
2631
<artifactId>log4j</artifactId>
2732
<version>1.2.16</version>
2833
</dependency>
29-
3034
</dependencies>
35+
<repositories>
36+
<repository>
37+
<id>maven.jotschi.de</id>
38+
<url>http://maven.jotschi.de/maven2</url>
39+
<releases>
40+
<enabled>true</enabled>
41+
</releases>
42+
<snapshots>
43+
<enabled>false</enabled>
44+
</snapshots>
45+
</repository>
46+
</repositories>
3147
</project>

src/test/java/at/jotschi/quadtree/RenderSpatialQuadTree.java

+5-17
Original file line numberDiff line numberDiff line change
@@ -50,8 +50,7 @@ protected SpatialQuadTree<Image> createSpatialQuadTree() throws IOException {
5050
Point startCoordinates = new Point(100, 100);
5151
Dimension size = new Dimension(512, 512);
5252

53-
SpatialQuadTree<Image> tree = new SpatialQuadTree<Image>(
54-
startCoordinates, size);
53+
SpatialQuadTree<Image> tree = new SpatialQuadTree<Image>(startCoordinates, size);
5554

5655
int elementSize = 32;
5756
for (int i = 0; i < 56; i++) {
@@ -89,14 +88,13 @@ public Image getRandomImage(int size) throws IOException {
8988
int i = (int) (Math.random() * 4);
9089
String fileName = types[i] + "_" + size + ".jpg";
9190
log.debug("Loading image: " + fileName);
92-
Image image = ImageIO.read(ClassLoader
93-
.getSystemResourceAsStream(fileName));
91+
Image image = ImageIO.read(ClassLoader.getSystemResourceAsStream(fileName));
9492

9593
return image;
9694
}
9795

9896
protected void paintComponent(Graphics g) {
99-
97+
10098
g.drawString("Hit space key to draw elements of the next level of the quadtree.", 100, 80);
10199
SpatialNode<Image> rootNode = tree.getRootNode();
102100
drawCells(rootNode, g);
@@ -106,8 +104,7 @@ protected void drawCells(SpatialNode<Image> node, Graphics g) {
106104
Dimension bounds = node.getBounds();
107105
Point startCoordinates = node.getStartCoordinates();
108106
// Draw node bounds
109-
g.drawRect(startCoordinates.x, startCoordinates.y, bounds.width,
110-
bounds.height);
107+
g.drawRect(startCoordinates.x, startCoordinates.y, bounds.width, bounds.height);
111108

112109
// Draw subnodes
113110
Map<Cell, SpatialNode<Image>> subNodes = node.getSubNodes();
@@ -141,16 +138,7 @@ public void drawElements(SpatialNode<Image> node, Graphics g) {
141138

142139
SpatialNodeElement<Image> element = node.getElement();
143140
if (element != null) {
144-
// int i = (int) (Math.random() * 255);
145-
// g.setColor(new Color(1, i, 1));
146-
147-
g.drawImage(element.getElement(), (int) element.getX(),
148-
(int) element.getY(), null);
149-
// g.drawImage(element.getElement(),element.getX(), (int)
150-
// element.getY(),element.getWidth(), element.getHeight() ,null);
151-
// g.fillRect((int) element.getX(), (int) element.getY(),
152-
// element.getWidth(), element.getHeight());
153-
// g.setColor(Color.BLACK);
141+
g.drawImage(element.getElement(), (int) element.getX(), (int) element.getY(), null);
154142
}
155143

156144
}

src/test/java/at/jotschi/quadtree/gui/QuadTreePanel.java

-3
Original file line numberDiff line numberDiff line change
@@ -4,15 +4,12 @@
44
import java.awt.event.KeyListener;
55
import java.awt.event.MouseEvent;
66
import java.awt.event.MouseListener;
7-
import java.util.Vector;
87

98
import javax.swing.JFrame;
109
import javax.swing.JPanel;
1110

1211
import org.apache.log4j.Logger;
1312

14-
import at.jotschi.quadtree.AbstractNodeElement;
15-
1613
@SuppressWarnings("serial")
1714
public class QuadTreePanel extends JPanel implements KeyListener, MouseListener {
1815

0 commit comments

Comments
 (0)