eclipse-sailing-analytics/sailing-analytics
1
0 Fork 0
mirror of https://github.com/eclipse-sailing-analytics/sailing-analytics.git synced 2026-10-08 21:30:57 +00:00
Code Activity

Changed App Event persistence manager to use an array list as cache instead of the fileContent

Browse Source
This commit is contained in:
Armin Zamani committed 2013-04-30 10:28:00 +02:00
1 parent 517d200a52
commit 9a180f0e60
3 files changed
+59 -54
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

java/com.sap.sailing.gwt.ui/SailingGWT.launch
+1 -1
View File
@@ -47,7 +47,7 @@
<stringAttribute key="org.eclipse.jdt.launching.CLASSPATH_PROVIDER" value="com.google.gwt.eclipse.core.moduleClasspathProvider"/>
<booleanAttribute key="org.eclipse.jdt.launching.DEFAULT_CLASSPATH" value="false"/>
<stringAttribute key="org.eclipse.jdt.launching.MAIN_TYPE" value="com.google.gwt.dev.DevMode"/>
<stringAttribute key="org.eclipse.jdt.launching.PROGRAM_ARGUMENTS" value="-war &quot;${project_loc:com.sap.sailing.gwt.ui}&quot; -noserver -remoteUI &quot;${gwt_remote_ui_server_port}:${unique_id}&quot; -logLevel INFO -codeServerPort 9997 -startupUrl /gwt/AdminConsole.html com.sap.sailing.gwt.ui.AdminConsole -startupUrl /gwt/LeaderboardEditing.html com.sap.sailing.gwt.ui.LeaderboardEditing -startupUrl /gwt/UserManagement.html com.sap.sailing.gwt.ui.UserManagement -startupUrl /gwt/Leaderboard.html com.sap.sailing.gwt.ui.Leaderboard -startupUrl /gwt/Spectator.html com.sap.sailing.gwt.ui.Spectator -startupUrl /gwt/RaceBoard.html com.sap.sailing.gwt.ui.RaceBoard -startupUrl /gwt/TvView.html com.sap.sailing.gwt.ui.TvView -startupUrl /gwt/PolarSheets.html com.sap.sailing.gwt.ui.PolarSheets -startupUrl /gwt/RegattaOverview.html com.sap.sailing.gwt.ui.RegattaOverview"/>
<stringAttribute key="org.eclipse.jdt.launching.PROGRAM_ARGUMENTS" value="-war &quot;${project_loc:com.sap.sailing.gwt.ui}&quot; -noserver -remoteUI &quot;${gwt_remote_ui_server_port}:${unique_id}&quot; -logLevel INFO -codeServerPort 9997 -startupUrl /gwt/AdminConsole.html com.sap.sailing.gwt.ui.AdminConsole -startupUrl /gwt/LeaderboardEditing.html com.sap.sailing.gwt.ui.LeaderboardEditing -startupUrl /gwt/UserManagement.html com.sap.sailing.gwt.ui.UserManagement -startupUrl /gwt/Leaderboard.html com.sap.sailing.gwt.ui.Leaderboard -startupUrl /gwt/Spectator.html com.sap.sailing.gwt.ui.Spectator -startupUrl /gwt/RaceBoard.html com.sap.sailing.gwt.ui.RaceBoard -startupUrl /gwt/TvView.html com.sap.sailing.gwt.ui.TvView -startupUrl /gwt/PolarSheets.html com.sap.sailing.gwt.ui.PolarSheets -startupUrl /gwt/RegattaOverview.html com.sap.sailing.gwt.ui.PolarSheets"/>
<stringAttribute key="org.eclipse.jdt.launching.PROJECT_ATTR" value="com.sap.sailing.gwt.ui"/>
<stringAttribute key="org.eclipse.jdt.launching.VM_ARGUMENTS" value="-Xmx2048m -XX:MaxPermSize=512m"/>
</launchConfiguration>
java/com.sap.sailing.mongodb.test/src/com/sap/sailing/mongodb/test/TestStoringAndRetrievingRaceLogInRegatta.java
+1 -1
View File
@@ -122,7 +122,7 @@ public class TestStoringAndRetrievingRaceLogInRegatta extends RaceLogMongoDBTest
@Test
public void testStoreAndRetrieveSimpleLeaderboardWithRaceLogStartProcedureChangedEvent() {
RaceLogStartProcedureChangedEvent expectedEvent = RaceLogEventFactory.INSTANCE.createStartProcedureChangedEvent(now, 0, StartProcedureType.RRS26);
RaceLogStartProcedureChangedEvent expectedEvent = RaceLogEventFactory.INSTANCE.createStartProcedureChangedEvent(now, 0, StartProcedureType.ESS);
addAndStoreRaceLogEvent(regatta, raceColumnName, expectedEvent);
mobile/com.sap.sailing.racecommittee.app/src/com/sap/sailing/racecommittee/app/services/sending/EventPersistenceManager.java
+57 -52
View File
@@ -23,16 +23,16 @@ public class EventPersistenceManager {
private final static String delayedEventFileName = "delayedEvents.txt";
private Context context;
private String fileContent;
private List<String> persistedEvents;
public EventPersistenceManager(Context context) {
this.context = context;
fileContent = "";
initializeFile();
persistedEvents = new ArrayList<String>();
initializeFileAndPersistedEvents();
}
public boolean areIntentsDelayed() {
return !fileContent.isEmpty();
return !persistedEvents.isEmpty();
}
public void persistIntent(Intent intent) {
@@ -45,16 +45,19 @@ public class EventPersistenceManager {
}
private void persistEvent(String raceUuid, Serializable serializedEvent) {
String eventLine = String.format("%s;%s\n", raceUuid, serializedEvent);
String eventLine = getSerializedIntentForPersistence(raceUuid, serializedEvent);
ExLog.i(TAG, String.format("Persisting event \"%s\" for race %s.", eventLine, raceUuid));
if (!fileContent.isEmpty()) {
if (fileContent.contains(eventLine)) {
ExLog.i(TAG, "The event already exists. Ignoring.");
return;
}
if (persistedEvents.contains(eventLine)) {
ExLog.i(TAG, "The event already exists. Ignoring.");
return;
}
writeEventToFile(eventLine);
saveEvent(eventLine);
}
private String getSerializedIntentForPersistence(String raceUuid, Serializable serializedEvent) {
String eventLine = String.format("%s;%s", raceUuid, serializedEvent);
return eventLine;
}
public void removeIntent(Intent intent) {
@@ -67,57 +70,49 @@ public class EventPersistenceManager {
}
private void removeEvent(String raceUuid, String serializedEvent) {
if (fileContent.isEmpty())
if (persistedEvents.isEmpty())
return;
ExLog.i(TAG, String.format("Removing event \"%s\" for race %s.", serializedEvent, raceUuid));
String eventLine = String.format("%s;%s\n", raceUuid, serializedEvent);
removeEntryInFileContent(eventLine);
String eventLine = getSerializedIntentForPersistence(raceUuid, serializedEvent);
removePersistedEvent(eventLine);
}
/**
* @param eventLine
*/
private void removeEntryInFileContent(String eventLine) {
if (fileContent.contains(eventLine)) {
fileContent = fileContent.replace(eventLine, "");
writeFileContentToFile();
private void removePersistedEvent(String eventLine) {
if (persistedEvents.contains(eventLine)) {
persistedEvents.remove(eventLine);
writePersistedEventsToFile();
ExLog.i(TAG, "Event removed.");
}
}
public int getEventCount() {
if (fileContent.isEmpty()) {
return 0;
}
return fileContent.split("\n").length;
return persistedEvents.size();
}
public List<Intent> restoreEvents() {
List<Intent> delayedIntents = new ArrayList<Intent>();
//These file entries may be too old. No appropriate race id has been found for this event.
List<String> fileEntriesToBeRemoved = new ArrayList<String>();
//These file entries may be too old. No appropriate race id has been found for this event.
List<String> entriesToBeRemoved = new ArrayList<String>();
if (!fileContent.isEmpty()) {
String[] eventLines = fileContent.split("\n");
for (String line : eventLines) {
if (!line.isEmpty()) {
String[] lineParts = line.split(";");
for (String persistedEvent : persistedEvents) {
Intent eventIntent = EventSendingService.createEventIntent(context, lineParts[0], lineParts[1]);
if (eventIntent != null) {
delayedIntents.add(eventIntent);
} else {
fileEntriesToBeRemoved.add(line);
}
}
String[] lineParts = persistedEvent.split(";");
Intent eventIntent = EventSendingService.createEventIntent(context, lineParts[0], lineParts[1]);
if (eventIntent != null) {
delayedIntents.add(eventIntent);
} else {
entriesToBeRemoved.add(persistedEvent);
}
}
for (String lineToBeRemoved : fileEntriesToBeRemoved) {
removeEntryInFileContent(lineToBeRemoved);
for (String entryToBeRemoved : entriesToBeRemoved) {
removePersistedEvent(entryToBeRemoved);
}
ExLog.i(TAG, "Restored " + delayedIntents.size() + " events");
@@ -142,30 +137,40 @@ public class EventPersistenceManager {
return fileContent;
}
private void writeEventToFile(String eventLine) {
fileContent += eventLine;
writeFileContentToFile();
private void saveEvent(String eventLine) {
persistedEvents.add(eventLine);
writePersistedEventsToFile();
ExLog.i(TAG, "Wrote event to file: " + eventLine);
}
private void writeFileContentToFile() {
writeToFile(fileContent, Context.MODE_PRIVATE);
ExLog.i(TAG, "Wrote file content to file: " + fileContent);
private void writePersistedEventsToFile() {
String newFileContent = "";
for (String persistedEvent : persistedEvents) {
newFileContent += persistedEvent + "\n";
}
writeToFile(newFileContent, Context.MODE_PRIVATE);
ExLog.i(TAG, "Wrote file content to file: " + newFileContent);
}
private void initializeFile() {
private void initializeFileAndPersistedEvents() {
try {
fileContent = getFileContent();
String fileContent = getFileContent();
String[] eventLines = fileContent.split("\n");
for (String eventLine : eventLines) {
if (!eventLine.isEmpty()) {
persistedEvents.add(eventLine);
}
}
} catch (FileNotFoundException e) {
ExLog.w(TAG, "persistence file not found in internal storage. The file will be created.");
clearFileContent();
clearPersistedEvents();
}
ExLog.i(TAG, "Initialized file");
}
private void clearFileContent() {
fileContent = "";
writeFileContentToFile();
private void clearPersistedEvents() {
persistedEvents.clear();
writePersistedEventsToFile();
}
private void writeToFile(String content, int mode) {