Added template graph functionality. fixes #876
authorzev <zev@radensolutions.com>
Tue, 15 Dec 2015 15:00:38 +0000 (17:00 +0200)
committerzev <zev@radensolutions.com>
Wed, 2 Nov 2016 19:52:48 +0000 (21:52 +0200)
commit7ac735ef50667834743cdf766db7729f5f10f988
treedebda1e255da10945edb7976239d1a1b5a9a9614
parentefab578647e4a7784a416dd436f9d707375f0a0c
Added template graph functionality. fixes #876
Menu filter is reworked. Object tool filter renamed as ObjectMenuFilter. Made option to add menu filter to any object. Filtering flags added to objectMenuFilter XML and removed from ObjectToll object.
NodeInfo class renamed to ObjectContext and now represent unified macro substitution class.
138 files changed:
ChangeLog
include/netxmsdb.h
include/nxtools.h
sql/objtools.in
src/java/client/netxms-client/src/main/java/org/netxms/client/NXCSession.java
src/java/client/netxms-client/src/main/java/org/netxms/client/ObjectMenuFilter.java [new file with mode: 0644]
src/java/client/netxms-client/src/main/java/org/netxms/client/datacollection/ChartConfig.java [moved from webui/webapp/PerfView/src/org/netxms/ui/eclipse/perfview/ChartConfig.java with 52% similarity]
src/java/client/netxms-client/src/main/java/org/netxms/client/datacollection/ChartDciConfig.java [moved from webui/webapp/Charts/src/org/netxms/ui/eclipse/charts/api/ChartDciConfig.java with 79% similarity]
src/java/client/netxms-client/src/main/java/org/netxms/client/datacollection/GraphSettings.java
src/java/client/netxms-client/src/main/java/org/netxms/client/datacollection/GraphSettingsChangeListener.java
src/java/client/netxms-client/src/main/java/org/netxms/client/objects/MenuFiltringObj.java [new file with mode: 0644]
src/java/client/netxms-client/src/main/java/org/netxms/client/objecttools/ObjectTool.java
src/java/client/netxms-client/src/main/java/org/netxms/client/objecttools/ObjectToolDetails.java
src/java/client/netxms-client/src/main/java/org/netxms/client/objecttools/ObjectToolFilter.java [deleted file]
src/java/client/netxms-client/src/main/java/org/netxms/client/xml/XmlDateConverter.java [moved from webui/webapp/PerfView/src/org/netxms/ui/eclipse/perfview/XmlDateConverter.java with 97% similarity]
src/java/netxms-eclipse/Charts/src/org/netxms/ui/eclipse/charts/api/ChartDciConfig.java [deleted file]
src/java/netxms-eclipse/Core/src/org/netxms/ui/eclipse/console/Messages.java
src/java/netxms-eclipse/Core/src/org/netxms/ui/eclipse/console/messages.properties
src/java/netxms-eclipse/Core/src/org/netxms/ui/eclipse/console/messages_ar.properties
src/java/netxms-eclipse/Core/src/org/netxms/ui/eclipse/console/messages_cs.properties
src/java/netxms-eclipse/Core/src/org/netxms/ui/eclipse/console/messages_de.properties
src/java/netxms-eclipse/Core/src/org/netxms/ui/eclipse/console/messages_es.properties
src/java/netxms-eclipse/Core/src/org/netxms/ui/eclipse/console/messages_fr.properties
src/java/netxms-eclipse/Core/src/org/netxms/ui/eclipse/console/messages_pt.properties
src/java/netxms-eclipse/Core/src/org/netxms/ui/eclipse/console/messages_ru.properties
src/java/netxms-eclipse/Core/src/org/netxms/ui/eclipse/console/messages_zh_CN.properties
src/java/netxms-eclipse/Core/src/org/netxms/ui/eclipse/objects/ObjectContext.java [new file with mode: 0644]
src/java/netxms-eclipse/Dashboard/src/org/netxms/ui/eclipse/dashboard/propertypages/DataSources.java
src/java/netxms-eclipse/Dashboard/src/org/netxms/ui/eclipse/dashboard/propertypages/helpers/DciListLabelProvider.java
src/java/netxms-eclipse/Dashboard/src/org/netxms/ui/eclipse/dashboard/widgets/BarChartElement.java
src/java/netxms-eclipse/Dashboard/src/org/netxms/ui/eclipse/dashboard/widgets/ComparisonChartElement.java
src/java/netxms-eclipse/Dashboard/src/org/netxms/ui/eclipse/dashboard/widgets/GaugeElement.java
src/java/netxms-eclipse/Dashboard/src/org/netxms/ui/eclipse/dashboard/widgets/LineChartElement.java
src/java/netxms-eclipse/Dashboard/src/org/netxms/ui/eclipse/dashboard/widgets/ObjectStatusChartElement.java
src/java/netxms-eclipse/Dashboard/src/org/netxms/ui/eclipse/dashboard/widgets/PieChartElement.java
src/java/netxms-eclipse/Dashboard/src/org/netxms/ui/eclipse/dashboard/widgets/TubeChartElement.java
src/java/netxms-eclipse/Dashboard/src/org/netxms/ui/eclipse/dashboard/widgets/internal/AbstractChartConfig.java
src/java/netxms-eclipse/Dashboard/src/org/netxms/ui/eclipse/dashboard/widgets/internal/NetworkMapConfig.java
src/java/netxms-eclipse/DataCollection/src/org/netxms/ui/eclipse/datacollection/dialogs/DataSourceEditDlg.java
src/java/netxms-eclipse/ObjectTools/plugin.xml
src/java/netxms-eclipse/ObjectTools/src/org/netxms/ui/eclipse/objecttools/Messages.java
src/java/netxms-eclipse/ObjectTools/src/org/netxms/ui/eclipse/objecttools/ObjectToolsDynamicMenu.java
src/java/netxms-eclipse/ObjectTools/src/org/netxms/ui/eclipse/objecttools/api/NodeInfo.java [deleted file]
src/java/netxms-eclipse/ObjectTools/src/org/netxms/ui/eclipse/objecttools/api/ObjectToolExecutor.java
src/java/netxms-eclipse/ObjectTools/src/org/netxms/ui/eclipse/objecttools/messages.properties
src/java/netxms-eclipse/ObjectTools/src/org/netxms/ui/eclipse/objecttools/messages_ar.properties
src/java/netxms-eclipse/ObjectTools/src/org/netxms/ui/eclipse/objecttools/messages_cs.properties
src/java/netxms-eclipse/ObjectTools/src/org/netxms/ui/eclipse/objecttools/messages_de.properties
src/java/netxms-eclipse/ObjectTools/src/org/netxms/ui/eclipse/objecttools/messages_es.properties
src/java/netxms-eclipse/ObjectTools/src/org/netxms/ui/eclipse/objecttools/messages_fr.properties
src/java/netxms-eclipse/ObjectTools/src/org/netxms/ui/eclipse/objecttools/messages_pt.properties
src/java/netxms-eclipse/ObjectTools/src/org/netxms/ui/eclipse/objecttools/messages_ru.properties
src/java/netxms-eclipse/ObjectTools/src/org/netxms/ui/eclipse/objecttools/messages_zh_CN.properties
src/java/netxms-eclipse/ObjectTools/src/org/netxms/ui/eclipse/objecttools/propertypages/Filter.java
src/java/netxms-eclipse/ObjectView/src/org/netxms/ui/eclipse/objectview/objecttabs/elements/Commands.java
src/java/netxms-eclipse/PerfView/META-INF/MANIFEST.MF
src/java/netxms-eclipse/PerfView/plugin.xml
src/java/netxms-eclipse/PerfView/src/org/netxms/ui/eclipse/perfview/ChartConfig.java [deleted file]
src/java/netxms-eclipse/PerfView/src/org/netxms/ui/eclipse/perfview/GraphTemplatePropertyTester.java [new file with mode: 0644]
src/java/netxms-eclipse/PerfView/src/org/netxms/ui/eclipse/perfview/LoginListener.java [copied from src/java/client/netxms-client/src/main/java/org/netxms/client/datacollection/GraphSettingsChangeListener.java with 57% similarity]
src/java/netxms-eclipse/PerfView/src/org/netxms/ui/eclipse/perfview/PredefinedChartConfig.java [deleted file]
src/java/netxms-eclipse/PerfView/src/org/netxms/ui/eclipse/perfview/TemplateGraphDynamicMenu.java [new file with mode: 0644]
src/java/netxms-eclipse/PerfView/src/org/netxms/ui/eclipse/perfview/XmlDateConverter.java [deleted file]
src/java/netxms-eclipse/PerfView/src/org/netxms/ui/eclipse/perfview/actions/OpenGraphTemplateView.java [new file with mode: 0644]
src/java/netxms-eclipse/PerfView/src/org/netxms/ui/eclipse/perfview/api/GraphTemplateCache.java [new file with mode: 0644]
src/java/netxms-eclipse/PerfView/src/org/netxms/ui/eclipse/perfview/dialogs/SaveGraphDlg.java
src/java/netxms-eclipse/PerfView/src/org/netxms/ui/eclipse/perfview/propertypages/DataSources.java
src/java/netxms-eclipse/PerfView/src/org/netxms/ui/eclipse/perfview/propertypages/General.java
src/java/netxms-eclipse/PerfView/src/org/netxms/ui/eclipse/perfview/propertypages/PredefinedGraph.java
src/java/netxms-eclipse/PerfView/src/org/netxms/ui/eclipse/perfview/propertypages/TemplateDataSources.java [copied from src/java/netxms-eclipse/PerfView/src/org/netxms/ui/eclipse/perfview/propertypages/DataSources.java with 86% similarity]
src/java/netxms-eclipse/PerfView/src/org/netxms/ui/eclipse/perfview/propertypages/helpers/DciListLabelProvider.java
src/java/netxms-eclipse/PerfView/src/org/netxms/ui/eclipse/perfview/propertypages/helpers/DciTemplateListLabelProvider.java [new file with mode: 0644]
src/java/netxms-eclipse/PerfView/src/org/netxms/ui/eclipse/perfview/views/HistoricalGraphView.java
src/java/netxms-eclipse/PerfView/src/org/netxms/ui/eclipse/perfview/views/PredefinedGraphTree.java
src/java/netxms-eclipse/PerfView/src/org/netxms/ui/eclipse/perfview/views/TemplateGraphView.java [new file with mode: 0644]
src/java/netxms-eclipse/PerfView/src/org/netxms/ui/eclipse/perfview/views/helpers/TemplateGraphLabelProvider.java [new file with mode: 0644]
src/java/netxms-eclipse/PolicyManager/src/org/netxms/ui/eclipse/policymanager/actions/UninstallPolicy.java
src/server/core/graph.cpp
src/server/tools/nxdbmgr/upgrade.cpp
webui/webapp/Core/src/org/netxms/ui/eclipse/console/Messages.java
webui/webapp/Core/src/org/netxms/ui/eclipse/console/messages.properties
webui/webapp/Core/src/org/netxms/ui/eclipse/console/messages_ar.properties
webui/webapp/Core/src/org/netxms/ui/eclipse/console/messages_cs.properties
webui/webapp/Core/src/org/netxms/ui/eclipse/console/messages_de.properties
webui/webapp/Core/src/org/netxms/ui/eclipse/console/messages_es.properties
webui/webapp/Core/src/org/netxms/ui/eclipse/console/messages_fr.properties
webui/webapp/Core/src/org/netxms/ui/eclipse/console/messages_pt.properties
webui/webapp/Core/src/org/netxms/ui/eclipse/console/messages_ru.properties
webui/webapp/Core/src/org/netxms/ui/eclipse/console/messages_zh_CN.properties
webui/webapp/Core/src/org/netxms/ui/eclipse/objects/ObjectContext.java [new file with mode: 0644]
webui/webapp/Dashboard/src/org/netxms/ui/eclipse/dashboard/propertypages/DataSources.java
webui/webapp/Dashboard/src/org/netxms/ui/eclipse/dashboard/propertypages/helpers/DciListLabelProvider.java
webui/webapp/Dashboard/src/org/netxms/ui/eclipse/dashboard/widgets/BarChartElement.java
webui/webapp/Dashboard/src/org/netxms/ui/eclipse/dashboard/widgets/ComparisonChartElement.java
webui/webapp/Dashboard/src/org/netxms/ui/eclipse/dashboard/widgets/GaugeElement.java
webui/webapp/Dashboard/src/org/netxms/ui/eclipse/dashboard/widgets/LineChartElement.java
webui/webapp/Dashboard/src/org/netxms/ui/eclipse/dashboard/widgets/ObjectStatusChartElement.java
webui/webapp/Dashboard/src/org/netxms/ui/eclipse/dashboard/widgets/PieChartElement.java
webui/webapp/Dashboard/src/org/netxms/ui/eclipse/dashboard/widgets/TubeChartElement.java
webui/webapp/Dashboard/src/org/netxms/ui/eclipse/dashboard/widgets/internal/AbstractChartConfig.java
webui/webapp/Dashboard/src/org/netxms/ui/eclipse/dashboard/widgets/internal/TableValueConfig.java
webui/webapp/DataCollection/src/org/netxms/ui/eclipse/datacollection/dialogs/DataSourceEditDlg.java
webui/webapp/ObjectTools/plugin.xml
webui/webapp/ObjectTools/src/org/netxms/ui/eclipse/objecttools/Messages.java
webui/webapp/ObjectTools/src/org/netxms/ui/eclipse/objecttools/ObjectToolsDynamicMenu.java
webui/webapp/ObjectTools/src/org/netxms/ui/eclipse/objecttools/api/NodeInfo.java [deleted file]
webui/webapp/ObjectTools/src/org/netxms/ui/eclipse/objecttools/api/ObjectToolExecutor.java
webui/webapp/ObjectTools/src/org/netxms/ui/eclipse/objecttools/messages.properties
webui/webapp/ObjectTools/src/org/netxms/ui/eclipse/objecttools/messages_ar.properties
webui/webapp/ObjectTools/src/org/netxms/ui/eclipse/objecttools/messages_cs.properties
webui/webapp/ObjectTools/src/org/netxms/ui/eclipse/objecttools/messages_de.properties
webui/webapp/ObjectTools/src/org/netxms/ui/eclipse/objecttools/messages_es.properties
webui/webapp/ObjectTools/src/org/netxms/ui/eclipse/objecttools/messages_fr.properties
webui/webapp/ObjectTools/src/org/netxms/ui/eclipse/objecttools/messages_pt.properties
webui/webapp/ObjectTools/src/org/netxms/ui/eclipse/objecttools/messages_ru.properties
webui/webapp/ObjectTools/src/org/netxms/ui/eclipse/objecttools/messages_zh_CN.properties
webui/webapp/ObjectTools/src/org/netxms/ui/eclipse/objecttools/propertypages/Filter.java
webui/webapp/ObjectView/src/org/netxms/ui/eclipse/objectview/objecttabs/elements/Commands.java
webui/webapp/PerfView/META-INF/MANIFEST.MF
webui/webapp/PerfView/plugin.xml
webui/webapp/PerfView/src/org/netxms/ui/eclipse/perfview/GraphTemplatePropertyTester.java [new file with mode: 0644]
webui/webapp/PerfView/src/org/netxms/ui/eclipse/perfview/LoginListener.java [copied from src/java/client/netxms-client/src/main/java/org/netxms/client/datacollection/GraphSettingsChangeListener.java with 57% similarity]
webui/webapp/PerfView/src/org/netxms/ui/eclipse/perfview/PredefinedChartConfig.java [deleted file]
webui/webapp/PerfView/src/org/netxms/ui/eclipse/perfview/TemplateGraphDynamicMenu.java [new file with mode: 0644]
webui/webapp/PerfView/src/org/netxms/ui/eclipse/perfview/actions/OpenGraphTemplateView.java [new file with mode: 0644]
webui/webapp/PerfView/src/org/netxms/ui/eclipse/perfview/api/GraphTemplateCache.java [new file with mode: 0644]
webui/webapp/PerfView/src/org/netxms/ui/eclipse/perfview/dialogs/SaveGraphDlg.java
webui/webapp/PerfView/src/org/netxms/ui/eclipse/perfview/propertypages/DataSources.java
webui/webapp/PerfView/src/org/netxms/ui/eclipse/perfview/propertypages/General.java
webui/webapp/PerfView/src/org/netxms/ui/eclipse/perfview/propertypages/PredefinedGraph.java
webui/webapp/PerfView/src/org/netxms/ui/eclipse/perfview/propertypages/TemplateDataSources.java [copied from src/java/netxms-eclipse/PerfView/src/org/netxms/ui/eclipse/perfview/propertypages/DataSources.java with 85% similarity]
webui/webapp/PerfView/src/org/netxms/ui/eclipse/perfview/propertypages/helpers/DciListLabelProvider.java
webui/webapp/PerfView/src/org/netxms/ui/eclipse/perfview/propertypages/helpers/DciTemplateListLabelProvider.java [new file with mode: 0644]
webui/webapp/PerfView/src/org/netxms/ui/eclipse/perfview/views/HistoricalGraphView.java
webui/webapp/PerfView/src/org/netxms/ui/eclipse/perfview/views/PredefinedGraphTree.java
webui/webapp/PerfView/src/org/netxms/ui/eclipse/perfview/views/TemplateGraphView.java [new file with mode: 0644]
webui/webapp/PerfView/src/org/netxms/ui/eclipse/perfview/views/helpers/TemplateGraphLabelProvider.java [new file with mode: 0644]
webui/webapp/PolicyManager/src/org/netxms/ui/eclipse/policymanager/actions/UninstallPolicy.java