Skip to content

Commit 7109664

Browse files
Merge pull request #3 from amiedavis/master
merged in my master's master and updated a pom pom
2 parents d7f91ba + 08f3f9a commit 7109664

File tree

9 files changed

+42
-12
lines changed

9 files changed

+42
-12
lines changed

SNAPPSociogram/.classpath

+9
Original file line numberDiff line numberDiff line change
@@ -4,4 +4,13 @@
44
<classpathentry kind="src" path="src/main/resources" excluding="**/*.java"/>
55
<classpathentry kind="output" path="target/classes"/>
66
<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
7+
<classpathentry kind="var" path="M2_REPO/commons-codec/commons-codec/1.3/commons-codec-1.3.jar"/>
8+
<classpathentry kind="var" path="M2_REPO/net/sourceforge/collections/collections-generic/4.01/collections-generic-4.01.jar"/>
9+
<classpathentry kind="var" path="M2_REPO/net/sf/jung/jung-visualization/2.0.1/jung-visualization-2.0.1.jar"/>
10+
<classpathentry kind="var" path="M2_REPO/net/sf/jung/jung-api/2.0.1/jung-api-2.0.1.jar"/>
11+
<classpathentry kind="var" path="M2_REPO/net/sf/jung/jung-algorithms/2.0.1/jung-algorithms-2.0.1.jar"/>
12+
<classpathentry kind="var" path="M2_REPO/colt/colt/1.2.0/colt-1.2.0.jar"/>
13+
<classpathentry kind="var" path="M2_REPO/concurrent/concurrent/1.3.4/concurrent-1.3.4.jar"/>
14+
<classpathentry kind="var" path="M2_REPO/com/michaelbaranov/microba/0.4.4.3/microba-0.4.4.3.jar"/>
15+
<classpathentry kind="var" path="M2_REPO/net/sf/jung/jung-graph-impl/2.0.1/jung-graph-impl-2.0.1.jar"/>
716
</classpath>

SNAPPSociogram/pom.xml

+25-2
Original file line numberDiff line numberDiff line change
@@ -14,6 +14,29 @@
1414
<artifactId>snapp-base</artifactId>
1515
<version>1.0</version>
1616
</parent>
17-
18-
17+
18+
<dependencies>
19+
<dependency>
20+
<groupId>commons-codec</groupId>
21+
<artifactId>commons-codec</artifactId>
22+
</dependency>
23+
24+
<!-- unclear if this is correct dependency -->
25+
<dependency>
26+
<groupId>net.sourceforge.collections</groupId>
27+
<artifactId>collections-generic</artifactId>
28+
</dependency>
29+
<dependency>
30+
<groupId>net.sf.jung</groupId>
31+
<artifactId>jung-visualization</artifactId>
32+
</dependency>
33+
<dependency>
34+
<groupId>com.michaelbaranov</groupId>
35+
<artifactId>microba</artifactId>
36+
</dependency>
37+
<dependency>
38+
<groupId>net.sf.jung</groupId>
39+
<artifactId>jung-graph-impl</artifactId>
40+
</dependency>
41+
</dependencies>
1942
</project>

SNAPPSociogram/src/main/java/ClusteringDemo.java renamed to SNAPPSociogram/src/main/java/org/apereo/learninganalytics/snapp/ClusteringDemo.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
package SNAPP;
1+
package org.apereo.learninganalytics.snapp;
22

33
/*
44
* Copyright (c) 2003, the JUNG Project and the Regents of the University

SNAPPSociogram/src/main/java/DBAccess.java renamed to SNAPPSociogram/src/main/java/org/apereo/learninganalytics/snapp/DBAccess.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
package SNAPP;
1+
package org.apereo.learninganalytics.snapp;
22

33

44
import java.sql.Connection;

SNAPPSociogram/src/main/java/Export.java renamed to SNAPPSociogram/src/main/java/org/apereo/learninganalytics/snapp/Export.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
package SNAPP;
1+
package org.apereo.learninganalytics.snapp;
22

33
import java.sql.ResultSet;
44
import java.sql.SQLException;

SNAPPSociogram/src/main/java/SNAPPDatabase.java renamed to SNAPPSociogram/src/main/java/org/apereo/learninganalytics/snapp/SNAPPDatabase.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
package SNAPP;
1+
package org.apereo.learninganalytics.snapp;
22

33
import java.text.DecimalFormat;
44
import java.util.*;

SNAPPSociogram/src/main/java/SNAPPDisplay.java renamed to SNAPPSociogram/src/main/java/org/apereo/learninganalytics/snapp/SNAPPDisplay.java

+2-4
Large diffs are not rendered by default.

SNAPPSociogram/src/main/java/SateliteViewDemo.java renamed to SNAPPSociogram/src/main/java/org/apereo/learninganalytics/snapp/SateliteViewDemo.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
package SNAPP;
1+
package org.apereo.learninganalytics.snapp;
22

33

44
import java.awt.BasicStroke;

SNAPPSociogram/src/main/java/Utils.java renamed to SNAPPSociogram/src/main/java/org/apereo/learninganalytics/snapp/Utils.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
package SNAPP;
1+
package org.apereo.learninganalytics.snapp;
22

33
import java.text.DateFormat;
44
import java.text.ParseException;

0 commit comments

Comments
 (0)