Treer
/
amidstest
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

removed the google tracker

master
Stefan Dollase 2015-12-23 23:58:10 +01:00
parent 5e2aa636ff
commit e0609cccdd
8 changed files with 4 additions and 124 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
pom.xml
View File

@ -51,22 +51,6 @@
<generatePom>true</generatePom>
</configuration>
</execution>
<execution>
<id>install-jgoogleanalytics</id>
<phase>clean</phase>
<goals>
<goal>install-file</goal>
</goals>
<configuration>
<file>${basedir}/lib/JGoogleAnalytics_0.4.jar</file>
<repositoryLayout>default</repositoryLayout>
<groupId>com.boxysystems</groupId>
<artifactId>jgoogleanalytics</artifactId>
<version>0.4</version>
<packaging>jar</packaging>
<generatePom>true</generatePom>
</configuration>
</execution>
</executions>
</plugin>
<plugin>
@ -169,11 +153,6 @@
<artifactId>jnbt</artifactId>
<version>1.3</version>
</dependency>
<dependency>
<groupId>com.boxysystems</groupId>
<artifactId>jgoogleanalytics</artifactId>
<version>0.4</version>
</dependency>
<dependency>
<groupId>junit</groupId>
<artifactId>junit</artifactId>

34
src/main/java/amidst/AmidstMetaData.java
View File

@ -13,11 +13,7 @@ public class AmidstMetaData {
icon,
Integer.parseInt(properties.getProperty("amidst.version.major")),
Integer.parseInt(properties.getProperty("amidst.version.minor")),
properties.getProperty("amidst.gui.mainWindow.title"),
Boolean.parseBoolean(properties.getProperty("amidst.googleanalytics.enabled")),
properties.getProperty("amidst.googleanalytics.appName"),
properties.getProperty("amidst.googleanalytics.appVersion"),
properties.getProperty("amidst.googleanalytics.trackingCode"));
properties.getProperty("amidst.gui.mainWindow.title"));
// @formatter:on
}
@ -25,23 +21,13 @@ public class AmidstMetaData {
private final int majorVersion;
private final int minorVersion;
private final String mainWindowTitle;
private final boolean googleAnalyticsEnabled;
private final String googleAnalyticsAppName;
private final String googleAnalyticsAppVersion;
private final String googleAnalyticsTrackingCode;
private AmidstMetaData(BufferedImage icon, int majorVersion,
int minorVersion, String mainWindowTitle,
boolean googleAnalyticsEnabled, String googleAnalyticsAppName,
String googleAnalyticsAppVersion, String googleAnalyticsTrackingCode) {
int minorVersion, String mainWindowTitle) {
this.icon = icon;
this.majorVersion = majorVersion;
this.minorVersion = minorVersion;
this.mainWindowTitle = mainWindowTitle;
this.googleAnalyticsEnabled = googleAnalyticsEnabled;
this.googleAnalyticsAppName = googleAnalyticsAppName;
this.googleAnalyticsAppVersion = googleAnalyticsAppVersion;
this.googleAnalyticsTrackingCode = googleAnalyticsTrackingCode;
}
public BufferedImage getIcon() {
@ -59,20 +45,4 @@ public class AmidstMetaData {
public String getMainWindowTitle() {
return mainWindowTitle;
}
public boolean isGoogleAnalyticsEnabled() {
return googleAnalyticsEnabled;
}
public String getGoogleAnalyticsAppName() {
return googleAnalyticsAppName;
}
public String getGoogleAnalyticsAppVersion() {
return googleAnalyticsAppVersion;
}
public String getGoogleAnalyticsTrackingCode() {
return googleAnalyticsTrackingCode;
}
}

19
src/main/java/amidst/Application.java
View File

@ -19,14 +19,11 @@ import amidst.mojangapi.world.WorldBuilder;
import amidst.mojangapi.world.player.PlayerInformationCache;
import amidst.threading.ThreadMaster;
import com.boxysystems.jgoogleanalytics.JGoogleAnalyticsTracker;
@NotThreadSafe
public class Application {
private final CommandLineParameters parameters;
private final AmidstMetaData metadata;
private final Settings settings;
private final GoogleTracker googleTracker;
private final MojangApi mojangApi;
private final WorldSurroundingsBuilder worldSurroundingsBuilder;
private final ThreadMaster threadMaster;
@ -41,7 +38,6 @@ public class Application {
this.parameters = parameters;
this.metadata = createMetadata();
this.settings = createSettings();
this.googleTracker = createGoogleTracker();
this.mojangApi = createMojangApi();
this.worldSurroundingsBuilder = createWorldSurroundingsBuilder();
this.threadMaster = createThreadMaster();
@ -59,22 +55,10 @@ public class Application {
return new Settings(Preferences.userNodeForPackage(Amidst.class));
}
@CalledOnlyBy(AmidstThread.EDT)
private GoogleTracker createGoogleTracker() {
if (metadata.isGoogleAnalyticsEnabled()) {
return new GoogleTracker();
} else {
return new GoogleTracker(new JGoogleAnalyticsTracker(
metadata.getGoogleAnalyticsAppName(),
metadata.getGoogleAnalyticsAppVersion(),
metadata.getGoogleAnalyticsTrackingCode()));
}
}
@CalledOnlyBy(AmidstThread.EDT)
private MojangApi createMojangApi() throws FileNotFoundException,
LocalMinecraftInterfaceCreationException {
return new MojangApiBuilder(new WorldBuilder(googleTracker,
return new MojangApiBuilder(new WorldBuilder(
new PlayerInformationCache(), new SeedHistoryLogger(
parameters.historyPath)), parameters.minecraftPath,
parameters.minecraftLibraries, parameters.minecraftJar,
@ -94,7 +78,6 @@ public class Application {
@CalledOnlyBy(AmidstThread.EDT)
public void run() {
googleTracker.trackApplicationRunning();
if (mojangApi.canCreateWorld()) {
displayMainWindow();
} else {

40
src/main/java/amidst/GoogleTracker.java
View File

@ -1,40 +0,0 @@
package amidst;
import amidst.documentation.ThreadSafe;
import amidst.mojangapi.world.WorldSeed;
import com.boxysystems.jgoogleanalytics.FocusPoint;
import com.boxysystems.jgoogleanalytics.JGoogleAnalyticsTracker;
@ThreadSafe
public class GoogleTracker {
private final JGoogleAnalyticsTracker tracker;
public GoogleTracker(JGoogleAnalyticsTracker tracker) {
this.tracker = tracker;
}
public GoogleTracker() {
this.tracker = null;
}
public void trackApplicationRunning() {
track("Run");
}
public void trackSeed(WorldSeed seed) {
if (seed.hasTrackingMessage()) {
track(seed.getTrackingMessage());
}
}
private void track(String name) {
if (tracker != null) {
doTrack(name);
}
}
private synchronized void doTrack(String name) {
tracker.trackAsynchronously(new FocusPoint(name));
}
}

1
src/main/java/amidst/gui/license/LicenseWindow.java
View File

@ -39,7 +39,6 @@ public class LicenseWindow {
createLicense("AMIDST", "amidst.txt"),
createLicense("Args4j", "args4j.txt"),
createLicense("Gson", "gson.txt"),
createLicense("JGoogleAnalytics", "jgoogleanalytics.txt"),
createLicense("JNBT", "jnbt.txt"),
createLicense("MiG Layout", "miglayout.txt"));
return result.toArray(new License[result.size()]);

7
src/main/java/amidst/mojangapi/world/WorldBuilder.java
View File

@ -2,7 +2,6 @@ package amidst.mojangapi.world;
import java.io.IOException;
import amidst.GoogleTracker;
import amidst.documentation.Immutable;
import amidst.mojangapi.file.MojangApiParsingException;
import amidst.mojangapi.file.directory.SaveDirectory;
@ -25,14 +24,11 @@ import amidst.mojangapi.world.player.WorldPlayerType;
@Immutable
public class WorldBuilder {
private final GoogleTracker googleTracker;
private final PlayerInformationCache playerInformationCache;
private final SeedHistoryLogger seedHistoryLogger;
public WorldBuilder(GoogleTracker googleTracker,
PlayerInformationCache playerInformationCache,
public WorldBuilder(PlayerInformationCache playerInformationCache,
SeedHistoryLogger seedHistoryLogger) {
this.googleTracker = googleTracker;
this.playerInformationCache = playerInformationCache;
this.seedHistoryLogger = seedHistoryLogger;
}
@ -71,7 +67,6 @@ public class WorldBuilder {
WorldType worldType, String generatorOptions,
MovablePlayerList movablePlayerList)
throws MinecraftInterfaceException {
googleTracker.trackSeed(seed);
seedHistoryLogger.log(seed);
// @formatter:off
minecraftInterface.createWorld(seed.getLong(), worldType, generatorOptions);

2
src/main/resources/amidst/gui/license/jgoogleanalytics.txt
View File

@ -1,2 +0,0 @@
JGoogleAnalytics is licensed under "Apache License, Version 2.0"
More information can be found here: http://www.apache.org/licenses/LICENSE-2.0

4
src/main/resources/amidst/metadata.properties
View File

@ -2,7 +2,3 @@ amidst.filename=AMIDST-v4.0-alpha1
amidst.version.major=4
amidst.version.minor=0
amidst.gui.mainWindow.title=Amidst v4.0-alpha1
amidst.googleanalytics.enabled=false
amidst.googleanalytics.appName=AMIDST
amidst.googleanalytics.appVersion=v4.0-alpha1
amidst.googleanalytics.trackingCode=UA-27092717-1