Menu
▾
▴
[Cs-studio-core] /hgroot/cs-studio/cs-studio: 3 new changesets
|
From: <cs-...@li...> - 2012-03-07 11:21:20
|
details: http://cs-studio.hg.sourceforge.net/hgweb/cs-studio/cs-studio//hgroot/cs-studio/cs-studio/rev/7779e07f42ae changeset: 14249:7779e07f42ae user: Markus Moeller <mar...@de...> date: Tue Feb 28 09:49:00 2012 +0100 description: o.c.ams.delivery.sms: Replaced asynchronous SMS receiving with polling. details: http://cs-studio.hg.sourceforge.net/hgweb/cs-studio/cs-studio//hgroot/cs-studio/cs-studio/rev/1452e63c868e changeset: 14250:1452e63c868e user: Markus Moeller <mar...@de...> date: Tue Feb 28 10:22:03 2012 +0100 description: o.c.ams.delivery.sms: The device thread will now be started. details: http://cs-studio.hg.sourceforge.net/hgweb/cs-studio/cs-studio//hgroot/cs-studio/cs-studio/rev/fc1a7de966d4 changeset: 14251:fc1a7de966d4 user: Markus Moeller <mar...@de...> date: Wed Mar 07 11:10:13 2012 +0100 description: Merge to main diffstat: .hgtags | 1 - applications/features/org.csstudio.channel.feature/ReleaseProcedure.txt | 19 + applications/features/org.csstudio.channel.feature/feature.xml | 2 +- applications/plugins/edu.msu.nscl.olog.api/src/edu/msu/nscl/olog/api/Olog.java | 29 + applications/plugins/edu.msu.nscl.olog.api/src/edu/msu/nscl/olog/api/OlogClient.java | 155 +- applications/plugins/edu.msu.nscl.olog.api/src/edu/msu/nscl/olog/api/OlogClientImpl.java | 295 +- applications/plugins/edu.msu.nscl.olog.api/src/edu/msu/nscl/olog/api/OlogClientManager.java | 42 - applications/plugins/edu.msu.nscl.olog.api/src/edu/msu/nscl/olog/api/Property.java | 34 +- applications/plugins/edu.msu.nscl.olog.api/src/edu/msu/nscl/olog/api/PropertyBuilder.java | 5 + applications/plugins/edu.msu.nscl.olog.api/src/edu/msu/nscl/olog/api/XmlProperties.java | 2 +- applications/plugins/edu.msu.nscl.olog.api/src/edu/msu/nscl/olog/api/XmlProperty.java | 230 +- applications/plugins/edu.msu.nscl.olog.api/src/org/csstudio/utility/olog/Activator.java | 5 +- applications/plugins/org.csstudio.alarm.beast.configtool/AlarmConfigurationSchema.xsd | 32 +- applications/plugins/org.csstudio.alarm.beast.ui.alarmtree/src/org/csstudio/alarm/beast/ui/alarmtree/GUI.java | 63 +- applications/plugins/org.csstudio.ams.delivery.sms/src/org/csstudio/ams/delivery/sms/SmsDeliveryDevice.java | 106 +- applications/plugins/org.csstudio.ams.delivery.sms/src/org/csstudio/ams/delivery/sms/SmsDeliveryWorker.java | 3 +- applications/plugins/org.csstudio.ams.delivery.sms/src/org/csstudio/ams/delivery/sms/internal/PreferencesInitializer.java | 2 +- applications/plugins/org.csstudio.channel.intro/META-INF/MANIFEST.MF | 2 +- applications/plugins/org.csstudio.channel.opiwidgets/META-INF/MANIFEST.MF | 2 +- applications/plugins/org.csstudio.channel.opiwidgets/src/org/csstudio/channel/opiwidgets/AbstractChannelWidgetModel.java | 22 + applications/plugins/org.csstudio.channel.opiwidgets/src/org/csstudio/channel/opiwidgets/ChannelTreeByPropertyModel.java | 8 +- applications/plugins/org.csstudio.channel.opiwidgets/src/org/csstudio/channel/opiwidgets/PVTableByPropertyEditPart.java | 2 + applications/plugins/org.csstudio.channel.opiwidgets/src/org/csstudio/channel/opiwidgets/PVTableByPropertyModel.java | 8 + applications/plugins/org.csstudio.channel.views/META-INF/MANIFEST.MF | 2 +- applications/plugins/org.csstudio.channel.views/src/org/csstudio/channel/views/PVTableByPropertyView.java | 163 +- applications/plugins/org.csstudio.channel.widgets/META-INF/MANIFEST.MF | 2 +- applications/plugins/org.csstudio.channel.widgets/html/cf-changelog.html | 21 +- applications/plugins/org.csstudio.channel.widgets/src/org/csstudio/channel/widgets/PVTableByPropertyCellLabelProvider.java | 40 +- applications/plugins/org.csstudio.channel.widgets/src/org/csstudio/channel/widgets/PVTableByPropertyConfigurationDialog.java | 49 + applications/plugins/org.csstudio.channel.widgets/src/org/csstudio/channel/widgets/PVTableByPropertyConfigurationPanel.java | 152 + applications/plugins/org.csstudio.channel.widgets/src/org/csstudio/channel/widgets/PVTableByPropertyWidget.java | 187 +- applications/plugins/org.csstudio.channel.widgets/src/org/csstudio/channel/widgets/StringListSelectionWidget.java | 5 +- applications/plugins/org.csstudio.channel.widgets/src/org/csstudio/channel/widgets/util/MementoUtil.java | 19 + applications/plugins/org.csstudio.graphene/icons/histogram-16.png | 0 applications/plugins/org.csstudio.graphene/plugin.xml | 10 +- applications/plugins/org.csstudio.logbook.olog/src/org/csstudio/logbook/olog/OlogLogbook.java | 4 +- applications/plugins/org.csstudio.logbook.olog/src/org/csstudio/logbook/olog/OlogLogbookFactory.java | 4 +- applications/plugins/org.csstudio.logbook.ologviewer/.classpath | 7 + applications/plugins/org.csstudio.logbook.ologviewer/.project | 28 + applications/plugins/org.csstudio.logbook.ologviewer/META-INF/MANIFEST.MF | 15 + applications/plugins/org.csstudio.logbook.ologviewer/build.properties | 5 + applications/plugins/org.csstudio.logbook.ologviewer/icons/tagged.png | 0 applications/plugins/org.csstudio.logbook.ologviewer/plugin.xml | 94 + applications/plugins/org.csstudio.logbook.ologviewer/schema/org.csstudio.logbook.ologtable.columndescription.exsd | 123 + applications/plugins/org.csstudio.logbook.ologviewer/src/org/csstudio/logbook/ologviewer/AbstractSelectionProviderWrapper.java | 82 + applications/plugins/org.csstudio.logbook.ologviewer/src/org/csstudio/logbook/ologviewer/Activator.java | 72 + applications/plugins/org.csstudio.logbook.ologviewer/src/org/csstudio/logbook/ologviewer/LogInfoHandler.java | 33 + applications/plugins/org.csstudio.logbook.ologviewer/src/org/csstudio/logbook/ologviewer/OlogContentProvider.java | 16 + applications/plugins/org.csstudio.logbook.ologviewer/src/org/csstudio/logbook/ologviewer/OlogEditor.java | 201 + applications/plugins/org.csstudio.logbook.ologviewer/src/org/csstudio/logbook/ologviewer/OlogPerspective.java | 53 + applications/plugins/org.csstudio.logbook.ologviewer/src/org/csstudio/logbook/ologviewer/OlogQuery.java | 130 + applications/plugins/org.csstudio.logbook.ologviewer/src/org/csstudio/logbook/ologviewer/OlogQueryListener.java | 7 + applications/plugins/org.csstudio.logbook.ologviewer/src/org/csstudio/logbook/ologviewer/OlogTableColumnDescriptor.java | 16 + applications/plugins/org.csstudio.logbook.ologviewer/src/org/csstudio/logbook/ologviewer/OlogTableWidget.java | 280 + applications/plugins/org.csstudio.logbook.ologviewer/src/org/csstudio/logbook/ologviewer/OpenOlog.java | 24 + applications/plugins/org.csstudio.logbook.ologviewer/src/org/csstudio/logbook/ologviewer/OwnerCellLabelProvider.java | 15 + applications/plugins/org.csstudio.logbook.ologviewer/src/org/csstudio/logbook/ologviewer/PopupMenuUtil.java | 37 + applications/plugins/org.csstudio.logbook.ologviewer/src/org/csstudio/logbook/ologviewer/SimpleOlogTableColumnDescriptor.java | 107 + applications/plugins/org.csstudio.logbook.ologviewer/src/org/csstudio/logbook/ologviewer/TagCellLabelProvider.java | 41 + applications/plugins/org.csstudio.logbook.ui/icons/logentry-16.png | 0 applications/plugins/org.csstudio.logbook.ui/icons/logentry-add-16.png | 0 applications/plugins/org.csstudio.logbook.ui/plugin.xml | 4 +- applications/plugins/org.csstudio.opibuilder.editor/src/org/csstudio/opibuilder/editor/OPIEditor.java | 42 +- applications/plugins/org.csstudio.opibuilder.examples/examples/BOY Examples/5_5_FileIOWithScript.opi | 1402 ++++-- applications/plugins/org.csstudio.opibuilder.examples/examples/BOY Examples/widgets/1_5_Polyline_Polygon.opi | 1377 ++++++ applications/plugins/org.csstudio.opibuilder.examples/examples/BOY Examples/widgets/2_5_2_XY_Graph.opi | 2030 ++++---- applications/plugins/org.csstudio.opibuilder.examples/examples/BOY Examples/widgets/3_3_Menu_Button.opi | 1684 +++++-- applications/plugins/org.csstudio.opibuilder.examples/examples/BOY Examples/widgets/3_4_Text_Input.opi | 2009 ++++++--- applications/plugins/org.csstudio.opibuilder.examples/examples/BOY Examples/widgets/4_1_GroupingContainer.opi | 2167 ++++++--- applications/plugins/org.csstudio.opibuilder.rcp/src/org/csstudio/opibuilder/util/ConsoleServiceSSHelperImpl.java | 2 +- applications/plugins/org.csstudio.opibuilder.rcp/src/org/csstudio/opibuilder/util/ResourceUtilSSHelperImpl.java | 3 + applications/plugins/org.csstudio.opibuilder.widgets/src/org/csstudio/opibuilder/widgets/editparts/TableEditPart.java | 22 +- applications/plugins/org.csstudio.opibuilder.widgets/src/org/csstudio/opibuilder/widgets/model/TableModel.java | 18 +- applications/plugins/org.csstudio.opibuilder/html/Actions.html | 6 +- applications/plugins/org.csstudio.opibuilder/html/ChangeLog.html | 39 +- applications/plugins/org.csstudio.opibuilder/html/Macro.html | 43 +- applications/plugins/org.csstudio.opibuilder/html/OPI Runtime.html | 64 +- applications/plugins/org.csstudio.opibuilder/html/Widget Properties.html | 3 + applications/plugins/org.csstudio.opibuilder/html/img/CustomScriptUtil.gif | 0 applications/plugins/org.csstudio.opibuilder/html/img/DashAlarmBorder.gif | 0 applications/plugins/org.csstudio.opibuilder/html/img/EmbedScript.gif | 0 applications/plugins/org.csstudio.opibuilder/html/img/InvertedAxis.gif | 0 applications/plugins/org.csstudio.opibuilder/html/img/JythonInBOY.gif | 0 applications/plugins/org.csstudio.opibuilder/html/img/OPI_Runtime.gif | 0 applications/plugins/org.csstudio.opibuilder/html/img/OpenOPIContextMenu.gif | 0 applications/plugins/org.csstudio.opibuilder/html/img/RotatedText.gif | 0 applications/plugins/org.csstudio.opibuilder/html/img/ScaleWidgets.gif | 0 applications/plugins/org.csstudio.opibuilder/html/img/ScriptOptions.gif | 0 applications/plugins/org.csstudio.opibuilder/html/img/TreeView.gif | 0 applications/plugins/org.csstudio.opibuilder/html/img/UnicodeSupport.gif | 0 applications/plugins/org.csstudio.opibuilder/html/img/detachedView.gif | 0 applications/plugins/org.csstudio.opibuilder/html/img/onlineHelp.gif | 0 applications/plugins/org.csstudio.opibuilder/html/widgets/Display.html | 7 +- applications/plugins/org.csstudio.opibuilder/src/org/csstudio/opibuilder/actions/CompactModeAction.java | 43 +- applications/plugins/org.csstudio.opibuilder/src/org/csstudio/opibuilder/datadefinition/DisplayScaleData.java | 100 +- applications/plugins/org.csstudio.opibuilder/src/org/csstudio/opibuilder/model/ConnectionModel.java | 1 + applications/plugins/org.csstudio.opibuilder/src/org/csstudio/opibuilder/properties/AbstractWidgetProperty.java | 5 + applications/plugins/org.csstudio.opibuilder/src/org/csstudio/opibuilder/runmode/OPIRunner.java | 45 +- applications/plugins/org.csstudio.opibuilder/src/org/csstudio/opibuilder/util/WorkbenchWindowService.java | 25 +- applications/plugins/org.csstudio.opibuilder/src/org/csstudio/opibuilder/visualparts/StringTableCellEditor.java | 12 +- applications/plugins/org.csstudio.swt.widgets/src/org/csstudio/swt/widgets/natives/SpreadSheetTable.java | 54 +- applications/plugins/org.csstudio.trends.databrowser2/src/org/csstudio/trends/databrowser2/model/HistoricSamples.java | 18 +- applications/plugins/org.csstudio.trends.databrowser2/src/org/csstudio/trends/databrowser2/model/LiveSamples.java | 28 +- applications/plugins/org.csstudio.trends.databrowser2/src/org/csstudio/trends/databrowser2/ui/Controller.java | 64 +- applications/plugins/org.csstudio.utility.channel/src/org/csstudio/utility/channel/CSSChannelUtils.java | 22 + applications/plugins/org.csstudio.utility.olog.ui/src/org/csstudio/utility/olog/ui/Activator.java | 13 +- applications/plugins/org.csstudio.utility.olog/src/org/csstudio/utility/olog/OlogClientFromPreferences.java | 105 +- applications/plugins/org.csstudio.utility.product/META-INF/MANIFEST.MF | 2 +- applications/plugins/org.csstudio.utility.product/src/org/csstudio/utility/product/Activator.java | 2 +- applications/plugins/org.csstudio.utility.product/src/org/csstudio/utility/product/ApplicationWorkbenchAdvisor.java | 25 +- applications/plugins/org.python/.classpath | 5 + applications/plugins/org.python/.project | 28 + applications/plugins/org.python/META-INF/MANIFEST.MF | 11 + applications/plugins/org.python/Readme.txt | 9 + applications/plugins/org.python/build.properties | 4 + applications/plugins/org.python/jython.jar | 0 core/plugins/org.csstudio.auth/src/org/csstudio/auth/internal/usermanagement/LoginContext.java | 5 +- core/plugins/org.csstudio.startup/src/org/csstudio/startup/module/ProjectExtPoint.java | 52 +- core/plugins/org.csstudio.startup/src/org/csstudio/startup/module/defaults/DefaultProject.java | 21 +- core/plugins/org.csstudio.ui.help/html/changelog/core.html | 2 +- core/plugins/org.csstudio.ui.util/src/org/csstudio/ui/util/NoResourceEditorInput.java | 107 + core/plugins/org.csstudio.utility.pv.epics/META-INF/MANIFEST.MF | 2 +- core/plugins/org.csstudio.utility.pv.epics/src/org/csstudio/utility/pv/epics/EPICS_V3_PV.java | 6 + products/NSLS2/features/org.csstudio.nsls2.applications.feature/feature.xml | 10 +- products/NSLS2/features/org.csstudio.nsls2.basic.applications.feature/feature.xml | 23 +- products/NSLS2/plugins.list | 4 + products/NSLS2/plugins/org.csstudio.nsls2.product/META-INF/MANIFEST.MF | 2 +- products/NSLS2/plugins/org.csstudio.nsls2.product/ReleaseProcedure.txt | 6 + products/NSLS2/plugins/org.csstudio.nsls2.product/css-nsls2.product | 4 +- products/NSLS2/plugins/org.csstudio.nsls2.product/plugin.xml | 2 +- products/SNS/plugins/org.csstudio.scan.client/.classpath | 1 - products/SNS/plugins/org.csstudio.scan.client/META-INF/MANIFEST.MF | 8 +- products/SNS/plugins/org.csstudio.scan.client/build.properties | 3 +- products/SNS/plugins/org.csstudio.scan.client/lib/jython.jar | 0 products/SNS/plugins/org.csstudio.scan.client/src/org/csstudio/scan/client/ScanServerConnector.java | 14 +- products/SNS/plugins/org.csstudio.scan.custom/src/org/csstudio/scan/command/CommentCommand.java | 2 +- products/SNS/plugins/org.csstudio.scan.server/META-INF/MANIFEST.MF | 1 - products/SNS/plugins/org.csstudio.scan.server/ScanServer.product | 1 + products/SNS/plugins/org.csstudio.scan.server/build.properties | 1 - products/SNS/plugins/org.csstudio.scan.server/plugin_customization.ini | 13 +- products/SNS/plugins/org.csstudio.scan.server/preferences.ini | 10 - products/SNS/plugins/org.csstudio.scan.server/src/org/csstudio/scan/device/DeviceContext.java | 16 +- products/SNS/plugins/org.csstudio.scan.server/src/org/csstudio/scan/server/app/Activator.java | 52 - products/SNS/plugins/org.csstudio.scan.server/src/org/csstudio/scan/server/app/Application.java | 8 +- products/SNS/plugins/org.csstudio.scan.server/src/org/csstudio/scan/server/app/Preferences.java | 33 - products/SNS/plugins/org.csstudio.scan.server/src/org/csstudio/scan/server/internal/PathStreamTool.java | 35 + products/SNS/plugins/org.csstudio.scan.server/src/org/csstudio/scan/server/internal/Scan.java | 113 +- products/SNS/plugins/org.csstudio.scan.server/src/org/csstudio/scan/server/internal/ScanServerImpl.java | 90 +- products/SNS/plugins/org.csstudio.scan.server/test/org/csstudio/scan/ScanHeadlessTest.java | 9 +- products/SNS/plugins/org.csstudio.scan.server/test/org/csstudio/scan/ScanServerHeadlessTest.java | 2 +- products/SNS/plugins/org.csstudio.scan.ui.plot/src/org/csstudio/scan/ui/plot/OpenPlotAction.java | 3 +- products/SNS/plugins/org.csstudio.scan.ui.plot/src/org/csstudio/scan/ui/plot/ScanPlotView.java | 19 +- products/SNS/plugins/org.csstudio.scan.ui.scanmonitor/src/org/csstudio/scan/ui/scanmonitor/GUI.java | 52 +- products/SNS/plugins/org.csstudio.scan.ui.scanmonitor/src/org/csstudio/scan/ui/scanmonitor/Messages.java | 2 + products/SNS/plugins/org.csstudio.scan.ui.scanmonitor/src/org/csstudio/scan/ui/scanmonitor/messages.properties | 2 + products/SNS/plugins/org.csstudio.scan.ui.scantree/icons/run.png | 0 products/SNS/plugins/org.csstudio.scan.ui.scantree/plugin.properties | 3 +- products/SNS/plugins/org.csstudio.scan.ui.scantree/plugin.xml | 46 +- products/SNS/plugins/org.csstudio.scan.ui.scantree/src/org/csstudio/scan/ui/scantree/CommandListView.java | 108 - products/SNS/plugins/org.csstudio.scan.ui.scantree/src/org/csstudio/scan/ui/scantree/CommandTreeContentProvider.java | 121 - products/SNS/plugins/org.csstudio.scan.ui.scantree/src/org/csstudio/scan/ui/scantree/CommandTreeLabelProvider.java | 85 - products/SNS/plugins/org.csstudio.scan.ui.scantree/src/org/csstudio/scan/ui/scantree/CommandsInfo.java | 107 - products/SNS/plugins/org.csstudio.scan.ui.scantree/src/org/csstudio/scan/ui/scantree/EmptyEditorInput.java | 67 - products/SNS/plugins/org.csstudio.scan.ui.scantree/src/org/csstudio/scan/ui/scantree/Perspective.java | 79 - products/SNS/plugins/org.csstudio.scan.ui.scantree/src/org/csstudio/scan/ui/scantree/ScanCommandTransfer.java | 103 - products/SNS/plugins/org.csstudio.scan.ui.scantree/src/org/csstudio/scan/ui/scantree/ScanEditor.java | 188 +- products/SNS/plugins/org.csstudio.scan.ui.scantree/src/org/csstudio/scan/ui/scantree/ScanEditorContributor.java | 90 - products/SNS/plugins/org.csstudio.scan.ui.scantree/src/org/csstudio/scan/ui/scantree/ScanTreeGUI.java | 555 -- products/SNS/plugins/org.csstudio.scan.ui.scantree/src/org/csstudio/scan/ui/scantree/TreeManipulator.java | 196 - products/SNS/plugins/org.csstudio.scan.ui.scantree/src/org/csstudio/scan/ui/scantree/gui/CommandListView.java | 109 + products/SNS/plugins/org.csstudio.scan.ui.scantree/src/org/csstudio/scan/ui/scantree/gui/CommandTreeContentProvider.java | 100 + products/SNS/plugins/org.csstudio.scan.ui.scantree/src/org/csstudio/scan/ui/scantree/gui/CommandTreeLabelProvider.java | 82 + products/SNS/plugins/org.csstudio.scan.ui.scantree/src/org/csstudio/scan/ui/scantree/gui/CommandsInfo.java | 107 + products/SNS/plugins/org.csstudio.scan.ui.scantree/src/org/csstudio/scan/ui/scantree/gui/EmptyEditorInput.java | 68 + products/SNS/plugins/org.csstudio.scan.ui.scantree/src/org/csstudio/scan/ui/scantree/gui/Perspective.java | 82 + products/SNS/plugins/org.csstudio.scan.ui.scantree/src/org/csstudio/scan/ui/scantree/gui/ScanCommandTransfer.java | 103 + products/SNS/plugins/org.csstudio.scan.ui.scantree/src/org/csstudio/scan/ui/scantree/gui/ScanEditorContributor.java | 74 + products/SNS/plugins/org.csstudio.scan.ui.scantree/src/org/csstudio/scan/ui/scantree/gui/ScanTreeGUI.java | 608 ++ products/SNS/plugins/org.csstudio.scan.ui.scantree/src/org/csstudio/scan/ui/scantree/messages.properties | 2 +- products/SNS/plugins/org.csstudio.scan.ui.scantree/src/org/csstudio/scan/ui/scantree/model/RemovalInfo.java | 84 + products/SNS/plugins/org.csstudio.scan.ui.scantree/src/org/csstudio/scan/ui/scantree/model/ScanTreeModel.java | 245 + products/SNS/plugins/org.csstudio.scan.ui.scantree/src/org/csstudio/scan/ui/scantree/model/ScanTreeModelListener.java | 30 + products/SNS/plugins/org.csstudio.scan.ui.scantree/src/org/csstudio/scan/ui/scantree/operations/AddCommandAction.java | 2 +- products/SNS/plugins/org.csstudio.scan.ui.scantree/src/org/csstudio/scan/ui/scantree/operations/CopyCommandHandler.java | 2 +- products/SNS/plugins/org.csstudio.scan.ui.scantree/src/org/csstudio/scan/ui/scantree/operations/CutCommandHandler.java | 5 +- products/SNS/plugins/org.csstudio.scan.ui.scantree/src/org/csstudio/scan/ui/scantree/operations/CutOperation.java | 25 +- products/SNS/plugins/org.csstudio.scan.ui.scantree/src/org/csstudio/scan/ui/scantree/operations/InsertOperation.java | 27 +- products/SNS/plugins/org.csstudio.scan.ui.scantree/src/org/csstudio/scan/ui/scantree/operations/NewScanTree.java | 2 +- products/SNS/plugins/org.csstudio.scan.ui.scantree/src/org/csstudio/scan/ui/scantree/operations/OpenCommandListAction.java | 2 +- products/SNS/plugins/org.csstudio.scan.ui.scantree/src/org/csstudio/scan/ui/scantree/operations/PasteCommandHandler.java | 5 +- products/SNS/plugins/org.csstudio.scan.ui.scantree/src/org/csstudio/scan/ui/scantree/operations/PropertyChangeOperation.java | 97 +- products/SNS/plugins/org.csstudio.scan.ui.scantree/src/org/csstudio/scan/ui/scantree/operations/SubmitCurrentScanAction.java | 37 - products/SNS/plugins/org.csstudio.scan.ui.scantree/src/org/csstudio/scan/ui/scantree/operations/SubmitScanHandler.java | 26 + products/SNS/plugins/org.csstudio.scan.ui.scantree/src/org/csstudio/scan/ui/scantree/properties/DoubleCellEditor.java | 46 +- products/SNS/plugins/org.csstudio.scan.ui.scantree/src/org/csstudio/scan/ui/scantree/properties/GenericCommandAdapter.java | 2 +- products/SNS/plugins/org.csstudio.scan.ui.scantree/src/org/csstudio/scan/ui/scantree/properties/OptionListCellEditor.java | 29 +- products/SNS/plugins/org.csstudio.scan.ui.scantree/src/org/csstudio/scan/ui/scantree/properties/ScanCommandPVAdapterFactory.java | 2 +- products/SNS/plugins/org.csstudio.scan.ui.scantree/src/org/csstudio/scan/ui/scantree/properties/ScanCommandPropertyAdapterFactory.java | 2 +- products/SNS/plugins/org.csstudio.scan.ui.scantree/src/org/csstudio/scan/ui/scantree/properties/StringOrDoubleCellEditor.java | 17 +- products/SNS/plugins/org.csstudio.scan.ui.scantree/test/org/csstudio/scan/ui/scantree/CommandTreeContentProviderUnitTest.java | 65 - products/SNS/plugins/org.csstudio.scan.ui.scantree/test/org/csstudio/scan/ui/scantree/CommandsInfoHeadlessTest.java | 1 + products/SNS/plugins/org.csstudio.scan.ui.scantree/test/org/csstudio/scan/ui/scantree/ScanCommandTransferHeadlessTest.java | 1 + products/SNS/plugins/org.csstudio.scan.ui.scantree/test/org/csstudio/scan/ui/scantree/ScanTreeGUIDemo.java | 12 +- products/SNS/plugins/org.csstudio.scan.ui.scantree/test/org/csstudio/scan/ui/scantree/ScanTreeModelTest.java | 192 + products/SNS/plugins/org.csstudio.scan.ui.scantree/test/org/csstudio/scan/ui/scantree/TreeManipulatiorUnitTest.java | 179 - products/SNS/plugins/org.csstudio.scan.ui/META-INF/MANIFEST.MF | 3 +- products/SNS/plugins/org.csstudio.scan.ui/doc/scansystem.html | 35 +- products/SNS/plugins/org.csstudio.scan.ui/plugin.xml | 8 + products/SNS/plugins/org.csstudio.scan.ui/src/org/csstudio/scan/ui/Messages.java | 33 + products/SNS/plugins/org.csstudio.scan.ui/src/org/csstudio/scan/ui/PreferencePage.java | 65 + products/SNS/plugins/org.csstudio.scan.ui/src/org/csstudio/scan/ui/ScanUIActivator.java | 15 +- products/SNS/plugins/org.csstudio.scan.ui/src/org/csstudio/scan/ui/messages.properties | 3 + products/SNS/plugins/org.csstudio.scan/META-INF/MANIFEST.MF | 2 + products/SNS/plugins/org.csstudio.scan/build.properties | 3 +- products/SNS/plugins/org.csstudio.scan/examples/BeamLine2.opi | 365 +- products/SNS/plugins/org.csstudio.scan/examples/beamline.xml | 5 + products/SNS/plugins/org.csstudio.scan/examples/benchmark.py | 166 + products/SNS/plugins/org.csstudio.scan/examples/jython.sh | 33 +- products/SNS/plugins/org.csstudio.scan/examples/post_scan.scn | 9 + products/SNS/plugins/org.csstudio.scan/examples/pre_scan.scn | 9 + products/SNS/plugins/org.csstudio.scan/examples/run_scan.py | 14 +- products/SNS/plugins/org.csstudio.scan/examples/scan_client.py | 113 +- products/SNS/plugins/org.csstudio.scan/examples/simulation.db | 9 + products/SNS/plugins/org.csstudio.scan/preferences.ini | 23 + products/SNS/plugins/org.csstudio.scan/src/org/csstudio/scan/Activator.java | 28 + products/SNS/plugins/org.csstudio.scan/src/org/csstudio/scan/Preferences.java | 95 + products/SNS/plugins/org.csstudio.scan/src/org/csstudio/scan/TODO.java | 27 +- products/SNS/plugins/org.csstudio.scan/src/org/csstudio/scan/command/CommandSequence.java | 29 +- products/SNS/plugins/org.csstudio.scan/src/org/csstudio/scan/command/DelayCommand.java | 2 +- products/SNS/plugins/org.csstudio.scan/src/org/csstudio/scan/command/LogCommand.java | 2 +- products/SNS/plugins/org.csstudio.scan/src/org/csstudio/scan/command/LoopCommand.java | 16 +- products/SNS/plugins/org.csstudio.scan/src/org/csstudio/scan/command/ScanCommand.java | 17 +- products/SNS/plugins/org.csstudio.scan/src/org/csstudio/scan/command/SetCommand.java | 37 +- products/SNS/plugins/org.csstudio.scan/src/org/csstudio/scan/command/UnknownScanCommandPropertyException.java | 4 +- products/SNS/plugins/org.csstudio.scan/src/org/csstudio/scan/command/WaitCommand.java | 21 +- products/SNS/plugins/org.csstudio.scan/src/org/csstudio/scan/data/ScanSample.java | 8 +- products/SNS/plugins/org.csstudio.scan/src/org/csstudio/scan/server/ScanInfo.java | 70 +- products/SNS/plugins/org.csstudio.scan/src/org/csstudio/scan/server/ScanServer.java | 37 +- products/SNS/plugins/org.csstudio.scan/src/org/csstudio/scan/server/UnknownScanException.java | 34 + products/SNS/plugins/org.csstudio.scan/test/org/csstudio/scan/ScanInfoUnitTest.java | 44 + products/SNS/plugins/org.csstudio.scan/test/org/csstudio/scan/SpreadsheetScanDataIteratorTest.java | 62 - products/SNS/plugins/org.csstudio.scan/test/org/csstudio/scan/SpreadsheetScanDataIteratorUnitTest.java | 62 + products/SNS/plugins/org.csstudio.sns.mpsbypasses/ChangeLog.html | 29 + products/SNS/plugins/org.csstudio.sns.mpsbypasses/META-INF/MANIFEST.MF | 5 +- products/SNS/plugins/org.csstudio.sns.mpsbypasses/build.properties | 5 +- products/SNS/plugins/org.csstudio.sns.mpsbypasses/html/Additional.html | 7 +- products/SNS/plugins/org.csstudio.sns.mpsbypasses/html/BypassTable.html | 6 + products/SNS/plugins/org.csstudio.sns.mpsbypasses/html/InputInformation.html | 5 + products/SNS/plugins/org.csstudio.sns.mpsbypasses/html/MPSBypass.html | 19 +- products/SNS/plugins/org.csstudio.sns.mpsbypasses/html/OtherDisplayInfo.html | 7 +- products/SNS/plugins/org.csstudio.sns.mpsbypasses/html/Overview.html | 124 +- products/SNS/plugins/org.csstudio.sns.mpsbypasses/html/context.png | 0 products/SNS/plugins/org.csstudio.sns.mpsbypasses/plugin.xml | 18 + products/SNS/plugins/org.csstudio.sns.mpsbypasses/src/org/csstudio/sns/mpsbypasses/Plugin.java | 5 +- products/SNS/plugins/org.csstudio.sns.mpsbypasses/src/org/csstudio/sns/mpsbypasses/model/Bypass.java | 44 +- products/SNS/plugins/org.csstudio.sns.mpsbypasses/src/org/csstudio/sns/mpsbypasses/model/BypassAdapterFactory.java | 49 + products/SNS/plugins/org.csstudio.sns.mpsbypasses/src/org/csstudio/sns/mpsbypasses/model/BypassModel.java | 53 +- products/SNS/plugins/org.csstudio.sns.mpsbypasses/src/org/csstudio/sns/mpsbypasses/model/BypassState.java | 11 +- products/SNS/plugins/org.csstudio.sns.mpsbypasses/src/org/csstudio/sns/mpsbypasses/model/Request.java | 9 +- products/SNS/plugins/org.csstudio.sns.mpsbypasses/src/org/csstudio/sns/mpsbypasses/model/RequestLookup.java | 9 +- products/SNS/plugins/org.csstudio.sns.mpsbypasses/src/org/csstudio/sns/mpsbypasses/model/RequestState.java | 13 +- products/SNS/plugins/org.csstudio.sns.mpsbypasses/src/org/csstudio/sns/mpsbypasses/modes/BeamMode.java | 9 +- products/SNS/plugins/org.csstudio.sns.mpsbypasses/src/org/csstudio/sns/mpsbypasses/modes/BeamModeMonitor.java | 19 +- products/SNS/plugins/org.csstudio.sns.mpsbypasses/src/org/csstudio/sns/mpsbypasses/modes/MachineMode.java | 13 +- products/SNS/plugins/org.csstudio.sns.mpsbypasses/src/org/csstudio/sns/mpsbypasses/modes/MachineModeMonitor.java | 19 +- products/SNS/plugins/org.csstudio.sns.mpsbypasses/src/org/csstudio/sns/mpsbypasses/ui/BypassEditorInput.java | 7 +- products/SNS/plugins/org.csstudio.sns.mpsbypasses/src/org/csstudio/sns/mpsbypasses/ui/ELogAction.java | 3 +- products/SNS/plugins/org.csstudio.sns.mpsbypasses/src/org/csstudio/sns/mpsbypasses/ui/Editor.java | 13 +- products/SNS/plugins/org.csstudio.sns.mpsbypasses/src/org/csstudio/sns/mpsbypasses/ui/GUI.java | 108 +- products/SNS/plugins/org.csstudio.sns.mpsbypasses/src/org/csstudio/sns/mpsbypasses/ui/HtmlReport.java | 7 +- products/SNS/plugins/org.csstudio.sns.mpsbypasses/src/org/csstudio/sns/mpsbypasses/ui/ShowHandler.java | 1 + products/SNS/plugins/org.csstudio.sns.mpsbypasses/src/org/csstudio/sns/mpsbypasses/ui/WebPageAction.java | 3 +- products/SNS/plugins/org.csstudio.sns.mpsbypasses/test/org/csstudio/sns/mpsbypasses/model/BypassHeadlessTest.java | 21 +- products/SNS/plugins/org.csstudio.sns.mpsbypasses/test/org/csstudio/sns/mpsbypasses/model/BypassModelHeadlessTest.java | 9 +- products/SNS/plugins/org.csstudio.sns.mpsbypasses/test/org/csstudio/sns/mpsbypasses/modes/BeamMonitorHeadlessTest.java | 8 +- products/SNS/plugins/org.csstudio.sns.mpsbypasses/test/org/csstudio/sns/mpsbypasses/modes/MachineModeMonitorHeadlessTest.java | 8 +- products/SNS/plugins/org.csstudio.sns.mpsbypasses/test/org/csstudio/sns/mpsbypasses/ui/GUIHeadlessDemo.java | 6 +- products/SNS/plugins/org.csstudio.sns.mpsbypasses/tocChangelog.xml | 6 + products/SNS/product/org.csstudio.basic.epics.product/CSS.product | 4 +- products/SNS/product/org.csstudio.basic.epics.product/META-INF/MANIFEST.MF | 3 +- products/SNS/product/org.csstudio.basic.epics.product/plugin.xml | 3 + products/SNS/product/org.csstudio.scan.ui.feature/feature.xml | 17 +- products/SNS/product/org.csstudio.sns.feature.basiccore/feature.xml | 12 +- 283 files changed, 14915 insertions(+), 6922 deletions(-) diffs (truncated from 27746 to 300 lines): diff -r 897f66debab0 -r fc1a7de966d4 .hgtags --- a/.hgtags Mon Feb 27 13:14:41 2012 +0100 +++ b/.hgtags Wed Mar 07 11:10:13 2012 +0100 @@ -41,4 +41,3 @@ 44e70272b6de0332ec9b0bed1041c21701525b10 DESY_3.1.0 963693518e1d423299e3dd13e3f877411ee1e7e4 CSS Core 3.1.0 ebd99693fd1d1e5d6bb1c2aeb2d00f8063ee3f5a KEK_3.1.0 - diff -r 897f66debab0 -r fc1a7de966d4 applications/features/org.csstudio.channel.feature/ReleaseProcedure.txt --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/applications/features/org.csstudio.channel.feature/ReleaseProcedure.txt Wed Mar 07 11:10:13 2012 +0100 @@ -0,0 +1,19 @@ +ChannelFinder Integration and Applications Release Procedure +------------------------------------------------------------ + +Should have been done at release planning: +* Make sure all the plugins/feature have the correct release number +* Make sure JIRA has the version "CSS-X" already created + +Pre-release +* Review if any unscheduled issues were done, and add them to "CSS-X" +* Remove scheduled issues from "CSS-X" if they don't make the release +* Go through version control, and add any solved and unreported issues +* Close all the issues +* Update the changelog in org.csstudio.channel.widgets/html +* Commit changes + +Release +* Should we tag? +* Binaries are build during the product build +* Mark version in JIRA as released, with the correct date \ No newline at end of file diff -r 897f66debab0 -r fc1a7de966d4 applications/features/org.csstudio.channel.feature/feature.xml --- a/applications/features/org.csstudio.channel.feature/feature.xml Mon Feb 27 13:14:41 2012 +0100 +++ b/applications/features/org.csstudio.channel.feature/feature.xml Wed Mar 07 11:10:13 2012 +0100 @@ -2,7 +2,7 @@ <feature id="org.csstudio.channel.feature" label="Channel based applications" - version="1.1.0.qualifier" + version="1.1.1.qualifier" provider-name="Gabriele Carcassi <car...@bn...>, Kunal Shroff <ks...@bn...> - BNL"> <description url="http://www.example.com/description"> diff -r 897f66debab0 -r fc1a7de966d4 applications/plugins/edu.msu.nscl.olog.api/src/edu/msu/nscl/olog/api/Olog.java --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/applications/plugins/edu.msu.nscl.olog.api/src/edu/msu/nscl/olog/api/Olog.java Wed Mar 07 11:10:13 2012 +0100 @@ -0,0 +1,29 @@ +package edu.msu.nscl.olog.api; +import static edu.msu.nscl.olog.api.OlogClientImpl.OlogClientBuilder.*; + +public class Olog { + private static volatile OlogClient client; + + private Olog() { + + } + + public static void setClient(OlogClient client) { + Olog.client = client; + } + + /** + * Returns the default {@link OlogClient}. + * + * @return + * @throws Exception + */ + public static OlogClient getClient() throws Exception { + if (client == null) { + Olog.client = serviceURL().withHTTPAuthentication(false) + .create(); + } + return client; + } + +} diff -r 897f66debab0 -r fc1a7de966d4 applications/plugins/edu.msu.nscl.olog.api/src/edu/msu/nscl/olog/api/OlogClient.java --- a/applications/plugins/edu.msu.nscl.olog.api/src/edu/msu/nscl/olog/api/OlogClient.java Mon Feb 27 13:14:41 2012 +0100 +++ b/applications/plugins/edu.msu.nscl.olog.api/src/edu/msu/nscl/olog/api/OlogClient.java Wed Mar 07 11:10:13 2012 +0100 @@ -36,6 +36,24 @@ public Collection<Tag> listTags() throws OlogException; /** + * Get a list of all the Properties currently existing + * + * @return + * @throws OlogException + */ + public Collection<Property> listProperties() throws OlogException; + + /** + * List all the active attributes associated with the property <tt>propertyName</tt> + * property must exist, name != null + * + * @param propertyName + * @return + * @throws OlogException + */ + public Collection<String> listAttributes(String propertyName) throws OlogException; + + /** * Get a list of all the levels currently existing * * @return string collection of levels @@ -73,11 +91,23 @@ DavException; /** + * return the complete property <tt>property</tt> + * + * @param property + * @return + * @throws OlogException + */ + public Property getProperty(String property) throws OlogException; + + /** * Set a single log <tt>log</tt>, if the log already exists it is replaced. * Destructive operation * - * TODO: (shroffk) should there be anything returned? - * XXX: creating logs with same subject allowed? + * TODO: check validity of log entry represented by builder + * + * TODO: (shroffk) should there be anything returned? XXX: creating logs + * with same subject allowed? + * * @param log * the log to be added * @throws OlogException @@ -87,45 +117,33 @@ /** * Set a set of logs Destructive operation. * - * TODO: (shroffk) should anything be returned? and should be returned from the service? + * TODO: (shroffk) should anything be returned? and should be returned from + * the service? * * @param logs * collection of logs to be added * @throws OlogException */ + @Deprecated public Collection<Log> set(Collection<LogBuilder> logs) throws OlogException; /** * Set a Tag <tt>tag</tt> with no associated logs to the database. * + * TODO: validity check, + * * @param tag * @throws OlogException */ public Tag set(TagBuilder tag) throws OlogException; - // /** - // * Set a Collection of tags <tt>tags</tt> with no associated logs. - // * - // * @param tags - // * @throws OlogException - // */ - // public void set(Collection<TagBuilder> tags) throws OlogException; - - /** - * Add tag <tt>tag</tt> to log <tt>logId</tt> and remove the tag from all - * other logs - * - * @param tag - * @param logId - * @throws OlogException - */ - public Tag set(TagBuilder tag, Long logId) throws OlogException; - /** * Set tag <tt>tag</tt> on the set of logs <tt>logIds</tt> and remove it * from all others * + * TODO: all logIds should exist/ service should do proper transactions. + * * @param tag * @param logIds * @throws OlogException @@ -142,21 +160,9 @@ public Logbook set(LogbookBuilder logbookBuilder) throws OlogException; /** - * Set Logbook <tt>logbook</tt> to the log <tt>logId</tt> and remove it from - * all other logs - * - * @param logbook - * logbook builder - * @param logId - * log id - * @throws OlogException - */ - public Logbook set(LogbookBuilder logbook, Long logId) throws OlogException; - - /** * Set Logbook <tt>logbook</tt> to the logs <tt>logIds</tt> and remove it * from all other logs - * + * TODO: all logids should exist, no nulls, check transaction * @param logbook * logbook builder * @param logIds @@ -167,19 +173,21 @@ throws OlogException; /** - * Set the logbook <tt>logbook</tt> to the logs identified by - * <tt>logIds</tt> and remove it from all other logs + * Create or replace property <tt>property</tt> * - * @param logIds - * @param logbook + * TODO: test creation of a new property, test changing this property, test old log entries still have old property structure * - * public void set(LogbookBuilder logbook, Collection<Long> - * logIds); - * - * /** Update a single log <tt>log</tt> + * @param property + * @return + * @throws OlogException + */ + public Property set(PropertyBuilder property) throws OlogException; + + /** + * Update a log entry <tt>log </tt> * * @param log - * the log to be added + * @return the updated log entry * @throws OlogException */ public Log update(LogBuilder log) throws OlogException; @@ -195,8 +203,20 @@ throws OlogException; /** + * Update an existing property, + * + * TODO: check non destructive nature, old attributes should not be touched. old entries should have old property. + * + * @param property + * @return + */ + public Property update(PropertyBuilder property); + + /** * Update Tag <tt>tag </tt> by adding it to Log with name <tt>logName</tt> * + * TODO: logid valid. + * * @param tag * tag builder * @param logId @@ -209,6 +229,8 @@ * Update the Tag <tt>tag</tt> by adding it to the set of the logs with ids * <tt>logIds</tt> * + * TODO: Transactional nature, + * * @param tag * tag builder * @param logIds @@ -227,9 +249,12 @@ * log id * @throws OlogException */ - public Logbook update(LogbookBuilder logbook, Long logId) throws OlogException; + public Logbook update(LogbookBuilder logbook, Long logId) + throws OlogException; /** + * + * TODO: transaction check * @param logIds * @param logbook * @throws OlogException @@ -241,26 +266,15 @@ * Update Property <tt>property</tt> by adding it to Log with id * <tt>logId</tt> * + * TODO : service invalid payload, need attribute and value + * * @param property * property builder * @param logId * log id the property to be added * @throws OlogException */ - public Property update(PropertyBuilder property, Long logId) - throws OlogException; - - /** - * Update the Property <tt>property</tt> by adding it to the set of the logs - * with ids <tt>logIds</tt> |