minor changes

diff --git a/ChangeLog b/ChangeLog
index 3101474..0d52572 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -19,7 +19,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, #906, #909, #942, #959, #992, #999, #1006, #1051, #1096, #1100, #1159, #1187, #1191, #1230, #1237, #1245, #1254, #1263, #1273, #1275
+- Fixed issues: #92, #906, #909, #942, #959, #992, #999, #1006, #1051, #1096, #1100, #1159, #1187, #1191, #1230, #1237, #1245, #1254, #1261, #1263, #1273, #1275
 
 
 *

diff --git a/src/java/netxms-eclipse/DataCollection/src/org/netxms/ui/eclipse/datacollection/views/helpers/DciLabelProvider.java b/src/java/netxms-eclipse/DataCollection/src/org/netxms/ui/eclipse/datacollection/views/helpers/DciLabelProvider.java
index 504ac44..e95519e 100644 (file)
--- a/src/java/netxms-eclipse/DataCollection/src/org/netxms/ui/eclipse/datacollection/views/helpers/DciLabelProvider.java
+++ b/src/java/netxms-eclipse/DataCollection/src/org/netxms/ui/eclipse/datacollection/views/helpers/DciLabelProvider.java
@@ -163,7 +163,7 @@ public class DciLabelProvider implements ITableLabelProvider
                }
                           
                           }
-                          if((dci instanceof DataCollectionTable))
+                          if ((dci instanceof DataCollectionTable))
                           {
                              List<TableThreshold> list = ((DataCollectionTable)dci).getThresholds();
                for(int i = 0; i < list.size(); i++)
@@ -178,9 +178,9 @@ public class DciLabelProvider implements ITableLabelProvider
                                if (dci.getTemplateId() == 0)
                                        return null;
                                AbstractObject object = session.findObjectById(dci.getTemplateId());
-                               if(object == null)
-                                  return  Messages.get().DciLabelProvider_Unknown;
-                               if(!(object instanceof Template))
+                               if (object == null)
+                                  return Messages.get().DciLabelProvider_Unknown;
+                               if (!(object instanceof Template))
                                   return object.getObjectName();
                                Set<AbstractObject> parents = object.getAllParents(null);
                                StringBuilder sb = new StringBuilder();

diff --git a/webui/webapp/DataCollection/src/org/netxms/ui/eclipse/datacollection/views/helpers/DciLabelProvider.java b/webui/webapp/DataCollection/src/org/netxms/ui/eclipse/datacollection/views/helpers/DciLabelProvider.java
index 504ac44..e95519e 100644 (file)
--- a/webui/webapp/DataCollection/src/org/netxms/ui/eclipse/datacollection/views/helpers/DciLabelProvider.java
+++ b/webui/webapp/DataCollection/src/org/netxms/ui/eclipse/datacollection/views/helpers/DciLabelProvider.java
@@ -163,7 +163,7 @@ public class DciLabelProvider implements ITableLabelProvider
                }
                           
                           }
-                          if((dci instanceof DataCollectionTable))
+                          if ((dci instanceof DataCollectionTable))
                           {
                              List<TableThreshold> list = ((DataCollectionTable)dci).getThresholds();
                for(int i = 0; i < list.size(); i++)
@@ -178,9 +178,9 @@ public class DciLabelProvider implements ITableLabelProvider
                                if (dci.getTemplateId() == 0)
                                        return null;
                                AbstractObject object = session.findObjectById(dci.getTemplateId());
-                               if(object == null)
-                                  return  Messages.get().DciLabelProvider_Unknown;
-                               if(!(object instanceof Template))
+                               if (object == null)
+                                  return Messages.get().DciLabelProvider_Unknown;
+                               if (!(object instanceof Template))
                                   return object.getObjectName();
                                Set<AbstractObject> parents = object.getAllParents(null);
                                StringBuilder sb = new StringBuilder();