library plugin made usable by other netxms-based products (like rules engine); code...
authorVictor Kirhenshtein <victor@netxms.org>
Sun, 17 Oct 2010 12:20:23 +0000 (12:20 +0000)
committerVictor Kirhenshtein <victor@netxms.org>
Sun, 17 Oct 2010 12:20:23 +0000 (12:20 +0000)
158 files changed:
.gitattributes
src/java/netxms-eclipse/ActionManager/META-INF/MANIFEST.MF
src/java/netxms-eclipse/ActionManager/src/org/netxms/ui/eclipse/actionmanager/views/ActionManager.java
src/java/netxms-eclipse/AlarmViewer/src/org/netxms/ui/eclipse/alarmviewer/AlarmComparator.java
src/java/netxms-eclipse/AlarmViewer/src/org/netxms/ui/eclipse/alarmviewer/AlarmListFilter.java
src/java/netxms-eclipse/AlarmViewer/src/org/netxms/ui/eclipse/alarmviewer/AlarmListLabelProvider.java
src/java/netxms-eclipse/AlarmViewer/src/org/netxms/ui/eclipse/alarmviewer/AlarmNotifier.java
src/java/netxms-eclipse/AlarmViewer/src/org/netxms/ui/eclipse/alarmviewer/Startup.java
src/java/netxms-eclipse/AlarmViewer/src/org/netxms/ui/eclipse/alarmviewer/actions/AcknowledgeAlarm.java
src/java/netxms-eclipse/AlarmViewer/src/org/netxms/ui/eclipse/alarmviewer/actions/TerminateAlarm.java
src/java/netxms-eclipse/AlarmViewer/src/org/netxms/ui/eclipse/alarmviewer/widgets/AlarmList.java
src/java/netxms-eclipse/Charts/META-INF/MANIFEST.MF
src/java/netxms-eclipse/Charts/src/org/netxms/ui/eclipse/charts/actions/ShowLastValuesGraph.java
src/java/netxms-eclipse/Charts/src/org/netxms/ui/eclipse/charts/objecttabs/PerformanceTab.java
src/java/netxms-eclipse/Charts/src/org/netxms/ui/eclipse/charts/views/HistoryGraph.java
src/java/netxms-eclipse/Charts/src/org/netxms/ui/eclipse/charts/views/LastValuesChart.java
src/java/netxms-eclipse/Charts/src/org/netxms/ui/eclipse/charts/views/PredefinedGraphTree.java
src/java/netxms-eclipse/DataCollection/META-INF/MANIFEST.MF
src/java/netxms-eclipse/DataCollection/src/org/netxms/ui/eclipse/datacollection/DciComparator.java
src/java/netxms-eclipse/DataCollection/src/org/netxms/ui/eclipse/datacollection/DciLabelProvider.java
src/java/netxms-eclipse/DataCollection/src/org/netxms/ui/eclipse/datacollection/ThresholdLabelProvider.java
src/java/netxms-eclipse/DataCollection/src/org/netxms/ui/eclipse/datacollection/dialogs/AbstractSelectParamDlg.java
src/java/netxms-eclipse/DataCollection/src/org/netxms/ui/eclipse/datacollection/dialogs/SelectAgentParamDlg.java
src/java/netxms-eclipse/DataCollection/src/org/netxms/ui/eclipse/datacollection/dialogs/helpers/AgentParameterComparator.java
src/java/netxms-eclipse/DataCollection/src/org/netxms/ui/eclipse/datacollection/dialogs/helpers/AgentParameterLabelProvider.java
src/java/netxms-eclipse/DataCollection/src/org/netxms/ui/eclipse/datacollection/propertypages/CustomSchedule.java
src/java/netxms-eclipse/DataCollection/src/org/netxms/ui/eclipse/datacollection/views/DataCollectionEditor.java
src/java/netxms-eclipse/DataCollection/src/org/netxms/ui/eclipse/datacollection/views/LastValues.java
src/java/netxms-eclipse/DataCollection/src/org/netxms/ui/eclipse/datacollection/widgets/LastValuesView.java
src/java/netxms-eclipse/DataCollection/src/org/netxms/ui/eclipse/datacollection/widgets/internal/LastValuesComparator.java
src/java/netxms-eclipse/EPP/META-INF/MANIFEST.MF
src/java/netxms-eclipse/EPP/src/org/netxms/ui/eclipse/epp/views/EventProcessingPolicyEditor.java
src/java/netxms-eclipse/EPP/src/org/netxms/ui/eclipse/epp/widgets/EventsCell.java
src/java/netxms-eclipse/EPP/src/org/netxms/ui/eclipse/epp/widgets/ObjectsCell.java
src/java/netxms-eclipse/EPP/src/org/netxms/ui/eclipse/epp/widgets/SeverityCell.java
src/java/netxms-eclipse/EventManager/META-INF/MANIFEST.MF
src/java/netxms-eclipse/EventManager/src/org/netxms/ui/eclipse/eventmanager/EventTemplateAdapterFactory.java
src/java/netxms-eclipse/EventManager/src/org/netxms/ui/eclipse/eventmanager/EventTemplateComparator.java
src/java/netxms-eclipse/EventManager/src/org/netxms/ui/eclipse/eventmanager/EventTemplateLabelProvider.java
src/java/netxms-eclipse/EventManager/src/org/netxms/ui/eclipse/eventmanager/dialogs/EditEventTemplateDialog.java
src/java/netxms-eclipse/EventManager/src/org/netxms/ui/eclipse/eventmanager/dialogs/EventSelectionDialog.java
src/java/netxms-eclipse/EventManager/src/org/netxms/ui/eclipse/eventmanager/views/EventConfigurator.java
src/java/netxms-eclipse/EventManager/src/org/netxms/ui/eclipse/eventmanager/widgets/EventSelector.java
src/java/netxms-eclipse/GoogleMaps/META-INF/MANIFEST.MF
src/java/netxms-eclipse/LogViewer/META-INF/MANIFEST.MF
src/java/netxms-eclipse/LogViewer/src/org/netxms/ui/eclipse/logviewer/views/LogViewer.java
src/java/netxms-eclipse/LogViewer/src/org/netxms/ui/eclipse/logviewer/views/helpers/LogLabelProvider.java
src/java/netxms-eclipse/NXSL/META-INF/MANIFEST.MF
src/java/netxms-eclipse/NXSL/src/org/netxms/ui/eclipse/nxsl/views/ScriptEditorView.java
src/java/netxms-eclipse/NXSL/src/org/netxms/ui/eclipse/nxsl/views/ScriptLibrary.java
src/java/netxms-eclipse/NXSL/src/org/netxms/ui/eclipse/nxsl/views/helpers/ScriptComparator.java
src/java/netxms-eclipse/NetworkMaps/META-INF/MANIFEST.MF
src/java/netxms-eclipse/NetworkMaps/src/org/netxms/ui/eclipse/networkmaps/views/NetworkMap.java
src/java/netxms-eclipse/NetworkMaps/src/org/netxms/ui/eclipse/networkmaps/views/helpers/MapContentProvider.java
src/java/netxms-eclipse/NetworkMaps/src/org/netxms/ui/eclipse/networkmaps/views/helpers/MapLabelProvider.java
src/java/netxms-eclipse/NetworkMaps/src/org/netxms/ui/eclipse/networkmaps/views/helpers/ObjectFigure.java
src/java/netxms-eclipse/NetworkMaps/src/org/netxms/ui/eclipse/networkmaps/views/helpers/ObjectTooltip.java
src/java/netxms-eclipse/ObjectBrowser/META-INF/MANIFEST.MF
src/java/netxms-eclipse/ObjectBrowser/src/org/netxms/ui/eclipse/objectbrowser/ObjectAdapterFactory.java
src/java/netxms-eclipse/ObjectBrowser/src/org/netxms/ui/eclipse/objectbrowser/dialogs/ChildObjectListDialog.java
src/java/netxms-eclipse/ObjectBrowser/src/org/netxms/ui/eclipse/objectbrowser/dialogs/ObjectSelectionDialog.java
src/java/netxms-eclipse/ObjectBrowser/src/org/netxms/ui/eclipse/objectbrowser/views/ObjectBrowser.java
src/java/netxms-eclipse/ObjectBrowser/src/org/netxms/ui/eclipse/objectbrowser/widgets/ObjectList.java
src/java/netxms-eclipse/ObjectBrowser/src/org/netxms/ui/eclipse/objectbrowser/widgets/ObjectSelector.java
src/java/netxms-eclipse/ObjectBrowser/src/org/netxms/ui/eclipse/objectbrowser/widgets/ObjectTree.java
src/java/netxms-eclipse/ObjectBrowser/src/org/netxms/ui/eclipse/objectbrowser/widgets/internal/ObjectListFilter.java
src/java/netxms-eclipse/ObjectBrowser/src/org/netxms/ui/eclipse/objectbrowser/widgets/internal/ObjectTreeFilter.java
src/java/netxms-eclipse/ObjectManager/META-INF/MANIFEST.MF
src/java/netxms-eclipse/ObjectManager/src/org/netxms/ui/eclipse/objectmanager/AccessListComparator.java
src/java/netxms-eclipse/ObjectManager/src/org/netxms/ui/eclipse/objectmanager/actions/BindObject.java
src/java/netxms-eclipse/ObjectManager/src/org/netxms/ui/eclipse/objectmanager/actions/ChangeIpAddress.java
src/java/netxms-eclipse/ObjectManager/src/org/netxms/ui/eclipse/objectmanager/actions/MultipleObjectAction.java
src/java/netxms-eclipse/ObjectManager/src/org/netxms/ui/eclipse/objectmanager/actions/UnbindObject.java
src/java/netxms-eclipse/ObjectManager/src/org/netxms/ui/eclipse/objectmanager/dialogs/AttributeEditDialog.java
src/java/netxms-eclipse/ObjectManager/src/org/netxms/ui/eclipse/objectmanager/dialogs/EnterIpAddressDialog.java
src/java/netxms-eclipse/ObjectManager/src/org/netxms/ui/eclipse/objectmanager/propertypages/AccessControl.java
src/java/netxms-eclipse/ObjectManager/src/org/netxms/ui/eclipse/objectmanager/propertypages/AutoApply.java
src/java/netxms-eclipse/ObjectManager/src/org/netxms/ui/eclipse/objectmanager/propertypages/AutoBind.java
src/java/netxms-eclipse/ObjectManager/src/org/netxms/ui/eclipse/objectmanager/propertypages/Comments.java
src/java/netxms-eclipse/ObjectManager/src/org/netxms/ui/eclipse/objectmanager/propertypages/Communication.java
src/java/netxms-eclipse/ObjectManager/src/org/netxms/ui/eclipse/objectmanager/propertypages/CustomAttributes.java
src/java/netxms-eclipse/ObjectManager/src/org/netxms/ui/eclipse/objectmanager/propertypages/General.java
src/java/netxms-eclipse/ObjectManager/src/org/netxms/ui/eclipse/objectmanager/propertypages/TrustedNodes.java
src/java/netxms-eclipse/ObjectTools/META-INF/MANIFEST.MF
src/java/netxms-eclipse/ObjectTools/src/org/netxms/ui/eclipse/objecttools/ObjectToolsCache.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/Startup.java
src/java/netxms-eclipse/ObjectView/META-INF/MANIFEST.MF
src/java/netxms-eclipse/PolicyManager/META-INF/MANIFEST.MF
src/java/netxms-eclipse/PolicyManager/src/org/netxms/ui/eclipse/policymanager/actions/CreateAgentPolicyConfig.java
src/java/netxms-eclipse/PolicyManager/src/org/netxms/ui/eclipse/policymanager/actions/CreatePolicyGroup.java
src/java/netxms-eclipse/PolicyManager/src/org/netxms/ui/eclipse/policymanager/actions/DeployPolicy.java
src/java/netxms-eclipse/PolicyManager/src/org/netxms/ui/eclipse/policymanager/actions/UninstallPolicy.java
src/java/netxms-eclipse/PolicyManager/src/org/netxms/ui/eclipse/policymanager/propertypages/ConfigFile.java
src/java/netxms-eclipse/PolicyManager/src/org/netxms/ui/eclipse/policymanager/propertypages/Policy.java
src/java/netxms-eclipse/SNMP/META-INF/MANIFEST.MF
src/java/netxms-eclipse/SNMP/src/org/netxms/ui/eclipse/snmp/Startup.java
src/java/netxms-eclipse/SNMP/src/org/netxms/ui/eclipse/snmp/views/SnmpTrapEditor.java
src/java/netxms-eclipse/SNMP/src/org/netxms/ui/eclipse/snmp/views/helpers/SnmpTrapComparator.java
src/java/netxms-eclipse/SNMP/src/org/netxms/ui/eclipse/snmp/views/helpers/SnmpTrapLabelProvider.java
src/java/netxms-eclipse/ServerConfig/META-INF/MANIFEST.MF
src/java/netxms-eclipse/ServerConfig/src/org/netxms/ui/eclipse/serverconfig/actions/DeleteVariable.java
src/java/netxms-eclipse/ServerConfig/src/org/netxms/ui/eclipse/serverconfig/actions/EditVariable.java
src/java/netxms-eclipse/ServerConfig/src/org/netxms/ui/eclipse/serverconfig/actions/ImportConfiguration.java
src/java/netxms-eclipse/ServerConfig/src/org/netxms/ui/eclipse/serverconfig/views/ServerConfigurationEditor.java
src/java/netxms-eclipse/ServerJobManager/META-INF/MANIFEST.MF
src/java/netxms-eclipse/ServerJobManager/src/org/netxms/ui/eclipse/serverjobmanager/views/ServerJobManager.java
src/java/netxms-eclipse/ServiceView/META-INF/MANIFEST.MF
src/java/netxms-eclipse/ServiceView/src/org/netxms/ui/eclipse/serviceview/views/ServiceTreeView.java
src/java/netxms-eclipse/ServiceView/src/org/netxms/ui/eclipse/serviceview/widgets/ServiceTree.java
src/java/netxms-eclipse/UserManager/META-INF/MANIFEST.MF
src/java/netxms-eclipse/UserManager/plugin.xml
src/java/netxms-eclipse/UserManager/src/org/netxms/ui/eclipse/usermanager/UserAdapterFactory.java
src/java/netxms-eclipse/UserManager/src/org/netxms/ui/eclipse/usermanager/UserComparator.java
src/java/netxms-eclipse/UserManager/src/org/netxms/ui/eclipse/usermanager/UserLabelProvider.java
src/java/netxms-eclipse/UserManager/src/org/netxms/ui/eclipse/usermanager/actions/ChangePassword.java
src/java/netxms-eclipse/UserManager/src/org/netxms/ui/eclipse/usermanager/actions/OpenUserManager.java
src/java/netxms-eclipse/UserManager/src/org/netxms/ui/eclipse/usermanager/dialogs/ChangePasswordDialog.java
src/java/netxms-eclipse/UserManager/src/org/netxms/ui/eclipse/usermanager/dialogs/CreateObjectDialog.java
src/java/netxms-eclipse/UserManager/src/org/netxms/ui/eclipse/usermanager/dialogs/SelectUserDialog.java
src/java/netxms-eclipse/UserManager/src/org/netxms/ui/eclipse/usermanager/propertypages/Authentication.java
src/java/netxms-eclipse/UserManager/src/org/netxms/ui/eclipse/usermanager/propertypages/General.java
src/java/netxms-eclipse/UserManager/src/org/netxms/ui/eclipse/usermanager/propertypages/Members.java
src/java/netxms-eclipse/UserManager/src/org/netxms/ui/eclipse/usermanager/views/UserManagementView.java [moved from src/java/netxms-eclipse/UserManager/src/org/netxms/ui/eclipse/usermanager/views/UserManager.java with 85% similarity]
src/java/netxms-eclipse/core/.classpath
src/java/netxms-eclipse/core/META-INF/MANIFEST.MF
src/java/netxms-eclipse/core/build.properties
src/java/netxms-eclipse/core/icons/status/critical.png [moved from src/java/netxms-eclipse/library/icons/status/critical.png with 100% similarity]
src/java/netxms-eclipse/core/icons/status/disabled.png [moved from src/java/netxms-eclipse/library/icons/status/disabled.png with 100% similarity]
src/java/netxms-eclipse/core/icons/status/major.png [moved from src/java/netxms-eclipse/library/icons/status/major.png with 100% similarity]
src/java/netxms-eclipse/core/icons/status/minor.png [moved from src/java/netxms-eclipse/library/icons/status/minor.png with 100% similarity]
src/java/netxms-eclipse/core/icons/status/normal.png [moved from src/java/netxms-eclipse/library/icons/status/normal.png with 100% similarity]
src/java/netxms-eclipse/core/icons/status/testing.png [moved from src/java/netxms-eclipse/library/icons/status/testing.png with 100% similarity]
src/java/netxms-eclipse/core/icons/status/unknown.png [moved from src/java/netxms-eclipse/library/icons/status/unknown.png with 100% similarity]
src/java/netxms-eclipse/core/icons/status/unmanaged.png [moved from src/java/netxms-eclipse/library/icons/status/unmanaged.png with 100% similarity]
src/java/netxms-eclipse/core/icons/status/warning.png [moved from src/java/netxms-eclipse/library/icons/status/warning.png with 100% similarity]
src/java/netxms-eclipse/core/src/org/netxms/ui/eclipse/console/Activator.java
src/java/netxms-eclipse/core/src/org/netxms/ui/eclipse/console/LoginJob.java
src/java/netxms-eclipse/core/src/org/netxms/ui/eclipse/console/NXMCWorkbenchWindowAdvisor.java
src/java/netxms-eclipse/core/src/org/netxms/ui/eclipse/console/dialogs/LoginDialog.java
src/java/netxms-eclipse/core/src/org/netxms/ui/eclipse/console/dialogs/PasswordExpiredDialog.java
src/java/netxms-eclipse/core/src/org/netxms/ui/eclipse/console/resources/DataCollectionDisplayInfo.java [moved from src/java/netxms-eclipse/library/src/org/netxms/ui/eclipse/shared/DataCollectionDisplayInfo.java with 94% similarity]
src/java/netxms-eclipse/core/src/org/netxms/ui/eclipse/console/resources/StatusDisplayInfo.java [moved from src/java/netxms-eclipse/library/src/org/netxms/ui/eclipse/shared/StatusDisplayInfo.java with 95% similarity]
src/java/netxms-eclipse/library/.classpath
src/java/netxms-eclipse/library/META-INF/MANIFEST.MF
src/java/netxms-eclipse/library/build.properties
src/java/netxms-eclipse/library/src/org/netxms/ui/eclipse/actions/RefreshAction.java [moved from src/java/netxms-eclipse/library/src/org/netxms/ui/eclipse/tools/RefreshAction.java with 93% similarity]
src/java/netxms-eclipse/library/src/org/netxms/ui/eclipse/jobs/ConsoleJob.java
src/java/netxms-eclipse/library/src/org/netxms/ui/eclipse/library/Activator.java
src/java/netxms-eclipse/library/src/org/netxms/ui/eclipse/shared/ConsoleSharedData.java [new file with mode: 0644]
src/java/netxms-eclipse/library/src/org/netxms/ui/eclipse/shared/IActionConstants.java
src/java/netxms-eclipse/library/src/org/netxms/ui/eclipse/shared/IUIConstants.java [deleted file]
src/java/netxms-eclipse/library/src/org/netxms/ui/eclipse/shared/NXMCSharedData.java [deleted file]
src/java/netxms-eclipse/library/src/org/netxms/ui/eclipse/tools/WidgetHelper.java
src/java/netxms-eclipse/library/src/org/netxms/ui/eclipse/widgets/SortableTableViewer.java [moved from src/java/netxms-eclipse/library/src/org/netxms/ui/eclipse/tools/SortableTableViewer.java with 93% similarity]
src/java/netxms-eclipse/library/src/org/netxms/ui/eclipse/widgets/helpers/TableSortingListener.java [moved from src/java/netxms-eclipse/library/src/org/netxms/ui/eclipse/tools/TableSortingListener.java with 91% similarity]
src/java/package.cmd
src/java/package.sh

index 128f54a..5014180 100644 (file)
@@ -844,7 +844,7 @@ src/java/netxms-eclipse/UserManager/src/org/netxms/ui/eclipse/usermanager/dialog
 src/java/netxms-eclipse/UserManager/src/org/netxms/ui/eclipse/usermanager/propertypages/Authentication.java -text
 src/java/netxms-eclipse/UserManager/src/org/netxms/ui/eclipse/usermanager/propertypages/General.java -text
 src/java/netxms-eclipse/UserManager/src/org/netxms/ui/eclipse/usermanager/propertypages/Members.java -text
-src/java/netxms-eclipse/UserManager/src/org/netxms/ui/eclipse/usermanager/views/UserManager.java -text
+src/java/netxms-eclipse/UserManager/src/org/netxms/ui/eclipse/usermanager/views/UserManagementView.java -text
 src/java/netxms-eclipse/core/.settings/org.eclipse.jdt.core.prefs -text
 src/java/netxms-eclipse/core/META-INF/MANIFEST.MF -text
 src/java/netxms-eclipse/core/OSGI-INF/l10n/bundle.properties -text
@@ -858,6 +858,15 @@ src/java/netxms-eclipse/core/icons/information.png -text
 src/java/netxms-eclipse/core/icons/login.png -text
 src/java/netxms-eclipse/core/icons/password.png -text
 src/java/netxms-eclipse/core/icons/pview.gif -text
+src/java/netxms-eclipse/core/icons/status/critical.png -text
+src/java/netxms-eclipse/core/icons/status/disabled.png -text
+src/java/netxms-eclipse/core/icons/status/major.png -text
+src/java/netxms-eclipse/core/icons/status/minor.png -text
+src/java/netxms-eclipse/core/icons/status/normal.png -text
+src/java/netxms-eclipse/core/icons/status/testing.png -text
+src/java/netxms-eclipse/core/icons/status/unknown.png -text
+src/java/netxms-eclipse/core/icons/status/unmanaged.png -text
+src/java/netxms-eclipse/core/icons/status/warning.png -text
 src/java/netxms-eclipse/core/nxmc.product -text
 src/java/netxms-eclipse/core/plugin.xml -text
 src/java/netxms-eclipse/core/plugin_customization.ini -text
@@ -874,37 +883,27 @@ src/java/netxms-eclipse/core/src/org/netxms/ui/eclipse/console/dialogs/PasswordE
 src/java/netxms-eclipse/core/src/org/netxms/ui/eclipse/console/messages.properties -text
 src/java/netxms-eclipse/core/src/org/netxms/ui/eclipse/console/perspectives/DefaultPerspective.java -text
 src/java/netxms-eclipse/core/src/org/netxms/ui/eclipse/console/preferencepages/WorkbenchGeneralPrefs.java -text
+src/java/netxms-eclipse/core/src/org/netxms/ui/eclipse/console/resources/DataCollectionDisplayInfo.java -text
+src/java/netxms-eclipse/core/src/org/netxms/ui/eclipse/console/resources/StatusDisplayInfo.java -text
 src/java/netxms-eclipse/library/META-INF/MANIFEST.MF -text
 src/java/netxms-eclipse/library/build.properties -text
 src/java/netxms-eclipse/library/icons/checkbox_off.png -text
 src/java/netxms-eclipse/library/icons/checkbox_on.png -text
 src/java/netxms-eclipse/library/icons/refresh.png -text
-src/java/netxms-eclipse/library/icons/status/critical.png -text
-src/java/netxms-eclipse/library/icons/status/disabled.png -text
-src/java/netxms-eclipse/library/icons/status/major.png -text
-src/java/netxms-eclipse/library/icons/status/minor.png -text
-src/java/netxms-eclipse/library/icons/status/normal.png -text
-src/java/netxms-eclipse/library/icons/status/testing.png -text
-src/java/netxms-eclipse/library/icons/status/unknown.png -text
-src/java/netxms-eclipse/library/icons/status/unmanaged.png -text
-src/java/netxms-eclipse/library/icons/status/warning.png -text
 src/java/netxms-eclipse/library/jar/simple-xml-2.3.5.jar -text
+src/java/netxms-eclipse/library/src/org/netxms/ui/eclipse/actions/RefreshAction.java -text
 src/java/netxms-eclipse/library/src/org/netxms/ui/eclipse/jobs/ConsoleJob.java -text
 src/java/netxms-eclipse/library/src/org/netxms/ui/eclipse/library/Activator.java -text
-src/java/netxms-eclipse/library/src/org/netxms/ui/eclipse/shared/DataCollectionDisplayInfo.java -text
+src/java/netxms-eclipse/library/src/org/netxms/ui/eclipse/shared/ConsoleSharedData.java -text
 src/java/netxms-eclipse/library/src/org/netxms/ui/eclipse/shared/IActionConstants.java -text
-src/java/netxms-eclipse/library/src/org/netxms/ui/eclipse/shared/IUIConstants.java -text
-src/java/netxms-eclipse/library/src/org/netxms/ui/eclipse/shared/NXMCSharedData.java -text
 src/java/netxms-eclipse/library/src/org/netxms/ui/eclipse/shared/SharedIcons.java -text
-src/java/netxms-eclipse/library/src/org/netxms/ui/eclipse/shared/StatusDisplayInfo.java -text
-src/java/netxms-eclipse/library/src/org/netxms/ui/eclipse/tools/RefreshAction.java -text
-src/java/netxms-eclipse/library/src/org/netxms/ui/eclipse/tools/SortableTableViewer.java -text
 src/java/netxms-eclipse/library/src/org/netxms/ui/eclipse/tools/StringComparator.java -text
-src/java/netxms-eclipse/library/src/org/netxms/ui/eclipse/tools/TableSortingListener.java -text
 src/java/netxms-eclipse/library/src/org/netxms/ui/eclipse/tools/WidgetFactory.java -text
 src/java/netxms-eclipse/library/src/org/netxms/ui/eclipse/tools/WidgetHelper.java -text
 src/java/netxms-eclipse/library/src/org/netxms/ui/eclipse/widgets/AbstractSelector.java -text
 src/java/netxms-eclipse/library/src/org/netxms/ui/eclipse/widgets/LabeledText.java -text
+src/java/netxms-eclipse/library/src/org/netxms/ui/eclipse/widgets/SortableTableViewer.java -text
+src/java/netxms-eclipse/library/src/org/netxms/ui/eclipse/widgets/helpers/TableSortingListener.java -text
 src/java/package.sh -text
 src/java/pom.xml -text
 src/libexpat/Changes -text
index 59ee573..8def56f 100644 (file)
@@ -7,6 +7,7 @@ Bundle-Activator: org.netxms.ui.eclipse.actionmanager.Activator
 Bundle-Vendor: netxms.org
 Require-Bundle: org.eclipse.ui,
  org.eclipse.core.runtime,
- org.netxms.ui.eclipse.library;bundle-version="1.1.0"
+ org.netxms.ui.eclipse.library;bundle-version="1.1.0",
+ org.netxms.ui.eclipse.console;bundle-version="1.1.0"
 Bundle-RequiredExecutionEnvironment: JavaSE-1.6
 Bundle-ActivationPolicy: lazy
index 2b5961d..bbb8f06 100644 (file)
@@ -49,8 +49,8 @@ import org.eclipse.ui.IActionBars;
 import org.eclipse.ui.IWorkbenchActionConstants;\r
 import org.eclipse.ui.part.ViewPart;\r
 import org.eclipse.ui.progress.UIJob;\r
-import org.netxms.api.client.ISessionListener;\r
-import org.netxms.api.client.ISessionNotification;\r
+import org.netxms.api.client.SessionListener;\r
+import org.netxms.api.client.SessionNotification;\r
 import org.netxms.client.NXCNotification;\r
 import org.netxms.client.NXCSession;\r
 import org.netxms.client.ServerAction;\r
@@ -58,17 +58,17 @@ import org.netxms.ui.eclipse.actionmanager.Activator;
 import org.netxms.ui.eclipse.actionmanager.dialogs.EditActionDlg;\r
 import org.netxms.ui.eclipse.actionmanager.views.helpers.ActionComparator;\r
 import org.netxms.ui.eclipse.actionmanager.views.helpers.ActionLabelProvider;\r
+import org.netxms.ui.eclipse.actions.RefreshAction;\r
 import org.netxms.ui.eclipse.jobs.ConsoleJob;\r
-import org.netxms.ui.eclipse.shared.NXMCSharedData;\r
-import org.netxms.ui.eclipse.tools.RefreshAction;\r
-import org.netxms.ui.eclipse.tools.SortableTableViewer;\r
+import org.netxms.ui.eclipse.shared.ConsoleSharedData;\r
 import org.netxms.ui.eclipse.tools.WidgetHelper;\r
+import org.netxms.ui.eclipse.widgets.SortableTableViewer;\r
 \r
 /**\r
  * Action configuration view\r
  *\r
  */\r
-public class ActionManager extends ViewPart implements ISessionListener\r
+public class ActionManager extends ViewPart implements SessionListener\r
 {\r
        public static final String ID = "org.netxms.ui.eclipse.actionmanager.views.ActionManager";\r
        \r
@@ -94,7 +94,7 @@ public class ActionManager extends ViewPart implements ISessionListener
        @Override\r
        public void createPartControl(Composite parent)\r
        {\r
-               session = NXMCSharedData.getInstance().getSession();\r
+               session = (NXCSession)ConsoleSharedData.getSession();\r
                \r
                parent.setLayout(new FillLayout());\r
                \r
@@ -426,10 +426,10 @@ public class ActionManager extends ViewPart implements ISessionListener
        }\r
 \r
        /* (non-Javadoc)\r
-        * @see org.netxms.api.client.ISessionListener#notificationHandler(org.netxms.api.client.ISessionNotification)\r
+        * @see org.netxms.api.client.ISessionListener#notificationHandler(org.netxms.api.client.SessionNotification)\r
         */\r
        @Override\r
-       public void notificationHandler(ISessionNotification n)\r
+       public void notificationHandler(SessionNotification n)\r
        {\r
                switch(n.getCode())\r
                {\r
index 807821e..4b4ef0f 100644 (file)
@@ -8,10 +8,11 @@ import org.eclipse.jface.viewers.Viewer;
 import org.eclipse.jface.viewers.ViewerComparator;\r
 import org.eclipse.swt.SWT;\r
 import org.eclipse.swt.widgets.TableColumn;\r
+import org.netxms.client.NXCSession;\r
 import org.netxms.client.events.Alarm;\r
 import org.netxms.client.objects.GenericObject;\r
 import org.netxms.ui.eclipse.alarmviewer.widgets.AlarmList;\r
-import org.netxms.ui.eclipse.shared.NXMCSharedData;\r
+import org.netxms.ui.eclipse.shared.ConsoleSharedData;\r
 \r
 /**\r
  * @author victor\r
@@ -56,8 +57,8 @@ public class AlarmComparator extends ViewerComparator
                                rc = compareNumbers(((Alarm)e1).getState(), ((Alarm)e2).getState());\r
                                break;\r
                        case AlarmList.COLUMN_SOURCE:\r
-                               GenericObject obj1 = NXMCSharedData.getInstance().getSession().findObjectById(((Alarm)e1).getSourceObjectId());\r
-                               GenericObject obj2 = NXMCSharedData.getInstance().getSession().findObjectById(((Alarm)e2).getSourceObjectId());\r
+                               GenericObject obj1 = ((NXCSession)ConsoleSharedData.getSession()).findObjectById(((Alarm)e1).getSourceObjectId());\r
+                               GenericObject obj2 = ((NXCSession)ConsoleSharedData.getSession()).findObjectById(((Alarm)e2).getSourceObjectId());\r
                                String name1 = (obj1 != null) ? obj1.getObjectName() : "<unknown>";\r
                                String name2 = (obj2 != null) ? obj2.getObjectName() : "<unknown>";\r
                                rc = name1.compareToIgnoreCase(name2);\r
index 27bdde7..7708795 100644 (file)
@@ -1,16 +1,32 @@
 /**\r
- * \r
+ * NetXMS - open source network management system\r
+ * Copyright (C) 2003-2010 Victor Kirhenshtein\r
+ *\r
+ * This program is free software; you can redistribute it and/or modify\r
+ * it under the terms of the GNU General Public License as published by\r
+ * the Free Software Foundation; either version 2 of the License, or\r
+ * (at your option) any later version.\r
+ *\r
+ * This program is distributed in the hope that it will be useful,\r
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of\r
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the\r
+ * GNU General Public License for more details.\r
+ *\r
+ * You should have received a copy of the GNU General Public License\r
+ * along with this program; if not, write to the Free Software\r
+ * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.\r
  */\r
 package org.netxms.ui.eclipse.alarmviewer;\r
 \r
 import org.eclipse.jface.viewers.Viewer;\r
 import org.eclipse.jface.viewers.ViewerFilter;\r
+import org.netxms.client.NXCSession;\r
 import org.netxms.client.events.Alarm;\r
 import org.netxms.client.objects.GenericObject;\r
-import org.netxms.ui.eclipse.shared.NXMCSharedData;\r
+import org.netxms.ui.eclipse.shared.ConsoleSharedData;\r
 \r
 /**\r
- * @author victor\r
+ * Filter for alarm list\r
  *\r
  */\r
 public class AlarmListFilter extends ViewerFilter\r
@@ -24,7 +40,6 @@ public class AlarmListFilter extends ViewerFilter
        {\r
                rootObject = 0;\r
        }\r
-\r
        \r
        /* (non-Javadoc)\r
         * @see org.eclipse.jface.viewers.ViewerFilter#select(org.eclipse.jface.viewers.Viewer, java.lang.Object, java.lang.Object)\r
@@ -35,13 +50,12 @@ public class AlarmListFilter extends ViewerFilter
                if ((rootObject == 0) || (rootObject == ((Alarm)element).getSourceObjectId()))\r
                        return true;    // No filtering by object ID or root object is a source\r
                \r
-               GenericObject object = NXMCSharedData.getInstance().getSession().findObjectById(((Alarm)element).getSourceObjectId());\r
+               GenericObject object = ((NXCSession)ConsoleSharedData.getSession()).findObjectById(((Alarm)element).getSourceObjectId());\r
                if (object != null)\r
                        return object.isChildOf(rootObject);\r
                return false;\r
        }\r
 \r
-       \r
        /**\r
         * @param rootObject the rootObject to set\r
         */\r
index 0cee6a9..f849d1b 100644 (file)
@@ -23,12 +23,13 @@ import java.text.DateFormat;
 import org.eclipse.jface.viewers.ILabelProviderListener;\r
 import org.eclipse.jface.viewers.ITableLabelProvider;\r
 import org.eclipse.swt.graphics.Image;\r
+import org.netxms.client.NXCSession;\r
 import org.netxms.client.constants.Severity;\r
 import org.netxms.client.events.Alarm;\r
 import org.netxms.client.objects.GenericObject;\r
 import org.netxms.ui.eclipse.alarmviewer.widgets.AlarmList;\r
-import org.netxms.ui.eclipse.shared.NXMCSharedData;\r
-import org.netxms.ui.eclipse.shared.StatusDisplayInfo;\r
+import org.netxms.ui.eclipse.console.resources.StatusDisplayInfo;\r
+import org.netxms.ui.eclipse.shared.ConsoleSharedData;\r
 \r
 \r
 /**\r
@@ -91,7 +92,7 @@ public class AlarmListLabelProvider implements ITableLabelProvider
                        case AlarmList.COLUMN_STATE:\r
                                return stateText[((Alarm)element).getState()];\r
                        case AlarmList.COLUMN_SOURCE:\r
-                               GenericObject object = NXMCSharedData.getInstance().getSession().findObjectById(((Alarm)element).getSourceObjectId());\r
+                               GenericObject object = ((NXCSession)ConsoleSharedData.getSession()).findObjectById(((Alarm)element).getSourceObjectId());\r
                                return (object != null) ? object.getObjectName() : null;\r
                        case AlarmList.COLUMN_MESSAGE:\r
                                return ((Alarm)element).getMessage();\r
index 8c7fcd9..ae7bec7 100644 (file)
@@ -26,15 +26,16 @@ import org.eclipse.swt.widgets.ToolTip;
 import org.eclipse.swt.widgets.TrayItem;\r
 import org.eclipse.ui.PlatformUI;\r
 import org.eclipse.ui.progress.UIJob;\r
-import org.netxms.api.client.ISessionNotification;\r
+import org.netxms.api.client.Session;\r
+import org.netxms.api.client.SessionNotification;\r
 import org.netxms.client.NXCListener;\r
 import org.netxms.client.NXCNotification;\r
 import org.netxms.client.NXCSession;\r
 import org.netxms.client.constants.Severity;\r
 import org.netxms.client.events.Alarm;\r
 import org.netxms.client.objects.GenericObject;\r
-import org.netxms.ui.eclipse.shared.NXMCSharedData;\r
-import org.netxms.ui.eclipse.shared.StatusDisplayInfo;\r
+import org.netxms.ui.eclipse.console.resources.StatusDisplayInfo;\r
+import org.netxms.ui.eclipse.shared.ConsoleSharedData;\r
 \r
 /**\r
  * Alarm notifier\r
@@ -51,14 +52,14 @@ public class AlarmNotifier
        {\r
                listener = new NXCListener() {\r
                        @Override\r
-                       public void notificationHandler(ISessionNotification n)\r
+                       public void notificationHandler(SessionNotification n)\r
                        {\r
                                if ((n.getCode() == NXCNotification.NEW_ALARM) ||\r
                                    (n.getCode() == NXCNotification.ALARM_CHANGED))\r
                                        processNewAlarm((Alarm)n.getObject());\r
                        }\r
                };\r
-               NXCSession session = NXMCSharedData.getInstance().getSession();\r
+               Session session = ConsoleSharedData.getSession();\r
                if (session != null)\r
                        session.addListener(listener);\r
        }\r
@@ -68,7 +69,7 @@ public class AlarmNotifier
         */\r
        public static void stop()\r
        {\r
-               NXCSession session = NXMCSharedData.getInstance().getSession();\r
+               Session session = ConsoleSharedData.getSession();\r
                if ((session != null) && (listener != null))\r
                        session.removeListener(listener);\r
        }\r
@@ -81,14 +82,14 @@ public class AlarmNotifier
                if (alarm.getState() != Alarm.STATE_OUTSTANDING)\r
                        return;\r
                \r
-               final TrayItem trayIcon = NXMCSharedData.getInstance().getTrayIcon();\r
+               final TrayItem trayIcon = ConsoleSharedData.getTrayIcon();\r
                if (trayIcon != null)\r
                {\r
                        new UIJob("Create alarm popup") {\r
                                @Override\r
                                public IStatus runInUIThread(IProgressMonitor monitor)\r
                                {\r
-                                       final NXCSession session = NXMCSharedData.getInstance().getSession();\r
+                                       final NXCSession session = (NXCSession)ConsoleSharedData.getSession();\r
                                        final GenericObject object = session.findObjectById(alarm.getSourceObjectId());\r
                                        \r
                                        int severityFlag;\r
index 3bc7996..a2be15b 100644 (file)
@@ -23,7 +23,7 @@ import org.eclipse.core.runtime.IStatus;
 import org.eclipse.core.runtime.Status;\r
 import org.eclipse.core.runtime.jobs.Job;\r
 import org.eclipse.ui.IStartup;\r
-import org.netxms.ui.eclipse.shared.NXMCSharedData;\r
+import org.netxms.ui.eclipse.shared.ConsoleSharedData;\r
 \r
 /**\r
  * Early startup class\r
@@ -42,7 +42,7 @@ public class Startup implements IStartup
                        @Override\r
                        protected IStatus run(IProgressMonitor monitor)\r
                        {\r
-                               while(NXMCSharedData.getInstance().getSession() == null)\r
+                               while(ConsoleSharedData.getSession() == null)\r
                                {\r
                                        try\r
                                        {\r
index a59a83f..ad31b5f 100644 (file)
@@ -29,10 +29,11 @@ import org.eclipse.ui.IObjectActionDelegate;
 import org.eclipse.ui.IWorkbenchPart;\r
 import org.eclipse.ui.progress.IWorkbenchSiteProgressService;\r
 import org.netxms.client.NXCException;\r
+import org.netxms.client.NXCSession;\r
 import org.netxms.client.events.Alarm;\r
 import org.netxms.ui.eclipse.alarmviewer.Activator;\r
 import org.netxms.ui.eclipse.alarmviewer.widgets.AlarmList;\r
-import org.netxms.ui.eclipse.shared.NXMCSharedData;\r
+import org.netxms.ui.eclipse.shared.ConsoleSharedData;\r
 \r
 \r
 /**\r
@@ -65,7 +66,7 @@ public class AcknowledgeAlarm implements IObjectActionDelegate
                        {\r
                                for(int i = 0; i < selection.length; i++)\r
                                        if (selection[i] instanceof Alarm)\r
-                                               NXMCSharedData.getInstance().getSession().acknowledgeAlarm(((Alarm)selection[i]).getId());\r
+                                               ((NXCSession)ConsoleSharedData.getSession()).acknowledgeAlarm(((Alarm)selection[i]).getId());\r
                                status = Status.OK_STATUS;\r
                        }\r
                        catch(Exception e)\r
index 9df0f17..b1e90e1 100644 (file)
@@ -29,10 +29,11 @@ import org.eclipse.ui.IObjectActionDelegate;
 import org.eclipse.ui.IWorkbenchPart;\r
 import org.eclipse.ui.progress.IWorkbenchSiteProgressService;\r
 import org.netxms.client.NXCException;\r
+import org.netxms.client.NXCSession;\r
 import org.netxms.client.events.Alarm;\r
 import org.netxms.ui.eclipse.alarmviewer.Activator;\r
 import org.netxms.ui.eclipse.alarmviewer.widgets.AlarmList;\r
-import org.netxms.ui.eclipse.shared.NXMCSharedData;\r
+import org.netxms.ui.eclipse.shared.ConsoleSharedData;\r
 \r
 \r
 /**\r
@@ -65,7 +66,7 @@ public class TerminateAlarm implements IObjectActionDelegate
                        {\r
                                for(int i = 0; i < selection.length; i++)\r
                                        if (selection[i] instanceof Alarm)\r
-                                               NXMCSharedData.getInstance().getSession().terminateAlarm(((Alarm)selection[i]).getId());\r
+                                               ((NXCSession)ConsoleSharedData.getSession()).terminateAlarm(((Alarm)selection[i]).getId());\r
                                status = Status.OK_STATUS;\r
                        }\r
                        catch(Exception e)\r
index 31718e5..f8c5a87 100644 (file)
@@ -37,7 +37,7 @@ import org.eclipse.swt.widgets.Menu;
 import org.eclipse.ui.IWorkbenchActionConstants;\r
 import org.eclipse.ui.part.ViewPart;\r
 import org.eclipse.ui.progress.UIJob;\r
-import org.netxms.api.client.ISessionNotification;\r
+import org.netxms.api.client.SessionNotification;\r
 import org.netxms.client.NXCListener;\r
 import org.netxms.client.NXCNotification;\r
 import org.netxms.client.NXCSession;\r
@@ -47,8 +47,8 @@ import org.netxms.ui.eclipse.alarmviewer.AlarmComparator;
 import org.netxms.ui.eclipse.alarmviewer.AlarmListFilter;\r
 import org.netxms.ui.eclipse.alarmviewer.AlarmListLabelProvider;\r
 import org.netxms.ui.eclipse.jobs.ConsoleJob;\r
-import org.netxms.ui.eclipse.shared.NXMCSharedData;\r
-import org.netxms.ui.eclipse.tools.SortableTableViewer;\r
+import org.netxms.ui.eclipse.shared.ConsoleSharedData;\r
+import org.netxms.ui.eclipse.widgets.SortableTableViewer;\r
 \r
 /**\r
  * @author victor\r
@@ -77,7 +77,7 @@ public class AlarmList extends Composite
        public AlarmList(ViewPart viewPart, Composite parent, int style)\r
        {\r
                super(parent, style);\r
-               session = NXMCSharedData.getInstance().getSession();\r
+               session = (NXCSession)ConsoleSharedData.getSession();\r
                this.viewPart = viewPart;               \r
                \r
                // Setup table columns\r
@@ -131,7 +131,7 @@ public class AlarmList extends Composite
                // Add client library listener\r
                clientListener = new NXCListener() {\r
                        @Override\r
-                       public void notificationHandler(ISessionNotification n)\r
+                       public void notificationHandler(SessionNotification n)\r
                        {\r
                                switch(n.getCode())\r
                                {\r
index 8798da9..61b5d10 100644 (file)
@@ -12,7 +12,8 @@ Require-Bundle: org.eclipse.ui,
  org.swtchart;bundle-version="0.7.0",
  org.eclipse.birt.chart.device.swt;bundle-version="2.5.2",
  org.eclipse.birt.chart.device.extension;bundle-version="2.5.2",
- org.eclipse.birt.chart.engine;bundle-version="2.5.2"
+ org.eclipse.birt.chart.engine;bundle-version="2.5.2",
+ org.netxms.ui.eclipse.console;bundle-version="1.1.0"
 Bundle-RequiredExecutionEnvironment: JavaSE-1.6
 Bundle-ActivationPolicy: lazy
 Export-Package: org.netxms.ui.eclipse.charts.widgets
index f8eb08a..92f13aa 100644 (file)
@@ -14,7 +14,6 @@ import org.eclipse.ui.IWorkbenchWindow;
 import org.eclipse.ui.PartInitException;\r
 import org.netxms.client.datacollection.DataCollectionItem;\r
 import org.netxms.client.datacollection.DciValue;\r
-import org.netxms.ui.eclipse.charts.views.LastValuesBarChart;\r
 \r
 public abstract class ShowLastValuesGraph implements IObjectActionDelegate\r
 {\r
index fa64268..594bb87 100644 (file)
@@ -29,7 +29,7 @@ import org.netxms.client.NXCSession;
 import org.netxms.client.datacollection.PerfTabDci;\r
 import org.netxms.client.objects.GenericObject;\r
 import org.netxms.ui.eclipse.objectview.objecttabs.ObjectTab;\r
-import org.netxms.ui.eclipse.shared.NXMCSharedData;\r
+import org.netxms.ui.eclipse.shared.ConsoleSharedData;\r
 \r
 /**\r
  * Performance tab\r
@@ -58,7 +58,7 @@ public class PerformanceTab extends ObjectTab
                        @Override\r
                        protected IStatus run(IProgressMonitor monitor)\r
                        {\r
-                               final NXCSession session = NXMCSharedData.getInstance().getSession();\r
+                               final NXCSession session = (NXCSession)ConsoleSharedData.getSession();\r
                                try\r
                                {\r
                                        final PerfTabDci[] items = session.getPerfTabItems(object.getObjectId());\r
index 45471a7..4e4714b 100644 (file)
@@ -56,10 +56,10 @@ import org.netxms.client.datacollection.GraphItem;
 import org.netxms.client.datacollection.GraphItemStyle;\r
 import org.netxms.client.datacollection.GraphSettings;\r
 import org.netxms.client.objects.GenericObject;\r
+import org.netxms.ui.eclipse.actions.RefreshAction;\r
 import org.netxms.ui.eclipse.charts.Activator;\r
 import org.netxms.ui.eclipse.charts.widgets.LineChart;\r
-import org.netxms.ui.eclipse.shared.NXMCSharedData;\r
-import org.netxms.ui.eclipse.tools.RefreshAction;\r
+import org.netxms.ui.eclipse.shared.ConsoleSharedData;\r
 import org.swtchart.IAxis;\r
 import org.swtchart.ILineSeries;\r
 import org.swtchart.LineStyle;\r
@@ -133,7 +133,7 @@ public class HistoryGraph extends ViewPart
                        }\r
                };\r
                \r
-               session = NXMCSharedData.getInstance().getSession();\r
+               session = (NXCSession)ConsoleSharedData.getSession();\r
                \r
                timeFrom = new Date(System.currentTimeMillis() - timeRange);\r
                timeTo = new Date(System.currentTimeMillis());\r
index 5eadea3..4c2cb9c 100644 (file)
@@ -22,10 +22,10 @@ import org.netxms.client.NXCSession;
 import org.netxms.client.datacollection.DciData;\r
 import org.netxms.client.datacollection.DciDataRow;\r
 import org.netxms.client.datacollection.GraphItem;\r
+import org.netxms.ui.eclipse.actions.RefreshAction;\r
 import org.netxms.ui.eclipse.charts.Activator;\r
 import org.netxms.ui.eclipse.jobs.ConsoleJob;\r
-import org.netxms.ui.eclipse.shared.NXMCSharedData;\r
-import org.netxms.ui.eclipse.tools.RefreshAction;\r
+import org.netxms.ui.eclipse.shared.ConsoleSharedData;\r
 import org.swtchart.Chart;\r
 \r
 public abstract class LastValuesChart extends ViewPart\r
@@ -184,7 +184,7 @@ public abstract class LastValuesChart extends ViewPart
                        }\r
                };\r
 \r
-               session = NXMCSharedData.getInstance().getSession();\r
+               session = (NXCSession)ConsoleSharedData.getSession();\r
 \r
                // Extract DCI ids from view id\r
                // (first field will be unique view id, so we skip it)\r
index 166a78d..751d349 100644 (file)
@@ -51,12 +51,12 @@ import org.eclipse.ui.part.ViewPart;
 import org.eclipse.ui.progress.UIJob;\r
 import org.netxms.client.NXCSession;\r
 import org.netxms.client.datacollection.GraphSettings;\r
+import org.netxms.ui.eclipse.actions.RefreshAction;\r
 import org.netxms.ui.eclipse.charts.Activator;\r
 import org.netxms.ui.eclipse.charts.views.helpers.GraphTreeContentProvider;\r
 import org.netxms.ui.eclipse.charts.views.helpers.GraphTreeLabelProvider;\r
 import org.netxms.ui.eclipse.jobs.ConsoleJob;\r
-import org.netxms.ui.eclipse.shared.NXMCSharedData;\r
-import org.netxms.ui.eclipse.tools.RefreshAction;\r
+import org.netxms.ui.eclipse.shared.ConsoleSharedData;\r
 \r
 /**\r
  * Navigation view for predefined graphs\r
@@ -77,7 +77,7 @@ public class PredefinedGraphTree extends ViewPart
        @Override\r
        public void createPartControl(Composite parent)\r
        {\r
-               session = NXMCSharedData.getInstance().getSession();\r
+               session = (NXCSession)ConsoleSharedData.getSession();\r
                \r
                parent.setLayout(new FillLayout());\r
                \r
index 1b843c9..2f5ce2e 100644 (file)
@@ -12,6 +12,7 @@ Require-Bundle: org.eclipse.ui,
  org.netxms.ui.eclipse.eventmanager;bundle-version="1.1.0",
  org.netxms.ui.eclipse.objectview;bundle-version="1.1.0",
  org.netxms.ui.eclipse.snmp;bundle-version="1.1.0",
- org.netxms.ui.eclipse.nxsl;bundle-version="1.1.0"
+ org.netxms.ui.eclipse.nxsl;bundle-version="1.1.0",
+ org.netxms.ui.eclipse.console;bundle-version="1.1.0"
 Bundle-RequiredExecutionEnvironment: JavaSE-1.6
 Bundle-ActivationPolicy: lazy
index dc5b9c2..2c5384b 100644 (file)
@@ -23,7 +23,7 @@ import org.eclipse.jface.viewers.ViewerComparator;
 import org.eclipse.swt.SWT;\r
 import org.netxms.client.datacollection.DataCollectionItem;\r
 import org.netxms.ui.eclipse.datacollection.views.DataCollectionEditor;\r
-import org.netxms.ui.eclipse.tools.SortableTableViewer;\r
+import org.netxms.ui.eclipse.widgets.SortableTableViewer;\r
 \r
 /**\r
  * @author Victor\r
index b965a9e..bf7eab6 100644 (file)
@@ -27,7 +27,7 @@ import org.netxms.client.NXCSession;
 import org.netxms.client.datacollection.DataCollectionItem;\r
 import org.netxms.client.objects.GenericObject;\r
 import org.netxms.ui.eclipse.datacollection.views.DataCollectionEditor;\r
-import org.netxms.ui.eclipse.shared.NXMCSharedData;\r
+import org.netxms.ui.eclipse.shared.ConsoleSharedData;\r
 \r
 /**\r
  * Label provider for user manager\r
@@ -48,7 +48,7 @@ public class DciLabelProvider implements ITableLabelProvider
         */\r
        public DciLabelProvider()\r
        {\r
-               session = NXMCSharedData.getInstance().getSession();\r
+               session = (NXCSession)ConsoleSharedData.getSession();\r
                \r
                statusImages = new Image[3];\r
                statusImages[DataCollectionItem.ACTIVE] = Activator.getImageDescriptor("icons/active.gif").createImage();\r
index f87db92..4f157ed 100644 (file)
@@ -26,7 +26,7 @@ import org.netxms.client.NXCSession;
 import org.netxms.client.datacollection.Threshold;\r
 import org.netxms.client.events.EventTemplate;\r
 import org.netxms.ui.eclipse.datacollection.propertypages.Thresholds;\r
-import org.netxms.ui.eclipse.shared.NXMCSharedData;\r
+import org.netxms.ui.eclipse.shared.ConsoleSharedData;\r
 \r
 /**\r
  * @author Victor\r
@@ -38,7 +38,7 @@ public class ThresholdLabelProvider implements ITableLabelProvider
        private static final String[] operations = { "<", "<=", "==", ">=", ">", "!=", "like", "!like" };\r
        \r
        private WorkbenchLabelProvider eventLabelProvider = new WorkbenchLabelProvider();\r
-       private NXCSession session = NXMCSharedData.getInstance().getSession();\r
+       private NXCSession session = (NXCSession)ConsoleSharedData.getSession();\r
        \r
        /* (non-Javadoc)\r
         * @see org.eclipse.jface.viewers.ITableLabelProvider#getColumnImage(java.lang.Object, int)\r
index ac4a0a8..3a50093 100644 (file)
@@ -36,9 +36,9 @@ import org.netxms.client.objects.GenericObject;
 import org.netxms.ui.eclipse.datacollection.dialogs.helpers.AgentParameterComparator;\r
 import org.netxms.ui.eclipse.datacollection.dialogs.helpers.AgentParameterLabelProvider;\r
 import org.netxms.ui.eclipse.shared.IUIConstants;\r
-import org.netxms.ui.eclipse.shared.NXMCSharedData;\r
-import org.netxms.ui.eclipse.tools.SortableTableViewer;\r
+import org.netxms.ui.eclipse.shared.ConsoleSharedData;\r
 import org.netxms.ui.eclipse.tools.WidgetHelper;\r
+import org.netxms.ui.eclipse.widgets.SortableTableViewer;\r
 \r
 public abstract class AbstractSelectParamDlg extends Dialog implements IParameterSelectionDialog\r
 {\r
@@ -53,7 +53,7 @@ public abstract class AbstractSelectParamDlg extends Dialog implements IParamete
        public AbstractSelectParamDlg(Shell parentShell, long nodeId)\r
        {\r
                super(parentShell);\r
-               object = NXMCSharedData.getInstance().getSession().findObjectById(nodeId);\r
+               object = ConsoleSharedData.getInstance().getSession().findObjectById(nodeId);\r
        }\r
 \r
        /* (non-Javadoc)\r
index 07036fa..168f7e4 100644 (file)
@@ -26,7 +26,7 @@ import org.netxms.client.AgentParameter;
 import org.netxms.client.NXCSession;\r
 import org.netxms.ui.eclipse.datacollection.Activator;\r
 import org.netxms.ui.eclipse.jobs.ConsoleJob;\r
-import org.netxms.ui.eclipse.shared.NXMCSharedData;\r
+import org.netxms.ui.eclipse.shared.ConsoleSharedData;\r
 \r
 /**\r
  * @author victor\r
@@ -46,7 +46,7 @@ public class SelectAgentParamDlg extends AbstractSelectParamDlg
         */\r
        void fillParameterList()\r
        {\r
-               final NXCSession session = NXMCSharedData.getInstance().getSession();\r
+               final NXCSession session = ConsoleSharedData.getInstance().getSession();\r
                \r
                ConsoleJob job = new ConsoleJob("Get list of supported parameters for " + object.getObjectName(),\r
                                                          null, Activator.PLUGIN_ID, null) {\r
index 9c843f3..645f666 100644 (file)
@@ -7,9 +7,9 @@ import org.eclipse.jface.viewers.Viewer;
 import org.eclipse.jface.viewers.ViewerComparator;\r
 import org.eclipse.swt.SWT;\r
 import org.netxms.client.AgentParameter;\r
+import org.netxms.ui.eclipse.console.resources.DataCollectionDisplayInfo;\r
 import org.netxms.ui.eclipse.datacollection.dialogs.AbstractSelectParamDlg;\r
-import org.netxms.ui.eclipse.shared.DataCollectionDisplayInfo;\r
-import org.netxms.ui.eclipse.tools.SortableTableViewer;\r
+import org.netxms.ui.eclipse.widgets.SortableTableViewer;\r
 \r
 /**\r
  * @author victor\r
index 9823f9f..0985a57 100644 (file)
@@ -7,8 +7,8 @@ import org.eclipse.jface.viewers.ILabelProviderListener;
 import org.eclipse.jface.viewers.ITableLabelProvider;\r
 import org.eclipse.swt.graphics.Image;\r
 import org.netxms.client.AgentParameter;\r
+import org.netxms.ui.eclipse.console.resources.DataCollectionDisplayInfo;\r
 import org.netxms.ui.eclipse.datacollection.dialogs.AbstractSelectParamDlg;\r
-import org.netxms.ui.eclipse.shared.DataCollectionDisplayInfo;\r
 \r
 /**\r
  * Label provider for AgentParameter class\r
index 404a3af..d7282f0 100644 (file)
@@ -50,9 +50,9 @@ import org.netxms.client.NXCException;
 import org.netxms.client.datacollection.DataCollectionItem;\r
 import org.netxms.ui.eclipse.datacollection.Activator;\r
 import org.netxms.ui.eclipse.datacollection.dialogs.EditScheduleDialog;\r
-import org.netxms.ui.eclipse.tools.SortableTableViewer;\r
 import org.netxms.ui.eclipse.tools.StringComparator;\r
 import org.netxms.ui.eclipse.tools.WidgetHelper;\r
+import org.netxms.ui.eclipse.widgets.SortableTableViewer;\r
 \r
 /**\r
  * @author Victor\r
index 1cc0c11..ec30297 100644 (file)
@@ -1,5 +1,20 @@
 /**\r
- * \r
+ * NetXMS - open source network management system\r
+ * Copyright (C) 2003-2010 Victor Kirhenshtein\r
+ *\r
+ * This program is free software; you can redistribute it and/or modify\r
+ * it under the terms of the GNU General Public License as published by\r
+ * the Free Software Foundation; either version 2 of the License, or\r
+ * (at your option) any later version.\r
+ *\r
+ * This program is distributed in the hope that it will be useful,\r
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of\r
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the\r
+ * GNU General Public License for more details.\r
+ *\r
+ * You should have received a copy of the GNU General Public License\r
+ * along with this program; if not, write to the Free Software\r
+ * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.\r
  */\r
 package org.netxms.ui.eclipse.datacollection.views;\r
 \r
@@ -43,15 +58,15 @@ import org.netxms.client.datacollection.DataCollectionItem;
 import org.netxms.client.objects.GenericObject;\r
 import org.netxms.client.objects.Node;\r
 import org.netxms.client.objects.Template;\r
+import org.netxms.ui.eclipse.actions.RefreshAction;\r
 import org.netxms.ui.eclipse.datacollection.Activator;\r
 import org.netxms.ui.eclipse.datacollection.DciComparator;\r
 import org.netxms.ui.eclipse.datacollection.DciLabelProvider;\r
-import org.netxms.ui.eclipse.shared.NXMCSharedData;\r
-import org.netxms.ui.eclipse.tools.RefreshAction;\r
-import org.netxms.ui.eclipse.tools.SortableTableViewer;\r
+import org.netxms.ui.eclipse.shared.ConsoleSharedData;\r
+import org.netxms.ui.eclipse.widgets.SortableTableViewer;\r
 \r
 /**\r
- * @author Victor\r
+ * Data collection configuration view\r
  * \r
  */\r
 public class DataCollectionEditor extends ViewPart\r
@@ -93,7 +108,7 @@ public class DataCollectionEditor extends ViewPart
        {\r
                super.init(site);\r
                \r
-               session = NXMCSharedData.getInstance().getSession();\r
+               session = (NXCSession)ConsoleSharedData.getSession();\r
                GenericObject obj = session.findObjectById(Long.parseLong(site.getSecondaryId()));\r
                object = ((obj != null) && ((obj instanceof Node) || (obj instanceof Template))) ? obj : null;\r
                setPartName("Data Collection Configuration - " + ((object != null) ? object.getObjectName() : "<error>"));\r
index 153ea07..af2228d 100644 (file)
@@ -30,10 +30,10 @@ import org.netxms.client.NXCSession;
 import org.netxms.client.objects.GenericObject;\r
 import org.netxms.client.objects.Node;\r
 import org.netxms.ui.eclipse.datacollection.widgets.LastValuesView;\r
-import org.netxms.ui.eclipse.shared.NXMCSharedData;\r
+import org.netxms.ui.eclipse.shared.ConsoleSharedData;\r
 \r
 /**\r
- * @author Victor\r
+ * Last values view\r
  *\r
  */\r
 public class LastValues extends ViewPart\r
@@ -52,7 +52,7 @@ public class LastValues extends ViewPart
        {\r
                super.init(site);\r
                \r
-               session = NXMCSharedData.getInstance().getSession();\r
+               session = (NXCSession)ConsoleSharedData.getSession();\r
                GenericObject obj = session.findObjectById(Long.parseLong(site.getSecondaryId()));\r
                node = ((obj != null) && (obj instanceof Node)) ? (Node)obj : null;\r
                setPartName("Last Values - " + ((node != null) ? node.getObjectName() : "<error>"));\r
index 16a5aef..7851bf0 100644 (file)
@@ -42,8 +42,8 @@ import org.netxms.ui.eclipse.datacollection.Activator;
 import org.netxms.ui.eclipse.datacollection.widgets.internal.LastValuesComparator;\r
 import org.netxms.ui.eclipse.datacollection.widgets.internal.LastValuesLabelProvider;\r
 import org.netxms.ui.eclipse.jobs.ConsoleJob;\r
-import org.netxms.ui.eclipse.shared.NXMCSharedData;\r
-import org.netxms.ui.eclipse.tools.SortableTableViewer;\r
+import org.netxms.ui.eclipse.shared.ConsoleSharedData;\r
+import org.netxms.ui.eclipse.widgets.SortableTableViewer;\r
 \r
 /**\r
  * @author victor\r
@@ -67,7 +67,7 @@ public class LastValuesView extends Composite
        public LastValuesView(ViewPart viewPart, Composite parent, int style, Node _node)\r
        {\r
                super(parent, style);\r
-               session = NXMCSharedData.getInstance().getSession();\r
+               session = ConsoleSharedData.getInstance().getSession();\r
                this.viewPart = viewPart;               \r
                this.node = _node;\r
                \r
index 877576c..0b5a689 100644 (file)
@@ -8,7 +8,7 @@ import org.eclipse.jface.viewers.ViewerComparator;
 import org.eclipse.swt.SWT;\r
 import org.netxms.client.datacollection.DciValue;\r
 import org.netxms.ui.eclipse.datacollection.widgets.LastValuesView;\r
-import org.netxms.ui.eclipse.tools.SortableTableViewer;\r
+import org.netxms.ui.eclipse.widgets.SortableTableViewer;\r
 \r
 /**\r
  * @author victor\r
index 61a3e3e..a6be497 100644 (file)
@@ -9,6 +9,7 @@ Require-Bundle: org.eclipse.ui,
  org.eclipse.core.runtime,
  org.netxms.ui.eclipse.library;bundle-version="1.1.0",
  org.netxms.ui.eclipse.eventmanager;bundle-version="1.1.0",
- org.netxms.ui.eclipse.nxsl;bundle-version="1.1.0"
+ org.netxms.ui.eclipse.nxsl;bundle-version="1.1.0",
+ org.netxms.ui.eclipse.console;bundle-version="1.1.0"
 Bundle-RequiredExecutionEnvironment: JavaSE-1.6
 Bundle-ActivationPolicy: lazy
index d1657c9..23785f8 100644 (file)
@@ -32,7 +32,7 @@ import org.eclipse.swt.layout.FillLayout;
 import org.eclipse.swt.widgets.Composite;\r
 import org.eclipse.ui.part.ViewPart;\r
 import org.eclipse.ui.progress.UIJob;\r
-import org.netxms.api.client.ISessionNotification;\r
+import org.netxms.api.client.SessionNotification;\r
 import org.netxms.client.NXCException;\r
 import org.netxms.client.NXCListener;\r
 import org.netxms.client.NXCNotification;\r
@@ -45,10 +45,10 @@ import org.netxms.ui.eclipse.epp.widgets.PolicyEditor;
 import org.netxms.ui.eclipse.epp.widgets.helpers.EPPCellFactory;\r
 import org.netxms.ui.eclipse.epp.widgets.helpers.ImageFactory;\r
 import org.netxms.ui.eclipse.jobs.ConsoleJob;\r
-import org.netxms.ui.eclipse.shared.NXMCSharedData;\r
+import org.netxms.ui.eclipse.shared.ConsoleSharedData;\r
 \r
 /**\r
- * @author Victor\r
+ * Event processing policy editor\r
  *\r
  */\r
 public class EventProcessingPolicyEditor extends ViewPart\r
@@ -69,7 +69,7 @@ public class EventProcessingPolicyEditor extends ViewPart
        @Override\r
        public void createPartControl(Composite parent)\r
        {\r
-               session = NXMCSharedData.getInstance().getSession();\r
+               session = (NXCSession)ConsoleSharedData.getSession();\r
 \r
                // Initiate loading of event manager and object manager plugins if it was not loaded before\r
                try\r
@@ -83,7 +83,7 @@ public class EventProcessingPolicyEditor extends ViewPart
                \r
                sessionListener = new NXCListener() {\r
                        @Override\r
-                       public void notificationHandler(ISessionNotification n)\r
+                       public void notificationHandler(SessionNotification n)\r
                        {\r
                                processSessionNotification(n);\r
                        }\r
@@ -143,7 +143,7 @@ public class EventProcessingPolicyEditor extends ViewPart
         * \r
         * @param n notification\r
         */\r
-       private void processSessionNotification(ISessionNotification n)\r
+       private void processSessionNotification(SessionNotification n)\r
        {\r
                switch(n.getCode())\r
                {\r
index fc2689d..8a77326 100644 (file)
@@ -26,9 +26,9 @@ import org.eclipse.jface.action.IMenuManager;
 import org.netxms.client.NXCSession;\r
 import org.netxms.client.events.EventProcessingPolicyRule;\r
 import org.netxms.client.events.EventTemplate;\r
+import org.netxms.ui.eclipse.console.resources.StatusDisplayInfo;\r
 import org.netxms.ui.eclipse.epp.widgets.helpers.ImageFactory;\r
-import org.netxms.ui.eclipse.shared.NXMCSharedData;\r
-import org.netxms.ui.eclipse.shared.StatusDisplayInfo;\r
+import org.netxms.ui.eclipse.shared.ConsoleSharedData;\r
 \r
 /**\r
  * Cell containing events\r
@@ -43,7 +43,7 @@ public class EventsCell extends ListCell
        {\r
                super(rule, data);\r
                eppRule = (EventProcessingPolicyRule)data;\r
-               session = NXMCSharedData.getInstance().getSession();\r
+               session = ConsoleSharedData.getInstance().getSession();\r
                \r
                List<Long> eventCodes = eppRule.getEvents();\r
                List<EventTemplate> events = session.findMultipleEventTemplates(eventCodes.toArray(new Long[eventCodes.size()]));\r
index 8dd6d02..a4a8fda 100644 (file)
@@ -27,7 +27,7 @@ import org.netxms.client.NXCSession;
 import org.netxms.client.events.EventProcessingPolicyRule;\r
 import org.netxms.client.objects.GenericObject;\r
 import org.netxms.ui.eclipse.epp.widgets.helpers.ImageFactory;\r
-import org.netxms.ui.eclipse.shared.NXMCSharedData;\r
+import org.netxms.ui.eclipse.shared.ConsoleSharedData;\r
 \r
 /**\r
  * Cell with source objects list\r
@@ -42,7 +42,7 @@ public class ObjectsCell extends ListCell
        {\r
                super(rule, data);\r
                eppRule = (EventProcessingPolicyRule)data;\r
-               session = NXMCSharedData.getInstance().getSession();\r
+               session = ConsoleSharedData.getInstance().getSession();\r
                \r
                List<Long> objectIds = eppRule.getSources();\r
                if (objectIds.size() > 0)\r
index 082bd3e..1c8de3a 100644 (file)
@@ -21,8 +21,8 @@ package org.netxms.ui.eclipse.epp.widgets;
 import org.eclipse.jface.action.Action;\r
 import org.eclipse.jface.action.IMenuManager;\r
 import org.netxms.client.events.EventProcessingPolicyRule;\r
+import org.netxms.ui.eclipse.console.resources.StatusDisplayInfo;\r
 import org.netxms.ui.eclipse.epp.widgets.helpers.ImageFactory;\r
-import org.netxms.ui.eclipse.shared.StatusDisplayInfo;\r
 \r
 /**\r
  * Cell for severity filter\r
index 871a473..4dc6baa 100644 (file)
@@ -7,7 +7,8 @@ Bundle-Activator: org.netxms.ui.eclipse.eventmanager.Activator
 Bundle-Vendor: netxms.org
 Require-Bundle: org.eclipse.ui,
  org.eclipse.core.runtime,
- org.netxms.ui.eclipse.library;bundle-version="1.1.0"
+ org.netxms.ui.eclipse.library;bundle-version="1.1.0",
+ org.netxms.ui.eclipse.console;bundle-version="1.1.0"
 Bundle-RequiredExecutionEnvironment: JavaSE-1.6
 Bundle-ActivationPolicy: lazy
 Export-Package: org.netxms.ui.eclipse.eventmanager.widgets
index 5c5c40a..481f0e6 100644 (file)
@@ -22,7 +22,7 @@ import org.eclipse.core.runtime.IAdapterFactory;
 import org.eclipse.jface.resource.ImageDescriptor;\r
 import org.eclipse.ui.model.IWorkbenchAdapter;\r
 import org.netxms.client.events.EventTemplate;\r
-import org.netxms.ui.eclipse.shared.StatusDisplayInfo;\r
+import org.netxms.ui.eclipse.console.resources.StatusDisplayInfo;\r
 \r
 /**\r
  * Adapter factory for NXCUserDBObject and derived classes\r
index d05e951..a602a6f 100644 (file)
@@ -8,7 +8,7 @@ import org.eclipse.jface.viewers.ViewerComparator;
 import org.eclipse.swt.SWT;\r
 import org.netxms.client.events.EventTemplate;\r
 import org.netxms.ui.eclipse.eventmanager.views.EventConfigurator;\r
-import org.netxms.ui.eclipse.tools.SortableTableViewer;\r
+import org.netxms.ui.eclipse.widgets.SortableTableViewer;\r
 \r
 /**\r
  * @author Victor\r
index 6622bb5..6a24e2a 100644 (file)
@@ -7,8 +7,8 @@ import org.eclipse.jface.viewers.ITableLabelProvider;
 import org.eclipse.swt.graphics.Image;\r
 import org.eclipse.ui.model.WorkbenchLabelProvider;\r
 import org.netxms.client.events.EventTemplate;\r
+import org.netxms.ui.eclipse.console.resources.StatusDisplayInfo;\r
 import org.netxms.ui.eclipse.eventmanager.views.EventConfigurator;\r
-import org.netxms.ui.eclipse.shared.StatusDisplayInfo;\r
 \r
 /**\r
  * @author Victor\r
index 8c51722..e9df2fc 100644 (file)
@@ -29,8 +29,8 @@ import org.eclipse.swt.widgets.Control;
 import org.eclipse.swt.widgets.Shell;\r
 import org.netxms.client.constants.Severity;\r
 import org.netxms.client.events.EventTemplate;\r
+import org.netxms.ui.eclipse.console.resources.StatusDisplayInfo;\r
 import org.netxms.ui.eclipse.shared.IUIConstants;\r
-import org.netxms.ui.eclipse.shared.StatusDisplayInfo;\r
 import org.netxms.ui.eclipse.tools.WidgetHelper;\r
 import org.netxms.ui.eclipse.widgets.LabeledText;\r
 \r
index 1a52aaf..c9937a8 100644 (file)
@@ -43,9 +43,9 @@ import org.netxms.ui.eclipse.eventmanager.EventTemplateComparator;
 import org.netxms.ui.eclipse.eventmanager.EventTemplateLabelProvider;\r
 import org.netxms.ui.eclipse.eventmanager.dialogs.helpers.EventListFilter;\r
 import org.netxms.ui.eclipse.shared.IUIConstants;\r
-import org.netxms.ui.eclipse.shared.NXMCSharedData;\r
-import org.netxms.ui.eclipse.tools.SortableTableViewer;\r
+import org.netxms.ui.eclipse.shared.ConsoleSharedData;\r
 import org.netxms.ui.eclipse.tools.WidgetHelper;\r
+import org.netxms.ui.eclipse.widgets.SortableTableViewer;\r
 \r
 /**\r
  * Event selection dialog\r
@@ -125,7 +125,7 @@ public class EventSelectionDialog extends Dialog
                if (filterString != null)\r
                        filter.setFilterString(filterString);\r
                eventList.addFilter(filter);\r
-               eventList.setInput(NXMCSharedData.getInstance().getSession().getCachedEventTemplates());\r
+               eventList.setInput(ConsoleSharedData.getInstance().getSession().getCachedEventTemplates());\r
                gd = new GridData();\r
                gd.grabExcessHorizontalSpace = true;\r
                gd.horizontalAlignment = SWT.FILL;\r
index 887602c..f72b1ce 100644 (file)
@@ -56,15 +56,15 @@ import org.netxms.api.client.ISessionNotification;
 import org.netxms.client.NXCNotification;\r
 import org.netxms.client.NXCSession;\r
 import org.netxms.client.events.EventTemplate;\r
+import org.netxms.ui.eclipse.actions.RefreshAction;\r
 import org.netxms.ui.eclipse.eventmanager.Activator;\r
 import org.netxms.ui.eclipse.eventmanager.EventTemplateComparator;\r
 import org.netxms.ui.eclipse.eventmanager.EventTemplateLabelProvider;\r
 import org.netxms.ui.eclipse.eventmanager.dialogs.EditEventTemplateDialog;\r
 import org.netxms.ui.eclipse.jobs.ConsoleJob;\r
-import org.netxms.ui.eclipse.shared.NXMCSharedData;\r
-import org.netxms.ui.eclipse.tools.RefreshAction;\r
-import org.netxms.ui.eclipse.tools.SortableTableViewer;\r
+import org.netxms.ui.eclipse.shared.ConsoleSharedData;\r
 import org.netxms.ui.eclipse.tools.WidgetHelper;\r
+import org.netxms.ui.eclipse.widgets.SortableTableViewer;\r
 \r
 /**\r
  * Event configuration view\r
@@ -99,7 +99,7 @@ public class EventConfigurator extends ViewPart implements ISessionListener
        @Override\r
        public void createPartControl(Composite parent)\r
        {\r
-               session = NXMCSharedData.getInstance().getSession();\r
+               session = ConsoleSharedData.getInstance().getSession();\r
                \r
                final String[] names = { "Code", "Name", "Severity", "Flags", "Message", "Description" };\r
                final int[] widths = { 70, 200, 90, 50, 400, 400 };\r
index c623bad..1384739 100644 (file)
@@ -21,9 +21,9 @@ package org.netxms.ui.eclipse.eventmanager.widgets;
 import org.eclipse.jface.window.Window;\r
 import org.eclipse.swt.widgets.Composite;\r
 import org.netxms.client.events.EventTemplate;\r
+import org.netxms.ui.eclipse.console.resources.StatusDisplayInfo;\r
 import org.netxms.ui.eclipse.eventmanager.dialogs.EventSelectionDialog;\r
-import org.netxms.ui.eclipse.shared.NXMCSharedData;\r
-import org.netxms.ui.eclipse.shared.StatusDisplayInfo;\r
+import org.netxms.ui.eclipse.shared.ConsoleSharedData;\r
 import org.netxms.ui.eclipse.widgets.AbstractSelector;\r
 \r
 /**\r
@@ -92,7 +92,7 @@ public class EventSelector extends AbstractSelector
                this.eventCode = eventCode;\r
                if (eventCode != 0)\r
                {\r
-                       EventTemplate event = NXMCSharedData.getInstance().getSession().findEventTemplateByCode(eventCode);\r
+                       EventTemplate event = ConsoleSharedData.getInstance().getSession().findEventTemplateByCode(eventCode);\r
                        if (event != null)\r
                        {\r
                                setText(event.getName());\r
index 85b0ec7..4afd53c 100644 (file)
@@ -7,6 +7,7 @@ Bundle-Activator: org.netxms.ui.eclipse.googlemaps.Activator
 Bundle-Vendor: netxms.org
 Require-Bundle: org.eclipse.ui,
  org.eclipse.core.runtime,
- org.netxms.ui.eclipse.library;bundle-version="1.1.0"
+ org.netxms.ui.eclipse.library;bundle-version="1.1.0",
+ org.netxms.ui.eclipse.console;bundle-version="1.1.0"
 Bundle-RequiredExecutionEnvironment: JavaSE-1.6
 Bundle-ActivationPolicy: lazy
index c25120f..16de98a 100644 (file)
@@ -8,6 +8,7 @@ Bundle-Vendor: netxms.org
 Require-Bundle: org.eclipse.ui,
  org.eclipse.core.runtime,
  org.netxms.ui.eclipse.library;bundle-version="1.1.0",
- org.netxms.ui.eclipse.objectbrowser;bundle-version="1.1.0"
+ org.netxms.ui.eclipse.objectbrowser;bundle-version="1.1.0",
+ org.netxms.ui.eclipse.console;bundle-version="1.1.0"
 Bundle-RequiredExecutionEnvironment: JavaSE-1.6
 Bundle-ActivationPolicy: lazy
index fb89398..4512853 100644 (file)
@@ -49,14 +49,14 @@ import org.netxms.client.Table;
 import org.netxms.client.log.Log;\r
 import org.netxms.client.log.LogColumn;\r
 import org.netxms.client.log.LogFilter;\r
+import org.netxms.ui.eclipse.actions.RefreshAction;\r
 import org.netxms.ui.eclipse.jobs.ConsoleJob;\r
 import org.netxms.ui.eclipse.logviewer.Activator;\r
 import org.netxms.ui.eclipse.logviewer.Messages;\r
 import org.netxms.ui.eclipse.logviewer.dialogs.QueryBuilder;\r
 import org.netxms.ui.eclipse.logviewer.views.helpers.LogLabelProvider;\r
 import org.netxms.ui.eclipse.logviewer.widgets.FilterBuilder;\r
-import org.netxms.ui.eclipse.shared.NXMCSharedData;\r
-import org.netxms.ui.eclipse.tools.RefreshAction;\r
+import org.netxms.ui.eclipse.shared.ConsoleSharedData;\r
 \r
 /**\r
  * @author Victor\r
@@ -97,7 +97,7 @@ public class LogViewer extends ViewPart
        {\r
                super.init(site);\r
                \r
-               session = NXMCSharedData.getInstance().getSession();\r
+               session = ConsoleSharedData.getInstance().getSession();\r
                logName = site.getSecondaryId();\r
                setPartName(Messages.getString("LogViewer_" + logName));\r
                final ImageDescriptor img = Activator.getImageDescriptor("icons/" + logName + ".png");\r
index df3a8f4..2ae478a 100644 (file)
@@ -34,8 +34,8 @@ import org.netxms.client.events.EventTemplate;
 import org.netxms.client.log.Log;\r
 import org.netxms.client.log.LogColumn;\r
 import org.netxms.client.objects.GenericObject;\r
-import org.netxms.ui.eclipse.shared.NXMCSharedData;\r
-import org.netxms.ui.eclipse.shared.StatusDisplayInfo;\r
+import org.netxms.ui.eclipse.console.resources.StatusDisplayInfo;\r
+import org.netxms.ui.eclipse.shared.ConsoleSharedData;\r
 \r
 /**\r
  * @author Victor\r
@@ -52,7 +52,7 @@ public class LogLabelProvider implements ITableLabelProvider
        {\r
                Collection<LogColumn> c = logHandle.getColumns();\r
                columns = c.toArray(new LogColumn[c.size()]);\r
-               session = NXMCSharedData.getInstance().getSession();\r
+               session = ConsoleSharedData.getInstance().getSession();\r
                \r
                statusImages = new Image[9];\r
                for(int i = 0; i < 9; i++)\r
index 3f3564a..08bb91f 100644 (file)
@@ -8,7 +8,8 @@ Bundle-Vendor: netxms.org
 Require-Bundle: org.eclipse.ui,
  org.eclipse.core.runtime,
  org.netxms.ui.eclipse.library;bundle-version="1.1.0",
- org.eclipse.jface.text;bundle-version="3.5.2"
+ org.eclipse.jface.text;bundle-version="3.5.2",
+ org.netxms.ui.eclipse.console;bundle-version="1.1.0"
 Bundle-RequiredExecutionEnvironment: JavaSE-1.6
 Bundle-ActivationPolicy: lazy
 Export-Package: org.netxms.ui.eclipse.nxsl.tools,
index 19ce03f..4c528ad 100644 (file)
@@ -37,11 +37,11 @@ import org.eclipse.ui.part.ViewPart;
 import org.eclipse.ui.progress.UIJob;\r
 import org.netxms.api.client.scripts.Script;\r
 import org.netxms.client.NXCSession;\r
+import org.netxms.ui.eclipse.actions.RefreshAction;\r
 import org.netxms.ui.eclipse.jobs.ConsoleJob;\r
 import org.netxms.ui.eclipse.nxsl.Activator;\r
 import org.netxms.ui.eclipse.nxsl.widgets.ScriptEditor;\r
-import org.netxms.ui.eclipse.shared.NXMCSharedData;\r
-import org.netxms.ui.eclipse.tools.RefreshAction;\r
+import org.netxms.ui.eclipse.shared.ConsoleSharedData;\r
 \r
 /**\r
  * Script editor view\r
@@ -66,7 +66,7 @@ public class ScriptEditorView extends ViewPart
        {\r
                super.init(site);\r
                \r
-               session = NXMCSharedData.getInstance().getSession();\r
+               session = ConsoleSharedData.getInstance().getSession();\r
                scriptId = Long.parseLong(site.getSecondaryId());\r
        }\r
 \r
index e8f85f5..8cbbbe8 100644 (file)
@@ -48,14 +48,14 @@ import org.eclipse.ui.part.ViewPart;
 import org.eclipse.ui.progress.UIJob;\r
 import org.netxms.api.client.scripts.Script;\r
 import org.netxms.client.NXCSession;\r
+import org.netxms.ui.eclipse.actions.RefreshAction;\r
 import org.netxms.ui.eclipse.jobs.ConsoleJob;\r
 import org.netxms.ui.eclipse.nxsl.Activator;\r
 import org.netxms.ui.eclipse.nxsl.views.helpers.ScriptComparator;\r
 import org.netxms.ui.eclipse.nxsl.views.helpers.ScriptLabelProvider;\r
-import org.netxms.ui.eclipse.shared.NXMCSharedData;\r
-import org.netxms.ui.eclipse.tools.RefreshAction;\r
-import org.netxms.ui.eclipse.tools.SortableTableViewer;\r
+import org.netxms.ui.eclipse.shared.ConsoleSharedData;\r
 import org.netxms.ui.eclipse.tools.WidgetHelper;\r
+import org.netxms.ui.eclipse.widgets.SortableTableViewer;\r
 \r
 /**\r
  * Script library view\r
@@ -84,7 +84,7 @@ public class ScriptLibrary extends ViewPart
        @Override\r
        public void createPartControl(Composite parent)\r
        {\r
-               session = NXMCSharedData.getInstance().getSession();\r
+               session = ConsoleSharedData.getInstance().getSession();\r
                \r
                parent.setLayout(new FillLayout());\r
                \r
index 13f1184..0a9ea94 100644 (file)
@@ -23,7 +23,7 @@ import org.eclipse.jface.viewers.ViewerComparator;
 import org.eclipse.swt.SWT;\r
 import org.netxms.api.client.scripts.Script;\r
 import org.netxms.ui.eclipse.nxsl.views.ScriptLibrary;\r
-import org.netxms.ui.eclipse.tools.SortableTableViewer;\r
+import org.netxms.ui.eclipse.widgets.SortableTableViewer;\r
 \r
 /**\r
  * Comparator for script list\r
index 6e7746c..f7f98dc 100644 (file)
@@ -9,6 +9,7 @@ Require-Bundle: org.netxms.ui.eclipse.library;bundle-version="1.1.0",
  org.eclipse.ui;bundle-version="3.5.0",
  org.eclipse.core.runtime;bundle-version="3.5.0",
  org.eclipse.zest.core;bundle-version="1.1.0",
- org.eclipse.zest.layouts;bundle-version="1.1.0"
+ org.eclipse.zest.layouts;bundle-version="1.1.0",
+ org.netxms.ui.eclipse.console;bundle-version="1.1.0"
 Bundle-RequiredExecutionEnvironment: JavaSE-1.6
 Bundle-ActivationPolicy: lazy
index 1d3b034..12c1810 100644 (file)
@@ -41,7 +41,7 @@ import org.netxms.client.objects.GenericObject;
 import org.netxms.ui.eclipse.networkmaps.views.helpers.MapContentProvider;\r
 import org.netxms.ui.eclipse.networkmaps.views.helpers.MapLabelProvider;\r
 import org.netxms.ui.eclipse.shared.IActionConstants;\r
-import org.netxms.ui.eclipse.shared.NXMCSharedData;\r
+import org.netxms.ui.eclipse.shared.ConsoleSharedData;\r
 \r
 public abstract class NetworkMap extends ViewPart\r
 {\r
@@ -58,7 +58,7 @@ public abstract class NetworkMap extends ViewPart
        {\r
                super.init(site);\r
 \r
-               session = NXMCSharedData.getInstance().getSession();\r
+               session = ConsoleSharedData.getInstance().getSession();\r
                rootObject = session.findObjectById(Long.parseLong(site.getSecondaryId()));\r
        \r
                buildMapPage();\r
index 7bb3646..42ea42e 100644 (file)
@@ -23,7 +23,7 @@ import org.eclipse.zest.core.viewers.IGraphEntityContentProvider;
 import org.netxms.client.NXCSession;\r
 import org.netxms.client.maps.NetworkMapPage;\r
 import org.netxms.client.objects.GenericObject;\r
-import org.netxms.ui.eclipse.shared.NXMCSharedData;\r
+import org.netxms.ui.eclipse.shared.ConsoleSharedData;\r
 \r
 /**\r
  * Content provider for map\r
@@ -39,7 +39,7 @@ public class MapContentProvider implements IGraphEntityContentProvider
         */\r
        public MapContentProvider()\r
        {\r
-               session = NXMCSharedData.getInstance().getSession();\r
+               session = ConsoleSharedData.getInstance().getSession();\r
        }\r
        \r
        @Override\r
index 7367dc6..62ebcd8 100644 (file)
@@ -28,8 +28,8 @@ import org.eclipse.swt.widgets.Display;
 import org.eclipse.zest.core.viewers.GraphViewer;\r
 import org.eclipse.zest.core.viewers.IFigureProvider;\r
 import org.netxms.client.objects.GenericObject;\r
+import org.netxms.ui.eclipse.console.resources.StatusDisplayInfo;\r
 import org.netxms.ui.eclipse.networkmaps.Activator;\r
-import org.netxms.ui.eclipse.shared.StatusDisplayInfo;\r
 \r
 /**\r
  * Label provider for map\r
index 59eb90a..b47ea63 100644 (file)
@@ -30,7 +30,7 @@ import org.eclipse.swt.graphics.Color;
 import org.eclipse.swt.graphics.Image;\r
 import org.eclipse.swt.widgets.Display;\r
 import org.netxms.client.objects.GenericObject;\r
-import org.netxms.ui.eclipse.shared.StatusDisplayInfo;\r
+import org.netxms.ui.eclipse.console.resources.StatusDisplayInfo;\r
 \r
 /**\r
  * Figure representing NetXMS object\r
index 62ccf0d..bf07f87 100644 (file)
@@ -25,7 +25,7 @@ import org.eclipse.draw2d.text.FlowPage;
 import org.eclipse.draw2d.text.TextFlow;\r
 import org.netxms.client.objects.GenericObject;\r
 import org.netxms.client.objects.Node;\r
-import org.netxms.ui.eclipse.shared.StatusDisplayInfo;\r
+import org.netxms.ui.eclipse.console.resources.StatusDisplayInfo;\r
 \r
 /**\r
  * @author victor\r
index aba038f..1904a67 100644 (file)
@@ -7,7 +7,8 @@ Bundle-Activator: org.netxms.ui.eclipse.objectbrowser.Activator
 Bundle-Vendor: netxms.org
 Require-Bundle: org.eclipse.ui,
  org.eclipse.core.runtime,
- org.netxms.ui.eclipse.library;bundle-version="1.1.0"
+ org.netxms.ui.eclipse.library;bundle-version="1.1.0",
+ org.netxms.ui.eclipse.console;bundle-version="1.1.0"
 Bundle-RequiredExecutionEnvironment: JavaSE-1.6
 Bundle-ActivationPolicy: lazy
 Export-Package: org.netxms.ui.eclipse.objectbrowser.dialogs,
index 9e9680f..fd1e23b 100644 (file)
@@ -25,7 +25,7 @@ import org.eclipse.jface.resource.ImageDescriptor;
 import org.eclipse.ui.model.IWorkbenchAdapter;\r
 import org.netxms.client.NXCSession;\r
 import org.netxms.client.objects.GenericObject;\r
-import org.netxms.ui.eclipse.shared.NXMCSharedData;\r
+import org.netxms.ui.eclipse.shared.ConsoleSharedData;\r
 \r
 /**\r
  * Adapter factory for NetXMS objects\r
@@ -137,7 +137,7 @@ public class ObjectAdapterFactory implements IAdapterFactory
                                        @Override\r
                                        public Object getParent(Object o)\r
                                        {\r
-                                               NXCSession session = NXMCSharedData.getInstance().getSession();\r
+                                               NXCSession session = ConsoleSharedData.getInstance().getSession();\r
                                                if (session != null)\r
                                                {\r
                                                        Iterator<Long> it = ((GenericObject)o).getParents();\r
index e2e4010..59c43fd 100644 (file)
@@ -52,7 +52,7 @@ import org.netxms.ui.eclipse.objectbrowser.Activator;
 import org.netxms.ui.eclipse.objectbrowser.Messages;\r
 import org.netxms.ui.eclipse.objectbrowser.widgets.internal.ObjectListFilter;\r
 import org.netxms.ui.eclipse.shared.IUIConstants;\r
-import org.netxms.ui.eclipse.shared.NXMCSharedData;\r
+import org.netxms.ui.eclipse.shared.ConsoleSharedData;\r
 import org.netxms.ui.eclipse.tools.WidgetHelper;\r
 \r
 /**\r
@@ -108,7 +108,7 @@ public class ChildObjectListDialog extends Dialog
        {\r
                Composite dialogArea = (Composite)super.createDialogArea(parent);\r
                \r
-               GenericObject object = NXMCSharedData.getInstance().getSession().findObjectById(parentObject);\r
+               GenericObject object = ConsoleSharedData.getInstance().getSession().findObjectById(parentObject);\r
                GenericObject[] sourceObjects = object.getChildsAsArray();\r
                \r
                GridLayout layout = new GridLayout();\r
index c0a00ef..418bdc4 100644 (file)
@@ -39,7 +39,7 @@ import org.netxms.client.objects.GenericObject;
 import org.netxms.ui.eclipse.objectbrowser.Activator;\r
 import org.netxms.ui.eclipse.objectbrowser.Messages;\r
 import org.netxms.ui.eclipse.objectbrowser.widgets.ObjectTree;\r
-import org.netxms.ui.eclipse.shared.NXMCSharedData;\r
+import org.netxms.ui.eclipse.shared.ConsoleSharedData;\r
 \r
 /**\r
  * @author Victor\r
@@ -203,7 +203,7 @@ public class ObjectSelectionDialog extends Dialog
                if (selectedObjects == null)\r
                        return new ArrayList<GenericObject>(0);\r
 \r
-               return NXMCSharedData.getInstance().getSession().findMultipleObjects(selectedObjects);\r
+               return ConsoleSharedData.getInstance().getSession().findMultipleObjects(selectedObjects);\r
        }\r
 \r
        /**\r
@@ -217,7 +217,7 @@ public class ObjectSelectionDialog extends Dialog
                if (selectedObjects == null)\r
                        return new GenericObject[0];\r
 \r
-               final NXCSession session = NXMCSharedData.getInstance().getSession();\r
+               final NXCSession session = ConsoleSharedData.getInstance().getSession();\r
                final Set<GenericObject> resultSet = new HashSet<GenericObject>(selectedObjects.length);\r
                for(int i = 0; i < selectedObjects.length; i++)\r
                {\r
index 791889b..8824fe3 100644 (file)
@@ -36,7 +36,7 @@ import org.eclipse.ui.part.ViewPart;
 import org.netxms.ui.eclipse.objectbrowser.Messages;\r
 import org.netxms.ui.eclipse.objectbrowser.widgets.ObjectTree;\r
 import org.netxms.ui.eclipse.shared.IActionConstants;\r
-import org.netxms.ui.eclipse.shared.NXMCSharedData;\r
+import org.netxms.ui.eclipse.shared.ConsoleSharedData;\r
 \r
 \r
 /**\r
@@ -143,7 +143,7 @@ public class ObjectBrowser extends ViewPart
                \r
                // Read custom root objects\r
                long[] rootObjects = null;\r
-               Object value = NXMCSharedData.getInstance().getProperty("ObjectBrowser.rootObjects"); //$NON-NLS-1$\r
+               Object value = ConsoleSharedData.getInstance().getProperty("ObjectBrowser.rootObjects"); //$NON-NLS-1$\r
                if ((value != null) && (value instanceof long[]))\r
                {\r
                        rootObjects = (long[])value;\r
index 6267b14..b49f188 100644 (file)
@@ -46,7 +46,7 @@ import org.netxms.client.NXCSession;
 import org.netxms.ui.eclipse.objectbrowser.Messages;\r
 import org.netxms.ui.eclipse.objectbrowser.widgets.internal.ObjectListFilter;\r
 import org.netxms.ui.eclipse.objectbrowser.widgets.internal.ObjectTreeComparator;\r
-import org.netxms.ui.eclipse.shared.NXMCSharedData;\r
+import org.netxms.ui.eclipse.shared.ConsoleSharedData;\r
 \r
 /**\r
  * Object list widget\r
@@ -75,7 +75,7 @@ public class ObjectList extends Composite
        {\r
                super(parent, style);\r
 \r
-               session = NXMCSharedData.getInstance().getSession();\r
+               session = ConsoleSharedData.getInstance().getSession();\r
 \r
                FormLayout formLayout = new FormLayout();\r
                setLayout(formLayout);\r
@@ -130,7 +130,7 @@ public class ObjectList extends Composite
                                                @Override\r
                                                public IStatus runInUIThread(IProgressMonitor monitor)\r
                                                {\r
-                                                       objectList.setInput(NXMCSharedData.getInstance().getSession().getAllObjects());\r
+                                                       objectList.setInput(ConsoleSharedData.getInstance().getSession().getAllObjects());\r
                                                        objectList.refresh();\r
                                                        return Status.OK_STATUS;\r
                                                }\r
index 3dc2282..a1df673 100644 (file)
@@ -23,7 +23,7 @@ import org.eclipse.swt.widgets.Composite;
 import org.netxms.client.objects.GenericObject;\r
 import org.netxms.ui.eclipse.objectbrowser.Messages;\r
 import org.netxms.ui.eclipse.objectbrowser.dialogs.ObjectSelectionDialog;\r
-import org.netxms.ui.eclipse.shared.NXMCSharedData;\r
+import org.netxms.ui.eclipse.shared.ConsoleSharedData;\r
 import org.netxms.ui.eclipse.widgets.AbstractSelector;\r
 \r
 /**\r
@@ -89,7 +89,7 @@ public class ObjectSelector extends AbstractSelector
                }\r
                else\r
                {\r
-                       final GenericObject object = NXMCSharedData.getInstance().getSession().findObjectById(objectId);\r
+                       final GenericObject object = ConsoleSharedData.getInstance().getSession().findObjectById(objectId);\r
                        setText((object != null) ? object.getObjectName() : Messages.getString("ObjectSelector.unknown")); //$NON-NLS-1$\r
                }\r
        }\r
index 0618e25..7ce5b98 100644 (file)
@@ -56,7 +56,7 @@ import org.netxms.ui.eclipse.objectbrowser.Messages;
 import org.netxms.ui.eclipse.objectbrowser.widgets.internal.ObjectTreeComparator;\r
 import org.netxms.ui.eclipse.objectbrowser.widgets.internal.ObjectTreeContentProvider;\r
 import org.netxms.ui.eclipse.objectbrowser.widgets.internal.ObjectTreeFilter;\r
-import org.netxms.ui.eclipse.shared.NXMCSharedData;\r
+import org.netxms.ui.eclipse.shared.ConsoleSharedData;\r
 \r
 /**\r
  * @author victor\r
@@ -89,7 +89,7 @@ public class ObjectTree extends Composite
        {\r
                super(parent, style);\r
                \r
-               session = NXMCSharedData.getInstance().getSession();\r
+               session = ConsoleSharedData.getInstance().getSession();\r
 \r
                FormLayout formLayout = new FormLayout();\r
                setLayout(formLayout);\r
index 1ae9153..82177c1 100644 (file)
@@ -25,7 +25,7 @@ import java.util.Set;
 import org.eclipse.jface.viewers.Viewer;\r
 import org.eclipse.jface.viewers.ViewerFilter;\r
 import org.netxms.client.objects.GenericObject;\r
-import org.netxms.ui.eclipse.shared.NXMCSharedData;\r
+import org.netxms.ui.eclipse.shared.ConsoleSharedData;\r
 \r
 /**\r
  * Filter for object list\r
@@ -100,7 +100,7 @@ public class ObjectListFilter extends ViewerFilter
                {\r
                        if (doFullSearch)\r
                        {\r
-                               GenericObject[] fullList = (sourceObjects != null) ? sourceObjects : NXMCSharedData.getInstance().getSession().getAllObjects();\r
+                               GenericObject[] fullList = (sourceObjects != null) ? sourceObjects : ConsoleSharedData.getInstance().getSession().getAllObjects();\r
                                objectList = new HashMap<Long, GenericObject>();\r
                                for(int i = 0; i < fullList.length; i++)\r
                                        if (fullList[i].getObjectName().toLowerCase().startsWith(filterString))\r
index 1707d0b..bcb05a5 100644 (file)
@@ -26,7 +26,7 @@ import java.util.Set;
 import org.eclipse.jface.viewers.Viewer;\r
 import org.eclipse.jface.viewers.ViewerFilter;\r
 import org.netxms.client.objects.GenericObject;\r
-import org.netxms.ui.eclipse.shared.NXMCSharedData;\r
+import org.netxms.ui.eclipse.shared.ConsoleSharedData;\r
 \r
 /**\r
  * Filter for object tree\r
@@ -109,7 +109,7 @@ public class ObjectTreeFilter extends ViewerFilter
                {\r
                        if (doFullSearch)\r
                        {\r
-                               GenericObject[] fullList = NXMCSharedData.getInstance().getSession().getAllObjects();\r
+                               GenericObject[] fullList = ConsoleSharedData.getInstance().getSession().getAllObjects();\r
                                objectList = new HashMap<Long, GenericObject>();\r
                                for(int i = 0; i < fullList.length; i++)\r
                                        if ((fullList[i].getObjectName().toLowerCase().startsWith(filterString)) &&\r
index 53df0fd..270b372 100644 (file)
@@ -9,6 +9,7 @@ Require-Bundle: org.eclipse.ui,
  org.eclipse.core.runtime,
  org.netxms.ui.eclipse.library;bundle-version="1.1.0",
  org.netxms.ui.eclipse.objectbrowser;bundle-version="1.1.0",
- org.netxms.ui.eclipse.usermanager;bundle-version="1.1.0"
+ org.netxms.ui.eclipse.usermanager;bundle-version="1.1.0",
+ org.netxms.ui.eclipse.console;bundle-version="1.1.0"
 Bundle-RequiredExecutionEnvironment: JavaSE-1.6
 Bundle-ActivationPolicy: lazy
index e1d2ef1..95649ee 100644 (file)
@@ -22,7 +22,7 @@ import org.eclipse.jface.viewers.ITableLabelProvider;
 import org.eclipse.jface.viewers.Viewer;\r
 import org.eclipse.jface.viewers.ViewerComparator;\r
 import org.eclipse.swt.SWT;\r
-import org.netxms.ui.eclipse.tools.SortableTableViewer;\r
+import org.netxms.ui.eclipse.widgets.SortableTableViewer;\r
 \r
 /**\r
  * Comparator for access list elements\r
index 0b1d4b9..e88805b 100644 (file)
@@ -35,7 +35,7 @@ import org.netxms.client.objects.ServiceRoot;
 import org.netxms.ui.eclipse.jobs.ConsoleJob;
 import org.netxms.ui.eclipse.objectbrowser.dialogs.ObjectSelectionDialog;
 import org.netxms.ui.eclipse.objectmanager.Activator;
-import org.netxms.ui.eclipse.shared.NXMCSharedData;
+import org.netxms.ui.eclipse.shared.ConsoleSharedData;
 
 public class BindObject implements IObjectActionDelegate
 {
@@ -61,7 +61,7 @@ public class BindObject implements IObjectActionDelegate
                dlg.open();
                if (dlg.getReturnCode() == Window.OK)
                {
-                       final NXCSession session = NXMCSharedData.getInstance().getSession();
+                       final NXCSession session = (NXCSession)ConsoleSharedData.getSession();
                        new ConsoleJob("Bind object", viewPart, Activator.PLUGIN_ID, null) {
                                @Override
                                protected String getErrorMessage()
index 26b25ee..357f6fb 100644 (file)
@@ -18,7 +18,7 @@ import org.netxms.client.NXCSession;
 import org.netxms.client.objects.Node;\r
 import org.netxms.ui.eclipse.objectmanager.Activator;\r
 import org.netxms.ui.eclipse.objectmanager.dialogs.EnterIpAddressDialog;\r
-import org.netxms.ui.eclipse.shared.NXMCSharedData;\r
+import org.netxms.ui.eclipse.shared.ConsoleSharedData;\r
 \r
 public class ChangeIpAddress implements IObjectActionDelegate\r
 {\r
@@ -43,7 +43,7 @@ public class ChangeIpAddress implements IObjectActionDelegate
                        protected IStatus run(IProgressMonitor monitor)\r
                        {\r
                                IStatus status;\r
-                               final NXCSession session = NXMCSharedData.getInstance().getSession();\r
+                               final NXCSession session = (NXCSession)ConsoleSharedData.getSession();\r
                                try\r
                                {\r
                                        session.changeNodeIpAddress(node.getObjectId(), dlg.getIpAddress());\r
index 097771e..f881a27 100644 (file)
@@ -17,7 +17,7 @@ import org.netxms.client.NXCException;
 import org.netxms.client.NXCSession;\r
 import org.netxms.client.objects.GenericObject;\r
 import org.netxms.ui.eclipse.objectmanager.Activator;\r
-import org.netxms.ui.eclipse.shared.NXMCSharedData;\r
+import org.netxms.ui.eclipse.shared.ConsoleSharedData;\r
 \r
 public abstract class MultipleObjectAction implements IObjectActionDelegate\r
 {\r
@@ -86,7 +86,7 @@ public abstract class MultipleObjectAction implements IObjectActionDelegate
                                protected IStatus run(IProgressMonitor monitor)\r
                                {\r
                                        IStatus status;\r
-                                       final NXCSession session = NXMCSharedData.getInstance().getSession();\r
+                                       final NXCSession session = (NXCSession)ConsoleSharedData.getSession();\r
                                        try\r
                                        {\r
                                                runObjectAction(session, object);\r
index 164a8f0..9a7fd4a 100644 (file)
@@ -35,7 +35,7 @@ import org.netxms.client.objects.ServiceRoot;
 import org.netxms.ui.eclipse.jobs.ConsoleJob;\r
 import org.netxms.ui.eclipse.objectbrowser.dialogs.ChildObjectListDialog;\r
 import org.netxms.ui.eclipse.objectmanager.Activator;\r
-import org.netxms.ui.eclipse.shared.NXMCSharedData;\r
+import org.netxms.ui.eclipse.shared.ConsoleSharedData;\r
 \r
 /**\r
  * @author victor\r
@@ -65,7 +65,7 @@ public class UnbindObject implements IObjectActionDelegate
                dlg.open();\r
                if (dlg.getReturnCode() == Window.OK)\r
                {\r
-                       final NXCSession session = NXMCSharedData.getInstance().getSession();\r
+                       final NXCSession session = (NXCSession)ConsoleSharedData.getSession();\r
                        new ConsoleJob("Unbind object", viewPart, Activator.PLUGIN_ID, null) {\r
                                @Override\r
                                protected String getErrorMessage()\r
index e1bee6c..e09ae34 100644 (file)
@@ -1,5 +1,20 @@
 /**\r
- * \r
+ * NetXMS - open source network management system\r
+ * Copyright (C) 2003-2010 Victor Kirhenshtein\r
+ *\r
+ * This program is free software; you can redistribute it and/or modify\r
+ * it under the terms of the GNU General Public License as published by\r
+ * the Free Software Foundation; either version 2 of the License, or\r
+ * (at your option) any later version.\r
+ *\r
+ * This program is distributed in the hope that it will be useful,\r
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of\r
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the\r
+ * GNU General Public License for more details.\r
+ *\r
+ * You should have received a copy of the GNU General Public License\r
+ * along with this program; if not, write to the Free Software\r
+ * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.\r
  */\r
 package org.netxms.ui.eclipse.objectmanager.dialogs;\r
 \r
@@ -11,11 +26,11 @@ import org.eclipse.swt.widgets.Control;
 import org.eclipse.swt.widgets.Label;\r
 import org.eclipse.swt.widgets.Shell;\r
 import org.eclipse.swt.widgets.Text;\r
-import org.netxms.ui.eclipse.shared.IUIConstants;\r
+import org.netxms.ui.eclipse.tools.WidgetHelper;\r
 \r
 \r
 /**\r
- * @author victor\r
+ * Object's custom attribute edit dialog\r
  *\r
  */\r
 public class AttributeEditDialog extends Dialog\r
@@ -45,8 +60,8 @@ public class AttributeEditDialog extends Dialog
                \r
                FillLayout layout = new FillLayout();\r
       layout.type = SWT.VERTICAL;\r
-      layout.marginWidth = IUIConstants.DIALOG_WIDTH_MARGIN;\r
-      layout.marginHeight = IUIConstants.DIALOG_HEIGHT_MARGIN;\r
+      layout.marginWidth = WidgetHelper.DIALOG_WIDTH_MARGIN;\r
+      layout.marginHeight = WidgetHelper.DIALOG_HEIGHT_MARGIN;\r
       dialogArea.setLayout(layout);\r
                \r
       Label label = new Label(dialogArea, SWT.NONE);\r
index 0de9f4c..b68d38e 100644 (file)
@@ -1,5 +1,20 @@
 /**\r
- * \r
+ * NetXMS - open source network management system\r
+ * Copyright (C) 2003-2010 Victor Kirhenshtein\r
+ *\r
+ * This program is free software; you can redistribute it and/or modify\r
+ * it under the terms of the GNU General Public License as published by\r
+ * the Free Software Foundation; either version 2 of the License, or\r
+ * (at your option) any later version.\r
+ *\r
+ * This program is distributed in the hope that it will be useful,\r
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of\r
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the\r
+ * GNU General Public License for more details.\r
+ *\r
+ * You should have received a copy of the GNU General Public License\r
+ * along with this program; if not, write to the Free Software\r
+ * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.\r
  */\r
 package org.netxms.ui.eclipse.objectmanager.dialogs;\r
 \r
@@ -14,11 +29,10 @@ import org.eclipse.swt.widgets.Composite;
 import org.eclipse.swt.widgets.Control;\r
 import org.eclipse.swt.widgets.Shell;\r
 import org.eclipse.swt.widgets.Text;\r
-import org.netxms.ui.eclipse.shared.IUIConstants;\r
 import org.netxms.ui.eclipse.tools.WidgetHelper;\r
 \r
 /**\r
- * @author Victor\r
+ * Dialog for entering IP address\r
  *\r
  */\r
 public class EnterIpAddressDialog extends Dialog\r
@@ -45,8 +59,8 @@ public class EnterIpAddressDialog extends Dialog
                Composite dialogArea = (Composite)super.createDialogArea(parent);\r
 \r
                GridLayout layout = new GridLayout();\r
-      layout.marginWidth = IUIConstants.DIALOG_WIDTH_MARGIN;\r
-      layout.marginHeight = IUIConstants.DIALOG_HEIGHT_MARGIN;\r
+      layout.marginWidth = WidgetHelper.DIALOG_WIDTH_MARGIN;\r
+      layout.marginHeight = WidgetHelper.DIALOG_HEIGHT_MARGIN;\r
       dialogArea.setLayout(layout);\r
                \r
       textAddress = WidgetHelper.createLabeledText(dialogArea, SWT.SINGLE | SWT.BORDER, SWT.DEFAULT, "New IP address", "",\r
index de694e8..1c16ad5 100644 (file)
@@ -1,5 +1,20 @@
 /**\r
- * \r
+ * NetXMS - open source network management system\r
+ * Copyright (C) 2003-2010 Victor Kirhenshtein\r
+ *\r
+ * This program is free software; you can redistribute it and/or modify\r
+ * it under the terms of the GNU General Public License as published by\r
+ * the Free Software Foundation; either version 2 of the License, or\r
+ * (at your option) any later version.\r
+ *\r
+ * This program is distributed in the hope that it will be useful,\r
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of\r
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the\r
+ * GNU General Public License for more details.\r
+ *\r
+ * You should have received a copy of the GNU General Public License\r
+ * along with this program; if not, write to the Free Software\r
+ * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.\r
  */\r
 package org.netxms.ui.eclipse.objectmanager.propertypages;\r
 \r
@@ -33,18 +48,19 @@ import org.netxms.api.client.users.AbstractUserObject;
 import org.netxms.client.AccessListElement;\r
 import org.netxms.client.NXCException;\r
 import org.netxms.client.NXCObjectModificationData;\r
+import org.netxms.client.NXCSession;\r
 import org.netxms.client.constants.UserAccessRights;\r
 import org.netxms.client.objects.GenericObject;\r
 import org.netxms.ui.eclipse.objectmanager.AccessListComparator;\r
 import org.netxms.ui.eclipse.objectmanager.AccessListLabelProvider;\r
 import org.netxms.ui.eclipse.objectmanager.Activator;\r
-import org.netxms.ui.eclipse.shared.NXMCSharedData;\r
-import org.netxms.ui.eclipse.tools.SortableTableViewer;\r
+import org.netxms.ui.eclipse.shared.ConsoleSharedData;\r
 import org.netxms.ui.eclipse.tools.WidgetHelper;\r
 import org.netxms.ui.eclipse.usermanager.dialogs.SelectUserDialog;\r
+import org.netxms.ui.eclipse.widgets.SortableTableViewer;\r
 \r
 /**\r
- * @author Victor\r
+ * Object's "access control" property page\r
  *\r
  */\r
 public class AccessControl extends PropertyPage\r
@@ -290,7 +306,7 @@ public class AccessControl extends PropertyPage
                                        NXCObjectModificationData md = new NXCObjectModificationData(object.getObjectId());\r
                                        md.setACL(acl.values().toArray(new AccessListElement[acl.size()]));\r
                                        md.setInheritAccessRights(inheritAccessRights);\r
-                                       NXMCSharedData.getInstance().getSession().modifyObject(md);\r
+                                       ((NXCSession)ConsoleSharedData.getSession()).modifyObject(md);\r
                                        status = Status.OK_STATUS;\r
                                }\r
                                catch(Exception e)\r
index 57804a1..4218026 100644 (file)
@@ -25,7 +25,7 @@ import org.netxms.client.NXCObjectModificationData;
 import org.netxms.client.objects.Template;\r
 import org.netxms.ui.eclipse.objectmanager.Activator;\r
 import org.netxms.ui.eclipse.shared.IUIConstants;\r
-import org.netxms.ui.eclipse.shared.NXMCSharedData;\r
+import org.netxms.ui.eclipse.shared.ConsoleSharedData;\r
 import org.netxms.ui.eclipse.tools.WidgetHelper;\r
 \r
 /**\r
@@ -141,7 +141,7 @@ public class AutoApply extends PropertyPage
                                                NXCObjectModificationData md = new NXCObjectModificationData(object.getObjectId());\r
                                                md.setAutoApplyEnabled(isAutoApplyEnabled);\r
                                                md.setAutoApplyFilter(newApplyFilter);\r
-                                               NXMCSharedData.getInstance().getSession().modifyObject(md);\r
+                                               ConsoleSharedData.getInstance().getSession().modifyObject(md);\r
                                        }\r
                                        initialApplyFlag = isAutoApplyEnabled;\r
                                        initialApplyFilter = newApplyFilter;\r
index 06cf551..3f6fb21 100644 (file)
@@ -25,7 +25,7 @@ import org.netxms.client.NXCObjectModificationData;
 import org.netxms.client.objects.Container;\r
 import org.netxms.ui.eclipse.objectmanager.Activator;\r
 import org.netxms.ui.eclipse.shared.IUIConstants;\r
-import org.netxms.ui.eclipse.shared.NXMCSharedData;\r
+import org.netxms.ui.eclipse.shared.ConsoleSharedData;\r
 import org.netxms.ui.eclipse.tools.WidgetHelper;\r
 \r
 /**\r
@@ -141,7 +141,7 @@ public class AutoBind extends PropertyPage
                                                NXCObjectModificationData md = new NXCObjectModificationData(object.getObjectId());\r
                                                md.setAutoBindEnabled(isAutoBindEnabled);\r
                                                md.setAutoBindFilter(newAutoBindFilter);\r
-                                               NXMCSharedData.getInstance().getSession().modifyObject(md);\r
+                                               ConsoleSharedData.getInstance().getSession().modifyObject(md);\r
                                        }\r
                                        initialAutoBindFlag = isAutoBindEnabled;\r
                                        initialAutoBindFilter = newAutoBindFilter;\r
index c3e37d7..f35f0a3 100644 (file)
@@ -18,7 +18,7 @@ import org.eclipse.ui.progress.UIJob;
 import org.netxms.client.NXCException;\r
 import org.netxms.client.objects.GenericObject;\r
 import org.netxms.ui.eclipse.objectmanager.Activator;\r
-import org.netxms.ui.eclipse.shared.NXMCSharedData;\r
+import org.netxms.ui.eclipse.shared.ConsoleSharedData;\r
 import org.netxms.ui.eclipse.tools.WidgetHelper;\r
 \r
 /**\r
@@ -87,7 +87,7 @@ public class Comments extends PropertyPage
                                \r
                                try\r
                                {\r
-                                       NXMCSharedData.getInstance().getSession().updateObjectComments(object.getObjectId(), newComments);\r
+                                       ConsoleSharedData.getInstance().getSession().updateObjectComments(object.getObjectId(), newComments);\r
                                        initialComments = newComments;\r
                                        status = Status.OK_STATUS;\r
                                }\r
index 2621b09..04896e0 100644 (file)
@@ -27,7 +27,7 @@ import org.netxms.client.NXCObjectModificationData;
 import org.netxms.client.objects.Node;\r
 import org.netxms.ui.eclipse.objectbrowser.widgets.ObjectSelector;\r
 import org.netxms.ui.eclipse.objectmanager.Activator;\r
-import org.netxms.ui.eclipse.shared.NXMCSharedData;\r
+import org.netxms.ui.eclipse.shared.ConsoleSharedData;\r
 import org.netxms.ui.eclipse.tools.WidgetHelper;\r
 import org.netxms.ui.eclipse.widgets.LabeledText;\r
 \r
@@ -308,7 +308,7 @@ public class Communication extends PropertyPage
                                \r
                                try\r
                                {\r
-                                       NXMCSharedData.getInstance().getSession().modifyObject(md);\r
+                                       ConsoleSharedData.getInstance().getSession().modifyObject(md);\r
                                        status = Status.OK_STATUS;\r
                                }\r
                                catch(Exception e)\r
index 443fd8c..d2e21b1 100644 (file)
@@ -37,9 +37,9 @@ import org.netxms.ui.eclipse.objectmanager.Activator;
 import org.netxms.ui.eclipse.objectmanager.AttrListLabelProvider;\r
 import org.netxms.ui.eclipse.objectmanager.AttrViewerComparator;\r
 import org.netxms.ui.eclipse.objectmanager.dialogs.AttributeEditDialog;\r
-import org.netxms.ui.eclipse.shared.NXMCSharedData;\r
-import org.netxms.ui.eclipse.tools.SortableTableViewer;\r
+import org.netxms.ui.eclipse.shared.ConsoleSharedData;\r
 import org.netxms.ui.eclipse.tools.WidgetHelper;\r
+import org.netxms.ui.eclipse.widgets.SortableTableViewer;\r
 \r
 /**\r
  * @author Victor\r
@@ -226,7 +226,7 @@ public class CustomAttributes extends PropertyPage
                                        {\r
                                                NXCObjectModificationData md = new NXCObjectModificationData(object.getObjectId());\r
                                                md.setCustomAttributes(attributes);\r
-                                               NXMCSharedData.getInstance().getSession().modifyObject(md);\r
+                                               ConsoleSharedData.getInstance().getSession().modifyObject(md);\r
                                        }\r
                                        isModified = false;\r
                                        status = Status.OK_STATUS;\r
index 415d30b..3fafc1a 100644 (file)
@@ -17,7 +17,7 @@ import org.eclipse.ui.progress.UIJob;
 import org.netxms.client.NXCException;\r
 import org.netxms.client.objects.GenericObject;\r
 import org.netxms.ui.eclipse.objectmanager.Activator;\r
-import org.netxms.ui.eclipse.shared.NXMCSharedData;\r
+import org.netxms.ui.eclipse.shared.ConsoleSharedData;\r
 import org.netxms.ui.eclipse.tools.WidgetHelper;\r
 \r
 /**\r
@@ -87,7 +87,7 @@ public class General extends PropertyPage
                                try\r
                                {\r
                                        if (object != null)\r
-                                               NXMCSharedData.getInstance().getSession().setObjectName(object.getObjectId(), newName);\r
+                                               ConsoleSharedData.getInstance().getSession().setObjectName(object.getObjectId(), newName);\r
                                        initialName = newName;\r
                                        status = Status.OK_STATUS;\r
                                }\r
index 55156be..1cef0c6 100644 (file)
@@ -47,9 +47,9 @@ import org.netxms.client.objects.GenericObject;
 import org.netxms.ui.eclipse.objectbrowser.dialogs.ObjectSelectionDialog;\r
 import org.netxms.ui.eclipse.objectmanager.Activator;\r
 import org.netxms.ui.eclipse.objectmanager.TrustedNodesComparator;\r
-import org.netxms.ui.eclipse.shared.NXMCSharedData;\r
-import org.netxms.ui.eclipse.tools.SortableTableViewer;\r
+import org.netxms.ui.eclipse.shared.ConsoleSharedData;\r
 import org.netxms.ui.eclipse.tools.WidgetHelper;\r
+import org.netxms.ui.eclipse.widgets.SortableTableViewer;\r
 \r
 /**\r
  * @author Victor\r
@@ -198,7 +198,7 @@ public class TrustedNodes extends PropertyPage
                                                for(long id : idList)\r
                                                        nodes[i++] = id;\r
                                                md.setTrustedNodes(nodes);\r
-                                               NXMCSharedData.getInstance().getSession().modifyObject(md);\r
+                                               ConsoleSharedData.getInstance().getSession().modifyObject(md);\r
                                        }\r
                                        isModified = false;\r
                                        status = Status.OK_STATUS;\r
index 81052e0..509154c 100644 (file)
@@ -9,6 +9,7 @@ Require-Bundle: org.eclipse.ui,
  org.eclipse.core.runtime,
  org.netxms.ui.eclipse.library;bundle-version="1.1.0",
  org.eclipse.core.expressions;bundle-version="3.4.101",
- org.eclipse.ui.console;bundle-version="3.4.0"
+ org.eclipse.ui.console;bundle-version="3.4.0",
+ org.netxms.ui.eclipse.console;bundle-version="1.1.0"
 Bundle-RequiredExecutionEnvironment: JavaSE-1.6
 Bundle-ActivationPolicy: lazy
index a59b989..9d896bb 100644 (file)
@@ -31,7 +31,7 @@ import org.netxms.client.NXCListener;
 import org.netxms.client.NXCNotification;\r
 import org.netxms.client.NXCSession;\r
 import org.netxms.client.objecttools.ObjectTool;\r
-import org.netxms.ui.eclipse.shared.NXMCSharedData;\r
+import org.netxms.ui.eclipse.shared.ConsoleSharedData;\r
 \r
 /**\r
  * Cache for object tools\r
@@ -48,7 +48,7 @@ public class ObjectToolsCache
         */\r
        public static void init()\r
        {\r
-               session = NXMCSharedData.getInstance().getSession();\r
+               session = ConsoleSharedData.getInstance().getSession();\r
                \r
                reload();\r
                \r
index 5cf75ef..9bb0da6 100644 (file)
@@ -53,7 +53,7 @@ import org.netxms.client.NXCSession;
 import org.netxms.client.objects.Node;\r
 import org.netxms.client.objecttools.ObjectTool;\r
 import org.netxms.ui.eclipse.jobs.ConsoleJob;\r
-import org.netxms.ui.eclipse.shared.NXMCSharedData;\r
+import org.netxms.ui.eclipse.shared.ConsoleSharedData;\r
 \r
 /**\r
  * Dynamic object tools menu creator\r
@@ -241,7 +241,7 @@ public class ObjectToolsDynamicMenu extends ContributionItem implements IWorkben
                                        @Override\r
                                        protected void runInternal(IProgressMonitor monitor) throws Exception\r
                                        {\r
-                                               final NXCSession session = NXMCSharedData.getInstance().getSession();\r
+                                               final NXCSession session = ConsoleSharedData.getInstance().getSession();\r
                                                session.executeAction(node.getObjectId(), tool.getData());\r
                                                new UIJob("Notify user about action execution") {\r
                                                        @Override\r
index 90ad65f..17e80f5 100644 (file)
@@ -23,7 +23,7 @@ import org.eclipse.core.runtime.IStatus;
 import org.eclipse.core.runtime.Status;\r
 import org.eclipse.core.runtime.jobs.Job;\r
 import org.eclipse.ui.IStartup;\r
-import org.netxms.ui.eclipse.shared.NXMCSharedData;\r
+import org.netxms.ui.eclipse.shared.ConsoleSharedData;\r
 \r
 /**\r
  * Early startup class\r
@@ -42,7 +42,7 @@ public class Startup implements IStartup
                        @Override\r
                        protected IStatus run(IProgressMonitor monitor)\r
                        {\r
-                               while(NXMCSharedData.getInstance().getSession() == null)\r
+                               while(ConsoleSharedData.getInstance().getSession() == null)\r
                                {\r
                                        try\r
                                        {\r
index 61716e9..a571fea 100644 (file)
@@ -7,7 +7,8 @@ Bundle-Activator: org.netxms.ui.eclipse.objectview.Activator
 Bundle-Vendor: netxms.org
 Require-Bundle: org.eclipse.ui,
  org.eclipse.core.runtime,
- org.netxms.ui.eclipse.library;bundle-version="1.1.0"
+ org.netxms.ui.eclipse.library;bundle-version="1.1.0",
+ org.netxms.ui.eclipse.console;bundle-version="1.1.0"
 Bundle-RequiredExecutionEnvironment: JavaSE-1.6
 Bundle-ActivationPolicy: lazy
 Export-Package: org.netxms.ui.eclipse.objectview.objecttabs
index 1e71827..74d970d 100644 (file)
@@ -8,6 +8,7 @@ Bundle-Vendor: netxms.org
 Require-Bundle: org.netxms.ui.eclipse.library;bundle-version="1.1.0",
  org.netxms.ui.eclipse.objectbrowser;bundle-version="1.1.0",
  org.eclipse.ui;bundle-version="3.5.0",
- org.eclipse.core.runtime;bundle-version="3.5.0"
+ org.eclipse.core.runtime;bundle-version="3.5.0",
+ org.netxms.ui.eclipse.console;bundle-version="1.1.0"
 Bundle-RequiredExecutionEnvironment: JavaSE-1.6
 Bundle-ActivationPolicy: lazy
index 44bea11..e36af5f 100644 (file)
@@ -21,7 +21,7 @@ import org.netxms.client.objects.PolicyGroup;
 import org.netxms.client.objects.PolicyRoot;\r
 import org.netxms.ui.eclipse.objectbrowser.dialogs.CreateObjectDialog;\r
 import org.netxms.ui.eclipse.policymanager.Activator;\r
-import org.netxms.ui.eclipse.shared.NXMCSharedData;\r
+import org.netxms.ui.eclipse.shared.ConsoleSharedData;\r
 \r
 /**\r
  * @author Victor\r
@@ -58,7 +58,7 @@ public class CreateAgentPolicyConfig implements IObjectActionDelegate
                                        try\r
                                        {\r
                                                NXCObjectCreationData cd = new NXCObjectCreationData(GenericObject.OBJECT_AGENTPOLICY_CONFIG, dlg.getObjectName(), currentObject.getObjectId());\r
-                                               NXMCSharedData.getInstance().getSession().createObject(cd);\r
+                                               ConsoleSharedData.getInstance().getSession().createObject(cd);\r
                                                status = Status.OK_STATUS;\r
                                        }\r
                                        catch(Exception e)\r
index b3da951..4e0b8f1 100644 (file)
@@ -21,7 +21,7 @@ import org.netxms.client.objects.PolicyGroup;
 import org.netxms.client.objects.PolicyRoot;\r
 import org.netxms.ui.eclipse.objectbrowser.dialogs.CreateObjectDialog;\r
 import org.netxms.ui.eclipse.policymanager.Activator;\r
-import org.netxms.ui.eclipse.shared.NXMCSharedData;\r
+import org.netxms.ui.eclipse.shared.ConsoleSharedData;\r
 \r
 /**\r
  * @author Victor\r
@@ -58,7 +58,7 @@ public class CreatePolicyGroup implements IObjectActionDelegate
                                        try\r
                                        {\r
                                                NXCObjectCreationData cd = new NXCObjectCreationData(GenericObject.OBJECT_POLICYGROUP, dlg.getObjectName(), currentObject.getObjectId());\r
-                                               NXMCSharedData.getInstance().getSession().createObject(cd);\r
+                                               ConsoleSharedData.getInstance().getSession().createObject(cd);\r
                                                status = Status.OK_STATUS;\r
                                        }\r
                                        catch(Exception e)\r
index 85e814f..acf2368 100644 (file)
@@ -32,7 +32,7 @@ import org.netxms.client.objects.GenericObject;
 import org.netxms.ui.eclipse.jobs.ConsoleJob;\r
 import org.netxms.ui.eclipse.objectbrowser.dialogs.ObjectSelectionDialog;\r
 import org.netxms.ui.eclipse.policymanager.Activator;\r
-import org.netxms.ui.eclipse.shared.NXMCSharedData;\r
+import org.netxms.ui.eclipse.shared.ConsoleSharedData;\r
 \r
 /**\r
  * Action: deploy policy on agent\r
@@ -60,7 +60,7 @@ public class DeployPolicy implements IObjectActionDelegate
        {\r
                // Read custom root objects\r
                long[] rootObjects = null;\r
-               Object value = NXMCSharedData.getInstance().getProperty("PolicyManager.rootObjects");\r
+               Object value = ConsoleSharedData.getInstance().getProperty("PolicyManager.rootObjects");\r
                if ((value != null) && (value instanceof long[]))\r
                {\r
                        rootObjects = (long[])value;\r
@@ -73,7 +73,7 @@ public class DeployPolicy implements IObjectActionDelegate
                                @Override\r
                                protected void runInternal(IProgressMonitor monitor) throws Exception\r
                                {\r
-                                       NXCSession session = NXMCSharedData.getInstance().getSession();\r
+                                       NXCSession session = ConsoleSharedData.getInstance().getSession();\r
                                        GenericObject[] nodeList = dlg.getSelectedObjects(GenericObject.OBJECT_NODE);\r
                                        for(int i = 0; i < nodeList.length; i++)\r
                                                session.deployAgentPolicy(currentObject.getObjectId(), nodeList[i].getObjectId());\r
index e6d8bbc..56fa36a 100644 (file)
@@ -32,7 +32,7 @@ import org.netxms.client.objects.GenericObject;
 import org.netxms.ui.eclipse.jobs.ConsoleJob;\r
 import org.netxms.ui.eclipse.objectbrowser.dialogs.ObjectSelectionDialog;\r
 import org.netxms.ui.eclipse.policymanager.Activator;\r
-import org.netxms.ui.eclipse.shared.NXMCSharedData;\r
+import org.netxms.ui.eclipse.shared.ConsoleSharedData;\r
 \r
 /**\r
  * @author Victor\r
@@ -60,7 +60,7 @@ public class UninstallPolicy implements IObjectActionDelegate
        {\r
                // Read custom root objects\r
                long[] rootObjects = null;\r
-               Object value = NXMCSharedData.getInstance().getProperty("PolicyManager.rootObjects");\r
+               Object value = ConsoleSharedData.getInstance().getProperty("PolicyManager.rootObjects");\r
                if ((value != null) && (value instanceof long[]))\r
                {\r
                        rootObjects = (long[])value;\r
@@ -73,7 +73,7 @@ public class UninstallPolicy implements IObjectActionDelegate
                                @Override\r
                                protected void runInternal(IProgressMonitor monitor) throws Exception\r
                                {\r
-                                       NXCSession session = NXMCSharedData.getInstance().getSession();\r
+                                       NXCSession session = ConsoleSharedData.getInstance().getSession();\r
                                        GenericObject[] nodeList = dlg.getSelectedObjects(GenericObject.OBJECT_NODE);\r
                                                for(int i = 0; i < nodeList.length; i++)\r
                                                        session.uninstallAgentPolicy(currentObject.getObjectId(), nodeList[i].getObjectId());\r
index cb22996..6a8cfd7 100644 (file)
@@ -20,7 +20,7 @@ import org.netxms.client.NXCException;
 import org.netxms.client.NXCObjectModificationData;\r
 import org.netxms.client.objects.AgentPolicyConfig;\r
 import org.netxms.ui.eclipse.policymanager.Activator;\r
-import org.netxms.ui.eclipse.shared.NXMCSharedData;\r
+import org.netxms.ui.eclipse.shared.ConsoleSharedData;\r
 import org.netxms.ui.eclipse.tools.WidgetHelper;\r
 \r
 /**\r
@@ -108,7 +108,7 @@ public class ConfigFile extends PropertyPage
                                                NXCObjectModificationData md = new NXCObjectModificationData(object.getObjectId());\r
                                                md.setConfigFileName(newName);\r
                                                md.setConfigFileContent(newContent);\r
-                                               NXMCSharedData.getInstance().getSession().modifyObject(md);\r
+                                               ConsoleSharedData.getInstance().getSession().modifyObject(md);\r
                                        }\r
                                        initialName = newName;\r
                                        initialContent = newContent;\r
index b0dab58..428810c 100644 (file)
@@ -18,7 +18,7 @@ import org.netxms.client.NXCException;
 import org.netxms.client.NXCObjectModificationData;\r
 import org.netxms.client.objects.AgentPolicy;\r
 import org.netxms.ui.eclipse.policymanager.Activator;\r
-import org.netxms.ui.eclipse.shared.NXMCSharedData;\r
+import org.netxms.ui.eclipse.shared.ConsoleSharedData;\r
 import org.netxms.ui.eclipse.tools.WidgetHelper;\r
 \r
 /**\r
@@ -85,7 +85,7 @@ public class Policy extends PropertyPage
                                        {\r
                                                NXCObjectModificationData md = new NXCObjectModificationData(object.getObjectId());\r
                                                md.setDescription(newDescription);\r
-                                               NXMCSharedData.getInstance().getSession().modifyObject(md);\r
+                                               ConsoleSharedData.getInstance().getSession().modifyObject(md);\r
                                        }\r
                                        initialDescription = newDescription;\r
                                        status = Status.OK_STATUS;\r
index 8e39c69..093f2fb 100644 (file)
@@ -8,7 +8,8 @@ Bundle-Vendor: netxms.org
 Require-Bundle: org.eclipse.ui,
  org.eclipse.core.runtime,
  org.netxms.ui.eclipse.library;bundle-version="1.1.0",
- org.netxms.ui.eclipse.eventmanager;bundle-version="1.1.0"
+ org.netxms.ui.eclipse.eventmanager;bundle-version="1.1.0",
+ org.netxms.ui.eclipse.console;bundle-version="1.1.0"
 Bundle-RequiredExecutionEnvironment: JavaSE-1.6
 Bundle-ActivationPolicy: lazy
 Export-Package: org.netxms.ui.eclipse.snmp.dialogs,
index e25e3ed..74847fb 100644 (file)
@@ -28,7 +28,7 @@ import org.eclipse.osgi.service.datalocation.Location;
 import org.eclipse.ui.IStartup;\r
 import org.netxms.client.NXCSession;\r
 import org.netxms.client.snmp.MibTree;\r
-import org.netxms.ui.eclipse.shared.NXMCSharedData;\r
+import org.netxms.ui.eclipse.shared.ConsoleSharedData;\r
 \r
 /**\r
  * Early startup class\r
@@ -47,7 +47,7 @@ public class Startup implements IStartup
                        @Override\r
                        protected IStatus run(IProgressMonitor monitor)\r
                        {\r
-                               while(NXMCSharedData.getInstance().getSession() == null)\r
+                               while(ConsoleSharedData.getInstance().getSession() == null)\r
                                {\r
                                        try\r
                                        {\r
@@ -59,7 +59,7 @@ public class Startup implements IStartup
                                }\r
                                try\r
                                {\r
-                                       NXCSession session = NXMCSharedData.getInstance().getSession();\r
+                                       NXCSession session = ConsoleSharedData.getInstance().getSession();\r
                                        Location loc = Platform.getInstanceLocation();\r
                                        if (loc != null)\r
                                        {\r
index 206c9a0..06613e1 100644 (file)
@@ -53,15 +53,15 @@ import org.netxms.api.client.ISessionNotification;
 import org.netxms.client.NXCNotification;\r
 import org.netxms.client.NXCSession;\r
 import org.netxms.client.snmp.SnmpTrap;\r
+import org.netxms.ui.eclipse.actions.RefreshAction;\r
 import org.netxms.ui.eclipse.jobs.ConsoleJob;\r
-import org.netxms.ui.eclipse.shared.NXMCSharedData;\r
+import org.netxms.ui.eclipse.shared.ConsoleSharedData;\r
 import org.netxms.ui.eclipse.snmp.Activator;\r
 import org.netxms.ui.eclipse.snmp.dialogs.TrapConfigurationDialog;\r
 import org.netxms.ui.eclipse.snmp.views.helpers.SnmpTrapComparator;\r
 import org.netxms.ui.eclipse.snmp.views.helpers.SnmpTrapLabelProvider;\r
-import org.netxms.ui.eclipse.tools.RefreshAction;\r
-import org.netxms.ui.eclipse.tools.SortableTableViewer;\r
 import org.netxms.ui.eclipse.tools.WidgetHelper;\r
+import org.netxms.ui.eclipse.widgets.SortableTableViewer;\r
 \r
 /**\r
  * SNMP trap configuration editor\r
@@ -92,7 +92,7 @@ public class SnmpTrapEditor extends ViewPart implements ISessionListener
        @Override\r
        public void createPartControl(Composite parent)\r
        {\r
-               session = NXMCSharedData.getInstance().getSession();\r
+               session = ConsoleSharedData.getInstance().getSession();\r
                \r
                parent.setLayout(new FillLayout());\r
                \r
index ffadbf4..f5b6459 100644 (file)
@@ -26,7 +26,7 @@ import org.eclipse.swt.widgets.TableColumn;
 import org.netxms.client.NXCSession;\r
 import org.netxms.client.events.EventTemplate;\r
 import org.netxms.client.snmp.SnmpTrap;\r
-import org.netxms.ui.eclipse.shared.NXMCSharedData;\r
+import org.netxms.ui.eclipse.shared.ConsoleSharedData;\r
 import org.netxms.ui.eclipse.snmp.views.SnmpTrapEditor;\r
 \r
 /**\r
@@ -42,7 +42,7 @@ public class SnmpTrapComparator extends ViewerComparator
         */\r
        public SnmpTrapComparator()\r
        {\r
-               session = NXMCSharedData.getInstance().getSession();\r
+               session = ConsoleSharedData.getInstance().getSession();\r
        }\r
        \r
        /* (non-Javadoc)\r
index b88792f..70b9083 100644 (file)
@@ -24,7 +24,7 @@ import org.eclipse.swt.graphics.Image;
 import org.netxms.client.NXCSession;\r
 import org.netxms.client.events.EventTemplate;\r
 import org.netxms.client.snmp.SnmpTrap;\r
-import org.netxms.ui.eclipse.shared.NXMCSharedData;\r
+import org.netxms.ui.eclipse.shared.ConsoleSharedData;\r
 import org.netxms.ui.eclipse.snmp.views.SnmpTrapEditor;\r
 \r
 /**\r
@@ -40,7 +40,7 @@ public class SnmpTrapLabelProvider implements ITableLabelProvider
         */\r
        public SnmpTrapLabelProvider()\r
        {\r
-               session = NXMCSharedData.getInstance().getSession();\r
+               session = ConsoleSharedData.getInstance().getSession();\r
        }\r
        \r
        /* (non-Javadoc)\r
index fc42081..6205ee1 100644 (file)
@@ -7,6 +7,7 @@ Bundle-Activator: org.netxms.ui.eclipse.serverconfig.Activator
 Bundle-Vendor: netxms.org
 Require-Bundle: org.eclipse.ui,
  org.eclipse.core.runtime,
- org.netxms.ui.eclipse.library;bundle-version="1.1.0"
+ org.netxms.ui.eclipse.library;bundle-version="1.1.0",
+ org.netxms.ui.eclipse.console;bundle-version="1.1.0"
 Bundle-RequiredExecutionEnvironment: JavaSE-1.6
 Bundle-ActivationPolicy: lazy
index 8a9c6d2..a803bfc 100644 (file)
@@ -33,7 +33,7 @@ import org.netxms.client.NXCException;
 import org.netxms.client.NXCSession;\r
 import org.netxms.ui.eclipse.serverconfig.Activator;\r
 import org.netxms.ui.eclipse.serverconfig.views.ServerConfigurationEditor;\r
-import org.netxms.ui.eclipse.shared.NXMCSharedData;\r
+import org.netxms.ui.eclipse.shared.ConsoleSharedData;\r
 \r
 /**\r
  * @author victor\r
@@ -61,7 +61,7 @@ public class DeleteVariable implements IObjectActionDelegate
                                \r
                                try\r
                                {\r
-                                       NXCSession session = NXMCSharedData.getInstance().getSession();\r
+                                       NXCSession session = ConsoleSharedData.getInstance().getSession();\r
                                        for(int i = 0; i < currentSelection.length; i++)\r
                                        {\r
                                                session.deleteServerVariable(((ServerVariable)currentSelection[i]).getName());\r
index 335c2ac..68f896b 100644 (file)
@@ -34,7 +34,7 @@ import org.netxms.client.NXCException;
 import org.netxms.ui.eclipse.serverconfig.Activator;\r
 import org.netxms.ui.eclipse.serverconfig.dialogs.VariableEditDialog;\r
 import org.netxms.ui.eclipse.serverconfig.views.ServerConfigurationEditor;\r
-import org.netxms.ui.eclipse.shared.NXMCSharedData;\r
+import org.netxms.ui.eclipse.shared.ConsoleSharedData;\r
 \r
 /**\r
  * Action for editing server's variable\r
@@ -68,7 +68,7 @@ public class EditVariable implements IObjectActionDelegate
                                                \r
                                                try\r
                                                {\r
-                                                       NXMCSharedData.getInstance().getSession().setServerVariable(dlg.getVarName(), dlg.getVarValue());\r
+                                                       ConsoleSharedData.getInstance().getSession().setServerVariable(dlg.getVarName(), dlg.getVarValue());\r
                                                        if (wbPart instanceof ServerConfigurationEditor)\r
                                                                ((ServerConfigurationEditor)wbPart).refreshVariablesList();\r
                                                        status = Status.OK_STATUS;\r
index 4ecf5f0..c2bedff 100644 (file)
@@ -35,7 +35,7 @@ import org.netxms.client.NXCSession;
 import org.netxms.ui.eclipse.jobs.ConsoleJob;\r
 import org.netxms.ui.eclipse.serverconfig.Activator;\r
 import org.netxms.ui.eclipse.serverconfig.dialogs.ConfigurationImportDialog;\r
-import org.netxms.ui.eclipse.shared.NXMCSharedData;\r
+import org.netxms.ui.eclipse.shared.ConsoleSharedData;\r
 \r
 /**\r
  * Import configuration from XML\r
@@ -87,7 +87,7 @@ public class ImportConfiguration implements IWorkbenchWindowActionDelegate
                                        file.close();\r
                                        \r
                                        String content = new String(data, "UTF-8");\r
-                                       final NXCSession session = NXMCSharedData.getInstance().getSession();\r
+                                       final NXCSession session = ConsoleSharedData.getInstance().getSession();\r
                                        session.importConfiguration(content, dlg.getFlags());\r
                                        \r
                                        new UIJob("Notify about configuration import completion") {\r
index ca6baa9..f521abf 100644 (file)
@@ -20,11 +20,11 @@ import org.eclipse.swt.SWT;
 import org.netxms.api.client.servermanager.ServerVariable;
 import org.netxms.client.NXCException;
 import org.netxms.client.NXCSession;
+import org.netxms.ui.eclipse.actions.RefreshAction;
 import org.netxms.ui.eclipse.serverconfig.Activator;
 import org.netxms.ui.eclipse.serverconfig.dialogs.VariableEditDialog;
-import org.netxms.ui.eclipse.shared.NXMCSharedData;
-import org.netxms.ui.eclipse.tools.RefreshAction;
-import org.netxms.ui.eclipse.tools.SortableTableViewer;
+import org.netxms.ui.eclipse.shared.ConsoleSharedData;
+import org.netxms.ui.eclipse.widgets.SortableTableViewer;
 
 /**
  */
@@ -226,7 +226,7 @@ public class ServerConfigurationEditor extends ViewPart
                contributeToActionBars();
                createPopupMenu();
                
-               session = NXMCSharedData.getInstance().getSession();
+               session = ConsoleSharedData.getInstance().getSession();
 
                Job job = new RefreshJob();
                IWorkbenchSiteProgressService siteService =
@@ -347,7 +347,7 @@ public class ServerConfigurationEditor extends ViewPart
                                        
                                        try
                                        {
-                                               NXMCSharedData.getInstance().getSession().setServerVariable(dlg.getVarName(), dlg.getVarValue());
+                                               ConsoleSharedData.getInstance().getSession().setServerVariable(dlg.getVarName(), dlg.getVarValue());
                                                actionRefresh.run();
                                                status = Status.OK_STATUS;
                                        }
@@ -401,7 +401,7 @@ public class ServerConfigurationEditor extends ViewPart
                                        
                                        try
                                        {
-                                               NXMCSharedData.getInstance().getSession().setServerVariable(dlg.getVarName(), dlg.getVarValue());
+                                               ConsoleSharedData.getInstance().getSession().setServerVariable(dlg.getVarName(), dlg.getVarValue());
                                                refreshVariablesList();
                                                status = Status.OK_STATUS;
                                        }
index 0fae5b5..8df7966 100644 (file)
@@ -7,6 +7,7 @@ Bundle-Activator: org.netxms.ui.eclipse.serverjobmanager.Activator
 Bundle-Vendor: netxms.org
 Require-Bundle: org.eclipse.ui,
  org.eclipse.core.runtime,
- org.netxms.ui.eclipse.library;bundle-version="1.1.0"
+ org.netxms.ui.eclipse.library;bundle-version="1.1.0",
+ org.netxms.ui.eclipse.console;bundle-version="1.1.0"
 Bundle-RequiredExecutionEnvironment: JavaSE-1.6
 Bundle-ActivationPolicy: lazy
index 36eec67..502f9ce 100644 (file)
@@ -62,10 +62,10 @@ import org.netxms.client.NXCServerJob;
 import org.netxms.client.NXCSession;
 import org.netxms.client.constants.RCC;
 import org.netxms.client.objects.GenericObject;
+import org.netxms.ui.eclipse.actions.RefreshAction;
 import org.netxms.ui.eclipse.serverjobmanager.Activator;
-import org.netxms.ui.eclipse.shared.NXMCSharedData;
-import org.netxms.ui.eclipse.tools.RefreshAction;
-import org.netxms.ui.eclipse.tools.SortableTableViewer;
+import org.netxms.ui.eclipse.shared.ConsoleSharedData;
+import org.netxms.ui.eclipse.widgets.SortableTableViewer;
 
 
 /**
@@ -315,7 +315,7 @@ public class ServerJobManager extends ViewPart
                contributeToActionBars();
                createPopupMenu();
                
-               session = NXMCSharedData.getInstance().getSession();
+               session = ConsoleSharedData.getInstance().getSession();
 
                viewer.addSelectionChangedListener(new ISelectionChangedListener() {
                        @Override
index 3c8c449..0049cdf 100644 (file)
@@ -9,6 +9,7 @@ Require-Bundle: org.eclipse.ui,
  org.eclipse.core.runtime,
  org.eclipse.zest.core;bundle-version="1.2.0",
  org.eclipse.zest.layouts;bundle-version="1.1.0",
- org.netxms.ui.eclipse.library;bundle-version="1.1.0"
+ org.netxms.ui.eclipse.library;bundle-version="1.1.0",
+ org.netxms.ui.eclipse.console;bundle-version="1.1.0"
 Bundle-RequiredExecutionEnvironment: JavaSE-1.6
 Bundle-ActivationPolicy: lazy
index 514c3a3..efa7273 100644 (file)
@@ -9,7 +9,7 @@ import org.eclipse.swt.widgets.Composite;
 import org.eclipse.ui.part.ViewPart;\r
 import org.netxms.client.NXCSession;\r
 import org.netxms.ui.eclipse.serviceview.widgets.ServiceTree;\r
-import org.netxms.ui.eclipse.shared.NXMCSharedData;\r
+import org.netxms.ui.eclipse.shared.ConsoleSharedData;\r
 \r
 /**\r
  * Service tree view\r
@@ -28,7 +28,7 @@ public class ServiceTreeView extends ViewPart
        @Override\r
        public void createPartControl(Composite parent)\r
        {\r
-               session = NXMCSharedData.getInstance().getSession();\r
+               session = ConsoleSharedData.getInstance().getSession();\r
                \r
                parent.setLayout(new FillLayout());\r
                serviceTree = new ServiceTree(parent, SWT.NONE, session.findObjectById(2));\r
index cbdf136..146c9a6 100644 (file)
@@ -35,7 +35,7 @@ import org.netxms.ui.eclipse.serviceview.widgets.helpers.ServiceTreeElement;
 import org.netxms.ui.eclipse.serviceview.widgets.helpers.ServiceTreeLabelProvider;\r
 import org.netxms.ui.eclipse.serviceview.widgets.helpers.ServiceTreeModel;\r
 import org.netxms.ui.eclipse.serviceview.widgets.helpers.SparseTree;\r
-import org.netxms.ui.eclipse.shared.NXMCSharedData;\r
+import org.netxms.ui.eclipse.shared.ConsoleSharedData;\r
 \r
 /**\r
  * Service tree widget\r
@@ -59,7 +59,7 @@ public class ServiceTree extends Composite implements IServiceFigureListener
                // Initiate loading of object manager plugin if it was not loaded before\r
                try\r
                {\r
-                       Platform.getAdapterManager().loadAdapter(NXMCSharedData.getInstance().getSession().getTopLevelObjects()[0], "org.eclipse.ui.model.IWorkbenchAdapter");\r
+                       Platform.getAdapterManager().loadAdapter(ConsoleSharedData.getInstance().getSession().getTopLevelObjects()[0], "org.eclipse.ui.model.IWorkbenchAdapter");\r
                }\r
                catch(Exception e)\r
                {\r
index 20def7c..1513c3e 100644 (file)
@@ -7,7 +7,8 @@ Bundle-Activator: org.netxms.ui.eclipse.usermanager.Activator
 Bundle-Vendor: netxms.org
 Require-Bundle: org.eclipse.ui,
  org.eclipse.core.runtime,
- org.netxms.ui.eclipse.library;bundle-version="1.1.0"
+ org.netxms.ui.eclipse.library;bundle-version="1.1.0",
+ org.netxms.ui.eclipse.console;bundle-version="1.1.0"
 Bundle-RequiredExecutionEnvironment: JavaSE-1.6
 Bundle-ActivationPolicy: lazy
 Export-Package: org.netxms.ui.eclipse.usermanager.dialogs
index f3968cd..22a2652 100644 (file)
@@ -12,7 +12,7 @@
             name="User Manager"\r
             icon="icons/user_manager.png"\r
             category="org.netxms.ui.eclipse.config"\r
-            class="org.netxms.ui.eclipse.usermanager.views.UserManager"\r
+            class="org.netxms.ui.eclipse.usermanager.views.UserManagementView"\r
             id="org.netxms.ui.eclipse.usermanager.view.user_manager">\r
       </view>\r
    </extension>\r
@@ -80,7 +80,7 @@
               class="org.netxms.ui.eclipse.usermanager.propertypages.General">\r
           <enabledWhen>\r
              <instanceof\r
-                  value="org.netxms.client.NXCUserDBObject">\r
+                  value="org.netxms.api.client.users.AbstractUserObject">\r
              </instanceof>\r
           </enabledWhen>\r
         </page>\r
@@ -90,7 +90,7 @@
               class="org.netxms.ui.eclipse.usermanager.propertypages.Authentication">\r
           <enabledWhen>\r
              <instanceof\r
-                  value="org.netxms.client.NXCUser">\r
+                  value="org.netxms.api.client.users.User">\r
              </instanceof>\r
           </enabledWhen>\r
         </page>\r
               name="Members">\r
            <enabledWhen>\r
               <instanceof\r
-                    value="org.netxms.client.NXCUserGroup">\r
+                    value="org.netxms.api.client.users.UserGroup">\r
               </instanceof>\r
            </enabledWhen>\r
         </page>\r
      point="org.eclipse.core.runtime.adapters">\r
         <factory \r
            class="org.netxms.ui.eclipse.usermanager.UserAdapterFactory" \r
-           adaptableType="org.netxms.client.NXCUserDBObject">\r
+           adaptableType="org.netxms.api.client.users.AbstractUserObject">\r
           <adapter type="org.eclipse.ui.model.IWorkbenchAdapter"/>\r
         </factory>\r
         <factory \r
index c007355..9242028 100644 (file)
@@ -24,9 +24,9 @@ import org.eclipse.ui.model.IWorkbenchAdapter;
 import org.netxms.api.client.users.AbstractUserObject;\r
 import org.netxms.api.client.users.User;\r
 import org.netxms.api.client.users.UserGroup;\r
+import org.netxms.api.client.users.UserManager;\r
 import org.netxms.client.AccessListElement;\r
-import org.netxms.client.NXCSession;\r
-import org.netxms.ui.eclipse.shared.NXMCSharedData;\r
+import org.netxms.ui.eclipse.shared.ConsoleSharedData;\r
 \r
 /**\r
  * Adapter factory for NXCUserDBObject and derived classes\r
@@ -99,7 +99,7 @@ public class UserAdapterFactory implements IAdapterFactory
                                                long[] members = ((UserGroup)o).getMembers();\r
                                                AbstractUserObject[] childrens = new User[members.length];\r
                                                for(int i = 0; i < members.length; i++)\r
-                                                       childrens[i] = NXMCSharedData.getInstance().getSession().findUserDBObjectById(members[i]);\r
+                                                       childrens[i] = ((UserManager)ConsoleSharedData.getSession()).findUserDBObjectById(members[i]);\r
                                                return childrens;\r
                                        }\r
 \r
@@ -144,8 +144,8 @@ public class UserAdapterFactory implements IAdapterFactory
                                        public String getLabel(Object object)\r
                                        {\r
                                                long userId = ((AccessListElement)object).getUserId();\r
-                                               NXCSession session = NXMCSharedData.getInstance().getSession();\r
-                                               AbstractUserObject dbo = session.findUserDBObjectById(userId);\r
+                                               UserManager umgr = (UserManager)ConsoleSharedData.getSession();\r
+                                               AbstractUserObject dbo = umgr.findUserDBObjectById(userId);\r
                                                return (dbo != null) ? dbo.getName() : ("{" + Long.toString(userId) + "}");\r
                                        }\r
 \r
index fdb5fc0..c85d6fd 100644 (file)
@@ -24,8 +24,8 @@ import org.eclipse.swt.SWT;
 import org.netxms.api.client.users.AbstractUserObject;\r
 import org.netxms.api.client.users.User;\r
 import org.netxms.api.client.users.UserGroup;\r
-import org.netxms.ui.eclipse.tools.SortableTableViewer;\r
-import org.netxms.ui.eclipse.usermanager.views.UserManager;\r
+import org.netxms.ui.eclipse.usermanager.views.UserManagementView;\r
+import org.netxms.ui.eclipse.widgets.SortableTableViewer;\r
 \r
 /**\r
  * Comparator for user objects\r
@@ -63,19 +63,19 @@ public class UserComparator extends ViewerComparator
 \r
                switch((Integer)((SortableTableViewer) viewer).getTable().getSortColumn().getData("ID"))\r
                {\r
-                       case UserManager.COLUMN_NAME:\r
+                       case UserManagementView.COLUMN_NAME:\r
                                result = ((AbstractUserObject)e1).getName().compareToIgnoreCase(((AbstractUserObject) e2).getName());\r
                                break;\r
-                       case UserManager.COLUMN_TYPE:\r
+                       case UserManagementView.COLUMN_TYPE:\r
                                result = compareTypes(e1, e2);\r
                                break;\r
-                       case UserManager.COLUMN_FULLNAME:\r
+                       case UserManagementView.COLUMN_FULLNAME:\r
                                result = getFullName(e1).compareToIgnoreCase(getFullName(e2));\r
                                break;\r
-                       case UserManager.COLUMN_DESCRIPTION:\r
+                       case UserManagementView.COLUMN_DESCRIPTION:\r
                                result = ((AbstractUserObject)e1).getDescription().compareToIgnoreCase(((AbstractUserObject)e2).getDescription());\r
                                break;\r
-                       case UserManager.COLUMN_GUID:\r
+                       case UserManagementView.COLUMN_GUID:\r
                                result = ((AbstractUserObject)e1).getGuid().toString().compareTo(((AbstractUserObject)e2).getGuid().toString());\r
                                break;\r
                        default:\r
index 68666e2..c4ae733 100644 (file)
@@ -23,7 +23,7 @@ import org.eclipse.swt.graphics.Image;
 import org.eclipse.ui.model.WorkbenchLabelProvider;\r
 import org.netxms.api.client.users.AbstractUserObject;\r
 import org.netxms.api.client.users.User;\r
-import org.netxms.ui.eclipse.usermanager.views.UserManager;\r
+import org.netxms.ui.eclipse.usermanager.views.UserManagementView;\r
 \r
 /**\r
  * Label provider for user manager\r
@@ -48,15 +48,15 @@ public class UserLabelProvider extends WorkbenchLabelProvider implements ITableL
        {\r
                switch(columnIndex)\r
                {\r
-                       case UserManager.COLUMN_NAME:\r
+                       case UserManagementView.COLUMN_NAME:\r
                                return getText(element);\r
-                       case UserManager.COLUMN_TYPE:\r
+                       case UserManagementView.COLUMN_TYPE:\r
                                return (element instanceof User) ? "User" : "Group";\r
-                       case UserManager.COLUMN_FULLNAME:\r
+                       case UserManagementView.COLUMN_FULLNAME:\r
                                return (element instanceof User) ? ((User) element).getFullName() : null;\r
-                       case UserManager.COLUMN_DESCRIPTION:\r
+                       case UserManagementView.COLUMN_DESCRIPTION:\r
                                return ((AbstractUserObject)element).getDescription();\r
-                       case UserManager.COLUMN_GUID:\r
+                       case UserManagementView.COLUMN_GUID:\r
                                return ((AbstractUserObject)element).getGuid().toString();\r
                }\r
                return null;\r
index ef328fb..d9bf71b 100644 (file)
@@ -28,9 +28,10 @@ import org.eclipse.jface.window.Window;
 import org.eclipse.ui.IWorkbenchWindow;\r
 import org.eclipse.ui.IWorkbenchWindowActionDelegate;\r
 import org.eclipse.ui.progress.UIJob;\r
-import org.netxms.client.NXCSession;\r
+import org.netxms.api.client.Session;\r
+import org.netxms.api.client.users.UserManager;\r
 import org.netxms.ui.eclipse.jobs.ConsoleJob;\r
-import org.netxms.ui.eclipse.shared.NXMCSharedData;\r
+import org.netxms.ui.eclipse.shared.ConsoleSharedData;\r
 import org.netxms.ui.eclipse.usermanager.Activator;\r
 import org.netxms.ui.eclipse.usermanager.dialogs.ChangePasswordDialog;\r
 \r
@@ -78,8 +79,8 @@ public class ChangePassword implements IWorkbenchWindowActionDelegate
                                @Override\r
                                protected void runInternal(IProgressMonitor monitor) throws Exception\r
                                {\r
-                                       NXCSession session = NXMCSharedData.getInstance().getSession();\r
-                                       session.setUserPassword(session.getUserId(), dlg.getPassword(), dlg.getOldPassword());\r
+                                       Session session = ConsoleSharedData.getSession();\r
+                                       ((UserManager)session).setUserPassword(session.getUserId(), dlg.getPassword(), dlg.getOldPassword());\r
                                        new UIJob("Password change notification") {\r
                                                @Override\r
                                                public IStatus runInUIThread(IProgressMonitor monitor)\r
index 4fbee45..e784c85 100644 (file)
@@ -24,7 +24,7 @@ import org.eclipse.jface.viewers.ISelection;
 import org.eclipse.ui.IWorkbenchWindow;\r
 import org.eclipse.ui.IWorkbenchWindowActionDelegate;\r
 import org.eclipse.ui.PartInitException;\r
-import org.netxms.ui.eclipse.usermanager.views.UserManager;\r
+import org.netxms.ui.eclipse.usermanager.views.UserManagementView;\r
 \r
 public class OpenUserManager implements IWorkbenchWindowActionDelegate\r
 {\r
@@ -59,7 +59,7 @@ public class OpenUserManager implements IWorkbenchWindowActionDelegate
                {       \r
                        try \r
                        {\r
-                               window.getActivePage().showView(UserManager.ID);\r
+                               window.getActivePage().showView(UserManagementView.ID);\r
                        } \r
                        catch (PartInitException e) \r
                        {\r
index 881643e..89de482 100644 (file)
@@ -31,7 +31,6 @@ import org.eclipse.swt.widgets.Control;
 import org.eclipse.swt.widgets.Label;\r
 import org.eclipse.swt.widgets.Shell;\r
 import org.eclipse.swt.widgets.Text;\r
-import org.netxms.ui.eclipse.shared.IUIConstants;\r
 import org.netxms.ui.eclipse.tools.WidgetHelper;\r
 import org.netxms.ui.eclipse.usermanager.Activator;\r
 \r
@@ -67,8 +66,8 @@ public class ChangePasswordDialog extends Dialog
 \r
                final GridLayout layout = new GridLayout();\r
 \r
-               layout.marginWidth = IUIConstants.DIALOG_WIDTH_MARGIN;\r
-               layout.marginHeight = IUIConstants.DIALOG_HEIGHT_MARGIN;\r
+               layout.marginWidth = WidgetHelper.DIALOG_WIDTH_MARGIN;\r
+               layout.marginHeight = WidgetHelper.DIALOG_HEIGHT_MARGIN;\r
                layout.numColumns = 2;\r
                dialogArea.setLayout(layout);\r
                \r
index db65796..16d8dc3 100644 (file)
@@ -27,10 +27,10 @@ import org.eclipse.swt.widgets.Control;
 import org.eclipse.swt.widgets.Label;\r
 import org.eclipse.swt.widgets.Shell;\r
 import org.eclipse.swt.widgets.Text;\r
-import org.netxms.ui.eclipse.shared.IUIConstants;\r
+import org.netxms.ui.eclipse.tools.WidgetHelper;\r
 \r
 /**\r
- * @author Victor\r
+ * User database object creation dialog\r
  * \r
  */\r
 public class CreateObjectDialog extends Dialog\r
@@ -57,8 +57,8 @@ public class CreateObjectDialog extends Dialog
 \r
                FillLayout layout = new FillLayout();\r
                layout.type = SWT.VERTICAL;\r
-               layout.marginWidth = IUIConstants.DIALOG_WIDTH_MARGIN;\r
-               layout.marginHeight = IUIConstants.DIALOG_HEIGHT_MARGIN;\r
+               layout.marginWidth = WidgetHelper.DIALOG_WIDTH_MARGIN;\r
+               layout.marginHeight = WidgetHelper.DIALOG_HEIGHT_MARGIN;\r
                dialogArea.setLayout(layout);\r
 \r
                Label label = new Label(dialogArea, SWT.NONE);\r
index 43797b9..bfb593e 100644 (file)
@@ -37,22 +37,23 @@ import org.eclipse.swt.widgets.Control;
 import org.eclipse.swt.widgets.Label;\r
 import org.eclipse.swt.widgets.Shell;\r
 import org.eclipse.ui.model.WorkbenchLabelProvider;\r
+import org.netxms.api.client.Session;\r
 import org.netxms.api.client.users.AbstractUserObject;\r
 import org.netxms.api.client.users.User;\r
-import org.netxms.client.NXCSession;\r
-import org.netxms.ui.eclipse.shared.IUIConstants;\r
-import org.netxms.ui.eclipse.shared.NXMCSharedData;\r
-import org.netxms.ui.eclipse.tools.SortableTableViewer;\r
+import org.netxms.api.client.users.UserManager;\r
+import org.netxms.ui.eclipse.shared.ConsoleSharedData;\r
+import org.netxms.ui.eclipse.tools.WidgetHelper;\r
 import org.netxms.ui.eclipse.usermanager.UserComparator;\r
+import org.netxms.ui.eclipse.widgets.SortableTableViewer;\r
 \r
 /**\r
- * @author Victor\r
+ * User selection dialog\r
  *\r
  */\r
 public class SelectUserDialog extends Dialog\r
 {\r
        private TableViewer userList;\r
-       private NXCSession session;\r
+       private Session session;\r
        private boolean showGroups;\r
        private AbstractUserObject[] selection;\r
        \r
@@ -81,12 +82,12 @@ public class SelectUserDialog extends Dialog
        @Override\r
        protected Control createDialogArea(Composite parent)\r
        {\r
-               session  = NXMCSharedData.getInstance().getSession();\r
+               session  = ConsoleSharedData.getSession();\r
                \r
                Composite dialogArea = (Composite)super.createDialogArea(parent);\r
                GridLayout layout = new GridLayout();\r
-      layout.marginWidth = IUIConstants.DIALOG_WIDTH_MARGIN;\r
-      layout.marginHeight = IUIConstants.DIALOG_HEIGHT_MARGIN;\r
+      layout.marginWidth = WidgetHelper.DIALOG_WIDTH_MARGIN;\r
+      layout.marginHeight = WidgetHelper.DIALOG_HEIGHT_MARGIN;\r
       dialogArea.setLayout(layout);\r
                \r
                new Label(dialogArea, SWT.NONE).setText("Available users");\r
@@ -112,7 +113,7 @@ public class SelectUserDialog extends Dialog
                                return showGroups || (element instanceof User);\r
                        }\r
       });\r
-      userList.setInput(session.getUserDatabaseObjects());\r
+      userList.setInput(((UserManager)session).getUserDatabaseObjects());\r
       \r
       GridData gd = new GridData();\r
       gd.horizontalAlignment = SWT.FILL;\r
index 9db28fd..7af77ce 100644 (file)
@@ -34,11 +34,12 @@ import org.eclipse.swt.widgets.Label;
 import org.eclipse.swt.widgets.Text;\r
 import org.eclipse.ui.dialogs.PropertyPage;\r
 import org.eclipse.ui.progress.UIJob;\r
+import org.netxms.api.client.NetXMSClientException;\r
+import org.netxms.api.client.Session;\r
 import org.netxms.api.client.users.AbstractUserObject;\r
 import org.netxms.api.client.users.User;\r
-import org.netxms.client.NXCException;\r
-import org.netxms.client.NXCSession;\r
-import org.netxms.ui.eclipse.shared.NXMCSharedData;\r
+import org.netxms.api.client.users.UserManager;\r
+import org.netxms.ui.eclipse.shared.ConsoleSharedData;\r
 import org.netxms.ui.eclipse.tools.WidgetHelper;\r
 import org.netxms.ui.eclipse.usermanager.Activator;\r
 \r
@@ -48,7 +49,7 @@ import org.netxms.ui.eclipse.usermanager.Activator;
  */\r
 public class Authentication extends PropertyPage\r
 {\r
-       private NXCSession session;\r
+       private Session session;\r
        private User object;\r
        private Button checkDisabled;\r
        private Button checkChangePassword;\r
@@ -63,7 +64,7 @@ public class Authentication extends PropertyPage
        public Authentication()\r
        {\r
                super();\r
-               session = NXMCSharedData.getInstance().getSession();\r
+               session = ConsoleSharedData.getSession();\r
        }\r
 \r
        /* (non-Javadoc)\r
@@ -176,13 +177,13 @@ public class Authentication extends PropertyPage
                                \r
                                try\r
                                {\r
-                                       session.modifyUserDBObject(object, NXCSession.USER_MODIFY_FLAGS | NXCSession.USER_MODIFY_AUTH_METHOD | NXCSession.USER_MODIFY_CERT_MAPPING);\r
+                                       ((UserManager)session).modifyUserDBObject(object, UserManager.USER_MODIFY_FLAGS | UserManager.USER_MODIFY_AUTH_METHOD | UserManager.USER_MODIFY_CERT_MAPPING);\r
                                        status = Status.OK_STATUS;\r
                                }\r
                                catch(Exception e)\r
                                {\r
                                        status = new Status(Status.ERROR, Activator.PLUGIN_ID, \r
-                                                           (e instanceof NXCException) ? ((NXCException)e).getErrorCode() : 0,\r
+                                                           (e instanceof NetXMSClientException) ? ((NetXMSClientException)e).getErrorCode() : 0,\r
                                                            "Cannot update user account: " + e.getMessage(), null);\r
                                }\r
 \r
index 7c213ac..405d66e 100644 (file)
@@ -29,12 +29,13 @@ import org.eclipse.swt.widgets.Control;
 import org.eclipse.swt.widgets.Text;\r
 import org.eclipse.ui.dialogs.PropertyPage;\r
 import org.eclipse.ui.progress.UIJob;\r
+import org.netxms.api.client.NetXMSClientException;\r
+import org.netxms.api.client.Session;\r
 import org.netxms.api.client.users.AbstractUserObject;\r
 import org.netxms.api.client.users.User;\r
-import org.netxms.client.NXCException;\r
-import org.netxms.client.NXCSession;\r
+import org.netxms.api.client.users.UserManager;\r
 import org.netxms.ui.eclipse.usermanager.Activator;\r
-import org.netxms.ui.eclipse.shared.NXMCSharedData;\r
+import org.netxms.ui.eclipse.shared.ConsoleSharedData;\r
 import org.netxms.ui.eclipse.tools.WidgetHelper;\r
 \r
 /**\r
@@ -50,7 +51,7 @@ public class General extends PropertyPage
        private String initialFullName;\r
        private String initialDescription;\r
        private AbstractUserObject object;\r
-       private NXCSession session;\r
+       private Session session;\r
        \r
        /**\r
         * Default constructor\r
@@ -58,7 +59,7 @@ public class General extends PropertyPage
        public General()\r
        {\r
                super();\r
-               session = NXMCSharedData.getInstance().getSession();\r
+               session = ConsoleSharedData.getSession();\r
        }\r
 \r
        /* (non-Javadoc)\r
@@ -104,7 +105,6 @@ public class General extends PropertyPage
                return dialogArea;\r
        }\r
        \r
-       \r
        /**\r
         * Apply changes\r
         * \r
@@ -136,22 +136,22 @@ public class General extends PropertyPage
                                        initialFullName = newFullName;\r
                                        initialDescription = newDescription;\r
                                        \r
-                                       int fields = NXCSession.USER_MODIFY_LOGIN_NAME | NXCSession.USER_MODIFY_DESCRIPTION;\r
+                                       int fields = UserManager.USER_MODIFY_LOGIN_NAME | UserManager.USER_MODIFY_DESCRIPTION;\r
                                        object.setName(newName);\r
                                        object.setDescription(newDescription);\r
                                        if (object instanceof User)\r
                                        {\r
                                                ((User)object).setFullName(newFullName);\r
-                                               fields |= NXCSession.USER_MODIFY_FULL_NAME;\r
+                                               fields |= UserManager.USER_MODIFY_FULL_NAME;\r
                                        }\r
-                                       session.modifyUserDBObject(object, fields);\r
+                                       ((UserManager)session).modifyUserDBObject(object, fields);\r
                                        \r
                                        status = Status.OK_STATUS;\r
                                }\r
                                catch(Exception e)\r
                                {\r
                                        status = new Status(Status.ERROR, Activator.PLUGIN_ID, \r
-                                                           (e instanceof NXCException) ? ((NXCException)e).getErrorCode() : 0,\r
+                                                           (e instanceof NetXMSClientException) ? ((NetXMSClientException)e).getErrorCode() : 0,\r
                                                            "Cannot change object name: " + e.getMessage(), e);\r
                                }\r
 \r
@@ -172,7 +172,6 @@ public class General extends PropertyPage
                }.schedule();\r
        }\r
 \r
-       \r
        /* (non-Javadoc)\r
         * @see org.eclipse.jface.preference.PreferencePage#performOk()\r
         */\r
@@ -183,7 +182,6 @@ public class General extends PropertyPage
                return true;\r
        }\r
 \r
-\r
        /* (non-Javadoc)\r
         * @see org.eclipse.jface.preference.PreferencePage#performApply()\r
         */\r
index 9dbda4d..9561cce 100644 (file)
@@ -24,27 +24,27 @@ import org.eclipse.swt.widgets.Control;
 import org.eclipse.ui.dialogs.PropertyPage;\r
 import org.eclipse.ui.model.WorkbenchLabelProvider;\r
 import org.eclipse.ui.progress.UIJob;\r
+import org.netxms.api.client.NetXMSClientException;\r
 import org.netxms.api.client.users.AbstractUserObject;\r
 import org.netxms.api.client.users.UserGroup;\r
-import org.netxms.client.NXCException;\r
-import org.netxms.client.NXCSession;\r
-import org.netxms.ui.eclipse.shared.NXMCSharedData;\r
-import org.netxms.ui.eclipse.tools.SortableTableViewer;\r
+import org.netxms.api.client.users.UserManager;\r
+import org.netxms.ui.eclipse.shared.ConsoleSharedData;\r
 import org.netxms.ui.eclipse.tools.WidgetHelper;\r
 import org.netxms.ui.eclipse.usermanager.Activator;\r
 import org.netxms.ui.eclipse.usermanager.UserComparator;\r
 import org.netxms.ui.eclipse.usermanager.dialogs.SelectUserDialog;\r
+import org.netxms.ui.eclipse.widgets.SortableTableViewer;\r
 \r
 public class Members extends PropertyPage\r
 {\r
        private SortableTableViewer userList;\r
-       private NXCSession session;\r
+       private UserManager userManager;\r
        private UserGroup object;\r
        private HashMap<Long, AbstractUserObject> members = new HashMap<Long, AbstractUserObject>(0);\r
 \r
        public Members()\r
        {\r
-               session = NXMCSharedData.getInstance().getSession();\r
+               userManager = (UserManager)ConsoleSharedData.getSession();\r
        }\r
 \r
        @Override\r
@@ -141,7 +141,7 @@ public class Members extends PropertyPage
       // Initial data\r
                for(long userId : object.getMembers())\r
                {\r
-                       final AbstractUserObject user = session.findUserDBObjectById(userId);\r
+                       final AbstractUserObject user = userManager.findUserDBObjectById(userId);\r
                        if (user != null)\r
                        {\r
                                members.put(user.getId(), user);\r
@@ -176,13 +176,13 @@ public class Members extends PropertyPage
                                \r
                                try\r
                                {\r
-                                       session.modifyUserDBObject(object, NXCSession.USER_MODIFY_MEMBERS);\r
+                                       userManager.modifyUserDBObject(object, UserManager.USER_MODIFY_MEMBERS);\r
                                        status = Status.OK_STATUS;\r
                                }\r
                                catch(Exception e)\r
                                {\r
                                        status = new Status(Status.ERROR, Activator.PLUGIN_ID, \r
-                                                           (e instanceof NXCException) ? ((NXCException)e).getErrorCode() : 0,\r
+                                                           (e instanceof NetXMSClientException) ? ((NetXMSClientException)e).getErrorCode() : 0,\r
                                                            "Cannot update user account: " + e.getMessage(), null);\r
                                }\r
 \r
@@ -51,28 +51,30 @@ import org.eclipse.ui.dialogs.PropertyDialogAction;
 import org.eclipse.ui.part.ViewPart;\r
 import org.eclipse.ui.progress.IWorkbenchSiteProgressService;\r
 import org.eclipse.ui.progress.UIJob;\r
-import org.netxms.api.client.ISessionNotification;\r
+import org.netxms.api.client.NetXMSClientException;\r
+import org.netxms.api.client.Session;\r
+import org.netxms.api.client.SessionListener;\r
+import org.netxms.api.client.SessionNotification;\r
 import org.netxms.api.client.users.AbstractUserObject;\r
 import org.netxms.api.client.users.User;\r
+import org.netxms.api.client.users.UserManager;\r
 import org.netxms.client.NXCException;\r
-import org.netxms.client.NXCListener;\r
 import org.netxms.client.NXCNotification;\r
-import org.netxms.client.NXCSession;\r
 import org.netxms.client.constants.RCC;\r
-import org.netxms.ui.eclipse.shared.NXMCSharedData;\r
-import org.netxms.ui.eclipse.tools.RefreshAction;\r
-import org.netxms.ui.eclipse.tools.SortableTableViewer;\r
+import org.netxms.ui.eclipse.actions.RefreshAction;\r
+import org.netxms.ui.eclipse.shared.ConsoleSharedData;\r
 import org.netxms.ui.eclipse.usermanager.Activator;\r
 import org.netxms.ui.eclipse.usermanager.UserComparator;\r
 import org.netxms.ui.eclipse.usermanager.UserLabelProvider;\r
 import org.netxms.ui.eclipse.usermanager.dialogs.ChangePasswordDialog;\r
 import org.netxms.ui.eclipse.usermanager.dialogs.CreateObjectDialog;\r
+import org.netxms.ui.eclipse.widgets.SortableTableViewer;\r
 \r
 /**\r
  * @author Victor\r
  * \r
  */\r
-public class UserManager extends ViewPart\r
+public class UserManagementView extends ViewPart\r
 {\r
        public static final String ID = "org.netxms.ui.eclipse.usermanager.view.user_manager";\r
        public static final String JOB_FAMILY = "UserManagerJob";\r
@@ -85,8 +87,9 @@ public class UserManager extends ViewPart
        public static final int COLUMN_GUID = 4;\r
 \r
        private TableViewer viewer;\r
-       private NXCSession session;\r
-       private NXCListener sessionListener;\r
+       private Session session;\r
+       private UserManager userManager;\r
+       private SessionListener sessionListener;\r
        private boolean databaseLocked = false;\r
        private boolean editNewUser = false;\r
        private Action actionAddUser;\r
@@ -102,7 +105,8 @@ public class UserManager extends ViewPart
        @Override\r
        public void createPartControl(Composite parent)\r
        {\r
-               session = NXMCSharedData.getInstance().getSession();\r
+               session = ConsoleSharedData.getSession();\r
+               userManager = (UserManager)ConsoleSharedData.getSession();\r
 \r
                final String[] names = { "Name", "Type", "Full Name", "Description", "GUID" };\r
                final int[] widths = { 100, 80, 180, 250, 250 };\r
@@ -137,9 +141,9 @@ public class UserManager extends ViewPart
                createPopupMenu();\r
 \r
                // Listener for server's notifications\r
-               sessionListener = new NXCListener() {\r
+               sessionListener = new SessionListener() {\r
                        @Override\r
-                       public void notificationHandler(final ISessionNotification n)\r
+                       public void notificationHandler(final SessionNotification n)\r
                        {\r
                                if (n.getCode() == NXCNotification.USER_DB_CHANGED)\r
                                {\r
@@ -148,7 +152,7 @@ public class UserManager extends ViewPart
                                                @Override\r
                                                public IStatus runInUIThread(IProgressMonitor monitor)\r
                                                {\r
-                                                       viewer.setInput(session.getUserDatabaseObjects());\r
+                                                       viewer.setInput(userManager.getUserDatabaseObjects());\r
                                                        if (editNewUser && (n.getSubCode() == NXCNotification.USER_DB_OBJECT_CREATED))\r
                                                        {\r
                                                                editNewUser = false;\r
@@ -172,14 +176,14 @@ public class UserManager extends ViewPart
 \r
                                try\r
                                {\r
-                                       session.lockUserDatabase();\r
+                                       userManager.lockUserDatabase();\r
                                        databaseLocked = true;\r
                                        new UIJob("Update user list")\r
                                        {\r
                                                @Override\r
                                                public IStatus runInUIThread(IProgressMonitor monitor)\r
                                                {\r
-                                                       viewer.setInput(session.getUserDatabaseObjects());\r
+                                                       viewer.setInput(userManager.getUserDatabaseObjects());\r
                                                        return Status.OK_STATUS;\r
                                                }\r
                                        }.schedule();\r
@@ -188,14 +192,14 @@ public class UserManager extends ViewPart
                                }\r
                                catch(Exception e)\r
                                {\r
-                                       status = new Status(Status.ERROR, Activator.PLUGIN_ID, (e instanceof NXCException) ? ((NXCException) e)\r
+                                       status = new Status(Status.ERROR, Activator.PLUGIN_ID, (e instanceof NetXMSClientException) ? ((NetXMSClientException) e)\r
                                                        .getErrorCode() : 0, "Cannot lock user database: " + e.getMessage(), null);\r
                                        new UIJob("Close user manager")\r
                                        {\r
                                                @Override\r
                                                public IStatus runInUIThread(IProgressMonitor monitor)\r
                                                {\r
-                                                       UserManager.this.getViewSite().getPage().hideView(UserManager.this);\r
+                                                       UserManagementView.this.getViewSite().getPage().hideView(UserManagementView.this);\r
                                                        return Status.OK_STATUS;\r
                                                }\r
                                        }.schedule();\r
@@ -264,7 +268,7 @@ public class UserManager extends ViewPart
                        @Override\r
                        public void run()\r
                        {\r
-                               viewer.setInput(session.getUserDatabaseObjects());\r
+                               viewer.setInput(userManager.getUserDatabaseObjects());\r
                        }\r
                };\r
 \r
@@ -332,7 +336,7 @@ public class UserManager extends ViewPart
                                        {\r
                                                try\r
                                                {\r
-                                                       session.setUserPassword(user.getId(), dialog.getPassword(), dialog.getOldPassword());\r
+                                                       userManager.setUserPassword(user.getId(), dialog.getPassword(), dialog.getOldPassword());\r
                                                }\r
                                                catch(Exception e)\r
                                                {\r
@@ -423,13 +427,13 @@ public class UserManager extends ViewPart
 \r
                                        try\r
                                        {\r
-                                               session.unlockUserDatabase();\r
+                                               userManager.unlockUserDatabase();\r
                                                status = Status.OK_STATUS;\r
                                        }\r
                                        catch(Exception e)\r
                                        {\r
                                                status = new Status(Status.ERROR, Activator.PLUGIN_ID,\r
-                                                               (e instanceof NXCException) ? ((NXCException) e).getErrorCode() : 0,\r
+                                                               (e instanceof NetXMSClientException) ? ((NetXMSClientException) e).getErrorCode() : 0,\r
                                                                "Cannot unlock user database: " + e.getMessage(), null);\r
                                        }\r
                                        return status;\r
@@ -457,13 +461,13 @@ public class UserManager extends ViewPart
                                        try\r
                                        {\r
                                                editNewUser = dlg.isEditAfterCreate();\r
-                                               session.createUser(dlg.getLoginName());\r
+                                               userManager.createUser(dlg.getLoginName());\r
                                                status = Status.OK_STATUS;\r
                                        }\r
                                        catch(Exception e)\r
                                        {\r
                                                status = new Status(Status.ERROR, Activator.PLUGIN_ID,\r
-                                                               (e instanceof NXCException) ? ((NXCException) e).getErrorCode() : 0,\r
+                                                               (e instanceof NetXMSClientException) ? ((NetXMSClientException) e).getErrorCode() : 0,\r
                                                                "Cannot create user: " + e.getMessage(), null);\r
                                        }\r
                                        return status;\r
@@ -475,7 +479,7 @@ public class UserManager extends ViewPart
                                @Override\r
                                public boolean belongsTo(Object family)\r
                                {\r
-                                       return family == UserManager.JOB_FAMILY;\r
+                                       return family == UserManagementView.JOB_FAMILY;\r
                                }\r
                        };\r
                        IWorkbenchSiteProgressService siteService = (IWorkbenchSiteProgressService) getSite().getAdapter(\r
@@ -502,13 +506,13 @@ public class UserManager extends ViewPart
                                        try\r
                                        {\r
                                                editNewUser = dlg.isEditAfterCreate();\r
-                                               session.createUserGroup(dlg.getLoginName());\r
+                                               userManager.createUserGroup(dlg.getLoginName());\r
                                                status = Status.OK_STATUS;\r
                                        }\r
                                        catch(Exception e)\r
                                        {\r
                                                status = new Status(Status.ERROR, Activator.PLUGIN_ID,\r
-                                                               (e instanceof NXCException) ? ((NXCException) e).getErrorCode() : 0,\r
+                                                               (e instanceof NetXMSClientException) ? ((NetXMSClientException)e).getErrorCode() : 0,\r
                                                                "Cannot create group: " + e.getMessage(), null);\r
                                        }\r
                                        return status;\r
@@ -520,7 +524,7 @@ public class UserManager extends ViewPart
                                @Override\r
                                public boolean belongsTo(Object family)\r
                                {\r
-                                       return family == UserManager.JOB_FAMILY;\r
+                                       return family == UserManagementView.JOB_FAMILY;\r
                                }\r
                        };\r
                        IWorkbenchSiteProgressService siteService = (IWorkbenchSiteProgressService) getSite().getAdapter(\r
@@ -559,7 +563,7 @@ public class UserManager extends ViewPart
                                                Object object = it.next();\r
                                                if (object instanceof AbstractUserObject)\r
                                                {\r
-                                                       session.deleteUserDBObject(((AbstractUserObject)object).getId());\r
+                                                       userManager.deleteUserDBObject(((AbstractUserObject)object).getId());\r
                                                }\r
                                                else\r
                                                {\r
@@ -571,7 +575,7 @@ public class UserManager extends ViewPart
                                catch(Exception e)\r
                                {\r
                                        status = new Status(Status.ERROR, Activator.PLUGIN_ID,\r
-                                                       (e instanceof NXCException) ? ((NXCException) e).getErrorCode() : 0,\r
+                                                       (e instanceof NetXMSClientException) ? ((NetXMSClientException)e).getErrorCode() : 0,\r
                                                        "Cannot delete user database object: " + e.getMessage(), null);\r
                                }\r
                                return status;\r
@@ -583,7 +587,7 @@ public class UserManager extends ViewPart
                        @Override\r
                        public boolean belongsTo(Object family)\r
                        {\r
-                               return family == UserManager.JOB_FAMILY;\r
+                               return family == UserManagementView.JOB_FAMILY;\r
                        }\r
                };\r
                IWorkbenchSiteProgressService siteService = (IWorkbenchSiteProgressService) getSite().getAdapter(\r
index c0d8c33..d72a188 100644 (file)
@@ -1,5 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <classpath>
+       <classpathentry exported="true" kind="lib" path="jar/netxms-client-1.1.0.jar"/>
        <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.6"/>
        <classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
        <classpathentry kind="src" path="src"/>
index 26eafb8..a086cf4 100644 (file)
@@ -12,4 +12,15 @@ Require-Bundle: org.eclipse.ui,
  org.eclipse.ui.console;bundle-version="3.4.0"
 Bundle-RequiredExecutionEnvironment: JavaSE-1.6
 Bundle-ActivationPolicy: lazy
-Bundle-ClassPath: .
+Bundle-ClassPath: .,
+ jar/netxms-client-1.1.0.jar
+Export-Package: org.netxms.client,
+ org.netxms.client.constants,
+ org.netxms.client.datacollection,
+ org.netxms.client.events,
+ org.netxms.client.log,
+ org.netxms.client.maps,
+ org.netxms.client.objects,
+ org.netxms.client.objecttools,
+ org.netxms.client.snmp,
+ org.netxms.ui.eclipse.console.resources
index 607b3e5..4a637a5 100644 (file)
@@ -5,7 +5,8 @@ bin.includes = plugin.xml,\
                icons/,\\r
                .,\\r
                plugin_customization.ini,\\r
-               OSGI-INF/l10n/bundle.properties\r
+               OSGI-INF/l10n/bundle.properties,\\r
+               jar/netxms-client-1.1.0.jar\r
 jars.compile.order = .\r
 bin.excludes = META-INF/.svn/,\\r
                icons/.svn/\r
index b308921..83b5c94 100644 (file)
@@ -25,7 +25,9 @@ import org.eclipse.swt.widgets.Display;
 import org.eclipse.swt.widgets.Tray;\r
 import org.eclipse.swt.widgets.TrayItem;\r
 import org.eclipse.ui.plugin.AbstractUIPlugin;\r
-import org.netxms.ui.eclipse.shared.NXMCSharedData;\r
+import org.netxms.ui.eclipse.console.resources.DataCollectionDisplayInfo;\r
+import org.netxms.ui.eclipse.console.resources.StatusDisplayInfo;\r
+import org.netxms.ui.eclipse.shared.ConsoleSharedData;\r
 import org.osgi.framework.BundleContext;\r
 \r
 /**\r
@@ -57,6 +59,8 @@ public class Activator extends AbstractUIPlugin
        {\r
                super.start(context);\r
                plugin = this;\r
+               StatusDisplayInfo.init();\r
+               DataCollectionDisplayInfo.init();\r
        }\r
 \r
        /*\r
@@ -112,7 +116,7 @@ public class Activator extends AbstractUIPlugin
         */\r
        public static void showTrayIcon()\r
        {\r
-               if (NXMCSharedData.getInstance().getTrayIcon() != null)\r
+               if (ConsoleSharedData.getTrayIcon() != null)\r
                        return; // Tray icon already exist\r
                \r
                Tray tray = Display.getDefault().getSystemTray();\r
@@ -121,7 +125,7 @@ public class Activator extends AbstractUIPlugin
                        TrayItem item = new TrayItem(tray, SWT.NONE);\r
                        item.setToolTipText("NetXMS Management Console");\r
                        item.setImage(getImageDescriptor("icons/alt_window_16.gif").createImage());\r
-                       NXMCSharedData.getInstance().setTrayIcon(item);\r
+                       ConsoleSharedData.setTrayIcon(item);\r
                }\r
        }\r
        \r
@@ -130,11 +134,11 @@ public class Activator extends AbstractUIPlugin
         */\r
        public static void hideTrayIcon()\r
        {\r
-               TrayItem item = NXMCSharedData.getInstance().getTrayIcon();\r
+               TrayItem item = ConsoleSharedData.getTrayIcon();\r
                if (item == null)\r
                        return; // No tray icon\r
                \r
-               NXMCSharedData.getInstance().setTrayIcon(null);\r
+               ConsoleSharedData.setTrayIcon(null);\r
                item.dispose();\r
        }\r
 }\r
index 3c18873..3c22b94 100644 (file)
@@ -7,7 +7,7 @@ import java.lang.reflect.InvocationTargetException;
 import org.eclipse.core.runtime.IProgressMonitor;\r
 import org.eclipse.jface.operation.IRunnableWithProgress;\r
 import org.netxms.client.*;\r
-import org.netxms.ui.eclipse.shared.NXMCSharedData;\r
+import org.netxms.ui.eclipse.shared.ConsoleSharedData;\r
 \r
 \r
 /**\r
@@ -55,7 +55,7 @@ public class LoginJob implements IRunnableWithProgress
                        session.subscribe(NXCSession.CHANNEL_ALARMS | NXCSession.CHANNEL_OBJECTS | NXCSession.CHANNEL_EVENTS);\r
                        monitor.worked(5);\r
                        \r
-                       NXMCSharedData.getInstance().setSession(session);\r
+                       ConsoleSharedData.setSession(session);\r
                }\r
                catch(Exception e)\r
                {\r
index d48ebf6..b942bfa 100644 (file)
@@ -33,10 +33,11 @@ import org.eclipse.ui.application.ActionBarAdvisor;
 import org.eclipse.ui.application.IActionBarConfigurer;
 import org.eclipse.ui.application.IWorkbenchWindowConfigurer;
 import org.eclipse.ui.application.WorkbenchWindowAdvisor;
+import org.netxms.api.client.Session;
 import org.netxms.client.NXCSession;
 import org.netxms.ui.eclipse.console.dialogs.LoginDialog;
 import org.netxms.ui.eclipse.console.dialogs.PasswordExpiredDialog;
-import org.netxms.ui.eclipse.shared.NXMCSharedData;
+import org.netxms.ui.eclipse.shared.ConsoleSharedData;
 
 public class NXMCWorkbenchWindowAdvisor extends WorkbenchWindowAdvisor
 {
@@ -76,7 +77,7 @@ public class NXMCWorkbenchWindowAdvisor extends WorkbenchWindowAdvisor
                
                window.getShell().setMaximized(true);
                
-               NXCSession session = NXMCSharedData.getInstance().getSession();
+               Session session = ConsoleSharedData.getSession();
                Activator.getDefault().getStatusItemConnection().setText(session.getUserName() + "@" + session.getServerAddress() + " (" + session.getServerVersion() + ")"); //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
 
                if (Activator.getDefault().getPreferenceStore().getBoolean("SHOW_TRAY_ICON"))
@@ -124,7 +125,7 @@ public class NXMCWorkbenchWindowAdvisor extends WorkbenchWindowAdvisor
                if (success)
                {
                        // Suggest user to change password if it is expired
-                       final NXCSession session = NXMCSharedData.getInstance().getSession();
+                       final Session session = ConsoleSharedData.getSession();
                        if (session.isPasswordExpired())
                        {
                                final PasswordExpiredDialog dlg = new PasswordExpiredDialog(shell);
@@ -137,7 +138,7 @@