From: <cs-...@li...> - 2010-12-16 08:13:36
|
details: http://cs-studio.hg.sourceforge.net/hgweb/cs-studio/cs-studio//hgrepo/c/cs/cs-studio/cs-studio/rev/98357e7dc606 changeset: 8611:98357e7dc606 user: jhatje date: Tue Dec 14 08:37:20 2010 +0100 description: o.c.config.kryoNameBrowser: Plant Parts can now be added without a number details: http://cs-studio.hg.sourceforge.net/hgweb/cs-studio/cs-studio//hgrepo/c/cs/cs-studio/cs-studio/rev/a6d842ba82ae changeset: 8612:a6d842ba82ae user: Jan Hatje <jan...@de...> date: Tue Dec 14 08:52:53 2010 +0100 description: Desy remote management: remove managementActions plugin details: http://cs-studio.hg.sourceforge.net/hgweb/cs-studio/cs-studio//hgrepo/c/cs/cs-studio/cs-studio/rev/0543a3ba7518 changeset: 8613:0543a3ba7518 user: jhatje date: Tue Dec 14 08:55:02 2010 +0100 description: Merge details: http://cs-studio.hg.sourceforge.net/hgweb/cs-studio/cs-studio//hgrepo/c/cs/cs-studio/cs-studio/rev/0981edaf88f6 changeset: 8614:0981edaf88f6 user: jhatje date: Wed Dec 15 08:45:46 2010 +0100 description: Merge details: http://cs-studio.hg.sourceforge.net/hgweb/cs-studio/cs-studio//hgrepo/c/cs/cs-studio/cs-studio/rev/3d83c9e86515 changeset: 8615:3d83c9e86515 user: jhatje date: Wed Dec 15 10:18:05 2010 +0100 description: o.c.utility.ldapUpdater.feature: add log4j plugin details: http://cs-studio.hg.sourceforge.net/hgweb/cs-studio/cs-studio//hgrepo/c/cs/cs-studio/cs-studio/rev/f69cf35ff1c0 changeset: 8616:f69cf35ff1c0 user: jhatje date: Thu Dec 16 07:33:49 2010 +0100 description: Merge details: http://cs-studio.hg.sourceforge.net/hgweb/cs-studio/cs-studio//hgrepo/c/cs/cs-studio/cs-studio/rev/410b637fa6ed changeset: 8617:410b637fa6ed user: Jan Hatje <jan...@de...> date: Tue Nov 30 09:16:12 2010 +0100 description: Desy products: minor changes in config details: http://cs-studio.hg.sourceforge.net/hgweb/cs-studio/cs-studio//hgrepo/c/cs/cs-studio/cs-studio/rev/4ffa5bd081d1 changeset: 8618:4ffa5bd081d1 user: Jan Hatje <jan...@de...> date: Wed Dec 01 11:43:08 2010 +0100 description: Merge with 70601bd5ff3dd371c956b9451e1fd8dc5a212a71 details: http://cs-studio.hg.sourceforge.net/hgweb/cs-studio/cs-studio//hgrepo/c/cs/cs-studio/cs-studio/rev/fd2bc3f9e068 changeset: 8619:fd2bc3f9e068 user: Jan Hatje <jan...@de...> date: Fri Dec 03 08:59:09 2010 +0100 description: Merge with 8c384faeb1feb966e13a9e53feb4bdd9daf84056 details: http://cs-studio.hg.sourceforge.net/hgweb/cs-studio/cs-studio//hgrepo/c/cs/cs-studio/cs-studio/rev/2aba272625f0 changeset: 8620:2aba272625f0 user: Jan Hatje <jan...@de...> date: Mon Dec 06 10:17:52 2010 +0100 description: Merge with 642352d51553b8849f81fe2fc9b32ff8f1b13497 details: http://cs-studio.hg.sourceforge.net/hgweb/cs-studio/cs-studio//hgrepo/c/cs/cs-studio/cs-studio/rev/cc4f0aa2f57c changeset: 8621:cc4f0aa2f57c user: Jan Hatje <jan...@de...> date: Tue Dec 07 16:02:31 2010 +0100 description: move xmpplogindialog plugin details: http://cs-studio.hg.sourceforge.net/hgweb/cs-studio/cs-studio//hgrepo/c/cs/cs-studio/cs-studio/rev/9650bf99190f changeset: 8622:9650bf99190f user: Jan Hatje <jan...@de...> date: Tue Dec 07 16:43:31 2010 +0100 description: Desy product: new feature configuration details: http://cs-studio.hg.sourceforge.net/hgweb/cs-studio/cs-studio//hgrepo/c/cs/cs-studio/cs-studio/rev/e90e37f9fbe8 changeset: 8623:e90e37f9fbe8 user: Jan Hatje <jan...@de...> date: Thu Dec 09 07:47:23 2010 +0100 description: o.c.utility.quickstart: Remove dependency to DB2 since it is integrated in Desy Css details: http://cs-studio.hg.sourceforge.net/hgweb/cs-studio/cs-studio//hgrepo/c/cs/cs-studio/cs-studio/rev/cc440ffe317e changeset: 8624:cc440ffe317e user: Jan Hatje <jan...@de...> date: Thu Dec 09 07:53:31 2010 +0100 description: Desy product: adjust feature configuration details: http://cs-studio.hg.sourceforge.net/hgweb/cs-studio/cs-studio//hgrepo/c/cs/cs-studio/cs-studio/rev/7d876ad646dc changeset: 8625:7d876ad646dc user: Jan Hatje <jan...@de...> date: Thu Dec 09 08:20:39 2010 +0100 description: Merge with adc07780b3c5b44c0247ac0e0d948b66e64d8add details: http://cs-studio.hg.sourceforge.net/hgweb/cs-studio/cs-studio//hgrepo/c/cs/cs-studio/cs-studio/rev/7bb55e133924 changeset: 8626:7bb55e133924 user: Jan Hatje <jan...@de...> date: Thu Dec 16 07:48:19 2010 +0100 description: Desy product: feature configuration details: http://cs-studio.hg.sourceforge.net/hgweb/cs-studio/cs-studio//hgrepo/c/cs/cs-studio/cs-studio/rev/3aa19522a71b changeset: 8627:3aa19522a71b user: Jan Hatje <jan...@de...> date: Thu Dec 16 08:00:58 2010 +0100 description: Merge diffstat: applications/features/org.csstudio.channelfinder.feature/.project | 17 + applications/plugins/org.csstudio.alarm.beast.ui/src/org/csstudio/alarm/beast/ui/globalclientmodel/GlobalAlarm.java | 107 +- applications/plugins/org.csstudio.alarm.beast.ui/src/org/csstudio/alarm/beast/ui/globalclientmodel/GlobalAlarmModel.java | 75 +- applications/plugins/org.csstudio.alarm.beast.ui/src/org/csstudio/alarm/beast/ui/globalclientmodel/GlobalAlarmModelDemo.java | 9 +- applications/plugins/org.csstudio.alarm.beast.ui/src/org/csstudio/alarm/beast/ui/globalclientmodel/GlobalAlarmTest.java | 34 +- applications/plugins/org.csstudio.alarm.beast/src/org/csstudio/alarm/beast/AlarmConfiguration.java | 17 +- applications/plugins/org.csstudio.alarm.beast/src/org/csstudio/alarm/beast/TreeItem.java | 37 +- applications/plugins/org.csstudio.alarm.beast/src/org/csstudio/alarm/beast/TreeItemUnitTest.java | 17 +- applications/plugins/org.csstudio.alarm.service/src/org/csstudio/alarm/service/declaration/AlarmPreference.java | 14 +- applications/plugins/org.csstudio.alarm.service/src/org/csstudio/alarm/service/declaration/IAlarmInitItem.java | 7 + applications/plugins/org.csstudio.alarm.service/src/org/csstudio/alarm/service/internal/AlarmMessageJMSImpl.java | 1 + applications/plugins/org.csstudio.alarm.service/src/org/csstudio/alarm/service/internal/AlarmServiceDALImpl.java | 1 - applications/plugins/org.csstudio.alarm.service/src/org/csstudio/alarm/service/internal/AlarmServiceJMSImpl.java | 275 +- applications/plugins/org.csstudio.alarm.service/src/org/csstudio/alarm/service/internal/ChunkableCollection.java | 1 + applications/plugins/org.csstudio.alarm.service/src/org/csstudio/alarm/service/preferences/AlarmServicePreferencePage.java | 27 +- applications/plugins/org.csstudio.alarm.service/test/org/csstudio/alarm/service/internal/AlarmServiceJMSImplTest.java | 1946 ++++++++++ applications/plugins/org.csstudio.alarm.service/test/org/csstudio/alarm/service/internal/ChunkableCollectionUnitTest.java | 3 +- applications/plugins/org.csstudio.alarm.table/src/org/csstudio/alarm/table/ui/InitialStateRetriever.java | 4 + applications/plugins/org.csstudio.alarm.treeView/src/org/csstudio/alarm/treeView/model/PVNodeItem.java | 11 + applications/plugins/org.csstudio.alarm.treeView/src/org/csstudio/alarm/treeView/views/AlarmTreeView.java | 14 +- applications/plugins/org.csstudio.alarm.treeView/src/org/csstudio/alarm/treeView/views/actions/AlarmTreeViewActionFactory.java | 13 + applications/plugins/org.csstudio.alarm.treeView/src/org/csstudio/alarm/treeView/views/actions/RetrieveInitialStateAction.java | 70 + applications/plugins/org.csstudio.archive.common.service.mysqlimpl/res/InsertTestDataConfiguration.sql | 36 + applications/plugins/org.csstudio.archive.common.service.mysqlimpl/res/MySQLDatabaseSchema.sql | 651 +++ applications/plugins/org.csstudio.archive.common.service.mysqlimpl/src/java/org/csstudio/archive/common/service/mysqlimpl/MySQLArchiveServiceImpl.java | 2 +- applications/plugins/org.csstudio.archive.common.service.mysqlimpl/src/java/org/csstudio/archive/common/service/mysqlimpl/channel/ArchiveChannelDaoImpl.java | 68 +- applications/plugins/org.csstudio.archive.common.service.mysqlimpl/src/java/org/csstudio/archive/common/service/mysqlimpl/channelgroup/ArchiveChannelGroupDaoImpl.java | 20 +- applications/plugins/org.csstudio.archive.common.service.mysqlimpl/src/java/org/csstudio/archive/common/service/mysqlimpl/dao/ArchiveDaoManager.java | 1 + applications/plugins/org.csstudio.archive.common.service.mysqlimpl/src/java/org/csstudio/archive/common/service/mysqlimpl/engine/ArchiveEngineDaoImpl.java | 3 +- applications/plugins/org.csstudio.archive.common.service.mysqlimpl/src/java/org/csstudio/archive/common/service/mysqlimpl/sample/ArchiveSampleDaoImpl.java | 13 +- applications/plugins/org.csstudio.archive.common.service.mysqlimpl/src/java/org/csstudio/archive/common/service/mysqlimpl/samplemode/ArchiveSampleModeDaoImpl.java | 9 +- applications/plugins/org.csstudio.archive.common.service.mysqlimpl/src/java/org/csstudio/archive/common/service/mysqlimpl/severity/ArchiveSeverityDaoImpl.java | 2 +- applications/plugins/org.csstudio.archive.common.service.mysqlimpl/src/java/org/csstudio/archive/service/common/mysqlimpl/status/ArchiveStatusDaoImpl.java | 2 +- applications/plugins/org.csstudio.archive.common.service/src/java/org/csstudio/archive/common/service/adapter/ArchiveEngineAdapter.java | 5 +- applications/plugins/org.csstudio.archive.service/.project | 34 + applications/plugins/org.csstudio.config.ioconfig.model/src/java/org/csstudio/config/ioconfig/model/AbstractNodeDBO.java | 52 +- applications/plugins/org.csstudio.config.ioconfig.model/src/java/org/csstudio/config/ioconfig/model/HibernateManager.java | 2 +- applications/plugins/org.csstudio.config.ioconfig.model/src/java/org/csstudio/config/ioconfig/model/NodeImageDBO.java | 4 +- applications/plugins/org.csstudio.config.ioconfig.model/test/java/org/csstudio/config/ioconfig/model/FacilityDBOTest.java | 58 +- applications/plugins/org.csstudio.config.ioconfig.view/src/java/org/csstudio/config/ioconfig/commands/AbstractCallNodeEditor.java | 18 +- applications/plugins/org.csstudio.config.ioconfig.view/src/java/org/csstudio/config/ioconfig/commands/CallNewChildrenNodeEditor.java | 9 +- applications/plugins/org.csstudio.config.ioconfig.view/src/java/org/csstudio/config/ioconfig/commands/CallNewSiblingNodeEditor.java | 14 +- applications/plugins/org.csstudio.config.ioconfig.view/src/java/org/csstudio/config/ioconfig/config/view/ChannelConfigDialog.java | 140 +- applications/plugins/org.csstudio.config.ioconfig.view/src/java/org/csstudio/config/ioconfig/config/view/ChannelPrototypConfigColumn.java | 6 +- applications/plugins/org.csstudio.config.ioconfig.view/src/java/org/csstudio/config/ioconfig/config/view/ChannelPrototypeConfigTableLabelProvider.java | 151 +- applications/plugins/org.csstudio.config.ioconfig.view/src/java/org/csstudio/config/ioconfig/config/view/ChannelTableContentProvider.java | 16 +- applications/plugins/org.csstudio.config.ioconfig.view/src/java/org/csstudio/config/ioconfig/config/view/ModuleListLabelProvider.java | 66 +- applications/plugins/org.csstudio.config.ioconfig.view/src/java/org/csstudio/config/ioconfig/config/view/OverviewLabelProvider.java | 139 +- applications/plugins/org.csstudio.config.ioconfig.view/src/java/org/csstudio/config/ioconfig/config/view/helper/AddDocDialog.java | 150 +- applications/plugins/org.csstudio.config.ioconfig.view/src/java/org/csstudio/config/ioconfig/config/view/helper/Baudrates.java | 21 +- applications/plugins/org.csstudio.config.ioconfig.view/src/java/org/csstudio/config/ioconfig/config/view/helper/Busparameter.java | 26 +- applications/plugins/org.csstudio.config.ioconfig.view/src/java/org/csstudio/config/ioconfig/config/view/helper/CheckNumFocusListener.java | 16 +- applications/plugins/org.csstudio.config.ioconfig.view/src/java/org/csstudio/config/ioconfig/config/view/helper/ConfigHelper.java | 129 +- applications/plugins/org.csstudio.config.ioconfig.view/src/java/org/csstudio/config/ioconfig/editorinputs/NodeEditorInput.java | 7 +- applications/plugins/org.csstudio.config.ioconfig.view/src/java/org/csstudio/config/ioconfig/editorparts/AbstractNodeEditor.java | 76 +- applications/plugins/org.csstudio.config.ioconfig.view/src/java/org/csstudio/config/ioconfig/editorparts/IocEditor.java | 1 - applications/plugins/org.csstudio.config.ioconfig.view/src/java/org/csstudio/config/ioconfig/editorparts/SubnetEditor.java | 46 +- applications/plugins/org.csstudio.config.ioconfig.view/src/java/org/csstudio/config/ioconfig/view/ProfiBusTreeView.java | 1202 +++--- applications/plugins/org.csstudio.config.ioconfig.view/src/java/org/csstudio/config/ioconfig/view/SearchDialog.java | 11 +- applications/plugins/org.csstudio.config.ioconfig.view/src/java/org/csstudio/config/ioconfig/view/ViewContentProviderData.java | 4 +- applications/plugins/org.csstudio.config.ioconfig.view/src/java/org/csstudio/config/ioconfig/view/actions/CreateWinModAction.java | 2 +- applications/plugins/org.csstudio.config.ioconfig.view/src/java/org/csstudio/config/ioconfig/view/actions/CreateXMLConfigAction.java | 2 +- applications/plugins/org.csstudio.config.kryoNameBrowser/src/org/csstudio/config/kryonamebrowser/logic/KryoNameBrowserLogic.java | 5 +- applications/plugins/org.csstudio.config.kryoNameBrowser/src/org/csstudio/config/kryonamebrowser/ui/UIModelBridge.java | 9 +- applications/plugins/org.csstudio.diag.pvmanager.probe/META-INF/MANIFEST.MF | 2 +- applications/plugins/org.csstudio.diag.pvmanager.probe/src/org/csstudio/diag/pvmanager/probe/views/PVManagerProbe.java | 404 +- applications/plugins/org.csstudio.diag.pvmanager.probe/src/org/csstudio/util/swt/meter/MeterWidget.java | 329 +- applications/plugins/org.csstudio.diag.pvmanager.probe/src/org/csstudio/util/swt/meter/MeterWidgetTest.java | 4 +- applications/plugins/org.csstudio.domain.desy/src/java/org/csstudio/domain/desy/alarm/IHasAlarm.java | 3 +- applications/plugins/org.csstudio.domain.desy/src/java/org/csstudio/domain/desy/calc/CumulativeAverageCache.java | 4 +- applications/plugins/org.csstudio.domain.desy/src/java/org/csstudio/domain/desy/types/AbstractArchiveConversionTypeSupport.java | 112 - applications/plugins/org.csstudio.domain.desy/src/java/org/csstudio/domain/desy/types/AbstractArchiveTypeConversionSupport.java | 105 + applications/plugins/org.csstudio.domain.desy/src/java/org/csstudio/domain/desy/types/AbstractBasicTypeConversionTypeSupport.java | 83 - applications/plugins/org.csstudio.domain.desy/src/java/org/csstudio/domain/desy/types/AbstractCssAlarmValueType.java | 82 - applications/plugins/org.csstudio.domain.desy/src/java/org/csstudio/domain/desy/types/AbstractIValueConversionTypeSupport.java | 78 +- applications/plugins/org.csstudio.domain.desy/src/java/org/csstudio/domain/desy/types/AbstractNumberArchiveTypeConversionSupport.java | 49 + applications/plugins/org.csstudio.domain.desy/src/java/org/csstudio/domain/desy/types/ByteArchiveTypeConversionSupport.java | 85 + applications/plugins/org.csstudio.domain.desy/src/java/org/csstudio/domain/desy/types/CssAlarmValueType.java | 82 + applications/plugins/org.csstudio.domain.desy/src/java/org/csstudio/domain/desy/types/DoubleArchiveTypeConversionSupport.java | 75 + applications/plugins/org.csstudio.domain.desy/src/java/org/csstudio/domain/desy/types/FloatArchiveTypeConversionSupport.java | 77 + applications/plugins/org.csstudio.domain.desy/src/java/org/csstudio/domain/desy/types/IntegerArchiveTypeConversionSupport.java | 76 + applications/plugins/org.csstudio.domain.desy/src/java/org/csstudio/domain/desy/types/StringArchiveTypeConversionSupport.java | 79 + applications/plugins/org.csstudio.domain.desy/src/java/org/csstudio/domain/desy/types/TypeSupport.java | 82 +- applications/plugins/org.csstudio.domain.desy/test/java/org/csstudio/domain/desy/calc/CumulativeAverageCacheUnitTest.java | 4 +- applications/plugins/org.csstudio.domain.desy/test/java/org/csstudio/domain/desy/types/TypeSupportUnitTest.java | 322 + applications/plugins/org.csstudio.multiChannelViewer/src/org/csstudio/multichannelviewer/ChannelsPlot.java | 2 +- applications/plugins/org.csstudio.multiChannelViewer/src/org/csstudio/multichannelviewer/MultiChannelPlot.java | 2 +- applications/plugins/org.csstudio.opibuilder.adl2boy/src/org/csstudio/opibuilder/adl2boy/ApplicationActionBarAdvisor.java | 24 + applications/plugins/org.csstudio.opibuilder.adl2boy/src/org/csstudio/opibuilder/adl2boy/translator/Display2Model.java | 15 +- applications/plugins/org.csstudio.opibuilder.adl2boy/test/org/csstudio/opibuilder/adl2boy/translator/AbstractADL2ModelUiPluginTest.java | 96 + applications/plugins/org.csstudio.opibuilder.adl2boy/test/org/csstudio/opibuilder/adl2boy/translator/Display2ModelUiPluginTest.java | 63 + applications/plugins/org.csstudio.opibuilder.adl2boy/test/org/csstudio/opibuilder/adl2boy/translator/RelatedDisplay2ModelUiPluginTest.java | 15 + applications/plugins/org.csstudio.opibuilder.adl2boy/test/org/csstudio/opibuilder/adl2boy/translator/UiPluginTests.java | 19 + applications/plugins/org.csstudio.opibuilder.examples/examples/BOY Examples/pictures/OPIBuilder.png | 0 applications/plugins/org.csstudio.opibuilder.examples/examples/BOY Examples/widgets/4_3_TabbedContainer.opi | 1915 +++++---- applications/plugins/org.csstudio.opibuilder.widgets/plugin.xml | 8 + applications/plugins/org.csstudio.opibuilder.widgets/src/org/csstudio/opibuilder/widgets/actions/AddTabCommand.java | 13 +- applications/plugins/org.csstudio.opibuilder.widgets/src/org/csstudio/opibuilder/widgets/actions/ChangeTabIndexAction.java | 64 + applications/plugins/org.csstudio.opibuilder.widgets/src/org/csstudio/opibuilder/widgets/actions/ChangeTabIndexCommand.java | 43 + applications/plugins/org.csstudio.opibuilder.widgets/src/org/csstudio/opibuilder/widgets/actions/DuplicateTabCommand.java | 27 +- applications/plugins/org.csstudio.opibuilder.widgets/src/org/csstudio/opibuilder/widgets/actions/RemoveTabCommand.java | 27 +- applications/plugins/org.csstudio.opibuilder.widgets/src/org/csstudio/opibuilder/widgets/editparts/TabEditPart.java | 656 +- applications/plugins/org.csstudio.opibuilder.widgets/src/org/csstudio/opibuilder/widgets/editparts/TabItem.java | 107 + applications/plugins/org.csstudio.opibuilder.widgets/src/org/csstudio/opibuilder/widgets/model/TabModel.java | 74 +- applications/plugins/org.csstudio.opibuilder/src/org/csstudio/opibuilder/properties/AbstractWidgetProperty.java | 2 +- applications/plugins/org.csstudio.opibuilder/src/org/csstudio/opibuilder/properties/FilePathProperty.java | 5 +- applications/plugins/org.csstudio.sds.ui/defaultSettings/settings.xml | 26 +- applications/plugins/org.csstudio.swt.widgets/src/org/csstudio/swt/widgets/figures/ImageFigure.java | 93 +- applications/plugins/org.csstudio.swt.widgets/src/org/csstudio/swt/widgets/figures/TabFigure.java | 75 +- applications/plugins/org.csstudio.swt.widgets/test/org/csstudio/swt/widgets/figures/TabTest.java | 14 +- applications/plugins/org.csstudio.utility.adlParser/test/org/csstudio/utility/adlparser/fileParser/widgetParts/ADLTestObjects.java | 39 +- applications/plugins/org.csstudio.utility.managementActions/.project | 28 - applications/plugins/org.csstudio.utility.pvmanager/META-INF/MANIFEST.MF | 5 +- applications/plugins/org.csstudio.utility.pvmanager/src/org/epics/pvmanager/DataRecipe.java | 13 +- applications/plugins/org.csstudio.utility.pvmanager/src/org/epics/pvmanager/DataSource.java | 26 +- applications/plugins/org.csstudio.utility.pvmanager/src/org/epics/pvmanager/DefaultExceptionHandler.java | 34 + applications/plugins/org.csstudio.utility.pvmanager/src/org/epics/pvmanager/ExceptionHandler.java | 5 +- applications/plugins/org.csstudio.utility.pvmanager/src/org/epics/pvmanager/ExpressionLanguage.java | 155 + applications/plugins/org.csstudio.utility.pvmanager/src/org/epics/pvmanager/Notifier.java | 38 +- applications/plugins/org.csstudio.utility.pvmanager/src/org/epics/pvmanager/PV.java | 73 +- applications/plugins/org.csstudio.utility.pvmanager/src/org/epics/pvmanager/PVManager.java | 27 +- applications/plugins/org.csstudio.utility.pvmanager/src/org/epics/pvmanager/SourceRateExpression.java | 7 +- applications/plugins/org.csstudio.utility.pvmanager/src/org/epics/pvmanager/TimeDuration.java | 135 - applications/plugins/org.csstudio.utility.pvmanager/src/org/epics/pvmanager/TimeInterval.java | 78 - applications/plugins/org.csstudio.utility.pvmanager/src/org/epics/pvmanager/TimeStamp.java | 211 - applications/plugins/org.csstudio.utility.pvmanager/src/org/epics/pvmanager/TimedCacheCollector.java | 2 + applications/plugins/org.csstudio.utility.pvmanager/src/org/epics/pvmanager/TimedTypeSupport.java | 2 + applications/plugins/org.csstudio.utility.pvmanager/src/org/epics/pvmanager/TypeSupport.java | 1 + applications/plugins/org.csstudio.utility.pvmanager/src/org/epics/pvmanager/data/Array.java | 2 + applications/plugins/org.csstudio.utility.pvmanager/src/org/epics/pvmanager/data/EpicsTypeSupport.java | 110 - applications/plugins/org.csstudio.utility.pvmanager/src/org/epics/pvmanager/data/ExpressionLanguage.java | 4 +- applications/plugins/org.csstudio.utility.pvmanager/src/org/epics/pvmanager/data/IVDoubleArray.java | 44 + applications/plugins/org.csstudio.utility.pvmanager/src/org/epics/pvmanager/data/IVIntArray.java | 44 + applications/plugins/org.csstudio.utility.pvmanager/src/org/epics/pvmanager/data/IVMetadata.java | 50 + applications/plugins/org.csstudio.utility.pvmanager/src/org/epics/pvmanager/data/IVMultiDouble.java | 2 +- applications/plugins/org.csstudio.utility.pvmanager/src/org/epics/pvmanager/data/IVNumeric.java | 97 + applications/plugins/org.csstudio.utility.pvmanager/src/org/epics/pvmanager/data/IVString.java | 30 + applications/plugins/org.csstudio.utility.pvmanager/src/org/epics/pvmanager/data/SimpleValueFormat.java | 116 + applications/plugins/org.csstudio.utility.pvmanager/src/org/epics/pvmanager/data/SynchronizedVDoubleAggregator.java | 6 +- applications/plugins/org.csstudio.utility.pvmanager/src/org/epics/pvmanager/data/Time.java | 2 +- applications/plugins/org.csstudio.utility.pvmanager/src/org/epics/pvmanager/data/TypeSupport.java | 113 + applications/plugins/org.csstudio.utility.pvmanager/src/org/epics/pvmanager/data/Util.java | 175 + applications/plugins/org.csstudio.utility.pvmanager/src/org/epics/pvmanager/data/VByteArray.java | 1 + applications/plugins/org.csstudio.utility.pvmanager/src/org/epics/pvmanager/data/VDoubleArray.java | 1 + applications/plugins/org.csstudio.utility.pvmanager/src/org/epics/pvmanager/data/VEnumArray.java | 1 + applications/plugins/org.csstudio.utility.pvmanager/src/org/epics/pvmanager/data/VFloatArray.java | 1 + applications/plugins/org.csstudio.utility.pvmanager/src/org/epics/pvmanager/data/VIntArray.java | 1 + applications/plugins/org.csstudio.utility.pvmanager/src/org/epics/pvmanager/data/VShortArray.java | 1 + applications/plugins/org.csstudio.utility.pvmanager/src/org/epics/pvmanager/data/VStringArray.java | 1 + applications/plugins/org.csstudio.utility.pvmanager/src/org/epics/pvmanager/data/ValueFactory.java | 32 +- applications/plugins/org.csstudio.utility.pvmanager/src/org/epics/pvmanager/data/ValueFormat.java | 109 + applications/plugins/org.csstudio.utility.pvmanager/src/org/epics/pvmanager/jca/ArrayProcessor.java | 49 - applications/plugins/org.csstudio.utility.pvmanager/src/org/epics/pvmanager/jca/DataUtils.java | 4 +- applications/plugins/org.csstudio.utility.pvmanager/src/org/epics/pvmanager/jca/JCADataSource.java | 9 +- applications/plugins/org.csstudio.utility.pvmanager/src/org/epics/pvmanager/jca/JCAProcessor.java | 116 + applications/plugins/org.csstudio.utility.pvmanager/src/org/epics/pvmanager/jca/JCAProcessorFactory.java | 221 - applications/plugins/org.csstudio.utility.pvmanager/src/org/epics/pvmanager/jca/SingleValueProcessor.java | 127 - applications/plugins/org.csstudio.utility.pvmanager/src/org/epics/pvmanager/jca/VMetadata.java | 2 +- applications/plugins/org.csstudio.utility.pvmanager/src/org/epics/pvmanager/jca/VNumberMetadata.java | 15 +- applications/plugins/org.csstudio.utility.pvmanager/src/org/epics/pvmanager/jca/VTypeFactory.java | 170 + applications/plugins/org.csstudio.utility.pvmanager/src/org/epics/pvmanager/sim/Gaussian.java | 2 +- applications/plugins/org.csstudio.utility.pvmanager/src/org/epics/pvmanager/sim/Noise.java | 2 +- applications/plugins/org.csstudio.utility.pvmanager/src/org/epics/pvmanager/sim/Ramp.java | 2 +- applications/plugins/org.csstudio.utility.pvmanager/src/org/epics/pvmanager/sim/Replay.java | 6 +- applications/plugins/org.csstudio.utility.pvmanager/src/org/epics/pvmanager/sim/ReplayValue.java | 4 +- applications/plugins/org.csstudio.utility.pvmanager/src/org/epics/pvmanager/sim/SimFunction.java | 16 +- applications/plugins/org.csstudio.utility.pvmanager/src/org/epics/pvmanager/sim/Simulation.java | 12 +- applications/plugins/org.csstudio.utility.pvmanager/src/org/epics/pvmanager/sim/SimulationDataSource.java | 34 +- applications/plugins/org.csstudio.utility.pvmanager/src/org/epics/pvmanager/sim/Sine.java | 2 +- applications/plugins/org.csstudio.utility.pvmanager/src/org/epics/pvmanager/sim/Strings.java | 60 + applications/plugins/org.csstudio.utility.pvmanager/src/org/epics/pvmanager/sim/XmlTimeStampAdapter.java | 2 +- applications/plugins/org.csstudio.utility.pvmanager/src/org/epics/pvmanager/sim/XmlVMetaData.java | 2 +- applications/plugins/org.csstudio.utility.pvmanager/src/org/epics/pvmanager/util/NumberFormats.java | 94 + applications/plugins/org.csstudio.utility.pvmanager/src/org/epics/pvmanager/util/TimeDuration.java | 135 + applications/plugins/org.csstudio.utility.pvmanager/src/org/epics/pvmanager/util/TimeInterval.java | 78 + applications/plugins/org.csstudio.utility.pvmanager/src/org/epics/pvmanager/util/TimeStamp.java | 211 + applications/plugins/org.csstudio.utility.pvmanager/src/org/epics/pvmanager/util/TimeStampFormat.java | 160 + applications/plugins/org.csstudio.utility.pvmanager/src/org/epics/pvmanager/util/package-info.java | 10 + applications/plugins/org.csstudio.utility.quickstart/META-INF/MANIFEST.MF | 3 +- applications/plugins/org.csstudio.utility.quickstart/plugin.xml | 23 +- applications/plugins/org.csstudio.utility.quickstart/src/org/csstudio/utility/quickstart/DisplayAutoStart.java | 23 +- applications/plugins/org.csstudio.utility.quickstart/src/org/csstudio/utility/quickstart/commandhandler/AbstractRunDisplayHandler.java | 20 +- core/plugins/org.csstudio.platform.libs.channelfinderAPI/.project | 28 + core/plugins/org.csstudio.platform.libs.dal/lib/log4j-1.2.16.jar | 0 core/plugins/org.csstudio.platform.libs.dal/src/org/epics/css/dal/spi/Plugs.java | 2 +- core/plugins/org.csstudio.platform.libs.hibernate/META-INF/MANIFEST.MF | 10 +- core/plugins/org.csstudio.platform.libs.hibernate/build.properties | 1 + products/DESY/DESY-CSS/features/org.csstudio.desy.product.feature/feature.xml | 38 +- products/DESY/DESY-DAL2JMS/features/org.csstudio.alarm.dal2jms.feature/feature.xml | 7 + products/DESY/DESY-DAL2JMS/plugins/org.csstudio.alarm.dal2jms/dal2jms.product | 7 + products/DESY/DESY-DAL2JMS/plugins/org.csstudio.alarm.dal2jms/resource/dal2jmsConfig.xml | 4 +- products/DESY/DESY-ISLAND/plugins/org.csstudio.desy.linde.product/csslinde.product | 40 +- products/DESY/DESY-ISLAND/plugins/org.csstudio.desy.linde.product/plugin_customization.ini | 728 +-- products/DESY/DESY-LDAP/features/org.csstudio.utility.ldapUpdater.feature/feature.xml | 7 + products/DESY/features/org.csstudio.alarm.desy.feature/.project | 17 + products/DESY/features/org.csstudio.desy.alarm.feature/feature.xml | 201 - products/DESY/features/org.csstudio.desy.ams.feature/feature.xml | 98 - products/DESY/features/org.csstudio.desy.dct.feature/feature.xml | 159 - products/DESY/features/org.csstudio.desy.epics.feature/feature.xml | 259 - products/DESY/features/org.csstudio.desy.ioconfigurator.feature/feature.xml | 140 - products/DESY/features/org.csstudio.desy.library.feature/.project | 17 + products/DESY/features/org.csstudio.desy.library.feature/build.properties | 1 + products/DESY/features/org.csstudio.desy.library.feature/feature.xml | 149 + products/DESY/features/org.csstudio.desy.librarydesy.feature/.project | 17 + products/DESY/features/org.csstudio.desy.librarydesy.feature/build.properties | 1 + products/DESY/features/org.csstudio.desy.librarydesy.feature/feature.xml | 116 + products/DESY/features/org.csstudio.desy.linde.feature/feature.xml | 12 + products/DESY/features/org.csstudio.desy.management.feature/feature.xml | 316 +- products/DESY/features/org.csstudio.desy.platform.base.feature/.project | 17 + products/DESY/features/org.csstudio.desy.platform.base.feature/build.properties | 1 + products/DESY/features/org.csstudio.desy.platform.base.feature/feature.xml | 195 + products/DESY/features/org.csstudio.desy.platform.eclipse.feature/feature.xml | 6 + products/DESY/features/org.csstudio.desy.platform.remote.feature/feature.xml | 14 + products/DESY/features/org.csstudio.desy.platform.user.feature/feature.xml | 7 - products/DESY/features/org.csstudio.desy.pv.feature/feature.xml | 167 - products/DESY/features/org.csstudio.desy.sds.feature/feature.xml | 120 +- products/DESY/features/org.csstudio.desy.snl.feature/feature.xml | 122 +- 217 files changed, 11587 insertions(+), 6323 deletions(-) diffs (truncated from 23103 to 300 lines): diff -r ef2010608f07 -r 3aa19522a71b applications/features/org.csstudio.channelfinder.feature/.project --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/applications/features/org.csstudio.channelfinder.feature/.project Thu Dec 16 08:00:58 2010 +0100 @@ -0,0 +1,17 @@ +<?xml version="1.0" encoding="UTF-8"?> +<projectDescription> + <name>org.csstudio.channelfinder.feature</name> + <comment></comment> + <projects> + </projects> + <buildSpec> + <buildCommand> + <name>org.eclipse.pde.FeatureBuilder</name> + <arguments> + </arguments> + </buildCommand> + </buildSpec> + <natures> + <nature>org.eclipse.pde.FeatureNature</nature> + </natures> +</projectDescription> diff -r ef2010608f07 -r 3aa19522a71b applications/plugins/org.csstudio.alarm.beast.ui/src/org/csstudio/alarm/beast/ui/globalclientmodel/GlobalAlarm.java --- a/applications/plugins/org.csstudio.alarm.beast.ui/src/org/csstudio/alarm/beast/ui/globalclientmodel/GlobalAlarm.java Mon Dec 13 09:34:19 2010 +0100 +++ b/applications/plugins/org.csstudio.alarm.beast.ui/src/org/csstudio/alarm/beast/ui/globalclientmodel/GlobalAlarm.java Thu Dec 16 08:00:58 2010 +0100 @@ -7,6 +7,8 @@ ******************************************************************************/ package org.csstudio.alarm.beast.ui.globalclientmodel; +import java.util.List; + import org.csstudio.alarm.beast.AlarmConfigurationReader; import org.csstudio.alarm.beast.AlarmTreeItem; import org.csstudio.alarm.beast.AlarmTreePV; @@ -21,34 +23,109 @@ * * @author Kay Kasemir */ +@SuppressWarnings("nls") public class GlobalAlarm extends AlarmTreePV { + /** Time of alarm */ + private ITimestamp timestamp; + /** Create global alarm with path and alarm info, - * but without GUI detail (guidance,..) nor valid RDB ID + * but without GUI detail (guidance,..) nor valid RDB ID. + * If possible, uses alarm tree elements from existing configurations. + * For example, uses an existing configuration root. + * If not found, new configuration elements are created to lead + * up to the new global alarm. + * + * @param configurations Existing configurations * @param full_path * @param severity * @param message * @param timestamp * @return GlobalAlarm + * @throws Error when path is not complete */ - public static GlobalAlarm fromPath(final String full_path, + static GlobalAlarm fromPath(final List<AlarmTreeRoot> configurations, final String full_path, final SeverityLevel severity, final String message, final ITimestamp timestamp) { final String path[] = AlarmTreePath.splitPath(full_path); + if (path.length <= 1) + throw new Error("Incomplete path " + full_path); - AlarmTreeItem parent = null; - for (int i=0; i<path.length-1; ++i) - { - if (i == 0) - parent = new AlarmTreeRoot(path[i], -1); - else - parent = new AlarmTreeItem(parent, path[i], -1); - } - return new GlobalAlarm(parent, path[path.length-1], -1, - severity, message, timestamp); + AlarmTreeItem parent = findOrCreateRoot(configurations, path[0]); + for (int i=1; i<path.length-1; ++i) + parent = findOrCreateItem(parent, path[i]); + return findOrCreateAlarm(parent, path[path.length-1], severity, message, timestamp); } + /** Locate alarm in known configuration. + * If not found, create a new alarm. + * @param parent Parent item within known configuration + * @param name Name of desired element + * @param severity + * @param message + * @param timestamp + * @return Global alarm + */ + private static GlobalAlarm findOrCreateAlarm(final AlarmTreeItem parent, + final String name, final SeverityLevel severity, final String message, + final ITimestamp timestamp) + { + // Check for existing item + for (int i=0; i<parent.getChildCount(); ++i) + { + final AlarmTreeItem item = parent.getClientChild(i); + if ((item instanceof GlobalAlarm) && item.getName().equals(name)) + { + // Update existing alarm + final GlobalAlarm alarm = (GlobalAlarm) item; + alarm.setAlarmState(severity, severity, message); + alarm.setAlarmTime(timestamp); + return alarm; + } + } + // Create new item + return new GlobalAlarm(parent, name, -1, severity, message, timestamp); + } + + /** Locate item in known configuration. + * If not found, create a new item and add to known configuration + * @param parent Parent item within known configuration + * @param name Name of desired element + * @return Item + */ + private static AlarmTreeItem findOrCreateItem(final AlarmTreeItem parent, + final String name) + { + // Check for existing item + for (int i=0; i<parent.getChildCount(); ++i) + { + final AlarmTreeItem item = parent.getClientChild(i); + if (item.getName().equals(name)) + return item; + } + // Create new item + return new AlarmTreeItem(parent, name, -1); + } + + /** Locate root in known configurations. + * If not found, create a new root and add to known configurations + * @param configurations Currently known configurations + * @param name Name of root + * @return Root + */ + private static AlarmTreeRoot findOrCreateRoot( + final List<AlarmTreeRoot> configurations, final String name) + { + // Check for existing root + for (AlarmTreeRoot root : configurations) + if (root.getName().equals(name)) + return root; + // Create new root + final AlarmTreeRoot root = new AlarmTreeRoot(name, -1); + configurations.add(root); + return root; + } // Similar to the AlarmTreePV, but doesn't track 'current' state, // only 'alarm' state @@ -58,10 +135,16 @@ super(parent, name, id); setAlarmState(severity, severity, message); + this.timestamp = timestamp; if (parent != null) parent.maximizeSeverity(null); } + private void setAlarmTime(final ITimestamp timestamp) + { + this.timestamp = timestamp; + } + // Complete the guidance etc. from RDB public void completeGuiInfo(final RDBUtil rdb, final SQL sql) throws Exception { diff -r ef2010608f07 -r 3aa19522a71b applications/plugins/org.csstudio.alarm.beast.ui/src/org/csstudio/alarm/beast/ui/globalclientmodel/GlobalAlarmModel.java --- a/applications/plugins/org.csstudio.alarm.beast.ui/src/org/csstudio/alarm/beast/ui/globalclientmodel/GlobalAlarmModel.java Mon Dec 13 09:34:19 2010 +0100 +++ b/applications/plugins/org.csstudio.alarm.beast.ui/src/org/csstudio/alarm/beast/ui/globalclientmodel/GlobalAlarmModel.java Thu Dec 16 08:00:58 2010 +0100 @@ -10,6 +10,9 @@ import java.util.ArrayList; import java.util.List; +import org.csstudio.alarm.beast.AlarmTreeItem; +import org.csstudio.alarm.beast.AlarmTreePath; +import org.csstudio.alarm.beast.AlarmTreeRoot; import org.csstudio.alarm.beast.Preferences; import org.csstudio.alarm.beast.SeverityLevel; import org.csstudio.alarm.beast.WorkQueue; @@ -38,13 +41,12 @@ */ private WorkQueue update_queue = null; - // TODO Track list of configurations which then contain the active alarms, - // not just list of alarms - /** Currently active global alarms. + /** Currently active global alarms, i.e. configurations with partial + * sub-tree of global alarms. * - * Synchronize on <code>alarms</code> for access. + * Synchronize on <code>configurations</code> for access. */ - final private List<GlobalAlarm> alarms = new ArrayList<GlobalAlarm>(); + final private List<AlarmTreeRoot> configurations = new ArrayList<AlarmTreeRoot>(); /** Initialize * @param listener Listener @@ -79,12 +81,11 @@ } /** @return Currently active global alarms */ - public GlobalAlarm[] getAlarms() + public AlarmTreeRoot[] getAlarms() { - synchronized (alarms) + synchronized (configurations) { - // Must return thread-save array. For now a copy on every call: - return alarms.toArray(new GlobalAlarm[alarms.size()]); + return configurations.toArray(new AlarmTreeRoot[configurations.size()]); } } @@ -121,9 +122,9 @@ } // TODO Read global alarms from RDB - synchronized (alarms) + synchronized (configurations) { - alarms.clear(); + configurations.clear(); } // Apply queued updates @@ -151,13 +152,12 @@ } else { - // TODO check for existing alarm - // Add alarm - final GlobalAlarm alarm = GlobalAlarm.fromPath(info.getNameOrPath(), - info.getSeverity(), info.getMessage(), info.getTimestamp()); - synchronized (alarms) + // Add/update alarm + final GlobalAlarm alarm; + synchronized (configurations) { - alarms.add(alarm); + alarm = GlobalAlarm.fromPath(configurations, info.getNameOrPath(), + info.getSeverity(), info.getMessage(), info.getTimestamp()); } // Complete GUI detail in background final ReadInfoJob read_job = new ReadInfoJob(Preferences.getRDB_Url(),Preferences.getRDB_User(), @@ -169,21 +169,46 @@ } /** Remove alarm because it cleared - * @param path Alarm path + * @param full_path Alarm path * @return <code>true</code> when removed, <code>false</code> when not found */ - private boolean removeAlarm(final String path) + private boolean removeAlarm(final String full_path) { - synchronized (alarms) + final String path[] = AlarmTreePath.splitPath(full_path); + if (path.length <= 1) + return false; + synchronized (configurations) { - for (int i=0; i<alarms.size(); ++i) - if (alarms.get(i).getPathName().equals(path)) + // Locate alarm: Root.... + AlarmTreeItem item = null; + for (AlarmTreeRoot root : configurations) + if (root.getName().equals(path[0])) { - alarms.remove(i); - return true; + item = root; + break; } + if (item == null) + return false; + // .. descend tree.. + for (int i=1; item != null && i<path.length; ++i) + item = item.getClientChild(path[i]); + // Found? + if (item == null || !(item instanceof GlobalAlarm)) + return false; + + // Up to the root, delete all 'empty' nodes + final AlarmTreeRoot root = item.getClientRoot(); + while (item != null && item.getChildCount() <= 0) + { + final AlarmTreeItem tmp = item; + item = item.getClientParent(); + tmp.detachFromParent(); + } + // If root is now unused, delete it from configurations + if (root.getChildCount() <= 0) + configurations.remove(root); } |