Menu
▾
▴
[Cs-studio-core] /hgrepo/c/cs/cs-studio/cs-studio: 2 new changesets
|
From: <cs-...@li...> - 2010-10-26 07:13:18
|
details: http://cs-studio.hg.sourceforge.net/hgweb/cs-studio/cs-studio//hgrepo/c/cs/cs-studio/cs-studio/rev/472addba52ad changeset: 7996:472addba52ad user: Jan Hatje <jan...@de...> date: Tue Oct 26 09:06:21 2010 +0200 description: Desy product: add island version details: http://cs-studio.hg.sourceforge.net/hgweb/cs-studio/cs-studio//hgrepo/c/cs/cs-studio/cs-studio/rev/042509534def changeset: 7997:042509534def user: Jan Hatje <jan...@de...> date: Tue Oct 26 09:10:01 2010 +0200 description: Merge with tip diffstat: applications/features/org.csstudio.alarm.beast.ui.feature/feature.xml | 2 +- applications/features/org.csstudio.trends.databrowser2.feature/feature.xml | 2 +- applications/plugins/org.csstudio.alarm.beast.annunciator/META-INF/MANIFEST.MF | 4 +- applications/plugins/org.csstudio.alarm.beast.annunciator/src/org/csstudio/alarm/beast/annunciator/Application.java | 4 +- applications/plugins/org.csstudio.alarm.beast.annunciator/src/org/csstudio/alarm/beast/annunciator/model/AnnunciationMessage.java | 23 +- applications/plugins/org.csstudio.alarm.beast.annunciator/src/org/csstudio/alarm/beast/annunciator/model/JMSAnnunciator.java | 1 + applications/plugins/org.csstudio.alarm.beast.annunciator/src/org/csstudio/alarm/beast/annunciator/model/QueueManager.java | 9 +- applications/plugins/org.csstudio.alarm.beast.annunciator/src/org/csstudio/alarm/beast/annunciator/model/QueueManagerTest.java | 1 + applications/plugins/org.csstudio.alarm.beast.annunciator/src/org/csstudio/alarm/beast/annunciator/model/Severity.java | 23 +- applications/plugins/org.csstudio.alarm.beast.annunciator/src/org/csstudio/alarm/beast/annunciator/model/SeverityTest.java | 2 + applications/plugins/org.csstudio.alarm.beast.annunciator/src/org/csstudio/alarm/beast/annunciator/model/TranslationFileReader.java | 1 + applications/plugins/org.csstudio.alarm.beast.configtool/META-INF/MANIFEST.MF | 2 +- applications/plugins/org.csstudio.alarm.beast.msghist/META-INF/MANIFEST.MF | 4 +- applications/plugins/org.csstudio.alarm.beast.msghist/src/org/csstudio/alarm/beast/msghist/model/Message.java | 10 +- applications/plugins/org.csstudio.alarm.beast.msghist/src/org/csstudio/alarm/beast/msghist/model/ModelTest.java | 17 +- applications/plugins/org.csstudio.alarm.beast.msghist/src/org/csstudio/alarm/beast/msghist/rdb/MessageRDB.java | 2 +- applications/plugins/org.csstudio.alarm.beast.msghist/src/org/csstudio/alarm/beast/msghist/rdb/SQL.java | 4 +- applications/plugins/org.csstudio.alarm.beast.server/META-INF/MANIFEST.MF | 8 +- applications/plugins/org.csstudio.alarm.beast.server/src/org/csstudio/alarm/beast/server/AlarmLogic.java | 2 +- applications/plugins/org.csstudio.alarm.beast.server/src/org/csstudio/alarm/beast/server/AlarmLogicTest.java | 2 +- applications/plugins/org.csstudio.alarm.beast.server/src/org/csstudio/alarm/beast/server/AlarmRDBTest.java | 30 +- applications/plugins/org.csstudio.alarm.beast.server/src/org/csstudio/alarm/beast/server/AlarmServer.java | 15 +- applications/plugins/org.csstudio.alarm.beast.server/src/org/csstudio/alarm/beast/server/AlarmState.java | 12 + applications/plugins/org.csstudio.alarm.beast.server/src/org/csstudio/alarm/beast/server/Application.java | 1 + applications/plugins/org.csstudio.alarm.beast.server/src/org/csstudio/alarm/beast/server/ServerCommunicator.java | 8 + applications/plugins/org.csstudio.alarm.beast.server/src/org/csstudio/alarm/beast/server/TimerQueueTest.java | 2 +- applications/plugins/org.csstudio.alarm.beast.ui.alarmtable/META-INF/MANIFEST.MF | 2 +- applications/plugins/org.csstudio.alarm.beast.ui.alarmtable/src/org/csstudio/alarm/beast/ui/alarmtable/AlarmComparator.java | 8 +- applications/plugins/org.csstudio.alarm.beast.ui.alarmtable/src/org/csstudio/alarm/beast/ui/alarmtable/GUI.java | 2 + applications/plugins/org.csstudio.alarm.beast.ui.alarmtable/src/org/csstudio/alarm/beast/ui/alarmtable/GUIUpdateThrottle.java | 6 +- applications/plugins/org.csstudio.alarm.beast.ui.alarmtable/src/org/csstudio/alarm/beast/ui/alarmtable/GUIUpdateThrottleTest.java | 1 + applications/plugins/org.csstudio.alarm.beast.ui.alarmtree/META-INF/MANIFEST.MF | 2 +- applications/plugins/org.csstudio.alarm.beast.ui/META-INF/MANIFEST.MF | 6 +- applications/plugins/org.csstudio.alarm.beast.ui/src/org/csstudio/alarm/beast/ui/MaintenanceModeAction.java | 15 +- applications/plugins/org.csstudio.alarm.beast.ui/src/org/csstudio/alarm/beast/ui/clientmodel/AlarmClientCommunicator.java | 1 + applications/plugins/org.csstudio.alarm.beast.ui/src/org/csstudio/alarm/beast/ui/clientmodel/AlarmClientModel.java | 18 +- applications/plugins/org.csstudio.alarm.beast/META-INF/MANIFEST.MF | 6 +- applications/plugins/org.csstudio.alarm.beast/src/org/csstudio/alarm/beast/AlarmConfigurationTest.java | 146 - applications/plugins/org.csstudio.alarm.beast/src/org/csstudio/alarm/beast/AlarmConfigurationUnitTest.java | 160 + applications/plugins/org.csstudio.alarm.beast/src/org/csstudio/alarm/beast/AlarmTreeItemTest.java | 87 - applications/plugins/org.csstudio.alarm.beast/src/org/csstudio/alarm/beast/AlarmTreeItemUnitTest.java | 87 + applications/plugins/org.csstudio.alarm.beast/src/org/csstudio/alarm/beast/AlarmTreePathTest.java | 60 - applications/plugins/org.csstudio.alarm.beast/src/org/csstudio/alarm/beast/AlarmTreePathUnitTest.java | 60 + applications/plugins/org.csstudio.alarm.beast/src/org/csstudio/alarm/beast/GDCDataStructure.java | 108 +- applications/plugins/org.csstudio.alarm.beast/src/org/csstudio/alarm/beast/JMSAlarmCommunicator.java | 9 +- applications/plugins/org.csstudio.alarm.beast/src/org/csstudio/alarm/beast/SeverityLevelHeadlessTest.java | 48 + applications/plugins/org.csstudio.alarm.beast/src/org/csstudio/alarm/beast/SeverityLevelTest.java | 47 - applications/plugins/org.csstudio.alarm.beast/src/org/csstudio/alarm/beast/TimeoutTimer.java | 1 - applications/plugins/org.csstudio.alarm.beast/src/org/csstudio/alarm/beast/TimeoutTimerTest.java | 67 - applications/plugins/org.csstudio.alarm.beast/src/org/csstudio/alarm/beast/TimeoutTimerUnitTest.java | 67 + applications/plugins/org.csstudio.alarm.beast/src/org/csstudio/alarm/beast/WorkQueueTest.java | 68 - applications/plugins/org.csstudio.alarm.beast/src/org/csstudio/alarm/beast/WorkQueueUnitTest.java | 68 + applications/plugins/org.csstudio.alarm.jms2ora/Jms2Ora.product | 20 +- applications/plugins/org.csstudio.alarm.jms2ora/META-INF/MANIFEST.MF | 2 +- applications/plugins/org.csstudio.alarm.jms2ora/jms2ora-config.properties | 55 - applications/plugins/org.csstudio.alarm.jms2ora/log4j-jms2ora.properties | 12 - applications/plugins/org.csstudio.alarm.jms2ora/plugin.xml | 5 + applications/plugins/org.csstudio.alarm.jms2ora/plugin_customization.ini | 99 +- applications/plugins/org.csstudio.alarm.jms2ora/src/org/csstudio/alarm/jms2ora/ApplicationStopper.java | 42 +- applications/plugins/org.csstudio.alarm.jms2ora/src/org/csstudio/alarm/jms2ora/Jms2OraApplication.java | 639 +- applications/plugins/org.csstudio.alarm.jms2ora/src/org/csstudio/alarm/jms2ora/Jms2OraPlugin.java | 188 +- applications/plugins/org.csstudio.alarm.jms2ora/src/org/csstudio/alarm/jms2ora/MessageProcessor.java | 982 ++-- applications/plugins/org.csstudio.alarm.jms2ora/src/org/csstudio/alarm/jms2ora/NewMessageProcessor.java | 1099 ++-- applications/plugins/org.csstudio.alarm.jms2ora/src/org/csstudio/alarm/jms2ora/Stoppable.java | 68 +- applications/plugins/org.csstudio.alarm.jms2ora/src/org/csstudio/alarm/jms2ora/VersionInfo.java | 80 +- applications/plugins/org.csstudio.alarm.jms2ora/src/org/csstudio/alarm/jms2ora/database/DatabaseLayer.java | 237 +- applications/plugins/org.csstudio.alarm.jms2ora/src/org/csstudio/alarm/jms2ora/management/DeleteAllMessageFiles.java | 92 +- applications/plugins/org.csstudio.alarm.jms2ora/src/org/csstudio/alarm/jms2ora/management/GetMessageFileContent.java | 87 +- applications/plugins/org.csstudio.alarm.jms2ora/src/org/csstudio/alarm/jms2ora/management/GetNameOfMessageFiles.java | 88 +- applications/plugins/org.csstudio.alarm.jms2ora/src/org/csstudio/alarm/jms2ora/management/GetNumberOfMessageFiles.java | 94 +- applications/plugins/org.csstudio.alarm.jms2ora/src/org/csstudio/alarm/jms2ora/management/GetQueuedMessages.java | 88 +- applications/plugins/org.csstudio.alarm.jms2ora/src/org/csstudio/alarm/jms2ora/management/Restart.java | 149 +- applications/plugins/org.csstudio.alarm.jms2ora/src/org/csstudio/alarm/jms2ora/management/Stop.java | 190 +- applications/plugins/org.csstudio.alarm.jms2ora/src/org/csstudio/alarm/jms2ora/preferences/PreferenceConstants.java | 110 +- applications/plugins/org.csstudio.alarm.jms2ora/src/org/csstudio/alarm/jms2ora/preferences/PreferenceInitializer.java | 132 +- applications/plugins/org.csstudio.alarm.jms2ora/src/org/csstudio/alarm/jms2ora/util/ApplicState.java | 56 +- applications/plugins/org.csstudio.alarm.jms2ora/src/org/csstudio/alarm/jms2ora/util/CommandLine.java | 519 +- applications/plugins/org.csstudio.alarm.jms2ora/src/org/csstudio/alarm/jms2ora/util/Hostname.java | 215 +- applications/plugins/org.csstudio.alarm.jms2ora/src/org/csstudio/alarm/jms2ora/util/JmsMessageReceiver.java | 328 +- applications/plugins/org.csstudio.alarm.jms2ora/src/org/csstudio/alarm/jms2ora/util/MessageAcceptor.java | 259 +- applications/plugins/org.csstudio.alarm.jms2ora/src/org/csstudio/alarm/jms2ora/util/MessageContent.java | 508 +- applications/plugins/org.csstudio.alarm.jms2ora/src/org/csstudio/alarm/jms2ora/util/MessageContentCreator.java | 1005 ++-- applications/plugins/org.csstudio.alarm.jms2ora/src/org/csstudio/alarm/jms2ora/util/MessageFileHandler.java | 745 +- applications/plugins/org.csstudio.alarm.jms2ora/src/org/csstudio/alarm/jms2ora/util/MessageFilter.java | 289 +- applications/plugins/org.csstudio.alarm.jms2ora/src/org/csstudio/alarm/jms2ora/util/MessageFilterContainer.java | 460 +- applications/plugins/org.csstudio.alarm.jms2ora/src/org/csstudio/alarm/jms2ora/util/MessageStorage.java | 248 +- applications/plugins/org.csstudio.alarm.jms2ora/src/org/csstudio/alarm/jms2ora/util/SynchObject.java | 256 +- applications/plugins/org.csstudio.ams/src/org/csstudio/ams/filter/FilterConditionProcessVariable.java | 1166 +++-- applications/plugins/org.csstudio.ams/src/org/csstudio/ams/filter/NumberValidator.java | 95 + applications/plugins/org.csstudio.apputil.ui/META-INF/MANIFEST.MF | 2 +- applications/plugins/org.csstudio.apputil/META-INF/MANIFEST.MF | 5 +- applications/plugins/org.csstudio.apputil/src/org/csstudio/apputil/test/TestProperties.java | 111 + applications/plugins/org.csstudio.apputil/src/org/csstudio/apputil/test/TestPropertiesTest.java | 44 + applications/plugins/org.csstudio.archive.engine/META-INF/MANIFEST.MF | 2 +- applications/plugins/org.csstudio.archive.rdb/META-INF/MANIFEST.MF | 2 +- applications/plugins/org.csstudio.archivereader.channelarchiver/META-INF/MANIFEST.MF | 4 +- applications/plugins/org.csstudio.archivereader.channelarchiver/src/org/csstudio/archivereader/channelarchiver/ChannelArchiverReader.java | 6 +- applications/plugins/org.csstudio.archivereader.channelarchiver/src/org/csstudio/archivereader/channelarchiver/NamesRequest.java | 2 +- applications/plugins/org.csstudio.archivereader.channelarchiver/src/org/csstudio/archivereader/channelarchiver/ServerInfoRequest.java | 2 +- applications/plugins/org.csstudio.archivereader.channelarchiver/src/org/csstudio/archivereader/channelarchiver/ValueRequest.java | 111 +- applications/plugins/org.csstudio.archivereader.rdb/META-INF/MANIFEST.MF | 2 +- applications/plugins/org.csstudio.archivereader.rdb/src/org/csstudio/archivereader/rdb/RDBArchiveReaderTest.java | 6 + applications/plugins/org.csstudio.archivereader/META-INF/MANIFEST.MF | 2 +- applications/plugins/org.csstudio.archivereader/src/org/csstudio/archivereader/ValueIteratorTest.java | 2 +- applications/plugins/org.csstudio.nams.configurator.ui/src/org/csstudio/nams/configurator/editor/FilterbedingungEditor.java | 2006 +++++---- applications/plugins/org.csstudio.opibuilder.examples/examples/BOY Examples/Miscellaneous/DynamicMacros/ChangeMacro.js | 9 + applications/plugins/org.csstudio.opibuilder.examples/examples/BOY Examples/Miscellaneous/DynamicMacros/DynamicMacros.opi | 2 +- applications/plugins/org.csstudio.opibuilder.examples/examples/BOY Examples/Miscellaneous/DynamicMacros/OpenOPI.js | 2 + applications/plugins/org.csstudio.opibuilder.examples/examples/BOY Examples/Miscellaneous/Virtual Linac/BeamPosition.js | 4 +- applications/plugins/org.csstudio.opibuilder/src/org/csstudio/opibuilder/properties/PVValueProperty.java | 25 +- applications/plugins/org.csstudio.opibuilder/src/org/csstudio/opibuilder/script/RuleData.java | 2 + applications/plugins/org.csstudio.opibuilder/src/org/csstudio/opibuilder/visualparts/RuleDataEditDialog.java | 7 +- applications/plugins/org.csstudio.sds.components/plugin.xml | 6 + applications/plugins/org.csstudio.sds.components/src/org/csstudio/sds/components/model/eventing/PolyModelPointsPostProcessor.java | 77 + applications/plugins/org.csstudio.sds.ui/plugin.xml | 37 + applications/plugins/org.csstudio.sds.ui/src/org/csstudio/sds/ui/internal/actions/MoveWidegtlHandler.java | 91 + applications/plugins/org.csstudio.trends.databrowser2/META-INF/MANIFEST.MF | 2 +- applications/plugins/org.csstudio.trends.databrowser2/src/org/csstudio/trends/databrowser/archive/ChannelInfo.java | 11 + applications/plugins/org.csstudio.trends.databrowser2/src/org/csstudio/trends/databrowser/model/ArchiveDataSource.java | 14 +- applications/plugins/org.csstudio.trends.databrowser2/src/org/csstudio/trends/databrowser/ui/PlotDemo.java | 157 + applications/plugins/org.csstudio.trends.databrowser2/src/org/csstudio/trends/databrowser/ui/PlotTest.java | 163 - applications/plugins/org.csstudio.utility.clock/META-INF/MANIFEST.MF | 2 +- applications/plugins/org.csstudio.utility.eliza/META-INF/MANIFEST.MF | 1 + applications/plugins/org.csstudio.utility.httpd/META-INF/MANIFEST.MF | 2 +- applications/plugins/org.csstudio.utility.jmssendcmd/META-INF/MANIFEST.MF | 2 +- applications/plugins/org.csstudio.utility.pv.epics/META-INF/MANIFEST.MF | 2 +- applications/plugins/org.csstudio.utility.pv.simu/META-INF/MANIFEST.MF | 2 +- applications/plugins/org.csstudio.utility.pv.ui/META-INF/MANIFEST.MF | 2 +- applications/plugins/org.csstudio.utility.pv/META-INF/MANIFEST.MF | 2 +- applications/plugins/org.csstudio.utility.screenshot.desy/src/org/csstudio/utility/screenshot/desy/dialog/LogbookSenderDialog.java | 57 +- applications/plugins/org.csstudio.utility.screenshot.desy/src/org/csstudio/utility/screenshot/desy/logbook/ImageProcessor.java | 4 +- applications/plugins/org.csstudio.utility.speech/META-INF/MANIFEST.MF | 4 +- applications/plugins/org.csstudio.utility.speech/src/org/csstudio/utility/speech/ExternalAnnunciator.java | 2 +- applications/plugins/org.csstudio.utility.sysmon/META-INF/MANIFEST.MF | 2 +- products/DESY/DESY-ISLAND/features/org.csstudio.island.product.feature/feature.xml | 95 +- products/DESY/DESY-ISLAND/plugins/org.csstudio.island.product/plugin.xml | 6 +- products/SNS/plugins/org.csstudio.diag.pvutil.sns/META-INF/MANIFEST.MF | 2 +- products/SNS/plugins/org.csstudio.diag.pvutil.sns/src/org/csstudio/diag/pvutil/sns/SNSPVUtilData.java | 20 +- products/SNS/plugins/org.csstudio.diag.pvutil/META-INF/MANIFEST.MF | 2 +- products/SNS/plugins/org.csstudio.diag.pvutil/src/org/csstudio/diag/pvutil/gui/GUI.java | 57 +- products/SNS/plugins/org.csstudio.diag.pvutil/src/org/csstudio/diag/pvutil/model/PVUtilModel.java | 14 +- products/SNS/product/org.csstudio.basic.epics.product/CSS.product | 10 +- products/SNS/product/org.csstudio.basic.epics.product/META-INF/MANIFEST.MF | 2 +- products/SNS/product/org.csstudio.sns.feature.applications/feature.xml | 12 +- products/SNS/product/org.csstudio.sns.feature.basiccore/feature.xml | 6 +- products/SNS/product/org.csstudio.sns.feature.core/feature.xml | 9 +- products/SNS/product/org.csstudio.sns.feature.eclipse/feature.xml | 25 +- products/SNS/product/org.csstudio.sns.feature.snsapps/feature.xml | 2 +- products/SNS/product/org.csstudio.sns.feature.snscore/feature.xml | 6 +- products/SNS/product/org.csstudio.sns.product/META-INF/MANIFEST.MF | 4 +- products/SNS/product/org.csstudio.sns.product/SNS_CSS.product | 10 +- products/SNS/product/org.csstudio.sns.updatesite/Readme.txt | 3 +- products/SNS/product/org.csstudio.sns.updatesite/settings.sh | 4 +- 153 files changed, 8017 insertions(+), 7322 deletions(-) diffs (truncated from 17415 to 300 lines): diff -r d308f8a99603 -r 042509534def applications/features/org.csstudio.alarm.beast.ui.feature/feature.xml --- a/applications/features/org.csstudio.alarm.beast.ui.feature/feature.xml Wed Oct 20 16:12:58 2010 +0200 +++ b/applications/features/org.csstudio.alarm.beast.ui.feature/feature.xml Tue Oct 26 09:10:01 2010 +0200 @@ -3,7 +3,7 @@ id="org.csstudio.alarm.beast.ui.feature" label="Alarm Handler UI" version="2.3.0.qualifier" - provider-name="SNS, Kay Kasemir"> + provider-name="Kay Kasemir <kas...@or...> - SNS"> <description> Alarm Handler user interface: Alarm Tree, table, annunciator diff -r d308f8a99603 -r 042509534def applications/features/org.csstudio.trends.databrowser2.feature/feature.xml --- a/applications/features/org.csstudio.trends.databrowser2.feature/feature.xml Wed Oct 20 16:12:58 2010 +0200 +++ b/applications/features/org.csstudio.trends.databrowser2.feature/feature.xml Tue Oct 26 09:10:01 2010 +0200 @@ -3,7 +3,7 @@ id="org.csstudio.trends.databrowser2.feature" label="Data Browser" version="2.3.0.qualifier" - provider-name="SNS, Kay Kasemir"> + provider-name="Kay Kasemir <kas...@or...> - SNS"> <description> Data Browser, "Strip Chart" and archive data viewer diff -r d308f8a99603 -r 042509534def applications/plugins/org.csstudio.alarm.beast.annunciator/META-INF/MANIFEST.MF --- a/applications/plugins/org.csstudio.alarm.beast.annunciator/META-INF/MANIFEST.MF Wed Oct 20 16:12:58 2010 +0200 +++ b/applications/plugins/org.csstudio.alarm.beast.annunciator/META-INF/MANIFEST.MF Tue Oct 26 09:10:01 2010 +0200 @@ -2,10 +2,10 @@ Bundle-ManifestVersion: 2 Bundle-Name: Alarm Annunciator Bundle-SymbolicName: org.csstudio.alarm.beast.annunciator;singleton:=true -Bundle-Version: 2.1.1.qualifier +Bundle-Version: 2.1.2.qualifier Bundle-Activator: org.csstudio.alarm.beast.annunciator.Activator Bundle-Localization: plugin -Bundle-Vendor: Katia Danilova, Kay Kasemir +Bundle-Vendor: Kay Kasemir <kas...@or...>, Xihui Chen <ch...@or...> - SNS Require-Bundle: org.junit4;bundle-version="4.3.1", org.eclipse.core.runtime, org.eclipse.help;bundle-version="3.4.1", diff -r d308f8a99603 -r 042509534def applications/plugins/org.csstudio.alarm.beast.annunciator/src/org/csstudio/alarm/beast/annunciator/Application.java --- a/applications/plugins/org.csstudio.alarm.beast.annunciator/src/org/csstudio/alarm/beast/annunciator/Application.java Wed Oct 20 16:12:58 2010 +0200 +++ b/applications/plugins/org.csstudio.alarm.beast.annunciator/src/org/csstudio/alarm/beast/annunciator/Application.java Tue Oct 26 09:10:01 2010 +0200 @@ -7,6 +7,8 @@ ******************************************************************************/ package org.csstudio.alarm.beast.annunciator; +import java.util.Arrays; + import javax.jms.Connection; import javax.swing.JFrame; @@ -59,7 +61,7 @@ final Object version = bundle.getHeaders().get(Constants.BUNDLE_VERSION); // Put startup info with JMS topic & URL into log CentralLogger.getInstance().getLogger(this).info - ("JMS2SPEECH " + version + ", topic " + topics + " @ " + url); + ("JMS2SPEECH " + version + ", topic " + Arrays.toString(topics) + " @ " + url); final Connection connection = JMSConnectionFactory.connect(url); diff -r d308f8a99603 -r 042509534def applications/plugins/org.csstudio.alarm.beast.annunciator/src/org/csstudio/alarm/beast/annunciator/model/AnnunciationMessage.java --- a/applications/plugins/org.csstudio.alarm.beast.annunciator/src/org/csstudio/alarm/beast/annunciator/model/AnnunciationMessage.java Wed Oct 20 16:12:58 2010 +0200 +++ b/applications/plugins/org.csstudio.alarm.beast.annunciator/src/org/csstudio/alarm/beast/annunciator/model/AnnunciationMessage.java Tue Oct 26 09:10:01 2010 +0200 @@ -70,8 +70,29 @@ { return other.getSeverity().compareTo(severity); } + + /** Compare by Severity + * {@inheritDoc} + */ + @Override + public boolean equals(Object obj) + { + if (! (obj instanceof AnnunciationMessage)) + return false; + AnnunciationMessage other = (AnnunciationMessage) obj; + return other.getSeverity().equals(severity); + } - /** @return String representation for debugging */ + /** Compare by Severity + * {@inheritDoc} + */ + @Override + public int hashCode() + { + return severity.hashCode(); + } + + /** @return String representation for debugging */ @SuppressWarnings("nls") @Override public String toString() diff -r d308f8a99603 -r 042509534def applications/plugins/org.csstudio.alarm.beast.annunciator/src/org/csstudio/alarm/beast/annunciator/model/JMSAnnunciator.java --- a/applications/plugins/org.csstudio.alarm.beast.annunciator/src/org/csstudio/alarm/beast/annunciator/model/JMSAnnunciator.java Wed Oct 20 16:12:58 2010 +0200 +++ b/applications/plugins/org.csstudio.alarm.beast.annunciator/src/org/csstudio/alarm/beast/annunciator/model/JMSAnnunciator.java Tue Oct 26 09:10:01 2010 +0200 @@ -126,6 +126,7 @@ { // Initialize the QueueManager. queuemanager = new QueueManager(listener, queue, translations, threshold); + queuemanager.start(); // Add a startup message to the queue queue.add(Severity.forInfo(), "Annunciator started"); diff -r d308f8a99603 -r 042509534def applications/plugins/org.csstudio.alarm.beast.annunciator/src/org/csstudio/alarm/beast/annunciator/model/QueueManager.java --- a/applications/plugins/org.csstudio.alarm.beast.annunciator/src/org/csstudio/alarm/beast/annunciator/model/QueueManager.java Wed Oct 20 16:12:58 2010 +0200 +++ b/applications/plugins/org.csstudio.alarm.beast.annunciator/src/org/csstudio/alarm/beast/annunciator/model/QueueManager.java Tue Oct 26 09:10:01 2010 +0200 @@ -51,10 +51,15 @@ // Handle queue in background thread thread = new Thread(this, "Annunciation QueueManager"); thread.setDaemon(true); + } + + /** Start the queue manager thread */ + public void start() + { thread.start(); } - - /** method run is the code to be executed by new thread */ + + /** method run is the code to be executed by new thread */ public void run() { // The main application will NOT exit when this thread exits. diff -r d308f8a99603 -r 042509534def applications/plugins/org.csstudio.alarm.beast.annunciator/src/org/csstudio/alarm/beast/annunciator/model/QueueManagerTest.java --- a/applications/plugins/org.csstudio.alarm.beast.annunciator/src/org/csstudio/alarm/beast/annunciator/model/QueueManagerTest.java Wed Oct 20 16:12:58 2010 +0200 +++ b/applications/plugins/org.csstudio.alarm.beast.annunciator/src/org/csstudio/alarm/beast/annunciator/model/QueueManagerTest.java Tue Oct 26 09:10:01 2010 +0200 @@ -40,6 +40,7 @@ Severity.initialize("MAJOR,MINOR,INFO"); final SpeechPriorityQueue queue = new SpeechPriorityQueue(); final QueueManager queue_manager = new QueueManager(listener, queue, null, 5); + queue_manager.start(); // Allow QueueManager to start up Thread.sleep(3000); diff -r d308f8a99603 -r 042509534def applications/plugins/org.csstudio.alarm.beast.annunciator/src/org/csstudio/alarm/beast/annunciator/model/Severity.java --- a/applications/plugins/org.csstudio.alarm.beast.annunciator/src/org/csstudio/alarm/beast/annunciator/model/Severity.java Wed Oct 20 16:12:58 2010 +0200 +++ b/applications/plugins/org.csstudio.alarm.beast.annunciator/src/org/csstudio/alarm/beast/annunciator/model/Severity.java Tue Oct 26 09:10:01 2010 +0200 @@ -104,7 +104,28 @@ return level - other.level; } - /** @return String representation for debugging */ + /** Compare Severities by level + * {@inheritDoc} + */ + @Override + public boolean equals(final Object obj) + { + if (! (obj instanceof Severity)) + return false; + Severity other = (Severity) obj; + return level == other.level; + } + + /** Compare Severities by level + * {@inheritDoc} + */ + @Override + public int hashCode() + { + return 31 * level; + } + + /** @return String representation for debugging */ @SuppressWarnings("nls") @Override public String toString() diff -r d308f8a99603 -r 042509534def applications/plugins/org.csstudio.alarm.beast.annunciator/src/org/csstudio/alarm/beast/annunciator/model/SeverityTest.java --- a/applications/plugins/org.csstudio.alarm.beast.annunciator/src/org/csstudio/alarm/beast/annunciator/model/SeverityTest.java Wed Oct 20 16:12:58 2010 +0200 +++ b/applications/plugins/org.csstudio.alarm.beast.annunciator/src/org/csstudio/alarm/beast/annunciator/model/SeverityTest.java Tue Oct 26 09:10:01 2010 +0200 @@ -45,12 +45,14 @@ assertEquals("MAJOR", major.getName()); // Check comparison assertTrue(major.compareTo(minor) > 0); + assertTrue(! major.equals(minor)); assertTrue(info.compareTo(major) < 0); assertTrue(minor.compareTo(info) > 0); assertTrue(error.compareTo(info) > 0); assertTrue(unknown.compareTo(debug) < 0); // Check identity assertTrue(info == info2); + assertTrue(info.equals(info2)); } } diff -r d308f8a99603 -r 042509534def applications/plugins/org.csstudio.alarm.beast.annunciator/src/org/csstudio/alarm/beast/annunciator/model/TranslationFileReader.java --- a/applications/plugins/org.csstudio.alarm.beast.annunciator/src/org/csstudio/alarm/beast/annunciator/model/TranslationFileReader.java Wed Oct 20 16:12:58 2010 +0200 +++ b/applications/plugins/org.csstudio.alarm.beast.annunciator/src/org/csstudio/alarm/beast/annunciator/model/TranslationFileReader.java Tue Oct 26 09:10:01 2010 +0200 @@ -77,6 +77,7 @@ strLine.length()); trans_arr.add(new Translation(pattern, replacement)); } + br.close(); } finally { diff -r d308f8a99603 -r 042509534def applications/plugins/org.csstudio.alarm.beast.configtool/META-INF/MANIFEST.MF --- a/applications/plugins/org.csstudio.alarm.beast.configtool/META-INF/MANIFEST.MF Wed Oct 20 16:12:58 2010 +0200 +++ b/applications/plugins/org.csstudio.alarm.beast.configtool/META-INF/MANIFEST.MF Tue Oct 26 09:10:01 2010 +0200 @@ -3,7 +3,7 @@ Bundle-Name: AlarmConfigTool Bundle-SymbolicName: org.csstudio.alarm.beast.configtool;singleton:=true Bundle-Version: 2.1.0.qualifier -Bundle-Vendor: Kay Kasemir +Bundle-Vendor: Kay Kasemir <kas...@or...>, Xihui Chen <ch...@or...> - SNS Require-Bundle: org.junit4, org.eclipse.core.runtime, org.csstudio.platform;bundle-version="1.1.0", diff -r d308f8a99603 -r 042509534def applications/plugins/org.csstudio.alarm.beast.msghist/META-INF/MANIFEST.MF --- a/applications/plugins/org.csstudio.alarm.beast.msghist/META-INF/MANIFEST.MF Wed Oct 20 16:12:58 2010 +0200 +++ b/applications/plugins/org.csstudio.alarm.beast.msghist/META-INF/MANIFEST.MF Tue Oct 26 09:10:01 2010 +0200 @@ -2,8 +2,8 @@ Bundle-ManifestVersion: 2 Bundle-Name: Message History Bundle-SymbolicName: org.csstudio.alarm.beast.msghist;singleton:=true -Bundle-Version: 2.1.0.qualifier -Bundle-Vendor: Kay Kasemir +Bundle-Version: 2.1.1.qualifier +Bundle-Vendor: Kay Kasemir <kas...@or...>, Xihui Chen <ch...@or...> - SNS Bundle-Localization: plugin Require-Bundle: org.junit4, org.eclipse.jface, diff -r d308f8a99603 -r 042509534def applications/plugins/org.csstudio.alarm.beast.msghist/src/org/csstudio/alarm/beast/msghist/model/Message.java --- a/applications/plugins/org.csstudio.alarm.beast.msghist/src/org/csstudio/alarm/beast/msghist/model/Message.java Wed Oct 20 16:12:58 2010 +0200 +++ b/applications/plugins/org.csstudio.alarm.beast.msghist/src/org/csstudio/alarm/beast/msghist/model/Message.java Tue Oct 26 09:10:01 2010 +0200 @@ -28,7 +28,7 @@ public class Message implements IPropertySource { /** Suggested time stamp format */ - final public static SimpleDateFormat date_format = + final private static SimpleDateFormat date_format = new SimpleDateFormat("yyyy/MM/dd HH:mm:ss.SSS"); //$NON-NLS-1$ /** Property for sequential message number */ @@ -69,6 +69,14 @@ this.id = id; this.properties = properties; } + + public static String format(final Date date) + { + synchronized (date_format) + { + return date_format.format(date); + } + } /** Set 'delta'. * Public, but really only meant to be called by code that diff -r d308f8a99603 -r 042509534def applications/plugins/org.csstudio.alarm.beast.msghist/src/org/csstudio/alarm/beast/msghist/model/ModelTest.java --- a/applications/plugins/org.csstudio.alarm.beast.msghist/src/org/csstudio/alarm/beast/msghist/model/ModelTest.java Wed Oct 20 16:12:58 2010 +0200 +++ b/applications/plugins/org.csstudio.alarm.beast.msghist/src/org/csstudio/alarm/beast/msghist/model/ModelTest.java Tue Oct 26 09:10:01 2010 +0200 @@ -9,6 +9,8 @@ import static org.junit.Assert.assertTrue; +import java.util.concurrent.Semaphore; + import org.junit.Test; /** JUnit test of the Model @@ -17,21 +19,18 @@ @SuppressWarnings("nls") public class ModelTest implements ModelListener { - private static final long TIMEOUT_MILLI = 10*1000; - private static final String URL = "jdbc:oracle:thin:@//172.31.75.138:1521/prod"; private static final String USER = "css_msg_user"; private static final String PASSWORD = "sns"; private static final String SCHEMA = "MSG_LOG"; + + private Semaphore got_response = new Semaphore(0); // ModelListener public void modelChanged(final Model model) { System.out.println("Received model update"); - synchronized (this) - { - notifyAll(); - } + got_response.release(); } @Test @@ -40,13 +39,9 @@ final Model model = new Model(URL, USER, PASSWORD, SCHEMA, 1000); model.addListener(this); - System.out.println("Starting query"); model.setTimerange("-1day", "now"); - synchronized (this) - { - wait(TIMEOUT_MILLI); |
