From: <cs-...@li...> - 2010-09-28 08:50:11
|
details: http://cs-studio.hg.sourceforge.net/hgweb/cs-studio/cs-studio//hgrepo/c/cs/cs-studio/cs-studio/rev/0eba4f77dc50 changeset: 7806:0eba4f77dc50 user: jpe...@wi... date: Tue Sep 28 10:45:41 2010 +0200 description: o.c.alarm.table fixed sound resource diffstat: applications/plugins/org.csstudio.alarm.table/build.properties | 3 +- applications/plugins/org.csstudio.alarm.table/src/org/csstudio/alarm/table/SendAcknowledge.java | 23 ++------- products/DESY/DESY-CSS/plugins/org.csstudio.desy.product/MP3Files/beep-1.mp3 | 0 products/DESY/DESY-CSS/plugins/org.csstudio.desy.product/MP3Files/beep-10.mp3 | 0 products/DESY/DESY-CSS/plugins/org.csstudio.desy.product/MP3Files/beep-2.mp3 | 0 products/DESY/DESY-CSS/plugins/org.csstudio.desy.product/MP3Files/beep-3.mp3 | 0 products/DESY/DESY-CSS/plugins/org.csstudio.desy.product/MP3Files/beep-4.mp3 | 0 products/DESY/DESY-CSS/plugins/org.csstudio.desy.product/MP3Files/beep-5.mp3 | 0 products/DESY/DESY-CSS/plugins/org.csstudio.desy.product/MP3Files/beep-6.mp3 | 0 products/DESY/DESY-CSS/plugins/org.csstudio.desy.product/MP3Files/beep-7.mp3 | 0 products/DESY/DESY-CSS/plugins/org.csstudio.desy.product/MP3Files/beep-8.mp3 | 0 products/DESY/DESY-CSS/plugins/org.csstudio.desy.product/MP3Files/beep-9.mp3 | 0 12 files changed, 8 insertions(+), 18 deletions(-) diffs (85 lines): diff -r c14aa4d895ab -r 0eba4f77dc50 applications/plugins/org.csstudio.alarm.table/build.properties --- a/applications/plugins/org.csstudio.alarm.table/build.properties Mon Sep 27 17:16:57 2010 -0400 +++ b/applications/plugins/org.csstudio.alarm.table/build.properties Tue Sep 28 10:45:41 2010 +0200 @@ -8,4 +8,5 @@ html/,\ toc.xml,\ nl/,\ - lib/ + lib/,\ + MP3Files/ diff -r c14aa4d895ab -r 0eba4f77dc50 applications/plugins/org.csstudio.alarm.table/src/org/csstudio/alarm/table/SendAcknowledge.java --- a/applications/plugins/org.csstudio.alarm.table/src/org/csstudio/alarm/table/SendAcknowledge.java Mon Sep 27 17:16:57 2010 -0400 +++ b/applications/plugins/org.csstudio.alarm.table/src/org/csstudio/alarm/table/SendAcknowledge.java Tue Sep 28 10:45:41 2010 +0200 @@ -112,9 +112,7 @@ } /** - * Sends for the list of JMSMessages an acknowledge message to the jms- and - * ldap server. - * + * Sends for the list of JMSMessages an acknowledge message to the jms server. */ @Override @Nonnull @@ -123,6 +121,7 @@ final ISendMapMessage sender = JmsLogsPlugin.getDefault().getSendMapMessage(); try { + // FIXME (jpenning) why no more startSender? // sender.startSender(true); for (final BasicMessage message : messagesToSend) { @@ -156,20 +155,9 @@ mapMessage.setString(AlarmMessageKey.ACK.getDefiningName(), Boolean.TRUE.toString()); //$NON-NLS-1$ //$NON-NLS-2$ mapMessage.setString("ACK_TIME", time); //$NON-NLS-1$ - // Engine.getInstance().addLdapWriteRequest("epicsAlarmAckn", - // message.getName(), "ack"); epicsAlarmHighUnAckn - // FIXME (jpenning, bknerr) - // LDAP Write requests for acknowledging should be removed. - // Acknowledge action NOT via LDAP (and not with this bad Engine anyway) - - -// Engine.getInstance().addLdapWriteRequest( -// "epicsAlarmAcknTimeStamp", message.getName(), time); -// Engine.getInstance().addLdapWriteRequest( -// "epicsAlarmHighUnAckn", message.getName(), ""); - - + // LDAP Write requests for acknowledging are removed. + // Acknowledge action is no longer stored in LDAP if (user != null) { String property = message.getProperty(AlarmMessageKey.EVENTTIME.getDefiningName()); @@ -185,7 +173,8 @@ JmsLogsPlugin.logException("ACK not set", e); return Status.CANCEL_STATUS; } finally { - try { + // FIXME (jpenning) cleanup finally block. why no more stopSender? + try { // sender.stopSender(); System.out.println("stop sender!!!"); //$NON-NLS-1$ } catch (final Exception e) { diff -r c14aa4d895ab -r 0eba4f77dc50 products/DESY/DESY-CSS/plugins/org.csstudio.desy.product/MP3Files/beep-1.mp3 Binary file products/DESY/DESY-CSS/plugins/org.csstudio.desy.product/MP3Files/beep-1.mp3 has changed diff -r c14aa4d895ab -r 0eba4f77dc50 products/DESY/DESY-CSS/plugins/org.csstudio.desy.product/MP3Files/beep-10.mp3 Binary file products/DESY/DESY-CSS/plugins/org.csstudio.desy.product/MP3Files/beep-10.mp3 has changed diff -r c14aa4d895ab -r 0eba4f77dc50 products/DESY/DESY-CSS/plugins/org.csstudio.desy.product/MP3Files/beep-2.mp3 Binary file products/DESY/DESY-CSS/plugins/org.csstudio.desy.product/MP3Files/beep-2.mp3 has changed diff -r c14aa4d895ab -r 0eba4f77dc50 products/DESY/DESY-CSS/plugins/org.csstudio.desy.product/MP3Files/beep-3.mp3 Binary file products/DESY/DESY-CSS/plugins/org.csstudio.desy.product/MP3Files/beep-3.mp3 has changed diff -r c14aa4d895ab -r 0eba4f77dc50 products/DESY/DESY-CSS/plugins/org.csstudio.desy.product/MP3Files/beep-4.mp3 Binary file products/DESY/DESY-CSS/plugins/org.csstudio.desy.product/MP3Files/beep-4.mp3 has changed diff -r c14aa4d895ab -r 0eba4f77dc50 products/DESY/DESY-CSS/plugins/org.csstudio.desy.product/MP3Files/beep-5.mp3 Binary file products/DESY/DESY-CSS/plugins/org.csstudio.desy.product/MP3Files/beep-5.mp3 has changed diff -r c14aa4d895ab -r 0eba4f77dc50 products/DESY/DESY-CSS/plugins/org.csstudio.desy.product/MP3Files/beep-6.mp3 Binary file products/DESY/DESY-CSS/plugins/org.csstudio.desy.product/MP3Files/beep-6.mp3 has changed diff -r c14aa4d895ab -r 0eba4f77dc50 products/DESY/DESY-CSS/plugins/org.csstudio.desy.product/MP3Files/beep-7.mp3 Binary file products/DESY/DESY-CSS/plugins/org.csstudio.desy.product/MP3Files/beep-7.mp3 has changed diff -r c14aa4d895ab -r 0eba4f77dc50 products/DESY/DESY-CSS/plugins/org.csstudio.desy.product/MP3Files/beep-8.mp3 Binary file products/DESY/DESY-CSS/plugins/org.csstudio.desy.product/MP3Files/beep-8.mp3 has changed diff -r c14aa4d895ab -r 0eba4f77dc50 products/DESY/DESY-CSS/plugins/org.csstudio.desy.product/MP3Files/beep-9.mp3 Binary file products/DESY/DESY-CSS/plugins/org.csstudio.desy.product/MP3Files/beep-9.mp3 has changed |