added method getConfigPrefix in alarm tab
authorVictor Kirhenshtein <victor@netxms.org>
Mon, 19 Aug 2013 11:41:17 +0000 (11:41 +0000)
committerVictor Kirhenshtein <victor@netxms.org>
Mon, 19 Aug 2013 11:41:17 +0000 (11:41 +0000)
.gitattributes
doc/internal/ComponentDiscovery - Draft.odt [new file with mode: 0644]
src/java/netxms-eclipse/AlarmViewer/META-INF/MANIFEST.MF
src/java/netxms-eclipse/AlarmViewer/src/org/netxms/ui/eclipse/alarmviewer/objecttabs/AlarmTab.java
webui/webapp/AlarmViewer/META-INF/MANIFEST.MF
webui/webapp/AlarmViewer/src/org/netxms/ui/eclipse/alarmviewer/objecttabs/AlarmTab.java

index db08a6c..7590c16 100644 (file)
@@ -339,6 +339,7 @@ doc/RadenSolutions.xml -text
 doc/comparison_netxms_nnm.doc -text
 doc/doxygen.md -text
 doc/integration/HPOM_Integration.docx -text
+doc/internal/ComponentDiscovery[!!-~]-[!!-~]Draft.odt -text
 doc/internal/NetworkDeviceDrivers.docx -text
 doc/internal/build.w64 -text
 doc/internal/db_driver_api.txt -text
diff --git a/doc/internal/ComponentDiscovery - Draft.odt b/doc/internal/ComponentDiscovery - Draft.odt
new file mode 100644 (file)
index 0000000..7cde2d5
Binary files /dev/null and b/doc/internal/ComponentDiscovery - Draft.odt differ
index 76f472d..16a1158 100644 (file)
@@ -2,15 +2,15 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: NXMC Alarm Viewer Plug-in
 Bundle-SymbolicName: org.netxms.ui.eclipse.alarmviewer;singleton:=true
-Bundle-Version: 1.2.8
+Bundle-Version: 1.2.9
 Bundle-Activator: org.netxms.ui.eclipse.alarmviewer.Activator
 Bundle-Vendor: netxms.org
 Require-Bundle: org.eclipse.ui;bundle-version="3.7.0",
  org.eclipse.core.runtime;bundle-version="3.7.0",
- org.netxms.ui.eclipse.console;bundle-version="1.2.7",
- org.netxms.ui.eclipse.objectview;bundle-version="1.2.5",
+ org.netxms.ui.eclipse.console;bundle-version="1.2.9",
+ org.netxms.ui.eclipse.objectview;bundle-version="1.2.9",
  org.eclipse.ui.forms;bundle-version="3.5.101",
- org.netxms.ui.eclipse.datacollection;bundle-version="1.2.6"
+ org.netxms.ui.eclipse.datacollection;bundle-version="1.2.9"
 Bundle-RequiredExecutionEnvironment: JavaSE-1.6
 Bundle-ActivationPolicy: lazy
 Bundle-ClassPath: .
index a1ae3eb..2f2cb92 100644 (file)
@@ -45,7 +45,17 @@ public class AlarmTab extends ObjectTab
        @Override\r
        protected void createTabContent(Composite parent)\r
        {\r
-               alarmList = new AlarmList(getViewPart(), parent, SWT.NONE, "AlarmTab"); //$NON-NLS-1$\r
+               alarmList = new AlarmList(getViewPart(), parent, SWT.NONE, getConfigPrefix());\r
+       }\r
+       \r
+       /**\r
+        * Get configuration prefix for alarm list.\r
+        * \r
+        * @return\r
+        */\r
+       protected String getConfigPrefix()\r
+       {\r
+               return "AlarmTab"; //$NON-NLS-1$\r
        }\r
 \r
        /* (non-Javadoc)\r
index e949c1c..3dbff7a 100644 (file)
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: NXMC Alarm Viewer Plug-in
 Bundle-SymbolicName: org.netxms.ui.eclipse.alarmviewer;singleton:=true
-Bundle-Version: 1.2.8
+Bundle-Version: 1.2.9
 Bundle-Activator: org.netxms.ui.eclipse.alarmviewer.Activator
 Bundle-Vendor: netxms.org
 Require-Bundle: org.netxms.ui.eclipse.objectview;bundle-version="1.2.7",
index a1ae3eb..2f2cb92 100644 (file)
@@ -45,7 +45,17 @@ public class AlarmTab extends ObjectTab
        @Override\r
        protected void createTabContent(Composite parent)\r
        {\r
-               alarmList = new AlarmList(getViewPart(), parent, SWT.NONE, "AlarmTab"); //$NON-NLS-1$\r
+               alarmList = new AlarmList(getViewPart(), parent, SWT.NONE, getConfigPrefix());\r
+       }\r
+       \r
+       /**\r
+        * Get configuration prefix for alarm list.\r
+        * \r
+        * @return\r
+        */\r
+       protected String getConfigPrefix()\r
+       {\r
+               return "AlarmTab"; //$NON-NLS-1$\r
        }\r
 \r
        /* (non-Javadoc)\r