Bug with displaying cross(remove field) in edit table threshold fixes #1280
authorEriks Jenkevics <eriks@netxms.org>
Wed, 31 Aug 2016 11:33:27 +0000 (14:33 +0300)
committerEriks Jenkevics <eriks@netxms.org>
Wed, 31 Aug 2016 11:33:27 +0000 (14:33 +0300)
ChangeLog
src/java/netxms-eclipse/DataCollection/src/org/netxms/ui/eclipse/datacollection/widgets/TableConditionsEditor.java
webui/webapp/DataCollection/src/org/netxms/ui/eclipse/datacollection/widgets/TableConditionsEditor.java

index 0f38f04..7137153 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -27,7 +27,7 @@
        - New editors for Agent Config Policy and Log Parser Policy. 
        - DCI summary tables with empty menu path not shown in object context menu
        - Fixed glitches in table value view
-- Fixed issues: #92, #568, #826, #851, #906, #909, #942, #959, #987, #992, #999, #1006, #1051, #1096, #1100, #1159, #1187, #1191, #1230, #1237, #1245, #1246, #1249, #1254, #1261, #1263, #1273, #1275, #1277, #1278
+- Fixed issues: #92, #568, #826, #851, #906, #909, #942, #959, #987, #992, #999, #1006, #1051, #1096, #1100, #1159, #1187, #1191, #1230, #1237, #1245, #1246, #1249, #1254, #1261, #1263, #1273, #1275, #1277, #1278, #1280
 
 
 *
index 12b2b91..81b0605 100644 (file)
@@ -183,7 +183,7 @@ public class TableConditionsEditor extends Composite
                }
                
                /**
-                * Get consfigured conditions
+                * Get configured conditions
                 * 
                 * @return
                 */
@@ -265,7 +265,7 @@ public class TableConditionsEditor extends Composite
                        value = toolkit.createText(parent, ""); //$NON-NLS-1$
                        value.setLayoutData(new GridData(SWT.FILL, SWT.CENTER, true, false));
                        
-                       ImageHyperlink link = toolkit.createImageHyperlink(parent, SWT.NONE);
+                       final ImageHyperlink link = toolkit.createImageHyperlink(parent, SWT.NONE);
                        link.setImage(SharedIcons.IMG_DELETE_OBJECT);
                        link.setToolTipText(Messages.get().TableConditionsEditor_DeleteCond);
                        link.addHyperlinkListener(new HyperlinkAdapter() {
@@ -273,6 +273,7 @@ public class TableConditionsEditor extends Composite
                                public void linkActivated(HyperlinkEvent e)
                                {
                                        group.deleteCondition(ConditionEditor.this);
+                                       link.dispose();
                                }
                        });
                        link.setLayoutData(new GridData(SWT.FILL, SWT.CENTER, false, false));
index 12b2b91..81b0605 100644 (file)
@@ -183,7 +183,7 @@ public class TableConditionsEditor extends Composite
                }
                
                /**
-                * Get consfigured conditions
+                * Get configured conditions
                 * 
                 * @return
                 */
@@ -265,7 +265,7 @@ public class TableConditionsEditor extends Composite
                        value = toolkit.createText(parent, ""); //$NON-NLS-1$
                        value.setLayoutData(new GridData(SWT.FILL, SWT.CENTER, true, false));
                        
-                       ImageHyperlink link = toolkit.createImageHyperlink(parent, SWT.NONE);
+                       final ImageHyperlink link = toolkit.createImageHyperlink(parent, SWT.NONE);
                        link.setImage(SharedIcons.IMG_DELETE_OBJECT);
                        link.setToolTipText(Messages.get().TableConditionsEditor_DeleteCond);
                        link.addHyperlinkListener(new HyperlinkAdapter() {
@@ -273,6 +273,7 @@ public class TableConditionsEditor extends Composite
                                public void linkActivated(HyperlinkEvent e)
                                {
                                        group.deleteCondition(ConditionEditor.this);
+                                       link.dispose();
                                }
                        });
                        link.setLayoutData(new GridData(SWT.FILL, SWT.CENTER, false, false));