Skip to content

Commit 3d5e29f

Browse files
author
naraesk
authored
Merge branch 'feature/refactoring' into development
2 parents fa78ad7 + daf6529 commit 3d5e29f

44 files changed

Lines changed: 1155 additions & 1395 deletions

Some content is hidden

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

‎generator2/org.getaviz.generator/pom.xml‎

Lines changed: 0 additions & 29 deletions
Original file line numberDiff line numberDiff line change
@@ -155,37 +155,8 @@
155155
<configuration>
156156
<skip>false</skip>
157157
<quiet>true</quiet>
158-
<!--<dependencyDetailsEnabled>false</dependencyDetailsEnabled>
159-
<dependencyLocationsEnabled>false</dependencyLocationsEnabled>-->
160158
</configuration>
161159
</plugin>
162-
<!-- <plugin> -->
163-
<!-- <groupId>org.codehaus.mojo</groupId> -->
164-
<!-- <artifactId>exec-maven-plugin</artifactId> -->
165-
<!-- <version>1.4.0</version> -->
166-
<!-- <executions> -->
167-
<!-- <execution> -->
168-
<!-- <phase>deploy</phase> -->
169-
<!-- <goals> -->
170-
<!-- <goal>java</goal> -->
171-
<!-- </goals> -->
172-
<!-- </execution> -->
173-
<!-- </executions> -->
174-
<!-- <configuration> -->
175-
<!-- <executable>java</executable> -->
176-
<!-- <includeProjectDependencies>true</includeProjectDependencies> -->
177-
<!-- <includePluginDependencies>true</includePluginDependencies> -->
178-
<!-- <arguments> -->
179-
<!-- uncomment to increase java heap size -->
180-
<!-- <argument>-Xmx8g</argument> -->
181-
<!-- <argument>-classpath</argument> -->
182-
<!-- <classpath /> -->
183-
<!-- <argument>org.getaviz.generator.Generator</argument> -->
184-
<!-- <argument>-p</argument> -->
185-
<!-- <argument>runtimeProject=${project.basedir}</argument> -->
186-
<!-- </arguments> -->
187-
<!-- </configuration> -->
188-
<!-- </plugin> -->
189160
<plugin>
190161
<groupId>org.apache.maven.plugins</groupId>
191162
<artifactId>maven-war-plugin</artifactId>

‎generator2/org.getaviz.generator/src/main/java/org/getaviz/generator/ColorGradient.java‎

Lines changed: 31 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,31 @@
1+
package org.getaviz.generator;
2+
3+
import java.awt.Color;
4+
import java.util.ArrayList;
5+
import java.util.List;
6+
7+
public class ColorGradient {
8+
9+
public static List<String> createColorGradient(String startHex, String endHex, int maxLevel) {
10+
Color start = Color.decode(startHex);
11+
Color end = Color.decode(endHex);
12+
13+
int steps = maxLevel - 1;
14+
if (maxLevel == 1) {
15+
steps++;
16+
}
17+
18+
float r_step = (end.getRed() - start.getRed()) / steps;
19+
float g_step = (end.getGreen() - start.getGreen()) / steps;
20+
float b_step = (end.getBlue() - start.getBlue()) / steps;
21+
22+
List<String> colorRange = new ArrayList<>();
23+
for (int i = 0; i < maxLevel; i++) {
24+
float newR = (start.getRed() + i * r_step)/255f;
25+
float newG = (start.getGreen() + i * g_step)/255f;
26+
float newB = (start.getBlue() + i * b_step)/255f;
27+
colorRange.add(newR + " " + newG + " " + newB);
28+
}
29+
return colorRange;
30+
}
31+
}

‎generator2/org.getaviz.generator/src/main/java/org/getaviz/generator/Generator.java‎

Lines changed: 8 additions & 54 deletions
Original file line numberDiff line numberDiff line change
@@ -2,64 +2,18 @@
22

33
import org.apache.commons.logging.Log;
44
import org.apache.commons.logging.LogFactory;
5-
import org.getaviz.generator.city.m2m.City2City;
6-
import org.getaviz.generator.city.m2t.City2AFrame;
7-
import org.getaviz.generator.city.m2t.City2X3D;
8-
import org.getaviz.generator.jqa.DatabaseBuilder;
9-
import org.getaviz.generator.jqa.JQA2JSON;
10-
import org.getaviz.generator.rd.m2m.RD2RD;
11-
import org.getaviz.generator.rd.m2t.RD2AFrame;
12-
import org.getaviz.generator.rd.m2t.RD2X3D;
13-
import org.getaviz.generator.city.s2m.JQA2City;
14-
import org.getaviz.generator.rd.s2m.JQA2RD;
155

16-
public class Generator {
17-
private static SettingsConfiguration config = SettingsConfiguration.getInstance();
18-
private static Log log = LogFactory.getLog(Generator.class);
6+
class Generator {
7+
private Log log = LogFactory.getLog(this.getClass());
8+
private Metaphor metaphor;
199

20-
public static void main(String[] args) {
21-
run();
10+
Generator(SettingsConfiguration config) {
11+
metaphor = MetaphorFactory.createMetaphor(config);
2212
}
2313

24-
public static void run() {
14+
void run() {
2515
log.info("Generator started");
26-
try {
27-
if(!config.isSkipScan()) {
28-
new DatabaseBuilder();
29-
}
30-
switch (config.getMetaphor()) {
31-
case CITY: {
32-
new JQA2City();
33-
new JQA2JSON();
34-
new City2City();
35-
switch (config.getOutputFormat()) {
36-
case X3D:
37-
new City2X3D(); break;
38-
case AFrame:
39-
new City2AFrame(); break;
40-
}
41-
break;
42-
}
43-
case RD: {
44-
new JQA2RD();
45-
new JQA2JSON();
46-
new RD2RD();
47-
switch (config.getOutputFormat()) {
48-
case X3D: {
49-
new RD2X3D();
50-
break;
51-
}
52-
case AFrame: {
53-
new RD2AFrame();
54-
break;
55-
}
56-
}
57-
break;
58-
}
59-
}
60-
61-
} catch (Exception e) {
62-
log.error(e);
63-
}
16+
metaphor.generate();
17+
log.info("Generator finished");
6418
}
6519
}

‎generator2/org.getaviz.generator/src/main/java/org/getaviz/generator/GeneratorServlet.java‎

Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -10,18 +10,21 @@
1010

1111
public class GeneratorServlet extends HttpServlet {
1212
private static final long serialVersionUID = -5343549433924172589L;
13-
private static Log log = LogFactory.getLog(GeneratorServlet.class);
13+
private static final Log log = LogFactory.getLog(GeneratorServlet.class);
1414

1515
public void doGet(HttpServletRequest request, HttpServletResponse response) throws IOException {
1616
log.info("GET request generator");
17-
Generator.run();
17+
SettingsConfiguration config = SettingsConfiguration.getInstance("/opt/config/settings.properties");
18+
Generator generator = new Generator(config);
19+
generator.run();
1820
writeGetResponse(response);
1921
}
2022

2123
public void doPost(HttpServletRequest request, HttpServletResponse response) {
2224
log.info("POST request generator");
2325
SettingsConfiguration config = SettingsConfiguration.getInstance(request);
24-
Generator.run();
26+
Generator generator = new Generator(config);
27+
generator.run();
2528
writePostResponse(response);
2629
}
2730

‎generator2/org.getaviz.generator/src/main/java/org/getaviz/generator/Metaphor.java‎

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,7 @@
1+
package org.getaviz.generator;
2+
3+
public interface Metaphor {
4+
5+
void generate();
6+
7+
}

‎generator2/org.getaviz.generator/src/main/java/org/getaviz/generator/MetaphorFactory.java‎

Lines changed: 15 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,15 @@
1+
package org.getaviz.generator;
2+
3+
import org.getaviz.generator.city.CityMetaphor;
4+
import org.getaviz.generator.rd.RDMetaphor;
5+
6+
public class MetaphorFactory {
7+
8+
public static Metaphor createMetaphor(SettingsConfiguration config) {
9+
if( config.getMetaphor() == SettingsConfiguration.Metaphor.RD) {
10+
return new RDMetaphor(config);
11+
} else {
12+
return new CityMetaphor(config);
13+
}
14+
}
15+
}

‎generator2/org.getaviz.generator/src/main/java/org/getaviz/generator/OutputFormatHelper.java‎

Lines changed: 0 additions & 179 deletions
This file was deleted.

0 commit comments

Comments
 (0)