Skip to content

Commit dafa574

Browse files
eduramibaeduramiba
committed
Update dependencies and improve destroy method
1 parent c5afb8b commit dafa574

File tree

3 files changed

+56
-30
lines changed

3 files changed

+56
-30
lines changed

‎modules/demo-jogl/pom.xml

-27
Original file line numberDiff line numberDiff line change
@@ -12,11 +12,6 @@
1212

1313
<name>Viz Engine Demo (JOGL)</name>
1414

15-
<properties>
16-
<viz-demo.maven-jar-plugin.version>3.3.0</viz-demo.maven-jar-plugin.version>
17-
<viz-demo.maven-dependency-plugin.version>3.6.0</viz-demo.maven-dependency-plugin.version>
18-
</properties>
19-
2015
<dependencies>
2116
<dependency>
2217
<groupId>org.gephi</groupId>
@@ -30,37 +25,30 @@
3025
<dependency>
3126
<groupId>org.gephi</groupId>
3227
<artifactId>graph-api</artifactId>
33-
<version>${gephi.version}</version>
3428
</dependency>
3529
<dependency>
3630
<groupId>org.gephi</groupId>
3731
<artifactId>io-importer-api</artifactId>
38-
<version>${gephi.version}</version>
3932
</dependency>
4033
<dependency>
4134
<groupId>org.gephi</groupId>
4235
<artifactId>io-importer-plugin</artifactId>
43-
<version>${gephi.version}</version>
4436
</dependency>
4537
<dependency>
4638
<groupId>org.gephi</groupId>
4739
<artifactId>layout-api</artifactId>
48-
<version>${gephi.version}</version>
4940
</dependency>
5041
<dependency>
5142
<groupId>org.gephi</groupId>
5243
<artifactId>layout-plugin</artifactId>
53-
<version>${gephi.version}</version>
5444
</dependency>
5545
<dependency>
5646
<groupId>org.netbeans.api</groupId>
5747
<artifactId>org-openide-filesystems</artifactId>
58-
<version>${netbeans.version}</version>
5948
</dependency>
6049
<dependency>
6150
<groupId>org.netbeans.modules</groupId>
6251
<artifactId>org-netbeans-modules-masterfs</artifactId>
63-
<version>${netbeans.version}</version>
6452
</dependency>
6553

6654
<!-- Gluegen -->
@@ -77,21 +65,6 @@
7765
</dependencies>
7866

7967
<build>
80-
<pluginManagement>
81-
<plugins>
82-
<plugin>
83-
<groupId>org.apache.maven.plugins</groupId>
84-
<artifactId>maven-jar-plugin</artifactId>
85-
<version>${viz-demo.maven-jar-plugin.version}</version>
86-
</plugin>
87-
<plugin>
88-
<groupId>org.apache.maven.plugins</groupId>
89-
<artifactId>maven-dependency-plugin</artifactId>
90-
<version>${viz-demo.maven-dependency-plugin.version}</version>
91-
</plugin>
92-
</plugins>
93-
</pluginManagement>
94-
9568
<plugins>
9669
<plugin>
9770
<groupId>org.apache.maven.plugins</groupId>

‎modules/engine-core/src/main/java/org/gephi/viz/engine/VizEngine.java

+3
Original file line numberDiff line numberDiff line change
@@ -364,6 +364,9 @@ public synchronized void pause() {
364364
}
365365

366366
public synchronized void destroy() {
367+
allInputListeners.clear();
368+
inputListenersPipeline.clear();
369+
367370
this.renderingTarget.stop();
368371
if (updatersThreadPool != null) {
369372
try {

‎pom.xml

+53-3
Original file line numberDiff line numberDiff line change
@@ -14,14 +14,17 @@
1414
<maven.compiler.target>1.8</maven.compiler.target>
1515
<jcp-maven-plugin.version>7.1.2</jcp-maven-plugin.version>
1616

17-
<gephi.graphstore.version>0.6.15-viz-engine-SNAPSHOT</gephi.graphstore.version>
18-
<gephi.version>0.10.0</gephi.version>
17+
<gephi.graphstore.version>0.7.1</gephi.graphstore.version>
18+
<gephi.version>0.11.0-SNAPSHOT</gephi.version>
1919
<jogl.version>2.5.0</jogl.version>
2020

2121
<joml.version>1.10.5</joml.version>
22-
<netbeans.version>RELEASE180</netbeans.version>
22+
<netbeans.version>RELEASE220</netbeans.version>
2323

2424
<junit.version>4.13.2</junit.version>
25+
26+
<maven-jar-plugin.version>3.4.1</maven-jar-plugin.version>
27+
<maven-dependency-plugin.version>3.7.0</maven-dependency-plugin.version>
2528
</properties>
2629

2730
<modules>
@@ -127,6 +130,43 @@
127130
<artifactId>viz-engine-jogl</artifactId>
128131
<version>${project.version}</version>
129132
</dependency>
133+
134+
<!-- Gephi for demo -->
135+
<dependency>
136+
<groupId>org.gephi</groupId>
137+
<artifactId>graph-api</artifactId>
138+
<version>${gephi.version}</version>
139+
</dependency>
140+
<dependency>
141+
<groupId>org.gephi</groupId>
142+
<artifactId>io-importer-api</artifactId>
143+
<version>${gephi.version}</version>
144+
</dependency>
145+
<dependency>
146+
<groupId>org.gephi</groupId>
147+
<artifactId>io-importer-plugin</artifactId>
148+
<version>${gephi.version}</version>
149+
</dependency>
150+
<dependency>
151+
<groupId>org.gephi</groupId>
152+
<artifactId>layout-api</artifactId>
153+
<version>${gephi.version}</version>
154+
</dependency>
155+
<dependency>
156+
<groupId>org.gephi</groupId>
157+
<artifactId>layout-plugin</artifactId>
158+
<version>${gephi.version}</version>
159+
</dependency>
160+
<dependency>
161+
<groupId>org.netbeans.api</groupId>
162+
<artifactId>org-openide-filesystems</artifactId>
163+
<version>${netbeans.version}</version>
164+
</dependency>
165+
<dependency>
166+
<groupId>org.netbeans.modules</groupId>
167+
<artifactId>org-netbeans-modules-masterfs</artifactId>
168+
<version>${netbeans.version}</version>
169+
</dependency>
130170

131171
<!-- Test -->
132172
<dependency>
@@ -141,6 +181,16 @@
141181
<build>
142182
<pluginManagement>
143183
<plugins>
184+
<plugin>
185+
<groupId>org.apache.maven.plugins</groupId>
186+
<artifactId>maven-jar-plugin</artifactId>
187+
<version>${maven-jar-plugin.version}</version>
188+
</plugin>
189+
<plugin>
190+
<groupId>org.apache.maven.plugins</groupId>
191+
<artifactId>maven-dependency-plugin</artifactId>
192+
<version>${maven-dependency-plugin.version}</version>
193+
</plugin>
144194
<plugin>
145195
<groupId>com.igormaznitsa</groupId>
146196
<artifactId>jcp</artifactId>

0 commit comments

Comments
 (0)