Merge remote-tracking branch 'upstream/develop' into sigid3

This commit is contained in:
Samuel H. Kenyon 2013-11-27 15:45:45 -05:00
commit 6e8f5a8d19

View File

@ -206,8 +206,14 @@ public class IngestManager {
} }
static synchronized void fireModuleEvent(String eventType, String moduleName) { static synchronized void fireModuleEvent(String eventType, String moduleName) {
try {
pcs.firePropertyChange(eventType, moduleName, null); pcs.firePropertyChange(eventType, moduleName, null);
} }
catch (Exception e) {
logger.log(Level.SEVERE, "Ingest manager listener threw exception", e);
MessageNotifyUtil.Notify.show("Module Error", "A module caused an error listening to Ingest Manager updates. See log to determine which module. Some data could be incomplete.", MessageNotifyUtil.MessageType.ERROR);
}
}
/** /**
@ -215,8 +221,14 @@ public class IngestManager {
* @param objId ID of file that is done * @param objId ID of file that is done
*/ */
static synchronized void fireFileDone(long objId) { static synchronized void fireFileDone(long objId) {
try {
pcs.firePropertyChange(IngestModuleEvent.FILE_DONE.toString(), objId, null); pcs.firePropertyChange(IngestModuleEvent.FILE_DONE.toString(), objId, null);
} }
catch (Exception e) {
logger.log(Level.SEVERE, "Ingest manager listener threw exception", e);
MessageNotifyUtil.Notify.show("Module Error", "A module caused an error listening to Ingest Manager updates. See log to determine which module. Some data could be incomplete.", MessageNotifyUtil.MessageType.ERROR);
}
}
/** /**
@ -224,16 +236,28 @@ public class IngestManager {
* @param moduleDataEvent * @param moduleDataEvent
*/ */
static synchronized void fireModuleDataEvent(ModuleDataEvent moduleDataEvent) { static synchronized void fireModuleDataEvent(ModuleDataEvent moduleDataEvent) {
try {
pcs.firePropertyChange(IngestModuleEvent.DATA.toString(), moduleDataEvent, null); pcs.firePropertyChange(IngestModuleEvent.DATA.toString(), moduleDataEvent, null);
} }
catch (Exception e) {
logger.log(Level.SEVERE, "Ingest manager listener threw exception", e);
MessageNotifyUtil.Notify.show("Module Error", "A module caused an error listening to Ingest Manager updates. See log to determine which module. Some data could be incomplete.", MessageNotifyUtil.MessageType.ERROR);
}
}
/** /**
* Fire event for ModuleContentChanged (when modules create new content that needs to be analyzed) * Fire event for ModuleContentChanged (when modules create new content that needs to be analyzed)
* @param moduleContentEvent * @param moduleContentEvent
*/ */
static synchronized void fireModuleContentEvent(ModuleContentEvent moduleContentEvent) { static synchronized void fireModuleContentEvent(ModuleContentEvent moduleContentEvent) {
try {
pcs.firePropertyChange(IngestModuleEvent.CONTENT_CHANGED.toString(), moduleContentEvent, null); pcs.firePropertyChange(IngestModuleEvent.CONTENT_CHANGED.toString(), moduleContentEvent, null);
} }
catch (Exception e) {
logger.log(Level.SEVERE, "Ingest manager listener threw exception", e);
MessageNotifyUtil.Notify.show("Module Error", "A module caused an error listening to Ingest Manager updates. See log to determine which module. Some data could be incomplete.", MessageNotifyUtil.MessageType.ERROR);
}
}
/** /**
* Returns the return value from a previously run module on the file being * Returns the return value from a previously run module on the file being