Skip to content

Commit fcd60b6

Browse files
authored
Merge pull request eugenp#61 from eugenp/master
update
2 parents bee2e6c + 06563f4 commit fcd60b6

File tree

209 files changed

+2292
-1031
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

209 files changed

+2292
-1031
lines changed

.gitignore

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -85,3 +85,5 @@ transaction.log
8585
*-shell.log
8686

8787
apache-cxf/cxf-aegis/baeldung.xml
88+
89+
libraries-2/*.db

algorithms-miscellaneous-2/src/test/java/com/baeldung/jgrapht/GraphImageGenerationUnitTest.java

Lines changed: 13 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,16 +1,21 @@
11
package com.baeldung.jgrapht;
22

33
import static org.junit.Assert.assertTrue;
4+
45
import java.awt.Color;
56
import java.awt.image.BufferedImage;
67
import java.io.File;
78
import java.io.IOException;
9+
810
import javax.imageio.ImageIO;
11+
912
import org.jgrapht.ext.JGraphXAdapter;
1013
import org.jgrapht.graph.DefaultDirectedGraph;
1114
import org.jgrapht.graph.DefaultEdge;
15+
import org.junit.After;
1216
import org.junit.Before;
1317
import org.junit.Test;
18+
1419
import com.mxgraph.layout.mxCircleLayout;
1520
import com.mxgraph.layout.mxIGraphLayout;
1621
import com.mxgraph.util.mxCellRenderer;
@@ -20,7 +25,7 @@ public class GraphImageGenerationUnitTest {
2025

2126
@Before
2227
public void createGraph() throws IOException {
23-
File imgFile = new File("src/test/resources/graph.png");
28+
File imgFile = new File("src/test/resources/graph1.png");
2429
imgFile.createNewFile();
2530
g = new DefaultDirectedGraph<String, DefaultEdge>(DefaultEdge.class);
2631
String x1 = "x1";
@@ -34,12 +39,18 @@ public void createGraph() throws IOException {
3439
g.addEdge(x3, x1);
3540
}
3641

42+
@After
43+
public void cleanup() {
44+
File imgFile = new File("src/test/resources/graph1.png");
45+
imgFile.deleteOnExit();
46+
}
47+
3748
@Test
3849
public void givenAdaptedGraph_whenWriteBufferedImage_ThenFileShouldExist() throws IOException {
3950
JGraphXAdapter<String, DefaultEdge> graphAdapter = new JGraphXAdapter<String, DefaultEdge>(g);
4051
mxIGraphLayout layout = new mxCircleLayout(graphAdapter);
4152
layout.execute(graphAdapter.getDefaultParent());
42-
File imgFile = new File("src/test/resources/graph.png");
53+
File imgFile = new File("src/test/resources/graph1.png");
4354
BufferedImage image = mxCellRenderer.createBufferedImage(graphAdapter, null, 2, Color.WHITE, true, null);
4455
ImageIO.write(image, "PNG", imgFile);
4556
assertTrue(imgFile.exists());

algorithms-miscellaneous-2/src/main/java/com/baeldung/algorithms/play2048/Play2048.java renamed to algorithms-miscellaneous-6/src/main/java/com/baeldung/algorithms/play2048/Play2048.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
package com.baeldung.algorithms.play2048;
22

33
public class Play2048 {
4-
private static final int SIZE = 3;
4+
private static final int SIZE = 4;
55
private static final int INITIAL_NUMBERS = 2;
66

77
public static void main(String[] args) {

apache-libraries/pom.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
33
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
44
<modelVersion>4.0.0</modelVersion>
5-
<artifactId>apache-miscellaneous-1</artifactId>
5+
<artifactId>apache-libraries</artifactId>
66
<version>0.0.1-SNAPSHOT</version>
77
<name>apache-libraries</name>
88

aws-app-sync/pom.xml

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -13,10 +13,6 @@
1313
<relativePath>../parent-boot-2</relativePath>
1414
</parent>
1515

16-
<properties>
17-
<java.version>1.8</java.version>
18-
</properties>
19-
2016
<dependencies>
2117

2218
<dependency>
@@ -50,4 +46,7 @@
5046
</plugins>
5147
</build>
5248

49+
<properties>
50+
<java.version>1.8</java.version>
51+
</properties>
5352
</project>

0 commit comments

Comments
 (0)